- Remove the rest of the unneeded client-side libraries.

- Use installed libraries that are not built here. - Don't build/install client-library related file and headers.
author: dawes <dawes> 2001-08-25 03:13:01 +0000
committer: dawes <dawes> 2001-08-25 03:13:01 +0000
commit: 78d8c394fd74a2ecaaefd2e50515e1efb3b06408 (patch)
tree: 63a9fededc551fb427766dfc092075675257b302
parent: 1bc269d9ee0b7ece9ebe6487b48f8786cdd0ee35 (diff)
606 files changed, 445 insertions, 156010 deletions
diff --git a/xc/config/cf/Imake.tmpl b/xc/config/cf/Imake.tmpl
index 2561c9896..87fa82afe 100644
--- a/xc/config/cf/Imake.tmpl
+++ b/xc/config/cf/Imake.tmpl
@@ -1173,7 +1173,11 @@ TCLIBDIR = TclLibDir
 #endif
 #ifndef LdPreLib
 #if !defined(UseInstalled)
+#if !BuildLibraries && AlternateUsrLibDir
+#define LdPreLib -L$(BUILDLIBDIR) -L$(USRLIBDIR)
+#else
 #define LdPreLib -L$(BUILDLIBDIR)
+#endif
 #else
 #if AlternateUsrLibDir
 #define LdPreLib -L$(USRLIBDIR)
@@ -1497,6 +1501,11 @@ CXXEXTRA_INCLUDES = CplusplusExtraIncludes
        CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES)
          CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
 #endif
+
+#if !BuildLibraries && AlternateIncRoot
+INSTALLED_INCLUDES = -I$(INCROOT)
+#endif
+
          COMPRESS = CompressCmd
           GZIPCMD = GzipCmd
               CPP = CppCmd $(STD_CPP_DEFINES)		/* simple filters */
@@ -1688,7 +1697,7 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags
  * INCLUDES contains client-specific includes set in Imakefile
  * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile
  */
-      ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
+      ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
        ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
            CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
         LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
diff --git a/xc/config/cf/Imakefile b/xc/config/cf/Imakefile
index 142e1f254..f3aeac4a2 100644
--- a/xc/config/cf/Imakefile
+++ b/xc/config/cf/Imakefile
@@ -1,5 +1,5 @@
-XCOMM $XConsortium: Imakefile /main/38 1996/11/07 14:43:46 kaleb $
-XCOMM $XFree86: xc/config/cf/Imakefile,v 3.20 1999/08/14 10:48:58 dawes Exp $
+XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
+XCOMM $XFree86: xc/config/cf/Imakefile,v 3.26 2001/01/17 16:22:30 dawes Exp $
 
 XCOMM Some compilers generate fatal errors if an -L directory does
 XCOMM not exist.  Since BUILDLIBDIR may not exist yet suppress its use.
@@ -17,12 +17,14 @@ host.def
 
 DEFFILES = \
 xf86site.def \
+version.def \
 $(HOSTDEFFILES) \
 site.def
 
 RULEFILES = \
 Imake.rules \
 Motif.rules \
+cygwin.rules \
 Win32.rules \
 X11.rules \
 bsdLib.rules \
@@ -34,6 +36,7 @@ lnxLib.rules \
 lnxdoc.rules \
 necLib.rules \
 noop.rules \
+nto.rules \
 oldlib.rules \
 os2.rules \
 os2Lib.rules \
@@ -44,6 +47,7 @@ sgiLib.rules \
 sunLib.rules \
 sv3Lib.rules \
 sv4Lib.rules \
+QNX4.rules \
 xf86.rules
 
 TMPLFILES = \
@@ -53,6 +57,7 @@ Motif.tmpl \
 Server.tmpl \
 ServerLib.tmpl \
 Threads.tmpl \
+cygwin.tmpl \
 WinLib.tmpl \
 X11.tmpl \
 bsdLib.tmpl \
@@ -80,6 +85,7 @@ Mips.cf \
 NetBSD.cf \
 OpenBSD.cf \
 Oki.cf \
+cygwin.cf \
 Win32.cf \
 apollo.cf \
 bsd.cf \
@@ -100,6 +106,7 @@ minix.cf \
 moto.cf \
 ncr.cf \
 nec.cf \
+nto.cf \
 os2.cf \
 osf1.cf \
 pegasus.cf \
@@ -115,13 +122,18 @@ ultrix.cf \
 usl.cf \
 lynx.cf \
 x386.cf \
+QNX4.cf \
+darwin.cf \
 xfree86.cf
 
 INSTFILES = $(RULEFILES) $(TMPLFILES) $(DEFFILES) $(CFFILES) $(LOCALFILES)
 
 all::
 
+#if BuildLibraries
 InstallMultipleDestFlags(install,$(INSTFILES),$(CONFIGDIR),$(INSTDATFLAGS))
+#endif
+
 InstallDriverSDKMultipleDestFlags($(INSTFILES),$(DRIVERSDKDIR)/config/cf,$(INSTDATFLAGS))
 
 #ifdef InstallEmptyHostDef
diff --git a/xc/config/cf/Library.tmpl b/xc/config/cf/Library.tmpl
index 8342ff32d..7e273a567 100644
--- a/xc/config/cf/Library.tmpl
+++ b/xc/config/cf/Library.tmpl
@@ -441,16 +441,22 @@ AllTarget($(OBJS))
 # ifdef IncSubdir
 #  ifdef IncSubSubdir
 BuildIncludes($(HEADERS),IncSubdir/IncSubSubdir,../..)
+#   if BuildLibraries
 InstallMultipleFlags($(HEADERS),$(INCDIR)/IncSubdir/IncSubSubdir,$(INSTINCFLAGS))
+#   endif
 #  else
 BuildIncludes($(HEADERS),IncSubdir,..)
+#   if BuildLibraries
 InstallMultipleFlags($(HEADERS),$(INCDIR)/IncSubdir,$(INSTINCFLAGS))
+#   endif
 #  endif
 # else
 #  ifndef CplusplusSource
 #   if !defined(LibHeaders) || LibHeaders
 BuildIncludesTop($(HEADERS))
+#    if BuildLibraries
 InstallMultipleFlags($(HEADERS),$(INCDIR),$(INSTINCFLAGS))
+#    endif
 #   endif
 #  endif
 # endif
diff --git a/xc/config/cf/X11.tmpl b/xc/config/cf/X11.tmpl
index fb7f332d0..1dcb90335 100644
--- a/xc/config/cf/X11.tmpl
+++ b/xc/config/cf/X11.tmpl
@@ -90,6 +90,9 @@ VENDORMANVERSION = XVendorManVersionString
 #ifndef BuildLibraries
 #define BuildLibraries		(!BuildServersOnly || BuildClients)
 #endif
+#ifndef BuildLibrariesForXServers
+#define BuildLibrariesForXservers	BuildServer
+#endif
 #ifndef BuildFontServer
 #define BuildFontServer		YES
 #endif
@@ -232,6 +235,18 @@ VENDORMANVERSION = XVendorManVersionString
 #ifndef BuildXAServer
 #define BuildXAServer		(HasXAServer & HasCplusplus)
 #endif
+#ifndef BuildX11Lib
+#define BuildX11Lib		(BuildLibraries || (BuildLibrariesForXServers && XnestServer))
+#endif
+#ifndef BuildXextLib
+#define BuildXextLib		(BuildLibraries || (BuildLibrariesForXServers && XnestServer))
+#endif
+#ifndef BuildXauLib
+#define BuildXauLib		(BuildLibraries || BuildLibrariesForXServers)
+#endif
+#ifndef BuildXdmcpLib
+#define BuildXdmcpLib		(BuildLibraries || BuildLibrariesForXServers)
+#endif
 #ifndef BuildMITMiscExt
 #define BuildMITMiscExt		YES
 #endif
@@ -280,6 +295,16 @@ VENDORMANVERSION = XVendorManVersionString
 #ifndef BuildDPMS
 #define BuildDPMS		YES
 #endif
+#ifndef BuildFontLib
+#if !defined(XF86Server) || !XF86Server
+#define BuildFontLib		(BuildLibraries || BuildServer)
+#else
+#define BuildFontLib		(BuildLibraries || \
+				 (BuildServer && !DoLoadableServer) || \
+				 XnestServer || XVirtualFramebufferServer || \
+				 XprtServer || KDriveXServer)
+#endif
+#endif
 #ifndef BuildFontCache
 #define BuildFontCache		YES
 #endif
@@ -1094,7 +1119,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
 #define XTrueTypeCConvIncDir $(INCROOT)/X11/fonts/codeconv
 #endif
 #ifndef XTrueTypeInstallCConvHeaders
-#define XTrueTypeInstallCConvHeaders YES
+#define XTrueTypeInstallCConvHeaders BuildLibraries
 #endif
 #ifndef XTrueTypeCConvModuleDir
 #define XTrueTypeCConvModuleDir $(USRLIBDIR)/modules
@@ -1800,7 +1825,6 @@ LINTEXTENSIONLIB = $(LINTEXTENSION)
              XLIB = $(EXTENSIONLIB) $(XONLYLIB)
          LINTXLIB = $(LINTXONLYLIB)
 
-#if BuildScreenSaverLibrary
     XSSLIBSRC = $(LIBSRC)/Xss
 #if SharedLibXss
 #ifndef SharedXssRev
@@ -1810,9 +1834,7 @@ SharedLibReferences(XSS,Xss,$(XSSLIBSRC),SOXSSREV,SharedXssRev)
 #else
 ProjectUnsharedLibReferences(XSS,Xss,$(XSSLIBSRC),XBuildLibDir)
 #endif
-#endif
 
-#if BuildXF86MiscLibrary
     XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc
 #if SharedLibXxf86misc
 #ifndef SharedXxf86miscRev
@@ -1822,9 +1844,7 @@ SharedLibReferences(XXF86MISC,Xxf86misc,$(XXF86MISCLIBSRC),SOXXF86MISCREV,Shared
 #else
 ProjectUnsharedLibReferences(XXF86MISC,Xxf86misc,$(XXF86MISCLIBSRC),XBuildLibDir)
 #endif
-#endif
 
-#if BuildXF86VidModeLibrary
     XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm
 #if SharedLibXxf86vm
 #ifndef SharedXxf86vmRev
@@ -1834,9 +1854,7 @@ SharedLibReferences(XXF86VM,Xxf86vm,$(XXF86VMLIBSRC),SOXXF86VMREV,SharedXxf86vmR
 #else
 ProjectUnsharedLibReferences(XXF86VM,Xxf86vm,$(XXF86VMLIBSRC),XBuildLibDir)
 #endif
-#endif
 
-#if BuildXF86DGALibrary
     XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga
 #if SharedLibXxf86dga
 #ifndef SharedXxf86dgaRev
@@ -1846,10 +1864,8 @@ SharedLibReferences(XXF86DGA,Xxf86dga,$(XXF86DGALIBSRC),SOXXF86DGAREV,SharedXxf8
 #else
 ProjectUnsharedLibReferences(XXF86DGA,Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir)
 #endif
-#endif
 
 
-#if BuildXF86RushLibrary
     XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush
 #if SharedLibXxf86rush
 #ifndef SharedXxf86rushRev
@@ -1859,10 +1875,8 @@ SharedLibReferences(XXF86RUSH,Xxf86rush,$(XXF86RUSHLIBSRC),SOXXF86RUSHREV,Shared
 #else
 ProjectUnsharedLibReferences(XXF86RUSH,Xxf86rush,$(XXF86RUSHLIBSRC),XBuildLibDir)
 #endif
-#endif
 
 
-#if BuildXvLibrary
     XVLIBSRC = $(LIBSRC)/Xv
 #if SharedLibXv
 #ifndef SharedXvRev
@@ -1872,9 +1886,7 @@ SharedLibReferences(XV,Xv,$(XVLIBSRC),SOXVREV,SharedXvRev)
 #else
 ProjectUnsharedLibReferences(XV,Xv,$(XVLIBSRC),XBuildLibDir)
 #endif
-#endif
 
-#if BuildXineramaLibrary
     XINERAMALIBSRC = $(LIBSRC)/Xinerama
 #if SharedLibXinerama
 #ifndef SharedXineramaRev
@@ -1884,9 +1896,7 @@ SharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedXine
 #else
 ProjectUnsharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),XBuildLibDir)
 #endif
-#endif
 
-#if BuildDPSLibrary
     DPSLIBSRC = $(LIBSRC)/dps
 #if SharedLibDps
 #ifndef SharedDpsRev
@@ -1896,9 +1906,7 @@ SharedLibReferences(DPS,dps,$(DPSLIBSRC),SODPSREV,SharedDpsRev)
 #else
 ProjectUnsharedLibReferences(DPS,dps,$(DPSLIBSRC),XBuildLibDir)
 #endif
-#endif
 
-#if BuildDPSTkLibrary
     DPSTKLIBSRC = $(LIBSRC)/dpstk
 #if SharedLibDpsTk
 #ifndef SharedDpsTkRev
@@ -1908,9 +1916,7 @@ SharedLibReferences(DPSTK,dpstk,$(DPSTKLIBSRC),SODPSTKREV,SharedDpsTkRev)
 #else
 ProjectUnsharedLibReferences(DPSTK,dpstk,$(DPSTKLIBSRC),XBuildLibDir)
 #endif
-#endif
 
-#if BuildPSResLibrary
     PSRESLIBSRC = $(LIBSRC)/psres
 #if SharedLibPSRes
 #ifndef SharedPSResRev
@@ -1920,9 +1926,7 @@ SharedLibReferences(PSRES,psres,$(PSRESLIBSRC),SOPSRESREV,SharedPSResRev)
 #else
 ProjectUnsharedLibReferences(PSRES,psres,$(PSRESLIBSRC),XBuildLibDir)
 #endif
-#endif
 
-#if BuildGLULibrary
     GLULIBSRC = $(LIBSRC)/GLU
 #if SharedLibGlu
 #ifndef SharedGluRev
@@ -1932,9 +1936,7 @@ SharedLibReferences(GLU,GLU,$(GLULIBSRC),SOGLUREV,SharedGluRev)
 #else
 ProjectUnsharedLibReferences(GLU,GLU,$(GLULIBSRC),XBuildLibDir)
 #endif
-#endif
 
-#if BuildGLXLibrary
     GLXLIBSRC = $(LIBSRC)/GL
 #if SharedLibGlx
 #ifndef SharedGlxRev
@@ -1953,9 +1955,7 @@ SharedDSLibReferences(GLW,GLw,$(GLWIDGETSRC),SOGLWREV,SharedGLwRev)
 #else
 ProjectUnsharedLibReferences(GLW,GLw,$(GLWIDGETSRC),XBuildLibDir)
 #endif
-#endif /* BuildGLXLibrary */
 
-#if BuildRenderLibrary
     XRENDERLIBSRC = $(LIBSRC)/Xrender
 #if SharedLibXrender
 #ifndef SharedXrenderRev
@@ -1965,9 +1965,7 @@ SharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderR
 #else
 ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir)
 #endif
-#endif
 
-#if BuildRandRLibrary
     XRANDRRLIBSRC = $(LIBSRC)/Xrandr
 #if SharedLibXrandr
 #ifndef SharedXrandrRev
@@ -1977,9 +1975,7 @@ SharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),SOXRANDRREV,SharedXrandrRev)
 #else
 ProjectUnsharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),XBuildLibDir)
 #endif
-#endif
 
-#if BuildFontCacheLib
 # ifndef SharedLibXfontcache
 #  define SharedLibXfontcache	NO
 # endif
@@ -1992,6 +1988,7 @@ ProjectUnsharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),XBuildLibDir)
 # ifndef ProfileLibXfontcache
 #  define ProfileLibXfontcache	NO
 # endif
+
     XFONTCACHELIBSRC = $(LIBSRC)/Xfontcache
 #if SharedLibXfontcache
 #ifndef SharedXfontcacheRev
@@ -2001,7 +1998,6 @@ SharedLibReferences(XFONTCACHE,Xfontcache,$(XFONTCACHELIBSRC),SOXFONTCACHEREV,Sh
 #else
 ProjectUnsharedLibReferences(XFONTCACHE,Xfontcache,$(XFONTCACHELIBSRC),XBuildLibDir)
 #endif
-#endif
 
 #ifndef SharedLibXau
 #define SharedLibXau NO		/* don't need shared form */
@@ -2635,7 +2631,6 @@ ProjectUnsharedLibReferences(XKBFILE,xkbfile,$(XKBFILELIBSRC),XBuildLibDir)
 #endif
 #endif /* BuildXKBlib */
 
-#if BuildXKBuilib
     XKBUILIBSRC = $(LIBSRC)/xkbui
 ProjectUnsharedLibReferences(XKBUI,xkbui,$(XKBUILIBSRC),XBuildLibDir)
 #ifndef XkbuiLibs
@@ -2644,14 +2639,6 @@ ProjectUnsharedLibReferences(XKBUI,xkbui,$(XKBUILIBSRC),XBuildLibDir)
 #ifndef XkbuiDepLibs
 #define	XkbuiDepLibs $(DEPXKBFILELIB)
 #endif
-#else /* !BuildXKBuilib */
-#ifndef XkbuiLibs
-#define	XkbuiLibs
-#endif
-#ifndef XkbuiDepLibs
-#define	XkbuiDepLibs
-#endif
-#endif /* BuildXKBuilib */
 
 #ifndef XawClientDepLibs
 #define XawClientDepLibs $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXPMLIB) $(DEPXLIB)
diff --git a/xc/config/cf/host.def b/xc/config/cf/host.def
index 2fe540b1e..52f5ba9e1 100644
--- a/xc/config/cf/host.def
+++ b/xc/config/cf/host.def
@@ -10,29 +10,20 @@
 #  define LibraryCDebugFlags -O2
 #endif
 
-#define BuildServersOnly YES
-/*
- * Turn this on to build xf86cfg and xf86config.  It has the side-effect of
- * building lots of libraries in xc/lib.
- */
-#define BuildXFree86ConfigTools NO
-#define XF86CardDrivers vga tdfx i810 mga ati glint
-#define LinuxDistribution LinuxRedHat
+#define BuildXFree86ConfigTools YES
+
+#define XF86CardDrivers tdfx i810 mga ati glint vga
+
 #define GccWarningOptions -Wall -Wpointer-arith -Wstrict-prototypes \
                           -Wmissing-prototypes -Wmissing-declarations \
                           -Wnested-externs
 #define DefaultCCOptions -ansi GccWarningOptions -pipe -g
+
 #define NormalLibGlx NO
 
 #define BuildXF86DRI YES
-#define HasGlide3 YES
 
-#ifdef i386Architecture
-#define MesaUse3DNow YES
-#if HasKatmaiSupport
-#  define MesaUseKatmai YES
-#endif
-#endif
+#define HasGlide3 YES
 
 /* To do profiling of the dynamically loaded 'xyz_dri.so' object, turn
  * this on.
@@ -59,10 +50,19 @@
 /* Optionally turn this on to force the kernel modules to build */
 /* #define BuildXF86DRM YES */
 
+#define XF86AFB NO
+
 #define XnestServer NO
 #define XVirtualFramebufferServer NO
-#define XprtServer NO
 
-/* No need to build these extensions */
+/*
+ * Don't change anything below or the build will fail.
+ */
+#define BuildServersOnly YES
+#define BuildLibrariesForXServers NO
+#define BuildLibrariesForConfigTools NO
 #define BuildXIE NO
 #define BuildPexExt NO
+#define XprtServer NO
+#define SharedLibFont NO
+
diff --git a/xc/config/cf/xfree86.cf b/xc/config/cf/xfree86.cf
index fab97186b..3c0df3a23 100644
--- a/xc/config/cf/xfree86.cf
+++ b/xc/config/cf/xfree86.cf
@@ -120,7 +120,11 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $
 #endif
 #endif
 
-#if BuildXFree86ConfigTools
+#ifndef BuildLibrariesForConfigTools
+#define BuildLibrariesForConfigTools	YES
+#endif
+
+#if BuildXFree86ConfigTools && BuildLibrariesForConfigTools
 #define BuildLibraries		YES
 #define BuildXF86MiscLibrary	YES
 #define BuildXF86VidModeLibrary	YES
diff --git a/xc/include/Imakefile b/xc/include/Imakefile
index 89c6ed9a0..bb596333c 100644
--- a/xc/include/Imakefile
+++ b/xc/include/Imakefile
@@ -50,7 +50,9 @@ all::
 
 BuildIncludes($(HEADERS),X11,..)
 
+#if BuildLibraries
 InstallMultipleFlags($(HEADERS),$(INCDIR)/X11,$(INSTINCFLAGS))
+#endif
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
 
diff --git a/xc/include/bitmaps/Imakefile b/xc/include/bitmaps/Imakefile
index 013439efe..921b5bbf3 100644
--- a/xc/include/bitmaps/Imakefile
+++ b/xc/include/bitmaps/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile /main/32 1996/09/28 16:17:53 rws $
+XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:43 coskrey Exp $
 
 HEADERS = \
 	1x1 \
@@ -76,4 +76,7 @@ all::
 
 BuildIncludes($(HEADERS),X11/bitmaps,../..)
 
+#if BuildLibraries
 InstallMultipleFlags($(HEADERS),$(INCDIR)/X11/bitmaps,$(INSTINCFLAGS))
+#endif
+
diff --git a/xc/include/extensions/Imakefile b/xc/include/extensions/Imakefile
index 26fe07d03..104b07eb5 100644
--- a/xc/include/extensions/Imakefile
+++ b/xc/include/extensions/Imakefile
@@ -72,7 +72,10 @@ HEADERS = Xext.h multibuf.h shape.h sync.h XShm.h MITMisc.h \
 all::
 
 BuildIncludes($(HEADERS),X11/extensions,../..)
+
+#if BuildLibraries
 InstallMultipleFlags($(HEADERS),$(INCDIR)/X11/extensions,$(INSTINCFLAGS))
+#endif
 
 InstallDriverSDKNonExecFile(XI.h,$(DRIVERSDKINCLUDEDIR)/extensions)
 InstallDriverSDKNonExecFile(XIproto.h,$(DRIVERSDKINCLUDEDIR)/extensions)
diff --git a/xc/include/fonts/Imakefile b/xc/include/fonts/Imakefile
index ebe0d70b9..06cb129d5 100644
--- a/xc/include/fonts/Imakefile
+++ b/xc/include/fonts/Imakefile
@@ -1,12 +1,19 @@
-XCOMM $XConsortium: Imakefile /main/6 1996/09/28 16:32:27 rws $
-XCOMM $XFree86: xc/include/fonts/Imakefile,v 3.6 1999/08/28 09:00:23 dawes Exp $
+XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:44 coskrey Exp $
+
+
+
+
+XCOMM $XFree86: xc/include/fonts/Imakefile,v 3.7 2001/01/17 17:53:26 dawes Exp $
 
     HEADERS = FS.h FSproto.h fsmasks.h
 
 all::
     
 BuildIncludes($(HEADERS),X11/fonts,../..)
+
+#if BuildLibraries
 InstallMultipleFlags($(HEADERS),$(INCDIR)/X11/fonts,$(INSTINCFLAGS))
+#endif
 
 
 InstallDriverSDKNonExecFile(font.h,$(DRIVERSDKINCLUDEDIR))
diff --git a/xc/lib/GL/dri/XF86dri.c b/xc/lib/GL/dri/XF86dri.c
index a004aeb91..6bba02e3a 100644
--- a/xc/lib/GL/dri/XF86dri.c
+++ b/xc/lib/GL/dri/XF86dri.c
@@ -38,9 +38,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 /* THIS IS NOT AN X CONSORTIUM STANDARD */
 
 #define NEED_REPLIES
-#include "Xlibint.h"
+#include <X11/Xlibint.h>
 #include "xf86dristr.h"
-#include "Xext.h"
+#include <X11/extensions/Xext.h>
 #include "extutil.h"
 
 static XExtensionInfo _xf86dri_info_data;
diff --git a/xc/lib/GL/dri/dri_glx.c b/xc/lib/GL/dri/dri_glx.c
index 6bbfd619d..87ff3edbb 100644
--- a/xc/lib/GL/dri/dri_glx.c
+++ b/xc/lib/GL/dri/dri_glx.c
@@ -36,9 +36,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifdef GLX_DIRECT_RENDERING
 
 #include <unistd.h>
-#include <Xlibint.h>
-#include <Xext.h>
-#include <extutil.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/Xext.h>
+#include "extutil.h"
 #include "glxclient.h"
 #include "xf86dri.h"
 #include "sarea.h"
@@ -94,6 +94,7 @@ static void ErrorMessageF(const char *f, ...)
     }
 }
 
+#if 0
 static void PrintF(const char *f, ...)
 {
     va_list args;
@@ -105,6 +106,7 @@ static void PrintF(const char *f, ...)
 	va_end(args);
     }
 }
+#endif
 
 static void ErrorMessage(const char *msg)
 {
diff --git a/xc/lib/GL/dri/dri_tmm.c b/xc/lib/GL/dri/dri_tmm.c
index b0644d3a8..9e3c9fa9d 100644
--- a/xc/lib/GL/dri/dri_tmm.c
+++ b/xc/lib/GL/dri/dri_tmm.c
@@ -24,8 +24,7 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $PI: xc/lib/GL/dri/dri_tmm.c,v 1.5 1999/05/18 06:46:11 martin Exp $
- * $XFree86: xc/lib/GL/dri/dri_tmm.c,v 1.1 1999/06/14 07:23:32 dawes Exp $
+ * $XFree86: xc/lib/GL/dri/dri_tmm.c,v 1.2 2000/02/23 04:46:34 martin Exp $
  * 
  *
  * DESCRIPTION
@@ -40,7 +39,7 @@
  */
 
 #include <unistd.h>
-#include <Xlibint.h>
+#include <X11/Xlibint.h>
 #include "xf86drm.h"
 
 #include "dri_tmm.h"
diff --git a/xc/lib/GL/mesa/dri/dri_mesa.c b/xc/lib/GL/mesa/dri/dri_mesa.c
index 097872382..97aa909f9 100644
--- a/xc/lib/GL/mesa/dri/dri_mesa.c
+++ b/xc/lib/GL/mesa/dri/dri_mesa.c
@@ -56,16 +56,16 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifdef GLX_DIRECT_RENDERING
 
 #include <unistd.h>
-#include <Xlibint.h>
-#include <Xext.h>
-#include <extutil.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/Xext.h>
+#include "extutil.h"
 #include "glxclient.h"
 #include "xf86dri.h"
 #include "sarea.h"
 #include "dri_mesaint.h"
 #include "dri_xmesaapi.h"
-#include "../src/context.h"
-#include "../src/mmath.h"
+#include "context.h"
+#include "mmath.h"
 
 
 /* Context binding */
diff --git a/xc/lib/GL/mesa/src/drv/gamma/gamma_texture.c b/xc/lib/GL/mesa/src/drv/gamma/gamma_texture.c
index 3a0f1cafb..459dd3a19 100644
--- a/xc/lib/GL/mesa/src/drv/gamma/gamma_texture.c
+++ b/xc/lib/GL/mesa/src/drv/gamma/gamma_texture.c
@@ -34,7 +34,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #ifdef GLX_DIRECT_RENDERING
 
-#include <Xarch.h>
+#include <X11/Xarch.h>
 #include <X11/Xlibint.h>
 #include "gamma_init.h"
 #include <string.h>
diff --git a/xc/lib/Imakefile b/xc/lib/Imakefile
index 62abe10b9..5c8bfc751 100644
--- a/xc/lib/Imakefile
+++ b/xc/lib/Imakefile
@@ -146,11 +146,19 @@ FONTSUBDIR = font
 FONTENCSUBDIR = fontenc
 #endif
 
+#if BuildXauLib
 XAULIBDIR = Xau
+#endif
+
+#if BuildXdmcpLib
 XDMCPLIBDIR = Xdmcp
+#endif
+
+#if BuildX11Lib
 X11LIBDIR = X11
+#endif
 
-#if BuildLibraries || XnestServer || BuildGLXLibrary
+#if BuildXextLib
 XEXTLIBDIR = Xext
 #endif
 
diff --git a/xc/lib/X11/AddDIC.c b/xc/lib/X11/AddDIC.c
deleted file mode 100644
index 3d6d94b53..000000000
--- a/xc/lib/X11/AddDIC.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* $XConsortium: AddDIC.c,v 1.5 91/05/15 15:40:22 rws Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		XcmsAddDIC.c
- *
- *	DESCRIPTION
- *		Source for XcmsAddColorSpace
- *
- *
- */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-
-/*
- *      DEFINES
- */
-#define NextUnregDiCsID(lastid) \
-	    (XCMS_UNREG_ID(lastid) ? ++lastid : XCMS_FIRST_UNREG_DI_ID)
-#define MAX(x,y) ((x) < (y) ? (y) : (x))
-
-
-/*
- *      EXTERNS
- */
-extern XcmsPerDpyInfo *_XcmsFindDpyInfo();
-extern XPointer *_XcmsPushPointerArray();
-extern XcmsColorFormat _XcmsRegFormatOfPrefix();
-extern XcmsColorSpace **_XcmsDIColorSpaces;
-extern XcmsColorSpace *_XcmsDIColorSpacesInit[];
-
-/*
- *	NAME
- *		XcmsAddColorSpace - Add a Device-Independent Color Space
- *
- *	SYNOPSIS
- */
-Status
-XcmsAddColorSpace(pCS)
-    XcmsColorSpace *pCS;
-/*
- *	DESCRIPTION
- *		DI Color Spaces are managed on a global basis.
- *		This means that with exception of the provided DI color spaces:
- *			CIEXYZ, CIExyY, CIELab, CIEuvY, CIELuv, and TekHVC
- *		DI color spaces may have different XcmsColorFormat IDs between
- *		clients.  So, you must be careful when using XcmsColor
- *		structures between clients!  Use the routines XcmsFormatOfPrefix()
- *		and XcmsPrefixOfFormat() appropriately.
- *
- *	RETURNS
- *		XcmsSuccess if succeeded, otherwise XcmsFailure
- */
-{
-    XcmsColorSpace **papColorSpaces;
-    XcmsColorSpace *ptmpCS;
-    XcmsColorFormat lastID = 0;
-
-    if ((pCS->id = _XcmsRegFormatOfPrefix(pCS->prefix)) != 0) {
-	if (XCMS_DD_ID(pCS->id)) {
-	    /* This is a Device-Dependent Color Space */
-	    return(XcmsFailure);
-	}
-	/*
-	 * REGISTERED DI Color Space
-	 *    then see if the color space has already been added to the
-	 *    system:
-	 *	    a. If the same ID/prefix and same XcmsColorSpec is found,
-	 *		then its a duplicate, so return success.
-	 *	    b. If same ID/prefix but different XcmsColorSpec is
-	 *		found, then add the color space to the front of the
-	 *		list using the same ID.  This allows one to override
-	 *		an existing DI Color Space.
-	 *	    c. Otherwise none found so just add the color space.
-	 */
-	if ((papColorSpaces = _XcmsDIColorSpaces) != NULL) {
-	    while ((ptmpCS = *papColorSpaces++) != NULL) {
-		if (pCS->id == ptmpCS->id) {
-		    if (pCS == ptmpCS) {
-			/* a. duplicate*/
-			return(XcmsSuccess);
-		    }
-		    /* b. same ID/prefix but different XcmsColorSpace */
-		    break;
-		}
-	    }
-	}
-	/* c. None found */
-    } else {
-	/*
-	 * UNREGISTERED DI Color Space
-	 *    then see if the color space has already been added to the
-	 *    system:
-	 *	    a. If same prefix and XcmsColorSpec, then
-	 *		its a duplicate ... return success.
-	 *	    b. If same prefix but different XcmsColorSpec, then
-	 *		add the color space to the front of the list using
-	 *		the same ID.  This allows one to override an existing
-	 *		DI Color Space.
-	 *	    c. Otherwise none found so, add the color space using the
-	 *		next unregistered ID for the connection.
-	 */
-	if ((papColorSpaces = _XcmsDIColorSpaces) != NULL) {
-	    while ((ptmpCS = *papColorSpaces++) != NULL) {
-		lastID = MAX(lastID, ptmpCS->id);
-		if (strcmp(pCS->prefix, ptmpCS->prefix) == 0) {
-		    if (pCS == ptmpCS) {
-			/* a. duplicate */
-			return(XcmsSuccess);
-		    }
-		    /* b. same prefix but different XcmsColorSpec */
-		    pCS->id = ptmpCS->id;
-		    goto AddColorSpace;
-		}
-	    }
-	}
-	/* c. None found */
-	pCS->id = NextUnregDiCsID(lastID);
-    }
-
-
-AddColorSpace:
-    if ((papColorSpaces = (XcmsColorSpace **)
-	    _XcmsPushPointerArray((XPointer *)_XcmsDIColorSpaces,
-	    (XPointer)pCS,
-	    (XPointer *)_XcmsDIColorSpacesInit)) == NULL) {
-	return(XcmsFailure);
-    }
-    _XcmsDIColorSpaces = papColorSpaces;
-    return(XcmsSuccess);
-}
diff --git a/xc/lib/X11/AddSF.c b/xc/lib/X11/AddSF.c
deleted file mode 100644
index ee48389e6..000000000
--- a/xc/lib/X11/AddSF.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/* $XConsortium: AddSF.c,v 1.6 91/11/06 16:29:27 rws Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		XcmsAddSF.c
- *
- *	DESCRIPTION
- *		Source for XcmsAddFunctionSet
- *
- *
- */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/*
- *      DEFINES
- */
-#define NextUnregDdCsID(lastid) \
-	    (XCMS_UNREG_ID(lastid) ? ++lastid : XCMS_FIRST_UNREG_DD_ID)
-#define MIN(x,y) ((x) > (y) ? (y) : (x))
-
-
-/*
- *      EXTERNS
- */
-extern XPointer *_XcmsPushPointerArray();
-extern XcmsColorFormat _XcmsRegFormatOfPrefix();
-extern XcmsFunctionSet **_XcmsSCCFuncSets;
-extern XcmsFunctionSet **_XcmsSCCFuncSetsInit;
-extern XcmsColorSpace **_XcmsDDColorSpaces;
-extern XcmsColorSpace **_XcmsDDColorSpacesInit;
-
-
-
-/*
- *	NAME
- *		XcmsAddFunctionSet - Add an Screen Color Characterization
- *					Function Set
- *
- *	SYNOPSIS
- */
-Status
-XcmsAddFunctionSet(pNewFS)
-    XcmsFunctionSet *pNewFS;
-/*
- *	DESCRIPTION
- *		Additional Screen Color Characterization Function Sets are
- *		managed on a global basis.  This means that with exception
- *		of the provided DD color spaces:
- *			    RGB and RGBi
- *		DD color spaces may have different XcmsColorFormat IDs between
- *		clients.  So, you must be careful when using XcmsColorFormat
- *		across clients!  Use the routines XcmsFormatOfPrefix()
- *		and XcmsPrefixOfFormat() appropriately.
- *
- *	RETURNS
- *		XcmsSuccess if succeeded, otherwise XcmsFailure
- *
- *	CAVEATS
- *		Additional Screen Color Characterization Function Sets
- *		should be added prior to any use of the routine
- *		XcmsCreateCCC().  If not, XcmsCCC structures created
- *		prior to the call of this routines will not have had
- *		a chance to initialize using the added Screen Color
- *		Characterization Function Set.
- */
-{
-    XcmsFunctionSet **papSCCFuncSets = _XcmsSCCFuncSets;
-    XcmsColorSpace **papNewCSs;
-    XcmsColorSpace *pNewCS, **paptmpCS;
-    XcmsColorFormat lastID = 0;
-
-
-    if (papSCCFuncSets != NULL) {
-	if ((papNewCSs = pNewFS->DDColorSpaces) == NULL) {
-	    /*
-	     * Error, new Screen Color Characterization Function Set
-	     *	missing color spaces
-	     */
-	    return(XcmsFailure);
-	}
-	while ((pNewCS = *papNewCSs++) != NULL) {
-	    if ((pNewCS->id = _XcmsRegFormatOfPrefix(pNewCS->prefix)) != 0) {
-		if (XCMS_DI_ID(pNewCS->id)) {
-		    /* This is a Device-Independent Color Space */
-		    return(XcmsFailure);
-		}
-		/*
-		 * REGISTERED DD Color Space
-		 *    therefore use the registered ID.
-		 */
-	    } else {
-		/*
-		 * UNREGISTERED DD Color Space
-		 *    then see if the color space is already in
-		 *    _XcmsDDColorSpaces.
-		 *	    a. If same prefix, then use the same ID.
-		 *	    b. Otherwise, use a new ID.
-		 */
-		for (paptmpCS = _XcmsDDColorSpaces; *paptmpCS != NULL;
-			paptmpCS++){
-		    lastID = MIN(lastID, (*paptmpCS)->id);
-		    if (strcmp(pNewCS->prefix, (*paptmpCS)->prefix) == 0) {
-			pNewCS->id = (*paptmpCS)->id;
-			break;
-		    }
-		}
-		if (pNewCS->id == 0) {
-		    /* still haven't found one */
-		    pNewCS->id = NextUnregDdCsID(lastID);
-		    if ((paptmpCS = (XcmsColorSpace **)_XcmsPushPointerArray(
-		   	    (XPointer *) _XcmsDDColorSpaces,
-			    (XPointer) pNewCS,
-			    (XPointer *) _XcmsDDColorSpacesInit)) == NULL) {
-			return(XcmsFailure);
-		    }
-		    _XcmsDDColorSpaces = paptmpCS;
-		}
-	    }
-	}
-    }
-    if ((papSCCFuncSets = (XcmsFunctionSet **)
-	    _XcmsPushPointerArray((XPointer *) _XcmsSCCFuncSets,
-	    (XPointer) pNewFS,
-	    (XPointer *)_XcmsSCCFuncSetsInit)) == NULL) {
-	return(XcmsFailure);
-    }
-    _XcmsSCCFuncSets = papSCCFuncSets;
-
-    return(XcmsSuccess);
-}
diff --git a/xc/lib/X11/AllCells.c b/xc/lib/X11/AllCells.c
deleted file mode 100644
index a7800acc5..000000000
--- a/xc/lib/X11/AllCells.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* $TOG: AllCells.c /main/8 1998/02/06 17:02:37 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_REPLIES
-
-#include "Xlibint.h"
-
-Status XAllocColorCells(dpy, cmap, contig, masks, nplanes, pixels, ncolors)
-register Display *dpy;
-Colormap cmap;
-Bool contig;
-unsigned int ncolors; /* CARD16 */
-unsigned int nplanes; /* CARD16 */
-unsigned long *masks; /* LISTofCARD32 */ /* RETURN */
-unsigned long *pixels; /* LISTofCARD32 */ /* RETURN */
-{
-
-    Status status;
-    xAllocColorCellsReply rep;
-    register xAllocColorCellsReq *req;
-    LockDisplay(dpy);
-    GetReq(AllocColorCells, req);
-
-    req->cmap = cmap;
-    req->colors = ncolors;
-    req->planes = nplanes;
-    req->contiguous = contig;
-
-    status = _XReply(dpy, (xReply *)&rep, 0, xFalse);
-
-    if (status) {
-	_XRead32 (dpy, (long *) pixels, 4L * (long) (rep.nPixels));
-	_XRead32 (dpy, (long *) masks, 4L * (long) (rep.nMasks));
-    }
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return(status);
-}
diff --git a/xc/lib/X11/AllPlanes.c b/xc/lib/X11/AllPlanes.c
deleted file mode 100644
index 218c11b48..000000000
--- a/xc/lib/X11/AllPlanes.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* $TOG: AllPlanes.c /main/7 1998/02/06 17:03:08 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-Status XAllocColorPlanes(dpy, cmap, contig, pixels, ncolors, nreds, ngreens, 
-                         nblues, rmask, gmask, bmask)
-register Display *dpy;
-Colormap cmap;
-Bool contig;
-unsigned long *pixels; /* LISTofCARD32 */ /* RETURN */
-int ncolors;
-int nreds, ngreens, nblues;
-unsigned long *rmask, *gmask, *bmask; /* CARD32 */ /* RETURN */
-{
-    xAllocColorPlanesReply rep;
-    Status status;
-    register xAllocColorPlanesReq *req;
-
-    LockDisplay(dpy);
-    GetReq(AllocColorPlanes,req);
-
-    req->cmap = cmap;
-    req->colors = ncolors;
-    req->red = nreds;
-    req->green = ngreens;
-    req->blue = nblues;
-    req->contiguous = contig;
-
-    status = _XReply(dpy, (xReply *)&rep, 0, xFalse);
-
-
-    if (status) {
-	*rmask = rep.redMask;
-	*gmask = rep.greenMask;
-	*bmask = rep.blueMask;
-
-	/* sizeof(CARD32) = 4 */
-	_XRead32 (dpy, (char *) pixels, (long)(ncolors * 4));
-    }
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return(status);
-}    
diff --git a/xc/lib/X11/AllowEv.c b/xc/lib/X11/AllowEv.c
deleted file mode 100644
index e41223ecf..000000000
--- a/xc/lib/X11/AllowEv.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $TOG: AllowEv.c /main/6 1998/02/06 17:02:55 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/AllowEv.c,v 1.2 1999/05/09 10:48:55 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XAllowEvents(dpy, mode, time)
-    register Display *dpy;
-    int mode;
-    Time time;
-
-{
-    register xAllowEventsReq *req;
-
-    LockDisplay(dpy);
-    GetReq(AllowEvents,req);
-    req->mode = mode;
-    req->time = time;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
-
-
diff --git a/xc/lib/X11/AutoRep.c b/xc/lib/X11/AutoRep.c
deleted file mode 100644
index 5b522e1ff..000000000
--- a/xc/lib/X11/AutoRep.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* $TOG: AutoRep.c /main/6 1998/02/06 17:03:21 kaleb $ */
-/*
-
-Copyright 1985, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/AutoRep.c,v 1.2 1999/05/09 10:48:56 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XAutoRepeatOn (dpy)
-register Display *dpy;
-{
-	XKeyboardControl values;
-	values.auto_repeat_mode = AutoRepeatModeOn;
-	XChangeKeyboardControl (dpy, KBAutoRepeatMode, &values);
-	return 1;
-}
-
-int
-XAutoRepeatOff (dpy)
-register Display *dpy;
-{
-	XKeyboardControl values;
-	values.auto_repeat_mode = AutoRepeatModeOff;
-	XChangeKeyboardControl (dpy, KBAutoRepeatMode, &values);
-	return 1;
-}
-
-
diff --git a/xc/lib/X11/Backgnd.c b/xc/lib/X11/Backgnd.c
deleted file mode 100644
index 02d47d606..000000000
--- a/xc/lib/X11/Backgnd.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* $TOG: Backgnd.c /main/7 1998/02/06 17:03:34 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/Backgnd.c,v 1.2 1999/05/09 10:48:56 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XSetWindowBackground(dpy, w, pixel)
-    register Display *dpy;
-    Window w;
-    unsigned long pixel;
-{
-    register xChangeWindowAttributesReq *req;
-
-    LockDisplay(dpy);
-    GetReqExtra (ChangeWindowAttributes, 4, req);
-    req->window = w;
-    req->valueMask = CWBackPixel;
-    OneDataCard32 (dpy, NEXTPTR(req,xChangeWindowAttributesReq), pixel);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/BdrWidth.c b/xc/lib/X11/BdrWidth.c
deleted file mode 100644
index 7ad0f46e4..000000000
--- a/xc/lib/X11/BdrWidth.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* $TOG: BdrWidth.c /main/7 1998/02/06 17:03:47 kaleb $ */
-
-/*
-
-Copyright 1994, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/BdrWidth.c,v 1.2 1999/05/09 10:48:57 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XSetWindowBorderWidth(dpy, w, width)
-Display *dpy;
-Window w;
-unsigned int width;
-{
-    unsigned long lwidth = width;	/* must be CARD32 */
-
-    register xConfigureWindowReq *req;
-    LockDisplay(dpy);
-    GetReqExtra(ConfigureWindow, 4, req);
-    req->window = w;
-    req->mask = CWBorderWidth;
-    OneDataCard32 (dpy, NEXTPTR(req,xConfigureWindowReq), lwidth);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/Bell.c b/xc/lib/X11/Bell.c
deleted file mode 100644
index bcaae6ee1..000000000
--- a/xc/lib/X11/Bell.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $TOG: Bell.c /main/6 1998/02/06 17:04:02 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/Bell.c,v 1.2 1999/05/09 10:48:57 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XBell(dpy, percent)
-    register Display *dpy;
-    int percent;
-{
-    register xBellReq *req;
-
-    LockDisplay(dpy);
-    GetReq(Bell,req);
-    req->percent = percent;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/Border.c b/xc/lib/X11/Border.c
deleted file mode 100644
index 98456f472..000000000
--- a/xc/lib/X11/Border.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* $TOG: Border.c /main/7 1998/02/06 17:04:17 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/Border.c,v 1.2 1999/05/09 10:48:57 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XSetWindowBorder(dpy, w, pixel)
-    register Display *dpy;
-    Window w;
-    unsigned long pixel;
-{
-    register xChangeWindowAttributesReq *req;
-
-    LockDisplay(dpy);
-    GetReqExtra (ChangeWindowAttributes, 4, req);
-    req->window = w;
-    req->valueMask = CWBorderPixel;
-    OneDataCard32 (dpy, NEXTPTR(req,xChangeWindowAttributesReq), pixel);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/CCC.c b/xc/lib/X11/CCC.c
deleted file mode 100644
index 257a1673d..000000000
--- a/xc/lib/X11/CCC.c
+++ /dev/null
@@ -1,290 +0,0 @@
-/* $TOG: CCC.c /main/15 1998/02/06 17:04:41 kaleb $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		XcmsCCC.c - Color Conversion Context Routines
- *
- *	DESCRIPTION
- *		Routines to create, access, and free Color Conversion
- *		Context structures.
- *
- *
- */
-/* $XFree86: xc/lib/X11/CCC.c,v 1.2 1999/05/09 10:48:58 dawes Exp $ */
-
-/*
-
-Copyright 1994, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-#include <stdio.h>
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-extern XcmsIntensityMap *_XcmsGetIntensityMap();
-
-/* cmsInt.c */
-extern int _XcmsInitDefaultCCCs();
-extern int _XcmsInitScrnInfo();
-
-
-
-
-
-/************************************************************************
- *									*
- *			PUBLIC INTERFACES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsCreateCCC
- *
- *	SYNOPSIS
- */
-
-XcmsCCC 
-XcmsCreateCCC(dpy, screenNumber, visual, clientWhitePt, gamutCompProc,
-	gamutCompClientData, whitePtAdjProc, whitePtAdjClientData)
-    Display *dpy;
-    int	screenNumber;
-    Visual *visual;
-    XcmsColor *clientWhitePt;
-    XcmsCompressionProc gamutCompProc;
-    XPointer gamutCompClientData;
-    XcmsWhiteAdjustProc whitePtAdjProc;
-    XPointer whitePtAdjClientData;
-/*
- *	DESCRIPTION
- *		Given a Display, Screen, Visual, etc., this routine creates
- *		an appropriate Color Conversion Context.
- *
- *	RETURNS
- *		Returns NULL if failed; otherwise address of the newly
- *		created XcmsCCC.
- *
- */
-{
-    XcmsCCC pDefaultCCC = XcmsDefaultCCC(dpy, screenNumber);
-    XcmsCCC newccc;
-    XcmsIntensityMap *pIMap;
-    XcmsPerScrnInfo *pNewScrnInfo;
-
-    if (pDefaultCCC == NULL ||
-	    !(newccc = (XcmsCCC) Xcalloc(1, (unsigned) sizeof(XcmsCCCRec)))) {
-	return(NULL);
-    } 
-
-    /*
-     * Should inherit the following as result of a memmove():
-     *		dpy
-     *		screenNumber
-     *		pPerScrnInfo
-     */
-    memcpy((char *)newccc, (char *)pDefaultCCC, sizeof(XcmsCCCRec));
-    if (clientWhitePt) {
-	memcpy((char *)&newccc->clientWhitePt, (char *)clientWhitePt,
-		sizeof(XcmsColor));
-    }
-    if (gamutCompProc) {
-	newccc->gamutCompProc = gamutCompProc;
-    }
-    if (gamutCompClientData) {
-	newccc->gamutCompClientData = gamutCompClientData;
-    }
-    if (whitePtAdjProc) {
-	newccc->whitePtAdjProc = whitePtAdjProc;
-    }
-    if (whitePtAdjClientData) {
-	newccc->whitePtAdjClientData = whitePtAdjClientData;
-    }
-
-    /*
-     * Now check our list of per-Visual Intensity tables.
-     * If one exists replace the pPerScrnInfo.
-     */
-    if ((pIMap = _XcmsGetIntensityMap(dpy, visual)) != NULL) {
-	if (!(pNewScrnInfo = (XcmsPerScrnInfo *)
-		Xcalloc(1, (unsigned) sizeof(XcmsPerScrnInfo)))) {
-	    Xfree(newccc);
-	    return(NULL);
-	}
-	memcpy((char *)pNewScrnInfo, (char *)newccc->pPerScrnInfo,
-		sizeof(XcmsPerScrnInfo));
-	pNewScrnInfo->screenData = pIMap->screenData;
-	newccc->pPerScrnInfo = pNewScrnInfo;
-    }
-
-    /*
-     * Set visual component
-     */
-    newccc->visual = visual;
-
-    return(newccc);
-}
-
-
-/*
- *	NAME
- *		XcmsDefaultCCC
- *
- *	SYNOPSIS
- */
-XcmsCCC 
-XcmsDefaultCCC(dpy, screenNumber)
-    Display *dpy;
-    int screenNumber;
-/*
- *	DESCRIPTION
- *		Given a Display and Screen, this routine creates
- *		returns the Screen's default Color Conversion Context.
- *		Note that a Screen's default CCC is built with the
- *		screen default visual.
- *
- *	RETURNS
- *		Returns NULL if failed; otherwise address of the
- *		XcmsCCC for the Screen's default CCC.
- *
- */
-{
-    XcmsCCC ccc;
-
-
-    if ((screenNumber < 0) || (screenNumber >= ScreenCount(dpy))) {
-	return((XcmsCCC)NULL);
-    }
-
-    /*
-     * Check if the XcmsCCC's for each screen has been created
-     */
-    if ((XcmsCCC)dpy->cms.defaultCCCs == NULL) {
-	if (!_XcmsInitDefaultCCCs(dpy)) {
-	    return((XcmsCCC)NULL);
-	}
-    }
-
-    ccc = (XcmsCCC)dpy->cms.defaultCCCs + screenNumber;
-
-    if (!ccc->pPerScrnInfo) {
-	/*
-	 * Need to create the XcmsPerScrnInfo structure.  The
-	 * _XcmsInitScrnInfo routine will create the XcmsPerScrnInfo
-	 * structure as well as initialize its functionSet and pScreenData
-	 * components.
-	 */
-	if (!_XcmsInitScrnInfo(dpy, screenNumber)) {
-	    return((XcmsCCC)NULL);
-	}
-	return(ccc);
-    } else {
-	/*
-	 * If ccc->pPerScrnInfo->state == XcmsInitSuccess,
-	 *    then the pPerScrnInfo component has already been initialized
-	 *    therefore, just return ccc.
-	 * If ccc->pPerScrnInfo->state == XcmsInitFailure,
-	 *    then this means that we already attempted to initialize
-	 *    the pPerScrnInfo component but failed therefore stuffing
-	 *    the pPerScrnInfo component with defaults.  Just return ccc.
-	 * If ccc->pPerScrnInfo->state == XcmsInitNone,
-	 *    then attempt to initialize the pPerScrnInfo component.
-	 */
-	switch (ccc->pPerScrnInfo->state) {
-	   case XcmsInitFailure :
-	    /* fall through */
-	   case XcmsInitSuccess :
-	    return(ccc);
-	   case XcmsInitNone :
-	    /* XcmsPerScreenInfo has not been initialized */
-	    if (!_XcmsInitScrnInfo(dpy, screenNumber)) {
-		return((XcmsCCC)NULL);
-	    }
-	    return(ccc);
-	   default :
-	    return((XcmsCCC)NULL);
-	}
-    }
-}
-
-
-/*
- *	NAME
- *		XcmsFreeCCC
- *
- *	SYNOPSIS
- */
-void
-XcmsFreeCCC(ccc)
-    XcmsCCC ccc;
-/*
- *	DESCRIPTION
- *		Frees memory associated with a Color Conversion Context
- *		that was created with XcmsCreateCCC().
- *
- *	RETURNS
- *		void
- *
- */
-{
-    if (ccc->dpy->cms.defaultCCCs &&
-	ccc == ((XcmsCCC)ccc->dpy->cms.defaultCCCs) + ccc->screenNumber) {
-	/* do not allow clients to free DefaultCCC's */
-	return;
-    }
-
-    /*
-     * Note that XcmsPerScrnInfo sub-structures are freed here only if
-     * they are for visuals that have per-Visual intensity tables.
-     * Otherwise the XcmsPerScrnInfo structure is being shared!
-     * For the latter, there is only one allocated per Screen and it just
-     * so happens * that we place its initial reference is placed in the
-     * 	default CCC.  The routine _XcmsFreeDefaultCCCs frees them.
-     */
-    if (_XcmsGetIntensityMap(ccc->dpy, ccc->visual) != NULL) {
-	Xfree(ccc->pPerScrnInfo);
-    }
-
-    Xfree(ccc);
-}
diff --git a/xc/lib/X11/ChAccCon.c b/xc/lib/X11/ChAccCon.c
deleted file mode 100644
index 570897d9a..000000000
--- a/xc/lib/X11/ChAccCon.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* $TOG: ChAccCon.c /main/6 1998/02/06 17:04:54 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/ChAccCon.c,v 1.2 1999/05/09 10:48:58 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XEnableAccessControl(dpy) 
-    register Display *dpy;
-
-{
-    return XSetAccessControl(dpy, EnableAccess);
-}
-
-int
-XDisableAccessControl(dpy) 
-    register Display *dpy;
-
-{
-    return XSetAccessControl(dpy, DisableAccess);
-}
-
-int
-XSetAccessControl(dpy, mode)
-    register Display *dpy; 
-    int mode;
-
-{
-    register xSetAccessControlReq *req;
-
-    LockDisplay(dpy);
-    GetReq(SetAccessControl, req);
-    req->mode = mode;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/ChActPGb.c b/xc/lib/X11/ChActPGb.c
deleted file mode 100644
index 271d5e8fd..000000000
--- a/xc/lib/X11/ChActPGb.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* $TOG: ChActPGb.c /main/6 1998/02/06 17:05:07 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/ChActPGb.c,v 1.2 1999/05/09 10:48:59 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XChangeActivePointerGrab(dpy, event_mask, curs, time)
-register Display *dpy;
-unsigned int event_mask; /* CARD16 */
-Cursor curs;
-Time time;
-{
-    register xChangeActivePointerGrabReq *req;
-
-    LockDisplay(dpy);
-    GetReq(ChangeActivePointerGrab, req);
-    req->eventMask = event_mask;
-    req->cursor = curs;
-    req->time = time;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/ChClMode.c b/xc/lib/X11/ChClMode.c
deleted file mode 100644
index 2ac66355a..000000000
--- a/xc/lib/X11/ChClMode.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* $TOG: ChClMode.c /main/6 1998/02/06 17:05:21 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/ChClMode.c,v 1.2 1999/05/09 10:48:59 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XSetCloseDownMode(dpy, mode)
-    register Display *dpy; 
-    int mode;
-
-{
-    register xSetCloseDownModeReq *req;
-
-    LockDisplay(dpy);
-    GetReq(SetCloseDownMode, req);
-    req->mode = mode;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/ChCmap.c b/xc/lib/X11/ChCmap.c
deleted file mode 100644
index 3eae3b1c9..000000000
--- a/xc/lib/X11/ChCmap.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* $TOG: ChCmap.c /main/7 1998/02/06 17:05:35 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/ChCmap.c,v 1.2 1999/05/09 10:48:59 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XSetWindowColormap(dpy, w, colormap)
-    register Display *dpy;
-    Window w;
-    Colormap colormap;
-{
-    register xChangeWindowAttributesReq *req;
-
-    LockDisplay(dpy);
-    GetReqExtra (ChangeWindowAttributes, 4, req);
-    req->window = w;
-    req->valueMask = CWColormap;
-    OneDataCard32 (dpy, NEXTPTR(req,xChangeWindowAttributesReq), colormap);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/ChGC.c b/xc/lib/X11/ChGC.c
deleted file mode 100644
index e38845414..000000000
--- a/xc/lib/X11/ChGC.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* $TOG: ChGC.c /main/8 1998/02/06 17:05:48 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/ChGC.c,v 1.2 1999/05/09 10:49:00 dawes Exp $ */
-
-#include "Xlibint.h"
-
-/* in ChGC.c */
-extern int _XUpdateGCCache(register GC gc, register unsigned long mask,
-				register XGCValues *attr);
-
-int
-XChangeGC (dpy, gc, valuemask, values)
-    register Display *dpy;
-    GC gc;
-    unsigned long valuemask;
-    XGCValues *values;
-{
-    LockDisplay(dpy);
-
-    valuemask &= (1L << (GCLastBit + 1)) - 1;
-    if (valuemask) _XUpdateGCCache (gc, valuemask, values);
-
-    /* if any Resource ID changed, must flush */
-    if (gc->dirty & (GCFont | GCTile | GCStipple))
-	_XFlushGCCache(dpy, gc);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/ChKeyCon.c b/xc/lib/X11/ChKeyCon.c
deleted file mode 100644
index 1f3c1b719..000000000
--- a/xc/lib/X11/ChKeyCon.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* $TOG: ChKeyCon.c /main/10 1998/02/06 17:06:01 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/ChKeyCon.c,v 1.2 1999/05/09 10:49:00 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XChangeKeyboardControl(dpy, mask, value_list)
-    register Display *dpy;
-    unsigned long mask;
-    XKeyboardControl *value_list;
-{
-    unsigned long values[8];
-    register unsigned long *value = values;
-    long nvalues;
-    register xChangeKeyboardControlReq *req;
-
-    LockDisplay(dpy);
-    GetReq(ChangeKeyboardControl, req);
-    req->mask = mask;
-
-    if (mask & KBKeyClickPercent)
-	*value++ = value_list->key_click_percent;
-	
-    if (mask & KBBellPercent)
-    	*value++ = value_list->bell_percent;
-
-    if (mask & KBBellPitch)
-    	*value++ = value_list->bell_pitch;
-
-    if (mask & KBBellDuration)
-    	*value++ = value_list->bell_duration;
-
-    if (mask & KBLed)
-    	*value++ = value_list->led;
-
-    if (mask & KBLedMode)
-	*value++ = value_list->led_mode;
-
-    if (mask & KBKey)
-        *value++ = value_list->key;
-
-    if (mask & KBAutoRepeatMode)
-        *value++ = value_list->auto_repeat_mode;
-
-
-    req->length += (nvalues = value - values);
-
-    /* note: Data is a macro that uses its arguments multiple
-       times, so "nvalues" is changed in a separate assignment
-       statement */
-
-    nvalues <<= 2;
-    Data32 (dpy, (long *) values, nvalues);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-    }
diff --git a/xc/lib/X11/ChPntCon.c b/xc/lib/X11/ChPntCon.c
deleted file mode 100644
index 9dfde201f..000000000
--- a/xc/lib/X11/ChPntCon.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* $TOG: ChPntCon.c /main/7 1998/02/06 17:07:27 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/ChPntCon.c,v 1.2 1999/05/09 10:49:01 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XChangePointerControl(dpy, do_acc, do_thresh, acc_numerator,
-		      acc_denominator, threshold)
-     register Display *dpy;
-     Bool do_acc, do_thresh;
-     int acc_numerator, acc_denominator, threshold;
-
-{
-    register xChangePointerControlReq *req;
-
-    LockDisplay(dpy);
-    GetReq(ChangePointerControl, req);
-    req->doAccel = do_acc;
-    req->doThresh = do_thresh;
-    req->accelNum = acc_numerator;
-    req->accelDenum = acc_denominator;
-    req->threshold = threshold;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/ChProp.c b/xc/lib/X11/ChProp.c
deleted file mode 100644
index 7cca688bd..000000000
--- a/xc/lib/X11/ChProp.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/* $TOG: ChProp.c /main/17 1998/02/06 17:07:40 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/ChProp.c,v 1.2 1999/05/09 10:49:01 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-#if NeedFunctionPrototypes
-XChangeProperty (
-    register Display *dpy,
-    Window w,
-    Atom property,
-    Atom type,
-    int format,  /* 8, 16, or 32 */
-    int mode,  /* PropModeReplace, PropModePrepend, PropModeAppend */
-    _Xconst unsigned char *data,
-    int nelements)
-#else
-XChangeProperty (dpy, w, property, type, format, mode, data, nelements)
-    register Display *dpy;
-    Window w;
-    Atom property, type;
-    int format;  /* 8, 16, or 32 */
-    int mode;  /* PropModeReplace, PropModePrepend, PropModeAppend */
-    unsigned char *data;
-    int nelements;
-#endif
-    {
-    register xChangePropertyReq *req;
-    register long len;
-
-    LockDisplay(dpy);
-    GetReq (ChangeProperty, req);
-    req->window = w;
-    req->property = property;
-    req->type = type;
-    req->mode = mode;
-    if (nelements < 0) {
-	req->nUnits = 0;
-	req->format = 0; /* ask for garbage, get garbage */
-    } else {
-	req->nUnits = nelements;
-	req->format = format;
-    }
-
-    switch (req->format) {
-      case 8:
-	len = ((long)nelements + 3)>>2;
-	if (dpy->bigreq_size || req->length + len <= (unsigned) 65535) {
-	    SetReqLen(req, len, len);
-	    Data (dpy, (char *)data, nelements);
-	} /* else force BadLength */
-        break;
- 
-      case 16:
-	len = ((long)nelements + 1)>>1;
-	if (dpy->bigreq_size || req->length + len <= (unsigned) 65535) {
-	    SetReqLen(req, len, len);
-	    len = (long)nelements << 1;
-	    Data16 (dpy, (short *) data, len);
-	} /* else force BadLength */
-	break;
-
-      case 32:
-	len = nelements;
-	if (dpy->bigreq_size || req->length + len <= (unsigned) 65535) {
-	    SetReqLen(req, len, len);
-	    len = (long)nelements << 2;
-	    Data32 (dpy, (long *) data, len);
-	} /* else force BadLength */
-	break;
-
-      default:
-        /* BadValue will be generated */ ;
-      }
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-    }
-
-
-
-
-
diff --git a/xc/lib/X11/ChSaveSet.c b/xc/lib/X11/ChSaveSet.c
deleted file mode 100644
index 4d526d498..000000000
--- a/xc/lib/X11/ChSaveSet.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* $TOG: ChSaveSet.c /main/6 1998/02/06 17:07:53 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/ChSaveSet.c,v 1.2 1999/05/09 10:49:01 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XChangeSaveSet(dpy, win, mode)
-register Display *dpy;
-Window win;
-int mode;
-{
-    register xChangeSaveSetReq *req;
-
-    LockDisplay(dpy);
-    GetReq(ChangeSaveSet, req);
-    req->window = win;
-    req->mode = mode;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
-int
-XAddToSaveSet(dpy, win)
-    register Display *dpy;
-    Window win;
-{
-    return XChangeSaveSet(dpy,win,SetModeInsert);
-}
-
-int
-XRemoveFromSaveSet (dpy, win)
-    register Display *dpy;
-    Window win;
-{
-    return XChangeSaveSet(dpy,win,SetModeDelete);
-}
diff --git a/xc/lib/X11/ChWAttrs.c b/xc/lib/X11/ChWAttrs.c
deleted file mode 100644
index 666817502..000000000
--- a/xc/lib/X11/ChWAttrs.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* $TOG: ChWAttrs.c /main/7 1998/02/06 17:08:08 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/ChWAttrs.c,v 1.2 1999/05/09 10:49:02 dawes Exp $ */
-
-#include "Xlibint.h"
-
-extern void _XProcessWindowAttributes();
-
-#define AllMaskBits (CWBackPixmap|CWBackPixel|CWBorderPixmap|\
-		     CWBorderPixel|CWBitGravity|CWWinGravity|\
-		     CWBackingStore|CWBackingPlanes|CWBackingPixel|\
-		     CWOverrideRedirect|CWSaveUnder|CWEventMask|\
-		     CWDontPropagate|CWColormap|CWCursor)
-
-int
-XChangeWindowAttributes (dpy, w, valuemask, attributes)
-    register Display *dpy;
-    Window w;
-    unsigned long valuemask;
-    XSetWindowAttributes *attributes;
-{
-    register xChangeWindowAttributesReq *req;
-
-    LockDisplay(dpy);
-    GetReq(ChangeWindowAttributes,req);
-    req->window = w;
-    valuemask &= AllMaskBits;
-    if ((req->valueMask = valuemask))
-        _XProcessWindowAttributes (dpy, req, valuemask, attributes);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/ChWindow.c b/xc/lib/X11/ChWindow.c
deleted file mode 100644
index a6c9704e0..000000000
--- a/xc/lib/X11/ChWindow.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* $TOG: ChWindow.c /main/10 1998/02/06 17:08:21 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/ChWindow.c,v 1.4 1999/05/09 10:49:02 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XResizeWindow(dpy, w, width, height)
-register Display *dpy;
-Window w;
-unsigned int width, height;
-{
-    register xConfigureWindowReq *req;
-
-    LockDisplay(dpy);
-    GetReqExtra(ConfigureWindow, 8, req); /* 2 4-byte quantities */
-
-    req->window = w;
-    req->mask = CWWidth | CWHeight;
-#ifdef MUSTCOPY
-    {
-	unsigned long lwidth = width, lheight = height;
-    dpy->bufptr -= 8;
-    Data32 (dpy, (long *) &lwidth, 4);	/* order dictated by values of */
-    Data32 (dpy, (long *) &lheight, 4);	/* CWWidth and CWHeight */
-    }
-#else
-    {
-	CARD32 *valuePtr = (CARD32 *) NEXTPTR(req,xConfigureWindowReq);
-	*valuePtr++ = width;
-	*valuePtr = height;
-    }
-#endif /* MUSTCOPY */
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/ChkIfEv.c b/xc/lib/X11/ChkIfEv.c
deleted file mode 100644
index d3a141dc8..000000000
--- a/xc/lib/X11/ChkIfEv.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* $TOG: ChkIfEv.c /main/11 1998/02/06 17:06:16 kaleb $ */
-/*
-
-Copyright 1985, 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_EVENTS
-#include "Xlibint.h"
-
-/* 
- * Check existing events in queue to find if any match.  If so, return.
- * If not, flush buffer and see if any more events are readable. If one
- * matches, return.  If all else fails, tell the user no events found.
- */
-
-Bool XCheckIfEvent (dpy, event, predicate, arg)
-        register Display *dpy;
-	Bool (*predicate)(
-#if NeedNestedPrototypes
-			  Display*			/* display */,
-			  XEvent*			/* event */,
-			  char*				/* arg */
-#endif
-			  );		/* function to call */
-	register XEvent *event;		/* XEvent to be filled in. */
-	char *arg;
-{
-	register _XQEvent *prev, *qelt;
-	unsigned long qe_serial = 0;
-	int n;			/* time through count */
-
-        LockDisplay(dpy);
-	prev = NULL;
-	for (n = 3; --n >= 0;) {
-	    for (qelt = prev ? prev->next : dpy->head;
-		 qelt;
-		 prev = qelt, qelt = qelt->next) {
-		if(qelt->qserial_num > qe_serial
-		   && (*predicate)(dpy, &qelt->event, arg)) {
-		    *event = qelt->event;
-		    _XDeq(dpy, prev, qelt);
-		    UnlockDisplay(dpy);
-		    return True;
-		}
-	    }
-	    if (prev)
-		qe_serial = prev->qserial_num;
-	    switch (n) {
-	      case 2:
-		_XEventsQueued(dpy, QueuedAfterReading);
-		break;
-	      case 1:
-		_XFlush(dpy);
-		break;
-	    }
-	    if (prev && prev->qserial_num != qe_serial)
-		/* another thread has snatched this event */
-		prev = NULL;
-	}
-	UnlockDisplay(dpy);
-	return False;
-}
diff --git a/xc/lib/X11/ChkMaskEv.c b/xc/lib/X11/ChkMaskEv.c
deleted file mode 100644
index 280be6ef8..000000000
--- a/xc/lib/X11/ChkMaskEv.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* $TOG: ChkMaskEv.c /main/18 1998/02/06 17:06:30 kaleb $ */
-/*
-
-Copyright 1985, 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_EVENTS
-#include "Xlibint.h"
-
-#ifdef __STDC__
-#define Const const
-#else
-#define Const /**/
-#endif
-extern long Const _Xevent_to_mask[];
-
-#define AllPointers (PointerMotionMask|PointerMotionHintMask|ButtonMotionMask)
-#define AllButtons (Button1MotionMask|Button2MotionMask|Button3MotionMask|\
-		    Button4MotionMask|Button5MotionMask)
-
-/* 
- * Check existing events in queue to find if any match.  If so, return.
- * If not, flush buffer and see if any more events are readable. If one
- * matches, return.  If all else fails, tell the user no events found.
- */
-
-Bool XCheckMaskEvent (dpy, mask, event)
-        register Display *dpy;
-	long mask;		/* Selected event mask. */
- 	register XEvent *event;	/* XEvent to be filled in. */
-{
-	register _XQEvent *prev, *qelt;
-	unsigned long qe_serial;
-	int n;			/* time through count */
-
-        LockDisplay(dpy);
-	prev = NULL;
-	for (n = 3; --n >= 0;) {
-	    for (qelt = prev ? prev->next : dpy->head;
-		 qelt;
-		 prev = qelt, qelt = qelt->next) {
-		if ((qelt->event.type < LASTEvent) &&
-		    (_Xevent_to_mask[qelt->event.type] & mask) &&
-		    ((qelt->event.type != MotionNotify) ||
-		     (mask & AllPointers) ||
-		     (mask & AllButtons & qelt->event.xmotion.state))) {
-		    *event = qelt->event;
-		    _XDeq(dpy, prev, qelt);
-		    UnlockDisplay(dpy);
-		    return True;
-		}
-	    }
-	    if (prev)
-		qe_serial = prev->qserial_num;
-	    switch (n) {
-	      case 2:
-		_XEventsQueued(dpy, QueuedAfterReading);
-		break;
-	      case 1:
-		_XFlush(dpy);
-		break;
-	    }
-	    if (prev && prev->qserial_num != qe_serial)
-		/* another thread has snatched this event */
-		prev = NULL;
-	}
-	UnlockDisplay(dpy);
-	return False;
-}
diff --git a/xc/lib/X11/ChkTypEv.c b/xc/lib/X11/ChkTypEv.c
deleted file mode 100644
index cdcff3f97..000000000
--- a/xc/lib/X11/ChkTypEv.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* $TOG: ChkTypEv.c /main/10 1998/02/06 17:06:46 kaleb $ */
-/*
-
-Copyright 1985, 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_EVENTS
-#include "Xlibint.h"
-
-/* 
- * Check existing events in queue to find if any match.  If so, return.
- * If not, flush buffer and see if any more events are readable. If one
- * matches, return.  If all else fails, tell the user no events found.
- */
-
-Bool XCheckTypedEvent (dpy, type, event)
-        register Display *dpy;
-	int type;		/* Selected event type. */
-	register XEvent *event;	/* XEvent to be filled in. */
-{
-	register _XQEvent *prev, *qelt;
-	unsigned long qe_serial;
-	int n;			/* time through count */
-
-        LockDisplay(dpy);
-	prev = NULL;
-	for (n = 3; --n >= 0;) {
-	    for (qelt = prev ? prev->next : dpy->head;
-		 qelt;
-		 prev = qelt, qelt = qelt->next) {
-		if (qelt->event.type == type) {
-		    *event = qelt->event;
-		    _XDeq(dpy, prev, qelt);
-		    UnlockDisplay(dpy);
-		    return True;
-		}
-	    }
-	    if (prev)
-		qe_serial = prev->qserial_num;
-	    switch (n) {
-	      case 2:
-		_XEventsQueued(dpy, QueuedAfterReading);
-		break;
-	      case 1:
-		_XFlush(dpy);
-		break;
-	    }
-	    if (prev && prev->qserial_num != qe_serial)
-		/* another thread has snatched this event */
-		prev = NULL;
-	}
-	UnlockDisplay(dpy);
-	return False;
-}
diff --git a/xc/lib/X11/ChkTypWEv.c b/xc/lib/X11/ChkTypWEv.c
deleted file mode 100644
index 957efe426..000000000
--- a/xc/lib/X11/ChkTypWEv.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* $TOG: ChkTypWEv.c /main/10 1998/02/06 17:06:59 kaleb $ */
-/*
-
-Copyright 1985, 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_EVENTS
-#include "Xlibint.h"
-
-/* 
- * Check existing events in queue to find if any match.  If so, return.
- * If not, flush buffer and see if any more events are readable. If one
- * matches, return.  If all else fails, tell the user no events found.
- */
-
-Bool XCheckTypedWindowEvent (dpy, w, type, event)
-        register Display *dpy;
-	Window w;		/* Selected window. */
-	int type;		/* Selected event type. */
-	register XEvent *event;	/* XEvent to be filled in. */
-{
-	register _XQEvent *prev, *qelt;
-	unsigned long qe_serial;
-	int n;			/* time through count */
-
-        LockDisplay(dpy);
-	prev = NULL;
-	for (n = 3; --n >= 0;) {
-	    for (qelt = prev ? prev->next : dpy->head;
-		 qelt;
-		 prev = qelt, qelt = qelt->next) {
-		if ((qelt->event.xany.window == w) &&
-		    (qelt->event.type == type)) {
-		    *event = qelt->event;
-		    _XDeq(dpy, prev, qelt);
-		    UnlockDisplay(dpy);
-		    return True;
-		}
-	    }
-	    if (prev)
-		qe_serial = prev->qserial_num;
-	    switch (n) {
-	      case 2:
-		_XEventsQueued(dpy, QueuedAfterReading);
-		break;
-	      case 1:
-		_XFlush(dpy);
-		break;
-	    }
-	    if (prev && prev->qserial_num != qe_serial)
-		/* another thread has snatched this event */
-		prev = NULL;
-	}
-	UnlockDisplay(dpy);
-	return False;
-}
diff --git a/xc/lib/X11/ChkWinEv.c b/xc/lib/X11/ChkWinEv.c
deleted file mode 100644
index 2c25778d5..000000000
--- a/xc/lib/X11/ChkWinEv.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* $TOG: ChkWinEv.c /main/18 1998/02/06 17:07:14 kaleb $ */
-/*
-
-Copyright 1985, 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_EVENTS
-#include "Xlibint.h"
-
-#ifdef __STDC__
-#define Const const
-#else
-#define Const /**/
-#endif
-extern long Const _Xevent_to_mask[];
-#define AllPointers (PointerMotionMask|PointerMotionHintMask|ButtonMotionMask)
-#define AllButtons (Button1MotionMask|Button2MotionMask|Button3MotionMask|\
-		    Button4MotionMask|Button5MotionMask)
-
-/* 
- * Check existing events in queue to find if any match.  If so, return.
- * If not, flush buffer and see if any more events are readable. If one
- * matches, return.  If all else fails, tell the user no events found.
- */
-
-Bool XCheckWindowEvent (dpy, w, mask, event)
-        register Display *dpy;
-	Window w;		/* Selected window. */
-	long mask;		/* Selected event mask. */
-	register XEvent *event;	/* XEvent to be filled in. */
-{
- 	register _XQEvent *prev, *qelt;
-	unsigned long qe_serial;
-	int n;			/* time through count */
-
-        LockDisplay(dpy);
-	prev = NULL;
-	for (n = 3; --n >= 0;) {
-	    for (qelt = prev ? prev->next : dpy->head;
-		 qelt;
-		 prev = qelt, qelt = qelt->next) {
-		if ((qelt->event.xany.window == w) &&
-		    (qelt->event.type < LASTEvent) &&
-		    (_Xevent_to_mask[qelt->event.type] & mask) &&
-		    ((qelt->event.type != MotionNotify) ||
-		     (mask & AllPointers) ||
-		     (mask & AllButtons & qelt->event.xmotion.state))) {
-		    *event = qelt->event;
-		    _XDeq(dpy, prev, qelt);
-		    UnlockDisplay(dpy);
-		    return True;
-		}
-	    }
-	    if (prev)
-		qe_serial = prev->qserial_num;
-	    switch (n) {
-	      case 2:
-		_XEventsQueued(dpy, QueuedAfterReading);
-		break;
-	      case 1:
-		_XFlush(dpy);
-		break;
-	    }
-	    if (prev && prev->qserial_num != qe_serial)
-		/* another thread has snatched this event */
-		prev = NULL;
-	}
-	UnlockDisplay(dpy);
-	return False;
-}
diff --git a/xc/lib/X11/CirWin.c b/xc/lib/X11/CirWin.c
deleted file mode 100644
index cc194bc49..000000000
--- a/xc/lib/X11/CirWin.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* $TOG: CirWin.c /main/6 1998/02/06 17:08:59 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/CirWin.c,v 1.2 1999/05/09 10:49:03 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XCirculateSubwindows(dpy, w, direction)
-    register Display *dpy;
-    Window w;
-    int direction;
-{
-    register xCirculateWindowReq *req;
-
-    LockDisplay(dpy);
-    GetReq(CirculateWindow, req);
-    req->window = w;
-    req->direction = direction;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/CirWinDn.c b/xc/lib/X11/CirWinDn.c
deleted file mode 100644
index 6a2334d6f..000000000
--- a/xc/lib/X11/CirWinDn.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* $TOG: CirWinDn.c /main/6 1998/02/06 17:08:34 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/CirWinDn.c,v 1.2 1999/05/09 10:49:04 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XCirculateSubwindowsDown(dpy,w)
-    register Display *dpy;
-    Window w;
-{
-    register xCirculateWindowReq *req;
-
-    LockDisplay(dpy);
-    GetReq(CirculateWindow, req);
-    req->window = w;
-    req->direction = LowerHighest;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/CirWinUp.c b/xc/lib/X11/CirWinUp.c
deleted file mode 100644
index 389bacf0b..000000000
--- a/xc/lib/X11/CirWinUp.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* $TOG: CirWinUp.c /main/6 1998/02/06 17:08:47 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/CirWinUp.c,v 1.2 1999/05/09 10:49:04 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XCirculateSubwindowsUp(dpy, w)
-    register Display *dpy;
-    Window w;
-{
-    register xCirculateWindowReq *req;
-
-    LockDisplay(dpy);
-    GetReq(CirculateWindow, req);
-    req->window = w;
-    req->direction = RaiseLowest;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/ClDisplay.c b/xc/lib/X11/ClDisplay.c
deleted file mode 100644
index 451d5f58c..000000000
--- a/xc/lib/X11/ClDisplay.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* $TOG: ClDisplay.c /main/23 1998/02/06 17:09:12 kaleb $ */
-
-/*
-
-Copyright 1985, 1990, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/ClDisplay.c,v 1.2 1999/05/09 10:49:05 dawes Exp $ */
-
-#include "Xlibint.h"
-
-extern void _XFreeDisplayStructure();
-
-/* ConnDis.c */
-extern int _XDisconnectDisplay();
-
-/* 
- * XCloseDisplay - XSync the connection to the X Server, close the connection,
- * and free all associated storage.  Extension close procs should only free
- * memory and must be careful about the types of requests they generate.
- */
-
-int
-XCloseDisplay (dpy)
-	register Display *dpy;
-{
-	register _XExtension *ext;
-	register int i;
-
-	if (!(dpy->flags & XlibDisplayClosing))
-	{
-	    dpy->flags |= XlibDisplayClosing;
-	    for (i = 0; i < dpy->nscreens; i++) {
-		    register Screen *sp = &dpy->screens[i];
-		    XFreeGC (dpy, sp->default_gc);
-	    }
-	    if (dpy->cursor_font != None) {
-		XUnloadFont (dpy, dpy->cursor_font);
-	    }
-	    XSync(dpy, 1);  /* throw away pending events, catch errors */
-	    /* call out to any extensions interested */
-	    for (ext = dpy->ext_procs; ext; ext = ext->next) {
-		if (ext->close_display)
-		    (*ext->close_display)(dpy, &ext->codes);
-	    }
-	    /* if the closes generated more protocol, sync them up */
-	    if (dpy->request != dpy->last_request_read)
-		XSync(dpy, 1);
-	}
-	_XDisconnectDisplay(dpy->trans_conn);
-	_XFreeDisplayStructure (dpy);
-	return 0;
-}
diff --git a/xc/lib/X11/Clear.c b/xc/lib/X11/Clear.c
deleted file mode 100644
index 68b87a870..000000000
--- a/xc/lib/X11/Clear.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* $TOG: Clear.c /main/6 1998/02/06 17:09:43 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/Clear.c,v 1.2 1999/05/09 10:49:05 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XClearWindow(dpy, w)
-    register Display *dpy;
-    Window w;
-{
-    register xClearAreaReq *req;
-
-    LockDisplay(dpy);
-    GetReq(ClearArea, req);
-    req->window = w;
-    req->x = req->y = req->width = req->height = 0;
-        /* these values mean "clear the entire window" */
-    req->exposures = xFalse;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/ClearArea.c b/xc/lib/X11/ClearArea.c
deleted file mode 100644
index b0e9d7f73..000000000
--- a/xc/lib/X11/ClearArea.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* $TOG: ClearArea.c /main/6 1998/02/06 17:09:29 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/ClearArea.c,v 1.2 1999/05/09 10:49:06 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XClearArea (dpy, w, x, y, width, height, exposures)
-    register Display *dpy;
-    Window w;
-    int x, y;
-    unsigned int width, height;
-    Bool exposures;
-{
-    register xClearAreaReq *req;
-
-    LockDisplay(dpy);
-    GetReq(ClearArea, req);
-    req->window = w;
-    req->x = x;
-    req->y = y;
-    req->width = width;
-    req->height = height;
-    req->exposures = exposures;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/ConfWind.c b/xc/lib/X11/ConfWind.c
deleted file mode 100644
index afe698ceb..000000000
--- a/xc/lib/X11/ConfWind.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* $TOG: ConfWind.c /main/9 1998/02/06 17:12:00 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/ConfWind.c,v 1.2 1999/05/09 10:49:06 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XMoveResizeWindow(dpy, w, x, y, width, height)
-register Display *dpy;
-Window w;
-int x, y;
-unsigned int width, height;
-{
-    register xConfigureWindowReq *req;
-
-    LockDisplay(dpy);
-    GetReqExtra(ConfigureWindow, 16, req);
-    req->window = w;
-    req->mask = CWX | CWY | CWWidth | CWHeight;
-#ifdef MUSTCOPY
-    {
-	long lx = x, ly = y;
-	unsigned long lwidth = width, lheight = height;
-
-	dpy->bufptr -= 16;
-	Data32 (dpy, (long *) &lx, 4);	/* order must match values of */
-	Data32 (dpy, (long *) &ly, 4);	/* CWX, CWY, CWWidth, and CWHeight */
-	Data32 (dpy, (long *) &lwidth, 4);
-	Data32 (dpy, (long *) &lheight, 4);
-    }
-#else
-    {
-	register CARD32 *valuePtr =
-	  (CARD32 *) NEXTPTR(req,xConfigureWindowReq);
-	*valuePtr++ = x;
-	*valuePtr++ = y;
-	*valuePtr++ = width;
-	*valuePtr   = height;
-    }
-#endif /* MUSTCOPY */
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/ConnDis.c b/xc/lib/X11/ConnDis.c
deleted file mode 100644
index f18710a62..000000000
--- a/xc/lib/X11/ConnDis.c
+++ /dev/null
@@ -1,1140 +0,0 @@
-/* $TOG: ConnDis.c /main/115 1998/02/06 17:12:13 kaleb $ */
-/*
- 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/ConnDis.c,v 3.16 1999/05/09 10:49:06 dawes Exp $ */
-
-/* 
- * This file contains operating system dependencies.
- */
-
-#define NEED_EVENTS
-
-#include <X11/Xlibint.h>
-#include <X11/Xtrans.h>
-#include <X11/Xauth.h>
-#include <stdio.h>
-#include <ctype.h>
-
-#if !defined(WIN32) && !defined(MINIX)
-#ifndef Lynx
-#include <sys/socket.h>
-#else
-#include <socket.h>
-#endif
-#endif
-
-#ifndef X_CONNECTION_RETRIES		/* number retries on ECONNREFUSED */
-#define X_CONNECTION_RETRIES 5
-#endif
-
-#ifdef LOCALCONN
-#include <sys/utsname.h>
-#endif
-
-static void GetAuthorization();
-
-static char *copystring (src, len)
-    char *src;
-    int len;
-{
-    char *dst = Xmalloc (len + 1);
-
-    if (dst) {
-	strncpy (dst, src, len);
-	dst[len] = '\0';
-    }
-
-    return dst;
-}
-
-
-/* 
- * Attempts to connect to server, given display name. Returns file descriptor
- * (network socket) or -1 if connection fails.  Display names may be of the
- * following format:
- *
- *     [protocol/] [hostname] : [:] displaynumber [.screennumber]
- *
- * The second colon indicates a DECnet style name.  No hostname is interpretted
- * as the most efficient local connection to a server on the same machine.  
- * This is usually:
- *
- *     o  shared memory
- *     o  local stream
- *     o  UNIX domain socket
- *     o  TCP to local host
- *
- * This function will eventually call the X Transport Interface functions
- * which expects the hostname in the format:
- *
- *	[protocol/] [hostname] : [:] displaynumber
- *
- */
-XtransConnInfo
-_X11TransConnectDisplay (display_name, fullnamep, dpynump, screenp,
-		      auth_namep, auth_namelenp, auth_datap, auth_datalenp)
-    char *display_name;
-    char **fullnamep;			/* RETURN */
-    int *dpynump;			/* RETURN */
-    int *screenp;			/* RETURN */
-    char **auth_namep;			/* RETURN */
-    int *auth_namelenp;			/* RETURN */
-    char **auth_datap;			/* RETURN */
-    int *auth_datalenp;			/* RETURN */
-{
-    int family;
-    int saddrlen;
-    Xtransaddr *saddr;
-    char *lastp, *lastc, *p;		/* char pointers */
-    char *pprotocol = NULL;		/* start of protocol name */
-    char *phostname = NULL;		/* start of host of display */
-    char *pdpynum = NULL;		/* start of dpynum of display */
-    char *pscrnum = NULL;		/* start of screen of display */
-    Bool dnet = False;			/* if true, then DECnet format */
-    int idisplay;			/* required display number */
-    int iscreen = 0;			/* optional screen number */
-    /*  int (*connfunc)(); */		/* method to create connection */
-    int len, hostlen;			/* length tmp variable */
-    int retry;				/* retry counter */
-    char addrbuf[128];			/* final address passed to
-					   X Transport Interface */
-    char* address = addrbuf;
-    XtransConnInfo trans_conn = NULL;	/* transport connection object */
-    int connect_stat;
-#ifdef LOCALCONN
-    struct utsname sys;
-#endif
-
-    p = display_name;
-
-    saddrlen = 0;			/* set so that we can clear later */
-    saddr = NULL;
-
-    /*
-     * Step 0, find the protocol.  This is delimited by the optional 
-     * slash ('/').
-     */
-    for (lastp = p; *p && *p != ':' && *p != '/'; p++) ;
-    if (!*p) return NULL;		/* must have a colon */
-
-    if (p != lastp && *p != ':') {	/* protocol given? */
-	pprotocol = copystring (lastp, p - lastp);
-	if (!pprotocol) goto bad;	/* no memory */
-	p++;				/* skip the '/' */
-    } else
-	p = display_name;		/* reset the pointer in
-					   case no protocol was given */
-
-    /*
-     * Step 1, find the hostname.  This is delimited by either one colon,
-     * or two colons in the case of DECnet (DECnet Phase V allows a single
-     * colon in the hostname).
-     */
-
-    lastp = p;
-    lastc = NULL;
-    for (; *p; p++)
-	if (*p == ':')
-	    lastc = p;
-
-    if (!lastc) return NULL;		/* must have a colon */
-
-    if ((lastp != lastc) && (*(lastc - 1) == ':')) {
-	/* DECnet display specified */
-
-#ifndef DNETCONN
-	goto bad;
-#else
-	dnet = True;
-	/* override the protocol specified */
-	if (pprotocol)
-	    Xfree (pprotocol);
-	pprotocol = copystring ("dnet", 4);
-	hostlen = lastc - 1 - lastp;
-#endif
-    }
-    else
-	hostlen = lastc - lastp;
-
-    if (hostlen > 0) {		/* hostname given? */
-	phostname = copystring (lastp, hostlen);
-	if (!phostname) goto bad;	/* no memory */
-    }
-
-    p = lastc;
-
-#ifdef LOCALCONN
-    /* check if phostname == localnodename */
-    if (phostname && uname(&sys) >= 0 &&
-	!strncmp(phostname, sys.nodename, strlen(sys.nodename)))
-    {
-	Xfree (phostname);
-	phostname = copystring ("unix", 4);
-    }
-#endif
-
-
-    /*
-     * Step 2, find the display number.  This field is required and is 
-     * delimited either by a nul or a period, depending on whether or not
-     * a screen number is present.
-     */
-
-    for (lastp = ++p; *p && isascii(*p) && isdigit(*p); p++) ;
-    if ((p == lastp) ||			/* required field */
-	(*p != '\0' && *p != '.') ||	/* invalid non-digit terminator */
-	!(pdpynum = copystring (lastp, p - lastp)))  /* no memory */
-      goto bad;
-    idisplay = atoi (pdpynum);
-
-
-    /*
-     * Step 3, find the screen number.  This field is optional.  It is 
-     * present only if the display number was followed by a period (which
-     * we've already verified is the only non-nul character).
-     */
-
-    if (*p) {
-	for (lastp = ++p; *p && isascii(*p) && isdigit (*p); p++) ;
-	if (p != lastp) {
-	    if (*p ||			/* non-digits */
-		!(pscrnum = copystring (lastp, p - lastp))) /* no memory */
-		goto bad;
-	    iscreen = atoi (lastp);
-	}
-    }
-
-    /*
-     * At this point, we know the following information:
-     *
-     *     pprotocol                protocol string or NULL
-     *     phostname                hostname string or NULL
-     *     idisplay                 display number
-     *     iscreen                  screen number
-     *     dnet                     DECnet boolean
-     * 
-     * We can now decide which transport to use based on the ConnectionFlags
-     * build parameter the hostname string.  If phostname is NULL or equals
-     * the string "local", then choose the best transport.  If phostname
-     * is "unix", then choose BSD UNIX domain sockets (if configured).
-     */
-
-#if defined(TCPCONN) || defined(UNIXCONN) || defined(LOCALCONN) || defined(MNX_TCPCONN) || defined(OS2PIPECONN)
-    if (!pprotocol) {
-	if (!phostname)
-#if defined(UNIXCONN) || defined(LOCALCONN) || defined(OS2PIPECONN)
-	    pprotocol = copystring ("local", 5);
-	else
-#endif
-	    pprotocol = copystring ("tcp", 3);
-    }
-#else
-#if defined(AMRPCCONN)
-    if (!pprotocol) {
-            pprotocol = copystring ("amcon", 5);
-    }
-#endif
-#endif
-
-#if defined(UNIXCONN) || defined(LOCALCONN) || defined(OS2PIPECONN)
-    /*
-     * Now that the defaults have been established, see if we have any 
-     * special names that we have to override:
-     *
-     *     :N         =>     if UNIXCONN then unix-domain-socket
-     *     ::N        =>     if UNIXCONN then unix-domain-socket
-     *     unix:N     =>     if UNIXCONN then unix-domain-socket
-     *
-     * Note that if UNIXCONN isn't defined, then we can use the default
-     * transport connection function set above.
-     */
-
-    if (!phostname) {
-#ifdef apollo
-	;   /* Unix domain sockets are *really* bad on apollos */
-#else
-	if( pprotocol ) Xfree(pprotocol);
-	pprotocol = copystring ("local", 5);
-#endif
-    }
-    else if (strcmp (phostname, "unix") == 0) {
-	if( pprotocol ) Xfree(pprotocol);
-	pprotocol = copystring ("local", 5);
-    }
-#endif
-
-    /*
-     * This seems kind of backwards, but we need to put the protocol,
-     * host, and port back together to pass to _X11TransOpenCOTSClient().
-     */
-
-    {
-	int olen = 3 + (pprotocol ? strlen(pprotocol) : 0) + 
-		       (phostname ? strlen(phostname) : 0) + 
-		       (pdpynum   ? strlen(pdpynum)   : 0);
-	if (olen > sizeof addrbuf) address = Xmalloc (olen);
-    }
-
-    sprintf(address,"%s/%s:%d",
-	pprotocol ? pprotocol : "",
-	phostname ? phostname : "",
-	idisplay );
-
-    /*
-     * Make the connection, also need to get the auth address info for
-     * the connection.  Do retries in case server host has hit its
-     * backlog (which, unfortunately, isn't distinguishable from there not
-     * being a server listening at all, which is why we have to not retry
-     * too many times).
-     */
-    for(retry=X_CONNECTION_RETRIES; retry>=0; retry-- )
-	{
-	if ( (trans_conn = _X11TransOpenCOTSClient(address)) == NULL )
-	    {
-	    break;
-	    }
-	if ((connect_stat = _X11TransConnect(trans_conn,address)) < 0 )
-	    {
-	    _X11TransClose(trans_conn);
-	    trans_conn = NULL;
-
-	    if (connect_stat == TRANS_TRY_CONNECT_AGAIN)
-	    {
-		sleep(1);
-		continue;
-	    }
-	    else
-		break;
-	    }
-
-	_X11TransGetPeerAddr(trans_conn, &family, &saddrlen, &saddr);
-
-	/*
-	 * The family is given in a socket format (ie AF_INET). This
-	 * will convert it to the format used by the authorization and
-	 * X protocol (ie FamilyInternet).
-	 */
-
-	if( _X11TransConvertAddress(&family, &saddrlen, &saddr) < 0 )
-	    {
-	    _X11TransClose(trans_conn);
-	    trans_conn = NULL;
-	    sleep(1);
-	    if (saddr)
-	    {
-		free ((char *) saddr);
-		saddr = NULL;
-	    }
-	    continue;
-	    }
-
-	break;
-	}
-
-    if (address != addrbuf) Xfree (address);
-
-    if( trans_conn == NULL )
-      goto bad;
-
-    /*
-     * Set close-on-exec so that programs that fork() doesn't get confused.
-     */
-
-    _X11TransSetOption(trans_conn,TRANS_CLOSEONEXEC,1);
-
-    /*
-     * Build the expanded display name:
-     *
-     *     [host] : [:] dpy . scr \0
-     */
-    len = ((phostname ? strlen(phostname) : 0) + 1 + (dnet ? 1 : 0) +
-	   strlen(pdpynum) + 1 + (pscrnum ? strlen(pscrnum) : 1) + 1);
-    *fullnamep = (char *) Xmalloc (len);
-    if (!*fullnamep) goto bad;
-
-    sprintf (*fullnamep, "%s%s%d.%d",
-	     (phostname ? phostname : ""),
-	     (dnet ? "::" : ":"),
-	     idisplay, iscreen);
-
-    *dpynump = idisplay;
-    *screenp = iscreen;
-    if (pprotocol) Xfree (pprotocol);
-    if (phostname) Xfree (phostname);
-    if (pdpynum) Xfree (pdpynum);
-    if (pscrnum) Xfree (pscrnum);
-
-    GetAuthorization(trans_conn, family, (char *) saddr, saddrlen, idisplay,
-		     auth_namep, auth_namelenp, auth_datap, auth_datalenp);
-    return trans_conn;
-
-
-    /*
-     * error return; make sure everything is cleaned up.
-     */
-  bad:
-    if (trans_conn) (void)_X11TransClose(trans_conn);
-    if (saddr) free ((char *) saddr);
-    if (pprotocol) Xfree (pprotocol);
-    if (phostname) Xfree (phostname);
-    if (pdpynum) Xfree (pdpynum);
-    if (pscrnum) Xfree (pscrnum);
-    return NULL;
-
-}
-
-/*
- * This is gross, but we need it for compatiblity.
- * The test suite relies on the following interface.
- *
- */
-
-int _XConnectDisplay (display_name, fullnamep, dpynump, screenp,
-		      auth_namep, auth_namelenp, auth_datap, auth_datalenp)
-    char *display_name;
-    char **fullnamep;			/* RETURN */
-    int *dpynump;			/* RETURN */
-    int *screenp;			/* RETURN */
-    char **auth_namep;			/* RETURN */
-    int *auth_namelenp;			/* RETURN */
-    char **auth_datap;			/* RETURN */
-    int *auth_datalenp;			/* RETURN */
-{
-   XtransConnInfo trans_conn;
-
-   trans_conn = _X11TransConnectDisplay (
-		      display_name, fullnamep, dpynump, screenp,
-		      auth_namep, auth_namelenp, auth_datap, auth_datalenp);
-
-   if (trans_conn)
-   {
-       int fd = _X11TransGetConnectionNumber (trans_conn);
-       _X11TransFreeConnInfo (trans_conn);
-       return (fd);
-   }
-   else
-       return (-1);
-}
-
-
-/*****************************************************************************
- *                                                                           *
- *			  Connection Utility Routines                        *
- *                                                                           *
- *****************************************************************************/
-
-/* 
- * Disconnect from server.
- */
-
-int _XDisconnectDisplay (trans_conn)
-
-XtransConnInfo	trans_conn;
-
-{
-    _X11TransDisconnect(trans_conn);
-    _X11TransClose(trans_conn);
-    return 0;
-}
-
-
-
-static int padlength[4] = {0, 3, 2, 1};	 /* make sure auth is multiple of 4 */
-
-Bool
-_XSendClientPrefix (dpy, client, auth_proto, auth_string, prefix)
-     Display *dpy;
-     xConnClientPrefix *client;		/* contains count for auth_* */
-     char *auth_proto, *auth_string;	/* NOT null-terminated */
-     xConnSetupPrefix *prefix;		/* prefix information */
-{
-    int auth_length = client->nbytesAuthProto;
-    int auth_strlen = client->nbytesAuthString;
-    static char padbuf[3];		/* for padding to 4x bytes */
-    int pad;
-    struct iovec iovarray[5], *iov = iovarray;
-    int niov = 0;
-    int len = 0;
-
-#define add_to_iov(b,l) \
-  { iov->iov_base = (b); iov->iov_len = (l); iov++, niov++; len += (l); }
-
-    add_to_iov ((caddr_t) client, SIZEOF(xConnClientPrefix));
-
-    /*
-     * write authorization protocol name and data
-     */
-    if (auth_length > 0) {
-	add_to_iov (auth_proto, auth_length);
-	pad = padlength [auth_length & 3];
-	if (pad) add_to_iov (padbuf, pad);
-    }
-    if (auth_strlen > 0) {
-	add_to_iov (auth_string, auth_strlen);
-	pad = padlength [auth_strlen & 3];
-	if (pad) add_to_iov (padbuf, pad);
-    }
-
-#undef add_to_iov
-
-    len -= _X11TransWritev (dpy->trans_conn, iovarray, niov);
-
-    /*
-     * Set the connection non-blocking since we use select() to block.
-     */
-
-    _X11TransSetOption(dpy->trans_conn, TRANS_NONBLOCKING, 1);
-
-    if (len != 0)
-	return -1;
-
-#ifdef K5AUTH
-    if (auth_length == 14 &&
-	!strncmp(auth_proto, "MIT-KERBEROS-5", 14))
-    {
-	return k5_clientauth(dpy, prefix);
-    } else
-#endif
-    return 0;
-}
-
-
-#ifdef STREAMSCONN
-#ifdef SVR4
-#include <tiuser.h>
-#else
-#undef HASXDMAUTH
-#endif
-#endif
-
-#ifdef SECURE_RPC
-#include <rpc/rpc.h>
-#ifdef ultrix
-#include <time.h>
-#include <rpc/auth_des.h>
-#endif
-#endif
-
-#ifdef HASXDMAUTH
-#ifdef X_NOT_STDC_ENV
-#define Time_t long
-extern Time_t time ();
-#else
-#include <time.h>
-#define Time_t time_t
-#endif
-#endif
-
-/*
- * First, a routine for setting authorization data
- */
-static int xauth_namelen = 0;
-static char *xauth_name = NULL;	 /* NULL means use default mechanism */
-static int xauth_datalen = 0;
-static char *xauth_data = NULL;	 /* NULL means get default data */
-
-/*
- * This is a list of the authorization names which Xlib currently supports.
- * Xau will choose the file entry which matches the earliest entry in this
- * array, allowing us to prioritize these in terms of the most secure first
- */
-
-static char *default_xauth_names[] = {
-#ifdef K5AUTH
-    "MIT-KERBEROS-5",
-#endif
-#ifdef SECURE_RPC
-    "SUN-DES-1",
-#endif
-#ifdef HASXDMAUTH
-    "XDM-AUTHORIZATION-1",
-#endif
-    "MIT-MAGIC-COOKIE-1"
-};
-
-static int default_xauth_lengths[] = {
-#ifdef K5AUTH
-    14,     /* strlen ("MIT-KERBEROS-5") */
-#endif
-#ifdef SECURE_RPC
-    9,	    /* strlen ("SUN-DES-1") */
-#endif
-#ifdef HASXDMAUTH
-    19,	    /* strlen ("XDM-AUTHORIZATION-1") */
-#endif
-    18	    /* strlen ("MIT-MAGIC-COOKIE-1") */
-};
-
-#define NUM_DEFAULT_AUTH    (sizeof (default_xauth_names) / sizeof (default_xauth_names[0]))
-    
-static char **xauth_names = default_xauth_names;
-static int  *xauth_lengths = default_xauth_lengths;
-
-static int  xauth_names_length = NUM_DEFAULT_AUTH;
-
-void XSetAuthorization (name, namelen, data, datalen)
-    int namelen, datalen;		/* lengths of name and data */
-    char *name, *data;			/* NULL or arbitrary array of bytes */
-{
-    char *tmpname, *tmpdata;
-
-    _XLockMutex(_Xglobal_lock);
-    if (xauth_name) Xfree (xauth_name);	 /* free any existing data */
-    if (xauth_data) Xfree (xauth_data);
-
-    xauth_name = xauth_data = NULL;	/* mark it no longer valid */
-    xauth_namelen = xauth_datalen = 0;
-    _XUnlockMutex(_Xglobal_lock);
-
-    if (namelen < 0) namelen = 0;	/* check for bogus inputs */
-    if (datalen < 0) datalen = 0;	/* maybe should return? */
-
-    if (namelen > 0)  {			/* try to allocate space */
-	tmpname = Xmalloc ((unsigned) namelen);
-	if (!tmpname) return;
-	memcpy (tmpname, name, namelen);
-    } else {
-	tmpname = NULL;
-    }
-
-    if (datalen > 0)  {
-	tmpdata = Xmalloc ((unsigned) datalen);
-	if (!tmpdata) {
-	    if (tmpname) (void) Xfree (tmpname);
-	    return;
-	}
-	memcpy (tmpdata, data, datalen);
-    } else {
-	tmpdata = NULL;
-    }
-
-    _XLockMutex(_Xglobal_lock);
-    xauth_name = tmpname;		/* and store the suckers */
-    xauth_namelen = namelen;
-    if (tmpname)
-    {
-	xauth_names = &xauth_name;
-	xauth_lengths = &xauth_namelen;
-	xauth_names_length = 1;
-    }
-    else
-    {
-	xauth_names = default_xauth_names;
-	xauth_lengths = default_xauth_lengths;
-	xauth_names_length = NUM_DEFAULT_AUTH;
-    }
-    xauth_data = tmpdata;
-    xauth_datalen = datalen;
-    _XUnlockMutex(_Xglobal_lock);
-    return;
-}
-
-#ifdef SECURE_RPC
-/*
- * Create a credential that we can send to the X server.
- */
-static int
-auth_ezencode(servername, window, cred_out, len)
-        char           *servername;
-        int             window;
-	char	       *cred_out;
-        int            *len;
-{
-        AUTH           *a;
-        XDR             xdr;
-
-        a = (AUTH *)authdes_create(servername, window, NULL, NULL);
-        if (a == (AUTH *)NULL) {
-                perror("auth_create");
-                return 0;
-        }
-        xdrmem_create(&xdr, cred_out, *len, XDR_ENCODE);
-        if (AUTH_MARSHALL(a, &xdr) == FALSE) {
-                perror("auth_marshall");
-                AUTH_DESTROY(a);
-                return 0;
-        }
-        *len = xdr_getpos(&xdr);
-        AUTH_DESTROY(a);
-	return 1;
-}
-#endif
-
-#ifdef K5AUTH
-#include <com_err.h>
-
-extern krb5_flags krb5_kdc_default_options;
-
-/*
- * k5_clientauth
- *
- * Returns non-zero if the setup prefix has been read,
- * so we can tell XOpenDisplay to not bother looking for it by
- * itself.
- */
-static int k5_clientauth(dpy, sprefix)
-    Display *dpy;
-    xConnSetupPrefix *sprefix;
-{
-    krb5_error_code retval;
-    xReq prefix;
-    char *buf;
-    CARD16 plen, tlen;
-    krb5_data kbuf;
-    krb5_ccache cc;
-    krb5_creds creds;
-    krb5_principal cprinc, sprinc;
-    krb5_ap_rep_enc_part *repl;
-
-    krb5_init_ets();
-    /*
-     * stage 0: get encoded principal and tgt from server
-     */
-    _XRead(dpy, (char *)&prefix, sz_xReq);
-    if (prefix.reqType != 2 && prefix.reqType != 3)
-	/* not an auth packet... so deal */
-	if (prefix.reqType == 0 || prefix.reqType == 1)
-	{
-	    memcpy((char *)sprefix, (char *)&prefix, sz_xReq);
-	    _XRead(dpy, (char *)sprefix + sz_xReq,
-		   sz_xConnSetupPrefix - sz_xReq); /* ewww... gross */
-	    return 1;
-	}
-	else
-	{
-	    fprintf(stderr,
-		    "Xlib: Krb5 stage 0: got illegal connection setup success code %d\n",
-		    prefix.reqType);
-	    return -1;
-	}
-    if (prefix.data != 0)
-    {
-	fprintf(stderr, "Xlib: got out of sequence (%d) packet in Krb5 auth\n",
-		prefix.data);
-	return -1;
-    }
-    buf = (char *)malloc((prefix.length << 2) - sz_xReq);
-    if (buf == NULL)		/* malloc failed.  Run away! */
-    {
-	fprintf(stderr, "Xlib: malloc bombed in Krb5 auth\n");
-	return -1;
-    }
-    tlen = (prefix.length << 2) - sz_xReq;
-    _XRead(dpy, buf, tlen);
-    if (prefix.reqType == 2 && tlen < 6)
-    {
-	fprintf(stderr, "Xlib: Krb5 stage 0 reply from server too short\n");
-	free(buf);
-	return -1;
-    }
-    if (prefix.reqType == 2)
-    {
-	plen = *(CARD16 *)buf;
-	kbuf.data = buf + 2;
-	kbuf.length = (plen > tlen) ? tlen : plen;
-    }
-    else
-    {
-	kbuf.data = buf;
-	kbuf.length = tlen;
-    }
-    if (XauKrb5Decode(kbuf, &sprinc))
-    {
-	free(buf);
-	fprintf(stderr, "Xlib: XauKrb5Decode bombed\n");
-	return -1;
-    }
-    if (prefix.reqType == 3)	/* do some special stuff here */
-    {
-	char *sname, *hostname = NULL;
-
-	sname = (char *)malloc(krb5_princ_component(sprinc, 0)->length + 1);
-	if (sname == NULL)
-	{
-	    free(buf);
-	    krb5_free_principal(sprinc);
-	    fprintf(stderr, "Xlib: malloc bombed in Krb5 auth\n");
-	    return -1;
-	}
-	memcpy(sname, krb5_princ_component(sprinc, 0)->data,
-	       krb5_princ_component(sprinc, 0)->length);
-	sname[krb5_princ_component(sprinc, 0)->length] = '\0';
-	krb5_free_principal(sprinc);
-	if (dpy->display_name[0] != ':') /* hunt for a hostname */
-	{
-	    char *t;
-
-	    if ((hostname = (char *)malloc(strlen(dpy->display_name)))
-		== NULL)
-	    {
-		free(buf);
-		free(sname);
-		fprintf(stderr, "Xlib: malloc bombed in Krb5 auth\n");
-		return -1;
-	    }
-	    strcpy(hostname, dpy->display_name);
-	    t = strchr(hostname, ':');
-	    if (t == NULL)
-	    {
-		free(buf);
-		free(sname);
-		free(hostname);
-		fprintf(stderr,
-			"Xlib: shouldn't get here! malformed display name.");
-		return -1;
-	    }
-	    if ((t - hostname + 1 < strlen(hostname)) && t[1] == ':')
-		t++;
-	    *t = '\0';		/* truncate the dpy number out */
-	}
-	retval = krb5_sname_to_principal(hostname, sname,
-					 KRB5_NT_SRV_HST, &sprinc);
-	free(sname);
-	if (hostname)
-	    free(hostname);
-	if (retval)
-	{
-	    free(buf);
-	    fprintf(stderr, "Xlib: krb5_sname_to_principal failed: %s\n",
-		    error_message(retval));
-	    return -1;
-	}
-    }
-    if (retval = krb5_cc_default(&cc))
-    {
-	free(buf);
-	krb5_free_principal(sprinc);
-	fprintf(stderr, "Xlib: krb5_cc_default failed: %s\n",
-		error_message(retval));
-	return -1;
-    }
-    if (retval = krb5_cc_get_principal(cc, &cprinc))
-    {
-	free(buf);
-	krb5_free_principal(sprinc);
-	fprintf(stderr, "Xlib: cannot get Kerberos principal from \"%s\": %s\n",
-		krb5_cc_default_name(), error_message(retval));
-	return -1;
-    }
-    bzero((char *)&creds, sizeof(creds));
-    creds.server = sprinc;
-    creds.client = cprinc;
-    if (prefix.reqType == 2)
-    {
-	creds.second_ticket.length = tlen - plen - 2;
-	creds.second_ticket.data = buf + 2 + plen;
-	retval = krb5_get_credentials(KRB5_GC_USER_USER |
-				      krb5_kdc_default_options,
-				      cc, &creds);
-    }
-    else
-	retval = krb5_get_credentials(krb5_kdc_default_options,
-				      cc, &creds);
-    if (retval)
-    {
-	free(buf);
-	krb5_free_cred_contents(&creds);
-	fprintf(stderr, "Xlib: cannot get Kerberos credentials: %s\n",
-		error_message(retval));
-	return -1;
-    }
-    /*
-     * now format the ap_req to send to the server
-     */
-    if (prefix.reqType == 2)
-	retval = krb5_mk_req_extended(AP_OPTS_USE_SESSION_KEY |
-				      AP_OPTS_MUTUAL_REQUIRED, NULL,
-				      0, 0, NULL, cc,
-				      &creds, NULL, &kbuf);
-    else
-	retval = krb5_mk_req_extended(AP_OPTS_MUTUAL_REQUIRED, NULL,
-				      0, 0, NULL, cc, &creds, NULL,
-				      &kbuf);
-    free(buf);
-    if (retval)			/* Some manner of Kerberos lossage */
-    {
-	krb5_free_cred_contents(&creds);
-	fprintf(stderr, "Xlib: krb5_mk_req_extended failed: %s\n",
-		error_message(retval));
-	return -1;
-    }
-    prefix.reqType = 1;
-    prefix.data = 0;
-    prefix.length = (kbuf.length + sz_xReq + 3) >> 2;
-    /*
-     * stage 1: send ap_req to server
-     */
-    _XSend(dpy, (char *)&prefix, sz_xReq);
-    _XSend(dpy, (char *)kbuf.data, kbuf.length);
-    free(kbuf.data);
-    /*
-     * stage 2: get ap_rep from server to mutually authenticate
-     */
-    _XRead(dpy, (char *)&prefix, sz_xReq);
-    if (prefix.reqType != 2)
-	if (prefix.reqType == 0 || prefix.reqType == 1)
-	{
-	    memcpy((char *)sprefix, (char *)&prefix, sz_xReq);
-	    _XRead(dpy, (char *)sprefix + sz_xReq,
-		   sz_xConnSetupPrefix - sz_xReq);
-	    return 1;
-	}
-	else
-	{
-	    fprintf(stderr,
-		    "Xlib: Krb5 stage 2: got illegal connection setup success code %d\n",
-		    prefix.reqType);
-	    return -1;
-	}
-    if (prefix.data != 2)
-	return -1;
-    kbuf.length = (prefix.length << 2) - sz_xReq;
-    kbuf.data = (char *)malloc(kbuf.length);
-    if (kbuf.data == NULL)
-    {
-	fprintf(stderr, "Xlib: malloc bombed in Krb5 auth\n");
-	return -1;
-    }
-    _XRead(dpy, (char *)kbuf.data, kbuf.length);
-    retval = krb5_rd_rep(&kbuf, &creds.keyblock, &repl);
-    if (retval)
-    {
-	free(kbuf.data);
-	fprintf(stderr, "Xlib: krb5_rd_rep failed: %s\n",
-		error_message(retval));
-	return -1;
-    }
-    free(kbuf.data);
-    /*
-     * stage 3: send a short ack to the server and return
-     */
-    prefix.reqType = 3;
-    prefix.data = 0;
-    prefix.length = sz_xReq >> 2;
-    _XSend(dpy, (char *)&prefix, sz_xReq);
-    return 0;
-}
-#endif /* K5AUTH */
-
-static void
-GetAuthorization(trans_conn, family, saddr, saddrlen, idisplay,
-		 auth_namep, auth_namelenp, auth_datap, auth_datalenp)
-    XtransConnInfo trans_conn;
-    int family;
-    int saddrlen;
-    int idisplay;
-    char *saddr;
-    char **auth_namep;			/* RETURN */
-    int *auth_namelenp;			/* RETURN */
-    char **auth_datap;			/* RETURN */
-    int *auth_datalenp;			/* RETURN */
-{
-#ifdef SECURE_RPC
-    char rpc_cred[MAX_AUTH_BYTES];
-#endif
-#ifdef HASXDMAUTH
-    char xdmcp_data[192/8];
-#endif
-    char *auth_name;
-    int auth_namelen;
-    char *auth_data;
-    int auth_datalen;
-    Xauth *authptr = NULL;
-
-/*
- * Look up the authorization protocol name and data if necessary.
- */
-    if (xauth_name && xauth_data) {
-	auth_namelen = xauth_namelen;
-	auth_name = xauth_name;
-	auth_datalen = xauth_datalen;
-	auth_data = xauth_data;
-    } else {
-	char dpynumbuf[40];		/* big enough to hold 2^64 and more */
-	(void) sprintf (dpynumbuf, "%d", idisplay);
-
-	authptr = XauGetBestAuthByAddr ((unsigned short) family,
-				    (unsigned short) saddrlen,
-				    saddr,
-				    (unsigned short) strlen (dpynumbuf),
-				    dpynumbuf,
-				    xauth_names_length,
-				    xauth_names,
-				    xauth_lengths);
-	if (authptr) {
-	    auth_namelen = authptr->name_length;
-	    auth_name = (char *)authptr->name;
-	    auth_datalen = authptr->data_length;
-	    auth_data = (char *)authptr->data;
-	} else {
-	    auth_namelen = 0;
-	    auth_name = NULL;
-	    auth_datalen = 0;
-	    auth_data = NULL;
-	}
-    }
-#ifdef HASXDMAUTH
-    /*
-     * build XDM-AUTHORIZATION-1 data
-     */
-    if (auth_namelen == 19 && !strncmp (auth_name, "XDM-AUTHORIZATION-1", 19))
-    {
-	int i, j;
-	Time_t  now;
-	int family, addrlen;
-	Xtransaddr *addr = NULL;
-
-	for (j = 0; j < 8; j++)
-	    xdmcp_data[j] = auth_data[j];
-
-	_X11TransGetMyAddr(trans_conn, &family, &addrlen, &addr);
-
-	switch( family )
-	{
-#ifdef AF_INET
-	case AF_INET:
-	{
-	    /*
-	     * addr will contain a sockaddr_in with all
-	     * of the members already in network byte order.
-	     */
-
-	    for(i=4; i<8; i++)	/* do sin_addr */
-		xdmcp_data[j++] = ((char *)addr)[i];
-	    for(i=2; i<4; i++)	/* do sin_port */
-		xdmcp_data[j++] = ((char *)addr)[i];
-	    break;
-	}
-#endif /* AF_INET */
-#ifdef AF_UNIX
-	case AF_UNIX:
-	{
-	    /*
-	     * We don't use the sockaddr_un for this encoding.
-	     * Instead, we create a sockaddr_in filled with
-	     * a decreasing counter for the address, and the
-	     * pid for the port.
-	     */
-
-	    static unsigned long    unix_addr = 0xFFFFFFFF;
-	    unsigned long	the_addr;
-	    unsigned short	the_port;
-	    
-	    _XLockMutex(_Xglobal_lock);
-	    the_addr = unix_addr--;
-	    _XUnlockMutex(_Xglobal_lock);
-	    the_port = getpid ();
-
-	    xdmcp_data[j++] = (the_addr >> 24) & 0xFF;
-	    xdmcp_data[j++] = (the_addr >> 16) & 0xFF;
-	    xdmcp_data[j++] = (the_addr >>  8) & 0xFF;
-	    xdmcp_data[j++] = (the_addr >>  0) & 0xFF;
-	    xdmcp_data[j++] = (the_port >>  8) & 0xFF;
-	    xdmcp_data[j++] = (the_port >>  0) & 0xFF;
-	    break;
-	}
-#endif /* AF_UNIX */
-#ifdef AF_DECnet
-	case AF_DECnet:
-	    /*
-	     * What is the defined encoding for this?
-	     */
-	    break;
-#endif /* AF_DECnet */
-	default:
-	    /*
-	     * Need to return some kind of errro status here.
-	     * maybe a NULL auth??
-	     */
-	    break;
-	} /* switch */
-
-	if (addr)
-	    free ((char *) addr);
-
-	time (&now);
-	xdmcp_data[j++] = (now >> 24) & 0xFF;
-	xdmcp_data[j++] = (now >> 16) & 0xFF;
-	xdmcp_data[j++] = (now >>  8) & 0xFF;
-	xdmcp_data[j++] = (now >>  0) & 0xFF;
-	while (j < 192 / 8)
-	    xdmcp_data[j++] = 0;
-	_XLockMutex(_Xglobal_lock);
-	/* this function might use static data, hence the lock around it */
-	XdmcpWrap (xdmcp_data, auth_data + 8,
-		      xdmcp_data, j);
-	_XUnlockMutex(_Xglobal_lock);
-	auth_data = xdmcp_data;
-	auth_datalen = j;
-    }
-#endif /* HASXDMAUTH */
-#ifdef SECURE_RPC
-    /*
-     * The SUN-DES-1 authorization protocol uses the
-     * "secure RPC" mechanism in SunOS 4.0+.
-     */
-    if (auth_namelen == 9 && !strncmp(auth_name, "SUN-DES-1", 9)) {
-	char servernetname[MAXNETNAMELEN + 1];
-
-	/*
-	 * Copy over the server's netname from the authorization
-	 * data field filled in by XauGetAuthByAddr().
-	 */
-	if (auth_datalen > MAXNETNAMELEN) {
-	    auth_datalen = 0;
-	    auth_data = NULL;
-	} else {
-	    memcpy(servernetname, auth_data, auth_datalen);
-	    servernetname[auth_datalen] = '\0';
-
-	    auth_datalen = sizeof (rpc_cred);
-	    if (auth_ezencode(servernetname, 100, rpc_cred,
-			      &auth_datalen))
-		auth_data = rpc_cred;
-	    else {
-		auth_datalen = 0;
-		auth_data = NULL;
-	    }
-	}
-    }
-#endif
-    if (saddr) free ((char *) saddr);
-    if ((*auth_namelenp = auth_namelen))
-    {
-	if ((*auth_namep = Xmalloc(auth_namelen)))
-	    memcpy(*auth_namep, auth_name, auth_namelen);
-	else
-	    *auth_namelenp = 0;
-    }
-    else
-	*auth_namep = NULL;
-    if ((*auth_datalenp = auth_datalen))
-    {
-	if ((*auth_datap = Xmalloc(auth_datalen)))
-	    memcpy(*auth_datap, auth_data, auth_datalen);
-	else
-	    *auth_datalenp = 0;
-    }
-    else
-	*auth_datap = NULL;
-    if (authptr) XauDisposeAuth (authptr);
-}
diff --git a/xc/lib/X11/Context.c b/xc/lib/X11/Context.c
deleted file mode 100644
index dd24ba000..000000000
--- a/xc/lib/X11/Context.c
+++ /dev/null
@@ -1,314 +0,0 @@
-/* $TOG: Context.c /main/22 1998/02/06 17:12:29 kaleb $ */
-
-/***********************************************************
-Copyright 1987, 1988, 1990 by Digital Equipment Corporation, Maynard,
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-/*
-
-Copyright 1987, 1988, 1990, 1994, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/Context.c,v 1.2 1999/05/09 10:49:07 dawes Exp $ */
-
-/* This module implements a simple sparse array.
-
-   XSaveContext(a,b,c,d) will store d in position (a,b,c) of the array.
-   XFindContext(a,b,c,&d) will set d to be the value in position (a,b,c).
-   XDeleteContext(a,b,c) will delete the entry in (a,b,c).
-
-   a is a display id, b is a resource id, and c is a Context.  d is just an
-   XPointer.  This code will work with any range of parameters, but is geared
-   to be most efficient with very few (one or two) different a's.
-
-*/
-
-#include "Xlibint.h"
-#include "Xutil.h"
-#ifdef XTHREADS
-#include "locking.h"
-#endif
-
-#define INITHASHMASK 63 /* Number of entries originally in the hash table. */
-
-typedef struct _TableEntryRec {	/* Stores one entry. */
-    XID 			rid;
-    XContext			context;
-    XPointer			data;
-    struct _TableEntryRec	*next;
-} TableEntryRec, *TableEntry;
-
-typedef struct _XContextDB {	/* Stores hash table for one display. */
-    TableEntry *table;		/* Pointer to array of hash entries. */
-    int mask;			/* Current size of hash table minus 1. */
-    int numentries;		/* Number of entries currently in table. */
-#ifdef XTHREADS
-    LockInfoRec linfo;
-#endif
-} DBRec, *DB;
-
-#ifdef MOTIFBC
-static DB NullDB = (DB)0;
-#endif
-
-/* Given an XID and a context, returns a value between 0 and HashSize-1.
-   Currently, this requires that HashSize be a power of 2.
-*/
-
-#define Hash(db,rid,context) \
-    (db)->table[(((rid) << 1) + context) & (db)->mask]
-
-/* Resize the given db */
-
-static void ResizeTable(db)
-    register DB db;
-{
-    TableEntry *otable;
-    register TableEntry entry, next, *pold, *head;
-    register int i, j;
-
-    otable = db->table;
-    for (i = INITHASHMASK+1; (i + i) < db->numentries; )
-	i += i;
-    db->table = (TableEntry *) Xcalloc((unsigned)i, sizeof(TableEntry));
-    if (!db->table) {
-	db->table = otable;
-	return;
-    }
-    j = db->mask + 1;
-    db->mask = i - 1;
-    for (pold = otable ; --j >= 0; pold++) {
-	for (entry = *pold; entry; entry = next) {
-	    next = entry->next;
-	    head = &Hash(db, entry->rid, entry->context);
-	    entry->next = *head;
-	    *head = entry;
-	}
-    }
-    Xfree((char *) otable);
-}
-
-static void _XFreeContextDB(display)
-    Display *display;
-{
-    register DB db;
-    register int i;
-    register TableEntry *pentry, entry, next;
-
-    db = display->context_db;
-    if (db) {
-	for (i = db->mask + 1, pentry = db->table ; --i >= 0; pentry++) {
-	    for (entry = *pentry; entry; entry = next) {
-		next = entry->next;
-		Xfree((char *)entry);
-	    }
-	}
-	Xfree((char *) db->table);
-	_XFreeMutex(&db->linfo);
-	Xfree((char *) db);
-    }
-}
-
-/* Public routines. */
-
-/* Save the given value of data to correspond with the keys XID and context.
-   Returns nonzero error code if an error has occured, 0 otherwise.
-   Possible errors are Out-of-memory.
-*/   
-
-#if NeedFunctionPrototypes
-int XSaveContext(
-    Display *display,
-    register XID rid,
-    register XContext context,
-    _Xconst char* data)
-#else
-int XSaveContext(display, rid, context, data)
-    Display *display;
-    register XID rid;
-    register XContext context;
-    XPointer data;
-#endif
-{
-    DB *pdb;
-    register DB db;
-    TableEntry *head;
-    register TableEntry entry;
-
-#ifdef MOTIFBC
-    if (!display) {
-	pdb = &NullDB;
-	db = *pdb;
-    } else
-#endif
-    {
-	LockDisplay(display);
-	pdb = &display->context_db;
-	db = *pdb;
-	UnlockDisplay(display);
-    }
-    if (!db) {
-	db = (DB) Xmalloc(sizeof(DBRec));
-	if (!db)
-	    return XCNOMEM;
-	db->mask = INITHASHMASK;
-	db->table = (TableEntry *)Xcalloc(db->mask + 1, sizeof(TableEntry));
-	if (!db->table) {
-	    Xfree((char *)db);
-	    return XCNOMEM;
-	}
-	db->numentries = 0;
-	_XCreateMutex(&db->linfo);
-#ifdef MOTIFBC
-	if (!display) *pdb = db; else
-#endif
-	{
-	    LockDisplay(display);
-	    *pdb = db;
-	    display->free_funcs->context_db = _XFreeContextDB;
-	    UnlockDisplay(display);
-	}
-    }
-    _XLockMutex(&db->linfo);
-    head = &Hash(db, rid, context);
-    _XUnlockMutex(&db->linfo);
-    for (entry = *head; entry; entry = entry->next) {
-	if (entry->rid == rid && entry->context == context) {
-	    entry->data = (XPointer)data;
-	    return 0;
-	}
-    }
-    entry = (TableEntry) Xmalloc(sizeof(TableEntryRec));
-    if (!entry)
-	return XCNOMEM;
-    entry->rid = rid;
-    entry->context = context;
-    entry->data = (XPointer)data;
-    entry->next = *head;
-    *head = entry;
-    _XLockMutex(&db->linfo);
-    db->numentries++;
-    if (db->numentries > (db->mask << 2))
-	ResizeTable(db);
-    _XUnlockMutex(&db->linfo);
-    return 0;
-}
-
-
-
-/* Given an XID and context, returns the associated data.  Note that data 
-   here is a pointer since it is a return value.  Returns nonzero error code
-   if an error has occured, 0 otherwise.  Possible errors are Entry-not-found.
-*/
-
-int XFindContext(display, rid, context, data)
-    Display *display;
-    register XID rid;
-    register XContext context;
-    XPointer *data;		/* RETURN */
-{
-    register DB db;
-    register TableEntry entry;
-
-#ifdef MOTIFBC
-    if (!display) db = NullDB; else
-#endif
-    {
-	LockDisplay(display);
-	db = display->context_db;
-	UnlockDisplay(display);
-    }
-    if (!db)
-	return XCNOENT;
-    _XLockMutex(&db->linfo);
-    for (entry = Hash(db, rid, context); entry; entry = entry->next)
-    {
-	if (entry->rid == rid && entry->context == context) {
-	    *data = (XPointer)entry->data;
-	    _XUnlockMutex(&db->linfo);
-	    return 0;
-	}
-    }
-    _XUnlockMutex(&db->linfo);
-    return XCNOENT;
-}
-
-
-
-/* Deletes the entry for the given XID and context from the datastructure.
-   This returns the same thing that FindContext would have returned if called
-   with the same arguments.
-*/
-
-int XDeleteContext(display, rid, context)
-    Display *display;
-    register XID rid;
-    register XContext context;
-{
-    register DB db;
-    register TableEntry entry, *prev;
-
-#ifdef MOTIFBC
-    if (!display) db = NullDB; else
-#endif
-    {
-	LockDisplay(display);
-	db = display->context_db;
-	UnlockDisplay(display);
-    }
-    if (!db)
-	return XCNOENT;
-    _XLockMutex(&db->linfo);
-    for (prev = &Hash(db, rid, context);
-	 (entry = *prev);
-	 prev = &entry->next) {
-	if (entry->rid == rid && entry->context == context) {
-	    *prev = entry->next;
-	    Xfree((char *) entry);
-	    db->numentries--;
-	    if (db->numentries < db->mask && db->mask > INITHASHMASK)
-		ResizeTable(db);
-	    _XUnlockMutex(&db->linfo);
-	    return 0;
-	}
-    }
-    _XUnlockMutex(&db->linfo);
-    return XCNOENT;
-}
diff --git a/xc/lib/X11/ConvSel.c b/xc/lib/X11/ConvSel.c
deleted file mode 100644
index 849065a93..000000000
--- a/xc/lib/X11/ConvSel.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* $TOG: ConvSel.c /main/6 1998/02/06 17:12:42 kaleb $ */
-/*
-
-Copyright 1986,1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/ConvSel.c,v 1.2 1999/05/09 10:49:07 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XConvertSelection(dpy, selection, target, property, requestor, time)
-register Display *dpy;
-Atom selection, target;
-Atom property;
-Window requestor;
-Time time;
-{
-    register xConvertSelectionReq *req;
-
-    LockDisplay(dpy);
-    GetReq(ConvertSelection, req);
-    req->selection = selection;
-    req->target = target;
-    req->property = property;
-    req->requestor = requestor;
-    req->time = time;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/CopyArea.c b/xc/lib/X11/CopyArea.c
deleted file mode 100644
index 45f982ca2..000000000
--- a/xc/lib/X11/CopyArea.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* $TOG: CopyArea.c /main/6 1998/02/06 17:12:55 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/CopyArea.c,v 1.2 1999/05/09 10:49:08 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XCopyArea(dpy, src_drawable, dst_drawable, gc,
-	  src_x, src_y, width, height,
-	  dst_x, dst_y)
-     register Display *dpy;
-     Drawable src_drawable, dst_drawable;
-     GC gc;
-     int src_x, src_y;
-     unsigned int width, height;
-     int dst_x, dst_y;
-
-{
-    register xCopyAreaReq *req;
-
-    LockDisplay(dpy);
-    FlushGC(dpy, gc);
-    GetReq(CopyArea, req);
-    req->srcDrawable = src_drawable;
-    req->dstDrawable = dst_drawable;
-    req->gc = gc->gid;
-    req->srcX = src_x;
-    req->srcY = src_y;
-    req->dstX = dst_x;
-    req->dstY = dst_y;
-    req->width = width;
-    req->height = height;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/CopyCmap.c b/xc/lib/X11/CopyCmap.c
deleted file mode 100644
index 8acfe9d5c..000000000
--- a/xc/lib/X11/CopyCmap.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* $TOG: CopyCmap.c /main/7 1998/02/06 17:13:08 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/CopyCmap.c,v 1.2 1999/05/09 10:49:08 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/* cmsCmap.c */
-extern XcmsCmapRec * _XcmsCopyCmapRecAndFree(Display *dpy,
-					     Colormap src_cmap,
-					     Colormap copy_cmap);
-
-Colormap XCopyColormapAndFree(dpy, src_cmap)
-register Display *dpy;
-Colormap src_cmap;
-{
-    Colormap mid;
-    register xCopyColormapAndFreeReq *req;
-
-    LockDisplay(dpy);
-    GetReq(CopyColormapAndFree, req);
-
-    mid = req->mid = XAllocID(dpy);
-    req->srcCmap = src_cmap;
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-
-    _XcmsCopyCmapRecAndFree(dpy, src_cmap, mid);
-
-    return(mid);
-}
diff --git a/xc/lib/X11/CopyGC.c b/xc/lib/X11/CopyGC.c
deleted file mode 100644
index 884398d03..000000000
--- a/xc/lib/X11/CopyGC.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/* $TOG: CopyGC.c /main/10 1998/02/06 17:13:20 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/CopyGC.c,v 1.2 1999/05/09 10:49:09 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XCopyGC (dpy, srcGC, mask, destGC)
-     register Display *dpy;
-     unsigned long mask;		/* which ones to set initially */
-     GC srcGC, destGC;
-{
-    register XGCValues *destgv = &destGC->values,
-    		       *srcgv = &srcGC->values;
-    register xCopyGCReq *req;
-    register _XExtension *ext;
-
-    LockDisplay(dpy);
-
-    mask &= (1L << (GCLastBit + 1)) - 1;
-    /* if some of the source values to be copied are "dirty", flush them 
-       out before sending the CopyGC request. */
-    if (srcGC->dirty & mask)
-         _XFlushGCCache(dpy, srcGC);
-
-    /* mark the copied values "not dirty" in the destination. */
-    destGC->dirty &= ~mask;
-
-    GetReq(CopyGC, req);
-    req->srcGC = srcGC->gid;
-    req->dstGC = destGC->gid;
-    req->mask = mask;
-
-    if (mask & GCFunction)
-    	destgv->function = srcgv->function;
-	
-    if (mask & GCPlaneMask)
-        destgv->plane_mask = srcgv->plane_mask;
-
-    if (mask & GCForeground)
-        destgv->foreground = srcgv->foreground;
-
-    if (mask & GCBackground)
-        destgv->background = srcgv->background;
-
-    if (mask & GCLineWidth)
-        destgv->line_width = srcgv->line_width;
-
-    if (mask & GCLineStyle)
-        destgv->line_style = srcgv->line_style;
-
-    if (mask & GCCapStyle)
-        destgv->cap_style = srcgv->cap_style;
-    
-    if (mask & GCJoinStyle)
-        destgv->join_style = srcgv->join_style;
-
-    if (mask & GCFillStyle)
-    	destgv->fill_style = srcgv->fill_style;
-
-    if (mask & GCFillRule) 
-        destgv->fill_rule = srcgv->fill_rule;
-
-    if (mask & GCArcMode)
-        destgv->arc_mode = srcgv->arc_mode;
-
-    if (mask & GCTile)
-        destgv->tile = srcgv->tile;
-
-    if (mask & GCStipple)
-        destgv->stipple = srcgv->stipple;
-
-    if (mask & GCTileStipXOrigin)
-        destgv->ts_x_origin = srcgv->ts_x_origin;
-
-    if (mask & GCTileStipYOrigin)
-        destgv->ts_y_origin = srcgv->ts_y_origin;
-
-    if (mask & GCFont) 
-        destgv->font = srcgv->font;
-
-    if (mask & GCSubwindowMode) 
-        destgv->subwindow_mode = srcgv->subwindow_mode;
-
-    if (mask & GCGraphicsExposures) 
-        destgv->graphics_exposures = srcgv->graphics_exposures;
-
-    if (mask & GCClipXOrigin) 
-        destgv->clip_x_origin = srcgv->clip_x_origin;
-
-    if (mask & GCClipYOrigin) 
-        destgv->clip_y_origin = srcgv->clip_y_origin;
-
-    if (mask & GCClipMask) {
-	destGC->rects = srcGC->rects;
-        destgv->clip_mask = srcgv->clip_mask;
-	}
-
-    if (mask & GCDashOffset) 
-        destgv->dash_offset = srcgv->dash_offset;
-
-    if (mask & GCDashList) {
-	destGC->dashes = srcGC->dashes;
-        destgv->dashes = srcgv->dashes;
-	}
-    /* call out to any extensions interested */
-    for (ext = dpy->ext_procs; ext; ext = ext->next)
-	if (ext->copy_GC) (*ext->copy_GC)(dpy, destGC, &ext->codes);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-    }
diff --git a/xc/lib/X11/CopyPlane.c b/xc/lib/X11/CopyPlane.c
deleted file mode 100644
index 594d8ba12..000000000
--- a/xc/lib/X11/CopyPlane.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* $TOG: CopyPlane.c /main/6 1998/02/06 17:13:33 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/CopyPlane.c,v 1.2 1999/05/09 10:49:09 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XCopyPlane(dpy, src_drawable, dst_drawable, gc,
-	  src_x, src_y, width, height,
-	  dst_x, dst_y, bit_plane)
-     register Display *dpy;
-     Drawable src_drawable, dst_drawable;
-     GC gc;
-     int src_x, src_y;
-     unsigned int width, height;
-     int dst_x, dst_y;
-     unsigned long bit_plane;
-
-{       
-    register xCopyPlaneReq *req;
-
-    LockDisplay(dpy);
-    FlushGC(dpy, gc);
-    GetReq(CopyPlane, req);
-    req->srcDrawable = src_drawable;
-    req->dstDrawable = dst_drawable;
-    req->gc = gc->gid;
-    req->srcX = src_x;
-    req->srcY = src_y;
-    req->dstX = dst_x;
-    req->dstY = dst_y;
-    req->width = width;
-    req->height = height;
-    req->bitPlane = bit_plane;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/CrBFData.c b/xc/lib/X11/CrBFData.c
deleted file mode 100644
index 88cdbdb52..000000000
--- a/xc/lib/X11/CrBFData.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* $TOG: CrBFData.c /main/13 1998/02/06 17:13:46 kaleb $ */
-/*
-
-Copyright 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#include "Xlib.h"
-
-/*
- * XCreateBitmapFromData: Routine to make a pixmap of depth 1 from user 
- *	                  supplied data.
- *	D is any drawable on the same screen that the pixmap will be used in.
- *	Data is a pointer to the bit data, and 
- *	width & height give the size in bits of the pixmap.
- *
- * The following format is assumed for data:
- *
- *    format=XYPixmap
- *    bit_order=LSBFirst
- *    byte_order=LSBFirst
- *    padding=8
- *    bitmap_unit=8
- *    xoffset=0
- *    no extra bytes per line
- */  
-#if NeedFunctionPrototypes
-Pixmap XCreateBitmapFromData(
-     Display *display,
-     Drawable d,
-     _Xconst char *data,
-     unsigned int width,
-     unsigned int height)
-#else
-Pixmap XCreateBitmapFromData(display, d, data, width, height)
-     Display *display;
-     Drawable d;
-     char *data;
-     unsigned int width, height;
-#endif
-{
-    XImage ximage;
-    GC gc;
-    Pixmap pix;
-
-    pix = XCreatePixmap(display, d, width, height, 1);
-    if (! (gc = XCreateGC(display, pix, (unsigned long) 0, (XGCValues *) 0)))
-	return (Pixmap) None;
-    ximage.height = height;
-    ximage.width = width;
-    ximage.depth = 1;
-    ximage.bits_per_pixel = 1;
-    ximage.xoffset = 0;
-    ximage.format = XYPixmap;
-    ximage.data = (char *)data;
-    ximage.byte_order = LSBFirst;
-    ximage.bitmap_unit = 8;
-    ximage.bitmap_bit_order = LSBFirst;
-    ximage.bitmap_pad = 8;
-    ximage.bytes_per_line = (width+7)/8;
-
-    XPutImage(display, pix, gc, &ximage, 0, 0, 0, 0, width, height);
-    XFreeGC(display, gc);
-    return(pix);
-}
diff --git a/xc/lib/X11/CrCmap.c b/xc/lib/X11/CrCmap.c
deleted file mode 100644
index dd845fdd8..000000000
--- a/xc/lib/X11/CrCmap.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* $TOG: CrCmap.c /main/7 1998/02/06 17:13:58 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/CrCmap.c,v 1.2 1999/05/09 10:49:09 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/* EXTERNS */
-/* cmsCmap.c */
-extern XcmsCmapRec * _XcmsAddCmapRec();
-
-Colormap XCreateColormap(dpy, w, visual, alloc)
-register Display *dpy;
-Window w;
-Visual *visual;
-int alloc;
-{
-    register xCreateColormapReq *req;
-    Colormap mid;
-
-    LockDisplay(dpy);
-    GetReq(CreateColormap, req);
-    req->window = w;
-    mid = req->mid = XAllocID(dpy);
-    req->alloc = alloc;
-    if (visual == CopyFromParent) req->visual = CopyFromParent;
-    else req->visual = visual->visualid;
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-
-    _XcmsAddCmapRec(dpy, mid, w, visual);
-
-    return(mid);
-}
diff --git a/xc/lib/X11/CrCursor.c b/xc/lib/X11/CrCursor.c
deleted file mode 100644
index 46ee13276..000000000
--- a/xc/lib/X11/CrCursor.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* $TOG: CrCursor.c /main/5 1998/02/06 17:14:11 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#include "Xlibint.h"
-
-Cursor XCreatePixmapCursor(dpy, source, mask, foreground, background, x, y)
-     register Display *dpy;
-     Pixmap source, mask;
-     XColor *foreground, *background;
-     unsigned int  x, y;
-
-{       
-    register xCreateCursorReq *req;
-    Cursor cid;
-
-    LockDisplay(dpy);
-    GetReq(CreateCursor, req);
-    req->cid = cid = XAllocID(dpy);
-    req->source = source;
-    req->mask = mask;
-    req->foreRed = foreground->red;
-    req->foreGreen = foreground->green;
-    req->foreBlue = foreground->blue;
-    req->backRed = background->red;
-    req->backGreen = background->green;
-    req->backBlue = background->blue;
-    req->x = x;
-    req->y = y;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return (cid);
-}
-
diff --git a/xc/lib/X11/CrGC.c b/xc/lib/X11/CrGC.c
deleted file mode 100644
index d16490780..000000000
--- a/xc/lib/X11/CrGC.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/* $TOG: CrGC.c /main/27 1998/02/06 17:14:22 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/CrGC.c,v 3.3 1999/05/09 10:49:10 dawes Exp $ */
-
-#include "Xlibint.h"
-
-#ifdef __STDC__
-#define Const const
-#else
-#define Const /**/
-#endif
-
-static XGCValues Const initial_GC = {
-    GXcopy, 	/* function */
-    AllPlanes,	/* plane_mask */
-    0L,		/* foreground */
-    1L,		/* background */
-    0,		/* line_width */
-    LineSolid,	/* line_style */
-    CapButt,	/* cap_style */
-    JoinMiter,	/* join_style */
-    FillSolid,	/* fill_style */
-    EvenOddRule,/* fill_rule */
-    ArcPieSlice,/* arc_mode */
-    (Pixmap)~0L,/* tile, impossible (unknown) resource */
-    (Pixmap)~0L,/* stipple, impossible (unknown) resource */
-    0,		/* ts_x_origin */
-    0,		/* ts_y_origin */
-    (Font)~0L,	/* font, impossible (unknown) resource */
-    ClipByChildren, /* subwindow_mode */
-    True,	/* graphics_exposures */
-    0,		/* clip_x_origin */
-    0,		/* clip_y_origin */
-    None,	/* clip_mask */
-    0,		/* dash_offset */
-    4		/* dashes (list [4,4]) */
-};
-
-static void _XGenerateGCList();
-int _XUpdateGCCache();
-
-GC XCreateGC (dpy, d, valuemask, values)
-     register Display *dpy;
-     Drawable d;		/* Window or Pixmap for which depth matches */
-     unsigned long valuemask;	/* which ones to set initially */
-     XGCValues *values;		/* the values themselves */
-{
-    register GC gc;
-    register xCreateGCReq *req;
-    register _XExtension *ext;
-
-    LockDisplay(dpy);
-    if ((gc = (GC)Xmalloc (sizeof(struct _XGC))) == NULL) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return (NULL);
-    }
-    gc->rects = 0;
-    gc->dashes = 0;
-    gc->ext_data = NULL;
-    gc->values = initial_GC;
-    gc->dirty = 0L;
-
-    valuemask &= (1L << (GCLastBit + 1)) - 1;
-    if (valuemask) _XUpdateGCCache (gc, valuemask, values);
-
-    GetReq(CreateGC, req);
-    req->drawable = d;
-    req->gc = gc->gid = XAllocID(dpy);
-
-    if ((req->mask = gc->dirty))
-        _XGenerateGCList (dpy, gc, (xReq *) req);
-    /* call out to any extensions interested */
-    for (ext = dpy->ext_procs; ext; ext = ext->next)
-	if (ext->create_GC) (*ext->create_GC)(dpy, gc, &ext->codes);
-    gc->dirty = 0L; /* allow extensions to see dirty bits */
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return (gc);
-    }
-
-/*
- * GenerateGCList looks at the GC dirty bits, and appends all the required
- * long words to the request being generated.
- */
-
-static void
-_XGenerateGCList (dpy, gc, req)
-    register Display *dpy;
-    xReq *req;
-    GC gc;
-    {
-    unsigned long values[32];
-    register unsigned long *value = values;
-    long nvalues;
-    register XGCValues *gv = &gc->values;
-    register unsigned long dirty = gc->dirty;
-
-    /*
-     * Note: The order of these tests are critical; the order must be the
-     * same as the GC mask bits in the word.
-     */
-    if (dirty & GCFunction)          *value++ = gv->function;
-    if (dirty & GCPlaneMask)         *value++ = gv->plane_mask;
-    if (dirty & GCForeground)        *value++ = gv->foreground;
-    if (dirty & GCBackground)        *value++ = gv->background;
-    if (dirty & GCLineWidth)         *value++ = gv->line_width;
-    if (dirty & GCLineStyle)         *value++ = gv->line_style;
-    if (dirty & GCCapStyle)          *value++ = gv->cap_style;
-    if (dirty & GCJoinStyle)         *value++ = gv->join_style;
-    if (dirty & GCFillStyle)         *value++ = gv->fill_style;
-    if (dirty & GCFillRule)          *value++ = gv->fill_rule;
-    if (dirty & GCTile)              *value++ = gv->tile;
-    if (dirty & GCStipple)           *value++ = gv->stipple;
-    if (dirty & GCTileStipXOrigin)   *value++ = gv->ts_x_origin;
-    if (dirty & GCTileStipYOrigin)   *value++ = gv->ts_y_origin;
-    if (dirty & GCFont)              *value++ = gv->font;
-    if (dirty & GCSubwindowMode)     *value++ = gv->subwindow_mode;
-    if (dirty & GCGraphicsExposures) *value++ = gv->graphics_exposures;
-    if (dirty & GCClipXOrigin)       *value++ = gv->clip_x_origin;
-    if (dirty & GCClipYOrigin)       *value++ = gv->clip_y_origin;
-    if (dirty & GCClipMask)          *value++ = gv->clip_mask;
-    if (dirty & GCDashOffset)        *value++ = gv->dash_offset;
-    if (dirty & GCDashList)          *value++ = gv->dashes;
-    if (dirty & GCArcMode)           *value++ = gv->arc_mode;
-
-    req->length += (nvalues = value - values);
-
-    /* 
-     * note: Data is a macro that uses its arguments multiple
-     * times, so "nvalues" is changed in a separate assignment
-     * statement 
-     */
-
-    nvalues <<= 2;
-    Data32 (dpy, (long *) values, nvalues);
-
-    }
-
-
-int
-_XUpdateGCCache (gc, mask, attr)
-    register unsigned long mask;
-    register XGCValues *attr;
-    register GC gc;
-    {
-    register XGCValues *gv = &gc->values;
-
-    if (mask & GCFunction)
-        if (gv->function != attr->function) {
-	  gv->function = attr->function;
-	  gc->dirty |= GCFunction;
-	}
-	
-    if (mask & GCPlaneMask)
-        if (gv->plane_mask != attr->plane_mask) {
-            gv->plane_mask = attr->plane_mask;
-	    gc->dirty |= GCPlaneMask;
-	  }
-
-    if (mask & GCForeground)
-        if (gv->foreground != attr->foreground) {
-            gv->foreground = attr->foreground;
-	    gc->dirty |= GCForeground;
-	  }
-
-    if (mask & GCBackground)
-        if (gv->background != attr->background) {
-            gv->background = attr->background;
-	    gc->dirty |= GCBackground;
-	  }
-
-    if (mask & GCLineWidth)
-        if (gv->line_width != attr->line_width) {
-            gv->line_width = attr->line_width;
-	    gc->dirty |= GCLineWidth;
-	  }
-
-    if (mask & GCLineStyle)
-        if (gv->line_style != attr->line_style) {
-            gv->line_style = attr->line_style;
-	    gc->dirty |= GCLineStyle;
-	  }
-
-    if (mask & GCCapStyle)
-        if (gv->cap_style != attr->cap_style) {
-            gv->cap_style = attr->cap_style;
-	    gc->dirty |= GCCapStyle;
-	  }
-    
-    if (mask & GCJoinStyle)
-        if (gv->join_style != attr->join_style) {
-            gv->join_style = attr->join_style;
-	    gc->dirty |= GCJoinStyle;
-	  }
-
-    if (mask & GCFillStyle)
-        if (gv->fill_style != attr->fill_style) {
-            gv->fill_style = attr->fill_style;
-	    gc->dirty |= GCFillStyle;
-	  }
-
-    if (mask & GCFillRule)
-        if (gv->fill_rule != attr->fill_rule) {
-    	    gv->fill_rule = attr->fill_rule;
-	    gc->dirty |= GCFillRule;
-	  }
-
-    if (mask & GCArcMode)
-        if (gv->arc_mode != attr->arc_mode) {
-	    gv->arc_mode = attr->arc_mode;
-	    gc->dirty |= GCArcMode;
-	  }
-
-    /* always write through tile change, since client may have changed pixmap contents */
-    if (mask & GCTile) {
-	    gv->tile = attr->tile;
-	    gc->dirty |= GCTile;
-	  }
-
-    /* always write through stipple change, since client may have changed pixmap contents */
-    if (mask & GCStipple) {
-	    gv->stipple = attr->stipple;
-	    gc->dirty |= GCStipple;
-	  }
-
-    if (mask & GCTileStipXOrigin)
-        if (gv->ts_x_origin != attr->ts_x_origin) {
-    	    gv->ts_x_origin = attr->ts_x_origin;
-	    gc->dirty |= GCTileStipXOrigin;
-	  }
-
-    if (mask & GCTileStipYOrigin)
-        if (gv->ts_y_origin != attr->ts_y_origin) {
-	    gv->ts_y_origin = attr->ts_y_origin;
-	    gc->dirty |= GCTileStipYOrigin;
-	  }
-
-    if (mask & GCFont)
-        if (gv->font != attr->font) {
-	    gv->font = attr->font;
-	    gc->dirty |= GCFont;
-	  }
-
-    if (mask & GCSubwindowMode)
-        if (gv->subwindow_mode != attr->subwindow_mode) {
-	    gv->subwindow_mode = attr->subwindow_mode;
-	    gc->dirty |= GCSubwindowMode;
-	  }
-
-    if (mask & GCGraphicsExposures)
-        if (gv->graphics_exposures != attr->graphics_exposures) {
-	    gv->graphics_exposures = attr->graphics_exposures;
-	    gc->dirty |= GCGraphicsExposures;
-	  }
-
-    if (mask & GCClipXOrigin)
-        if (gv->clip_x_origin != attr->clip_x_origin) {
-	    gv->clip_x_origin = attr->clip_x_origin;
-	    gc->dirty |= GCClipXOrigin;
-	  }
-
-    if (mask & GCClipYOrigin)
-        if (gv->clip_y_origin != attr->clip_y_origin) {
-	    gv->clip_y_origin = attr->clip_y_origin;
-	    gc->dirty |= GCClipYOrigin;
-	  }
-
-    /* always write through mask change, since client may have changed pixmap contents */
-    if (mask & GCClipMask) {
-	    gv->clip_mask = attr->clip_mask;
-	    gc->dirty |= GCClipMask;
-	    gc->rects = 0;
-	  }
-
-    if (mask & GCDashOffset)
-        if (gv->dash_offset != attr->dash_offset) {
-	    gv->dash_offset = attr->dash_offset;
-	    gc->dirty |= GCDashOffset;
-	  }
-
-    if (mask & GCDashList)
-        if ((gv->dashes != attr->dashes) || (gc->dashes == True)) {
-            gv->dashes = attr->dashes;
-	    gc->dirty |= GCDashList;
-	    gc->dashes = 0;
-	    }
-    return 0;
-    }
-
-/* can only call when display is already locked. */
-
-void _XFlushGCCache(dpy, gc)
-     Display *dpy;
-     GC gc;
-{
-    register xChangeGCReq *req;
-    register _XExtension *ext;
-
-    if (gc->dirty) {
-        GetReq(ChangeGC, req);
-        req->gc = gc->gid;
-	req->mask = gc->dirty;
-        _XGenerateGCList (dpy, gc, (xReq *) req);
-	/* call out to any extensions interested */
-	for (ext = dpy->ext_procs; ext; ext = ext->next)
-	    if (ext->flush_GC) (*ext->flush_GC)(dpy, gc, &ext->codes);
-	gc->dirty = 0L; /* allow extensions to see dirty bits */
-    }
-}
-
-void XFlushGC(dpy, gc)
-     Display *dpy;
-     GC gc;
-{
-    FlushGC(dpy, gc);
-}
-
-GContext XGContextFromGC(gc)
-    GC gc;
-    { return (gc->gid); }
diff --git a/xc/lib/X11/CrGlCur.c b/xc/lib/X11/CrGlCur.c
deleted file mode 100644
index ad8633caa..000000000
--- a/xc/lib/X11/CrGlCur.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* $TOG: CrGlCur.c /main/5 1998/02/06 17:14:36 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#include "Xlibint.h"
-
-Cursor XCreateGlyphCursor(dpy, source_font, mask_font,
-		   source_char, mask_char,
-		   foreground, background)
-     register Display *dpy;
-     Font source_font, mask_font;
-     unsigned int source_char, mask_char;
-     XColor *foreground, *background;
-
-{       
-    Cursor cid;
-    register xCreateGlyphCursorReq *req;
-
-    LockDisplay(dpy);
-    GetReq(CreateGlyphCursor, req);
-    cid = req->cid = XAllocID(dpy);
-    req->source = source_font;
-    req->mask = mask_font;
-    req->sourceChar = source_char;
-    req->maskChar = mask_char;
-    req->foreRed = foreground->red;
-    req->foreGreen = foreground->green;
-    req->foreBlue = foreground->blue;
-    req->backRed = background->red;
-    req->backGreen = background->green;
-    req->backBlue = background->blue;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return (cid);
-}
-
diff --git a/xc/lib/X11/CrPFBData.c b/xc/lib/X11/CrPFBData.c
deleted file mode 100644
index 1fd027f31..000000000
--- a/xc/lib/X11/CrPFBData.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* $TOG: CrPFBData.c /main/9 1998/02/06 17:14:49 kaleb $ */
-/*
-
-Copyright 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#include "Xlib.h"
-#include <stdio.h>
-
-/*
- * XCreatePixmapFromBitmapData: Routine to make a pixmap from user supplied bitmap data.
- *             D is any drawable on the same screen that the pixmap will be used in.
- *             Data is a pointer to the bit data, and 
- *             width & height give the size in bits of the pixmap.
- *             Fg and Bg are the pixel values to use for the two colors.
- *             Depth is the depth of the pixmap to create.
- *
- * The following format is assumed for data:
- *
- *    format=XYPixmap
- *    bit_order=LSBFirst
- *    byte_order=LSBFirst
- *    padding=8
- *    bitmap_unit=8
- *    xoffset=0
- *    no extra bytes per line
- */  
-Pixmap XCreatePixmapFromBitmapData(display,d,data,width,height,fg,bg,depth)
-    Display *display;
-    Drawable d;
-    char *data;
-    unsigned int width, height;
-    unsigned long fg, bg;
-    unsigned int depth;
-{
-    XImage ximage;
-    GC gc;
-    XGCValues gcv;
-    Pixmap pix;
-
-    pix = XCreatePixmap(display, d, width, height, depth);
-    gcv.foreground = fg;
-    gcv.background = bg;
-    if (! (gc = XCreateGC(display, pix, GCForeground|GCBackground, &gcv)))
-	return (Pixmap) NULL;
-    ximage.height = height;
-    ximage.width = width;
-    ximage.depth = 1;
-    ximage.bits_per_pixel = 1;
-    ximage.xoffset = 0;
-    ximage.format = XYBitmap;
-    ximage.data = data;
-    ximage.byte_order = LSBFirst;
-    ximage.bitmap_unit = 8;
-    ximage.bitmap_bit_order = LSBFirst;
-    ximage.bitmap_pad = 8;
-    ximage.bytes_per_line = (width+7)/8;
-
-    XPutImage(display, pix, gc, &ximage, 0, 0, 0, 0, width, height);
-    XFreeGC(display, gc);
-    return(pix);
-}
diff --git a/xc/lib/X11/CrPixmap.c b/xc/lib/X11/CrPixmap.c
deleted file mode 100644
index 54f5803f3..000000000
--- a/xc/lib/X11/CrPixmap.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $TOG: CrPixmap.c /main/5 1998/02/06 17:15:01 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#include "Xlibint.h"
-
-Pixmap XCreatePixmap (dpy, d, width, height, depth)
-    register Display *dpy;
-    Drawable d;
-    unsigned int width, height, depth;
-{
-    Pixmap pid;
-    register xCreatePixmapReq *req;
-
-    LockDisplay(dpy);
-    GetReq(CreatePixmap, req);
-    req->drawable = d;
-    req->width = width;
-    req->height = height;
-    req->depth = depth;
-    pid = req->pid = XAllocID(dpy);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return (pid);
-}
-
diff --git a/xc/lib/X11/CrWindow.c b/xc/lib/X11/CrWindow.c
deleted file mode 100644
index 3a6fc9c2d..000000000
--- a/xc/lib/X11/CrWindow.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* $TOG: CrWindow.c /main/8 1998/02/06 17:15:28 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#include "Xlibint.h"
-
-Window XCreateSimpleWindow(dpy, parent, x, y, width, height, 
-                      borderWidth, border, background)
-    register Display *dpy;
-    Window parent;
-    int x, y;
-    unsigned int width, height, borderWidth;
-    unsigned long border;
-    unsigned long background;
-{
-    Window wid;
-    register xCreateWindowReq *req;
-
-    LockDisplay(dpy);
-    GetReqExtra(CreateWindow, 8, req);
-    req->parent = parent;
-    req->x = x;
-    req->y = y;
-    req->width = width;
-    req->height = height;
-    req->borderWidth = borderWidth;
-    req->depth = 0;
-    req->class = CopyFromParent;
-    req->visual = CopyFromParent;
-    wid = req->wid = XAllocID(dpy);
-    req->mask = CWBackPixel | CWBorderPixel;
-
-#ifdef MUSTCOPY
-    {
-	unsigned long lbackground = background, lborder = border;
-	dpy->bufptr -= 8;
-	Data32 (dpy, (long *) &lbackground, 4);
-	Data32 (dpy, (long *) &lborder, 4);
-    }
-#else
-    {
-	register CARD32 *valuePtr = (CARD32 *) NEXTPTR(req,xCreateWindowReq);
-	*valuePtr++ = background;
-	*valuePtr = border;
-    }
-#endif /* MUSTCOPY */
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return (wid);
-    }
diff --git a/xc/lib/X11/Cursor.c b/xc/lib/X11/Cursor.c
deleted file mode 100644
index e0f674e06..000000000
--- a/xc/lib/X11/Cursor.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* $TOG: Cursor.c /main/8 1998/02/06 17:16:09 kaleb $ */
-/*
-
-Copyright 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#include "Xlibint.h"
-static XColor foreground = { 0,    0,     0,     0  };  /* black */
-static XColor background = { 0, 65535, 65535, 65535 };  /* white */
-
-Cursor XCreateFontCursor(dpy, which)
-	Display *dpy;
-	unsigned int which;
-{
-	/* 
-	 * the cursor font contains the shape glyph followed by the mask
-	 * glyph; so character position 0 contains a shape, 1 the mask for 0,
-	 * 2 a shape, etc.  <X11/cursorfont.h> contains hash define names
-	 * for all of these.
-	 */
-
-	if (dpy->cursor_font == None) {
-	    dpy->cursor_font = XLoadFont (dpy, CURSORFONT);
-	    if (dpy->cursor_font == None) return None;
-	}
-
-	return XCreateGlyphCursor (dpy, dpy->cursor_font, dpy->cursor_font, 
-				   which, which + 1, &foreground, &background);
-}
-
diff --git a/xc/lib/X11/CvColW.c b/xc/lib/X11/CvColW.c
deleted file mode 100644
index 4f139e5dd..000000000
--- a/xc/lib/X11/CvColW.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/* $XConsortium: CvColW.c,v 1.4 91/05/13 23:19:33 rws Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *
- *	NAME
- *		XcmsCvColW.c
- *
- *	DESCRIPTION
- *		<overall description of what the package does>
- *
- *
- */
-/* $XFree86: xc/lib/X11/CvColW.c,v 1.2 1999/05/09 10:49:10 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/* EXTERNS */
-/* CvCols.c */
-extern Status _XcmsDDConvertColors();
-extern Status _XcmsDIConvertColors();
-
-
-
-/************************************************************************
- *									*
- *			 API PRIVATE ROUTINES				*
- *									*
- ************************************************************************/
-
-
-/*
- *	NAME
- *		_XcmsConvertColorsWithWhitePt - Convert XcmsColor structures
- *
- *	SYNOPSIS
- */
-Status
-_XcmsConvertColorsWithWhitePt(ccc, pColors_in_out, pWhitePt, nColors,
-	newFormat, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pColors_in_out;
-    XcmsColor *pWhitePt;
-    unsigned int nColors;
-    XcmsColorFormat newFormat;
-    Bool *pCompressed;
-/*
- *	DESCRIPTION
- *		Convert XcmsColor structures between device-independent
- *		and/or device-dependent formats but allowing the calling
- *		routine to specify the white point to be associated
- *		with the color specifications (overriding
- *		ccc->clientWhitePt).
- *
- *		This routine has been provided for use in white point
- *		adjustment routines.
- *
- *	RETURNS
- *		XcmsFailure if failed,
- *		XcmsSuccess if succeeded without gamut compression,
- *		XcmsSuccessWithCompression if succeeded with gamut
- *			compression.
- *
- */
-{
-    if (ccc == NULL || pColors_in_out == NULL ||
-	    pColors_in_out->format == XcmsUndefinedFormat) {
-	return(XcmsFailure);
-    }
-
-    if (nColors == 0 || pColors_in_out->format == newFormat) {
-	/* do nothing */
-	return(XcmsSuccess);
-    }
-
-    if (XCMS_DI_ID(pColors_in_out->format) && XCMS_DI_ID(newFormat)) {
-	/*
-	 * Device-Independent to Device-Independent Conversion
-	 */
-	return(_XcmsDIConvertColors(ccc, pColors_in_out, pWhitePt, nColors,
-		newFormat));
-    }
-    if (XCMS_DD_ID(pColors_in_out->format) && XCMS_DD_ID(newFormat)) {
-	/*
-	 * Device-Dependent to Device-Dependent Conversion
-	 */
-	return(_XcmsDDConvertColors(ccc, pColors_in_out, nColors, newFormat,
-		pCompressed));
-    }
-
-    /*
-     * Otherwise we have:
-     *    1. Device-Independent to Device-Dependent Conversion
-     *		OR
-     *    2. Device-Dependent to Device-Independent Conversion
-     */
-
-    if (XCMS_DI_ID(pColors_in_out->format)) {
-	/*
-	 *    1. Device-Independent to Device-Dependent Conversion
-	 */
-	/* First convert to CIEXYZ */
-	if (_XcmsDIConvertColors(ccc, pColors_in_out, pWhitePt, nColors,
-		XcmsCIEXYZFormat) == XcmsFailure) {
-	    return(XcmsFailure);
-	}
-	/* Then convert to DD Format */
-	return(_XcmsDDConvertColors(ccc, pColors_in_out, nColors, newFormat,
-		pCompressed));
-    } else {
-	/*
-	 *    2. Device-Dependent to Device-Independent Conversion
-	 */
-	/* First convert to CIEXYZ */
-	if (_XcmsDDConvertColors(ccc, pColors_in_out, nColors,
-		XcmsCIEXYZFormat, pCompressed) == XcmsFailure) {
-	    return(XcmsFailure);
-	}
-	/* Then convert to DI Format */
-	return(_XcmsDIConvertColors(ccc, pColors_in_out, pWhitePt, nColors,
-		newFormat));
-    }
-}
diff --git a/xc/lib/X11/CvCols.c b/xc/lib/X11/CvCols.c
deleted file mode 100644
index 0a6708bdc..000000000
--- a/xc/lib/X11/CvCols.c
+++ /dev/null
@@ -1,1050 +0,0 @@
-/* $XConsortium: CvCols.c,v 1.12 93/09/07 21:30:32 rws Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		XcmsCvCols.c
- *
- *	DESCRIPTION
- *		Xcms API routine that converts between the
- *		device-independent color spaces.
- *
- *
- */
-/* $XFree86: xc/lib/X11/CvCols.c,v 1.2 1999/05/09 10:49:11 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/*
- *      EXTERNS
- *              External declarations required locally to this package
- *              that are not already declared in any of the included header
- *		files (external includes or internal includes).
- */
-extern XcmsRegColorSpaceEntry _XcmsRegColorSpaces[];
-extern XcmsColorSpace **_XcmsDIColorSpaces;
-extern XcmsColorSpace **_XcmsDDColorSpaces;
-
-/*
- *      LOCAL DEFINES
- */
-#define	DD_FORMAT	0x01
-#define	DI_FORMAT	0x02
-#define	MIX_FORMAT	0x04
-#ifndef MAX
-#  define MAX(x,y) ((x) > (y) ? (x) : (y))
-#endif
-
-/*
- *      FORWARD DECLARATIONS
- */
-Status _XcmsDIConvertColors();
-Status _XcmsDDConvertColors();
-int _XcmsEqualWhitePts();
-
-
-/************************************************************************
- *									*
- *			 PRIVATE ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		EqualCIEXYZ
- *
- *	SYNOPSIS
- */
-static int
-EqualCIEXYZ(p1, p2)
-    XcmsColor *p1, *p2;
-/*
- *	DESCRIPTION
- *		Compares two XcmsColor structures that are in XcmsCIEXYZFormat
- *
- *	RETURNS
- *		Returns 1 if equal; 0 otherwise.
- *
- */
-{
-    if (p1->format != XcmsCIEXYZFormat || p2->format != XcmsCIEXYZFormat) {
-	return(0);
-    }
-    if ((p1->spec.CIEXYZ.X != p2->spec.CIEXYZ.X)
-	    || (p1->spec.CIEXYZ.Y != p2->spec.CIEXYZ.Y)
-	    || (p1->spec.CIEXYZ.Z != p2->spec.CIEXYZ.Z)) {
-	return(0);
-    }
-    return(1);
-}
-
-
-/*
- *	NAME
- *		XcmsColorSpace
- *
- *	SYNOPSIS
- */
-static XcmsColorSpace *
-ColorSpaceOfID(ccc, id)
-    XcmsCCC ccc;
-    XcmsColorFormat	id;
-/*
- *	DESCRIPTION
- *		Returns a pointer to the color space structure
- *		(XcmsColorSpace) associated with the specified color space
- *		ID.
- *
- *	RETURNS
- *		Pointer to matching XcmsColorSpace structure if found;
- *		otherwise NULL.
- */
-{
-    XcmsColorSpace	**papColorSpaces;
-
-    if (ccc == NULL) {
-	return(NULL);
-    }
-
-    /*
-     * First try Device-Independent color spaces
-     */
-    papColorSpaces = _XcmsDIColorSpaces;
-    if (papColorSpaces != NULL) {
-	while (*papColorSpaces != NULL) {
-	    if ((*papColorSpaces)->id == id) {
-		return(*papColorSpaces);
-	    }
-	    papColorSpaces++;
-	}
-    }
-
-    /*
-     * Next try Device-Dependent color spaces
-     */
-    papColorSpaces = ((XcmsFunctionSet *)ccc->pPerScrnInfo->functionSet)->DDColorSpaces;
-    if (papColorSpaces != NULL) {
-	while (*papColorSpaces != NULL) {
-	    if ((*papColorSpaces)->id == id) {
-		return(*papColorSpaces);
-	    }
-	    papColorSpaces++;
-	}
-    }
-
-    return(NULL);
-}
-
-
-/*
- *	NAME
- *		ValidDIColorSpaceID
- *
- *	SYNOPSIS
- */
-static int
-ValidDIColorSpaceID(id)
-    XcmsColorFormat id;
-/*
- *	DESCRIPTION
- *		Determines if the specified color space ID is a valid
- *		Device-Independent color space in the specified Color
- *		Conversion Context.
- *
- *	RETURNS
- *		Returns zero if not valid; otherwise non-zero.
- */
-{
-    XcmsColorSpace **papRec;
-    papRec = _XcmsDIColorSpaces;
-    if (papRec != NULL) {
-	while (*papRec != NULL) {
-	    if ((*papRec)->id == id) {
-		return(1);
-	    }
-	    papRec++;
-	}
-    }
-    return(0);
-}
-
-
-/*
- *	NAME
- *		ValidDDColorSpaceID
- *
- *	SYNOPSIS
- */
-static int
-ValidDDColorSpaceID(ccc, id)
-    XcmsCCC ccc;
-    XcmsColorFormat id;
-/*
- *	DESCRIPTION
- *		Determines if the specified color space ID is a valid
- *		Device-Dependent color space in the specified Color
- *		Conversion Context.
- *
- *	RETURNS
- *		Returns zero if not valid; otherwise non-zero.
- */
-{
-    XcmsColorSpace **papRec;
-
-    if (ccc->pPerScrnInfo->state != XcmsInitNone) {
-	papRec = ((XcmsFunctionSet *)ccc->pPerScrnInfo->functionSet)->DDColorSpaces;
-	while (*papRec != NULL) {
-	    if ((*papRec)->id == id) {
-		return(1);
-	    }
-	    papRec++;
-	}
-    }
-    return(0);
-}
-
-
-/*
- *	NAME
- *		ConvertMixedColors - Convert XcmsColor structures
- *
- *	SYNOPSIS
- */
-static Status
-ConvertMixedColors(ccc, pColors_in_out, pWhitePt, nColors,
-	targetFormat, format_flag)
-    XcmsCCC ccc;
-    XcmsColor *pColors_in_out;
-    XcmsColor *pWhitePt;
-    unsigned int nColors;
-    XcmsColorFormat targetFormat;
-    unsigned char format_flag;
-/*
- *	DESCRIPTION
- *		This routine will only convert the following types of
- *		batches:
- *			DI to DI
- *			DD to DD
- *			DD to CIEXYZ
- *		In other words, it will not convert the following types of
- *		batches:
- *			DI to DD
- *			DD to DI(not CIEXYZ)
- *		
- *		format_flag:
- *		    0x01 : convert Device-Dependent only specifications to the
- *			target format.
- *		    0x02 : convert Device-Independent only specifications to the
- *			target format.
- *		    0x03 : convert all specifications to the target format.
- *
- *	RETURNS
- *		XcmsFailure if failed,
- *		XcmsSuccess if none of the color specifications were
- *			compressed in the conversion process
- *		XcmsSuccessWithCompression if at least one of the
- *			color specifications were compressed in the
- *			conversion process.
- *
- */
-{
-    XcmsColor *pColor, *pColors_start;
-    XcmsColorFormat format;
-    Status retval_tmp;
-    Status retval = XcmsSuccess;
-    unsigned int iColors;
-    unsigned int nBatch;
-
-    /*
-     * Convert array of mixed color specifications in batches of
-     * contiguous formats to the target format
-     */
-    iColors = 0;
-    while (iColors < nColors) {
-	/*
-	 * Find contiguous array of color specifications with the
-	 * same format
-	 */
-	pColor = pColors_start = pColors_in_out + iColors;
-	format = pColors_start->format;
-	nBatch = 0;
-	while (iColors < nColors && pColor->format == format) {
-		pColor++;
-		nBatch++;
-		iColors++;
-	}
-	if (format != targetFormat) {
-	    /*
-	     * Need to convert this batch from current format to target format.
-	     */
-	    if (XCMS_DI_ID(format) && (format_flag & DI_FORMAT) &&
-		XCMS_DI_ID(targetFormat)) {
-		/*
-		 * DI->DI
-		 *
-		 * Format of interest is Device-Independent,
-		 * This batch contains Device-Independent specifications, and
-		 * the Target format is Device-Independent.
-		 */
-		retval_tmp = _XcmsDIConvertColors(ccc, pColors_start, pWhitePt,
-			nBatch, targetFormat);
-	    } else if (XCMS_DD_ID(format) && (format_flag & DD_FORMAT) &&
-		    (targetFormat == XcmsCIEXYZFormat)) {
-		/*
-		 * DD->CIEXYZ
-		 *
-		 * Format of interest is Device-Dependent,
-		 * This batch contains Device-Dependent specifications, and
-		 * the Target format is CIEXYZ.
-		 *
-		 * Since DD->CIEXYZ we can use NULL instead of pCompressed.
-		 */
-		if ((ccc->whitePtAdjProc != NULL) && !_XcmsEqualWhitePts(ccc,
-			pWhitePt, ScreenWhitePointOfCCC(ccc))) {
-		    /*
-		     * Need to call WhiteAdjustProc (Screen White Point to
-		     *   White Point).
-		     */
-		    retval_tmp = (*ccc->whitePtAdjProc)(ccc,
-			    ScreenWhitePointOfCCC(ccc), pWhitePt,
-			    XcmsCIEXYZFormat, pColors_start, nBatch,
-			    (Bool *)NULL);
-		} else {
-		    retval_tmp = _XcmsDDConvertColors(ccc, pColors_start,
-			    nBatch, XcmsCIEXYZFormat, (Bool *)NULL);
-		}
-	    } else if (XCMS_DD_ID(format) && (format_flag & DD_FORMAT) &&
-		    XCMS_DD_ID(targetFormat)) {
-		/*
-		 * DD->DD(not CIEXYZ)
-		 *
-		 * Format of interest is Device-Dependent,
-		 * This batch contains Device-Dependent specifications, and
-		 * the Target format is Device-Dependent and not CIEXYZ.
-		 */
-		retval_tmp = _XcmsDDConvertColors(ccc, pColors_start, nBatch,
-			targetFormat, (Bool *)NULL);
-	    } else {
-		/*
-		 * This routine is called for the wrong reason.
-		 */
-		return(XcmsFailure);
-	    }
-	    if (retval_tmp == XcmsFailure) {
-		return(XcmsFailure);
-	    }
-	    retval = MAX(retval, retval_tmp);
-	}
-    }
-    return(retval);
-}
-
-
-/************************************************************************
- *									*
- *			 API PRIVATE ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		_XcmsEqualWhitePts
- *
- *	SYNOPSIS
- */
-int
-_XcmsEqualWhitePts(ccc, pWhitePt1, pWhitePt2)
-    XcmsCCC ccc;
-    XcmsColor *pWhitePt1, *pWhitePt2;
-/*
- *	DESCRIPTION
- *
- *	RETURNS
- *		Returns 0 if not equal; otherwise 1.
- *
- */
-{
-    XcmsColor tmp1, tmp2;
-
-    memcpy((char *)&tmp1, (char *)pWhitePt1, sizeof(XcmsColor));
-    memcpy((char *)&tmp2, (char *)pWhitePt2, sizeof(XcmsColor));
-
-    if (tmp1.format != XcmsCIEXYZFormat) {
-	if (_XcmsDIConvertColors(ccc, &tmp1, (XcmsColor *) NULL, 1,
-		XcmsCIEXYZFormat)==0) {
-	    return(0);
-	}
-    }
-
-    if (tmp2.format != XcmsCIEXYZFormat) {
-	if (_XcmsDIConvertColors(ccc, &tmp2, (XcmsColor *) NULL, 1,
-		XcmsCIEXYZFormat)==0) {
-	    return(0);
-	}
-    }
-
-    return (EqualCIEXYZ(&tmp1, &tmp2));
-}
-
-
-/*
- *	NAME
- *		_XcmsDIConvertColors - Convert XcmsColor structures
- *
- *	SYNOPSIS
- */
-Status
-_XcmsDIConvertColors(ccc, pColors_in_out, pWhitePt, nColors,
-	newFormat)
-    XcmsCCC ccc;
-    XcmsColor *pColors_in_out;
-    XcmsColor *pWhitePt;
-    unsigned int nColors;
-    XcmsColorFormat newFormat;
-/*
- *	DESCRIPTION
- *		Convert XcmsColor structures to another Device-Independent
- *		form.
- *
- *		Here are some assumptions that this routine makes:
- *		1. The calling routine has already checked if
- *		    pColors_in_out->format == newFormat, therefore
- *		    there is no need to check again here.
- *		2. The calling routine has already checked nColors,
- *		    therefore this routine assumes nColors > 0.
- *		3. The calling routine may want to convert only between
- *			CIExyY <-> CIEXYZ <-> CIEuvY
- *		    therefore, this routine allows pWhitePt to equal NULL.
- *		
- *
- *	RETURNS
- *		XcmsFailure if failed,
- *		XcmsSuccess if succeeded.
- *
- */
-{
-    XcmsColorSpace *pFrom, *pTo;
-    XcmsConversionProc *src_to_CIEXYZ, *src_from_CIEXYZ;
-    XcmsConversionProc *dest_to_CIEXYZ, *dest_from_CIEXYZ;
-    XcmsConversionProc *to_CIEXYZ_stop, *from_CIEXYZ_start;
-    XcmsConversionProc *tmp;
-
-    /*
-     * Allow pWhitePt to equal NULL.  This appropriate when converting
-     *    anywhere between:
-     *		CIExyY <-> CIEXYZ <-> CIEuvY
-     */
-
-    if (pColors_in_out == NULL ||
-	    !ValidDIColorSpaceID(pColors_in_out->format) ||
-	    !ValidDIColorSpaceID(newFormat)) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Get a handle on the function list for the current specification format
-     */
-    if ((pFrom = ColorSpaceOfID(ccc, pColors_in_out->format))
-	    == NULL) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Get a handle on the function list for the new specification format
-     */
-    if ((pTo = ColorSpaceOfID(ccc, newFormat)) == NULL) {
-	return(XcmsFailure);
-    }
-
-    src_to_CIEXYZ = pFrom->to_CIEXYZ;
-    src_from_CIEXYZ = pFrom->from_CIEXYZ;
-    dest_to_CIEXYZ = pTo->to_CIEXYZ;
-    dest_from_CIEXYZ = pTo->from_CIEXYZ;
-
-    if (pTo->inverse_flag && pFrom->inverse_flag) {
-	/*
-	 * Find common function pointers
-	 */
-	for (to_CIEXYZ_stop = src_to_CIEXYZ; *to_CIEXYZ_stop; to_CIEXYZ_stop++){
-	    for (tmp = dest_to_CIEXYZ; *tmp; tmp++) {
-		if (*to_CIEXYZ_stop == *tmp) {
-		    goto Continue;
-		}
-	    }
-	}
-
-Continue:
-
-	/*
-	 * Execute the functions to CIEXYZ, stopping short as necessary
-	 */
-	while (src_to_CIEXYZ != to_CIEXYZ_stop) {
-	    if ((*src_to_CIEXYZ++)(ccc, pWhitePt, pColors_in_out,
-		    nColors) == XcmsFailure) {
-		return(XcmsFailure);
-	    }
-	}
-
-	/*
-	 * Determine where to start on the from_CIEXYZ path.
-	 */
-	from_CIEXYZ_start = dest_from_CIEXYZ;
-	tmp = src_from_CIEXYZ;
-	while ((*from_CIEXYZ_start == *tmp) && (*from_CIEXYZ_start != NULL)) {
-	    from_CIEXYZ_start++;
-	    tmp++;
-	}
-
-    } else {
-	/*
-	 * The function in at least one of the Color Spaces are not
-	 * complementary, i.e.,
-	 *	for an i, 0 <= i < n elements
-	 *	from_CIEXYZ[i] is not the inverse of to_CIEXYZ[i]
-	 *	
-	 * Execute the functions all the way to CIEXYZ
-	 */
-	while (*src_to_CIEXYZ) {
-	    if ((*src_to_CIEXYZ++)(ccc, pWhitePt, pColors_in_out,
-		    nColors) == XcmsFailure) {
-		return(XcmsFailure);
-	    }
-	}
-
-	/*
-	 * Determine where to start on the from_CIEXYZ path.
-	 */
-	from_CIEXYZ_start = dest_from_CIEXYZ;
-    }
-
-
-    /*
-     * Execute the functions from CIEXYZ.
-     */
-    while (*from_CIEXYZ_start) {
-	if ((*from_CIEXYZ_start++)(ccc, pWhitePt, pColors_in_out,
-		nColors) == XcmsFailure) {
-	    return(XcmsFailure);
-	}
-    }
-
-    return(XcmsSuccess);
-}
-
-
-/*
- *	NAME
- *		_XcmsDDConvertColors - Convert XcmsColor structures
- *
- *	SYNOPSIS
- */
-Status
-_XcmsDDConvertColors(ccc, pColors_in_out, nColors, newFormat,
-	pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-    XcmsColorFormat newFormat;
-    Bool *pCompressed;
-/*
- *	DESCRIPTION
- *		Convert XcmsColor structures:
- *
- *		1. From CIEXYZ to Device-Dependent formats (typically RGB and
- *			RGBi),
- *		    or
- *		2. Between Device-Dependent formats (typically RGB and RGBi).
- *
- *		Assumes that these specifications have already been white point
- *		adjusted if necessary from Client White Point to Screen
- *		White Point.  Therefore, the white point now associated
- *		with the specifications is the Screen White Point.
- *
- *		pCompressed may be NULL.  If so this indicates that the
- *		calling routine is not interested in knowing exactly which
- *		color was compressed, if any.
- *
- *
- *	RETURNS
- *		XcmsFailure if failed,
- *		XcmsSuccess if none of the color specifications were
- *			compressed in the conversion process
- *		XcmsSuccessWithCompression if at least one of the
- *			color specifications were compressed in the
- *			conversion process.
- *
- */
-{
-    XcmsColorSpace *pFrom, *pTo;
-    XcmsConversionProc *src_to_CIEXYZ, *src_from_CIEXYZ;
-    XcmsConversionProc *dest_to_CIEXYZ, *dest_from_CIEXYZ;
-    XcmsConversionProc *from_CIEXYZ_start, *to_CIEXYZ_stop;
-    XcmsConversionProc *tmp;
-    int	retval;
-    int hasCompressed = 0;
-
-    if (ccc == NULL || pColors_in_out == NULL) {
-	return(XcmsFailure);
-    }
-
-    if (nColors == 0 || pColors_in_out->format == newFormat) {
-	/* do nothing */
-	return(XcmsSuccess);
-    }
-
-    if (((XcmsFunctionSet *)ccc->pPerScrnInfo->functionSet) == NULL) {
-	return(XcmsFailure);	/* hmm, an internal error? */
-    }
-
-    /*
-     * Its ok if pColors_in_out->format == XcmsCIEXYZFormat
-     *	or 
-     * if newFormat == XcmsCIEXYZFormat
-     */
-    if ( !( ValidDDColorSpaceID(ccc, pColors_in_out->format)
-	    ||
-	    (pColors_in_out->format == XcmsCIEXYZFormat))
-	 ||
-	 !(ValidDDColorSpaceID(ccc, newFormat)
-	    ||
-	    newFormat == XcmsCIEXYZFormat)) {
-	return(XcmsFailure);
-    }
-
-    if ((pFrom = ColorSpaceOfID(ccc, pColors_in_out->format)) == NULL){
-	return(XcmsFailure);
-    }
-
-    if ((pTo = ColorSpaceOfID(ccc, newFormat)) == NULL) {
-	return(XcmsFailure);
-    }
-
-    src_to_CIEXYZ = pFrom->to_CIEXYZ;
-    src_from_CIEXYZ = pFrom->from_CIEXYZ;
-    dest_to_CIEXYZ = pTo->to_CIEXYZ;
-    dest_from_CIEXYZ = pTo->from_CIEXYZ;
-
-    if (pTo->inverse_flag && pFrom->inverse_flag) {
-	/*
-	 * Find common function pointers
-	 */
-	for (to_CIEXYZ_stop = src_to_CIEXYZ; *to_CIEXYZ_stop; to_CIEXYZ_stop++){
-	    for (tmp = dest_to_CIEXYZ; *tmp; tmp++) {
-		if (*to_CIEXYZ_stop == *tmp) {
-		    goto Continue;
-		}
-	    }
-	}
-Continue:
-
-	/*
-	 * Execute the functions
-	 */
-	while (src_to_CIEXYZ != to_CIEXYZ_stop) {
-	    retval = (*src_to_CIEXYZ++)(ccc, pColors_in_out, nColors,
-		    pCompressed);
-	    if (retval == XcmsFailure) {
-		return(XcmsFailure);
-	    }
-	    hasCompressed |= (retval == XcmsSuccessWithCompression);
-	}
-
-	/*
-	 * Determine where to start on the from_CIEXYZ path.
-	 */
-	from_CIEXYZ_start = dest_from_CIEXYZ;
-	tmp = src_from_CIEXYZ;
-	while ((*from_CIEXYZ_start == *tmp) && (*from_CIEXYZ_start != NULL)) {
-	    from_CIEXYZ_start++;
-	    tmp++;
-	}
-
-    } else {
-	/*
-	 * The function in at least one of the Color Spaces are not
-	 * complementary, i.e.,
-	 *	for an i, 0 <= i < n elements
-	 *	from_CIEXYZ[i] is not the inverse of to_CIEXYZ[i]
-	 *	
-	 * Execute the functions all the way to CIEXYZ
-	 */
-	while (*src_to_CIEXYZ) {
-	    retval = (*src_to_CIEXYZ++)(ccc, pColors_in_out, nColors,
-		    pCompressed);
-	    if (retval == XcmsFailure) {
-		return(XcmsFailure);
-	    }
-	    hasCompressed |= (retval == XcmsSuccessWithCompression);
-	}
-
-	/*
-	 * Determine where to start on the from_CIEXYZ path.
-	 */
-	from_CIEXYZ_start = dest_from_CIEXYZ;
-    }
-
-    while (*from_CIEXYZ_start) {
-	retval = (*from_CIEXYZ_start++)(ccc, pColors_in_out, nColors,
-		pCompressed);
-	if (retval == XcmsFailure) {
-	    return(XcmsFailure);
-	}
-	hasCompressed |= (retval == XcmsSuccessWithCompression);
-    }
-
-    return(hasCompressed ? XcmsSuccessWithCompression : XcmsSuccess);
-}
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsConvertColors - Convert XcmsColor structures
- *
- *	SYNOPSIS
- */
-Status
-XcmsConvertColors(ccc, pColors_in_out, nColors, targetFormat, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-    XcmsColorFormat targetFormat;
-    Bool *pCompressed;
-/*
- *	DESCRIPTION
- *		Convert XcmsColor structures to another format
- *
- *	RETURNS
- *		XcmsFailure if failed,
- *		XcmsSuccess if succeeded without gamut compression,
- *		XcmsSuccessWithCompression if succeeded with gamut
- *			compression.
- *
- */
-{
-    XcmsColor clientWhitePt;
-    XcmsColor Color1;
-    XcmsColor *pColors_tmp;
-    int callWhiteAdjustProc = 0;
-    XcmsColorFormat format;
-    Status retval;
-    unsigned char contents_flag = 0x00;
-    unsigned int iColors;
-
-    if (ccc == NULL || pColors_in_out == NULL ||
-		!(ValidDIColorSpaceID(targetFormat) ||
-		ValidDDColorSpaceID(ccc, targetFormat))) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Check formats in color specification array
-     */
-    format = pColors_in_out->format;
-    for (pColors_tmp = pColors_in_out, iColors = nColors; iColors; pColors_tmp++, iColors--) {
-	if (!(ValidDIColorSpaceID(pColors_tmp->format) ||
-		ValidDDColorSpaceID(ccc, pColors_tmp->format))) {
-	    return(XcmsFailure);
-	}
-	if (XCMS_DI_ID(pColors_tmp->format)) {
-	    contents_flag |= DI_FORMAT;
-	} else {
-	    contents_flag |= DD_FORMAT;
-	}
-	if (pColors_tmp->format != format) {
-	    contents_flag |= MIX_FORMAT;
-	}
-    }
-
-    /*
-     * Check if we need the Client White Point.
-     */
-    if ((contents_flag & DI_FORMAT) || XCMS_DI_ID(targetFormat)) {
-	/* To proceed, we need to get the Client White Point */
-	memcpy((char *)&clientWhitePt, (char *)&ccc->clientWhitePt,
-	       sizeof(XcmsColor));
-	if (clientWhitePt.format == XcmsUndefinedFormat) {
-	    /*
-	     * Client White Point is undefined, therefore set to the Screen
-	     *   White Point.
-	     * Since Client White Point == Screen White Point, WhiteAdjustProc
-	     *   is not called.
-	     */
-	    memcpy((char *)&clientWhitePt,
-		   (char *)&ccc->pPerScrnInfo->screenWhitePt,
-		   sizeof(XcmsColor));
-	} else if ((ccc->whitePtAdjProc != NULL) && !_XcmsEqualWhitePts(ccc,
-		&clientWhitePt, ScreenWhitePointOfCCC(ccc))) {
-	    /*
-	     * Client White Point != Screen White Point, and WhiteAdjustProc
-	     *   is not NULL, therefore, will need to call it when
-	     *   converting between DI and DD specifications.
-	     */
-	    callWhiteAdjustProc = 1;
-	}
-    }
-
-    /*
-     * Make copy of array of color specifications
-     */
-    if (nColors > 1) {
-	pColors_tmp = (XcmsColor *) Xmalloc(nColors * sizeof(XcmsColor));
-    } else {
-	pColors_tmp = &Color1;
-    }
-    memcpy((char *)pColors_tmp, (char *)pColors_in_out,
-	   nColors * sizeof(XcmsColor));
-
-    /*
-     * zero out pCompressed
-     */
-    if (pCompressed) {
-	bzero((char *)pCompressed, nColors * sizeof(Bool));
-    }
-
-    if (contents_flag == DD_FORMAT || contents_flag == DI_FORMAT) {
-	/*
-	 * ENTIRE ARRAY IS IN ONE FORMAT.
-	 */
-	if (XCMS_DI_ID(format) && XCMS_DI_ID(targetFormat)) {
-	    /*
-	     * DI-to-DI only conversion
-	     */
-	    retval = _XcmsDIConvertColors(ccc, pColors_tmp,
-		    &clientWhitePt, nColors, targetFormat);
-	} else if (XCMS_DD_ID(format) && XCMS_DD_ID(targetFormat)) {
-	    /*
-	     * DD-to-DD only conversion
-	     *   Since DD->DD there will be no compressed thus we can
-	     *   pass NULL instead of pCompressed.
-	     */
-	    retval = _XcmsDDConvertColors(ccc, pColors_tmp, nColors,
-		    targetFormat, (Bool *)NULL);
-	} else {
-	    /*
-	     * Otherwise we have:
-	     *    1. Device-Independent to Device-Dependent Conversion
-	     *		OR
-	     *    2. Device-Dependent to Device-Independent Conversion
-	     *
-	     *  We need to go from oldFormat -> CIEXYZ -> targetFormat
-	     *	adjusting for white points as necessary.
-	     */
-
-	    if (XCMS_DI_ID(format)) {
-		/*
-		 *    1. Device-Independent to Device-Dependent Conversion
-		 */
-		if (callWhiteAdjustProc) {
-		    /*
-		     * White Point Adjustment
-		     *		Client White Point to Screen White Point
-		     */
-		    retval = (*ccc->whitePtAdjProc)(ccc, &clientWhitePt,
-			    ScreenWhitePointOfCCC(ccc), targetFormat,
-			    pColors_tmp, nColors, pCompressed);
-		} else {
-		    if (_XcmsDIConvertColors(ccc, pColors_tmp,
-			    &clientWhitePt, nColors, XcmsCIEXYZFormat)
-			    == XcmsFailure) {
-			goto Failure;
-		    }
-		    retval = _XcmsDDConvertColors(ccc, pColors_tmp, nColors,
-			    targetFormat, pCompressed);
-		}
-	    } else {
-		/*
-		 *    2. Device-Dependent to Device-Independent Conversion
-		 */
-		if (callWhiteAdjustProc) {
-		    /*
-		     * White Point Adjustment
-		     *		Screen White Point to Client White Point
-		     */
-		    retval = (*ccc->whitePtAdjProc)(ccc,
-			    ScreenWhitePointOfCCC(ccc), &clientWhitePt,
-			    targetFormat, pColors_tmp, nColors, pCompressed);
-		} else {
-		    /*
-		     * Since DD->CIEXYZ, no compression takes place therefore
-		     * we can pass NULL instead of pCompressed.
-		     */
-		    if (_XcmsDDConvertColors(ccc, pColors_tmp, nColors,
-			    XcmsCIEXYZFormat, (Bool *)NULL) == XcmsFailure) {
-			goto Failure;
-		    }
-		    retval = _XcmsDIConvertColors(ccc, pColors_tmp,
-			    &clientWhitePt, nColors, targetFormat);
-		}
-	    }
-	}
-    } else {
-	/*
-	 * ARRAY HAS MIXED FORMATS.
-	 */
-	if ((contents_flag == (DI_FORMAT | MIX_FORMAT)) &&
-		XCMS_DI_ID(targetFormat)) {
-	    /*
-	     * Convert from DI to DI in batches of contiguous formats
-	     *
-	     * Because DI->DI, WhiteAdjustProc not called.
-	     */
-	    retval = ConvertMixedColors(ccc, pColors_tmp, &clientWhitePt,
-		    nColors, targetFormat, (unsigned char)DI_FORMAT);
-	} else if ((contents_flag == (DD_FORMAT | MIX_FORMAT)) &&
-		XCMS_DD_ID(targetFormat)) {
-	    /*
-	     * Convert from DD to DD in batches of contiguous formats
-	     *
-	     * Because DD->DD, WhiteAdjustProc not called.
-	     */
-	    retval = ConvertMixedColors(ccc, pColors_tmp,
-		    (XcmsColor *)NULL, nColors, targetFormat,
-		    (unsigned char)DD_FORMAT);
-	} else if (XCMS_DI_ID(targetFormat)) {
-	    /*
-	     * We need to convert from DI-to-DI and DD-to-DI, therefore
-	     *   1. convert DD specifications to CIEXYZ, then
-	     *   2. convert all in batches to the target DI format.
-	     *
-	     * Note that ConvertMixedColors will call WhiteAdjustProc
-	     * as necessary.
-	     */
-
-	    /*
-	     * Convert only DD specifications in batches of contiguous formats
-	     * to CIEXYZ
-	     *
-	     * Since DD->CIEXYZ, ConvertMixedColors will apply WhiteAdjustProc
-	     * if required.
-	     */
-	    retval = ConvertMixedColors(ccc, pColors_tmp, &clientWhitePt,
-		    nColors, XcmsCIEXYZFormat, (unsigned char)DD_FORMAT);
-
-	    /*
-	     * Because at this point we may have a mix of DI formats
-	     * (e.g., CIEXYZ, CIELuv) we must convert the specs to the
-	     * target DI format in batches of contiguous source formats.
-	     */
-	    retval = ConvertMixedColors(ccc, pColors_tmp, &clientWhitePt,
-		    nColors, targetFormat, (unsigned char)DI_FORMAT);
-	} else {
-	    /*
-	     * We need to convert from DI-to-DD and DD-to-DD, therefore
-	     *   1. convert DI specifications to CIEXYZ, then
-	     *   2. convert all to the DD target format.
-	     *
-	     *   This allows white point adjustment and gamut compression
-	     *	 to be applied to all the color specifications in one
-	     *   swoop if those functions do in fact modify the entire
-	     *   group of color specifications.
-	     */
-
-	    /*
-	     * Convert in batches to CIEXYZ
-	     *
-	     * If DD->CIEXYZ, ConvertMixedColors will apply WhiteAdjustProc
-	     * if required.
-	     */
-	    if ((retval = ConvertMixedColors(ccc, pColors_tmp, &clientWhitePt,
-		    nColors, XcmsCIEXYZFormat,
-		    (unsigned char)(DI_FORMAT | DD_FORMAT))) == XcmsFailure) {
-		goto Failure;
-	    }
-
-	    /*
-	     * Convert all specifications (now in CIEXYZ format) to
-	     * the target DD format.
-	     * Since CIEXYZ->DD, compression MAY take place therefore
-	     * we must pass pCompressed.
-	     * Note that WhiteAdjustProc must be used if necessary.
-	     */
-	    if (callWhiteAdjustProc) {
-		/*
-		 * White Point Adjustment
-		 *	Client White Point to Screen White Point
-		 */
-		retval = (*ccc->whitePtAdjProc)(ccc,
-			&clientWhitePt, ScreenWhitePointOfCCC(ccc),
-			targetFormat, pColors_tmp, nColors, pCompressed);
-	    } else {
-		retval = _XcmsDDConvertColors(ccc, pColors_tmp, nColors,
-			targetFormat, pCompressed);
-	    }
-	}
-    }
-
-    if (retval != XcmsFailure) {
-	memcpy((char *)pColors_in_out, (char *)pColors_tmp,
-	       nColors * sizeof(XcmsColor));
-    }
-    if (nColors > 1) {
-	Xfree((char *)pColors_tmp);
-    }
-    return(retval);
-
-Failure:
-    if (nColors > 1) {
-	Xfree((char *)pColors_tmp);
-    }
-    return(XcmsFailure);
-}
-
-
-/*
- *	NAME
- *		XcmsRegFormatOfPrefix
- *
- *	SYNOPSIS
- */
-XcmsColorFormat
-_XcmsRegFormatOfPrefix(prefix)
-    char *prefix;
-/*
- *	DESCRIPTION
- *		Returns a color space ID associated with the specified
- *		X Consortium registered color space prefix.
- *
- *	RETURNS
- *		The color space ID if found;
- *		otherwise NULL.
- */
-{
-    XcmsRegColorSpaceEntry *pEntry = _XcmsRegColorSpaces;
-
-    while (pEntry->prefix != NULL) {
-	if (strcmp(prefix, pEntry->prefix) == 0) {
-	    return(pEntry->id);
-	}
-	pEntry++;
-    }
-    return(XcmsUndefinedFormat);
-}
diff --git a/xc/lib/X11/DefCursor.c b/xc/lib/X11/DefCursor.c
deleted file mode 100644
index be99698a5..000000000
--- a/xc/lib/X11/DefCursor.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* $TOG: DefCursor.c /main/7 1998/02/06 17:16:48 kaleb $ */
-/*
-
-Copyright 1986,1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/DefCursor.c,v 1.2 1999/05/09 10:49:11 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XDefineCursor (dpy, w, cursor)
-    register Display *dpy;
-    Window w;
-    Cursor cursor;
-{
-    register xChangeWindowAttributesReq *req;
-
-    LockDisplay(dpy);
-    GetReqExtra (ChangeWindowAttributes, 4, req);
-    req->window = w;
-    req->valueMask = CWCursor;
-    OneDataCard32 (dpy, NEXTPTR(req,xChangeWindowAttributesReq), cursor);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/DelProp.c b/xc/lib/X11/DelProp.c
deleted file mode 100644
index 47e6274ed..000000000
--- a/xc/lib/X11/DelProp.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* $TOG: DelProp.c /main/6 1998/02/06 17:17:00 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/DelProp.c,v 1.2 1999/05/09 10:49:12 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XDeleteProperty(dpy, window, property)
-register Display *dpy;
-Window window;
-Atom property;
-{
-    register xDeletePropertyReq *req;
-
-    LockDisplay(dpy);
-    GetReq(DeleteProperty, req);
-    req->window = window;
-    req->property = property;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/Depths.c b/xc/lib/X11/Depths.c
deleted file mode 100644
index 3787e4de0..000000000
--- a/xc/lib/X11/Depths.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* $TOG: Depths.c /main/8 1998/02/06 17:17:12 kaleb $ */
-/*
-
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#include "Xlibint.h"
-#include <stdio.h>
-
-/*
- * XListDepths - return info from connection setup
- */
-int *XListDepths (dpy, scrnum, countp)
-    Display *dpy;
-    int scrnum;
-    int *countp;
-{
-    Screen *scr;
-    int count;
-    int *depths;
-
-    if (scrnum < 0 || scrnum >= dpy->nscreens) return NULL;
-
-    scr = &dpy->screens[scrnum];
-    if ((count = scr->ndepths) > 0) {
-	register Depth *dp;
-	register int i;
-
-	depths = (int *) Xmalloc (count * sizeof(int));
-	if (!depths) return NULL;
-	for (i = 0, dp = scr->depths; i < count; i++, dp++) 
-	  depths[i] = dp->depth;
-    } else {
-	/* a screen must have a depth */
-	return NULL;
-    }
-    *countp = count;
-    return depths;
-}
diff --git a/xc/lib/X11/DestSubs.c b/xc/lib/X11/DestSubs.c
deleted file mode 100644
index 0f2cb474c..000000000
--- a/xc/lib/X11/DestSubs.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* $TOG: DestSubs.c /main/6 1998/02/06 17:17:24 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/DestSubs.c,v 1.2 1999/05/09 10:49:12 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XDestroySubwindows(dpy, win)
-register Display *dpy;
-Window win;
-{
-    register xResourceReq *req;
-
-    LockDisplay(dpy);
-    GetResReq (DestroySubwindows,win, req);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/DestWind.c b/xc/lib/X11/DestWind.c
deleted file mode 100644
index c6b003668..000000000
--- a/xc/lib/X11/DestWind.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* $TOG: DestWind.c /main/6 1998/02/06 17:17:37 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/DestWind.c,v 1.2 1999/05/09 10:49:12 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XDestroyWindow (dpy, w)
-	register Display *dpy;
-	Window w;
-{
-        register xResourceReq *req;
-
-	LockDisplay(dpy);
-        GetResReq(DestroyWindow, w, req);
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return 1;
-}
-
diff --git a/xc/lib/X11/DisName.c b/xc/lib/X11/DisName.c
deleted file mode 100644
index cd2074ee2..000000000
--- a/xc/lib/X11/DisName.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* $TOG: DisName.c /main/6 1998/02/06 17:17:50 kaleb $ */
-
-/*
-
-Copyright 1994, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-/* XDisplayName.c */
-/* 
- * Returns the name of the display XOpenDisplay would use.  This is better
- * than just printing the "display" variable in a program because that
- * could be NULL and/or there could be an environment variable set.
- * This makes it easier for programmers to provide meaningful error
- * messages. 
- *
- * 
- * For example, this is used in XOpenDisplay() as
- *	strncpy( displaybuf, XDisplayName( display ), sizeof(displaybuf) );
- *      if ( *displaybuf == '\0' ) return( NULL );
- *  This check is actually unnecessary because the next thing is an index()
- *  call looking for a ':' which will fail and we'll return(NULL).
- */
-/* Written at Waterloo - JMSellens */
-
-#include <stdio.h>
-
-extern char *getenv();
-
-char *
-XDisplayName( display )
-    char *display;
-{
-    char *d;
-    if ( display != (char *)NULL && *display != '\0' )
-	return( display );
-    if ( (d = getenv( "DISPLAY" )) != (char *)NULL )
-	return( d );
-    return( "" );
-}
diff --git a/xc/lib/X11/DrArc.c b/xc/lib/X11/DrArc.c
deleted file mode 100644
index 6e184828f..000000000
--- a/xc/lib/X11/DrArc.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* $TOG: DrArc.c /main/9 1998/02/06 17:18:14 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/DrArc.c,v 1.2 1999/05/09 10:49:13 dawes Exp $ */
-
-/* Note to future maintainers:  XDrawArc does NOT batch successive PolyArc
-   requests into a single request like XDrawLine, XDrawPoint, etc.
-   We don't do this because X_PolyArc applies the GC's join-style if
-   the last point in one arc coincides with the first point in another.
-   The client wouldn't expect this and would have no easy way to defeat it. */
-   
-#include "Xlibint.h"
-
-int
-XDrawArc(dpy, d, gc, x, y, width, height, angle1, angle2)
-    register Display *dpy;
-    Drawable d;
-    GC gc;
-    int x, y; /* INT16 */
-    unsigned int width, height; /* CARD16 */
-    int angle1, angle2; /* INT16 */
-{
-    register xPolyArcReq *req;
-    register xArc *arc;
-#ifdef MUSTCOPY
-    xArc arcdata;
-    long len = SIZEOF(xArc);
-
-    arc = &arcdata;
-#endif /* MUSTCOPY */
-
-    LockDisplay(dpy);
-    FlushGC(dpy, gc);
-    GetReqExtra (PolyArc, SIZEOF(xArc), req);
-
-    req->drawable = d;
-    req->gc = gc->gid;
-
-#ifndef MUSTCOPY
-    arc = (xArc *) NEXTPTR(req,xPolyArcReq);
-#endif /* MUSTCOPY */
-
-    arc->x = x;
-    arc->y = y;
-    arc->width = width;
-    arc->height = height;
-    arc->angle1 = angle1;
-    arc->angle2 = angle2;
-
-#ifdef MUSTCOPY
-    dpy->bufptr -= SIZEOF(xArc);
-    Data (dpy, (char *) arc, len);
-#endif /* MUSTCOPY */
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/DrArcs.c b/xc/lib/X11/DrArcs.c
deleted file mode 100644
index 847efd24c..000000000
--- a/xc/lib/X11/DrArcs.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* $TOG: DrArcs.c /main/14 1998/02/06 17:18:02 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/DrArcs.c,v 1.2 1999/05/09 10:49:13 dawes Exp $ */
-
-#include "Xlibint.h"
-
-#define arc_scale (SIZEOF(xArc) / 4)
-
-int
-XDrawArcs(dpy, d, gc, arcs, n_arcs)
-register Display *dpy;
-Drawable d;
-GC gc;
-XArc *arcs;
-int n_arcs;
-{
-    register xPolyArcReq *req;
-    register long len;
-
-    LockDisplay(dpy);
-    FlushGC(dpy, gc);
-    GetReq(PolyArc,req);
-    req->drawable = d;
-    req->gc = gc->gid;
-    len = ((long)n_arcs) * arc_scale;
-    SetReqLen(req, len, 1);
-    len <<= 2; /* watch out for macros... */
-    Data16 (dpy, (short *) arcs, len);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/DrLine.c b/xc/lib/X11/DrLine.c
deleted file mode 100644
index 4538415db..000000000
--- a/xc/lib/X11/DrLine.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* $TOG: DrLine.c /main/9 1998/02/06 17:18:37 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/DrLine.c,v 1.2 1999/05/09 10:49:14 dawes Exp $ */
-
-#include "Xlibint.h"
-
-/* precompute the maximum size of batching request allowed */
-
-#define wsize (SIZEOF(xPolySegmentReq) + WLNSPERBATCH * SIZEOF(xSegment))
-#define zsize (SIZEOF(xPolySegmentReq) + ZLNSPERBATCH * SIZEOF(xSegment))
-
-int
-XDrawLine (dpy, d, gc, x1, y1, x2, y2)
-    register Display *dpy;
-    Drawable d;
-    GC gc;
-    int x1, y1, x2, y2;
-{
-    register xSegment *segment;
-#ifdef MUSTCOPY
-    xSegment segmentdata;
-    long len = SIZEOF(xSegment);
-
-    segment = &segmentdata;
-#endif /* not MUSTCOPY */
-
-    LockDisplay(dpy);
-    FlushGC(dpy, gc);
-
-    {
-    register xPolySegmentReq *req = (xPolySegmentReq *) dpy->last_req;
-
-    /* if same as previous request, with same drawable, batch requests */
-    if (
-          (req->reqType == X_PolySegment)
-       && (req->drawable == d)
-       && (req->gc == gc->gid)
-       && ((dpy->bufptr + SIZEOF(xSegment)) <= dpy->bufmax)
-       && (((char *)dpy->bufptr - (char *)req) < (gc->values.line_width ?
-						  wsize : zsize)) ) {
-	 req->length += SIZEOF(xSegment) >> 2;
-#ifndef MUSTCOPY
-         segment = (xSegment *) dpy->bufptr;
-	 dpy->bufptr += SIZEOF(xSegment);
-#endif /* not MUSTCOPY */
-	 }
-
-    else {
-	GetReqExtra (PolySegment, SIZEOF(xSegment), req);
-	req->drawable = d;
-	req->gc = gc->gid;
-#ifdef MUSTCOPY
-	dpy->bufptr -= SIZEOF(xSegment);
-#else
-	segment = (xSegment *) NEXTPTR(req,xPolySegmentReq);
-#endif /* MUSTCOPY */
-	}
-
-    segment->x1 = x1;
-    segment->y1 = y1;
-    segment->x2 = x2;
-    segment->y2 = y2;
-
-#ifdef MUSTCOPY
-    Data (dpy, (char *) &segmentdata, len);
-#endif /* MUSTCOPY */
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    }
-    return 1;
-}
-
diff --git a/xc/lib/X11/DrLines.c b/xc/lib/X11/DrLines.c
deleted file mode 100644
index f7bd24678..000000000
--- a/xc/lib/X11/DrLines.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* $TOG: DrLines.c /main/11 1998/02/06 17:18:25 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/DrLines.c,v 1.2 1999/05/09 10:49:14 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XDrawLines (dpy, d, gc, points, npoints, mode)
-    register Display *dpy;
-    Drawable d;
-    GC gc;
-    XPoint *points;
-    int npoints;
-    int mode;
-{
-    register xPolyLineReq *req;
-    register long length;
-    LockDisplay(dpy);
-    FlushGC(dpy, gc);
-    GetReq (PolyLine, req);
-    req->drawable = d;
-    req->gc = gc->gid;
-    req->coordMode = mode;
-    SetReqLen(req, npoints, 65535 - req->length);
-    /* each point is 2 16-bit integers */
-    length = npoints << 2;		/* watch out for macros... */
-    Data16 (dpy, (short *) points, length);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/DrPoint.c b/xc/lib/X11/DrPoint.c
deleted file mode 100644
index 31d363cd9..000000000
--- a/xc/lib/X11/DrPoint.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* $TOG: DrPoint.c /main/9 1998/02/06 17:19:00 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/DrPoint.c,v 1.2 1999/05/09 10:49:15 dawes Exp $ */
-
-#include "Xlibint.h"
-
-/* precompute the maximum size of batching request allowed */
-
-#define size (SIZEOF(xPolyPointReq) + PTSPERBATCH * SIZEOF(xPoint))
-
-int
-XDrawPoint(dpy, d, gc, x, y)
-    register Display *dpy;
-    Drawable d;
-    GC gc;
-    int x, y; /* INT16 */
-{
-    xPoint *point;
-#ifdef MUSTCOPY
-    xPoint pointdata;
-    long len = SIZEOF(xPoint);
-
-    point = &pointdata;
-#endif /* MUSTCOPY */
-
-    LockDisplay(dpy);
-    FlushGC(dpy, gc);
-
-    {
-    register xPolyPointReq *req = (xPolyPointReq *) dpy->last_req;
-
-
-    /* if same as previous request, with same drawable, batch requests */
-    if (
-          (req->reqType == X_PolyPoint)
-       && (req->drawable == d)
-       && (req->gc == gc->gid)
-       && (req->coordMode == CoordModeOrigin)
-       && ((dpy->bufptr + SIZEOF(xPoint)) <= dpy->bufmax)
-       && (((char *)dpy->bufptr - (char *)req) < size) ) {
-	 req->length += SIZEOF(xPoint) >> 2;
-#ifndef MUSTCOPY
-         point = (xPoint *) dpy->bufptr;
-	 dpy->bufptr += SIZEOF(xPoint);
-#endif /* not MUSTCOPY */
-	 }
-
-    else {
-	GetReqExtra(PolyPoint, 4, req); /* 1 point = 4 bytes */
-	req->drawable = d;
-	req->gc = gc->gid;
-	req->coordMode = CoordModeOrigin;
-#ifdef MUSTCOPY
-	dpy->bufptr -= SIZEOF(xPoint);
-#else
-	point = (xPoint *) NEXTPTR(req,xPolyPointReq);
-#endif /* MUSTCOPY */
-	}
-
-    point->x = x;
-    point->y = y;
-
-#ifdef MUSTCOPY
-    Data (dpy, (char *) point, len);
-#endif /* MUSTCOPY */
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/DrPoints.c b/xc/lib/X11/DrPoints.c
deleted file mode 100644
index 03145117b..000000000
--- a/xc/lib/X11/DrPoints.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* $TOG: DrPoints.c /main/12 1998/02/06 17:18:48 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/DrPoints.c,v 1.2 1999/05/09 10:49:15 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XDrawPoints(dpy, d, gc, points, n_points, mode)
-    register Display *dpy;
-    Drawable d;
-    GC gc;
-    XPoint *points;
-    int n_points;
-    int mode; /* CoordMode */
-{
-    register xPolyPointReq *req;
-    register long nbytes;
-    int n;
-    int xoff, yoff;
-    XPoint pt;
-
-    xoff = yoff = 0;
-    LockDisplay(dpy);
-    FlushGC(dpy, gc);
-    while (n_points) {
-	GetReq(PolyPoint, req);
-	req->drawable = d;
-	req->gc = gc->gid;
-	req->coordMode = mode;
-	n = n_points;
-	if (!dpy->bigreq_size && n > (dpy->max_request_size - req->length))
-	    n = dpy->max_request_size - req->length;
-	SetReqLen(req, n, n);
-	nbytes = ((long)n) << 2; /* watch out for macros... */
-	if (xoff || yoff) {
-	    pt.x = xoff + points->x;
-	    pt.y = yoff + points->y;
-	    Data16 (dpy, (short *) &pt, 4);
-	    if (nbytes > 4) {
-		Data16 (dpy, (short *) (points + 1), nbytes - 4);
-	    }
-	} else {
-	    Data16 (dpy, (short *) points, nbytes);
-	}
-	n_points -= n;
-	if (n_points && (mode == CoordModePrevious)) {
-	    register XPoint *pptr = points;
-	    points += n;
-	    while (pptr != points) {
-		xoff += pptr->x;
-		yoff += pptr->y;
-		pptr++;
-	    }
-	} else
-	    points += n;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/DrRect.c b/xc/lib/X11/DrRect.c
deleted file mode 100644
index 9bafc6040..000000000
--- a/xc/lib/X11/DrRect.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* $TOG: DrRect.c /main/9 1998/02/06 17:19:23 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/DrRect.c,v 1.2 1999/05/09 10:49:15 dawes Exp $ */
-
-#include "Xlibint.h"
-
-/* precompute the maximum size of batching request allowed */
-
-#define wsize (SIZEOF(xPolyRectangleReq) + WRCTSPERBATCH * SIZEOF(xRectangle))
-#define zsize (SIZEOF(xPolyRectangleReq) + ZRCTSPERBATCH * SIZEOF(xRectangle))
-
-int
-XDrawRectangle(dpy, d, gc, x, y, width, height)
-    register Display *dpy;
-    Drawable d;
-    GC gc;
-    int x, y; /* INT16 */
-    unsigned int width, height; /* CARD16 */
-{
-    xRectangle *rect;
-#ifdef MUSTCOPY
-    xRectangle rectdata;
-    long len = SIZEOF(xRectangle);
-
-    rect = &rectdata;
-#endif /* MUSTCOPY */
-
-    LockDisplay(dpy);
-    FlushGC(dpy, gc);
-
-    {
-    register xPolyRectangleReq *req = (xPolyRectangleReq *) dpy->last_req;
-
-    /* if same as previous request, with same drawable, batch requests */
-    if (
-          (req->reqType == X_PolyRectangle)
-       && (req->drawable == d)
-       && (req->gc == gc->gid)
-       && ((dpy->bufptr + SIZEOF(xRectangle)) <= dpy->bufmax)
-       && (((char *)dpy->bufptr - (char *)req) < (gc->values.line_width ?
-						  wsize : zsize)) ) {
-	 req->length += SIZEOF(xRectangle) >> 2;
-#ifndef MUSTCOPY
-         rect = (xRectangle *) dpy->bufptr;
-	 dpy->bufptr += SIZEOF(xRectangle);
-#endif /* not MUSTCOPY */
-	 }
-
-    else {
-	GetReqExtra(PolyRectangle, SIZEOF(xRectangle), req);
-	req->drawable = d;
-	req->gc = gc->gid;
-#ifdef MUSTCOPY
-	dpy->bufptr -= SIZEOF(xRectangle);
-#else
-	rect = (xRectangle *) NEXTPTR(req,xPolyRectangleReq);
-#endif /* MUSTCOPY */
-	}
-
-    rect->x = x;
-    rect->y = y;
-    rect->width = width;
-    rect->height = height;
-
-#ifdef MUSTCOPY
-    Data (dpy, (char *) rect, len);	/* subtracted bufptr up above */
-#endif /* MUSTCOPY */
-
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/DrRects.c b/xc/lib/X11/DrRects.c
deleted file mode 100644
index 119120a0b..000000000
--- a/xc/lib/X11/DrRects.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* $TOG: DrRects.c /main/11 1998/02/06 17:19:12 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/DrRects.c,v 1.2 1999/05/09 10:49:16 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XDrawRectangles(dpy, d, gc, rects, n_rects)
-register Display *dpy;
-Drawable d;
-GC gc;
-XRectangle *rects;
-int n_rects;
-{
-    register xPolyRectangleReq *req;
-    long len;
-    int n;
-
-    LockDisplay(dpy);
-    FlushGC(dpy, gc);
-    while (n_rects) {
-	GetReq(PolyRectangle, req);
-	req->drawable = d;
-	req->gc = gc->gid;
-	n = n_rects;
-	len = ((long)n) << 1;
-	if (!dpy->bigreq_size && len > (dpy->max_request_size - req->length)) {
-	    n = (dpy->max_request_size - req->length) >> 1;
-	    len = ((long)n) << 1;
-	}
-	SetReqLen(req, len, len);
-	len <<= 2; /* watch out for macros... */
-	Data16 (dpy, (short *) rects, len);
-	n_rects -= n;
-	rects += n;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/DrSegs.c b/xc/lib/X11/DrSegs.c
deleted file mode 100644
index 23f155631..000000000
--- a/xc/lib/X11/DrSegs.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* $TOG: DrSegs.c /main/10 1998/02/06 17:19:40 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/DrSegs.c,v 1.2 1999/05/09 10:49:16 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XDrawSegments (dpy, d, gc, segments, nsegments)
-    register Display *dpy;
-    Drawable d;
-    GC gc;
-    XSegment *segments;
-    int nsegments;
-{
-    register xPolySegmentReq *req;
-    long len;
-    int n;
-
-    LockDisplay(dpy);
-    FlushGC(dpy, gc);
-    while (nsegments) {
-	GetReq (PolySegment, req);
-	req->drawable = d;
-	req->gc = gc->gid;
-	n = nsegments;
-	len = ((long)n) << 1;
-	if (!dpy->bigreq_size && len > (dpy->max_request_size - req->length)) {
-	    n = (dpy->max_request_size - req->length) >> 1;
-	    len = ((long)n) << 1;
-	}
-	SetReqLen(req, len, len);
-	len <<= 2; /* watch out for macros... */
-	Data16 (dpy, (short *) segments, len);
-	nsegments -= n;
-	segments += n;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/ErrDes.c b/xc/lib/X11/ErrDes.c
deleted file mode 100644
index e7c82f2a7..000000000
--- a/xc/lib/X11/ErrDes.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * $TOG: ErrDes.c /main/44 1998/04/28 17:17:38 kaleb $
- */
-
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-/* $XFree86: xc/lib/X11/ErrDes.c,v 3.7 1999/05/09 10:49:16 dawes Exp $ */
-
-#include "Xlibint.h"
-#include <X11/Xos.h>
-#include "Xresource.h"
-#include <stdio.h>
-
-#ifndef ERRORDB
-#define ERRORDB "/usr/lib/X11/XErrorDB"
-#endif
-
-#ifdef __STDC__
-#define Const const
-#else
-#define Const /**/
-#endif
-
-/*
- * descriptions of errors in Section 4 of Protocol doc (pp. 350-351); more
- * verbose descriptions are given in the error database
- */
-static Const char * Const _XErrorList[] = {
-    /* No error	*/		"no error",
-    /* BadRequest */		"BadRequest",
-    /* BadValue	*/		"BadValue",
-    /* BadWindow */		"BadWindow",
-    /* BadPixmap */		"BadPixmap",
-    /* BadAtom */		"BadAtom",
-    /* BadCursor */		"BadCursor",
-    /* BadFont */		"BadFont",
-    /* BadMatch	*/		"BadMatch",
-    /* BadDrawable */		"BadDrawable",
-    /* BadAccess */		"BadAccess",
-    /* BadAlloc	*/		"BadAlloc",
-    /* BadColor */  		"BadColor",
-    /* BadGC */  		"BadGC",
-    /* BadIDChoice */		"BadIDChoice",
-    /* BadName */		"BadName",
-    /* BadLength */		"BadLength",
-    /* BadImplementation */	"BadImplementation",
-};
-
-
-int
-XGetErrorText(dpy, code, buffer, nbytes)
-    register int code;
-    register Display *dpy;
-    char *buffer;
-    int nbytes;
-{
-    char buf[150];
-    register _XExtension *ext;
-    _XExtension *bext = (_XExtension *)NULL;
-
-    if (nbytes == 0) return 0;
-    if (code <= BadImplementation && code > 0) {
-	sprintf(buf, "%d", code);
-	(void) XGetErrorDatabaseText(dpy, "XProtoError", buf, _XErrorList[code],
-				     buffer, nbytes);
-    } else
-	buffer[0] = '\0';
-    /* call out to any extensions interested */
-    for (ext = dpy->ext_procs; ext; ext = ext->next) {
- 	if (ext->error_string)
- 	    (*ext->error_string)(dpy, code, &ext->codes, buffer, nbytes);
-	if (ext->codes.first_error &&
-	    ext->codes.first_error < code &&
-	    (!bext || ext->codes.first_error > bext->codes.first_error))
-	    bext = ext;
-    }    
-    if (!buffer[0] && bext) {
-	sprintf(buf, "%s.%d", bext->name, code - bext->codes.first_error);
-	(void) XGetErrorDatabaseText(dpy, "XProtoError", buf, "", buffer, nbytes);
-    }
-    if (!buffer[0])
-	sprintf(buffer, "%d", code);
-    return 0;
-}
-
-int
-#if NeedFunctionPrototypes
-/*ARGSUSED*/
-XGetErrorDatabaseText(
-    Display *dpy,
-    register _Xconst char *name,
-    register _Xconst char *type,
-    _Xconst char *defaultp,
-    char *buffer,
-    int nbytes)
-#else
-/*ARGSUSED*/
-XGetErrorDatabaseText(dpy, name, type, defaultp, buffer, nbytes)
-    Display *dpy;
-    register char *name, *type;
-    char *defaultp;
-    char *buffer;
-    int nbytes;
-#endif
-{
-
-    static XrmDatabase db = NULL;
-    XrmString type_str;
-    XrmValue result;
-    char temp[BUFSIZ];
-    char* tptr;
-    unsigned long tlen;
-
-    if (nbytes == 0) return 0;
-
-    if (!db) {
-	/* the Xrm routines expect to be called with the global
-	   mutex unlocked. */
-	XrmDatabase temp_db;
-	int do_destroy;
-
-	XrmInitialize();
-	temp_db = XrmGetFileDatabase(ERRORDB);
-
-	_XLockMutex(_Xglobal_lock);
-	if (!db) {
-	    db = temp_db;
-	    do_destroy = 0;
-	} else
-	    do_destroy = 1;	/* we didn't need to get it after all */
-	_XUnlockMutex(_Xglobal_lock);
-
-	if (do_destroy)
-	    XrmDestroyDatabase(temp_db);
-    }
-
-    if (db)
-    {
-	tlen = strlen (name) + strlen (type) + 2;
-	if (tlen <= BUFSIZE) tptr = temp;
-	else tptr = Xmalloc (tlen);
-	sprintf(tptr, "%s.%s", name, type);
-	XrmGetResource(db, tptr, "ErrorType.ErrorNumber", &type_str, &result);
-	if (tptr != temp) Xfree (tptr);
-    }
-    else
-	result.addr = (XPointer)NULL;
-    if (!result.addr) {
-	result.addr = (XPointer) defaultp;
-	result.size = strlen(defaultp) + 1;
-    }
-    (void) strncpy (buffer, (char *) result.addr, nbytes);
-    if (result.size > nbytes) buffer[nbytes-1] = '\0';
-    return 0;
-}
diff --git a/xc/lib/X11/ErrHndlr.c b/xc/lib/X11/ErrHndlr.c
deleted file mode 100644
index 080ae4cfb..000000000
--- a/xc/lib/X11/ErrHndlr.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* $TOG: ErrHndlr.c /main/14 1998/02/06 17:20:03 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/ErrHndlr.c,v 1.3 1999/03/02 11:49:21 dawes Exp $ */
-
-#include "Xlibint.h"
-
-extern int _XDefaultError();
-extern int _XDefaultIOError();
-/* 
- * XErrorHandler - This procedure sets the X non-fatal error handler
- * (_XErrorFunction) to be the specified routine.  If NULL is passed in
- * the original error handler is restored.
- */
- 
-#if NeedFunctionPrototypes
-XErrorHandler XSetErrorHandler(XErrorHandler handler)
-#else
-XErrorHandler XSetErrorHandler(handler)
-    register XErrorHandler handler;
-#endif
-{
-    int (*oldhandler)();
-
-    _XLockMutex(_Xglobal_lock);
-    oldhandler = _XErrorFunction;
-
-    if (!oldhandler)
-	oldhandler = _XDefaultError;
-
-    if (handler != NULL) {
-	_XErrorFunction = handler;
-    }
-    else {
-	_XErrorFunction = _XDefaultError;
-    }
-    _XUnlockMutex(_Xglobal_lock);
-
-    return (XErrorHandler) oldhandler;
-}
-
-/* 
- * XIOErrorHandler - This procedure sets the X fatal I/O error handler
- * (_XIOErrorFunction) to be the specified routine.  If NULL is passed in 
- * the original error handler is restored.
- */
- 
-#if NeedFunctionPrototypes
-XIOErrorHandler XSetIOErrorHandler(XIOErrorHandler handler)
-#else
-XIOErrorHandler XSetIOErrorHandler(handler)
-    register XIOErrorHandler handler;
-#endif
-{
-    int (*oldhandler)();
-
-    _XLockMutex(_Xglobal_lock);
-    oldhandler = _XIOErrorFunction;
-
-    if (!oldhandler)
-	oldhandler = _XDefaultIOError;
-
-    if (handler != NULL) {
-	_XIOErrorFunction = handler;
-    }
-    else {
-	_XIOErrorFunction = _XDefaultIOError;
-    }
-    _XUnlockMutex(_Xglobal_lock);
-
-    return (XIOErrorHandler) oldhandler;
-}
diff --git a/xc/lib/X11/EvToWire.c b/xc/lib/X11/EvToWire.c
deleted file mode 100644
index de9d63a6d..000000000
--- a/xc/lib/X11/EvToWire.c
+++ /dev/null
@@ -1,404 +0,0 @@
-/* $TOG: EvToWire.c /main/13 1998/02/06 17:20:28 kaleb $ */
-
-/*
-
-Copyright 1985, 1986, 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/EvToWire.c,v 1.2 1999/05/09 10:49:17 dawes Exp $ */
-
-/*
- *	XEvToWire.c - Internal support routines for the C subroutine
- *	interface library (Xlib) to the X Window System Protocol V11.0.
- */
-#define NEED_EVENTS
-#define NEED_REPLIES
-
-#include "Xlibint.h"
-
-/* XlibInt.c */
-extern Status _XUnknownNativeEvent();
-
-/*
- * reformat a wire event into an XEvent structure of the right type.
- */
-Status
-_XEventToWire(dpy, re, event)
-register Display *dpy;	/* pointer to display structure */
-register XEvent *re;	/* pointer to where event should be reformatted */
-register xEvent *event;	/* wire protocol event */
-{
-	switch (event->u.u.type = re->type) {
-	      case KeyPress:
-	      case KeyRelease:
-	        {
-			register XKeyEvent *ev = (XKeyEvent*) re;
-			event->u.keyButtonPointer.root	= ev->root;
-			event->u.keyButtonPointer.event	 = ev->window;
-			event->u.keyButtonPointer.child  = ev->subwindow;
-			event->u.keyButtonPointer.time	 = ev->time;
-			event->u.keyButtonPointer.eventX = ev->x ;
-			event->u.keyButtonPointer.eventY = ev->y ;
-			event->u.keyButtonPointer.rootX	 = ev->x_root;
-			event->u.keyButtonPointer.rootY  = ev->y_root;
-			event->u.keyButtonPointer.state  = ev->state;
-			event->u.keyButtonPointer.sameScreen = ev->same_screen;
-			event->u.u.detail = ev->keycode;
-		}
-	      	break;
-	      case ButtonPress:
-	      case ButtonRelease:
-	        {
-			register XButtonEvent *ev =  (XButtonEvent *) re;
-			event->u.keyButtonPointer.root	 = ev->root;
-			event->u.keyButtonPointer.event	 = ev->window;
-			event->u.keyButtonPointer.child	 = ev->subwindow;
-			event->u.keyButtonPointer.time	 = ev->time;
-			event->u.keyButtonPointer.eventX = ev->x;
-			event->u.keyButtonPointer.eventY = ev->y;
-			event->u.keyButtonPointer.rootX	 = ev->x_root;
-			event->u.keyButtonPointer.rootY	 = ev->y_root;
-			event->u.keyButtonPointer.state	 = ev->state;
-			event->u.keyButtonPointer.sameScreen	= ev->same_screen;
-			event->u.u.detail		= ev->button;
-		}
-	        break;
-	      case MotionNotify:
-	        {
-			register XMotionEvent *ev =   (XMotionEvent *)re;
-			event->u.keyButtonPointer.root	= ev->root;
-			event->u.keyButtonPointer.event	= ev->window;
-			event->u.keyButtonPointer.child	= ev->subwindow;
-			event->u.keyButtonPointer.time	= ev->time;
-			event->u.keyButtonPointer.eventX= ev->x;
-			event->u.keyButtonPointer.eventY= ev->y;
-			event->u.keyButtonPointer.rootX	= ev->x_root;
-			event->u.keyButtonPointer.rootY	= ev->y_root;
-			event->u.keyButtonPointer.state	= ev->state;
-			event->u.keyButtonPointer.sameScreen= ev->same_screen;
-			event->u.u.detail		= ev->is_hint;
-		}
-	        break;
-	      case EnterNotify:
-	      case LeaveNotify:
-		{
-			register XCrossingEvent *ev   = (XCrossingEvent *) re;
-			event->u.enterLeave.root	= ev->root;
-			event->u.enterLeave.event	= ev->window;
-			event->u.enterLeave.child	= ev->subwindow;
-			event->u.enterLeave.time	= ev->time;
-			event->u.enterLeave.eventX	= ev->x;
-			event->u.enterLeave.eventY	= ev->y;
-			event->u.enterLeave.rootX	= ev->x_root;
-			event->u.enterLeave.rootY	= ev->y_root;
-			event->u.enterLeave.state	= ev->state;
-			event->u.enterLeave.mode	= ev->mode;
-			event->u.enterLeave.flags	= 0;
-			if (ev->same_screen) {
-				event->u.enterLeave.flags |= ELFlagSameScreen;
-				}
-			if (ev->focus) {
-				event->u.enterLeave.flags |= ELFlagFocus;
-				}
-			event->u.u.detail		= ev->detail;
-		}
-		  break;
-	      case FocusIn:
-	      case FocusOut:
-		{
-			register XFocusChangeEvent *ev = (XFocusChangeEvent *) re;
-			event->u.focus.window	= ev->window;
-			event->u.focus.mode	= ev->mode;
-			event->u.u.detail	= ev->detail;
-		}
-		  break;
-	      case KeymapNotify:
-		{
-			register XKeymapEvent *ev = (XKeymapEvent *) re;
-			memcpy ((char *)(((xKeymapEvent *) event)->map),
-				&ev->key_vector[1],
-				sizeof (((xKeymapEvent *) event)->map));
-		}
-		break;
-	      case Expose:
-		{
-			register XExposeEvent *ev = (XExposeEvent *) re;
-			event->u.expose.window		= ev->window;
-			event->u.expose.x		= ev->x;
-			event->u.expose.y		= ev->y;
-			event->u.expose.width		= ev->width;
-			event->u.expose.height		= ev->height;
-			event->u.expose.count		= ev->count;
-		}
-		break;
-	      case GraphicsExpose:
-		{
-		    register XGraphicsExposeEvent *ev =
-			(XGraphicsExposeEvent *) re;
-		    event->u.graphicsExposure.drawable	= ev->drawable;
-		    event->u.graphicsExposure.x		= ev->x;
-		    event->u.graphicsExposure.y		= ev->y;
-		    event->u.graphicsExposure.width	= ev->width;
-		    event->u.graphicsExposure.height	= ev->height;
-		    event->u.graphicsExposure.count	= ev->count;
-		    event->u.graphicsExposure.majorEvent= ev->major_code;
-		    event->u.graphicsExposure.minorEvent= ev->minor_code;
-		}
-		break;
-	      case NoExpose:
-		{
-		    register XNoExposeEvent *ev = (XNoExposeEvent *) re;
-		    event->u.noExposure.drawable	= ev->drawable;
-		    event->u.noExposure.majorEvent	= ev->major_code;
-		    event->u.noExposure.minorEvent	= ev->minor_code;
-		}
-		break;
-	      case VisibilityNotify:
-		{
-		    register XVisibilityEvent *ev = (XVisibilityEvent *) re;
-		    event->u.visibility.window		= ev->window;
-		    event->u.visibility.state		= ev->state;
-		}
-		break;
-	      case CreateNotify:
-		{
-		    register XCreateWindowEvent *ev =
-			 (XCreateWindowEvent *) re;
-		    event->u.createNotify.window	= ev->window;
-		    event->u.createNotify.parent	= ev->parent;
-		    event->u.createNotify.x		= ev->x;
-		    event->u.createNotify.y		= ev->y;
-		    event->u.createNotify.width		= ev->width;
-		    event->u.createNotify.height	= ev->height;
-		    event->u.createNotify.borderWidth	= ev->border_width;
-		    event->u.createNotify.override	= ev->override_redirect;
-		}
-		break;
-	      case DestroyNotify:
-		{
-		    register XDestroyWindowEvent *ev =
-				(XDestroyWindowEvent *) re;
-		    event->u.destroyNotify.window	= ev->window;
-		    event->u.destroyNotify.event	= ev->event;
-		}
-		break;
-	      case UnmapNotify:
-		{
-		    register XUnmapEvent *ev = (XUnmapEvent *) re;
-		    event->u.unmapNotify.window	= ev->window;
-		    event->u.unmapNotify.event	= ev->event;
-		    event->u.unmapNotify.fromConfigure	= ev->from_configure;
-		}
-		break;
-	      case MapNotify:
-		{
-		    register XMapEvent *ev = (XMapEvent *) re;
-		    event->u.mapNotify.window	= ev->window;
-		    event->u.mapNotify.event	= ev->event;
-		    event->u.mapNotify.override	= ev->override_redirect;
-		}
-		break;
-	      case MapRequest:
-		{
-		    register XMapRequestEvent *ev = (XMapRequestEvent *) re;
-		    event->u.mapRequest.window	= ev->window;
-		    event->u.mapRequest.parent	= ev->parent;
-		}
-		break;
-	      case ReparentNotify:
-		{
-		    register XReparentEvent *ev = (XReparentEvent *) re;
-		    event->u.reparent.window	= ev->window;
-		    event->u.reparent.event	= ev->event;
-		    event->u.reparent.parent	= ev->parent;
-		    event->u.reparent.x		= ev->x;
-		    event->u.reparent.y		= ev->y;
-		    event->u.reparent.override	= ev->override_redirect;
-		}
-		break;
-	      case ConfigureNotify:
-		{
-		    register XConfigureEvent *ev = (XConfigureEvent *) re;
-		    event->u.configureNotify.window	= ev->window;
-		    event->u.configureNotify.event	= ev->event;
-		    event->u.configureNotify.aboveSibling	= ev->above;
-		    event->u.configureNotify.x		= ev->x;
-		    event->u.configureNotify.y		= ev->y;
-		    event->u.configureNotify.width	= ev->width;
-		    event->u.configureNotify.height	= ev->height;
-		    event->u.configureNotify.borderWidth= ev->border_width;
-		    event->u.configureNotify.override	= ev->override_redirect;
-		}
-		break;
-	      case ConfigureRequest:
-		{
-		    register XConfigureRequestEvent *ev =
-		        (XConfigureRequestEvent *) re;
-		    event->u.configureRequest.window	= ev->window;
-		    event->u.configureRequest.parent	= ev->parent;
-		    event->u.configureRequest.sibling   = ev->above;
-		    event->u.configureRequest.x		= ev->x;
-		    event->u.configureRequest.y		= ev->y;
-		    event->u.configureRequest.width	= ev->width;
-		    event->u.configureRequest.height	= ev->height;
-		    event->u.configureRequest.borderWidth= ev->border_width;
-		    event->u.configureRequest.valueMask= ev->value_mask;
-		    event->u.u.detail 			= ev->detail;
-		}
-		break;
-	      case GravityNotify:
-		{
-		    register XGravityEvent *ev  = (XGravityEvent *) re;
-		    event->u.gravity.window	= ev->window;
-		    event->u.gravity.event	= ev->event;
-		    event->u.gravity.x		= ev->x;
-		    event->u.gravity.y		= ev->y;
-		}
-		break;
-	      case ResizeRequest:
-		{
-		    register XResizeRequestEvent *ev =
-			(XResizeRequestEvent *) re;
-		    event->u.resizeRequest.window	= ev->window;
-		    event->u.resizeRequest.width	= ev->width;
-		    event->u.resizeRequest.height	= ev->height;
-		}
-		break;
-	      case CirculateNotify:
-		{
-		    register XCirculateEvent *ev = (XCirculateEvent *) re;
-		    event->u.circulate.window		= ev->window;
-		    event->u.circulate.event		= ev->event;
-		    event->u.circulate.place		= ev->place;
-		}
-		break;
-	      case CirculateRequest:
-		{
-		    register XCirculateRequestEvent *ev =
-		        (XCirculateRequestEvent *) re;
-		    event->u.circulate.window		= ev->window;
-		    event->u.circulate.event		= ev->parent;
-		    event->u.circulate.place		= ev->place;
-		}
-		break;
-	      case PropertyNotify:
-		{
-		    register XPropertyEvent *ev = (XPropertyEvent *) re;
-		    event->u.property.window		= ev->window;
-		    event->u.property.atom		= ev->atom;
-		    event->u.property.time		= ev->time;
-		    event->u.property.state		= ev->state;
-		}
-		break;
-	      case SelectionClear:
-		{
-		    register XSelectionClearEvent *ev =
-			 (XSelectionClearEvent *) re;
-		    event->u.selectionClear.window	= ev->window;
-		    event->u.selectionClear.atom	= ev->selection;
-		    event->u.selectionClear.time	= ev->time;
-		}
-		break;
-	      case SelectionRequest:
-		{
-		    register XSelectionRequestEvent *ev =
-		        (XSelectionRequestEvent *) re;
-		    event->u.selectionRequest.owner	= ev->owner;
-		    event->u.selectionRequest.requestor	= ev->requestor;
-		    event->u.selectionRequest.selection	= ev->selection;
-		    event->u.selectionRequest.target	= ev->target;
-		    event->u.selectionRequest.property	= ev->property;
-		    event->u.selectionRequest.time	= ev->time;
-		}
-		break;
-	      case SelectionNotify:
-		{
-		    register XSelectionEvent *ev = (XSelectionEvent *) re;
-		    event->u.selectionNotify.requestor	= ev->requestor;
-		    event->u.selectionNotify.selection	= ev->selection;
-		    event->u.selectionNotify.target	= ev->target;
-		    event->u.selectionNotify.property	= ev->property;
-		    event->u.selectionNotify.time	= ev->time;
-		}
-		break;
-	      case ColormapNotify:
-		{
-		    register XColormapEvent *ev = (XColormapEvent *) re;
-		    event->u.colormap.window		= ev->window;
-		    event->u.colormap.colormap		= ev->colormap;
-		    event->u.colormap.new		= ev->new;
-		    event->u.colormap.state		= ev->state;
-	        }
-		break;
-	      case ClientMessage:
-		{
-		   register int i;
-		   register XClientMessageEvent *ev 
-		   			= (XClientMessageEvent *) re;
-		   event->u.clientMessage.window = ev->window;
-		   event->u.u.detail		 = ev->format;
-		   switch (ev->format) {
-			case 8:	
-			  event->u.clientMessage.u.b.type   = ev->message_type;
-			  for (i = 0; i < 20; i++)
-			   event->u.clientMessage.u.b.bytes[i] = ev->data.b[i];
-			  break;
-			case 16:
-			  event->u.clientMessage.u.s.type   = ev->message_type;
-			  event->u.clientMessage.u.s.shorts0   = ev->data.s[0];
-			  event->u.clientMessage.u.s.shorts1   = ev->data.s[1];
-			  event->u.clientMessage.u.s.shorts2   = ev->data.s[2];
-			  event->u.clientMessage.u.s.shorts3   = ev->data.s[3];
-			  event->u.clientMessage.u.s.shorts4   = ev->data.s[4];
-			  event->u.clientMessage.u.s.shorts5   = ev->data.s[5];
-			  event->u.clientMessage.u.s.shorts6   = ev->data.s[6];
-			  event->u.clientMessage.u.s.shorts7   = ev->data.s[7];
-			  event->u.clientMessage.u.s.shorts8   = ev->data.s[8];
-			  event->u.clientMessage.u.s.shorts9   = ev->data.s[9];
-			  break;
-			case 32:
-			  event->u.clientMessage.u.l.type   = ev->message_type;
-			  event->u.clientMessage.u.l.longs0   = ev->data.l[0];
-			  event->u.clientMessage.u.l.longs1   = ev->data.l[1];
-			  event->u.clientMessage.u.l.longs2   = ev->data.l[2];
-			  event->u.clientMessage.u.l.longs3   = ev->data.l[3];
-			  event->u.clientMessage.u.l.longs4   = ev->data.l[4];
-			  break;
-			default:
-			  /* client passing bogus data, let server complain */
-			  break;
-			}
-		    }
-		break;
-	      case MappingNotify:
-		  {
-		    register XMappingEvent *ev = (XMappingEvent *) re;
-		    event->u.mappingNotify.firstKeyCode = ev->first_keycode;
-		    event->u.mappingNotify.request 	= ev->request;
-		    event->u.mappingNotify.count	= ev->count;
-		   }
-		break;
-		
-	      default:
-		return(_XUnknownNativeEvent(dpy, re, event));
-	}
-	return(1);
-}
diff --git a/xc/lib/X11/FSSaver.c b/xc/lib/X11/FSSaver.c
deleted file mode 100644
index 08162422e..000000000
--- a/xc/lib/X11/FSSaver.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* $TOG: FSSaver.c /main/6 1998/02/06 17:23:57 kaleb $ */
-/*
-
-Copyright 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/FSSaver.c,v 1.2 1999/05/09 10:49:17 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XActivateScreenSaver(dpy) 
-    register Display *dpy;
-
-{
-    XForceScreenSaver (dpy, ScreenSaverActive);
-    return 1;
-}
-
-int
-XResetScreenSaver(dpy) 
-    register Display *dpy;
-
-{
-    XForceScreenSaver (dpy, ScreenSaverReset);
-    return 1;
-}
-
-int
-XForceScreenSaver(dpy, mode)
-    register Display *dpy; 
-    int mode;
-
-{
-    register xForceScreenSaverReq *req;
-
-    LockDisplay(dpy);
-    GetReq(ForceScreenSaver, req);
-    req->mode = mode;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/FSWrap.c b/xc/lib/X11/FSWrap.c
deleted file mode 100644
index 142a66869..000000000
--- a/xc/lib/X11/FSWrap.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/* $TOG: FSWrap.c /main/16 1998/05/29 14:46:29 kaleb $ */
-
-/*
- * Copyright 1991 by the Open Software Foundation
- * Copyright 1993 by the TOSHIBA Corp.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name Open Software Foundation
- * not be used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  Open Software
- * Foundation makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without express or
- * implied warranty.
- *
- * OPEN SOFTWARE FOUNDATION DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL OPEN SOFTWARE FOUNDATIONN BE
- * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- * 
- *		 M. Collins		OSF  
- *
- *		 Katsuhisa Yano		TOSHIBA Corp.
- */				
-
-/*
-
-Copyright 1991, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-/* $XFree86: xc/lib/X11/FSWrap.c,v 1.4 1999/05/09 10:49:18 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include <ctype.h>
-#include <X11/Xos.h>
-
-
-#define	XMAXLIST	256
-
-char **
-_XParseBaseFontNameList(str, num)
-    char           *str;
-    int            *num;
-{
-    char           *plist[XMAXLIST];
-    char          **list;
-    char           *ptr;
-
-    *num = 0;
-    if (!str || !*str) {
-	return (char **)NULL;
-    }
-    while (*str && isspace(*str))
-	str++;
-    if (!*str)
-	return (char **)NULL;
-
-    if (!(ptr = Xmalloc((unsigned)strlen(str) + 1))) {
-	return (char **)NULL;
-    }
-    strcpy(ptr, str);
-
-    /* somebody who specifies more than XMAXLIST basefontnames will lose */
-    while (*num < (sizeof plist / sizeof plist[0])) {
-	char	*back;
-
-	plist[*num] = ptr;
-	if ((ptr = strchr(ptr, ','))) {
-	    back = ptr;
-	} else {
-	    back = plist[*num] + strlen(plist[*num]);
-	}
-	while (isspace(*(back - 1)))
-	    back--;
-	*back = '\0';
-	(*num)++;
-	if (!ptr)
-	    break;
-	ptr++;
-	while (*ptr && isspace(*ptr))
-	    ptr++;
-	if (!*ptr)
-	    break;
-    }
-    if (!(list = (char **) Xmalloc((unsigned)sizeof(char *) * (*num + 1)))) {
-	Xfree(ptr);
-	return (char **)NULL;
-    }
-    memcpy((char *)list, (char *)plist, sizeof(char *) * (*num));
-    *(list + *num) = NULL;
-
-    return list;
-}
-
-static char **
-copy_string_list(string_list, list_count)
-    char **string_list;
-    int list_count;
-{
-    char **string_list_ret, **list_src, **list_dst, *dst;
-    int length, count;
-
-    if (string_list == NULL)
-	return (char **) NULL;
-
-    string_list_ret = (char **) Xmalloc(sizeof(char *) * list_count);
-    if (string_list_ret == NULL)
-	return (char **) NULL;
-
-    list_src = string_list;
-    count = list_count;
-    for (length = 0; count-- > 0; list_src++)
-	length += strlen(*list_src) + 1;
-
-    dst = (char *) Xmalloc(length);
-    if (dst == NULL) {
-	Xfree(string_list_ret);
-	return (char **) NULL;
-    }
-
-    list_src = string_list;
-    count = list_count;
-    list_dst = string_list_ret;
-    for ( ;  count-- > 0; list_src++) {
-	strcpy(dst, *list_src);
-	*list_dst++ = dst;
-	dst += strlen(dst) + 1;
-    }
-
-    return string_list_ret;
-}
-
-#if NeedFunctionPrototypes
-XFontSet
-XCreateFontSet (
-    Display        *dpy,
-    _Xconst char   *base_font_name_list,
-    char         ***missing_charset_list,
-    int            *missing_charset_count,
-    char          **def_string)
-#else
-XFontSet
-XCreateFontSet (dpy, base_font_name_list, missing_charset_list,
-	        missing_charset_count, def_string)
-    Display        *dpy;
-    char           *base_font_name_list;
-    char         ***missing_charset_list;
-    int            *missing_charset_count;
-    char          **def_string;
-#endif
-{
-    XOM om;
-    XOC oc;
-    XOMCharSetList *list;
-
-    *missing_charset_list = NULL;
-    *missing_charset_count = 0;
-
-    om = XOpenOM(dpy, NULL, NULL, NULL);
-    if (om == NULL)
-	return (XFontSet) NULL;
-    
-    if ((oc = XCreateOC(om, XNBaseFontName, base_font_name_list, NULL))) {
-	list = &oc->core.missing_list;
-	oc->core.om_automatic = True;
-    } else
-	list = &om->core.required_charset;
-    
-    *missing_charset_list = copy_string_list(list->charset_list,
-					     list->charset_count);
-    *missing_charset_count = list->charset_count;
-
-    if (list->charset_list && *missing_charset_list == NULL)
-	oc = NULL;
-
-    if (oc && def_string) {
-	*def_string = oc->core.default_string;
-	if (!*def_string)
-	    *def_string = "";
-    }
-    
-    if (oc == NULL)
-	XCloseOM(om);
-
-    return (XFontSet) oc;
-}
-
-int
-XFontsOfFontSet(font_set, font_struct_list, font_name_list)
-    XFontSet        font_set;
-    XFontStruct  ***font_struct_list;
-    char         ***font_name_list;
-{
-    *font_name_list   = font_set->core.font_info.font_name_list;
-    *font_struct_list = font_set->core.font_info.font_struct_list;
-    return font_set->core.font_info.num_font;
-}
-
-char *
-XBaseFontNameListOfFontSet(font_set)
-    XFontSet        font_set;
-{
-    return font_set->core.base_name_list;
-}
-
-char *
-XLocaleOfFontSet(font_set)
-    XFontSet        font_set;
-{
-    return font_set->core.om->core.lcd->core->name;
-}
-
-extern Bool XContextDependentDrawing(font_set)
-    XFontSet        font_set;
-{
-    return font_set->core.om->core.context_dependent;
-}
-
-Bool
-XDirectionalDependentDrawing(font_set)
-    XFontSet        font_set;
-{
-    return font_set->core.om->core.directional_dependent;
-}
-
-Bool
-XContextualDrawing(font_set)
-    XFontSet        font_set;
-{
-    return font_set->core.om->core.contextual_drawing;
-}
-
-XFontSetExtents *
-XExtentsOfFontSet(font_set)
-    XFontSet        font_set;
-{
-    return &font_set->core.font_set_extents;
-}
-
-void
-XFreeFontSet(dpy, font_set)
-    Display        *dpy;
-    XFontSet        font_set;
-{
-    XCloseOM(font_set->core.om);
-}
diff --git a/xc/lib/X11/FetchName.c b/xc/lib/X11/FetchName.c
deleted file mode 100644
index fd9a59c6e..000000000
--- a/xc/lib/X11/FetchName.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* $TOG: FetchName.c /main/11 1998/02/06 17:20:40 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#include <X11/Xlibint.h>
-#include <X11/Xatom.h>
-#include <X11/Xos.h>
-#include <stdio.h>
-
-
-Status XFetchName (dpy, w, name)
-    register Display *dpy;
-    Window w;
-    char **name;
-{
-    Atom actual_type;
-    int actual_format;
-    unsigned long nitems;
-    unsigned long leftover;
-    unsigned char *data = NULL;
-    if (XGetWindowProperty(dpy, w, XA_WM_NAME, 0L, (long)BUFSIZ, False, XA_STRING, 
-	&actual_type,
-	&actual_format, &nitems, &leftover, &data) != Success) {
-        *name = NULL;
-	return (0);
-	}
-    if ( (actual_type == XA_STRING) &&  (actual_format == 8) ) {
-
-	/* The data returned by XGetWindowProperty is guarranteed to
-	contain one extra byte that is null terminated to make retrieveing
-	string properties easy. */
-
-	*name = (char *)data;
-	return(1);
-	}
-    if (data) Xfree ((char *)data);
-    *name = NULL;
-    return(0);
-}
-
-Status XGetIconName (dpy, w, icon_name)
-    register Display *dpy;
-    Window w;
-    char **icon_name;
-{
-    Atom actual_type;
-    int actual_format;
-    unsigned long nitems;
-    unsigned long leftover;
-    unsigned char *data = NULL;
-    if (XGetWindowProperty(dpy, w, XA_WM_ICON_NAME, 0L, (long)BUFSIZ, False,
-        XA_STRING, 
-	&actual_type,
-	&actual_format, &nitems, &leftover, &data) != Success) {
-        *icon_name = NULL;
-	return (0);
-	}
-    if ( (actual_type == XA_STRING) &&  (actual_format == 8) ) {
-
-	/* The data returned by XGetWindowProperty is guarranteed to
-	contain one extra byte that is null terminated to make retrieveing
-	string properties easy. */
-
-	*icon_name = (char*)data;
-	return(1);
-	}
-    if (data) Xfree ((char *)data);
-    *icon_name = NULL;
-    return(0);
-}
diff --git a/xc/lib/X11/FillArc.c b/xc/lib/X11/FillArc.c
deleted file mode 100644
index 6f89ae75a..000000000
--- a/xc/lib/X11/FillArc.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/* $TOG: FillArc.c /main/9 1998/02/06 17:21:02 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/FillArc.c,v 1.2 1999/05/09 10:49:18 dawes Exp $ */
-
-#include "Xlibint.h"
-
-/* precompute the maximum size of batching request allowed */
-
-#define size (SIZEOF(xPolyFillArcReq) + FARCSPERBATCH * SIZEOF(xArc))
-
-int
-XFillArc(dpy, d, gc, x, y, width, height, angle1, angle2)
-    register Display *dpy;
-    Drawable d;
-    GC gc;
-    int x, y; /* INT16 */
-    unsigned int width, height; /* CARD16 */
-    int angle1, angle2; /* INT16 */
-{
-    xArc *arc;
-#ifdef MUSTCOPY
-    xArc arcdata;
-    long len = SIZEOF(xArc);
-
-    arc = &arcdata;
-#endif /* MUSTCOPY */
-
-    LockDisplay(dpy);
-    FlushGC(dpy, gc);
-
-    {
-    register xPolyFillArcReq *req = (xPolyFillArcReq *) dpy->last_req;
-
-    /* if same as previous request, with same drawable, batch requests */
-    if (
-          (req->reqType == X_PolyFillArc)
-       && (req->drawable == d)
-       && (req->gc == gc->gid)
-       && ((dpy->bufptr + SIZEOF(xArc)) <= dpy->bufmax)
-       && (((char *)dpy->bufptr - (char *)req) < size) ) {
-	 req->length += SIZEOF(xArc) >> 2;
-#ifndef MUSTCOPY
-         arc = (xArc *) dpy->bufptr;
-	 dpy->bufptr += SIZEOF(xArc);
-#endif /* not MUSTCOPY */
-	 }
-
-    else {
-	GetReqExtra(PolyFillArc, SIZEOF(xArc), req);
-
-	req->drawable = d;
-	req->gc = gc->gid;
-#ifdef MUSTCOPY
-	dpy->bufptr -= SIZEOF(xArc);
-#else
-	arc = (xArc *) NEXTPTR(req,xPolyFillArcReq);
-#endif /* MUSTCOPY */
-	}
-    arc->x = x;
-    arc->y = y;
-    arc->width = width;
-    arc->height = height;
-    arc->angle1 = angle1;
-    arc->angle2 = angle2;
-
-#ifdef MUSTCOPY
-    Data (dpy, (char *) arc, len);
-#endif /* MUSTCOPY */
-
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/FillArcs.c b/xc/lib/X11/FillArcs.c
deleted file mode 100644
index c0e99441c..000000000
--- a/xc/lib/X11/FillArcs.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* $TOG: FillArcs.c /main/12 1998/02/06 17:20:51 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/FillArcs.c,v 1.2 1999/05/09 10:49:19 dawes Exp $ */
-
-#include "Xlibint.h"
-
-#define arc_scale (SIZEOF(xArc) / 4)
-
-int
-XFillArcs(dpy, d, gc, arcs, n_arcs)
-register Display *dpy;
-Drawable d;
-GC gc;
-XArc *arcs;
-int n_arcs;
-{
-    register xPolyFillArcReq *req;
-    long len;
-    int n;
-
-    LockDisplay(dpy);
-    FlushGC(dpy, gc);
-    while (n_arcs) {
-	GetReq(PolyFillArc, req);
-	req->drawable = d;
-	req->gc = gc->gid;
-	n = n_arcs;
-	len = ((long)n) * arc_scale;
-	if (!dpy->bigreq_size && len > (dpy->max_request_size - req->length)) {
-	    n = (dpy->max_request_size - req->length) / arc_scale;
-	    len = ((long)n) * arc_scale;
-	}
-	SetReqLen(req, len, len);
-	len <<= 2; /* watch out for macros... */
-	Data16 (dpy, (short *) arcs, len);
-	n_arcs -= n;
-	arcs += n;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/FillPoly.c b/xc/lib/X11/FillPoly.c
deleted file mode 100644
index afba3f03f..000000000
--- a/xc/lib/X11/FillPoly.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* $TOG: FillPoly.c /main/11 1998/02/06 17:21:14 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/FillPoly.c,v 1.2 1999/05/09 10:49:19 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XFillPolygon(dpy, d, gc, points, n_points, shape, mode)
-register Display *dpy;
-Drawable d;
-GC gc;
-XPoint *points;
-int n_points;
-int shape;
-int mode;
-{
-    register xFillPolyReq *req;
-    register long nbytes;
-
-    LockDisplay(dpy);
-    FlushGC(dpy, gc);
-    GetReq(FillPoly, req);
-
-    req->drawable = d;
-    req->gc = gc->gid;
-    req->shape = shape;
-    req->coordMode = mode;
-
-    SetReqLen(req, n_points, 65535 - req->length);
-
-    /* shift (mult. by 4) before passing to the (possible) macro */
-
-    nbytes = n_points << 2;
-    
-    Data16 (dpy, (short *) points, nbytes);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/FillRct.c b/xc/lib/X11/FillRct.c
deleted file mode 100644
index a2bf1fd54..000000000
--- a/xc/lib/X11/FillRct.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* $TOG: FillRct.c /main/9 1998/02/06 17:21:38 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/FillRct.c,v 1.2 1999/05/09 10:49:19 dawes Exp $ */
-
-#include "Xlibint.h"
-
-/* precompute the maximum size of batching request allowed */
-
-#define size (SIZEOF(xPolyFillRectangleReq) + FRCTSPERBATCH * SIZEOF(xRectangle))
-
-int
-XFillRectangle(dpy, d, gc, x, y, width, height)
-    register Display *dpy;
-    Drawable d;
-    GC gc;
-    int x, y; /* INT16 */
-    unsigned int width, height; /* CARD16 */
-{
-    xRectangle *rect;
-#ifdef MUSTCOPY
-    xRectangle rectdata;
-    long len = SIZEOF(xRectangle);
-
-    rect = &rectdata;
-#endif /* MUSTCOPY */
-
-    LockDisplay(dpy);
-    FlushGC(dpy, gc);
-
-    {
-    register xPolyFillRectangleReq *req 
-		= (xPolyFillRectangleReq *) dpy->last_req;
-
-    /* if same as previous request, with same drawable, batch requests */
-    if (
-          (req->reqType == X_PolyFillRectangle)
-       && (req->drawable == d)
-       && (req->gc == gc->gid)
-       && ((dpy->bufptr + SIZEOF(xRectangle)) <= dpy->bufmax)
-       && (((char *)dpy->bufptr - (char *)req) < size) ) {
-	 req->length += SIZEOF(xRectangle) >> 2;
-#ifndef MUSTCOPY
-         rect = (xRectangle *) dpy->bufptr;
-	 dpy->bufptr += SIZEOF(xRectangle);
-#endif /* not MUSTCOPY */
-	 }
-
-    else {
-	GetReqExtra(PolyFillRectangle, SIZEOF(xRectangle), req);
-	req->drawable = d;
-	req->gc = gc->gid;
-#ifdef MUSTCOPY
-	dpy->bufptr -= SIZEOF(xRectangle);
-#else
-	rect = (xRectangle *) NEXTPTR(req,xPolyFillRectangleReq);
-#endif /* MUSTCOPY */
-	}
-    rect->x = x;
-    rect->y = y;
-    rect->width = width;
-    rect->height = height;
-
-#ifdef MUSTCOPY
-    Data (dpy, (char *) rect, len);
-#endif /* MUSTCOPY */
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/FillRcts.c b/xc/lib/X11/FillRcts.c
deleted file mode 100644
index 1fd9e5e77..000000000
--- a/xc/lib/X11/FillRcts.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* $TOG: FillRcts.c /main/11 1998/02/06 17:21:26 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/FillRcts.c,v 1.2 1999/05/09 10:49:20 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XFillRectangles(dpy, d, gc, rectangles, n_rects)
-register Display *dpy;
-Drawable d;
-GC gc;
-XRectangle *rectangles;
-int n_rects;
-{
-    register xPolyFillRectangleReq *req;
-    long len;
-    int n;
-
-    LockDisplay(dpy);
-    FlushGC(dpy, gc);
-    while (n_rects) {
-	GetReq(PolyFillRectangle, req);
-	req->drawable = d;
-	req->gc = gc->gid;
-	n = n_rects;
-	len = ((long)n) << 1;
-	if (!dpy->bigreq_size && len > (dpy->max_request_size - req->length)) {
-	    n = (dpy->max_request_size - req->length) >> 1;
-	    len = ((long)n) << 1;
-	}
-	SetReqLen(req, len, len);
-	len <<= 2; /* watch out for macros... */
-	Data16 (dpy, (short *) rectangles, len);
-	n_rects -= n;
-	rectangles += n;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-    
diff --git a/xc/lib/X11/FilterEv.c b/xc/lib/X11/FilterEv.c
deleted file mode 100644
index fa6b313d9..000000000
--- a/xc/lib/X11/FilterEv.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/* $TOG: FilterEv.c /main/10 1998/02/06 17:21:51 kaleb $ */
-
- /*
-  * Copyright 1990, 1991 by OMRON Corporation
-  *
-  * Permission to use, copy, modify, distribute, and sell this software and its
-  * documentation for any purpose is hereby granted without fee, provided that
-  * the above copyright notice appear in all copies and that both that
-  * copyright notice and this permission notice appear in supporting
-  * documentation, and that the name OMRON not be used in
-  * advertising or publicity pertaining to distribution of the software without
-  * specific, written prior permission.  OMRON makes no representations
-  * about the suitability of this software for any purpose.  It is provided
-  * "as is" without express or implied warranty.
-  *
-  * OMRON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-  * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-  * EVENT SHALL OMRON BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-  * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-  * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-  * TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  * PERFORMANCE OF THIS SOFTWARE. 
-  *
-  *	Author:	Seiji Kuwari	OMRON Corporation
-  *				kuwa@omron.co.jp
-  *				kuwa%omron.co.jp@uunet.uu.net
-  */				
-
-/*
-
-Copyright 1991, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-#define NEED_EVENTS
-#include "Xlibint.h"
-#include "Xlcint.h"
-
-#ifdef __STDC__
-#define Const const
-#else
-#define Const /**/
-#endif
-extern long Const _Xevent_to_mask[];
-
-/*
- * Look up if there is a specified filter for the event.
- */
-Bool
-XFilterEvent(ev, window)
-    XEvent *ev;
-    Window window;
-{
-    XFilterEventList	p;
-    Window		win;
-    long		mask;
-    Bool		ret;
-
-    if (window)
-	win = window;
-    else
-	win = ev->xany.window;
-    if (ev->type >= LASTEvent)
-	mask = 0;
-    else
-	mask = _Xevent_to_mask[ev->type];
-
-    LockDisplay(ev->xany.display);
-    for (p = ev->xany.display->im_filters; p != NULL; p = p->next) {
-	if (win == p->window) {
-	    if ((mask & p->event_mask) ||
-		(ev->type >= p->start_type && ev->type <= p->end_type)) {
-		ret = (*(p->filter))(ev->xany.display, p->window, ev,
-				      p->client_data);
-		UnlockDisplay(ev->xany.display);
-		return(ret);
-	    }
-	}
-    }
-    UnlockDisplay(ev->xany.display);
-    return(False);
-}
diff --git a/xc/lib/X11/Flush.c b/xc/lib/X11/Flush.c
deleted file mode 100644
index f823194b5..000000000
--- a/xc/lib/X11/Flush.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* $TOG: Flush.c /main/7 1998/02/06 17:22:02 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/Flush.c,v 1.2 1999/05/09 10:49:20 dawes Exp $ */
-
-#include "Xlibint.h"
-
-/* Flush all buffered output requests. */
-/* NOTE: NOT necessary when calling any of the Xlib routines. */
-
-int
-XFlush (dpy)
-    register Display *dpy;
-    {
-    LockDisplay(dpy);
-    _XFlush (dpy);
-    UnlockDisplay(dpy);
-    return 1;
-    }
diff --git a/xc/lib/X11/Font.c b/xc/lib/X11/Font.c
deleted file mode 100644
index 899bf81f9..000000000
--- a/xc/lib/X11/Font.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/* $TOG: Font.c /main/30 1998/02/06 17:22:37 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/Font.c,v 1.2 1999/05/09 10:49:21 dawes Exp $ */
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-/* FreeEData.c */
-extern int _XFreeExtData();
-
-static XFontStruct *_XQueryFont();
-
-#if NeedFunctionPrototypes
-XFontStruct *XLoadQueryFont(
-   register Display *dpy,
-   _Xconst char *name)
-#else
-XFontStruct *XLoadQueryFont(dpy, name)
-   register Display *dpy;
-   char *name;
-#endif
-{
-    XFontStruct *font_result;
-    register long nbytes;
-    Font fid;
-    xOpenFontReq *req;
-    unsigned long seq;
-
-    LockDisplay(dpy);
-    GetReq(OpenFont, req);
-    seq = dpy->request;
-    nbytes = req->nbytes  = name ? strlen(name) : 0;
-    req->fid = fid = XAllocID(dpy);
-    req->length += (nbytes+3)>>2;
-    Data (dpy, name, nbytes);
-    font_result = _XQueryFont(dpy, fid, seq);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return font_result;
-}
-
-int
-XFreeFont(dpy, fs)
-    register Display *dpy;
-    XFontStruct *fs;
-{ 
-    register xResourceReq *req;
-    register _XExtension *ext;
-
-    LockDisplay(dpy);
-    /* call out to any extensions interested */
-    for (ext = dpy->ext_procs; ext; ext = ext->next)
-	if (ext->free_Font) (*ext->free_Font)(dpy, fs, &ext->codes);
-    GetResReq (CloseFont, fs->fid, req);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    _XFreeExtData(fs->ext_data);
-    if (fs->per_char)
-       Xfree ((char *) fs->per_char);
-    if (fs->properties)
-       Xfree ((char *) fs->properties);
-    Xfree ((char *) fs);
-    return 1;
-}
-
-static XFontStruct *
-_XQueryFont (dpy, fid, seq)
-    register Display *dpy;
-    Font fid;
-    unsigned long seq;
-{
-    register XFontStruct *fs;
-    register long nbytes;
-    xQueryFontReply reply;
-    register xResourceReq *req;
-    register _XExtension *ext;
-    _XAsyncHandler async;
-    _XAsyncErrorState async_state;
-
-    if (seq) {
-	async_state.min_sequence_number = seq;
-	async_state.max_sequence_number = seq;
-	async_state.error_code = BadName;
-	async_state.major_opcode = X_OpenFont;
-	async_state.minor_opcode = 0;
-	async_state.error_count = 0;
-	async.next = dpy->async_handlers;
-	async.handler = _XAsyncErrorHandler;
-	async.data = (XPointer)&async_state;
-	dpy->async_handlers = &async;
-    }
-    GetResReq(QueryFont, fid, req);
-    if (!_XReply (dpy, (xReply *) &reply,
-       ((SIZEOF(xQueryFontReply) - SIZEOF(xReply)) >> 2), xFalse)) {
-	if (seq)
-	    DeqAsyncHandler(dpy, &async);
-	return (XFontStruct *)NULL;
-    }
-    if (seq)
-	DeqAsyncHandler(dpy, &async);
-    if (! (fs = (XFontStruct *) Xmalloc (sizeof (XFontStruct)))) {
-	_XEatData(dpy, (unsigned long)(reply.nFontProps * SIZEOF(xFontProp) +
-				       reply.nCharInfos * SIZEOF(xCharInfo)));
-	return (XFontStruct *)NULL;
-    }
-    fs->ext_data 		= NULL;
-    fs->fid 			= fid;
-    fs->direction 		= reply.drawDirection;
-    fs->min_char_or_byte2	= reply.minCharOrByte2;
-    fs->max_char_or_byte2 	= reply.maxCharOrByte2;
-    fs->min_byte1 		= reply.minByte1;
-    fs->max_byte1 		= reply.maxByte1;
-    fs->default_char 		= reply.defaultChar;
-    fs->all_chars_exist 	= reply.allCharsExist;
-    fs->ascent 			= cvtINT16toInt (reply.fontAscent);
-    fs->descent 		= cvtINT16toInt (reply.fontDescent);
-    
-#ifdef MUSTCOPY
-    {
-	xCharInfo *xcip;
-
-	xcip = (xCharInfo *) &reply.minBounds;
-	fs->min_bounds.lbearing = cvtINT16toShort(xcip->leftSideBearing);
-	fs->min_bounds.rbearing = cvtINT16toShort(xcip->rightSideBearing);
-	fs->min_bounds.width = cvtINT16toShort(xcip->characterWidth);
-	fs->min_bounds.ascent = cvtINT16toShort(xcip->ascent);
-	fs->min_bounds.descent = cvtINT16toShort(xcip->descent);
-	fs->min_bounds.attributes = xcip->attributes;
-
-	xcip = (xCharInfo *) &reply.maxBounds;
-	fs->max_bounds.lbearing = cvtINT16toShort(xcip->leftSideBearing);
-	fs->max_bounds.rbearing =  cvtINT16toShort(xcip->rightSideBearing);
-	fs->max_bounds.width =  cvtINT16toShort(xcip->characterWidth);
-	fs->max_bounds.ascent =  cvtINT16toShort(xcip->ascent);
-	fs->max_bounds.descent =  cvtINT16toShort(xcip->descent);
-	fs->max_bounds.attributes = xcip->attributes;
-    }
-#else
-    /* XXX the next two statements won't work if short isn't 16 bits */
-    fs->min_bounds = * (XCharStruct *) &reply.minBounds;
-    fs->max_bounds = * (XCharStruct *) &reply.maxBounds;
-#endif /* MUSTCOPY */
-
-    fs->n_properties = reply.nFontProps;
-    /* 
-     * if no properties defined for the font, then it is bad
-     * font, but shouldn't try to read nothing.
-     */
-    fs->properties = NULL;
-    if (fs->n_properties > 0) {
-	    nbytes = reply.nFontProps * sizeof(XFontProp);
-	    fs->properties = (XFontProp *) Xmalloc ((unsigned) nbytes);
-	    nbytes = reply.nFontProps * SIZEOF(xFontProp);
-	    if (! fs->properties) {
-		Xfree((char *) fs);
-		_XEatData(dpy, (unsigned long)
-			  (nbytes + reply.nCharInfos * SIZEOF(xCharInfo)));
-		return (XFontStruct *)NULL;
-	    }
-	    _XRead32 (dpy, (char *)fs->properties, nbytes);
-    }
-    /*
-     * If no characters in font, then it is a bad font, but
-     * shouldn't try to read nothing.
-     */
-    /* have to unpack charinfos on some machines (CRAY) */
-    fs->per_char = NULL;
-    if (reply.nCharInfos > 0){
-	nbytes = reply.nCharInfos * sizeof(XCharStruct);
-	if (! (fs->per_char = (XCharStruct *) Xmalloc ((unsigned) nbytes))) {
-	    if (fs->properties) Xfree((char *) fs->properties);
-	    Xfree((char *) fs);
-	    _XEatData(dpy, (unsigned long)
-			    (reply.nCharInfos * SIZEOF(xCharInfo)));
-	    return (XFontStruct *)NULL;
-	}
-	    
-#ifdef MUSTCOPY
-	{
-	    register XCharStruct *cs = fs->per_char;
-	    register int i;
-
-	    for (i = 0; i < reply.nCharInfos; i++, cs++) {
-		xCharInfo xcip;
-
-		_XRead(dpy, (char *)&xcip, SIZEOF(xCharInfo));
-		cs->lbearing = cvtINT16toShort(xcip.leftSideBearing);
-		cs->rbearing = cvtINT16toShort(xcip.rightSideBearing);
-		cs->width =  cvtINT16toShort(xcip.characterWidth);
-		cs->ascent =  cvtINT16toShort(xcip.ascent);
-		cs->descent =  cvtINT16toShort(xcip.descent);
-		cs->attributes = xcip.attributes;
-	    }
-	}
-#else
-	nbytes = reply.nCharInfos * SIZEOF(xCharInfo);
-	_XRead16 (dpy, (char *)fs->per_char, nbytes);
-#endif
-    }
-
-    /* call out to any extensions interested */
-    for (ext = dpy->ext_procs; ext; ext = ext->next)
-	if (ext->create_Font) (*ext->create_Font)(dpy, fs, &ext->codes);
-    return fs;
-}
-
-
-XFontStruct *XQueryFont (dpy, fid)
-    register Display *dpy;
-    Font fid;
-{
-    XFontStruct *font_result;
-
-    LockDisplay(dpy);
-    font_result = _XQueryFont(dpy, fid, 0L);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return font_result;
-}
-
-   
-   
diff --git a/xc/lib/X11/FontInfo.c b/xc/lib/X11/FontInfo.c
deleted file mode 100644
index a0f8bba92..000000000
--- a/xc/lib/X11/FontInfo.c
+++ /dev/null
@@ -1,245 +0,0 @@
-/* $TOG: FontInfo.c /main/17 1998/02/06 17:22:14 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/FontInfo.c,v 1.2 1999/05/09 10:49:21 dawes Exp $ */
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-#if NeedFunctionPrototypes
-char **XListFontsWithInfo(
-register Display *dpy,
-_Xconst char *pattern,  /* null-terminated */
-int maxNames,
-int *actualCount,	/* RETURN */
-XFontStruct **info)	/* RETURN */
-#else
-char **XListFontsWithInfo(dpy, pattern, maxNames, actualCount, info)
-register Display *dpy;
-char *pattern;  /* null-terminated */
-int maxNames;
-int *actualCount;	/* RETURN */
-XFontStruct **info;	/* RETURN */
-#endif
-{       
-    register long nbytes;
-    register int i;
-    register XFontStruct *fs;
-    register int size = 0;
-    XFontStruct *finfo = NULL;
-    char **flist = NULL;
-    xListFontsWithInfoReply reply;
-    register xListFontsReq *req;
-    int j;
-
-    LockDisplay(dpy);
-    GetReq(ListFontsWithInfo, req);
-    req->maxNames = maxNames;
-    nbytes = req->nbytes = pattern ? strlen (pattern) : 0;
-    req->length += (nbytes + 3) >> 2;
-    _XSend (dpy, pattern, nbytes);
-    /* use _XSend instead of Data, since subsequent _XReply will flush buffer */
-
-    for (i = 0; ; i++) {
-	if (!_XReply (dpy, (xReply *) &reply,
-		      ((SIZEOF(xListFontsWithInfoReply) - 
-			SIZEOF(xGenericReply)) >> 2), xFalse)) {
-	    for (j=(i-1); (j >= 0); j--) {
-		Xfree(flist[j]);
-		if (finfo[j].properties) Xfree((char *) finfo[j].properties);
-	    }
-	    if (flist) Xfree((char *) flist);
-	    if (finfo) Xfree((char *) finfo);
-	    UnlockDisplay(dpy);
-	    SyncHandle();
-	    return ((char **) NULL);
-	}
-	if (reply.nameLength == 0)
-	    break;
-	if ((i + reply.nReplies) >= size) {
-	    size = i + reply.nReplies + 1;
-
-	    if (finfo) {
-		XFontStruct * tmp_finfo = (XFontStruct *) 
-		    Xrealloc ((char *) finfo,
-			      (unsigned) (sizeof(XFontStruct) * size));
-		char ** tmp_flist = (char **)
-		    Xrealloc ((char *) flist,
-			      (unsigned) (sizeof(char *) * (size+1)));
-
-		if ((! tmp_finfo) || (! tmp_flist)) {
-		    /* free all the memory that we allocated */
-		    for (j=(i-1); (j >= 0); j--) {
-			Xfree(flist[j]);
-			if (finfo[j].properties)
-			    Xfree((char *) finfo[j].properties);
-		    }
-		    if (tmp_flist) Xfree((char *) tmp_flist);
-		    else Xfree((char *) flist);
-		    if (tmp_finfo) Xfree((char *) tmp_finfo);
-		    else Xfree((char *) finfo);
-		    goto clearwire;
-		}
-		finfo = tmp_finfo;
-		flist = tmp_flist;
-	    }
-	    else {
-		if (! (finfo = (XFontStruct *)
-		       Xmalloc((unsigned) (sizeof(XFontStruct) * size))))
-		    goto clearwire;
-		if (! (flist = (char **)
-		       Xmalloc((unsigned) (sizeof(char *) * (size+1))))) {
-		    Xfree((char *) finfo);
-		    goto clearwire;
-		}
-	    }
-	}
-	fs = &finfo[i];
-
-	fs->ext_data 		= NULL;
-	fs->per_char		= NULL;
-	fs->fid 		= None;
-	fs->direction 		= reply.drawDirection;
-	fs->min_char_or_byte2	= reply.minCharOrByte2;
-	fs->max_char_or_byte2 	= reply.maxCharOrByte2;
-	fs->min_byte1 		= reply.minByte1;
-	fs->max_byte1 		= reply.maxByte1;
-	fs->default_char	= reply.defaultChar;
-	fs->all_chars_exist 	= reply.allCharsExist;
-	fs->ascent 		= cvtINT16toInt (reply.fontAscent);
-	fs->descent 		= cvtINT16toInt (reply.fontDescent);
-    
-#ifdef MUSTCOPY
-	{
-	    xCharInfo *xcip;
-
-	    xcip = (xCharInfo *) &reply.minBounds;
-	    fs->min_bounds.lbearing = xcip->leftSideBearing;
-	    fs->min_bounds.rbearing = xcip->rightSideBearing;
-	    fs->min_bounds.width = xcip->characterWidth;
-	    fs->min_bounds.ascent = xcip->ascent;
-	    fs->min_bounds.descent = xcip->descent;
-	    fs->min_bounds.attributes = xcip->attributes;
-
-	    xcip = (xCharInfo *) &reply.maxBounds;
-	    fs->max_bounds.lbearing = xcip->leftSideBearing;
-	    fs->max_bounds.rbearing = xcip->rightSideBearing;
-	    fs->max_bounds.width = xcip->characterWidth;
-	    fs->max_bounds.ascent = xcip->ascent;
-	    fs->max_bounds.descent = xcip->descent;
-	    fs->max_bounds.attributes = xcip->attributes;
-	}
-#else
-	/* XXX the next two statements won't work if short isn't 16 bits */
-	fs->min_bounds = * (XCharStruct *) &reply.minBounds;
-	fs->max_bounds = * (XCharStruct *) &reply.maxBounds;
-#endif /* MUSTCOPY */
-
-	fs->n_properties = reply.nFontProps;
-	if (fs->n_properties > 0) {
-	    nbytes = reply.nFontProps * sizeof(XFontProp);
-	    if (! (fs->properties = (XFontProp *) Xmalloc((unsigned) nbytes)))
-		goto badmem;
-	    nbytes = reply.nFontProps * SIZEOF(xFontProp);
-	    _XRead32 (dpy, (char *)fs->properties, nbytes);
-
-	} else
-	    fs->properties = NULL;
-
-	j = reply.nameLength + 1;
-	if (!i)
-	    j++; /* make first string 1 byte longer, to match XListFonts */
-	flist[i] = (char *) Xmalloc ((unsigned int) j);
-	if (! flist[i]) {
-	    if (finfo[i].properties) Xfree((char *) finfo[i].properties);
-	    nbytes = (reply.nameLength + 3) & ~3;
-	    _XEatData(dpy, (unsigned long) nbytes);
-	    goto badmem;
-	}
-	if (!i) {
-	    *flist[0] = 0; /* zero to distinguish from XListFonts */
-	    flist[0]++;
-	}
-	flist[i][reply.nameLength] = '\0';
-	_XReadPad (dpy, flist[i], (long) reply.nameLength);
-    }
-    *info = finfo;
-    *actualCount = i;
-    if (flist)
-	flist[i] = NULL; /* required in case XFreeFontNames is called */
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return (flist);
-
-
-  badmem:
-    /* Free all memory allocated by this function. */
-    for (j=(i-1); (j >= 0); j--) {
-	Xfree(flist[j]);
-	if (finfo[j].properties) Xfree((char *) finfo[j].properties);
-    }
-    if (flist) Xfree((char *) flist);
-    if (finfo) Xfree((char *) finfo);
-
-  clearwire:
-    /* Clear the wire. */
-    do {
-	if (reply.nFontProps)
-	    _XEatData(dpy, (unsigned long)
-		      (reply.nFontProps * SIZEOF(xFontProp)));
-	nbytes = (reply.nameLength + 3) & ~3;
-	_XEatData(dpy, (unsigned long) nbytes);
-    }
-    while (_XReply(dpy,(xReply *) &reply, ((SIZEOF(xListFontsWithInfoReply) -
-					    SIZEOF(xGenericReply)) >> 2),
-		   xFalse) && (reply.nameLength != 0));
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return (char **) NULL;
-}
-
-int
-XFreeFontInfo (names, info, actualCount)
-char **names;
-XFontStruct *info;
-int actualCount;
-{
-	register int i;
-	if (names) {
-		Xfree (names[0]-1);
-		for (i = 1; i < actualCount; i++) {
-			Xfree (names[i]);
-		}
-		Xfree((char *) names);
-	}
-	if (info) {
-		for (i = 0; i < actualCount; i++) {
-			if (info[i].per_char)
-				Xfree ((char *) info[i].per_char);
-			if (info[i].properties)
-				Xfree ((char *) info[i].properties);
-			}
-		Xfree((char *) info);
-	}
-	return 1;
-}
diff --git a/xc/lib/X11/FontNames.c b/xc/lib/X11/FontNames.c
deleted file mode 100644
index d3f63f9fe..000000000
--- a/xc/lib/X11/FontNames.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/* $TOG: FontNames.c /main/14 1998/05/17 09:16:03 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-/* $XFree86: xc/lib/X11/FontNames.c,v 1.4 1999/05/09 10:49:21 dawes Exp $ */
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-#if NeedFunctionPrototypes
-char **XListFonts(
-register Display *dpy,
-_Xconst char *pattern,  /* null-terminated */
-int maxNames,
-int *actualCount)	/* RETURN */
-#else
-char **XListFonts(dpy, pattern, maxNames, actualCount)
-register Display *dpy;
-char *pattern;  /* null-terminated */
-int maxNames;
-int *actualCount;	/* RETURN */
-#endif
-{       
-    register long nbytes;
-    register unsigned i;
-    register int length;
-    char **flist;
-    char *ch;
-    xListFontsReply rep;
-    register xListFontsReq *req;
-    register long rlen;
-
-    LockDisplay(dpy);
-    GetReq(ListFonts, req);
-    req->maxNames = maxNames;
-    nbytes = req->nbytes = pattern ? strlen (pattern) : 0;
-    req->length += (nbytes + 3) >> 2;
-    _XSend (dpy, pattern, nbytes);
-    /* use _XSend instead of Data, since following _XReply will flush buffer */
-
-    if (!_XReply (dpy, (xReply *)&rep, 0, xFalse)) {
-	*actualCount = 0;
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return (char **) NULL;
-    }
-
-    if (rep.nFonts) {
-	flist = (char **)Xmalloc ((unsigned)rep.nFonts * sizeof(char *));
-	rlen = rep.length << 2;
-	ch = (char *) Xmalloc((unsigned) (rlen + 1));
-	    /* +1 to leave room for last null-terminator */
-
-	if ((! flist) || (! ch)) {
-	    if (flist) Xfree((char *) flist);
-	    if (ch) Xfree(ch);
-	    _XEatData(dpy, (unsigned long) rlen);
-	    *actualCount = 0;
-	    UnlockDisplay(dpy);
-	    SyncHandle();
-	    return (char **) NULL;
-	}
-
-	_XReadPad (dpy, ch, rlen);
-	/*
-	 * unpack into null terminated strings.
-	 */
-	length = *(unsigned char *)ch;
-	*ch = 1; /* make sure it is non-zero for XFreeFontNames */
-	for (i = 0; i < rep.nFonts; i++) {
-	    flist[i] = ch + 1;  /* skip over length */
-	    ch += length + 1;  /* find next length ... */
-	    length = *(unsigned char *)ch;
-	    *ch = '\0';  /* and replace with null-termination */
-	}
-    }
-    else flist = (char **) NULL;
-    *actualCount = rep.nFonts;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return (flist);
-}
-
-int
-XFreeFontNames(list)
-char **list;
-{       
-	if (list) {
-		if (!*(list[0]-1)) { /* from ListFontsWithInfo */
-			register char **names;
-			for (names = list+1; *names; names++)
-				Xfree (*names);
-		}
-		Xfree (list[0]-1);
-		Xfree ((char *)list);
-	}
-	return 1;
-}
diff --git a/xc/lib/X11/FreeCmap.c b/xc/lib/X11/FreeCmap.c
deleted file mode 100644
index 4a58df557..000000000
--- a/xc/lib/X11/FreeCmap.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* $TOG: FreeCmap.c /main/9 1998/02/06 17:22:49 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/FreeCmap.c,v 1.2 1999/05/09 10:49:22 dawes Exp $ */
-
-#include "Xlibint.h"
-
-extern void _XcmsDeleteCmapRec();
-
-int
-XFreeColormap(dpy, cmap)
-register Display *dpy;
-Colormap cmap;
-{
-    register xResourceReq *req;
-
-    LockDisplay(dpy);
-    GetResReq(FreeColormap, cmap, req);
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-
-    _XcmsDeleteCmapRec(dpy, cmap);
-    return 1;
-}
diff --git a/xc/lib/X11/FreeCols.c b/xc/lib/X11/FreeCols.c
deleted file mode 100644
index d6f2f069a..000000000
--- a/xc/lib/X11/FreeCols.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* $TOG: FreeCols.c /main/8 1998/02/06 17:23:00 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/FreeCols.c,v 1.2 1999/05/09 10:49:22 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XFreeColors(dpy, cmap, pixels, npixels, planes)
-register Display *dpy;
-Colormap cmap;
-unsigned long *pixels; /* LISTofCARD32 */
-int npixels;
-unsigned long planes; /* CARD32 */
-{
-    register xFreeColorsReq *req;
-    register long nbytes;
-
-    LockDisplay(dpy);
-    GetReq(FreeColors, req);
-    req->cmap = cmap;
-    req->planeMask = planes;
-
-    /* on the VAX, each pixel is a 32-bit (unsigned) integer */
-    req->length += npixels;
-
-    nbytes = npixels << 2;		/* watch out for macros... */
-    Data32 (dpy, (long *) pixels, nbytes);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/FreeCurs.c b/xc/lib/X11/FreeCurs.c
deleted file mode 100644
index f2bd966de..000000000
--- a/xc/lib/X11/FreeCurs.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* $TOG: FreeCurs.c /main/6 1998/02/06 17:23:13 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/FreeCurs.c,v 1.2 1999/05/09 10:49:23 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XFreeCursor(dpy, cursor)
-    register Display *dpy;
-    Cursor cursor;
-{
-    register xResourceReq *req;
-    LockDisplay(dpy);
-    GetResReq(FreeCursor, cursor, req);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/FreeEData.c b/xc/lib/X11/FreeEData.c
deleted file mode 100644
index 89069b3a4..000000000
--- a/xc/lib/X11/FreeEData.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $TOG: FreeEData.c /main/6 1998/02/06 17:23:24 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/FreeEData.c,v 1.2 1999/05/09 10:49:23 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-_XFreeExtData (extension)
-     XExtData *extension;
-{
-	XExtData *temp;
-	while (extension) {
-		if (extension->free_private) 
-		    (*extension->free_private)(extension);
-		else Xfree ((char *)extension->private_data);
-		temp = extension->next;
-		Xfree ((char *)extension);
-		extension = temp;
-	}
-	return 0;
-}
diff --git a/xc/lib/X11/FreeGC.c b/xc/lib/X11/FreeGC.c
deleted file mode 100644
index 58e33765f..000000000
--- a/xc/lib/X11/FreeGC.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* $TOG: FreeGC.c /main/9 1998/02/06 17:23:35 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/FreeGC.c,v 1.2 1999/05/09 10:49:23 dawes Exp $ */
-
-#include "Xlibint.h"
-
-/* FreeEData.c */
-extern int _XFreeExtData();
-
-int
-XFreeGC (dpy, gc)
-    register Display *dpy;
-    GC gc;
-    {
-    register xResourceReq *req;
-    register _XExtension *ext;
-    LockDisplay(dpy);
-    /* call out to any extensions interested */
-    for (ext = dpy->ext_procs; ext; ext = ext->next)
-	if (ext->free_GC) (*ext->free_GC)(dpy, gc, &ext->codes);
-    GetResReq (FreeGC, gc->gid, req);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    _XFreeExtData(gc->ext_data);
-    Xfree ((char *) gc);
-    return 1;
-    }
-    
diff --git a/xc/lib/X11/FreePix.c b/xc/lib/X11/FreePix.c
deleted file mode 100644
index 9fd60239e..000000000
--- a/xc/lib/X11/FreePix.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* $TOG: FreePix.c /main/6 1998/02/06 17:23:46 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/FreePix.c,v 1.2 1999/05/09 10:49:24 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XFreePixmap(dpy, pixmap)
-    register Display *dpy;
-    Pixmap pixmap;
-
-{   
-    register xResourceReq *req;    
-    LockDisplay(dpy);
-    GetResReq(FreePixmap, pixmap, req);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/GCMisc.c b/xc/lib/X11/GCMisc.c
deleted file mode 100644
index 9b43412e8..000000000
--- a/xc/lib/X11/GCMisc.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/* $TOG: GCMisc.c /main/6 1998/02/06 17:24:20 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/GCMisc.c,v 1.2 1999/05/09 10:49:24 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XSetArcMode (dpy, gc, arc_mode)
-register Display *dpy;
-register GC gc;
-int arc_mode;
-{
-    LockDisplay(dpy);
-    if (gc->values.arc_mode != arc_mode) {
-	gc->values.arc_mode = arc_mode;
-	gc->dirty |= GCArcMode;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
-int
-XSetFillRule (dpy, gc, fill_rule)
-register Display *dpy;
-register GC gc;
-int fill_rule;
-{
-    LockDisplay(dpy);
-    if (gc->values.fill_rule != fill_rule) {
-	gc->values.fill_rule = fill_rule;
-	gc->dirty |= GCFillRule;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
-int
-XSetFillStyle (dpy, gc, fill_style)
-register Display *dpy;
-register GC gc;
-int fill_style;
-{
-    LockDisplay(dpy);
-    if (gc->values.fill_style != fill_style) {
-	gc->values.fill_style = fill_style;
-	gc->dirty |= GCFillStyle;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
-int
-XSetGraphicsExposures (dpy, gc, graphics_exposures)
-register Display *dpy;
-register GC gc;
-Bool graphics_exposures;
-{
-    LockDisplay(dpy);
-    if (gc->values.graphics_exposures != graphics_exposures) {
-	gc->values.graphics_exposures = graphics_exposures;
-	gc->dirty |= GCGraphicsExposures;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
-int
-XSetSubwindowMode (dpy, gc, subwindow_mode)
-register Display *dpy;
-register GC gc;
-int subwindow_mode;
-{
-    LockDisplay(dpy);
-    if (gc->values.subwindow_mode != subwindow_mode) {
-	gc->values.subwindow_mode = subwindow_mode;
-	gc->dirty |= GCSubwindowMode;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/Geom.c b/xc/lib/X11/Geom.c
deleted file mode 100644
index 7c6909e7d..000000000
--- a/xc/lib/X11/Geom.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/* $TOG: Geom.c /main/9 1998/02/06 17:24:31 kaleb $ */
-
-/*
-
-Copyright 1985, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-#include "Xlibint.h"
-#include "Xutil.h"
-
-/*
- * This routine given a user supplied positional argument and a default
- * argument (fully qualified) will return the position the window should take
- * returns 0 if there was some problem, else the position bitmask.
- */
-
-#if NeedFunctionPrototypes
-int XGeometry (
-     Display *dpy,			/* user's display connection */
-     int screen,			/* screen on which to do computation */
-     _Xconst char *pos,			/* user provided geometry spec */
-     _Xconst char *def,			/* default geometry spec for window */
-     unsigned int bwidth,		/* border width */
-     unsigned int fwidth,		/* size of position units */
-     unsigned int fheight,
-     int xadd,				/* any additional interior space */
-     int yadd,
-     register int *x,			/* always set on successful RETURN */
-     register int *y,			/* always set on successful RETURN */
-     register int *width,		/* always set on successful RETURN */
-     register int *height)		/* always set on successful RETURN */
-#else
-int XGeometry (dpy, screen, pos, def, bwidth, fwidth, fheight, xadd, yadd, x, y, width, height)
-     Display *dpy;			/* user's display connection */
-     int screen;			/* screen on which to do computation */
-     char *pos;				/* user provided geometry spec */
-     char *def;				/* default geometry spec for window */
-     unsigned int bwidth;		/* border width */
-     unsigned int fwidth, fheight;	/* size of position units */
-     int xadd, yadd;			/* any additional interior space */
-     register int *x, *y, *width, *height;/* always set on successful RETURN */
-#endif
-{
-	int px, py;			/* returned values from parse */
-	unsigned int pwidth, pheight;	/* returned values from parse */
-	int dx, dy;			/* default values from parse */
-	unsigned int dwidth, dheight;	/* default values from parse */
-	int pmask, dmask;		/* values back from parse */
-
-	pmask = XParseGeometry(pos, &px, &py, &pwidth, &pheight);
-	dmask = XParseGeometry(def, &dx, &dy, &dwidth, &dheight);
-
-	/* set default values */
-	*x = (dmask & XNegative) ? 
-	    DisplayWidth(dpy, screen)  + dx - dwidth * fwidth - 
-	        2 * bwidth - xadd : dx;
-	*y = (dmask & YNegative) ? 
-	    DisplayHeight(dpy, screen) + dy - dheight * fheight - 
-	        2 * bwidth - yadd : dy;
-	*width  = dwidth;
-	*height = dheight;
-
-	if (pmask & WidthValue)  *width  = pwidth;
-	if (pmask & HeightValue) *height = pheight;
-
-	if (pmask & XValue)
-	    *x = (pmask & XNegative) ?
-	      DisplayWidth(dpy, screen) + px - *width * fwidth - 
-		  2 * bwidth - xadd : px;
-	if (pmask & YValue)
-	    *y = (pmask & YNegative) ?
-	      DisplayHeight(dpy, screen) + py - *height * fheight - 
-		  2 * bwidth - yadd : py;
-	return (pmask);
-}
diff --git a/xc/lib/X11/GetAtomNm.c b/xc/lib/X11/GetAtomNm.c
deleted file mode 100644
index e03cbf14e..000000000
--- a/xc/lib/X11/GetAtomNm.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/* $TOG: GetAtomNm.c /main/12 1998/02/06 17:24:48 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/GetAtomNm.c,v 3.2 1999/05/09 10:49:24 dawes Exp $ */
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-extern void _XFreeAtomTable();
-
-/* IntAtom.c */
-extern void _XUpdateAtomCache();
-
-/* XlibAsync.c */
-extern void _XGetAsyncData();
-
-/* XXX this table def is duplicated in IntAtom.c, keep them consistent! */
-
-#define TABLESIZE 64
-
-typedef struct _Entry {
-    unsigned long sig;
-    Atom atom;
-} EntryRec, *Entry;
-
-#define EntryName(e) ((char *)(e+1))
-
-typedef struct _XDisplayAtoms {
-    Entry table[TABLESIZE];
-} AtomTable;
-
-static
-char *_XGetAtomName(dpy, atom)
-    Display *dpy;
-    Atom atom;
-{
-    xResourceReq *req;
-    char *name;
-    register Entry *table;
-    register int idx;
-    register Entry e;
-
-    if (dpy->atoms) {
-	table = dpy->atoms->table;
-	for (idx = TABLESIZE; --idx >= 0; ) {
-	    if ((e = *table++) && (e->atom == atom)) {
-		idx = strlen(EntryName(e)) + 1;
-		if ((name = (char *)Xmalloc(idx)))
-		    strcpy(name, EntryName(e));
-		return name;
-	    }		
-	}
-    }
-    GetResReq(GetAtomName, atom, req);
-    return (char *)NULL;
-}
-
-char *XGetAtomName(dpy, atom)
-    register Display *dpy;
-    Atom atom;
-{
-    xGetAtomNameReply rep;
-    char *name;
-
-    LockDisplay(dpy);
-    if ((name = _XGetAtomName(dpy, atom))) {
-	UnlockDisplay(dpy);
-	return name;
-    }	
-    if (_XReply(dpy, (xReply *)&rep, 0, xFalse) == 0) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return(NULL);
-    }
-    if ((name = (char *) Xmalloc(rep.nameLength+1))) {
-	_XReadPad(dpy, name, (long)rep.nameLength);
-	name[rep.nameLength] = '\0';
-	_XUpdateAtomCache(dpy, name, atom, 0, -1, 0);
-    } else {
-	_XEatData(dpy, (unsigned long) (rep.nameLength + 3) & ~3);
-	name = (char *) NULL;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return(name);
-}
-
-typedef struct {
-    unsigned long start_seq;
-    unsigned long stop_seq;
-    Atom *atoms;
-    char **names;
-    int idx;
-    int count;
-    Status status;
-} _XGetAtomNameState;
-
-static
-Bool _XGetAtomNameHandler(dpy, rep, buf, len, data)
-    register Display *dpy;
-    register xReply *rep;
-    char *buf;
-    int len;
-    XPointer data;
-{
-    register _XGetAtomNameState *state;
-    xGetAtomNameReply replbuf;
-    register xGetAtomNameReply *repl;
-
-    state = (_XGetAtomNameState *)data;
-    if (dpy->last_request_read < state->start_seq ||
-	dpy->last_request_read > state->stop_seq)
-	return False;
-    while (state->idx < state->count && state->names[state->idx])
-	state->idx++;
-    if (state->idx >= state->count)
-	return False;
-    if (rep->generic.type == X_Error) {
-	state->status = 0;
-	return False;
-    }
-    repl = (xGetAtomNameReply *)
-	_XGetAsyncReply(dpy, (char *)&replbuf, rep, buf, len,
-			(SIZEOF(xGetAtomNameReply) - SIZEOF(xReply)) >> 2,
-			False);
-    state->names[state->idx] = (char *) Xmalloc(repl->nameLength+1);
-    _XGetAsyncData(dpy, state->names[state->idx], buf, len,
-		   SIZEOF(xGetAtomNameReply), repl->nameLength,
-		   repl->length << 2);
-    if (state->names[state->idx]) {
-	state->names[state->idx][repl->nameLength] = '\0';
-	_XUpdateAtomCache(dpy, state->names[state->idx],
-			  state->atoms[state->idx], 0, -1, 0);
-    } else {
-	state->status = 0;
-    }
-    return True;
-}
-
-Status
-XGetAtomNames (dpy, atoms, count, names_return)
-    Display *dpy;
-    Atom *atoms;
-    int count;
-    char **names_return;
-{
-    _XAsyncHandler async;
-    _XGetAtomNameState async_state;
-    xGetAtomNameReply rep;
-    int i;
-    int missed = -1;
-
-    LockDisplay(dpy);
-    async_state.start_seq = dpy->request + 1;
-    async_state.atoms = atoms;
-    async_state.names = names_return;
-    async_state.idx = 0;
-    async_state.count = count - 1;
-    async_state.status = 1;
-    async.next = dpy->async_handlers;
-    async.handler = _XGetAtomNameHandler;
-    async.data = (XPointer)&async_state;
-    dpy->async_handlers = &async;
-    for (i = 0; i < count; i++) {
-	if (!(names_return[i] = _XGetAtomName(dpy, atoms[i]))) {
-	    missed = i;
-	    async_state.stop_seq = dpy->request;
-	}
-    }
-    if (missed >= 0) {
-	if (_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	    if ((names_return[missed] = (char *) Xmalloc(rep.nameLength+1))) {
-		_XReadPad(dpy, names_return[missed], (long)rep.nameLength);
-		names_return[missed][rep.nameLength] = '\0';
-		_XUpdateAtomCache(dpy, names_return[missed], atoms[missed],
-				  0, -1, 0);
-	    } else {
-		_XEatData(dpy, (unsigned long) (rep.nameLength + 3) & ~3);
-		async_state.status = 0;
-	    }
-	}
-    }
-    DeqAsyncHandler(dpy, &async);
-    UnlockDisplay(dpy);
-    if (missed >= 0)
-	SyncHandle();
-    return async_state.status;
-}
diff --git a/xc/lib/X11/GetColor.c b/xc/lib/X11/GetColor.c
deleted file mode 100644
index adfb41977..000000000
--- a/xc/lib/X11/GetColor.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/* $TOG: GetColor.c /main/19 1998/02/06 17:24:59 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/GetColor.c,v 1.2 1999/05/09 10:49:25 dawes Exp $ */
-
-#define NEED_REPLIES
-#include <stdio.h>
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-extern void _XcmsRGB_to_XColor();
-
-/* cmsColNm.c */
-extern Status _XcmsResolveColorString(
-#if NeedFunctionPrototypes
-				      XcmsCCC ccc,
-				      _Xconst char **color_string,
-				      XcmsColor *pColor_exact_return,
-				      XcmsColorFormat result_format
-#endif
-);
-
-#if NeedFunctionPrototypes
-Status XAllocNamedColor(
-register Display *dpy,
-Colormap cmap,
-_Xconst char *colorname, /* STRING8 */
-XColor *hard_def, /* RETURN */
-XColor *exact_def) /* RETURN */
-#else
-Status XAllocNamedColor(dpy, cmap, colorname, hard_def, exact_def)
-register Display *dpy;
-Colormap cmap;
-char *colorname; /* STRING8 */
-XColor *hard_def; /* RETURN */
-XColor *exact_def; /* RETURN */
-#endif
-{
-
-    long nbytes;
-    xAllocNamedColorReply rep;
-    xAllocNamedColorReq *req;
-
-    XcmsCCC ccc;
-    XcmsColor cmsColor_exact;
-    Status ret;
-
-    /*
-     * Let's Attempt to use Xcms and i18n approach to Parse Color
-     */
-    /* copy string to allow overwrite by _XcmsResolveColorString() */
-    if ((ccc = XcmsCCCOfColormap(dpy, cmap)) != (XcmsCCC)NULL) {
-	if (_XcmsResolveColorString(ccc, &colorname, &cmsColor_exact,
-		XcmsRGBFormat) >= XcmsSuccess) {
-	    _XcmsRGB_to_XColor(&cmsColor_exact, exact_def, 1);
-	    memcpy((char *)hard_def, (char *)exact_def, sizeof(XColor));
-	    ret = XAllocColor(dpy, cmap, hard_def);
-	    exact_def->pixel = hard_def->pixel;
-	    return(ret);
-	}
-	/*
-	 * Otherwise we failed; or colorname was changed with yet another
-	 * name.  Thus pass name to the X Server.
-	 */
-    }
-
-    /*
-     * Xcms and i18n approach failed.
-     */
-    LockDisplay(dpy);
-    GetReq(AllocNamedColor, req);
-
-    req->cmap = cmap;
-    nbytes = req->nbytes = strlen(colorname);
-    req->length += (nbytes + 3) >> 2; /* round up to mult of 4 */
-
-    _XSend(dpy, colorname, nbytes);
-       /* _XSend is more efficient that Data, since _XReply follows */
-
-    if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) {
-	UnlockDisplay(dpy);
-        SyncHandle();
-        return (0);
-    }
-
-    exact_def->red = rep.exactRed;
-    exact_def->green = rep.exactGreen;
-    exact_def->blue = rep.exactBlue;
-
-    hard_def->red = rep.screenRed;
-    hard_def->green = rep.screenGreen;
-    hard_def->blue = rep.screenBlue;
-
-    exact_def->pixel = hard_def->pixel = rep.pixel;
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return (1);
-}
diff --git a/xc/lib/X11/GetDflt.c b/xc/lib/X11/GetDflt.c
deleted file mode 100644
index 258d9c18a..000000000
--- a/xc/lib/X11/GetDflt.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/* $TOG: GetDflt.c /main/59 1998/05/12 11:19:09 kaleb $ */
-
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-/* $XFree86: xc/lib/X11/GetDflt.c,v 3.16 1999/05/09 10:49:25 dawes Exp $ */
-
-#include "Xlibint.h"
-#include <X11/Xos.h>
-#include <X11/Xresource.h>
-
-#ifndef X_NOT_POSIX
-#ifdef _POSIX_SOURCE
-#include <limits.h>
-#else
-#define _POSIX_SOURCE
-#include <limits.h>
-#undef _POSIX_SOURCE
-#endif
-#endif
-#ifndef PATH_MAX
-#ifdef WIN32
-#define PATH_MAX 512
-#else
-#include <sys/param.h>
-#endif
-#ifndef PATH_MAX
-#ifdef MAXPATHLEN
-#define PATH_MAX MAXPATHLEN
-#else
-#define PATH_MAX 1024
-#endif
-#endif
-#endif
-
-#ifdef XTHREADS
-#include <X11/Xthreads.h>
-#endif
-#ifndef WIN32
-#define X_INCLUDE_PWD_H
-#define XOS_USE_XLIB_LOCKING
-#include <X11/Xos_r.h>
-#endif
-#include <stdio.h>
-#include <ctype.h>
-
-#ifdef X_NOT_STDC_ENV
-extern char *getenv();
-#endif
-
-/*ARGSUSED*/
-static char *GetHomeDir (dest, len)
-    char *dest;
-    int len;
-{
-#ifdef WIN32
-    register char *ptr1;
-    register char *ptr2;
-    int len1 = 0, len2 = 0;
-
-    if (ptr1 = getenv("HOME")) {	/* old, deprecated */
-	len1 = strlen (ptr1);
-    } else if ((ptr1 = getenv("HOMEDRIVE")) && (ptr2 = getenv("HOMEDIR"))) {
-	len1 = strlen (ptr1);
-	len2 = strlen (ptr2);
-    } else if (ptr2 = getenv("USERNAME")) {
-	len1 = strlen (ptr1 = "/users/");
-	len2 = strlen (ptr2);
-    }
-    if ((len1 + len2 + 1) < len)
-	sprintf (dest, "%s%s", ptr1, (ptr2) ? ptr2 : "");
-    else
-	*dest = '\0';
-#else
-    _Xgetpwparams pwparams;
-    struct passwd *pw;
-    register char *ptr;
-
-    if (len <= 0 || dest == NULL)
-	return NULL;
-
-    if ((ptr = getenv("HOME"))) {
-	(void) strncpy(dest, ptr, len-1);
-	dest[len-1] = '\0';
-    } else {
-	if ((ptr = getenv("USER")))
-	    pw = _XGetpwnam(ptr,pwparams);
-	else
-	    pw = _XGetpwuid(getuid(),pwparams);
-	if (pw != NULL) {
-	    (void) strncpy(dest, pw->pw_dir, len-1);
-	    dest[len-1] = '\0';
-	} else
-	    *dest = '\0';
-    }
-#endif
-    return dest;
-}
-
-
-static XrmDatabase InitDefaults (dpy)
-    Display *dpy;			/* display for defaults.... */
-{
-    XrmDatabase userdb;
-    XrmDatabase xdb;
-    char fname[PATH_MAX];               /* longer than any conceivable size */
-    char *xenv;
-
-    XrmInitialize();
-
-    /*
-     * See lib/Xt/Initialize.c
-     *
-     * First, get the defaults from the server; if none, then load from
-     * ~/.Xdefaults.  Next, if there is an XENVIRONMENT environment variable,
-     * then load that file.
-     */
-
-    if (dpy->xdefaults == NULL) {
-	char *slashDotXdefaults = "/.Xdefaults";
-
-	(void) GetHomeDir (fname, PATH_MAX - strlen (slashDotXdefaults) - 1);
-	(void) strcat (fname, slashDotXdefaults);
-	xdb = XrmGetFileDatabase (fname);
-    } else {
-	xdb = XrmGetStringDatabase(dpy->xdefaults);
-    }
-
-    if (!(xenv = getenv ("XENVIRONMENT"))) {
-	char *slashDotXdefaultsDash = "/.Xdefaults-";
-	int len;
-
-	(void) GetHomeDir (fname, PATH_MAX - strlen (slashDotXdefaultsDash) - 1);
-	(void) strcat (fname, slashDotXdefaultsDash);
-	len = strlen (fname);
-	(void) _XGetHostname (fname+len, PATH_MAX-len);
-	xenv = fname;
-    }
-    userdb = XrmGetFileDatabase (xenv);
-    XrmMergeDatabases (userdb, &xdb);
-    return (xdb);
-
-#ifdef old
-    if (fname[0] != '\0') userdb =  XrmGetFileDatabase(fname);
-    xdb = XrmGetStringDatabase(dpy->xdefaults);
-    XrmMergeDatabases(userdb, &xdb);
-    return xdb;
-#endif
-}
-
-#if NeedFunctionPrototypes
-char *XGetDefault(
-	Display *dpy,			/* display for defaults.... */
-	char _Xconst *prog,		/* name of program for option	*/
-	register _Xconst char *name)	/* name of option program wants */
-#else
-char *XGetDefault(dpy, prog, name)
-	Display *dpy;			/* display for defaults.... */
-	char *prog;			/* name of program for option	*/
-	register char *name;		/* name of option program wants */
-#endif
-{					/* to get, for example, "font"  */
-	XrmName names[3];
-	XrmClass classes[3];
-	XrmRepresentation fromType;
-	XrmValue result;
-	char *progname;
-#ifdef WIN32
-	char *progname2;
-#endif
-#ifdef __EMX__
-	char *progname2;
-	char *dotpos;
-#endif
-
-	/*
-	 * strip path off of program name (XXX - this is OS specific)
-	 */
-	progname = strrchr (prog, '/');
-#ifdef WIN32
-	progname2 = strrchr (prog, '\\');
-	if (progname2 && (!progname || progname < progname2))
-	    progname = progname2;
-#endif
-#ifdef __EMX__  /* Very similar to WIN32 */
-	progname2 = strrchr (prog, '\\');
-	if (progname2 && (!progname || progname < progname2))
-	    progname = progname2;
-	dotpos = strrchr (prog, '.');
-	if (dotpos && (dotpos>progname2)) *dotpos='\0';
-#endif  /* We take out the .exe suffix  */
-
-	if (progname)
-	    progname++;
-	else
-	    progname = (char *)prog;
-
-	/*
-	 * see if database has ever been initialized.  Lookups can be done
-	 * without locks held.
-	 */
-	LockDisplay(dpy);
-	if (dpy->db == NULL) {
-		dpy->db = InitDefaults(dpy);
-		}
-	UnlockDisplay(dpy);
-
-	names[0] = XrmStringToName(progname);
-	names[1] = XrmStringToName(name);
-	names[2] = NULLQUARK;
-	classes[0] = XrmStringToClass("Program");
-	classes[1] = XrmStringToClass("Name");
-	classes[2] = NULLQUARK;
-	(void)XrmQGetResource(dpy->db, names, classes, &fromType, &result);
-	return (result.addr);
-}
-
diff --git a/xc/lib/X11/GetFPath.c b/xc/lib/X11/GetFPath.c
deleted file mode 100644
index 3a31174ee..000000000
--- a/xc/lib/X11/GetFPath.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* $TOG: GetFPath.c /main/8 1998/02/06 17:25:22 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/GetFPath.c,v 1.2 1999/05/09 10:49:26 dawes Exp $ */
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-char **XGetFontPath(dpy, npaths)
-register Display *dpy;
-int *npaths;	/* RETURN */
-{
-	xGetFontPathReply rep;
-	register long nbytes;
-	char **flist;
-	char *ch;
-	register unsigned i;
-	register int length;
-	register xReq *req;
-
-	LockDisplay(dpy);
-	GetEmptyReq (GetFontPath, req);
-	(void) _XReply (dpy, (xReply *) &rep, 0, xFalse);
-
-	if (rep.nPaths) {
-	    flist = (char **)
-		Xmalloc((unsigned) rep.nPaths * sizeof (char *));
-	    nbytes = (long)rep.length << 2;
-	    ch = (char *) Xmalloc ((unsigned) (nbytes + 1));
-                /* +1 to leave room for last null-terminator */
-
-	    if ((! flist) || (! ch)) {
-		if (flist) Xfree((char *) flist);
-		if (ch) Xfree(ch);
-		_XEatData(dpy, (unsigned long) nbytes);
-		UnlockDisplay(dpy);
-		SyncHandle();
-		return (char **) NULL;
-	    }
-
-	    _XReadPad (dpy, ch, nbytes);
-	    /*
-	     * unpack into null terminated strings.
-	     */
-	    length = *ch;
-	    for (i = 0; i < rep.nPaths; i++) {
-		flist[i] = ch+1;  /* skip over length */
-		ch += length + 1; /* find next length ... */
-		length = *ch;
-		*ch = '\0'; /* and replace with null-termination */
-	    }
-	}
-	else flist = NULL;
-	*npaths = rep.nPaths;
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return (flist);
-}
-
-int
-XFreeFontPath (list)
-char **list;
-{
-	if (list != NULL) {
-		Xfree (list[0]-1);
-		Xfree ((char *)list);
-	}
-	return 1;
-}
diff --git a/xc/lib/X11/GetFProp.c b/xc/lib/X11/GetFProp.c
deleted file mode 100644
index 6abeb69f3..000000000
--- a/xc/lib/X11/GetFProp.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* $TOG: GetFProp.c /main/5 1998/02/06 17:25:33 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#include "Xlibint.h"
-
-Bool XGetFontProperty (fs, name, valuePtr)
-    XFontStruct *fs;
-    register Atom name;
-    unsigned long *valuePtr;
-    {
-    /* XXX this is a simple linear search for now.  If the
-      protocol is changed to sort the property list, this should
-      become a binary search. */
-    register XFontProp *prop = fs->properties;
-    register XFontProp *last = prop + fs->n_properties;
-    while (prop != last) {
-	if (prop->name == name) {
-	    *valuePtr = prop->card32;
-	    return (1);
-	    }
-	prop++;
-	}
-    return (0);
-    }
-
-	
-    
-
-      
diff --git a/xc/lib/X11/GetGCVals.c b/xc/lib/X11/GetGCVals.c
deleted file mode 100644
index 8b65bc6bc..000000000
--- a/xc/lib/X11/GetGCVals.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* $TOG: GetGCVals.c /main/5 1998/02/06 17:25:45 kaleb $ */
-
-/*
-
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#include "Xlibint.h"
-
-/*
- * All gc fields except GCClipMask and GCDashList
- */
-#define ValidGCValuesBits (GCFunction | GCPlaneMask | GCForeground | \
-			   GCBackground | GCLineWidth | GCLineStyle | \
-			   GCCapStyle | GCJoinStyle | GCFillStyle | \
-			   GCFillRule | GCTile | GCStipple | \
-			   GCTileStipXOrigin | GCTileStipYOrigin | \
-			   GCFont | GCSubwindowMode | GCGraphicsExposures | \
-			   GCClipXOrigin | GCClipYOrigin | GCDashOffset | \
-			   GCArcMode)
-
-/*ARGSUSED*/
-Status XGetGCValues (dpy, gc, valuemask, values)
-    Display *dpy;
-    GC gc;
-    unsigned long valuemask;
-    XGCValues *values;
-{
-    if (valuemask == ValidGCValuesBits) {
-	char dashes = values->dashes;
-	Pixmap clip_mask = values->clip_mask;
-	*values = gc->values;
-	values->dashes = dashes;
-	values->clip_mask = clip_mask;
-	return True;
-    }
-
-    if (valuemask & ~ValidGCValuesBits) return False;
-
-    if (valuemask & GCFunction)
-      values->function = gc->values.function;
-
-    if (valuemask & GCPlaneMask)
-      values->plane_mask = gc->values.plane_mask;
-
-    if (valuemask & GCForeground)
-      values->foreground = gc->values.foreground;
-
-    if (valuemask & GCBackground)
-      values->background = gc->values.background;
-
-    if (valuemask & GCLineWidth)
-      values->line_width = gc->values.line_width;
-
-    if (valuemask & GCLineStyle)
-      values->line_style = gc->values.line_style;
-
-    if (valuemask & GCCapStyle)
-      values->cap_style = gc->values.cap_style;
-
-    if (valuemask & GCJoinStyle)
-      values->join_style = gc->values.join_style;
-
-    if (valuemask & GCFillStyle)
-      values->fill_style = gc->values.fill_style;
-
-    if (valuemask & GCFillRule)
-      values->fill_rule = gc->values.fill_rule;
-
-    if (valuemask & GCTile)
-      values->tile = gc->values.tile;
-
-    if (valuemask & GCStipple)
-      values->stipple = gc->values.stipple;
-
-    if (valuemask & GCTileStipXOrigin)
-      values->ts_x_origin = gc->values.ts_x_origin;
-
-    if (valuemask & GCTileStipYOrigin)
-      values->ts_y_origin = gc->values.ts_y_origin;
-
-    if (valuemask & GCFont)
-      values->font = gc->values.font;
-
-    if (valuemask & GCSubwindowMode)
-      values->subwindow_mode = gc->values.subwindow_mode;
-
-    if (valuemask & GCGraphicsExposures)
-      values->graphics_exposures = gc->values.graphics_exposures;
-
-    if (valuemask & GCClipXOrigin)
-      values->clip_x_origin = gc->values.clip_x_origin;
-
-    if (valuemask & GCClipYOrigin)
-      values->clip_y_origin = gc->values.clip_y_origin;
-
-    if (valuemask & GCDashOffset)
-
-      values->dash_offset = gc->values.dash_offset;
-
-    if (valuemask & GCArcMode)
-      values->arc_mode = gc->values.arc_mode;
-
-    return True;
-}
diff --git a/xc/lib/X11/GetGeom.c b/xc/lib/X11/GetGeom.c
deleted file mode 100644
index 187e7d175..000000000
--- a/xc/lib/X11/GetGeom.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* $TOG: GetGeom.c /main/7 1998/02/06 17:25:56 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-Status XGetGeometry (dpy, d, root, x, y, width, height, borderWidth, depth)
-    register Display *dpy;
-    Drawable d;
-    Window *root; /* RETURN */
-    int *x, *y;  /* RETURN */
-    unsigned int *width, *height, *borderWidth, *depth;  /* RETURN */
-{
-    xGetGeometryReply rep;
-    register xResourceReq *req;
-    LockDisplay(dpy);
-    GetResReq(GetGeometry, d, req);
-    if (!_XReply (dpy, (xReply *)&rep, 0, xTrue)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return (0);
-	}
-    *root = rep.root;
-    *x = cvtINT16toInt (rep.x);
-    *y = cvtINT16toInt (rep.y);
-    *width = rep.width;
-    *height = rep.height;
-    *borderWidth = rep.borderWidth;
-    *depth = rep.depth;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return (1);
-}
-
diff --git a/xc/lib/X11/GetHColor.c b/xc/lib/X11/GetHColor.c
deleted file mode 100644
index 1f33c77e7..000000000
--- a/xc/lib/X11/GetHColor.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* $TOG: GetHColor.c /main/5 1998/02/06 17:26:07 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-Status XAllocColor(dpy, cmap, def)
-register Display *dpy;
-Colormap cmap;
-XColor *def;
-{
-    Status status;
-    xAllocColorReply rep;
-    register xAllocColorReq *req;
-    LockDisplay(dpy);
-    GetReq(AllocColor, req);
-
-    req->cmap = cmap;
-    req->red = def->red;
-    req->green = def->green;
-    req->blue = def->blue;
-
-    status = _XReply(dpy, (xReply *) &rep, 0, xTrue);
-    if (status) {
-      def->pixel = rep.pixel;
-      def->red = rep.red;
-      def->green = rep.green;
-      def->blue = rep.blue;
-      }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return(status);
-}
diff --git a/xc/lib/X11/GetHints.c b/xc/lib/X11/GetHints.c
deleted file mode 100644
index 3e48f512d..000000000
--- a/xc/lib/X11/GetHints.c
+++ /dev/null
@@ -1,334 +0,0 @@
-/* $TOG: GetHints.c /main/23 1998/02/06 17:26:18 kaleb $ */
-
-/***********************************************************
-
-Copyright 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-/* $XFree86: xc/lib/X11/GetHints.c,v 1.2 1999/05/09 10:49:26 dawes Exp $ */
-
-#include <X11/Xlibint.h>
-#include <X11/Xos.h>
-#include <X11/Xutil.h>
-#include "Xatomtype.h"
-#include <X11/Xatom.h>
-#include <stdio.h>
-
-Status XGetSizeHints (dpy, w, hints, property)
-	Display *dpy;
-	Window w;
-	XSizeHints *hints;
-        Atom property;
-{
-	xPropSizeHints *prop = NULL;
-        Atom actual_type;
-        int actual_format;
-        unsigned long leftover;
-        unsigned long nitems;
-	if (XGetWindowProperty(dpy, w, property, 0L,
-			       (long) OldNumPropSizeElements,
-	    False, XA_WM_SIZE_HINTS, &actual_type, &actual_format,
-            &nitems, &leftover, (unsigned char **)&prop)
-            != Success) return (0);
-
-        if ((actual_type != XA_WM_SIZE_HINTS) ||
-	    (nitems < OldNumPropSizeElements) || (actual_format != 32)) {
-		if (prop != NULL) Xfree ((char *)prop);
-                return(0);
-		}
-	hints->flags	  = (prop->flags & (USPosition|USSize|PAllHints));
-	hints->x 	  = cvtINT32toInt (prop->x);
-	hints->y 	  = cvtINT32toInt (prop->y);
-	hints->width      = cvtINT32toInt (prop->width);
-	hints->height     = cvtINT32toInt (prop->height);
-	hints->min_width  = cvtINT32toInt (prop->minWidth);
-	hints->min_height = cvtINT32toInt (prop->minHeight);
-	hints->max_width  = cvtINT32toInt (prop->maxWidth);
-	hints->max_height = cvtINT32toInt (prop->maxHeight);
-	hints->width_inc  = cvtINT32toInt (prop->widthInc);
-	hints->height_inc = cvtINT32toInt (prop->heightInc);
-	hints->min_aspect.x = cvtINT32toInt (prop->minAspectX);
-	hints->min_aspect.y = cvtINT32toInt (prop->minAspectY);
-	hints->max_aspect.x = cvtINT32toInt (prop->maxAspectX);
-	hints->max_aspect.y = cvtINT32toInt (prop->maxAspectY);
-	Xfree((char *)prop);
-	return(1);
-}
-
-/* 
- * must return a pointer to the hint, in malloc'd memory, or routine is not
- * extensible; any use of the caller's memory would cause things to be stepped
- * on.
- */
-
-XWMHints *XGetWMHints (dpy, w)
-	Display *dpy;
-	Window w;
-{
-	xPropWMHints *prop = NULL;
-	register XWMHints *hints;
-        Atom actual_type;
-        int actual_format;
-        unsigned long leftover;
-        unsigned long nitems;
-	if (XGetWindowProperty(dpy, w, XA_WM_HINTS, 
-	    0L, (long)NumPropWMHintsElements,
-	    False, XA_WM_HINTS, &actual_type, &actual_format,
-            &nitems, &leftover, (unsigned char **)&prop)
-            != Success) return (NULL);
-
-	/* If the property is undefined on the window, return null pointer. */
-	/* pre-R3 bogusly truncated window_group, don't fail on them */
-
-        if ((actual_type != XA_WM_HINTS) ||
-	    (nitems < (NumPropWMHintsElements - 1)) || (actual_format != 32)) {
-		if (prop != NULL) Xfree ((char *)prop);
-                return(NULL);
-		}
-	/* static copies not allowed in library, due to reentrancy constraint*/
-	if ((hints = (XWMHints *) Xcalloc (1, (unsigned) sizeof(XWMHints)))) {
-	    hints->flags = prop->flags;
-	    hints->input = (prop->input ? True : False);
-	    hints->initial_state = cvtINT32toInt (prop->initialState);
-	    hints->icon_pixmap = prop->iconPixmap;
-	    hints->icon_window = prop->iconWindow;
-	    hints->icon_x = cvtINT32toInt (prop->iconX);
-	    hints->icon_y = cvtINT32toInt (prop->iconY);
-	    hints->icon_mask = prop->iconMask;
-	    if (nitems >= NumPropWMHintsElements)
-		hints->window_group = prop->windowGroup;
-	    else
-		hints->window_group = 0;
-	}
-	Xfree ((char *)prop);
-	return(hints);
-}
-
-Status
-XGetZoomHints (dpy, w, zhints)
-	Display *dpy;
-	Window w;
-	XSizeHints *zhints;
-{
-	return (XGetSizeHints(dpy, w, zhints, XA_WM_ZOOM_HINTS));
-}
-
-Status
-XGetNormalHints (dpy, w, hints)
-	Display *dpy;
-	Window w;
-	XSizeHints *hints;
-{
-	return (XGetSizeHints(dpy, w, hints, XA_WM_NORMAL_HINTS));
-}
-
-				
-/*
- * XGetIconSizes reads the property 
- *	ICONSIZE_ATOM	type: ICONSIZE_ATOM format: 32
- */
-
-Status XGetIconSizes (dpy, w, size_list, count)
-	Display *dpy;
-	Window w;	/* typically, root */
-	XIconSize **size_list;	/* RETURN */
-	int *count; 		/* RETURN number of items on the list */
-{
-	xPropIconSize *prop = NULL;
-	register xPropIconSize *pp;
-	register XIconSize *hp, *hints;
-        Atom actual_type;
-        int actual_format;
-        unsigned long leftover;
-        unsigned long nitems;
-	register int i;
-
-	if (XGetWindowProperty(dpy, w, XA_WM_ICON_SIZE, 0L, 60L,
-	    False, XA_WM_ICON_SIZE, &actual_type, &actual_format,
-            &nitems, &leftover, (unsigned char **)&prop)
-            != Success) return (0);
-
-	pp = prop;
-
-        if ((actual_type != XA_WM_ICON_SIZE) ||
-	    (nitems < NumPropIconSizeElements) ||
-	    (nitems % NumPropIconSizeElements != 0) ||
-	    (actual_format != 32)) {
-		if (prop != NULL) Xfree ((char *)prop);
-                return(0);
-		}
-
-	/* static copies not allowed in library, due to reentrancy constraint*/
-
-	nitems /= NumPropIconSizeElements;
-	if (! (hp = hints = (XIconSize *) 
-	  Xcalloc ((unsigned) nitems, (unsigned) sizeof(XIconSize)))) {
-	    if (prop) Xfree ((char *) prop);
-	    return 0;
-	}
-
-	/* march down array putting things into native form */
-	for (i = 0; i < nitems; i++) {
-	    hp->min_width  = cvtINT32toInt (pp->minWidth);
-	    hp->min_height = cvtINT32toInt (pp->minHeight);
-	    hp->max_width  = cvtINT32toInt (pp->maxWidth);
-	    hp->max_height = cvtINT32toInt (pp->maxHeight);
-	    hp->width_inc  = cvtINT32toInt (pp->widthInc);
-	    hp->height_inc = cvtINT32toInt (pp->heightInc);
-	    hp += 1;
-	    pp += 1;
-	}
-	*count = nitems;
-	*size_list = hints;
-	Xfree ((char *)prop);
-	return(1);
-}
-
-
-Status XGetCommand (dpy, w, argvp, argcp)
-    Display *dpy;
-    Window w;
-    char ***argvp;
-    int *argcp;
-{
-    XTextProperty tp;
-    int argc;
-    char **argv;
-
-    if (!XGetTextProperty (dpy, w, &tp, XA_WM_COMMAND)) return 0;
-
-    if (tp.encoding != XA_STRING || tp.format != 8) {
-	if (tp.value) Xfree ((char *) tp.value);
-	return 0;
-    }
-
-
-    /*
-     * ignore final <NUL> if present since UNIX WM_COMMAND is nul-terminated
-     */
-    if (tp.nitems && (tp.value[tp.nitems - 1] == '\0')) tp.nitems--;
-
-
-    /*
-     * create a string list and return if successful
-     */
-    if (!XTextPropertyToStringList (&tp, &argv, &argc)) {
-	if (tp.value) Xfree ((char *) tp.value);
-	return (0);
-    }
-
-    if (tp.value) Xfree ((char *) tp.value);
-    *argvp = argv;
-    *argcp = argc;
-    return 1;
-}
-
-
-Status
-XGetTransientForHint(dpy, w, propWindow)
-	Display *dpy;
-	Window w;
-	Window *propWindow;
-{
-    Atom actual_type;
-    int actual_format;
-    unsigned long nitems;
-    unsigned long leftover;
-    Window *data = NULL;
-    if (XGetWindowProperty(dpy, w, XA_WM_TRANSIENT_FOR, 0L, 1L, False,
-        XA_WINDOW, 
-	&actual_type,
-	&actual_format, &nitems, &leftover, (unsigned char **) &data)
-	!= Success) {
-	*propWindow = None;
-	return (0);
-	}
-    if ( (actual_type == XA_WINDOW) && (actual_format == 32) &&
-	 (nitems != 0) ) {
-	*propWindow = *data;
-	Xfree( (char *) data);
-	return (1);
-	}
-    *propWindow = None;
-    if (data) Xfree( (char *) data);
-    return(0);
-}
-
-Status
-XGetClassHint(dpy, w, classhint)
-	Display *dpy;
-	Window w;
-	XClassHint *classhint;	/* RETURN */
-{
-    int len_name, len_class;
-
-    Atom actual_type;
-    int actual_format;
-    unsigned long nitems;
-    unsigned long leftover;
-    unsigned char *data = NULL;
-    if (XGetWindowProperty(dpy, w, XA_WM_CLASS, 0L, (long)BUFSIZ, False,
-        XA_STRING, 
-	&actual_type,
-	&actual_format, &nitems, &leftover, &data) != Success)
-           return (0);
-	
-   if ( (actual_type == XA_STRING) && (actual_format == 8) ) {
-	len_name = strlen((char *) data);
-	if (! (classhint->res_name = Xmalloc((unsigned) (len_name+1)))) {
-	    Xfree((char *) data);
-	    return (0);
-	}
-	strcpy(classhint->res_name, (char *) data);
-	if (len_name == nitems) len_name--;
-	len_class = strlen((char *) (data+len_name+1));
-	if (! (classhint->res_class = Xmalloc((unsigned) (len_class+1)))) {
-	    Xfree(classhint->res_name);
-	    classhint->res_name = (char *) NULL;
-	    Xfree((char *) data);
-	    return (0);
-	}
-	strcpy(classhint->res_class, (char *) (data+len_name+1));
-	Xfree( (char *) data);
-	return(1);
-	}
-    if (data) Xfree( (char *) data);
-    return(0);
-}
diff --git a/xc/lib/X11/GetIFocus.c b/xc/lib/X11/GetIFocus.c
deleted file mode 100644
index 4a2915671..000000000
--- a/xc/lib/X11/GetIFocus.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $TOG: GetIFocus.c /main/6 1998/02/06 17:26:31 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/GetIFocus.c,v 1.2 1999/05/09 10:49:27 dawes Exp $ */
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-int
-XGetInputFocus(dpy, focus, revert_to)
-     register Display *dpy;
-     Window *focus;
-     int *revert_to;
-{       
-    xGetInputFocusReply rep;
-    register xReq *req;
-    LockDisplay(dpy);
-    GetEmptyReq(GetInputFocus, req);
-    (void) _XReply (dpy, (xReply *)&rep, 0, xTrue);
-    *focus = rep.focus;
-    *revert_to = rep.revertTo;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/GetImage.c b/xc/lib/X11/GetImage.c
deleted file mode 100644
index 7d3d03eaf..000000000
--- a/xc/lib/X11/GetImage.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* $TOG: GetImage.c /main/17 1998/02/06 17:26:43 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/GetImage.c,v 1.2 1999/05/09 10:49:27 dawes Exp $ */
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-#include <X11/Xutil.h>		/* for XDestroyImage */
-
-/* ImUtil.c */
-extern int _XGetScanlinePad();
-extern int _XSetImage();
-
-#define ROUNDUP(nbytes, pad) (((((nbytes) - 1) + (pad)) / (pad)) * (pad))
-
-static unsigned int Ones(mask)                /* HACKMEM 169 */
-    unsigned long mask;
-{
-    register unsigned long y;
-
-    y = (mask >> 1) &033333333333;
-    y = mask - y - ((y >>1) & 033333333333);
-    return ((unsigned int) (((y + (y >> 3)) & 030707070707) % 077));
-}
-
-XImage *XGetImage (dpy, d, x, y, width, height, plane_mask, format)
-     register Display *dpy;
-     Drawable d;
-     int x, y;
-     unsigned int width, height;
-     unsigned long plane_mask;
-     int format;	/* either XYPixmap or ZPixmap */
-{
-	xGetImageReply rep;
-	register xGetImageReq *req;
-	char *data;
-	long nbytes;
-	XImage *image;
-	LockDisplay(dpy);
-	GetReq (GetImage, req);
-	/*
-	 * first set up the standard stuff in the request
-	 */
-	req->drawable = d;
-	req->x = x;
-	req->y = y;
-	req->width = width;
-	req->height = height;
-	req->planeMask = plane_mask;
-	req->format = format;
-	
-	if (_XReply (dpy, (xReply *) &rep, 0, xFalse) == 0 ||
-	    rep.length == 0) {
-		UnlockDisplay(dpy);
-		SyncHandle();
-		return (XImage *)NULL;
-	}
-		
-	nbytes = (long)rep.length << 2;
-	data = (char *) Xmalloc((unsigned) nbytes);
-	if (! data) {
-	    _XEatData(dpy, (unsigned long) nbytes);
-	    UnlockDisplay(dpy);
-	    SyncHandle();
-	    return (XImage *) NULL;
-	}
-        _XReadPad (dpy, data, nbytes);
-        if (format == XYPixmap)
-	   image = XCreateImage(dpy, _XVIDtoVisual(dpy, rep.visual),
-		  Ones (plane_mask &
-			(((unsigned long)0xFFFFFFFF) >> (32 - rep.depth))),
-		  format, 0, data, width, height, dpy->bitmap_pad, 0);
-	else /* format == ZPixmap */
-           image = XCreateImage (dpy, _XVIDtoVisual(dpy, rep.visual),
-		 rep.depth, ZPixmap, 0, data, width, height,
-		  _XGetScanlinePad(dpy, (int) rep.depth), 0);
-
-	if (!image)
-	    Xfree(data);
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return (image);
-}
-
-XImage *XGetSubImage(dpy, d, x, y, width, height, plane_mask, format,
-		     dest_image, dest_x, dest_y)
-     register Display *dpy;
-     Drawable d;
-     int x, y;
-     unsigned int width, height;
-     unsigned long plane_mask;
-     int format;	/* either XYPixmap or ZPixmap */
-     XImage *dest_image;
-     int dest_x, dest_y;
-{
-	XImage *temp_image;
-	temp_image = XGetImage(dpy, d, x, y, width, height, 
-				plane_mask, format);
-	if (!temp_image)
-	    return (XImage *)NULL;
-	_XSetImage(temp_image, dest_image, dest_x, dest_y);
-	XDestroyImage(temp_image);
-	return (dest_image);
-}	
diff --git a/xc/lib/X11/GetKCnt.c b/xc/lib/X11/GetKCnt.c
deleted file mode 100644
index 62fc6b529..000000000
--- a/xc/lib/X11/GetKCnt.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* $TOG: GetKCnt.c /main/13 1998/02/06 17:26:54 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/GetKCnt.c,v 1.4 1999/05/09 10:49:27 dawes Exp $ */
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-int
-XGetKeyboardControl (dpy, state)
-    register Display *dpy;
-    register XKeyboardState *state;
-    {
-    xGetKeyboardControlReply rep;
-    register xReq *req;
-    LockDisplay(dpy);
-    GetEmptyReq (GetKeyboardControl, req);
-    (void) _XReply (dpy, (xReply *) &rep, 
-	(SIZEOF(xGetKeyboardControlReply) - SIZEOF(xReply)) >> 2, xTrue);
-
-    state->key_click_percent = rep.keyClickPercent;
-    state->bell_percent = rep.bellPercent;
-    state->bell_pitch = rep.bellPitch;
-    state->bell_duration = rep.bellDuration;
-    state->led_mask = rep.ledMask;
-    state->global_auto_repeat = rep.globalAutoRepeat;
-    memcpy (state->auto_repeats, rep.map, sizeof state->auto_repeats);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-    }
-
diff --git a/xc/lib/X11/GetMoEv.c b/xc/lib/X11/GetMoEv.c
deleted file mode 100644
index bac14e85b..000000000
--- a/xc/lib/X11/GetMoEv.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* $TOG: GetMoEv.c /main/10 1998/02/06 17:27:07 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-XTimeCoord *XGetMotionEvents(dpy, w, start, stop, nEvents)
-    register Display *dpy;
-    Time start, stop;
-    Window w;
-    int *nEvents;  /* RETURN */
-{       
-    xGetMotionEventsReply rep;
-    register xGetMotionEventsReq *req;
-    XTimeCoord *tc = NULL;
-    long nbytes;
-    LockDisplay(dpy);
-    GetReq(GetMotionEvents, req);
-    req->window = w;
-/* XXX is this right for all machines? */
-    req->start = start;
-    req->stop  = stop;
-    if (!_XReply (dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-        SyncHandle();
-	return (NULL);
-	}
-    
-    if (rep.nEvents) {
-	if (! (tc = (XTimeCoord *)
-	       Xmalloc( (unsigned) 
-		       (nbytes = (long) rep.nEvents * sizeof(XTimeCoord))))) {
-	    _XEatData (dpy, (unsigned long) nbytes);
-	    UnlockDisplay(dpy);
-	    SyncHandle();
-	    return (NULL);
-	}
-    }
-
-    *nEvents = rep.nEvents;
-    nbytes = SIZEOF (xTimecoord);
-    {
-	register XTimeCoord *tcptr;
-	register int i;
-	xTimecoord xtc;
-
-	for (i = rep.nEvents, tcptr = tc; i > 0; i--, tcptr++) {
-	    _XRead (dpy, (char *) &xtc, nbytes);
-	    tcptr->time = xtc.time;
-	    tcptr->x    = cvtINT16toShort (xtc.x);
-	    tcptr->y    = cvtINT16toShort (xtc.y);
-	}
-    }
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return (tc);
-}
-
diff --git a/xc/lib/X11/GetNrmHint.c b/xc/lib/X11/GetNrmHint.c
deleted file mode 100644
index 1669da80e..000000000
--- a/xc/lib/X11/GetNrmHint.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* $TOG: GetNrmHint.c /main/8 1998/02/06 17:27:17 kaleb $ */
-/***********************************************************
-Copyright 1988 by Wyse Technology, Inc., San Jose, Ca,
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL AND WYSE DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, 
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO 
-EVENT SHALL DIGITAL OR WYSE BE LIABLE FOR ANY SPECIAL, INDIRECT OR 
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF 
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR 
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR 
-PERFORMANCE OF THIS SOFTWARE.
-
-******************************************************************/
-
-/*
-
-Copyright 1987, 1988, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-
-#include <X11/Xlibint.h>
-#include <X11/Xatom.h>
-#include "Xatomtype.h"
-#include <X11/Xutil.h>
-#include <stdio.h>
-
-Status XGetWMSizeHints (dpy, w, hints, supplied, property)
-    Display *dpy;
-    Window w;
-    XSizeHints *hints;
-    long *supplied;
-    Atom property;
-{
-    xPropSizeHints *prop = NULL;
-    Atom actual_type;
-    int actual_format;
-    unsigned long leftover;
-    unsigned long nitems;
-
-    if (XGetWindowProperty (dpy, w, property, 0L, 
-			    (long)NumPropSizeElements,
-			    False, XA_WM_SIZE_HINTS, &actual_type,
-			    &actual_format, &nitems, &leftover, 
-			    (unsigned char **)&prop)
-	!= Success)
-      return False;
-
-    if ((actual_type != XA_WM_SIZE_HINTS) ||
-	(nitems < OldNumPropSizeElements) || (actual_format != 32)) {
-	if (prop != NULL) Xfree ((char *)prop);
-	return False;
-    }
-
-    hints->flags	  = prop->flags;
-    /* XSizeHints misdeclares these as int instead of long */
-    hints->x = cvtINT32toInt (prop->x);
-    hints->y = cvtINT32toInt (prop->y);
-    hints->width = cvtINT32toInt (prop->width);
-    hints->height = cvtINT32toInt (prop->height);
-    hints->min_width  = cvtINT32toInt (prop->minWidth);
-    hints->min_height = cvtINT32toInt (prop->minHeight);
-    hints->max_width  = cvtINT32toInt (prop->maxWidth);
-    hints->max_height = cvtINT32toInt (prop->maxHeight);
-    hints->width_inc  = cvtINT32toInt (prop->widthInc);
-    hints->height_inc = cvtINT32toInt (prop->heightInc);
-    hints->min_aspect.x = cvtINT32toInt (prop->minAspectX);
-    hints->min_aspect.y = cvtINT32toInt (prop->minAspectY);
-    hints->max_aspect.x = cvtINT32toInt (prop->maxAspectX);
-    hints->max_aspect.y = cvtINT32toInt (prop->maxAspectY);
-
-    *supplied = (USPosition | USSize | PAllHints);
-    if (nitems >= NumPropSizeElements) {
-	hints->base_width= cvtINT32toInt (prop->baseWidth);
-	hints->base_height= cvtINT32toInt (prop->baseHeight);
-	hints->win_gravity= cvtINT32toInt (prop->winGravity);
-	*supplied |= (PBaseSize | PWinGravity);
-    }
-    hints->flags &= (*supplied);	/* get rid of unwanted bits */
-    Xfree((char *)prop);
-    return True;
-}
-
-
-Status XGetWMNormalHints (dpy, w, hints, supplied)
-    Display *dpy;
-    Window w;
-    XSizeHints *hints;
-    long *supplied;
-{
-    return (XGetWMSizeHints (dpy, w, hints, supplied, XA_WM_NORMAL_HINTS));
-}
diff --git a/xc/lib/X11/GetPCnt.c b/xc/lib/X11/GetPCnt.c
deleted file mode 100644
index 95637afa7..000000000
--- a/xc/lib/X11/GetPCnt.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* $TOG: GetPCnt.c /main/6 1998/02/06 17:27:29 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/GetPCnt.c,v 1.2 1999/05/09 10:49:28 dawes Exp $ */
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-int
-XGetPointerControl(dpy, accel_numer, accel_denom, threshold)
-     register Display *dpy;
-     /* the following are return only vars */
-     int *accel_numer, *accel_denom;
-     int *threshold;
-{       
-    xGetPointerControlReply rep;
-    xReq *req;
-    LockDisplay(dpy);
-    GetEmptyReq(GetPointerControl, req);
-    (void) _XReply (dpy, (xReply *)&rep, 0, xTrue);
-    *accel_numer = rep.accelNumerator;
-    *accel_denom = rep.accelDenominator;
-    *threshold = rep.threshold;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/GetPntMap.c b/xc/lib/X11/GetPntMap.c
deleted file mode 100644
index 93c6decdf..000000000
--- a/xc/lib/X11/GetPntMap.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/* $TOG: GetPntMap.c /main/14 1998/05/30 08:06:05 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-/* $XFree86: xc/lib/X11/GetPntMap.c,v 1.3 1998/10/03 08:41:18 dawes Exp $ */
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-#ifdef MIN		/* some systems define this in <sys/param.h> */
-#undef MIN
-#endif
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-
-int XGetPointerMapping (dpy, map, nmaps)
-    register Display *dpy;
-    unsigned char *map;	/* RETURN */
-    int nmaps;
-
-{
-    unsigned char mapping[256];	/* known fixed size */
-    long nbytes, remainder = 0;
-    xGetPointerMappingReply rep;
-    register xReq *req;
-
-    LockDisplay(dpy);
-    GetEmptyReq(GetPointerMapping, req);
-    if (! _XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return 0;
-    }
-
-    nbytes = (long)rep.length << 2;
-
-    /* Don't count on the server returning a valid value */
-    if (nbytes > sizeof mapping) {
-	remainder = nbytes - sizeof mapping;
-	nbytes = sizeof mapping;
-    }
-    _XRead (dpy, (char *)mapping, nbytes);
-    /* don't return more data than the user asked for. */
-    if (rep.nElts) {
-	    memcpy ((char *) map, (char *) mapping, 
-		MIN((int)rep.nElts, nmaps) );
-	}
-
-    if (remainder) 
-	_XEatData(dpy, (unsigned long)remainder);
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return ((int) rep.nElts);
-}
-
-#if NeedFunctionPrototypes
-KeySym *XGetKeyboardMapping (Display *dpy,
-#if NeedWidePrototypes
-			     unsigned int first_keycode,
-#else
-			     KeyCode first_keycode,
-#endif
-			     int count,
-			     int *keysyms_per_keycode)
-#else
-KeySym *XGetKeyboardMapping (dpy, first_keycode, count, keysyms_per_keycode)
-    register Display *dpy;
-    KeyCode first_keycode;
-    int count;
-    int *keysyms_per_keycode;		/* RETURN */
-#endif
-{
-    long nbytes;
-    unsigned long nkeysyms;
-    register KeySym *mapping = NULL;
-    xGetKeyboardMappingReply rep;
-    register xGetKeyboardMappingReq *req;
-
-    LockDisplay(dpy);
-    GetReq(GetKeyboardMapping, req);
-    req->firstKeyCode = first_keycode;
-    req->count = count;
-    if (! _XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return (KeySym *) NULL;
-    }
-
-    nkeysyms = (unsigned long) rep.length;
-    if (nkeysyms > 0) {
-	nbytes = nkeysyms * sizeof (KeySym);
-	mapping = (KeySym *) Xmalloc ((unsigned) nbytes);
-	nbytes = nkeysyms << 2;
-	if (! mapping) {
-	    _XEatData(dpy, (unsigned long) nbytes);
-	    UnlockDisplay(dpy);
-	    SyncHandle();
-	    return (KeySym *) NULL;
-	}
-	_XRead32 (dpy, (char *) mapping, nbytes);
-    }
-    *keysyms_per_keycode = rep.keySymsPerKeyCode;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return (mapping);
-}
-
diff --git a/xc/lib/X11/GetProp.c b/xc/lib/X11/GetProp.c
deleted file mode 100644
index e997ef4e4..000000000
--- a/xc/lib/X11/GetProp.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/* $TOG: GetProp.c /main/11 1998/02/06 17:27:52 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/GetProp.c,v 1.2 1999/05/09 10:49:28 dawes Exp $ */
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-int
-XGetWindowProperty(dpy, w, property, offset, length, delete, 
-	req_type, actual_type, actual_format, nitems, bytesafter, prop)
-    register Display *dpy;
-    Window w;
-    Atom property;
-    Bool delete;
-    Atom req_type;
-    Atom *actual_type;		/* RETURN */
-    int *actual_format;  	/* RETURN  8, 16, or 32 */
-    long offset, length;
-    unsigned long *nitems; 	/* RETURN  # of 8-, 16-, or 32-bit entities */
-    unsigned long *bytesafter;	/* RETURN */
-    unsigned char **prop;	/* RETURN */
-{
-    xGetPropertyReply reply;
-    register xGetPropertyReq *req;
-    xError error;
-
-    LockDisplay(dpy);
-    GetReq (GetProperty, req);
-    req->window = w;
-    req->property = property;
-    req->type = req_type;
-    req->delete = delete;
-    req->longOffset = offset;
-    req->longLength = length;
-    error.sequenceNumber = dpy->request;
-    
-    if (!_XReply (dpy, (xReply *) &reply, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return (1);	/* not Success */
-	}	
-
-    *prop = (unsigned char *) NULL;
-    if (reply.propertyType != None) {
-	long nbytes, netbytes;
-	switch (reply.format) {
-      /* 
-       * One extra byte is malloced than is needed to contain the property
-       * data, but this last byte is null terminated and convenient for 
-       * returning string properties, so the client doesn't then have to 
-       * recopy the string to make it null terminated. 
-       */
-	  case 8:
-	    nbytes = netbytes = reply.nItems;
-	    if ((*prop = (unsigned char *) Xmalloc ((unsigned)nbytes + 1)))
-		_XReadPad (dpy, (char *) *prop, netbytes);
-	    break;
-
-	  case 16:
-	    nbytes = reply.nItems * sizeof (short);
-	    netbytes = reply.nItems << 1;
-	    if ((*prop = (unsigned char *) Xmalloc ((unsigned)nbytes + 1)))
-		_XRead16Pad (dpy, (short *) *prop, netbytes);
-	    break;
-
-	  case 32:
-	    nbytes = reply.nItems * sizeof (long);
-	    netbytes = reply.nItems << 2;
-	    if ((*prop = (unsigned char *) Xmalloc ((unsigned)nbytes + 1)))
-		_XRead32 (dpy, (long *) *prop, netbytes);
-	    break;
-
-	  default:
-	    /*
-	     * This part of the code should never be reached.  If it is,
-	     * the server sent back a property with an invalid format.
-	     * This is a BadImplementation error. 
-	     */
-	    {
-		/* sequence number stored above */
-		error.type = X_Error;
-		error.majorCode = X_GetProperty;
-		error.minorCode = 0;
-		error.errorCode = BadImplementation;
-		_XError(dpy, &error);
-	    }
-	    netbytes = 0L;
-	    break;
-	}
-	if (! *prop) {
-	    _XEatData(dpy, (unsigned long) netbytes);
-	    UnlockDisplay(dpy);
-	    SyncHandle();
-	    return(BadAlloc);	/* not Success */
-	}
-	(*prop)[nbytes] = '\0';
-    }
-    *actual_type = reply.propertyType;
-    *actual_format = reply.format;
-    *nitems = reply.nItems;
-    *bytesafter = reply.bytesAfter;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return(Success);
-}
-
diff --git a/xc/lib/X11/GetRGBCMap.c b/xc/lib/X11/GetRGBCMap.c
deleted file mode 100644
index 4370e0314..000000000
--- a/xc/lib/X11/GetRGBCMap.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/* $TOG: GetRGBCMap.c /main/7 1998/02/06 17:28:03 kaleb $ */
-
-/*
-
-Copyright 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
-#include "Xatomtype.h"
-#include <X11/Xatom.h>
-
-Status XGetRGBColormaps (dpy, w, stdcmap, count, property)
-    Display *dpy;
-    Window w;
-    XStandardColormap **stdcmap;	/* RETURN */
-    int *count;				/* RETURN */
-    Atom property;			/* XA_RGB_BEST_MAP, etc. */
-{
-    register int i;			/* iterator variable */
-    xPropStandardColormap *data = NULL;	 /* data read in from prop */
-    Atom actual_type;			/* how the prop was actually stored */
-    int actual_format;			/* ditto */
-    unsigned long leftover;		/* how much was left over */
-    unsigned long nitems;		/* number of 32bits read */
-    int ncmaps;				/* number of structs this makes */
-    Bool old_style = False;		/* if was too short */
-    VisualID def_visual = None;		/* visual to use if prop too short */
-    XStandardColormap *cmaps;		/* return value */
-
-
-    if (XGetWindowProperty (dpy, w, property, 0L, 1000000L, False,
-			    XA_RGB_COLOR_MAP, &actual_type, &actual_format,
-			    &nitems, &leftover, (unsigned char **)&data)
-	!= Success)
-      return False;
-
-    /* if wrong type or format, or too small for us, then punt */
-    if ((actual_type != XA_RGB_COLOR_MAP) || (actual_format != 32) ||
-	(nitems < OldNumPropStandardColormapElements)) {
-	if (data) Xfree ((char *) data);
-	return False;
-    }
-
-    /*
-     * See how many properties were found; if pre-ICCCM then assume 
-     * default visual and a kill id of 1.
-     */
-    if (nitems < NumPropStandardColormapElements) {
-	ncmaps = 1;
-	old_style = True;
-	if (nitems < (NumPropStandardColormapElements - 1)) {
-	    Screen *sp = _XScreenOfWindow (dpy, w);
-
-	    if (!sp) {
-		if (data) Xfree ((char *) data);
-		return False;
-	    }
-	    def_visual = sp->root_visual->visualid;
-	}
-    } else {
-	/*
-	 * make sure we have an integral number of colormaps 
-	 */
-	ncmaps = (nitems / NumPropStandardColormapElements);
-	if ((((unsigned long) ncmaps) * NumPropStandardColormapElements) !=
-	    nitems) {
-	    if (data) Xfree ((char *) data);
-	    return False;
-	}
-    }
-
-    
-    /*
-     * allocate array
-     */
-    cmaps = (XStandardColormap *) Xmalloc (ncmaps *
-					   sizeof (XStandardColormap));
-    if (!cmaps) {
-	if (data) Xfree ((char *) data);
-	return False;
-    }
-
-
-    /*
-     * and fill it in, handling compatibility with pre-ICCCM short stdcmaps
-     */
-    {
-	register XStandardColormap *map;
-	register xPropStandardColormap *prop;
-
-	for (i = ncmaps, map = cmaps, prop = data; i > 0; i--, map++, prop++) {
-	    map->colormap   = prop->colormap;
-	    map->red_max    = prop->red_max;
-	    map->red_mult   = prop->red_mult;
-	    map->green_max  = prop->green_max;
-	    map->green_mult = prop->green_mult;
-	    map->blue_max   = prop->blue_max;
-	    map->blue_mult  = prop->blue_mult;
-	    map->base_pixel = prop->base_pixel;
-	    map->visualid   = (def_visual ? def_visual : prop->visualid);
-	    map->killid     = (old_style ? None : prop->killid);
-	}
-    }
-    Xfree ((char *) data);
-    *stdcmap = cmaps;
-    *count = ncmaps;
-    return True;
-}
-
diff --git a/xc/lib/X11/GetSOwner.c b/xc/lib/X11/GetSOwner.c
deleted file mode 100644
index 0096d4e14..000000000
--- a/xc/lib/X11/GetSOwner.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* $TOG: GetSOwner.c /main/5 1998/02/06 17:28:14 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-Window XGetSelectionOwner(dpy, selection)
-register Display *dpy;
-Atom selection;
-{
-    xGetSelectionOwnerReply rep;
-    register xResourceReq *req;
-    LockDisplay(dpy);
-    GetResReq(GetSelectionOwner, selection, req);
-
-    if (_XReply(dpy, (xReply *)&rep, 0, xTrue) == 0) rep.owner = None;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return(rep.owner);
-}
diff --git a/xc/lib/X11/GetSSaver.c b/xc/lib/X11/GetSSaver.c
deleted file mode 100644
index 79595e014..000000000
--- a/xc/lib/X11/GetSSaver.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* $TOG: GetSSaver.c /main/6 1998/02/06 17:28:26 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/GetSSaver.c,v 1.2 1999/05/09 10:49:29 dawes Exp $ */
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-int
-XGetScreenSaver(dpy, timeout, interval, prefer_blanking, allow_exp)
-     register Display *dpy;
-     /* the following are return only vars */
-     int *timeout, *interval;
-     int *prefer_blanking, *allow_exp;  /*boolean */
-     
-{       
-    xGetScreenSaverReply rep;
-    register xReq *req;
-    LockDisplay(dpy);
-    GetEmptyReq(GetScreenSaver, req);
-
-    (void) _XReply (dpy, (xReply *)&rep, 0, xTrue);
-    *timeout = rep.timeout;
-    *interval = rep.interval;
-    *prefer_blanking = rep.preferBlanking;
-    *allow_exp = rep.allowExposures;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/GetStCmap.c b/xc/lib/X11/GetStCmap.c
deleted file mode 100644
index d9857e684..000000000
--- a/xc/lib/X11/GetStCmap.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/* $TOG: GetStCmap.c /main/10 1998/02/06 17:28:37 kaleb $ */
-
-/***********************************************************
-
-Copyright 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
-#include "Xatomtype.h"
-#include <X11/Xatom.h>
-
-/*
- * 				    WARNING
- * 
- * This is a pre-ICCCM routine.  It must not reference any of the new fields
- * in the XStandardColormap structure.
- */
-
-Status XGetStandardColormap (dpy, w, cmap, property)
-    Display *dpy;
-    Window w;
-    XStandardColormap *cmap;
-    Atom property;		/* XA_RGB_BEST_MAP, etc. */
-{
-    Status stat;			/* return value */
-    XStandardColormap *stdcmaps;	/* will get malloced value */
-    int nstdcmaps;			/* count of above */
-
-    stat = XGetRGBColormaps (dpy, w, &stdcmaps, &nstdcmaps, property);
-    if (stat) {
-	XStandardColormap *use;
-
-	if (nstdcmaps > 1) {
-	    VisualID vid;
-	    Screen *sp = _XScreenOfWindow (dpy, w);
-	    int i;
-
-	    if (!sp) {
-		if (stdcmaps) Xfree ((char *) stdcmaps);
-		return False;
-	    }
-	    vid = sp->root_visual->visualid;
-
-	    for (i = 0; i < nstdcmaps; i++) {
-		if (stdcmaps[i].visualid == vid) break;
-	    }
-
-	    if (i == nstdcmaps) {	/* not found */
-		Xfree ((char *) stdcmaps);
-		return False;
-	    }
-	    use = &stdcmaps[i];
-	} else {
-	    use = stdcmaps;
-	}
-	    
-	/*
-	 * assign only those fields which were in the pre-ICCCM version
-	 */
-	cmap->colormap	 = use->colormap;
-	cmap->red_max	 = use->red_max;
-	cmap->red_mult	 = use->red_mult;
-	cmap->green_max	 = use->green_max;
-	cmap->green_mult = use->green_mult;
-	cmap->blue_max	 = use->blue_max;
-	cmap->blue_mult	 = use->blue_mult;
-	cmap->base_pixel = use->base_pixel;
-
-	Xfree ((char *) stdcmaps);	/* don't need alloced memory */
-    }
-    return stat;
-}
diff --git a/xc/lib/X11/GetTxtProp.c b/xc/lib/X11/GetTxtProp.c
deleted file mode 100644
index db59b0667..000000000
--- a/xc/lib/X11/GetTxtProp.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* $TOG: GetTxtProp.c /main/8 1998/02/06 17:28:48 kaleb $ */
-/***********************************************************
-Copyright 1988 by Wyse Technology, Inc., San Jose, Ca.,
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name Wyse not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-WYSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-/*
-
-Copyright 1988, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-#include <X11/Xlibint.h>
-#include <X11/Xatom.h>
-#include <X11/Xutil.h>
-#include <X11/Xos.h>
-#include <stdio.h>
-
-Status XGetTextProperty (display, window, tp, property)
-    Display *display;
-    Window window;
-    XTextProperty *tp;
-    Atom property;
-{
-    Atom actual_type;
-    int actual_format = 0;
-    unsigned long nitems = 0L, leftover = 0L;
-    unsigned char *prop = NULL;
-
-    if (XGetWindowProperty (display, window, property, 0L, 1000000L, False,
-			    AnyPropertyType, &actual_type, &actual_format,
-			    &nitems, &leftover, &prop) == Success &&
-	actual_type != None) {
-	/* okay, fill it in */
-	tp->value = prop;
-	tp->encoding = actual_type;
-	tp->format = actual_format;
-	tp->nitems = nitems;
-	return True;
-    }
-
-    tp->value = NULL;
-    tp->encoding = None;
-    tp->format = 0;
-    tp->nitems = 0;
-    return False;
-}
-
-Status XGetWMName (dpy, w, tp)
-    Display *dpy;
-    Window w;
-    XTextProperty *tp;
-{
-    return (XGetTextProperty (dpy, w, tp, XA_WM_NAME));
-}
-
-Status XGetWMIconName (dpy, w, tp)
-    Display *dpy;
-    Window w;
-    XTextProperty *tp;
-{
-    return (XGetTextProperty (dpy, w, tp, XA_WM_ICON_NAME));
-}
-
-Status XGetWMClientMachine (dpy, w, tp)
-    Display *dpy;
-    Window w;
-    XTextProperty *tp;
-{
-    return (XGetTextProperty (dpy, w, tp, XA_WM_CLIENT_MACHINE));
-}
-
diff --git a/xc/lib/X11/GetWAttrs.c b/xc/lib/X11/GetWAttrs.c
deleted file mode 100644
index 8cce8484b..000000000
--- a/xc/lib/X11/GetWAttrs.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/* $TOG: GetWAttrs.c /main/10 1998/02/06 17:29:01 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-typedef struct _WAttrsState {
-    unsigned long attr_seq;
-    unsigned long geom_seq;
-    XWindowAttributes *attr;
-} _XWAttrsState;
-
-static Bool
-_XWAttrsHandler(dpy, rep, buf, len, data)
-    register Display *dpy;
-    register xReply *rep;
-    char *buf;
-    int len;
-    XPointer data;
-{
-    register _XWAttrsState *state;
-    xGetWindowAttributesReply replbuf;
-    register xGetWindowAttributesReply *repl;
-    register XWindowAttributes *attr;
-
-    state = (_XWAttrsState *)data;
-    if (dpy->last_request_read != state->attr_seq) {
-	if (dpy->last_request_read == state->geom_seq &&
-	    !state->attr &&
-	    rep->generic.type == X_Error &&
-	    rep->error.errorCode == BadDrawable)
-	    return True;
-	return False;
-    }
-    if (rep->generic.type == X_Error) {
-	state->attr = (XWindowAttributes *)NULL;
-	return False;
-    }
-    repl = (xGetWindowAttributesReply *)
-	_XGetAsyncReply(dpy, (char *)&replbuf, rep, buf, len,
-		     (SIZEOF(xGetWindowAttributesReply) - SIZEOF(xReply)) >> 2,
-			True);
-    attr = state->attr;
-    attr->class = repl->class;
-    attr->bit_gravity = repl->bitGravity;
-    attr->win_gravity = repl->winGravity;
-    attr->backing_store = repl->backingStore;
-    attr->backing_planes = repl->backingBitPlanes;
-    attr->backing_pixel = repl->backingPixel;
-    attr->save_under = repl->saveUnder;
-    attr->colormap = repl->colormap;
-    attr->map_installed = repl->mapInstalled;
-    attr->map_state = repl->mapState;
-    attr->all_event_masks = repl->allEventMasks;
-    attr->your_event_mask = repl->yourEventMask;
-    attr->do_not_propagate_mask = repl->doNotPropagateMask;
-    attr->override_redirect = repl->override;
-    attr->visual = _XVIDtoVisual (dpy, repl->visualID);
-    return True;
-}
-
-Status XGetWindowAttributes(dpy, w, attr)
-     register Display *dpy;
-     Window w;
-     XWindowAttributes *attr;
-{       
-    xGetGeometryReply rep;
-    register xResourceReq *req;
-    register int i;
-    register Screen *sp;
-    _XAsyncHandler async;
-    _XWAttrsState async_state;
- 
-    LockDisplay(dpy);
-    GetResReq(GetWindowAttributes, w, req);
-
-    async_state.attr_seq = dpy->request;
-    async_state.geom_seq = 0;
-    async_state.attr = attr;
-    async.next = dpy->async_handlers;
-    async.handler = _XWAttrsHandler;
-    async.data = (XPointer)&async_state;
-    dpy->async_handlers = &async;
-
-    GetResReq(GetGeometry, w, req);
-
-    async_state.geom_seq = dpy->request;
-
-    if (!_XReply (dpy, (xReply *)&rep, 0, xTrue)) {
-	DeqAsyncHandler(dpy, &async);
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return (0);
-	}
-    DeqAsyncHandler(dpy, &async);
-    if (!async_state.attr) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return (0);
-    }
-    attr->x = cvtINT16toInt (rep.x);
-    attr->y = cvtINT16toInt (rep.y);
-    attr->width = rep.width;
-    attr->height = rep.height;
-    attr->border_width = rep.borderWidth;
-    attr->depth = rep.depth;
-    attr->root = rep.root;
-    /* find correct screen so that applications find it easier.... */
-    for (i = 0; i < dpy->nscreens; i++) {
-	sp = &dpy->screens[i];
-	if (sp->root == attr->root) {
-	    attr->screen = sp;
-	    break;
-	}
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return(1);
-}
-
diff --git a/xc/lib/X11/GetWMCMapW.c b/xc/lib/X11/GetWMCMapW.c
deleted file mode 100644
index 4104276d6..000000000
--- a/xc/lib/X11/GetWMCMapW.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* $TOG: GetWMCMapW.c /main/7 1998/02/06 17:29:13 kaleb $ */
-
-/***********************************************************
-
-Copyright 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#include "Xlibint.h"
-#include <X11/Xatom.h>
-#include <stdio.h>
-
-Status XGetWMColormapWindows (dpy, w, colormapWindows, countReturn)
-    Display *dpy;
-    Window w;
-    Window **colormapWindows;
-    int *countReturn;
-{
-    Atom *data = NULL;
-    Atom actual_type;
-    Atom prop;
-    int actual_format;
-    unsigned long leftover, nitems;
-
-    prop =  XInternAtom(dpy, "WM_COLORMAP_WINDOWS", False);
-    if (prop == None) return False;
-
-    /* get the property */
-    if (XGetWindowProperty (dpy, w, prop,
-    			    0L, 1000000L, False,
-			    XA_WINDOW, &actual_type, &actual_format,
-			    &nitems, &leftover, (unsigned char **) &data)
-	!= Success)
-      return False;
-
-    if (actual_type != XA_WINDOW || actual_format != 32) {
-	if (data) Xfree ((char *) data);
-	return False;
-    }
-
-    *colormapWindows = (Window *) data;
-    *countReturn = (int) nitems;
-    return True;
-}
diff --git a/xc/lib/X11/GetWMProto.c b/xc/lib/X11/GetWMProto.c
deleted file mode 100644
index f84af7c69..000000000
--- a/xc/lib/X11/GetWMProto.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* $TOG: GetWMProto.c /main/7 1998/02/06 17:29:24 kaleb $ */
-
-/***********************************************************
-
-Copyright 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#include "Xlibint.h"
-#include <X11/Xatom.h>
-#include <stdio.h>
-
-Status XGetWMProtocols (dpy, w, protocols, countReturn)
-    Display *dpy;
-    Window w;
-    Atom **protocols;
-    int *countReturn;
-{
-    Atom *data = NULL;
-    Atom actual_type;
-    Atom prop;
-    int actual_format;
-    unsigned long leftover, nitems;
-
-    prop =  XInternAtom(dpy, "WM_PROTOCOLS", False);
-    if (prop == None) return False;
-
-    /* get the property */
-    if (XGetWindowProperty (dpy, w, prop,
-    			    0L, 1000000L, False,
-			    XA_ATOM, &actual_type, &actual_format,
-			    &nitems, &leftover, (unsigned char **) &data)
-	!= Success)
-      return False;
-
-    if (actual_type != XA_ATOM || actual_format != 32) {
-	if (data) Xfree ((char *) data);
-	return False;
-    }
-
-    *protocols = (Atom *) data;
-    *countReturn = (int) nitems;
-    return True;
-}
diff --git a/xc/lib/X11/GrButton.c b/xc/lib/X11/GrButton.c
deleted file mode 100644
index 37e6d0c56..000000000
--- a/xc/lib/X11/GrButton.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* $TOG: GrButton.c /main/6 1998/02/06 17:29:47 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/GrButton.c,v 1.2 1999/05/09 10:49:29 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XGrabButton(dpy, button, modifiers, grab_window, owner_events, event_mask,
-	    pointer_mode, keyboard_mode, confine_to, curs)
-register Display *dpy;
-unsigned int modifiers; /* CARD16 */
-unsigned int button; /* CARD8 */
-Window grab_window;
-Bool owner_events;
-unsigned int event_mask; /* CARD16 */
-int pointer_mode, keyboard_mode;
-Window confine_to;
-Cursor curs;
-{
-    register xGrabButtonReq *req;
-    LockDisplay(dpy);
-    GetReq(GrabButton, req);
-    req->modifiers = modifiers;
-    req->button = button;
-    req->grabWindow = grab_window;
-    req->ownerEvents = owner_events;
-    req->eventMask = event_mask;
-    req->pointerMode = pointer_mode;
-    req->keyboardMode = keyboard_mode;
-    req->confineTo = confine_to;
-    req->cursor = curs;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/GrKey.c b/xc/lib/X11/GrKey.c
deleted file mode 100644
index f1bdc0a0d..000000000
--- a/xc/lib/X11/GrKey.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* $TOG: GrKey.c /main/7 1998/02/06 17:30:10 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/GrKey.c,v 1.2 1999/05/09 10:49:29 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XGrabKey(dpy, key, modifiers, grab_window, owner_events, 
-	 pointer_mode, keyboard_mode)
-    register Display *dpy;
-    int key;
-    unsigned int modifiers;
-    Window grab_window;
-    Bool owner_events;
-    int pointer_mode, keyboard_mode;
-
-{
-    register xGrabKeyReq *req;
-    LockDisplay(dpy);
-    GetReq(GrabKey, req);
-    req->ownerEvents = owner_events;
-    req->grabWindow = grab_window;
-    req->modifiers = modifiers;
-    req->key = key;
-    req->pointerMode = pointer_mode;
-    req->keyboardMode = keyboard_mode;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
-
-
diff --git a/xc/lib/X11/GrKeybd.c b/xc/lib/X11/GrKeybd.c
deleted file mode 100644
index 85dc708d6..000000000
--- a/xc/lib/X11/GrKeybd.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* $TOG: GrKeybd.c /main/6 1998/02/06 17:29:58 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-int XGrabKeyboard (dpy, window, ownerEvents, pointerMode, keyboardMode, time)
-    register Display *dpy;
-    Window window;
-    Bool ownerEvents;
-    int pointerMode, keyboardMode;
-    Time time;
-{
-        xGrabKeyboardReply rep;
-	register xGrabKeyboardReq *req;
-	register int status;
-	LockDisplay(dpy);
-        GetReq(GrabKeyboard, req);
-	req->grabWindow = window;
-	req->ownerEvents = ownerEvents;
-	req->pointerMode = pointerMode;
-	req->keyboardMode = keyboardMode;
-	req->time = time;
-
-       /* if we ever return, suppress the error */
-	if (_XReply (dpy, (xReply *) &rep, 0, xTrue) == 0) 
-		rep.status = GrabSuccess;
-	status = rep.status;
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return (status);
-}
-
diff --git a/xc/lib/X11/GrPointer.c b/xc/lib/X11/GrPointer.c
deleted file mode 100644
index db8b2a9f8..000000000
--- a/xc/lib/X11/GrPointer.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* $TOG: GrPointer.c /main/5 1998/02/06 17:30:21 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-int XGrabPointer(dpy, grab_window, owner_events, event_mask, pointer_mode,
-	     keyboard_mode, confine_to, curs, time)
-register Display *dpy;
-Window grab_window;
-Bool owner_events;
-unsigned int event_mask; /* CARD16 */
-int pointer_mode, keyboard_mode;
-Window confine_to;
-Cursor curs;
-Time time;
-{
-    xGrabPointerReply rep;
-    register xGrabPointerReq *req;
-    register int status;
-    LockDisplay(dpy);
-    GetReq(GrabPointer, req);
-    req->grabWindow = grab_window;
-    req->ownerEvents = owner_events;
-    req->eventMask = event_mask;
-    req->pointerMode = pointer_mode;
-    req->keyboardMode = keyboard_mode;
-    req->confineTo = confine_to;
-    req->cursor = curs;
-    req->time = time;
-    
-    /* if we ever return, suppress the error */
-    if (_XReply (dpy, (xReply *) &rep, 0, xTrue) == 0)
-	rep.status = GrabSuccess;
-    status = rep.status;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return (status);
-}
diff --git a/xc/lib/X11/GrServer.c b/xc/lib/X11/GrServer.c
deleted file mode 100644
index 34aac9186..000000000
--- a/xc/lib/X11/GrServer.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* $TOG: GrServer.c /main/6 1998/02/06 17:30:31 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/GrServer.c,v 1.2 1999/05/09 10:49:30 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XGrabServer (dpy)
-register Display *dpy;
-{
-	register xReq *req;
-	LockDisplay(dpy);
-        GetEmptyReq(GrabServer, req);
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return 1;
-}
-
diff --git a/xc/lib/X11/HVC.c b/xc/lib/X11/HVC.c
deleted file mode 100644
index 34b4106e8..000000000
--- a/xc/lib/X11/HVC.c
+++ /dev/null
@@ -1,620 +0,0 @@
-/* $XConsortium: HVC.c,v 1.13 93/09/07 21:30:46 rws Exp $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  TekColor is a
- * trademark of Tektronix, Inc.  The term "TekHVC" designates a particular
- * color space that is the subject of U.S. Patent No. 4,985,853 (equivalent
- * foreign patents pending).  Permission is hereby granted to use, copy,
- * modify, sell, and otherwise distribute this software and its
- * documentation for any purpose and without fee, provided that:
- * 
- * 1. This copyright, permission, and disclaimer notice is reproduced in
- *    all copies of this software and any modification thereof and in
- *    supporting documentation; 
- * 2. Any color-handling application which displays TekHVC color
- *    cooordinates identifies these as TekHVC color coordinates in any
- *    interface that displays these coordinates and in any associated
- *    documentation;
- * 3. The term "TekHVC" is always used, and is only used, in association
- *    with the mathematical derivations of the TekHVC Color Space,
- *    including those provided in this file and any equivalent pathways and
- *    mathematical derivations, regardless of digital (e.g., floating point
- *    or integer) representation.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *	NAME
- *		TekHVC.c
- *
- *	DESCRIPTION
- *		This file contains routines that support the TekHVC
- *		color space to include conversions to and from the CIE
- *		XYZ space.
- *
- *	DOCUMENTATION
- *		"TekColor Color Management System, System Implementor's Manual"
- */
-/* $XFree86: xc/lib/X11/HVC.c,v 1.2 1999/05/09 10:49:30 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-#include <X11/Xos.h>
-#include <math.h>
-
-#include <stdio.h>
-
-/*
- *	DEFINES
- */
-#define u_BR    0.7127          /* u' Best Red */
-#define v_BR    0.4931          /* v' Best Red */
-#define EPS     0.001
-#define CHROMA_SCALE_FACTOR   7.50725
-#ifndef PI
-#  ifdef M_PI
-#    define PI	M_PI
-#  else
-#    define PI       3.14159265358979323846264338327950
-#  endif
-#endif
-#ifndef degrees
-#  define degrees(r) ((XcmsFloat)(r) * 180.0 / PI)
-#endif /* degrees */
-#ifndef radians
-#  define radians(d) ((XcmsFloat)(d) * PI / 180.0)
-#endif /* radians */
-
-/*************************************************************************
- * Note: The DBL_EPSILON for ANSI is 1e-5 so my checks need to take
- *       this into account.  If your DBL_EPSILON is different then
- *       adjust this define. 
- *
- *       Also note that EPS is the error factor in the calculations
- *       This may need to be the same as XMY_DBL_EPSILON in
- *       some implementations.
- **************************************************************************/
-#ifdef DBL_EPSILON
-#  define XMY_DBL_EPSILON DBL_EPSILON
-#else
-#  define XMY_DBL_EPSILON 0.00001
-#endif
-
-/*
- *	EXTERNS
- */
-
-extern char _XcmsTekHVC_prefix[];
-
-/* CvCols.c */
-extern Status _XcmsDIConvertColors();
-
-/* uvY.c */
-extern Status _XcmsCIEuvY_ValidSpec();
-
-/*
- *	FORWARD DECLARATIONS
- */
-
-static int TekHVC_ParseString();
-static Status XcmsTekHVC_ValidSpec();
-
-
-/*
- *	LOCAL VARIABLES
- */
-
-    /*
-     * NULL terminated list of functions applied to get from TekHVC to CIEXYZ
-     */
-static XcmsConversionProc Fl_TekHVC_to_CIEXYZ[] = {
-    XcmsTekHVCToCIEuvY,
-    XcmsCIEuvYToCIEXYZ,
-    NULL
-};
-
-    /*
-     * NULL terminated list of functions applied to get from CIEXYZ to TekHVC
-     */
-static XcmsConversionProc Fl_CIEXYZ_to_TekHVC[] = {
-    XcmsCIEXYZToCIEuvY,
-    XcmsCIEuvYToTekHVC,
-    NULL
-};
-
-/*
- *	GLOBALS
- */
-
-    /*
-     * TekHVC Color Space
-     */
-XcmsColorSpace	XcmsTekHVCColorSpace =
-    {
-	_XcmsTekHVC_prefix,	/* prefix */
-	XcmsTekHVCFormat,		/* id */
-	TekHVC_ParseString,	/* parseString */
-	Fl_TekHVC_to_CIEXYZ,	/* to_CIEXYZ */
-	Fl_CIEXYZ_to_TekHVC,	/* from_CIEXYZ */
-	1
-    };
-
-
-
-
-/************************************************************************
- *									*
- *			 PRIVATE ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		TekHVC_ParseString
- *
- *	SYNOPSIS
- */
-static int
-TekHVC_ParseString(spec, pColor)
-    register char *spec;
-    XcmsColor *pColor;
-/*
- *	DESCRIPTION
- *		This routines takes a string and attempts to convert
- *		it into a XcmsColor structure with XcmsTekHVCFormat.
- *		The assumed TekHVC string syntax is:
- *		    TekHVC:<H>/<V>/<C>
- *		Where H, V, and C are in string input format for floats
- *		consisting of:
- *		    a. an optional sign
- *		    b. a string of numbers possibly containing a decimal point,
- *		    c. an optional exponent field containing an 'E' or 'e'
- *			followed by a possibly signed integer string.
- *
- *	RETURNS
- *		XcmsFailure if invalid;
- *		XcmsSuccess if valid.
- */
-{
-    int n;
-    char *pchar;
-
-    if ((pchar = strchr(spec, ':')) == NULL) {
-	return(XcmsFailure);
-    }
-    n = (int)(pchar - spec);
-
-    /*
-     * Check for proper prefix.
-     */
-    if (strncmp(spec, _XcmsTekHVC_prefix, n) != 0) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Attempt to parse the value portion.
-     */
-    if (sscanf(spec + n + 1, "%lf/%lf/%lf",
-	    &pColor->spec.TekHVC.H,
-	    &pColor->spec.TekHVC.V,
-	    &pColor->spec.TekHVC.C) != 3) {
-	return(XcmsFailure);
-    }
-    pColor->format = XcmsTekHVCFormat;
-    pColor->pixel = 0;
-    return(XcmsTekHVC_ValidSpec(pColor));
-}
-
-
-/*
- *	NAME
- *		ThetaOffset -- compute thetaOffset
- *
- *	SYNOPSIS
- */
-static int
-ThetaOffset(pWhitePt, pThetaOffset)
-    XcmsColor *pWhitePt;
-    XcmsFloat *pThetaOffset;
-/*
- *	DESCRIPTION
- *		This routine computes the theta offset of a given
- *		white point, i.e. XcmsColor.  It is used in both this
- *		conversion and the printer conversions.
- *
- *	RETURNS
- *		0 if failed.
- *		1 if succeeded with no modifications.
- *
- *	ASSUMPTIONS
- *		Assumes:
- *			pWhitePt != NULL
- *			pWhitePt->format == XcmsCIEuvYFormat
- *
- */
-{
-    double div, slopeuv;
-
-    if (pWhitePt == NULL || pWhitePt->format != XcmsCIEuvYFormat) {
-	return(0);
-    }
-
-    if ((div = u_BR - pWhitePt->spec.CIEuvY.u_prime) == 0.0) {
-	return(0);
-    }
-    slopeuv = (v_BR - pWhitePt->spec.CIEuvY.v_prime) / div;
-    *pThetaOffset = degrees(XCMS_ATAN(slopeuv));
-    return(1);
-}
-
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsTekHVC_ValidSpec()
- *
- *	SYNOPSIS
- */
-static int
-XcmsTekHVC_ValidSpec(pColor)
-    XcmsColor *pColor;
-/*
- *	DESCRIPTION
- *		Checks if values in the color specification are valid.
- *		Also brings hue into the range 0.0 <= Hue < 360.0
- *
- *	RETURNS
- *		0 if not valid.
- *		1 if valid.
- *
- */
-{
-    if (pColor->format != XcmsTekHVCFormat) {
-	return(XcmsFailure);
-    }
-    if (pColor->spec.TekHVC.V < (0.0 - XMY_DBL_EPSILON)
-	    || pColor->spec.TekHVC.V > (100.0 + XMY_DBL_EPSILON)
-	    || (pColor->spec.TekHVC.C < 0.0 - XMY_DBL_EPSILON)) {
-	return(XcmsFailure);
-    }
-
-    if (pColor->spec.TekHVC.V < 0.0) {
-	    pColor->spec.TekHVC.V = 0.0 + XMY_DBL_EPSILON;
-    } else if (pColor->spec.TekHVC.V > 100.0) {
-	pColor->spec.TekHVC.V = 100.0 - XMY_DBL_EPSILON;
-    }
-
-    if (pColor->spec.TekHVC.C < 0.0) {
-	pColor->spec.TekHVC.C = 0.0 - XMY_DBL_EPSILON;
-    }
-
-    while (pColor->spec.TekHVC.H < 0.0) {
-	pColor->spec.TekHVC.H += 360.0;
-    }
-    while (pColor->spec.TekHVC.H >= 360.0) {
-	pColor->spec.TekHVC.H -= 360.0;
-    } 
-    return(XcmsSuccess);
-}
-
-/*
- *	NAME
- *		XcmsTekHVCToCIEuvY - convert TekHVC to CIEuvY
- *
- *	SYNOPSIS
- */
-Status
-XcmsTekHVCToCIEuvY(ccc, pHVC_WhitePt, pColors_in_out, nColors)
-    XcmsCCC ccc;
-    XcmsColor *pHVC_WhitePt;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-/*
- *	DESCRIPTION
- *		Transforms an array of TekHVC color specifications, given
- *		their associated white point, to CIECIEuvY.color
- *		specifications.
- *
- *	RETURNS
- *		XcmsFailure if failed, XcmsSuccess otherwise.
- *
- */
-{
-    XcmsFloat	thetaOffset;
-    XcmsColor	*pColor = pColors_in_out;
-    XcmsColor	whitePt;
-    XcmsCIEuvY	uvY_return;
-    XcmsFloat	tempHue, u, v;
-    XcmsFloat	tmpVal;
-    register int i;
-
-    /*
-     * Check arguments
-     */
-    if (pHVC_WhitePt == NULL || pColors_in_out == NULL) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Make sure white point is in CIEuvY form
-     */
-    if (pHVC_WhitePt->format != XcmsCIEuvYFormat) {
-	/* Make copy of the white point because we're going to modify it */
-	memcpy((char *)&whitePt, (char *)pHVC_WhitePt, sizeof(XcmsColor));
-	if (!_XcmsDIConvertColors(ccc, &whitePt, (XcmsColor *)NULL, 1,
-		XcmsCIEuvYFormat)) {
-	    return(XcmsFailure);
-	}
-	pHVC_WhitePt = &whitePt;
-    }
-    /* Make sure it is a white point, i.e., Y == 1.0 */
-    if (pHVC_WhitePt->spec.CIEuvY.Y != 1.0) {
-	return(XcmsFailure);
-    }
-
-    /* Get the thetaOffset */
-    if (!ThetaOffset(pHVC_WhitePt, &thetaOffset)) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Now convert each XcmsColor structure to CIEXYZ form
-     */
-    for (i = 0; i < nColors; i++, pColor++) {
-
-	/* Make sure original format is TekHVC and is valid */
-	if (!XcmsTekHVC_ValidSpec(pColor)) {
-	    return(XcmsFailure);
-	}
-
-	if (pColor->spec.TekHVC.V == 0.0 || pColor->spec.TekHVC.V == 100.0) {
-	    if (pColor->spec.TekHVC.V == 100.0) {
-		uvY_return.Y = 1.0;
-	    } else { /* pColor->spec.TekHVC.V == 0.0 */
-		uvY_return.Y = 0.0;
-	    }
-	    uvY_return.u_prime = pHVC_WhitePt->spec.CIEuvY.u_prime;
-	    uvY_return.v_prime = pHVC_WhitePt->spec.CIEuvY.v_prime;
-	} else {
-
-	    /* Find the hue based on the white point offset */
-	    tempHue = pColor->spec.TekHVC.H + thetaOffset;
-
-	    while (tempHue < 0.0) {
-		tempHue += 360.0;
-	    }
-	    while (tempHue >= 360.0) {
-		tempHue -= 360.0;
-	    }
-
-	    tempHue = radians(tempHue);
-
-	    /* Calculate u'v' for the obtained hue */
-	    u = (XcmsFloat) ((XCMS_COS(tempHue) * pColor->spec.TekHVC.C) / 
-		    (pColor->spec.TekHVC.V * (double)CHROMA_SCALE_FACTOR));
-	    v = (XcmsFloat) ((XCMS_SIN(tempHue) * pColor->spec.TekHVC.C) / 
-		    (pColor->spec.TekHVC.V * (double)CHROMA_SCALE_FACTOR));
-
-	    /* Based on the white point get the offset from best red */
-	    uvY_return.u_prime = u + pHVC_WhitePt->spec.CIEuvY.u_prime;
-	    uvY_return.v_prime = v + pHVC_WhitePt->spec.CIEuvY.v_prime;
-
-	    /* Calculate the Y value based on the L* = V. */
-	    if (pColor->spec.TekHVC.V < 7.99953624) {
-		uvY_return.Y = pColor->spec.TekHVC.V / 903.29;
-	    } else {
-		tmpVal = (pColor->spec.TekHVC.V + 16.0) / 116.0;
-		uvY_return.Y = tmpVal * tmpVal * tmpVal; /* tmpVal ** 3 */
-	    }
-	}
-
-	/* Copy result to pColor */
-	memcpy((char *)&pColor->spec, (char *)&uvY_return, sizeof(XcmsCIEuvY));
-
-	/* Identify that the format is now CIEuvY */
-	pColor->format = XcmsCIEuvYFormat;
-    }
-    return(XcmsSuccess);
-}
-
-
-/*
- *	NAME
- *		XcmsCIEuvYToTekHVC - convert CIEuvY to TekHVC
- *
- *	SYNOPSIS
- */
-Status
-XcmsCIEuvYToTekHVC(ccc, pHVC_WhitePt, pColors_in_out, nColors)
-    XcmsCCC ccc;
-    XcmsColor *pHVC_WhitePt;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-/*
- *	DESCRIPTION
- *		Transforms an array of CIECIEuvY.color specifications, given
- *		their assiciated white point, to TekHVC specifications.
- *
- *	RETURNS
- *		XcmsFailure if failed, XcmsSuccess otherwise.
- *
- */
-{
-    XcmsFloat	theta, L2, u, v, nThetaLow, nThetaHigh;
-    XcmsFloat	thetaOffset;
-    XcmsColor	*pColor = pColors_in_out;
-    XcmsColor	whitePt;
-    XcmsTekHVC	HVC_return;
-    register int i;
-
-    /*
-     * Check arguments
-     */
-    if (pHVC_WhitePt == NULL || pColors_in_out == NULL) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Make sure white point is in CIEuvY form
-     */
-    if (pHVC_WhitePt->format != XcmsCIEuvYFormat) {
-	/* Make copy of the white point because we're going to modify it */
-	memcpy((char *)&whitePt, (char *)pHVC_WhitePt, sizeof(XcmsColor));
-	if (!_XcmsDIConvertColors(ccc, &whitePt, (XcmsColor *)NULL, 1,
-		XcmsCIEuvYFormat)) {
-	    return(XcmsFailure);
-	}
-	pHVC_WhitePt = &whitePt;
-    }
-    /* Make sure it is a white point, i.e., Y == 1.0 */
-    if (pHVC_WhitePt->spec.CIEuvY.Y != 1.0) {
-	return(XcmsFailure);
-    }
-    if (!ThetaOffset(pHVC_WhitePt, &thetaOffset)) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Now convert each XcmsColor structure to CIEXYZ form
-     */
-    for (i = 0; i < nColors; i++, pColor++) {
-	if (!_XcmsCIEuvY_ValidSpec(pColor)) {
-	    return(XcmsFailure);
-	}
-
-	/* Use the white point offset to determine HVC */
-	u = pColor->spec.CIEuvY.u_prime - pHVC_WhitePt->spec.CIEuvY.u_prime;
-	v = pColor->spec.CIEuvY.v_prime - pHVC_WhitePt->spec.CIEuvY.v_prime;
-
-	/* Calculate the offset */
-	if (u == 0.0) {
-	    theta = 0.0;
-	} else {
-	    theta = v / u;
-	    theta = (XcmsFloat) XCMS_ATAN((double)theta);
-	    theta = degrees(theta);
-	}
-
-	nThetaLow = 0.0;
-	nThetaHigh = 360.0;
-	if (u > 0.0 && v > 0.0) {
-	    nThetaLow = 0.0;
-	    nThetaHigh = 90.0;
-	} else if (u < 0.0 && v > 0.0) {
-	    nThetaLow = 90.0;
-	    nThetaHigh = 180.0;
-	} else if (u < 0.0 && v < 0.0) {
-	    nThetaLow = 180.0;
-	    nThetaHigh = 270.0;
-	} else if (u > 0.0 && v < 0.0) {
-	    nThetaLow = 270.0;
-	    nThetaHigh = 360.0;
-	}
-	while (theta < nThetaLow) {
-		theta += 90.0;
-	}
-	while (theta >= nThetaHigh) {
-	    theta -= 90.0;
-	}
-
-	/* calculate the L value from the given Y */
-	L2 = (pColor->spec.CIEuvY.Y < 0.008856)
-	    ?
-	    (pColor->spec.CIEuvY.Y * 903.29)
-	    :
-	    ((XcmsFloat)(XCMS_CUBEROOT(pColor->spec.CIEuvY.Y) * 116.0) - 16.0);
-	HVC_return.C = L2 * CHROMA_SCALE_FACTOR * XCMS_SQRT((double) ((u * u) + (v * v)));
-	if (HVC_return.C < 0.0) {
-	    theta = 0.0;
-	}
-	HVC_return.V = L2;
-	HVC_return.H = theta - thetaOffset;
-
-	/*
-	 * If this is within the error margin let some other routine later
-	 * in the chain worry about the slop in the calculations.
-	 */
-	while (HVC_return.H < -EPS) {
-	    HVC_return.H += 360.0;
-	}
-	while (HVC_return.H >= 360.0 + EPS) {
-	    HVC_return.H -= 360.0;
-	}
-
-	/* Copy result to pColor */
-	memcpy((char *)&pColor->spec, (char *)&HVC_return, sizeof(XcmsTekHVC));
-
-	/* Identify that the format is now CIEuvY */
-	pColor->format = XcmsTekHVCFormat;
-    }
-    return(XcmsSuccess);
-}
-
-
-/*
- *	NAME
- *		_XcmsTekHVC_CheckModify
- *
- *	SYNOPSIS
- */
-int
-_XcmsTekHVC_CheckModify(pColor)
-    XcmsColor *pColor;
-/*
- *	DESCRIPTION
- *		Checks if values in the color specification are valid.
- *		If they are not it modifies the values.
- *		Also brings hue into the range 0.0 <= Hue < 360.0
- *
- *	RETURNS
- *		0 if not valid.
- *		1 if valid.
- *
- */
-{
-    int n;
-
-    /* For now only use the TekHVC numbers as inputs */
-    if (pColor->format != XcmsTekHVCFormat) {
-	return(0);
-    }
-
-    if (pColor->spec.TekHVC.V < 0.0) {
-	pColor->spec.TekHVC.V = 0.0 + XMY_DBL_EPSILON;
-    } else if (pColor->spec.TekHVC.V > 100.0) {
-	pColor->spec.TekHVC.V = 100.0 - XMY_DBL_EPSILON;
-    }
-
-    if (pColor->spec.TekHVC.C < 0.0) {
-	pColor->spec.TekHVC.C = 0.0 - XMY_DBL_EPSILON;
-    }
-
-    if (pColor->spec.TekHVC.H < 0.0) {
-	n = -pColor->spec.TekHVC.H / 360.0;
-	pColor->spec.TekHVC.H += (n + 1) * 360.0;
-	if (pColor->spec.TekHVC.H >= 360.0)
-	    pColor->spec.TekHVC.H -= 360.0;
-    } else if (pColor->spec.TekHVC.H >= 360.0) {
-	n = pColor->spec.TekHVC.H / 360.0;
-	pColor->spec.TekHVC.H -= n * 360.0;
-    } 
-    return(1);
-}
diff --git a/xc/lib/X11/HVCGcC.c b/xc/lib/X11/HVCGcC.c
deleted file mode 100644
index efe3ad385..000000000
--- a/xc/lib/X11/HVCGcC.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* $XConsortium: HVCGcC.c,v 1.8 93/07/05 11:43:37 rws Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  TekColor is a
- * trademark of Tektronix, Inc.  The term "TekHVC" designates a particular
- * color space that is the subject of U.S. Patent No. 4,985,853 (equivalent
- * foreign patents pending).  Permission is hereby granted to use, copy,
- * modify, sell, and otherwise distribute this software and its
- * documentation for any purpose and without fee, provided that:
- * 
- * 1. This copyright, permission, and disclaimer notice is reproduced in
- *    all copies of this software and any modification thereof and in
- *    supporting documentation; 
- * 2. Any color-handling application which displays TekHVC color
- *    cooordinates identifies these as TekHVC color coordinates in any
- *    interface that displays these coordinates and in any associated
- *    documentation;
- * 3. The term "TekHVC" is always used, and is only used, in association
- *    with the mathematical derivations of the TekHVC Color Space,
- *    including those provided in this file and any equivalent pathways and
- *    mathematical derivations, regardless of digital (e.g., floating point
- *    or integer) representation.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *	NAME
- *		TekHVCGcC.c
- *
- *	DESCRIPTION
- *		Source for XcmsTekHVCClipC() gamut compression routine.
- *
- */
-/* $XFree86: xc/lib/X11/HVCGcC.c,v 1.2 1999/05/09 10:49:31 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/*
- *	EXTERNS
- */
-extern XcmsColorSpace XcmsTekHVCColorSpace;
-extern XcmsFunctionSet	XcmsLinearRGBFunctionSet;
-
-/* CvCols.c */
-extern Status _XcmsDIConvertColors();
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsTekHVCClipC - Reduce the chroma for a hue and value
- *
- *	SYNOPSIS
- */
-/* ARGSUSED */
-Status
-XcmsTekHVCClipC (ccc, pColors_in_out, nColors, i, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-    unsigned int i;
-    Bool *pCompressed;
-/*
- *	DESCRIPTION
- *		Reduce the Chroma for a specific hue and value to
- *		to bring the given color into the gamut of the 
- *		specified device.  As required of gamut compression
- *		functions in Xcms, this routine returns pColor_in_out
- *		in XcmsCIEXYZFormat on successful completion.
- *		
- *		Since this routine works with the value within
- *		pColor_in_out intermediate results may be returned
- *		even though it may be invalid.
- *
- *	RETURNS
- *		XcmsFailure - Failure
- *              XcmsSuccess - Succeeded
- *
- */
-{
-    Status retval;
-    XcmsColor *pColor;
-
-    /*
-     * Color specification passed as input can be assumed to:
-     *	1. Be in XcmsCIEXYZFormat
-     *	2. Already be white point adjusted for the Screen White Point.
-     *	    This means that the white point now associated with this
-     *	    color spec is the Screen White Point (even if the
-     *	    ccc->clientWhitePt differs).
-     */
-
-    /*
-     * Insure TekHVC installed
-     */
-    if (XcmsAddColorSpace(&XcmsTekHVCColorSpace) == XcmsFailure) {
-	return(XcmsFailure);
-    }
-
-    pColor = pColors_in_out + i;
-
-    if (ccc->visual->class < StaticColor &&
-	    FunctionSetOfCCC(ccc) != (XPointer) &XcmsLinearRGBFunctionSet) {
-	/*
-	 * GRAY !
-	 */
-	_XcmsDIConvertColors(ccc, pColor, &ccc->pPerScrnInfo->screenWhitePt,
-		1, XcmsTekHVCFormat);
-	pColor->spec.TekHVC.H = pColor->spec.TekHVC.C = 0.0;
-	_XcmsDIConvertColors(ccc, pColor, &ccc->pPerScrnInfo->screenWhitePt,
-		1, XcmsCIEXYZFormat);
-	if (pCompressed) {
-	    *(pCompressed + i) = True;
-	}
-	return(XcmsSuccess);
-    } else {
-	if (pColor->format != XcmsTekHVCFormat) {
-	    if (_XcmsDIConvertColors(ccc, pColor,
-		    &ccc->pPerScrnInfo->screenWhitePt, 1, XcmsTekHVCFormat)
-		    == XcmsFailure) {
-		return(XcmsFailure);
-	    }
-	}
-	if (XcmsTekHVCQueryMaxC(ccc,
-		pColor->spec.TekHVC.H,
-		pColor->spec.TekHVC.V,
-		pColor)
-		== XcmsFailure) {
-	    return(XcmsFailure);
-	}
-	retval = _XcmsDIConvertColors(ccc, pColor,
-		&ccc->pPerScrnInfo->screenWhitePt, 1, XcmsCIEXYZFormat);
-	if (retval != XcmsFailure && pCompressed != NULL) {
-	    *(pCompressed + i) = True;
-	}
-	return(retval);
-    }
-}
diff --git a/xc/lib/X11/HVCGcV.c b/xc/lib/X11/HVCGcV.c
deleted file mode 100644
index f2738c818..000000000
--- a/xc/lib/X11/HVCGcV.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/* $XConsortium: HVCGcV.c,v 1.8 93/09/07 21:30:49 rws Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  TekColor is a
- * trademark of Tektronix, Inc.  The term "TekHVC" designates a particular
- * color space that is the subject of U.S. Patent No. 4,985,853 (equivalent
- * foreign patents pending).  Permission is hereby granted to use, copy,
- * modify, sell, and otherwise distribute this software and its
- * documentation for any purpose and without fee, provided that:
- * 
- * 1. This copyright, permission, and disclaimer notice is reproduced in
- *    all copies of this software and any modification thereof and in
- *    supporting documentation; 
- * 2. Any color-handling application which displays TekHVC color
- *    cooordinates identifies these as TekHVC color coordinates in any
- *    interface that displays these coordinates and in any associated
- *    documentation;
- * 3. The term "TekHVC" is always used, and is only used, in association
- *    with the mathematical derivations of the TekHVC Color Space,
- *    including those provided in this file and any equivalent pathways and
- *    mathematical derivations, regardless of digital (e.g., floating point
- *    or integer) representation.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *	NAME
- *		TekHVCGcV.c
- *
- *	DESCRIPTION
- *		Source for XcmsTekHVCClipV() gamut compression routine.
- *
- */
-/* $XFree86: xc/lib/X11/HVCGcV.c,v 1.2 1999/05/09 10:49:31 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/*
- *	EXTERNS
- */
-extern Status _XcmsTekHVC_CheckModify();
-extern XcmsColorSpace XcmsTekHVCColorSpace;
-extern XcmsFunctionSet	XcmsLinearRGBFunctionSet;
-
-/* CvCols.c */
-extern Status _XcmsDIConvertColors();
-
-/* HVCMxVC.c */
-extern Status _XcmsTekHVCQueryMaxVCRGB();
-
-
-
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsTekHVCClipV - Return the closest value
- *
- *	SYNOPSIS
- */
-/* ARGSUSED */
-Status
-XcmsTekHVCClipV (ccc, pColors_in_out, nColors, i, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-    unsigned int i;
-    Bool *pCompressed;
-/*
- *	DESCRIPTION
- *		Return the closest value for a specific hue and chroma.
- *		This routine takes any color as input and outputs 
- *		a CIE XYZ color.
- *
- *		Since this routine works with the value within
- *		pColor_in_out intermediate results may be returned
- *		even though it may be invalid.
- *
- *	RETURNS
- *		XcmsFailure - Failure
- *              XcmsSuccess - Succeeded
- *
- */
-{
-    XcmsColor  *pColor;
-    XcmsColor  hvc_max;
-    XcmsCCCRec myCCC;
-    Status retval;
-
-    /*
-     * Insure TekHVC installed
-     */
-    if (XcmsAddColorSpace(&XcmsTekHVCColorSpace) == XcmsFailure) {
-	return(XcmsFailure);
-    }
-
-    /* Use my own CCC */
-    memcpy ((char *)&myCCC, (char *)ccc, sizeof(XcmsCCCRec));
-    myCCC.clientWhitePt.format = XcmsUndefinedFormat;/* Inherit Screen WP */
-    myCCC.gamutCompProc = (XcmsCompressionProc)NULL;/* no gamut compression */
-
-    /*
-     * Color specification passed as input can be assumed to:
-     *	1. Be in XcmsCIEXYZFormat
-     *	2. Already be white point adjusted for the Screen White Point.
-     *	    This means that the white point now associated with this
-     *	    color spec is the Screen White Point (even if the
-     *	    ccc->clientWhitePt differs).
-     */
-
-    pColor = pColors_in_out + i;
-    
-    if (ccc->visual->class < StaticColor &&
-	    FunctionSetOfCCC(ccc) != (XPointer) &XcmsLinearRGBFunctionSet) {
-	/*
-	 * GRAY !
-	 */
-	return(XcmsFailure);
-    } else {
-	/* Convert from CIEXYZ to TekHVC format */
-	if (_XcmsDIConvertColors(&myCCC, pColor,
-		&myCCC.pPerScrnInfo->screenWhitePt, 1, XcmsTekHVCFormat)
-		== XcmsFailure) {
-	    return(XcmsFailure);
-	}
-
-	/* check to make sure we have a valid TekHVC number */
-	if (!_XcmsTekHVC_CheckModify (pColor)) {
-	    return (XcmsFailure);
-	}
-
-	/* Step 1: compute the maximum value and chroma for this hue. */
-	/*         This copy may be overkill but it preserves the pixel etc. */
-	memcpy((char *)&hvc_max, (char *)pColor, sizeof(XcmsColor));
-	if (_XcmsTekHVCQueryMaxVCRGB (&myCCC, hvc_max.spec.TekHVC.H, &hvc_max,
-		(XcmsRGBi *)NULL) == XcmsFailure) {
-	    return (XcmsFailure);
-	}
-
-	/* Now check and return the appropriate value */
-	if (pColor->spec.TekHVC.C == hvc_max.spec.TekHVC.C) {
-	    /* When the chroma input is equal to the maximum chroma */
-	    /* merely return the value for that chroma. */
-	    pColor->spec.TekHVC.V = hvc_max.spec.TekHVC.V;
-	    if (!_XcmsTekHVC_CheckModify (pColor)) {
-		return (XcmsFailure);
-	    }
-	    retval = _XcmsDIConvertColors(&myCCC, pColor,
-		    &myCCC.pPerScrnInfo->screenWhitePt, 1, XcmsCIEXYZFormat);
-	} else if (pColor->spec.TekHVC.C > hvc_max.spec.TekHVC.C) {
-	    /* When the chroma input is greater than the maximum chroma */
-	    /* merely return the value and chroma for the given hue. */
-	    pColor->spec.TekHVC.C = hvc_max.spec.TekHVC.C;
-	    pColor->spec.TekHVC.V = hvc_max.spec.TekHVC.V;
-	    return (XcmsFailure);
-	} else if (pColor->spec.TekHVC.V < hvc_max.spec.TekHVC.V) {
-	    /* When the value input is less than the maximum value point */
-	    /* compute the intersection of the line from 0,0 to max_V, max_C */
-	    /* using the chroma input. */
-	    pColor->spec.TekHVC.V = pColor->spec.TekHVC.C * 
-				    hvc_max.spec.TekHVC.V / hvc_max.spec.TekHVC.C;
-	    if (pColor->spec.TekHVC.V >= hvc_max.spec.TekHVC.V) {
-		pColor->spec.TekHVC.C = hvc_max.spec.TekHVC.C;
-		pColor->spec.TekHVC.V = hvc_max.spec.TekHVC.V;
-	    }
-	    if (!_XcmsTekHVC_CheckModify (pColor)) {
-		return (XcmsFailure);
-	    }
-	    retval = _XcmsDIConvertColors(&myCCC, pColor,
-		    &myCCC.pPerScrnInfo->screenWhitePt, 1, XcmsCIEXYZFormat);
-	} else {
-	    /* When the value input is greater than the maximum value point */
-	    /* use HvcMaxValue to find the maximum value for the given chroma. */
-	    if (pColor->format != XcmsTekHVCFormat) {
-		if (_XcmsDIConvertColors(ccc, pColor,
-			&ccc->pPerScrnInfo->screenWhitePt, 1, XcmsCIEXYZFormat)
-			== XcmsFailure) {
-		    return(XcmsFailure);
-		}
-	    }
-	    if (XcmsTekHVCQueryMaxV(&myCCC,
-		    pColor->spec.TekHVC.H,
-		    pColor->spec.TekHVC.C,
-		    pColor)
-		    == XcmsFailure) {
-		return (XcmsFailure);
-	    }
-	    retval = _XcmsDIConvertColors(&myCCC, pColor,
-		    &myCCC.pPerScrnInfo->screenWhitePt, 1, XcmsCIEXYZFormat);
-	}
-	if (retval != XcmsFailure && pCompressed != NULL) {
-	    *(pCompressed + i) = True;
-	}
-	return(retval);
-    }
-}
diff --git a/xc/lib/X11/HVCGcVC.c b/xc/lib/X11/HVCGcVC.c
deleted file mode 100644
index 1ee0cc8c3..000000000
--- a/xc/lib/X11/HVCGcVC.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/* $XConsortium: HVCGcVC.c,v 1.11 94/02/07 22:30:20 rws Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  TekColor is a
- * trademark of Tektronix, Inc.  The term "TekHVC" designates a particular
- * color space that is the subject of U.S. Patent No. 4,985,853 (equivalent
- * foreign patents pending).  Permission is hereby granted to use, copy,
- * modify, sell, and otherwise distribute this software and its
- * documentation for any purpose and without fee, provided that:
- * 
- * 1. This copyright, permission, and disclaimer notice is reproduced in
- *    all copies of this software and any modification thereof and in
- *    supporting documentation; 
- * 2. Any color-handling application which displays TekHVC color
- *    cooordinates identifies these as TekHVC color coordinates in any
- *    interface that displays these coordinates and in any associated
- *    documentation;
- * 3. The term "TekHVC" is always used, and is only used, in association
- *    with the mathematical derivations of the TekHVC Color Space,
- *    including those provided in this file and any equivalent pathways and
- *    mathematical derivations, regardless of digital (e.g., floating point
- *    or integer) representation.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *	NAME
- *		TekHVCGcVC.c
- *
- *	DESCRIPTION
- *		Source for XcmsTekHVCClipVC() gamut
- *		compression function.
- */
-/* $XFree86: xc/lib/X11/HVCGcVC.c,v 1.2 1999/05/09 10:49:32 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-#include <math.h>
-
-/*
- *	INTERNALS
- *		Internal defines that need NOT be exported to any package or
- *		program using this package.
- */
-#define MAXBISECTCOUNT	100
-
-/*
- *	EXTERNS
- */
-extern int _XcmsTekHVC_CheckModify();
-extern Status _XcmsTekHVCQueryMaxVCRGB();
-extern XcmsColorSpace XcmsTekHVCColorSpace;
-extern XcmsFunctionSet	XcmsLinearRGBFunctionSet;
-
-/* CvCols.c */
-extern Status _XcmsDIConvertColors();
-
-/* CvColW.c */
-extern Status _XcmsConvertColorsWithWhitePt();
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsTekHVCClipVC - Return the closest value and chroma
- *
- *	SYNOPSIS
- */
-/* ARGSUSED */
-Status
-XcmsTekHVCClipVC (ccc, pColors_in_out, nColors, i, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-    unsigned int i;
-    Bool *pCompressed;
-/*
- *	DESCRIPTION
- *		This routine will find the closest value and chroma 
- *		for a specific hue.  The color input is converted to
- *		HVC format and returned as CIE XYZ format.
- *
- *		Since this routine works with the value within
- *		pColor_in_out intermediate results may be returned
- *		even though it may be invalid.
- *
- *	RETURNS
- *		XcmsFailure - Failure
- *              XcmsSuccess - Succeeded
- *
- */
-{
-    Status retval;
-    XcmsCCCRec	myCCC;
-    XcmsColor  *pColor;
-    XcmsColor  hvc_max;
-    XcmsRGBi   rgb_max;
-    int	      nCount, nMaxCount, nI, nILast;
-    XcmsFloat  Chroma, Value, bestChroma, bestValue, nT, saveDist, tmpDist;
-
-    /*
-     * Insure TekHVC installed
-     */
-    if (XcmsAddColorSpace(&XcmsTekHVCColorSpace) == XcmsFailure) {
-	return(XcmsFailure);
-    }
-
-    /* Use my own CCC */
-    memcpy ((char *)&myCCC, (char *)ccc, sizeof(XcmsCCCRec));
-    myCCC.clientWhitePt.format = XcmsUndefinedFormat;/* inherit screen white pt */
-    myCCC.gamutCompProc = (XcmsCompressionProc)NULL;/* no gamut compression func */
-
-    /*
-     * Color specification passed as input can be assumed to:
-     *	1. Be in XcmsCIEXYZFormat
-     *	2. Already be white point adjusted for the Screen White Point.
-     *	    This means that the white point now associated with this
-     *	    color spec is the Screen White Point (even if the
-     *	    ccc->clientWhitePt differs).
-     */
-
-    pColor = pColors_in_out + i;
-
-    if (ccc->visual->class < StaticColor &&
-	    FunctionSetOfCCC(ccc) != (XPointer) &XcmsLinearRGBFunctionSet) {
-	/*
-	 * GRAY !
-	 */
-	_XcmsDIConvertColors(ccc, pColor, &ccc->pPerScrnInfo->screenWhitePt,
-		1, XcmsTekHVCFormat);
-	pColor->spec.TekHVC.H = pColor->spec.TekHVC.C = 0.0;
-	_XcmsDIConvertColors(ccc, pColor, &ccc->pPerScrnInfo->screenWhitePt,
-		1, XcmsCIEXYZFormat);
-	if (pCompressed) {
-	    *(pCompressed + i) = True;
-	}
-	return(XcmsSuccess);
-    } else {
-	/* Convert from CIEXYZ to TekHVC format */
-	if (_XcmsDIConvertColors(&myCCC, pColor,
-		&myCCC.pPerScrnInfo->screenWhitePt, 1, XcmsTekHVCFormat)
-		== XcmsFailure) {
-	    return(XcmsFailure);
-	}
-
-	if (!_XcmsTekHVC_CheckModify(pColor)) {
-	    return (XcmsFailure);
-	}
-
-	/* Step 1: compute the maximum value and chroma for this hue. */
-	/*         This copy may be overkill but it preserves the pixel etc. */
-	memcpy((char *)&hvc_max, (char *)pColor, sizeof(XcmsColor));
-	if (_XcmsTekHVCQueryMaxVCRGB (&myCCC, hvc_max.spec.TekHVC.H, &hvc_max,
-		&rgb_max) == XcmsFailure) {
-	    return (XcmsFailure);
-	}
-
-	/* Now check and return the appropriate value */
-	if (pColor->spec.TekHVC.V == hvc_max.spec.TekHVC.V) {
-	    /* When the value input is equal to the maximum value */
-	    /* merely return the chroma for that value. */
-	    pColor->spec.TekHVC.C = hvc_max.spec.TekHVC.C;
-	    retval = _XcmsDIConvertColors(&myCCC, pColor,
-		    &myCCC.pPerScrnInfo->screenWhitePt, 1, XcmsCIEXYZFormat);
-	}
-
-	if (pColor->spec.TekHVC.V < hvc_max.spec.TekHVC.V) {
-	    /* return the intersection of the perpindicular line through     */
-	    /* the value and chroma given and the line from 0,0 and hvc_max. */
-	    Chroma = pColor->spec.TekHVC.C;
-	    Value = pColor->spec.TekHVC.V;
-	    pColor->spec.TekHVC.C = 
-	       (Value + (hvc_max.spec.TekHVC.C / hvc_max.spec.TekHVC.V * Chroma)) /
-	       ((hvc_max.spec.TekHVC.V / hvc_max.spec.TekHVC.C) +
-		(hvc_max.spec.TekHVC.C / hvc_max.spec.TekHVC.V));
-	    if (pColor->spec.TekHVC.C >= hvc_max.spec.TekHVC.C) {
-		pColor->spec.TekHVC.C = hvc_max.spec.TekHVC.C;
-		pColor->spec.TekHVC.V = hvc_max.spec.TekHVC.V;
-	    } else {
-		pColor->spec.TekHVC.V = pColor->spec.TekHVC.C *
-				    hvc_max.spec.TekHVC.V / hvc_max.spec.TekHVC.C;
-	    }
-	    retval = _XcmsDIConvertColors(&myCCC, pColor,
-		    &myCCC.pPerScrnInfo->screenWhitePt, 1, XcmsCIEXYZFormat);
-
-	    if (retval != XcmsFailure && pCompressed != NULL) {
-		*(pCompressed + i) = True;
-	    }
-	    return (retval);
-	}
-
-	/* return the closest point on the upper part of the hue leaf. */
-	/* must do a bisection here to compute the delta e. */
-	nMaxCount = MAXBISECTCOUNT;
-	nI =     nMaxCount / 2;
-	bestValue = Value =  pColor->spec.TekHVC.V;
-	bestChroma = Chroma = pColor->spec.TekHVC.C;
-	saveDist = (XcmsFloat) XCMS_SQRT ((double) (((Chroma - hvc_max.spec.TekHVC.C) *
-					       (Chroma - hvc_max.spec.TekHVC.C)) +
-					      ((Value - hvc_max.spec.TekHVC.V) *
-					       (Value - hvc_max.spec.TekHVC.V))));
-	for (nCount = 0; nCount < nMaxCount; nCount++) {
-	    nT = (XcmsFloat) nI / (XcmsFloat) nMaxCount;
-	    pColor->spec.RGBi.red   = rgb_max.red * (1.0 - nT) + nT;
-	    pColor->spec.RGBi.green = rgb_max.green * (1.0 - nT) + nT;
-	    pColor->spec.RGBi.blue  = rgb_max.blue * (1.0 - nT) + nT;
-	    pColor->format = XcmsRGBiFormat;
-
-	    /* Convert from RGBi to HVC */
-	    if (_XcmsConvertColorsWithWhitePt(&myCCC, pColor,
-		    &myCCC.pPerScrnInfo->screenWhitePt, 1, XcmsTekHVCFormat,
-		    (Bool *) NULL)
-		    == XcmsFailure) {
-		return (XcmsFailure);
-	    }
-	    if (!_XcmsTekHVC_CheckModify(pColor)) {
-		return (XcmsFailure);
-	    }
-	    tmpDist = (XcmsFloat) XCMS_SQRT ((double) 
-			(((Chroma - pColor->spec.TekHVC.C) *
-			  (Chroma - pColor->spec.TekHVC.C)) +
-			 ((Value - pColor->spec.TekHVC.V) *
-			  (Value - pColor->spec.TekHVC.V))));
-	    nILast = nI;
-	    if (tmpDist > saveDist) {
-		nI /= 2;
-	    } else {
-		nI = (nMaxCount + nI) / 2;
-		saveDist = tmpDist;
-		bestValue = pColor->spec.TekHVC.V;
-		bestChroma = pColor->spec.TekHVC.C;	    
-	    }
-	    if (nI == nILast || nI == 0) {
-		break;
-	    }
-
-	}
-
-	if (bestChroma >= hvc_max.spec.TekHVC.C) {
-	    pColor->spec.TekHVC.C = hvc_max.spec.TekHVC.C;
-	    pColor->spec.TekHVC.V = hvc_max.spec.TekHVC.V;
-	} else {
-	    pColor->spec.TekHVC.C = bestChroma;
-	    pColor->spec.TekHVC.V = bestValue;
-	}
-	if (!_XcmsTekHVC_CheckModify(pColor)) {
-	    return (XcmsFailure);
-	}
-	retval = _XcmsDIConvertColors(&myCCC, pColor,
-		&myCCC.pPerScrnInfo->screenWhitePt, 1, XcmsCIEXYZFormat);
-
-	if (retval != XcmsFailure && pCompressed != NULL) {
-	    *(pCompressed + i) = True;
-	}
-	return(retval);
-    }
-}
diff --git a/xc/lib/X11/HVCMnV.c b/xc/lib/X11/HVCMnV.c
deleted file mode 100644
index ac5ab8f48..000000000
--- a/xc/lib/X11/HVCMnV.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/* $XConsortium: HVCMnV.c,v 1.7 93/09/07 21:30:53 rws Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  TekColor is a
- * trademark of Tektronix, Inc.  The term "TekHVC" designates a particular
- * color space that is the subject of U.S. Patent No. 4,985,853 (equivalent
- * foreign patents pending).  Permission is hereby granted to use, copy,
- * modify, sell, and otherwise distribute this software and its
- * documentation for any purpose and without fee, provided that:
- * 
- * 1. This copyright, permission, and disclaimer notice is reproduced in
- *    all copies of this software and any modification thereof and in
- *    supporting documentation; 
- * 2. Any color-handling application which displays TekHVC color
- *    cooordinates identifies these as TekHVC color coordinates in any
- *    interface that displays these coordinates and in any associated
- *    documentation;
- * 3. The term "TekHVC" is always used, and is only used, in association
- *    with the mathematical derivations of the TekHVC Color Space,
- *    including those provided in this file and any equivalent pathways and
- *    mathematical derivations, regardless of digital (e.g., floating point
- *    or integer) representation.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *	NAME
- *		TekHVCMnV.c
- *
- *	DESCRIPTION
- *		Source for XcmsTekHVCQueryMinV gamut boundary querying routine.
- *
- */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/*
- *	DEFINES
- */
-#define EPS	    0.001
-
-/*
- *	EXTERNS
- */
-extern Status _XcmsTekHVCQueryMaxVCRGB();
-extern Status _XcmsTekHVC_CheckModify();
-extern XcmsColorSpace XcmsTekHVCColorSpace;
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsTekHVCQueryMinV - Compute minimum value for hue and chroma
- *
- *	SYNOPSIS
- */
-Status
-XcmsTekHVCQueryMinV (ccc, hue, chroma, pColor_return)
-    XcmsCCC ccc;
-    XcmsFloat hue;
-    XcmsFloat chroma;
-    XcmsColor *pColor_return;
-
-/*
- *	DESCRIPTION
- *		Return the minimum value for a specific hue, and the
- *		corresponding chroma.  The input color specification
- *		may be in any format, however output is in XcmsTekHVCFormat.
- *
- *		Since this routine works with the value within
- *		pColor_return intermediate results may be returned
- *		even though it may be invalid.
- *
- *	ASSUMPTIONS
- *		This routine assumes that the white point associated with
- *		the color specification is the Screen White Point.  The
- *		Screen White Point will also be associated with the
- *		returned color specification.
- *
- *	RETURNS
- *		XcmsFailure - Failure
- *		XcmsSuccess - Succeeded with no modifications
- *
- */ 
-{
-    XcmsCCCRec myCCC;
-    XcmsColor tmp;
-    XcmsColor max_vc;
-
-    /*
-     * Check Arguments
-     */
-    if (ccc == NULL || pColor_return == NULL) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Insure TekHVC installed
-     */
-    if (XcmsAddColorSpace(&XcmsTekHVCColorSpace) == XcmsFailure) {
-	return(XcmsFailure);
-    }
-
-    /* Use my own CCC */
-    memcpy ((char *)&myCCC, (char *)ccc, sizeof(XcmsCCCRec));
-    myCCC.clientWhitePt.format = XcmsUndefinedFormat;/* inherit screen white pt */
-    myCCC.gamutCompProc = (XcmsCompressionProc)NULL;/* no gamut comp func */
-
-    tmp.spec.TekHVC.H = hue;
-    tmp.spec.TekHVC.V = 100.0;
-    tmp.spec.TekHVC.C = chroma;
-    tmp.pixel = pColor_return->pixel;
-    tmp.format = XcmsTekHVCFormat;
-
-
-    /* Check for a valid HVC */
-    if (!_XcmsTekHVC_CheckModify (&tmp)) {
-	return(XcmsFailure);
-    }
-
-    /* Step 1: compute the maximum value and chroma for this hue. */
-    /*         This copy may be overkill but it preserves the pixel etc. */
-    memcpy((char *)&max_vc, (char *)&tmp, sizeof(XcmsColor));
-    if (_XcmsTekHVCQueryMaxVCRGB (&myCCC, max_vc.spec.TekHVC.H, &max_vc,
-	    (XcmsRGBi *)NULL) == XcmsFailure) {
-	return(XcmsFailure);
-    }
-
-    /* Step 2: find the intersection with the maximum hvc and chroma line. */
-    if (tmp.spec.TekHVC.C > max_vc.spec.TekHVC.C + EPS) {
-	/* If the chroma is to large then return maximum hvc. */
-	tmp.spec.TekHVC.C = max_vc.spec.TekHVC.C;
-	tmp.spec.TekHVC.V = max_vc.spec.TekHVC.V;
-    } else {
-	tmp.spec.TekHVC.V = tmp.spec.TekHVC.C *
-		max_vc.spec.TekHVC.V / max_vc.spec.TekHVC.C;
-	if (tmp.spec.TekHVC.V > max_vc.spec.TekHVC.V) {
-	    tmp.spec.TekHVC.V = max_vc.spec.TekHVC.V;
-	} else if (tmp.spec.TekHVC.V < 0.0) {
-	    tmp.spec.TekHVC.V = tmp.spec.TekHVC.C = 0.0;
-	}
-    }
-    if (_XcmsTekHVC_CheckModify (&tmp)) {
-	memcpy ((char *) pColor_return, (char *) &tmp, sizeof (XcmsColor));
-	return(XcmsSuccess);
-    } else {
-	return(XcmsFailure);
-    }
-}
diff --git a/xc/lib/X11/HVCMxC.c b/xc/lib/X11/HVCMxC.c
deleted file mode 100644
index 9c2d524c0..000000000
--- a/xc/lib/X11/HVCMxC.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/* $XConsortium: HVCMxC.c,v 1.9 93/09/07 21:30:55 rws Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  TekColor is a
- * trademark of Tektronix, Inc.  The term "TekHVC" designates a particular
- * color space that is the subject of U.S. Patent No. 4,985,853 (equivalent
- * foreign patents pending).  Permission is hereby granted to use, copy,
- * modify, sell, and otherwise distribute this software and its
- * documentation for any purpose and without fee, provided that:
- * 
- * 1. This copyright, permission, and disclaimer notice is reproduced in
- *    all copies of this software and any modification thereof and in
- *    supporting documentation; 
- * 2. Any color-handling application which displays TekHVC color
- *    cooordinates identifies these as TekHVC color coordinates in any
- *    interface that displays these coordinates and in any associated
- *    documentation;
- * 3. The term "TekHVC" is always used, and is only used, in association
- *    with the mathematical derivations of the TekHVC Color Space,
- *    including those provided in this file and any equivalent pathways and
- *    mathematical derivations, regardless of digital (e.g., floating point
- *    or integer) representation.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *	NAME
- *		TekHVCMxC.c
- *
- *	DESCRIPTION
- *		Source for the XcmsTekHVCQueryMaxC() gamut boudary
- *		querying routine.
- *
- */
-/* $XFree86: xc/lib/X11/HVCMxC.c,v 1.2 1999/05/09 10:49:32 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-#include <math.h>
-
-/*
- *	DEFINES
- */
-#define MAXBISECTCOUNT	100
-#define EPS	        0.001
-
-/*
- *	EXTERNS
- */
-extern Status _XcmsTekHVCQueryMaxVCRGB();
-extern int _XcmsTekHVC_CheckModify();
-extern XcmsColorSpace XcmsTekHVCColorSpace;
-
-/* CvColW.c */
-extern Status _XcmsConvertColorsWithWhitePt();
-
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsTekHVCQueryMaxC - Compute the maximum chroma for a hue and value
- *
- *	SYNOPSIS
- */
-Status
-XcmsTekHVCQueryMaxC(ccc, hue, value, pColor_return)
-    XcmsCCC ccc;
-    XcmsFloat hue;
-    XcmsFloat value;
-    XcmsColor *pColor_return;
-/*
- *	DESCRIPTION
- *		Return the maximum chroma for a specific hue and value.
- *		The returned format is in XcmsTekHVCFormat.
- *
- *
- *	ASSUMPTIONS
- *		This routine assumes that the white point associated with
- *		the color specification is the Screen White Point.  The
- *		Screen White Point will also be associated with the
- *		returned color specification.
- *
- *	RETURNS
- *		XcmsFailure - Failure
- *              XcmsSuccess - Succeeded
- *
- */
-{
-    XcmsCCCRec	myCCC;
-    XcmsColor  tmp;
-    XcmsColor  max_vc;
-    XcmsRGBi   rgb_saved;
-    int nCount, nMaxCount;
-    XcmsFloat nValue, savedValue, lastValue, lastChroma, prevValue;
-    XcmsFloat maxDist, nT, rFactor;
-    XcmsFloat ftmp1, ftmp2;
-
-    /*
-     * Check Arguments
-     */
-    if (ccc == NULL || pColor_return == NULL) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Insure TekHVC installed
-     */
-    if (XcmsAddColorSpace(&XcmsTekHVCColorSpace) == XcmsFailure) {
-	return(XcmsFailure);
-    }
-
-    /* Use my own CCC */
-    memcpy ((char *)&myCCC, (char *)ccc, sizeof(XcmsCCCRec));
-    myCCC.clientWhitePt.format = XcmsUndefinedFormat; /* inherit screen white Pt */
-    myCCC.gamutCompProc = (XcmsCompressionProc)NULL;/* no gamut comp func */
-
-    tmp.spec.TekHVC.H = hue;
-    tmp.spec.TekHVC.V = value;
-    tmp.spec.TekHVC.C = 100.0;
-    tmp.pixel = pColor_return->pixel;
-    tmp.format = XcmsTekHVCFormat;
-
-    /* check to make sure we have a valid TekHVC number */
-    if (!_XcmsTekHVC_CheckModify(&tmp)) {
-	return(XcmsFailure);
-    }
-
-    /* Step 1: compute the maximum value and chroma for this hue. */
-    memcpy((char *)&max_vc, (char *)&tmp, sizeof(XcmsColor));
-    if (_XcmsTekHVCQueryMaxVCRGB(&myCCC, hue, &max_vc, &rgb_saved)
-	    == XcmsFailure) {
-	return(XcmsFailure);
-    }
-
-    /* Step 2: If the value is less than the value for the maximum */
-    /*         value, chroma point then the chroma is on the line  */
-    /*         from max_vc to 0,0. */
-    if (value <= max_vc.spec.TekHVC.V) {
-	tmp.spec.TekHVC.C = value
-			      * max_vc.spec.TekHVC.C / max_vc.spec.TekHVC.V;
-	if (_XcmsTekHVC_CheckModify (&tmp)) {
-	    memcpy((char *)pColor_return, (char *)&tmp, sizeof(XcmsColor));
-	    return(XcmsSuccess);
-	} else {
-	    return(XcmsFailure);
-	}
-    } else {
-	/* must do a bisection here to compute the maximum chroma */
-	/* save the structure input so that any elements that */
-	/* are not touched are recopied later in the routine. */
-	nValue = savedValue = value;
-	lastValue = -1.0;
-	nMaxCount = MAXBISECTCOUNT;
-	maxDist = 100.0 - max_vc.spec.TekHVC.V;
-	rFactor = 1.0;
-
-	for (nCount = 0; nCount < nMaxCount; nCount++) {
-	    prevValue =  lastValue;
-	    lastValue =  tmp.spec.TekHVC.V;
-	    lastChroma = tmp.spec.TekHVC.C;
-	    nT = (nValue - max_vc.spec.TekHVC.V) / maxDist * rFactor;
-	    tmp.spec.RGBi.red = rgb_saved.red * (1.0 - nT) + nT;
-	    tmp.spec.RGBi.green = rgb_saved.green * (1.0 - nT) + nT;
-	    tmp.spec.RGBi.blue  = rgb_saved.blue * (1.0 - nT) + nT;
-	    tmp.format = XcmsRGBiFormat;
-
-	    /* convert from RGB to HVC */
-	    if (_XcmsConvertColorsWithWhitePt(&myCCC, &tmp,
-		    &myCCC.pPerScrnInfo->screenWhitePt, 1, XcmsTekHVCFormat,
-		    (Bool *) NULL) == XcmsFailure) {
-		return(XcmsFailure);
-	    }
-
-	    /* Now check the return against what is expected */
-	    if (tmp.spec.TekHVC.V <= savedValue + EPS &&
-		tmp.spec.TekHVC.V >= savedValue - EPS) {
-		/* make sure to return the input hue */
-		tmp.spec.TekHVC.H = hue;
-		if (_XcmsTekHVC_CheckModify (&tmp)) {
-		    memcpy((char *)pColor_return, (char *)&tmp, sizeof(XcmsColor));
-		    return(XcmsSuccess);
-		} else {
-		    return(XcmsFailure);
-		}
-	    }
-	    nValue += savedValue - tmp.spec.TekHVC.V;
-	    if (nValue < max_vc.spec.TekHVC.V) {
-		nValue = max_vc.spec.TekHVC.V;
-		rFactor *= 0.5;  /* selective relaxation employed */
-	    } else if (nValue > 100.0) {
-		/* make sure to return the input hue */
-		tmp.spec.TekHVC.H = hue;
-		/* avoid using fabs */
-		ftmp1 = lastValue - savedValue;
-		if (ftmp1 < 0.0)
-		    ftmp1 = -ftmp1;
-		ftmp2 = tmp.spec.TekHVC.V - savedValue;
-		if (ftmp2 < 0.0)
-		    ftmp2 = -ftmp2;
-		if (ftmp1 < ftmp2) {
-		    tmp.spec.TekHVC.V = lastValue;
-		    tmp.spec.TekHVC.C = lastChroma;
-		} 
-		if (_XcmsTekHVC_CheckModify (&tmp)) {
-		    memcpy((char *)pColor_return, (char *)&tmp, sizeof(XcmsColor));
-		    return(XcmsSuccess);
-		} else {
-		    return(XcmsFailure);
-		}
-	    } else if (tmp.spec.TekHVC.V <= prevValue + EPS &&
-		       tmp.spec.TekHVC.V >= prevValue - EPS) {
-		rFactor *= 0.5;  /* selective relaxation employed */
-	    }
-	}
-	if (nCount >= nMaxCount) {
-	    /* avoid using fabs */
-	    ftmp1 = lastValue - savedValue;
-	    if (ftmp1 < 0.0)
-		ftmp1 = -ftmp1;
-	    ftmp2 = tmp.spec.TekHVC.V - savedValue;
-	    if (ftmp2 < 0.0)
-		ftmp2 = -ftmp2;
-	    if (ftmp1 < ftmp2) {
-		tmp.spec.TekHVC.V = lastValue;
-		tmp.spec.TekHVC.C = lastChroma;
-	    }
-	}
-    } 
-    /* make sure to return the input hue */
-    tmp.spec.TekHVC.H = hue;
-    memcpy((char *)pColor_return, (char *)&tmp, sizeof(XcmsColor));
-    return(XcmsSuccess);
-}
diff --git a/xc/lib/X11/HVCMxV.c b/xc/lib/X11/HVCMxV.c
deleted file mode 100644
index eb0e037a9..000000000
--- a/xc/lib/X11/HVCMxV.c
+++ /dev/null
@@ -1,254 +0,0 @@
-/* $XConsortium: HVCMxV.c,v 1.9 93/09/07 21:30:58 rws Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  TekColor is a
- * trademark of Tektronix, Inc.  The term "TekHVC" designates a particular
- * color space that is the subject of U.S. Patent No. 4,985,853 (equivalent
- * foreign patents pending).  Permission is hereby granted to use, copy,
- * modify, sell, and otherwise distribute this software and its
- * documentation for any purpose and without fee, provided that:
- * 
- * 1. This copyright, permission, and disclaimer notice is reproduced in
- *    all copies of this software and any modification thereof and in
- *    supporting documentation; 
- * 2. Any color-handling application which displays TekHVC color
- *    cooordinates identifies these as TekHVC color coordinates in any
- *    interface that displays these coordinates and in any associated
- *    documentation;
- * 3. The term "TekHVC" is always used, and is only used, in association
- *    with the mathematical derivations of the TekHVC Color Space,
- *    including those provided in this file and any equivalent pathways and
- *    mathematical derivations, regardless of digital (e.g., floating point
- *    or integer) representation.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *	NAME
- *		TekHVCMxV.c
- *
- *	DESCRIPTION
- *		Source for the XcmsTekHVCQueryMaxV() gamut boundary
- *		querying routine.
- *
- */
-/* $XFree86: xc/lib/X11/HVCMxV.c,v 1.2 1999/05/09 10:49:32 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-#include <math.h>
-
-/*
- *	DEFINES
- */
-#define MAXBISECTCOUNT	100
-#define EPS	    0.001
-
-/*
- *	EXTERNS
- */
-extern Status _XcmsTekHVCQueryMaxVCRGB();
-extern int _XcmsTekHVC_CheckModify();
-extern XcmsColorSpace XcmsTekHVCColorSpace;
-
-/* CvColW.c */
-extern Status _XcmsConvertColorsWithWhitePt();
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsTekHVCQueryMaxV - Compute maximum value for a hue and chroma
- *
- *	SYNOPSIS
- */
-Status
-XcmsTekHVCQueryMaxV(ccc, hue, chroma, pColor_return)
-    XcmsCCC ccc;
-    XcmsFloat hue;
-    XcmsFloat chroma;
-    XcmsColor *pColor_return;
-/*
- *	DESCRIPTION
- *		Return the maximum value for a specified hue and chroma.
- *
- *	ASSUMPTIONS
- *		This routine assumes that the white point associated with
- *		the color specification is the Screen White Point.  The
- *		Screen White Point will also be associated with the
- *		returned color specification.
- *
- *	RETURNS
- *		XcmsFailure - Failure
- *              XcmsSuccess - Succeeded with no modifications
- *
- */
-{
-    XcmsCCCRec myCCC;
-    XcmsColor   tmp;
-    XcmsColor   max_vc;
-    XcmsRGBi    rgb_saved;
-    int         nCount, nMaxCount;
-    XcmsFloat   nT, nChroma, savedChroma, lastValue, lastChroma, prevChroma;
-    XcmsFloat   rFactor;
-    XcmsFloat	ftmp1, ftmp2;
-
-    /*
-     * Check Arguments
-     */
-    if (ccc == NULL || pColor_return == NULL) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Insure TekHVC installed
-     */
-    if (XcmsAddColorSpace(&XcmsTekHVCColorSpace) == XcmsFailure) {
-	return(XcmsFailure);
-    }
-
-    /* setup the CCC to use for the conversions. */
-    memcpy ((char *) &myCCC, (char *) ccc, sizeof(XcmsCCCRec));
-    myCCC.clientWhitePt.format = XcmsUndefinedFormat;
-    myCCC.gamutCompProc = (XcmsCompressionProc) NULL;
-
-    tmp.spec.TekHVC.H = hue;
-    tmp.spec.TekHVC.V = 0.0;
-    tmp.spec.TekHVC.C = chroma;
-    tmp.pixel = pColor_return->pixel;
-    tmp.format = XcmsTekHVCFormat;
-
-    if (!_XcmsTekHVC_CheckModify (&tmp)) {
-	return(XcmsFailure);
-    }
-
-    /* Step 1: compute the maximum value and chroma for this hue. */
-    /*         This copy may be overkill but it preserves the pixel etc. */
-    memcpy((char *)&max_vc, (char *)&tmp, sizeof(XcmsColor));
-    hue = max_vc.spec.TekHVC.H;
-    if (_XcmsTekHVCQueryMaxVCRGB(&myCCC, max_vc.spec.TekHVC.H, &max_vc, &rgb_saved)
-	    == XcmsFailure) {
-	return(XcmsFailure);
-    }
-
-    if (max_vc.spec.TekHVC.C < tmp.spec.TekHVC.C) {
-	/*
-	 *  If the chroma is greater than the chroma for the 
-	 *  maximum value/chroma point then the value is the
-	 *  the value for the maximum value, chroma point.
-	 *  This is an error but it I return the best approximation I can.
-         *  Thus the inconsistency.
-	 */
-	tmp.spec.TekHVC.C = max_vc.spec.TekHVC.C;
-	tmp.spec.TekHVC.V = max_vc.spec.TekHVC.V;
-	memcpy ((char *) pColor_return, (char *) &tmp, sizeof (XcmsColor));
-	return(XcmsSuccess);
-    } else if (max_vc.spec.TekHVC.C == tmp.spec.TekHVC.C) {
-	/*
-	 *  If the chroma is equal to the chroma for the 
-	 *  maximum value/chroma point then the value is the
-	 *  the value for the maximum value, chroma point.
-	 */
-	tmp.spec.TekHVC.V = max_vc.spec.TekHVC.V;
-	memcpy ((char *) pColor_return, (char *) &tmp, sizeof (XcmsColor));
-	return(XcmsSuccess);
-    } else {
-	/* must do a bisection here to compute the maximum value */
-	/* save the structure input so that any elements that */
-	/* are not touched are recopied later in the routine. */
-	nChroma = savedChroma = tmp.spec.TekHVC.C;
-	tmp.spec.TekHVC.C = max_vc.spec.TekHVC.C;
-	tmp.spec.TekHVC.V = max_vc.spec.TekHVC.V;
-	lastChroma = -1.0;
-	nMaxCount = MAXBISECTCOUNT;
-	rFactor = 1.0;
-
-	for (nCount = 0; nCount < nMaxCount; nCount++) {
-	    prevChroma = lastChroma;
-	    lastValue =  tmp.spec.TekHVC.V;
-	    lastChroma = tmp.spec.TekHVC.C;
-	    nT = (1.0 - (nChroma / max_vc.spec.TekHVC.C)) * rFactor;
-	    tmp.spec.RGBi.red   = rgb_saved.red * (1.0 - nT) + nT;
-	    tmp.spec.RGBi.green = rgb_saved.green * (1.0 - nT) + nT;
-	    tmp.spec.RGBi.blue  = rgb_saved.blue * (1.0 - nT) + nT;
-	    tmp.format = XcmsRGBiFormat;
-
-	    /* convert from RGB to HVC */
-	    if (_XcmsConvertColorsWithWhitePt(&myCCC, &tmp,
-		    &myCCC.pPerScrnInfo->screenWhitePt, 1, XcmsTekHVCFormat,
-		    (Bool *) NULL) == XcmsFailure) {
-		return(XcmsFailure);
-	    }
-
-	    /* Now check the return against what is expected */
-	    if (tmp.spec.TekHVC.C <= savedChroma + EPS &&
-		tmp.spec.TekHVC.C >= savedChroma - EPS) {
-		tmp.spec.TekHVC.H = hue;  /* use the saved hue */
-		memcpy ((char *) pColor_return, (char *) &tmp, sizeof (XcmsColor));
-		return(XcmsSuccess);
-	    } 
-	    nChroma += savedChroma - tmp.spec.TekHVC.C;
-	    if (nChroma > max_vc.spec.TekHVC.C) {
-		nChroma = max_vc.spec.TekHVC.C;
-		rFactor *= 0.5;  /* selective relaxation employed */
-	    } else if (nChroma < 0.0) {
-		/* avoid using fabs */
-		ftmp1 = lastChroma - savedChroma;
-		if (ftmp1 < 0.0)
-		    ftmp1 = -ftmp1;
-		ftmp2 = tmp.spec.TekHVC.C - savedChroma;
-		if (ftmp2 < 0.0)
-		    ftmp2 = -ftmp2;
-		if (ftmp1 < ftmp2) {
-		    tmp.spec.TekHVC.V = lastValue;
-		    tmp.spec.TekHVC.C = lastChroma;
-		}
-		/* make sure to return the input hue */
-		tmp.spec.TekHVC.H = hue;
-		if (!_XcmsTekHVC_CheckModify(&tmp)) {
-		    return(XcmsFailure);
-		}
-		memcpy ((char *) pColor_return, (char *) &tmp, sizeof (XcmsColor));
-		return(XcmsSuccess);
-	    } else if (tmp.spec.TekHVC.C <= prevChroma + EPS &&
-		       tmp.spec.TekHVC.C >= prevChroma - EPS) {
-		rFactor *= 0.5;  /* selective relaxation employed */
-	    }
-	}
-	if (nCount >= nMaxCount) {
-	    /* avoid using fabs */
-	    ftmp1 = lastChroma - savedChroma;
-	    if (ftmp1 < 0.0)
-		ftmp1 = -ftmp1;
-	    ftmp2 = tmp.spec.TekHVC.C - savedChroma;
-	    if (ftmp2 < 0.0)
-		ftmp2 = -ftmp2;
-	    if (ftmp1 < ftmp2) {
-		    tmp.spec.TekHVC.V = lastValue;
-		    tmp.spec.TekHVC.C = lastChroma;
-	    }
-	}
-    }
-
-    /* make sure to return the input hue */
-    tmp.spec.TekHVC.H = hue;
-    memcpy ((char *) pColor_return, (char *) &tmp, sizeof (XcmsColor));
-    return(XcmsSuccess);
-}
diff --git a/xc/lib/X11/HVCMxVC.c b/xc/lib/X11/HVCMxVC.c
deleted file mode 100644
index 4e4751628..000000000
--- a/xc/lib/X11/HVCMxVC.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/* $XConsortium: HVCMxVC.c,v 1.8 93/10/07 18:49:10 rws Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  TekColor is a
- * trademark of Tektronix, Inc.  The term "TekHVC" designates a particular
- * color space that is the subject of U.S. Patent No. 4,985,853 (equivalent
- * foreign patents pending).  Permission is hereby granted to use, copy,
- * modify, sell, and otherwise distribute this software and its
- * documentation for any purpose and without fee, provided that:
- * 
- * 1. This copyright, permission, and disclaimer notice is reproduced in
- *    all copies of this software and any modification thereof and in
- *    supporting documentation; 
- * 2. Any color-handling application which displays TekHVC color
- *    cooordinates identifies these as TekHVC color coordinates in any
- *    interface that displays these coordinates and in any associated
- *    documentation;
- * 3. The term "TekHVC" is always used, and is only used, in association
- *    with the mathematical derivations of the TekHVC Color Space,
- *    including those provided in this file and any equivalent pathways and
- *    mathematical derivations, regardless of digital (e.g., floating point
- *    or integer) representation.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *	NAME
- *		TekHVCMxVC.c
- *
- *	DESCRIPTION
- *		Source for the XcmsTekHVCQueryMaxVC() gamut boundary
- *		querying routine.
- *
- */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/*
- *	DEFINES
- */
-#define MIN(x,y) ((x) > (y) ? (y) : (x))
-#define MIN3(x,y,z) ((x) > (MIN((y), (z))) ? (MIN((y), (z))) : (x))
-#define MAX(x,y) ((x) > (y) ? (x) : (y))
-#define MAX3(x,y,z) ((x) > (MAX((y), (z))) ? (x) : (MAX((y), (z))))
-#define START_V	    40.0
-#define START_C	    120.0
-
-/*
- *	EXTERNS
- */
-extern Status _XcmsTekHVC_CheckModify();
-extern Status _XcmsConvertColorsWithWhitePt();
-extern XcmsColorSpace XcmsTekHVCColorSpace;
-
-/*
- *	FORWARD DECLARATIONS
- */
-Status _XcmsTekHVCQueryMaxVCRGB();
-
-
-/************************************************************************
- *									*
- *			 API PRIVATE ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		_XcmsTekHVCQueryMaxVCRGB - Compute maximum value/chroma.
- *
- *	SYNOPSIS
- */
-Status
-_XcmsTekHVCQueryMaxVCRGB(ccc, hue, pColor_return, pRGB_return)
-    XcmsCCC	ccc;
-    XcmsFloat	hue;
-    XcmsColor   *pColor_return;
-    XcmsRGBi    *pRGB_return;
-
-/*
- *	DESCRIPTION
- *		Return the maximum chroma for a specified hue, and the
- *		corresponding value.  This is computed by a binary search of
- *		all possible chromas.  An assumption is made that there are
- *		no local maxima.  Use the unrounded Max Chroma because
- *		the difference check can be small.
- *
- *		NOTE:  No local CCC is used because this is a private
- *		       routine and all routines that call it are expected
- *		       to behave properly, i.e. send a local CCC with
- *		       no white adjust function and no gamut compression
- *		       function.
- *
- *		This routine only accepts hue as input and outputs
- *		HVC's and RGBi's.
- *
- *	RETURNS
- *		XcmsFailure - Failure
- *		XCMS_SUCCUSS - Succeeded
- *
- */ 
-{
-    XcmsFloat nSmall, nLarge;
-    XcmsColor tmp;
-
-    tmp.format = XcmsTekHVCFormat;
-    tmp.spec.TekHVC.H = hue;
-    /*  Use some unreachable color on the given hue */
-    tmp.spec.TekHVC.V = START_V;
-    tmp.spec.TekHVC.C = START_C;
-
-
-    /*
-     * Convert from HVC to RGB
-     *
-     * Note that the CIEXYZ to RGBi conversion routine must stuff the
-     * out of bounds RGBi values in tmp when the ccc->gamutCompProc
-     * is NULL.
-     */
-    if ((_XcmsConvertColorsWithWhitePt(ccc, &tmp,
-	    &ccc->pPerScrnInfo->screenWhitePt, 1, XcmsRGBiFormat, (Bool *) NULL) 
-	    == XcmsFailure) && tmp.format != XcmsRGBiFormat) {
-	return (XcmsFailure);
-    }
-
-    /* Now pick the smallest RGB */
-    nSmall = MIN3(tmp.spec.RGBi.red, 
-		  tmp.spec.RGBi.green, 
-		  tmp.spec.RGBi.blue);
-    /* Make the smallest RGB equal to zero */
-    tmp.spec.RGBi.red   -= nSmall;
-    tmp.spec.RGBi.green -= nSmall;
-    tmp.spec.RGBi.blue  -= nSmall;
-
-    /* Now pick the largest RGB */
-    nLarge = MAX3(tmp.spec.RGBi.red, 
-		  tmp.spec.RGBi.green, 
-		  tmp.spec.RGBi.blue);
-    /* Scale the RGB values based on the largest one */
-    tmp.spec.RGBi.red   /= nLarge;
-    tmp.spec.RGBi.green /= nLarge;
-    tmp.spec.RGBi.blue  /= nLarge;
-    tmp.format = XcmsRGBiFormat;
-
-    /* If the calling routine wants RGB value give them the ones used. */
-    if (pRGB_return) {
-	pRGB_return->red   = tmp.spec.RGBi.red;
-	pRGB_return->green = tmp.spec.RGBi.green;
-	pRGB_return->blue  = tmp.spec.RGBi.blue;
-    }
-
-    /* Convert from RGBi to HVC */
-    if (_XcmsConvertColorsWithWhitePt(ccc, &tmp,
-	    &ccc->pPerScrnInfo->screenWhitePt, 1, XcmsTekHVCFormat, (Bool *) NULL) 
-	    == XcmsFailure) {
-	return (XcmsFailure);
-    }
-
-    /* make sure to return the input hue */
-    tmp.spec.TekHVC.H = hue;
-    memcpy((char *)pColor_return, (char *)&tmp, sizeof(XcmsColor));
-    return (XcmsSuccess);    
-}
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsTekHVCQueryMaxVC - Compute maximum value and chroma.
- *
- *	SYNOPSIS
- */
-Status
-XcmsTekHVCQueryMaxVC (ccc, hue, pColor_return)
-    XcmsCCC ccc;
-    XcmsFloat hue;
-    XcmsColor *pColor_return;
-
-/*
- *	DESCRIPTION
- *		Return the maximum chroma for the specified hue, and the
- *		corresponding value.
- *
- *	ASSUMPTIONS
- *		This routine assumes that the white point associated with
- *		the color specification is the Screen White Point.  The
- *		Screen White Point will also be associated with the
- *		returned color specification.
- *
- *	RETURNS
- *		XcmsFailure - Failure
- *		XcmsSuccess - Succeeded
- *
- */ 
-{
-    XcmsCCCRec myCCC;
-
-    /*
-     * Check Arguments
-     */
-    if (ccc == NULL || pColor_return == NULL) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Insure TekHVC installed
-     */
-    if (XcmsAddColorSpace(&XcmsTekHVCColorSpace) == XcmsFailure) {
-	return(XcmsFailure);
-    }
-    
-    /* Use my own CCC */
-    memcpy ((char *)&myCCC, (char *)ccc, sizeof(XcmsCCCRec));
-    myCCC.clientWhitePt.format = XcmsUndefinedFormat;
-    myCCC.gamutCompProc = (XcmsCompressionProc)NULL;
-
-    while (hue < 0.0) {
-	hue += 360.0;
-    }
-    while (hue >= 360.0) {
-	hue -= 360.0;
-    } 
-    
-    return(_XcmsTekHVCQueryMaxVCRGB (&myCCC, hue, pColor_return,
-	    (XcmsRGBi *)NULL));
-}
diff --git a/xc/lib/X11/HVCMxVs.c b/xc/lib/X11/HVCMxVs.c
deleted file mode 100644
index c32fc63ed..000000000
--- a/xc/lib/X11/HVCMxVs.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/* $XConsortium: HVCMxVs.c,v 1.7 93/09/07 21:31:03 rws Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  TekColor is a
- * trademark of Tektronix, Inc.  The term "TekHVC" designates a particular
- * color space that is the subject of U.S. Patent No. 4,985,853 (equivalent
- * foreign patents pending).  Permission is hereby granted to use, copy,
- * modify, sell, and otherwise distribute this software and its
- * documentation for any purpose and without fee, provided that:
- * 
- * 1. This copyright, permission, and disclaimer notice is reproduced in
- *    all copies of this software and any modification thereof and in
- *    supporting documentation; 
- * 2. Any color-handling application which displays TekHVC color
- *    cooordinates identifies these as TekHVC color coordinates in any
- *    interface that displays these coordinates and in any associated
- *    documentation;
- * 3. The term "TekHVC" is always used, and is only used, in association
- *    with the mathematical derivations of the TekHVC Color Space,
- *    including those provided in this file and any equivalent pathways and
- *    mathematical derivations, regardless of digital (e.g., floating point
- *    or integer) representation.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *	NAME
- *		TekHVCMxVs.c
- *
- *	DESCRIPTION
- *		Source for the XcmsTekHVCQueryMaxVSamples() gamut boundary
- *		querying routine.
- */
-/* $XFree86: xc/lib/X11/HVCMxVs.c,v 1.2 1999/05/09 10:49:33 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/*
- *	EXTERNS
- */
-extern Status _XcmsTekHVCQueryMaxVCRGB();
-extern Status _XcmsTekHVC_CheckModify();
-extern XcmsColorSpace XcmsTekHVCColorSpace;
-
-/* CvColW.c */
-extern Status _XcmsConvertColorsWithWhitePt();
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsTekHVCQueryMaxVSamples - Compute a set of value/chroma
- *						pairs.
- *
- *	SYNOPSIS
- */
-Status
-XcmsTekHVCQueryMaxVSamples(ccc, hue, pColor_in_out, nSamples)
-    XcmsCCC ccc;
-    XcmsFloat hue;
-    XcmsColor *pColor_in_out;
-    unsigned int nSamples;
-
-/*
- *	DESCRIPTION
- *		Return a set of values and chromas for the input Hue.
- *		This routine will take any color as input.  
- *		It returns TekHVC colors.
- *
- *		Since this routine works with the value within
- *		pColor_in_out intermediate results may be returned
- *		even though it may be invalid.
- *
- *	ASSUMPTIONS
- *		This routine assumes that the white point associated with
- *		the color specification is the Screen White Point.  The
- *		Screen White Point will also be associated with the
- *		returned color specification.
- *
- *	RETURNS
- *		XcmsFailure - Failure
- *		XcmsSuccess - Succeeded
- *
- */
-{
-    XcmsCCCRec myCCC;
-    XcmsColor *pHVC;
-    XcmsRGBi rgb_saved;
-    unsigned short nI;
-    XcmsFloat nT;
-
-    /*
-     * Check Arguments
-     */
-    if (ccc == NULL || pColor_in_out == NULL || nSamples == 0) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Insure TekHVC installed
-     */
-    if (XcmsAddColorSpace(&XcmsTekHVCColorSpace) == XcmsFailure) {
-	return(XcmsFailure);
-    }
-
-    /* setup the CCC to use for the conversions. */
-    memcpy ((char *) &myCCC, (char *) ccc, sizeof(XcmsCCCRec));
-    myCCC.clientWhitePt.format = XcmsUndefinedFormat;
-    myCCC.gamutCompProc = (XcmsCompressionProc) NULL;
-
-    /* Step 1: compute the maximum value and chroma for this hue. */
-
-
-    /* save the Hue for use later. */
-    while (hue < 0.0) {
-	hue += 360.0;
-    }
-    while (hue > 360.0) {
-	hue -= 360.0;
-    }
-    pColor_in_out->spec.TekHVC.H = hue;
-    pColor_in_out->format = XcmsTekHVCFormat;
-
-    /* Get the maximum value and chroma point for this hue */
-    if (_XcmsTekHVCQueryMaxVCRGB(&myCCC, pColor_in_out->spec.TekHVC.H,
-	    pColor_in_out, (XcmsRGBi *)&rgb_saved) == XcmsFailure) {
-	return (XcmsFailure);
-    }
-
-    /* Step 2:  Convert each of the RGBi's to HVC's */
-    pHVC = pColor_in_out;
-    for (nI = 0; nI < nSamples; nI++, pHVC++) {
-	nT = (XcmsFloat) nI / (XcmsFloat) nSamples;
-	pHVC->spec.RGBi.red   = rgb_saved.red * (1.0 - nT) + nT;
-	pHVC->spec.RGBi.green = rgb_saved.green * (1.0 - nT) + nT;
-	pHVC->spec.RGBi.blue  = rgb_saved.blue * (1.0 - nT) + nT;
-	pHVC->format          = XcmsRGBiFormat;
-	pHVC->pixel           = pColor_in_out->pixel;
-	/* convert from RGB to HVC */
-	if (_XcmsConvertColorsWithWhitePt(&myCCC, pHVC,
-		&myCCC.pPerScrnInfo->screenWhitePt, 1, XcmsTekHVCFormat,
-		(Bool *) NULL) == XcmsFailure) {
-	    return(XcmsFailure);
-	}
-
-	/* make sure to return the input hue */
-	pHVC->spec.TekHVC.H = hue;
-    }
-
-    return(XcmsSuccess);
-}
diff --git a/xc/lib/X11/HVCWpAj.c b/xc/lib/X11/HVCWpAj.c
deleted file mode 100644
index c93690330..000000000
--- a/xc/lib/X11/HVCWpAj.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/* $XConsortium: HVCWpAj.c,v 1.4 91/05/13 22:48:45 rws Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  TekColor is a
- * trademark of Tektronix, Inc.  The term "TekHVC" designates a particular
- * color space that is the subject of U.S. Patent No. 4,985,853 (equivalent
- * foreign patents pending).  Permission is hereby granted to use, copy,
- * modify, sell, and otherwise distribute this software and its
- * documentation for any purpose and without fee, provided that:
- * 
- * 1. This copyright, permission, and disclaimer notice is reproduced in
- *    all copies of this software and any modification thereof and in
- *    supporting documentation; 
- * 2. Any color-handling application which displays TekHVC color
- *    cooordinates identifies these as TekHVC color coordinates in any
- *    interface that displays these coordinates and in any associated
- *    documentation;
- * 3. The term "TekHVC" is always used, and is only used, in association
- *    with the mathematical derivations of the TekHVC Color Space,
- *    including those provided in this file and any equivalent pathways and
- *    mathematical derivations, regardless of digital (e.g., floating point
- *    or integer) representation.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *	DESCRIPTION
- *		TekHVCWpAj.c
- *
- *	DESCRIPTION
- *		This file contains routine(s) that support white point
- *		adjustment of color specifications in the TekHVC color
- *		space.
- */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/*
- *	EXTERNS
- */
-extern Status _XcmsConvertColorsWithWhitePt();
-extern XcmsColorSpace XcmsTekHVCColorSpace;
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsTekHVCWhiteShiftColors
- *
- *	SYNOPSIS
- */
-Status
-XcmsTekHVCWhiteShiftColors(ccc, pWhitePtFrom, pWhitePtTo, destSpecFmt,
-	pColors_in_out, nColors, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pWhitePtFrom;
-    XcmsColor *pWhitePtTo;
-    XcmsColorFormat destSpecFmt;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-    Bool *pCompressed;
-/*
- *	DESCRIPTION
- *		Convert color specifications in an array of XcmsColor structures
- *		for differences in white points.
- *
- *	RETURNS
- *		XcmsFailure if failed,
- *		XcmsSuccess if succeeded without gamut compression,
- *		XcmsSuccessWithCompression if succeeded with
- *			gamut compression.
- */
-{
-    if (pWhitePtFrom == NULL || pWhitePtTo == NULL || pColors_in_out == NULL) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Insure TekHVC installed
-     */
-    if (XcmsAddColorSpace(&XcmsTekHVCColorSpace) == XcmsFailure) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Convert to TekHVC using pWhitePtFrom
-     *    We can ignore return value for compression because we are converting
-     *    to XcmsTekHVCFormat which is device-independent, not device-dependent.
-     */
-    if (_XcmsConvertColorsWithWhitePt(ccc, pColors_in_out, pWhitePtFrom,
-	    nColors, XcmsTekHVCFormat, pCompressed) == XcmsFailure) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Convert from TekHVC to destSpecFmt using pWhitePtTo
-     */
-    return(_XcmsConvertColorsWithWhitePt(ccc, pColors_in_out, pWhitePtTo,
-	    nColors, destSpecFmt, pCompressed));
-}
diff --git a/xc/lib/X11/Host.c b/xc/lib/X11/Host.c
deleted file mode 100644
index 0ff29a35e..000000000
--- a/xc/lib/X11/Host.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* $TOG: Host.c /main/8 1998/02/06 17:30:43 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/Host.c,v 1.2 1999/05/09 10:49:33 dawes Exp $ */
-
-/* this might be rightly reguarded an os dependent file */
-
-#include "Xlibint.h"
-
-int
-XAddHost (dpy, host)
-    register Display *dpy;
-    XHostAddress *host;
-    {
-    register xChangeHostsReq *req;
-    register int length = (host->length + 3) & ~0x3;	/* round up */
-
-    LockDisplay(dpy);
-    GetReqExtra (ChangeHosts, length, req);
-    req->mode = HostInsert;
-    req->hostFamily = host->family;
-    req->hostLength = host->length;
-    memcpy((char *) NEXTPTR(req,xChangeHostsReq), host->address, host->length);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-    }
-
-int
-XRemoveHost (dpy, host)
-    register Display *dpy;
-    XHostAddress *host;
-    {
-    register xChangeHostsReq *req;
-    register int length = (host->length + 3) & ~0x3;	/* round up */
-
-    LockDisplay(dpy);
-    GetReqExtra (ChangeHosts, length, req);
-    req->mode = HostDelete;
-    req->hostFamily = host->family;
-    req->hostLength = host->length;
-    memcpy((char *) NEXTPTR(req,xChangeHostsReq), host->address, host->length);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-    }
-
-int
-XAddHosts (dpy, hosts, n)
-    register Display *dpy;
-    XHostAddress *hosts;
-    int n;
-{
-    register int i;
-    for (i = 0; i < n; i++) {
-	(void) XAddHost(dpy, &hosts[i]);
-      }
-    return 1;
-}
-
-int
-XRemoveHosts (dpy, hosts, n)
-    register Display *dpy;
-    XHostAddress *hosts;
-    int n;
-{
-    register int i;
-    for (i = 0; i < n; i++) {
-	(void) XRemoveHost(dpy, &hosts[i]);
-      }
-    return 1;
-}
diff --git a/xc/lib/X11/ICWrap.c b/xc/lib/X11/ICWrap.c
deleted file mode 100644
index 32df984cb..000000000
--- a/xc/lib/X11/ICWrap.c
+++ /dev/null
@@ -1,471 +0,0 @@
-/*
- * $TOG: ICWrap.c /main/10 1998/02/06 17:32:58 kaleb $
- */
-
-/*
- * Copyright 1990, 1991 by OMRON Corporation, NTT Software Corporation,
- *                      and Nippon Telegraph and Telephone Corporation
- * Copyright 1991 by the Open Software Foundation
- * Copyright 1993 by the FUJITSU LIMITED
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the names of OMRON, NTT Software, NTT, and
- * Open Software Foundation not be used in advertising or publicity 
- * pertaining to distribution of the software without specific, 
- * written prior permission. OMRON, NTT Software, NTT, and Open Software
- * Foundation make no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without express or
- * implied warranty.
- *
- * OMRON, NTT SOFTWARE, NTT, AND OPEN SOFTWARE FOUNDATION 
- * DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT 
- * SHALL OMRON, NTT SOFTWARE, NTT, OR OPEN SOFTWARE FOUNDATION BE
- * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- * 
- *	Authors: Li Yuhong		OMRON Corporation
- *		 Tatsuya Kato		NTT Software Corporation
- *		 Hiroshi Kuribayashi	OMRON Coproration
- *		 Muneiyoshi Suzuki	Nippon Telegraph and Telephone Co.
- * 
- *		 M. Collins		OSF  
- *		 Takashi Fujiwara	FUJITSU LIMITED
- */				
-/*
-
-Copyright 1991, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-#define NEED_EVENTS
-#include "Xlibint.h"
-#include "Xlcint.h"
-
-static int
-_XIMNestedListToNestedList(nlist, list)
-    XIMArg *nlist;   /* This is the new list */
-    XIMArg *list;    /* The original list */
-{
-    register XIMArg *ptr = list;
-
-    while (ptr->name) {
-	if (!strcmp(ptr->name, XNVaNestedList)) {
-	    nlist += _XIMNestedListToNestedList(nlist, (XIMArg *)ptr->value);
-	} else {
-	    nlist->name = ptr->name;
-	    nlist->value = ptr->value;
-	    ptr++;
-	    nlist++;
-	}
-    }
-    return ptr - list;
-}
-
-static void
-_XIMCountNestedList(args, total_count)
-    XIMArg *args;
-    int *total_count;
-{
-    for (; args->name; args++) {
-	if (!strcmp(args->name, XNVaNestedList))
-	    _XIMCountNestedList((XIMArg *)args->value, total_count);
-	else
-	    ++(*total_count);
-    }
-}
-
-#if NeedVarargsPrototypes
-static void
-_XIMCountVaList(va_list var, int *total_count)
-#else
-static void
-_XIMCountVaList(var, total_count)
-    va_list var;
-    int *total_count;
-#endif
-{
-    char *attr;
-
-    *total_count = 0;
-
-    for (attr = va_arg(var, char*); attr; attr = va_arg(var, char*)) {
-	if (!strcmp(attr, XNVaNestedList)) {
-	    _XIMCountNestedList(va_arg(var, XIMArg*), total_count);
-	} else {
-	    va_arg(var, XIMArg*);
-	    ++(*total_count);
-	}
-    }
-}
-
-#if NeedVarargsPrototypes
-static void
-_XIMVaToNestedList(va_list var, int max_count, XIMArg **args_return)
-#else
-static void
-_XIMVaToNestedList(var, max_count, args_return)
-    va_list var;
-    int max_count;
-    XIMArg **args_return;
-#endif
-{
-    XIMArg *args;
-    char   *attr;
-
-    if (max_count <= 0) {
-	*args_return = (XIMArg *)NULL;
-	return;
-    }
-
-    args = (XIMArg *)Xmalloc((unsigned)(max_count + 1) * sizeof(XIMArg));
-    *args_return = args;
-    if (!args) return;
-
-    for (attr = va_arg(var, char*); attr; attr = va_arg(var, char*)) {
-	if (!strcmp(attr, XNVaNestedList)) {
-	    args += _XIMNestedListToNestedList(args, va_arg(var, XIMArg*));
-	} else {
-	    args->name = attr;
-	    args->value = va_arg(var, XPointer);
-	    args++;
-	}
-    }
-    args->name = (char*)NULL;
-}
-
-/*ARGSUSED*/
-#if NeedVarargsPrototypes
-XVaNestedList
-XVaCreateNestedList(int dummy, ...)
-#else
-XVaNestedList
-XVaCreateNestedList(dummy, va_alist)
-    int dummy;
-    va_dcl
-#endif
-{
-    va_list		var;
-    XIMArg		*args = NULL;
-    int			total_count;
-
-    Va_start(var, dummy);
-    _XIMCountVaList(var, &total_count);
-    va_end(var);
-
-    Va_start(var, dummy);
-    _XIMVaToNestedList(var, total_count, &args);
-    va_end(var);
-
-    return (XVaNestedList)args;
-}
-
-#if NeedVarargsPrototypes
-char *
-XSetIMValues(XIM im, ...)
-#else				/* NeedVarargsPrototypes */
-char *
-XSetIMValues(im, va_alist)
-    XIM im;
-    va_dcl
-#endif				/* NeedVarargsPrototypes */
-{
-    va_list var;
-    int     total_count;
-    XIMArg *args;
-    char   *ret;
-
-    /*
-     * so count the stuff dangling here
-     */
-    Va_start(var, im);
-    _XIMCountVaList(var, &total_count);
-    va_end(var);
-
-    /*
-     * now package it up so we can send it along
-     */
-    Va_start(var, im);
-    _XIMVaToNestedList(var, total_count, &args);
-    va_end(var);
-
-    ret = (*im->methods->set_values) (im, args);
-    if (args) Xfree((char *)args);
-    return ret;
-}
-
-#if NeedVarargsPrototypes
-char *
-XGetIMValues(XIM im, ...)
-#else				/* NeedVarargsPrototypes */
-char *
-XGetIMValues(im, va_alist)
-    XIM im;
-    va_dcl
-#endif				/* NeedVarargsPrototypes */
-{
-    va_list var;
-    int     total_count;
-    XIMArg *args;
-    char   *ret;
-
-    /*
-     * so count the stuff dangling here
-     */
-    Va_start(var, im);
-    _XIMCountVaList(var, &total_count);
-    va_end(var);
-
-    /*
-     * now package it up so we can send it along
-     */
-    Va_start(var, im);
-    _XIMVaToNestedList(var, total_count, &args);
-    va_end(var);
-
-    ret = (*im->methods->get_values) (im, args);
-    if (args) Xfree((char *)args);
-    return ret;
-}
-
-/*
- * Create an input context within the input method, 
- * and return a pointer to the input context.
- */
-
-#if NeedVarargsPrototypes
-XIC
-XCreateIC(XIM im, ...)
-#else
-XIC
-XCreateIC(im, va_alist)
-    XIM im;		/* specified the attached input method */
-    va_dcl		/* specified variable length argment list */
-#endif
-{
-    va_list var;
-    int     total_count;
-    XIMArg *args;
-    XIC     ic;
-  
-    /*
-     * so count the stuff dangling here
-     */
-    Va_start(var, im);
-    _XIMCountVaList(var, &total_count);
-    va_end(var);
-
-    /*
-     * now package it up so we can send it along
-     */
-    Va_start(var, im);
-    _XIMVaToNestedList(var, total_count, &args);
-    va_end(var);
-
-    ic = (XIC) (*im->methods->create_ic) (im, args);
-    if (args) Xfree((char *)args);
-    if (ic) {
-	ic->core.next = im->core.ic_chain;
-	im->core.ic_chain = ic;
-    }
-    return ic;
-}
-
-/*
- * Free the input context.
- */
-void
-XDestroyIC(ic)
-    XIC ic;
-{
-    XIM im = ic->core.im;
-    XIC *prev;
-
-    (*ic->methods->destroy) (ic);
-    if (im) {
-	for (prev = &im->core.ic_chain; *prev; prev = &(*prev)->core.next) {
-	    if (*prev == ic) {
-		*prev = ic->core.next;
-		break;
-	    }
-	}
-    }
-    Xfree ((char *) ic);
-}
-
-#if NeedVarargsPrototypes
-char *
-XGetICValues(XIC ic, ...)
-#else
-char *
-XGetICValues(ic, va_alist)
-    XIC ic;
-    va_dcl
-#endif
-{ 
-    va_list var;
-    int     total_count;
-    XIMArg *args;
-    char   *ret;
-
-    if (!ic->core.im)
-	return (char *) NULL;
-
-    /*
-     * so count the stuff dangling here
-     */
-    Va_start(var, ic);
-    _XIMCountVaList(var, &total_count);
-    va_end(var);
-
-    /*
-     * now package it up so we can send it along
-     */
-    Va_start(var, ic);
-    _XIMVaToNestedList(var, total_count, &args);
-    va_end(var);
-
-    ret = (*ic->methods->get_values) (ic, args);
-    if (args) Xfree((char *)args);
-    return ret;
-}
-
-#if NeedVarargsPrototypes
-char *
-XSetICValues(XIC ic, ...)
-#else
-char *
-XSetICValues(ic, va_alist)
-    XIC ic;
-    va_dcl
-#endif
-{
-    va_list var;
-    int     total_count;
-    XIMArg *args;
-    char   *ret;
-
-    if (!ic->core.im)
-	return (char *) NULL;
-
-    /*
-     * so count the stuff dangling here
-     */
-    Va_start(var, ic);
-    _XIMCountVaList(var, &total_count);
-    va_end(var);
-
-    /*
-     * now package it up so we can send it along
-     */
-    Va_start(var, ic);
-    _XIMVaToNestedList(var, total_count, &args);
-    va_end(var);
-
-    ret = (*ic->methods->set_values) (ic, args);
-    if (args) Xfree((char *)args);
-    return ret;
-}
-
-/*
- * Require the input manager to focus the focus window attached to the ic
- * argument.
- */
-void
-XSetICFocus(ic)
-    XIC ic;
-{
-  if (ic->core.im)
-      (*ic->methods->set_focus) (ic);
-}
-
-/*
- * Require the input manager to unfocus the focus window attached to the ic
- * argument.
- */
-void
-XUnsetICFocus(ic)
-    XIC ic;
-{
-  if (ic->core.im)
-      (*ic->methods->unset_focus) (ic);
-}
-
-/*
- * Return the XIM associated with the input context.
- */
-XIM
-XIMOfIC(ic)
-    XIC ic;
-{
-    return ic->core.im;
-}
-
-char *XmbResetIC(ic)
-    XIC ic;
-{
-    if (ic->core.im)
-	return (*ic->methods->mb_reset)(ic);
-    return (char *)NULL;
-}
-
-wchar_t *XwcResetIC(ic)
-    XIC ic;
-{
-    if (ic->core.im)
-	return (*ic->methods->wc_reset)(ic);
-    return (wchar_t *)NULL;
-}
-
-int
-XmbLookupString(ic, ev, buffer, nbytes, keysym, status)
-    XIC ic;
-    register XKeyEvent *ev;
-    char *buffer;
-    int nbytes;
-    KeySym *keysym;
-    Status *status;
-{
-    if (ic->core.im)
-	return (*ic->methods->mb_lookup_string) (ic, ev, buffer, nbytes,
-						 keysym, status);
-    return XLookupNone;
-}
-
-int
-XwcLookupString(ic, ev, buffer, nchars, keysym, status)
-    XIC ic;
-    register XKeyEvent *ev;
-    wchar_t *buffer;
-    int nchars;
-    KeySym *keysym;
-    Status *status;
-{
-    if (ic->core.im)
-	return (*ic->methods->wc_lookup_string) (ic, ev, buffer, nchars,
-						 keysym, status);
-    return XLookupNone;
-}
diff --git a/xc/lib/X11/IMWrap.c b/xc/lib/X11/IMWrap.c
deleted file mode 100644
index 17562c22f..000000000
--- a/xc/lib/X11/IMWrap.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * $TOG: IMWrap.c /main/14 1998/02/06 17:37:48 kaleb $
- */
-
-/*
- * Copyright 1991 by the Open Software Foundation
- * Copyright 1993, 1994 by the Sony Corporation
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the names of Open Software Foundation and
- * Sony Corporation not be used in advertising or publicity pertaining to 
- * distribution of the software without specific, written prior permission.  
- * Open Software Foundation and Sony Corporation make no 
- * representations about the suitability of this software for any purpose.  
- * It is provided "as is" without express or implied warranty.
- *
- * OPEN SOFTWARE FOUNDATION AND SONY CORPORATION DISCLAIM ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL OPEN
- * SOFTWARE FOUNDATIONN OR SONY CORPORATION BE LIABLE FOR ANY SPECIAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE. 
- * 
- *		 M. Collins		OSF  
- *               Makoto Wakamatsu       Sony Corporation
- */				
-/*
-
-Copyright 1991, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-/* $XFree86: xc/lib/X11/IMWrap.c,v 3.6 1998/12/20 11:56:55 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xlcint.h"
-
-/*
- * Compile the resource name. (resource_name ---> xrm_name)
- */
-void
-_XIMCompileResourceList(res, num_res)
-    register XIMResourceList res;
-    unsigned int num_res;
-{
-    register unsigned int count;
-
-    for (count = 0; count < num_res; res++, count++) {
-	res->xrm_name = XrmStringToQuark(res->resource_name);
-    }
-}
-
-void
-_XCopyToArg(src, dst, size)
-    XPointer src;
-    XPointer *dst;
-    register unsigned int size;
-{
-    if (!*dst) {
-	union {
-	    long	longval;
-#ifdef LONG64
-	    int		intval;
-#endif
-	    short	shortval;
-	    char	charval;
-	    char*	charptr;
-	    XPointer	ptr;
-	} u;
-	if (size <= sizeof(XPointer)) {
-	    memcpy((char *)&u, (char *)src, (int)size);
-	    if (size == sizeof(long))	       *dst = (XPointer)u.longval;
-#ifdef LONG64
-	    else if (size == sizeof(int))      *dst = (XPointer)(long)u.intval;
-#endif
-	    else if (size == sizeof(short))    *dst = (XPointer)(long)u.shortval;
-	    else if (size == sizeof(char))     *dst = (XPointer)(long)u.charval;
-	    else if (size == sizeof(char*))    *dst = (XPointer)u.charptr;
-	    else if (size == sizeof(XPointer)) *dst = (XPointer)u.ptr;
-	    else memcpy( (char*)dst, (char*)src, (int)size );
-	} else {
-	    memcpy( (char*)dst, (char*)src, (int)size );
-	}
-    } else {
-	memcpy( (char*)*dst, (char*)src, (int)size );
-    }
-}
-
-/*
- * Connects to an input method matching current locale specification, creates
- * a XIM object and return a pointer the newly created XIM back to the caller.
- */
-
-XIM 
-XOpenIM( display, rdb, res_name, res_class )
-    Display	*display;
-    XrmDatabase	 rdb;
-    char	*res_name;
-    char	*res_class;
-{
-    XLCd	lcd = _XOpenLC( (char *)NULL );
-
-    if( !lcd )
-	return( (XIM)NULL );
-    return (*lcd->methods->open_im) (lcd, display, rdb, res_name, res_class);
-}
-
-/*
- * Close the connection to the input manager, and free the XIM structure
- */
-Status
-XCloseIM(im)
-    XIM im;
-{
-    Status s;
-    XIC ic;
-    XLCd lcd = im->core.lcd;
-  
-    s = (im->methods->close) (im);
-    for (ic = im->core.ic_chain; ic; ic = ic->core.next)
-	ic->core.im = (XIM)NULL;
-    Xfree ((char *) im);
-    _XCloseLC (lcd);
-    return (s);
-}
-
-/*
- * Return the Display associated with the input method.
- */
-Display *
-XDisplayOfIM(im)
-    XIM im;
-{
-    return im->core.display;
-}
-
-/*
- * Return the Locale associated with the input method.
- */
-char *
-XLocaleOfIM(im)
-    XIM im;
-{
-    return im->core.lcd->core->name;
-}
-
-/*
- * Register to a input method instantiation callback to prepare the
- * on-demand input method instantiation.
- */
-Bool
-#if NeedFunctionPrototypes
-XRegisterIMInstantiateCallback(
-    Display	*display,
-    XrmDatabase	 rdb,
-    char	*res_name,
-    char	*res_class,
-    XIDProc	 callback,
-    XPointer	 client_data)
-#else
-XRegisterIMInstantiateCallback( display, rdb, res_name, res_class, callback,
-				client_data)
-    Display	*display;
-    XrmDatabase	 rdb;
-    char	*res_name;
-    char	*res_class;
-    XIDProc	 callback;
-    XPointer	 client_data;
-#endif
-{
-    XLCd	lcd = _XOpenLC( (char *)NULL );
-
-    if( !lcd )
-	return( False );
-    return( (*lcd->methods->register_callback)( lcd, display, rdb, res_name,
-						res_class, callback,
-						client_data ) );
-}
-
-/*
- * Unregister to a input method instantiation callback.
- */
-Bool
-#if NeedFunctionPrototypes
-XUnregisterIMInstantiateCallback(
-    Display	*display,
-    XrmDatabase	 rdb,
-    char	*res_name,
-    char	*res_class,
-    XIDProc	 callback,
-    XPointer	 client_data)
-#else
-XUnregisterIMInstantiateCallback( display, rdb, res_name, res_class, callback,
-				  client_data )
-    Display	*display;
-    XrmDatabase	 rdb;
-    char	*res_name;
-    char	*res_class;
-    XIDProc	 callback;
-    XPointer	 client_data;
-#endif
-{
-    XLCd	lcd = _XlcCurrentLC();
-
-    if( !lcd )
-	return( False );
-    if( lcd->methods->unregister_callback == NULL )
-	return( False );
-    return( (*lcd->methods->unregister_callback)( lcd, display, rdb, res_name,
-						  res_class, callback,
-						  client_data ) );
-}
-
diff --git a/xc/lib/X11/Iconify.c b/xc/lib/X11/Iconify.c
deleted file mode 100644
index 00b2abfb5..000000000
--- a/xc/lib/X11/Iconify.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* $TOG: Iconify.c /main/9 1998/02/06 17:32:48 kaleb $ */
-
-/***********************************************************
-Copyright 1988 by Wyse Technology, Inc., San Jose, Ca.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name Wyse not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-WYSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-/*
-
-Copyright 1988, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-#define NEED_EVENTS
-#include <X11/Xlibint.h>
-#include <X11/Xatom.h>
-#include <X11/Xos.h>
-#include <X11/Xutil.h>
-#include <stdio.h>
-
-/*
- * This function instructs the window manager to change this window from
- * NormalState to IconicState.
- */
-Status XIconifyWindow (dpy, w, screen)
-    Display *dpy;
-    Window w;
-    int screen;
-{
-    XClientMessageEvent ev;
-    Window root = RootWindow (dpy, screen);
-    Atom prop;
-
-    prop = XInternAtom (dpy, "WM_CHANGE_STATE", False);
-    if (prop == None) return False;
-
-    ev.type = ClientMessage;
-    ev.window = w;
-    ev.message_type = prop;
-    ev.format = 32;
-    ev.data.l[0] = IconicState;
-    return (XSendEvent (dpy, root, False,
-			SubstructureRedirectMask|SubstructureNotifyMask,
-			(XEvent *)&ev));
-}
diff --git a/xc/lib/X11/IdOfPr.c b/xc/lib/X11/IdOfPr.c
deleted file mode 100644
index 1d1b3cb30..000000000
--- a/xc/lib/X11/IdOfPr.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/* $XConsortium: IdOfPr.c,v 1.6 91/11/06 16:45:23 rws Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		XcmsIdOfPr.c
- *
- *	DESCRIPTION
- *		Source for XcmsFormatOfPrefix()
- *
- *
- */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/*
- *      EXTERNS
- */
-extern XcmsColorSpace **_XcmsDIColorSpaces;
-extern XcmsColorSpace **_XcmsDDColorSpaces;
-void _XcmsCopyISOLatin1Lowered();
-
-
-/*
- *	NAME
- *		XcmsFormatOfPrefix
- *
- *	SYNOPSIS
- */
-XcmsColorFormat
-XcmsFormatOfPrefix(prefix)
-    char *prefix;
-/*
- *	DESCRIPTION
- *		Returns the Color Space ID for the specified prefix
- *		if the color space is found in the Color Conversion
- *		Context.
- *
- *	RETURNS
- *		Color Space ID if found; zero otherwise.
- */
-{
-    XcmsColorSpace	**papColorSpaces;
-    char		string_buf[64];
-    char		*string_lowered;
-    int			len;
-
-    /*
-     * While copying prefix to string_lowered, convert to lowercase
-     */
-    if ((len = strlen(prefix)) >= sizeof(string_buf)) {
-	string_lowered = (char *) Xmalloc(len+1);
-    } else {
-	string_lowered = string_buf;
-    }
-    _XcmsCopyISOLatin1Lowered(string_lowered, prefix);
-
-    /*
-     * First try Device-Independent color spaces
-     */
-    papColorSpaces = _XcmsDIColorSpaces;
-    if (papColorSpaces != NULL) {
-	while (*papColorSpaces != NULL) {
-	    if (strcmp((*papColorSpaces)->prefix, string_lowered) == 0) {
-		if (len >= sizeof(string_buf)) Xfree(string_lowered);
-		return((*papColorSpaces)->id);
-	    }
-	    papColorSpaces++;
-	}
-    }
-
-    /*
-     * Next try Device-Dependent color spaces
-     */
-    papColorSpaces = _XcmsDDColorSpaces;
-    if (papColorSpaces != NULL) {
-	while (*papColorSpaces != NULL) {
-	    if (strcmp((*papColorSpaces)->prefix, string_lowered) == 0) {
-		if (len >= sizeof(string_buf)) Xfree(string_lowered);
-		return((*papColorSpaces)->id);
-	    }
-	    papColorSpaces++;
-	}
-    }
-
-    if (len >= sizeof(string_buf)) Xfree(string_lowered);
-    return(XcmsUndefinedFormat);
-}
diff --git a/xc/lib/X11/IfEvent.c b/xc/lib/X11/IfEvent.c
deleted file mode 100644
index 096558bd7..000000000
--- a/xc/lib/X11/IfEvent.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* $TOG: IfEvent.c /main/9 1998/02/06 17:33:19 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/IfEvent.c,v 1.2 1999/05/09 10:49:35 dawes Exp $ */
-
-#define NEED_EVENTS
-#include "Xlibint.h"
-
-/* 
- * Flush output and (wait for and) return the next event matching the
- * predicate in the queue.
- */
-
-int
-XIfEvent (dpy, event, predicate, arg)
-	register Display *dpy;
-	Bool (*predicate)(
-#if NeedNestedPrototypes
-			  Display*			/* display */,
-			  XEvent*			/* event */,
-			  char*				/* arg */
-#endif
-			  );		/* function to call */
-	register XEvent *event;
-	char *arg;
-{
-	register _XQEvent *qelt, *prev;
-	unsigned long qe_serial = 0;
-	
-        LockDisplay(dpy);
-	prev = NULL;
-	while (1) {
-	    for (qelt = prev ? prev->next : dpy->head;
-		 qelt;
-		 prev = qelt, qelt = qelt->next) {
-		if(qelt->qserial_num > qe_serial
-		   && (*predicate)(dpy, &qelt->event, arg)) {
-		    *event = qelt->event;
-		    _XDeq(dpy, prev, qelt);
-		    UnlockDisplay(dpy);
-		    return 0;
-		}
-	    }
-	    if (prev)
-		qe_serial = prev->qserial_num;
-	    _XReadEvents(dpy);
-	    if (prev && prev->qserial_num != qe_serial)
-		/* another thread has snatched this event */
-		prev = NULL;
-	}
-}
diff --git a/xc/lib/X11/ImText.c b/xc/lib/X11/ImText.c
deleted file mode 100644
index 48274986e..000000000
--- a/xc/lib/X11/ImText.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* $TOG: ImText.c /main/12 1998/02/06 17:36:40 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/ImText.c,v 1.2 1999/05/09 10:49:36 dawes Exp $ */
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-int
-#if NeedFunctionPrototypes
-XDrawImageString(
-    register Display *dpy,
-    Drawable d,
-    GC gc,
-    int x,
-    int y,
-    _Xconst char *string,
-    int length)
-#else
-XDrawImageString(dpy, d, gc, x, y, string, length)
-    register Display *dpy;
-    Drawable d;
-    GC gc;
-    int x, y;
-    char *string;
-    int length;
-#endif
-{   
-    register xImageText8Req *req;
-    char *CharacterOffset = (char *)string;
-    int FirstTimeThrough = True;
-    int lastX = 0;
-
-    LockDisplay(dpy);
-    FlushGC(dpy, gc);
-
-    while (length > 0) 
-    {
-	int Unit;
-
-	if (length > 255) Unit = 255;
-	else Unit = length;
-
-   	if (FirstTimeThrough)
-	{
-	    FirstTimeThrough = False;
-        }
-	else
-	{
-	    char buf[512];
-	    char *ptr, *str;
-	    xQueryTextExtentsReq *qreq;
-	    xQueryTextExtentsReply rep;
-	    int i;
-
-	    GetReq(QueryTextExtents, qreq);
-	    qreq->fid = gc->gid;
-	    qreq->length += (510 + 3)>>2;
-	    qreq->oddLength = 1;
-	    str = CharacterOffset - 255;
-	    for (ptr = buf, i = 255; --i >= 0; ) {
-		*ptr++ = 0;
-		*ptr++ = *str++;
-	    }
-	    Data (dpy, buf, 510);
-	    if (!_XReply (dpy, (xReply *)&rep, 0, xTrue))
-		break;
-
-	    x = lastX + cvtINT32toInt (rep.overallWidth);
-	}
-
-        GetReq (ImageText8, req);
-        req->length += (Unit + 3) >> 2;
-        req->nChars = Unit;
-        req->drawable = d;
-        req->gc = gc->gid;
-        req->y = y;
-
-	lastX = req->x = x;
-        Data (dpy, CharacterOffset, (long)Unit);
-        CharacterOffset += Unit;
-	length -= Unit;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 0;
-}
-
diff --git a/xc/lib/X11/ImText16.c b/xc/lib/X11/ImText16.c
deleted file mode 100644
index 7bce69a9c..000000000
--- a/xc/lib/X11/ImText16.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* $TOG: ImText16.c /main/12 1998/02/06 17:36:32 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/ImText16.c,v 1.2 1999/05/09 10:49:36 dawes Exp $ */
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-int
-#if NeedFunctionPrototypes
-XDrawImageString16(
-    register Display *dpy,
-    Drawable d,
-    GC gc,
-    int x,
-    int y,
-    _Xconst XChar2b *string,
-    int length)
-#else
-XDrawImageString16(dpy, d, gc, x, y, string, length)
-    register Display *dpy;
-    Drawable d;
-    GC gc;
-    int x, y;
-    XChar2b *string;
-    int length;
-#endif
-{   
-    register xImageText16Req *req;
-    XChar2b *CharacterOffset = (XChar2b *)string;
-    int FirstTimeThrough = True;
-    int lastX = 0;
-
-    LockDisplay(dpy);
-    FlushGC(dpy, gc);
-
-    while (length > 0) 
-    {
-	int Unit, Datalength;
-
-	if (length > 255) Unit = 255;
-	else Unit = length;
-
-   	if (FirstTimeThrough)
-	{
-	    FirstTimeThrough = False;
-        }
-	else
-	{
-	    char buf[512];
-	    xQueryTextExtentsReq *qreq;
-	    xQueryTextExtentsReply rep;
-	    unsigned char *ptr;
-	    XChar2b *str;
-	    int i;
-
-	    GetReq(QueryTextExtents, qreq);
-	    qreq->fid = gc->gid;
-	    qreq->length += (510 + 3)>>2;
-	    qreq->oddLength = 1;
-	    str = CharacterOffset - 255;
-	    for (ptr = (unsigned char *)buf, i = 255; --i >= 0; str++) {
-		*ptr++ = str->byte1;
-		*ptr++ = str->byte2;
-	    }
-	    Data (dpy, buf, 510);
-	    if (!_XReply (dpy, (xReply *)&rep, 0, xTrue))
-		break;
-
-	    x = lastX + cvtINT32toInt (rep.overallWidth);
-	}
-
-        GetReq (ImageText16, req);
-        req->length += ((Unit << 1) + 3) >> 2;
-        req->nChars = Unit;
-        req->drawable = d;
-        req->gc = gc->gid;
-        req->y = y;
-
-	lastX = req->x = x;
-	Datalength = Unit << 1;
-        Data (dpy, (char *)CharacterOffset, (long)Datalength);
-        CharacterOffset += Unit;
-	length -= Unit;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 0;
-}
-
diff --git a/xc/lib/X11/ImUtil.c b/xc/lib/X11/ImUtil.c
deleted file mode 100644
index 8c6b10745..000000000
--- a/xc/lib/X11/ImUtil.c
+++ /dev/null
@@ -1,1023 +0,0 @@
-/* $TOG: ImUtil.c /main/48 1998/02/06 17:37:38 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/ImUtil.c,v 3.5 1999/05/09 10:49:36 dawes Exp $ */
-
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
-#include <stdio.h>
-
-/* PutImage.c */
-extern int _XReverse_Bytes();
-
-#ifdef __STDC__
-#define Const const
-#else
-#define Const /**/
-#endif
-
-#if NeedFunctionPrototypes
-static int _XDestroyImage(XImage *);
-static unsigned long _XGetPixel(XImage *, int, int);
-static unsigned long _XGetPixel1(XImage *, int, int);
-static unsigned long _XGetPixel8(XImage *, int, int);
-static unsigned long _XGetPixel16(XImage *, int, int);
-static unsigned long _XGetPixel32(XImage *, int, int);
-static int _XPutPixel(XImage *, int, int, unsigned long);
-static int _XPutPixel1(XImage *, int, int, unsigned long);
-static int _XPutPixel8(XImage *, int, int, unsigned long);
-static int _XPutPixel16(XImage *, int, int, unsigned long);
-static int _XPutPixel32(XImage *, int, int, unsigned long);
-static XImage *_XSubImage(XImage *, int, int, unsigned int, unsigned int);
-static int _XAddPixel(XImage *, long);
-#endif
-
-static unsigned char Const _lomask[0x09] = { 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff };
-static unsigned char Const _himask[0x09] = { 0xff, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0x80, 0x00 };
-
-/* These two convenience routines return the scanline_pad and bits_per_pixel 
-	associated with a specific depth of ZPixmap format image for a 
-	display. */
-
-int
-_XGetScanlinePad(dpy, depth)
- Display *dpy;
- int depth;
- {
- 	register ScreenFormat *fmt = dpy->pixmap_format;
- 	register int i;
- 
- 	for (i = dpy->nformats + 1; --i; ++fmt)
- 		if (fmt->depth == depth)
- 			return(fmt->scanline_pad);
- 
- 	return(dpy->bitmap_pad);
- }
- 
-int
-_XGetBitsPerPixel(dpy, depth)
- Display *dpy;
- int depth;
- {
- 	register ScreenFormat *fmt = dpy->pixmap_format;
- 	register int i;
- 
- 	for (i = dpy->nformats + 1; --i; ++fmt)
- 		if (fmt->depth == depth)
- 			return(fmt->bits_per_pixel);
-	if (depth <= 4)
-	    return 4;
-	if (depth <= 8)
-	    return 8;
-	if (depth <= 16)
-	    return 16;
-	return 32;
- }
- 
-
-/*
- * This module provides rudimentary manipulation routines for image data
- * structures.  The functions provided are:
- *
- *	XCreateImage	Creates a default XImage data structure
- *	_XDestroyImage	Deletes an XImage data structure
- *	_XGetPixel	Reads a pixel from an image data structure
- *	_XGetPixel32	Reads a pixel from a 32-bit Z image data structure
- *	_XGetPixel16	Reads a pixel from a 16-bit Z image data structure
- *	_XGetPixel8	Reads a pixel from an 8-bit Z image data structure
- *	_XGetPixel1	Reads a pixel from an 1-bit image data structure
- *	_XPutPixel	Writes a pixel into an image data structure
- *	_XPutPixel32	Writes a pixel into a 32-bit Z image data structure
- *	_XPutPixel16	Writes a pixel into a 16-bit Z image data structure
- *	_XPutPixel8	Writes a pixel into an 8-bit Z image data structure
- *	_XPutPixel1	Writes a pixel into an 1-bit image data structure
- *	_XSubImage	Clones a new (sub)image from an existing one
- *	_XSetImage	Writes an image data pattern into another image
- *	_XAddPixel	Adds a constant value to every pixel in an image
- *
- * The logic contained in these routines makes several assumptions about
- * the image data structures, and at least for current implementations
- * these assumptions are believed to be true.  They are: 
- *
- *	For all formats, bits_per_pixel is less than or equal to 32.
- *	For XY formats, bitmap_unit is always less than or equal to bitmap_pad.
- *	For XY formats, bitmap_unit is 8, 16, or 32 bits.
- *	For Z format, bits_per_pixel is 1, 4, 8, 16, 24, or 32 bits.
- */
-static void _xynormalizeimagebits (bp, img)
-    register unsigned char *bp;
-    register XImage *img;
-{
-	register unsigned char c;
-
-	if (img->byte_order != img->bitmap_bit_order) {
-	    switch (img->bitmap_unit) {
-
-		case 16:
-		    c = *bp;
-		    *bp = *(bp + 1);
-		    *(bp + 1) = c;
-		    break;
-
-		case 32:
-		    c = *(bp + 3);
-		    *(bp + 3) = *bp;
-		    *bp = c;
-		    c = *(bp + 2);
-		    *(bp + 2) = *(bp + 1);
-		    *(bp + 1) = c;
-		    break;
-	    }
-	}
-	if (img->bitmap_bit_order == MSBFirst)
-	    _XReverse_Bytes (bp, img->bitmap_unit >> 3);
-}
-
-static void _znormalizeimagebits (bp, img)
-    register unsigned char *bp;
-    register XImage *img;
-{
-	register unsigned char c;
-	switch (img->bits_per_pixel) {
-
-	    case 4:
-		*bp = ((*bp >> 4) & 0xF) | ((*bp << 4) & ~0xF);
-		break;
-
-	    case 16:
-		c = *bp;
-		*bp = *(bp + 1);
-		*(bp + 1) = c;
-		break;
-
-	    case 24:
-		c = *(bp + 2);
-		*(bp + 2) = *bp;
-		*bp = c;
-		break;
-
-	    case 32:
-		c = *(bp + 3);
-		*(bp + 3) = *bp;
-		*bp = c;
-		c = *(bp + 2);
-		*(bp + 2) = *(bp + 1);
-		*(bp + 1) = c;
-		break;
-	}
-}
-
-static void _putbits (src, dstoffset, numbits, dst)
-    register char *src;	/* address of source bit string */
-    int dstoffset;	/* bit offset into destination; range is 0-31 */
-    register int numbits;/* number of bits to copy to destination */
-    register char *dst;	/* address of destination bit string */
-{
-	register unsigned char chlo, chhi;
-	int hibits;
-	dst = dst + (dstoffset >> 3);
-	dstoffset = dstoffset & 7;
-	hibits = 8 - dstoffset;
-	chlo = *dst & _lomask[dstoffset];
-	for (;;) {
-	    chhi = (*src << dstoffset) & _himask[dstoffset];
-	    if (numbits <= hibits) {
-		chhi = chhi & _lomask[dstoffset + numbits];
-		*dst = (*dst & _himask[dstoffset + numbits]) | chlo | chhi;
-		break;
-	    }
-	    *dst = chhi | chlo;
-	    dst++;
-	    numbits = numbits - hibits;
-	    chlo = (unsigned char) (*src & _himask[hibits]) >> hibits;
-	    src++;
-	    if (numbits <= dstoffset) {
-		chlo = chlo & _lomask[numbits];
-		*dst = (*dst & _himask[numbits]) | chlo;
-		break;
-	    }
-	    numbits = numbits - dstoffset;
-	}	
-}
-
-
-/*
- * Macros
- * 
- * The ROUNDUP macro rounds up a quantity to the specified boundary,
- * then truncates to bytes.
- *
- * The XYNORMALIZE macro determines whether XY format data requires 
- * normalization and calls a routine to do so if needed. The logic in
- * this module is designed for LSBFirst byte and bit order, so 
- * normalization is done as required to present the data in this order.
- *
- * The ZNORMALIZE macro performs byte and nibble order normalization if 
- * required for Z format data.
- *
- * The XYINDEX macro computes the index to the starting byte (char) boundary
- * for a bitmap_unit containing a pixel with coordinates x and y for image
- * data in XY format.
- * 
- * The ZINDEX macro computes the index to the starting byte (char) boundary 
- * for a pixel with coordinates x and y for image data in ZPixmap format.
- * 
- */
-
-#if defined(Lynx) && defined(ROUNDUP)
-#undef ROUNDUP
-#endif
-
-#define ROUNDUP(nbytes, pad) ((((nbytes) + ((pad)-1)) / (pad)) * ((pad)>>3))
-
-#define XYNORMALIZE(bp, img) \
-    if ((img->byte_order == MSBFirst) || (img->bitmap_bit_order == MSBFirst)) \
-	_xynormalizeimagebits((unsigned char *)(bp), img)
-
-#define ZNORMALIZE(bp, img) \
-    if (img->byte_order == MSBFirst) \
-	_znormalizeimagebits((unsigned char *)(bp), img)
-
-#define XYINDEX(x, y, img) \
-    ((y) * img->bytes_per_line) + \
-    (((x) + img->xoffset) / img->bitmap_unit) * (img->bitmap_unit >> 3)
-
-#define ZINDEX(x, y, img) ((y) * img->bytes_per_line) + \
-    (((x) * img->bits_per_pixel) >> 3)
-
-/*
- * This routine initializes the image object function pointers.  The
- * intent is to provide native (i.e. fast) routines for native format images
- * only using the generic (i.e. slow) routines when fast ones don't exist.
- * However, with the current rather botched external interface, clients may
- * have to mung image attributes after the image gets created, so the fast
- * routines always have to check to make sure the optimization is still
- * valid, and reinit the functions if not.
- */
-void _XInitImageFuncPtrs (image)
-    register XImage *image;
-{
-	image->f.create_image = XCreateImage;
-	image->f.destroy_image = _XDestroyImage;
-	if ((image->format == ZPixmap) && (image->bits_per_pixel == 8)) {
-	    image->f.get_pixel = _XGetPixel8;
-	    image->f.put_pixel = _XPutPixel8;
-	} else if (((image->bits_per_pixel | image->depth) == 1) &&
-		   (image->byte_order == image->bitmap_bit_order)) {
-	    image->f.get_pixel = _XGetPixel1;
-	    image->f.put_pixel = _XPutPixel1;
-	} else if ((image->format == ZPixmap) &&
-		   (image->bits_per_pixel == 32)) {
-	    image->f.get_pixel = _XGetPixel32;
-	    image->f.put_pixel = _XPutPixel32;
-	} else if ((image->format == ZPixmap) &&
-		   (image->bits_per_pixel == 16)) {
-	    image->f.get_pixel = _XGetPixel16;
-	    image->f.put_pixel = _XPutPixel16;
-	} else {
-	    image->f.get_pixel = _XGetPixel;
-	    image->f.put_pixel = _XPutPixel;
-	}
-	image->f.sub_image = _XSubImage;
-/*	image->f.set_image = _XSetImage;*/
-	image->f.add_pixel = _XAddPixel;
-}
-
-/*
- * CreateImage
- * 
- * Allocates the memory necessary for an XImage data structure. 
- * Initializes the structure with "default" values and returns XImage. 
- * 
- */
-
-XImage *XCreateImage (dpy, visual, depth, format, offset, data, width, height,
-    xpad, image_bytes_per_line)
-    register Display *dpy;
-    register Visual *visual;
-    unsigned int depth;
-    int format;
-    int offset; /*How many pixels from the start of the data does the
-		picture to be transmitted start?*/
-
-    char *data;
-    unsigned int width;
-    unsigned int height;
-    int xpad;	
-    int image_bytes_per_line; 
-		/*How many bytes between a pixel on one line and the pixel with
-		  the same X coordinate on the next line? 0 means
-		  XCreateImage can calculate it.*/
-{
-	register XImage *image;
-	int bits_per_pixel = 1;
-
-	if (depth == 0 || depth > 32 ||
-	    (format != XYBitmap && format != XYPixmap && format != ZPixmap) ||
-	    (format == XYBitmap && depth != 1) ||
-	    (xpad != 8 && xpad != 16 && xpad != 32) ||
-	    offset < 0 || image_bytes_per_line < 0)
-	    return (XImage *) NULL;
-	if ((image = (XImage *) Xcalloc(1, (unsigned) sizeof(XImage))) == NULL)
-	    return (XImage *) NULL;
-
-	image->width = width;
-	image->height = height;
-	image->format = format;
-	image->byte_order = dpy->byte_order;
-	image->bitmap_unit = dpy->bitmap_unit;
-	image->bitmap_bit_order = dpy->bitmap_bit_order;
-	if (visual != NULL) {
-		image->red_mask = visual->red_mask;
-		image->green_mask = visual->green_mask;
-		image->blue_mask = visual->blue_mask;
-	}
-	else {
-		image->red_mask = image->green_mask = image->blue_mask = 0;
-	}
-	if (format == ZPixmap) 
-	{
-	    bits_per_pixel = _XGetBitsPerPixel(dpy, (int) depth);
-	}
-
-	image->xoffset = offset;
-	image->bitmap_pad = xpad;
-	image->depth = depth;
- 	image->data = data;
-	/*
-	 * compute per line accelerator.
-	 */
-	if (image_bytes_per_line == 0)
-	{
-	if (format == ZPixmap)
-	    image->bytes_per_line = 
-	       ROUNDUP((bits_per_pixel * width), image->bitmap_pad);
-	else
-	    image->bytes_per_line =
-	        ROUNDUP((width + offset), image->bitmap_pad);
-	}
-	else image->bytes_per_line = image_bytes_per_line;
-
-	image->bits_per_pixel = bits_per_pixel;
-	image->obdata = NULL;
-	_XInitImageFuncPtrs (image);
-
-	return image;
-}
-
-Status XInitImage (image)
-    XImage *image;
-{
-	if (image->depth == 0 || image->depth > 32 ||
-	    (image->format != XYBitmap &&
-	     image->format != XYPixmap &&
-	     image->format != ZPixmap) ||
-	    (image->format == XYBitmap && image->depth != 1) ||
-	    (image->bitmap_pad != 8 &&
-	     image->bitmap_pad != 16 &&
-	     image->bitmap_pad != 32) ||
-	    image->xoffset < 0 || image->bytes_per_line < 0)
-	    return 0;
-
-	/*
-	 * compute per line accelerator.
-	 */
-	if (image->bytes_per_line == 0)
-	{
-	if (image->format == ZPixmap)
-	    image->bytes_per_line = 
-	       ROUNDUP((image->bits_per_pixel * image->width),
-		       image->bitmap_pad);
-	else
-	    image->bytes_per_line =
-	        ROUNDUP((image->width + image->xoffset), image->bitmap_pad);
-	}
-
-	_XInitImageFuncPtrs (image);
-
-	return 1;
-}
-
-/*
- * _DestroyImage
- * 	
- * Deallocates the memory associated with the ximage data structure. 
- * this version handles the case of the image data being malloc'd
- * entirely by the library.
- */
-
-static int _XDestroyImage (ximage)
-    XImage *ximage;
-
-{
-	if (ximage->data != NULL) Xfree((char *)ximage->data);
-	if (ximage->obdata != NULL) Xfree((char *)ximage->obdata);
-	Xfree((char *)ximage);
-	return 1;
-}
-
-
-/*
- * GetPixel
- * 
- * Returns the specified pixel.  The X and Y coordinates are relative to 
- * the origin (upper left [0,0]) of the image.  The pixel value is returned
- * in normalized format, i.e. the LSB of the long is the LSB of the pixel.
- * The algorithm used is:
- *
- *	copy the source bitmap_unit or Zpixel into temp
- *	normalize temp if needed
- *	extract the pixel bits into return value
- *
- */
-
-static unsigned long Const low_bits_table[] = {
-    0x00000000, 0x00000001, 0x00000003, 0x00000007,
-    0x0000000f, 0x0000001f, 0x0000003f, 0x0000007f,
-    0x000000ff, 0x000001ff, 0x000003ff, 0x000007ff,
-    0x00000fff, 0x00001fff, 0x00003fff, 0x00007fff,
-    0x0000ffff, 0x0001ffff, 0x0003ffff, 0x0007ffff,
-    0x000fffff, 0x001fffff, 0x003fffff, 0x007fffff,
-    0x00ffffff, 0x01ffffff, 0x03ffffff, 0x07ffffff,
-    0x0fffffff, 0x1fffffff, 0x3fffffff, 0x7fffffff,
-    0xffffffff
-};
-
-static unsigned long _XGetPixel (ximage, x, y)
-    register XImage *ximage;
-    int x;
-    int y;
-
-{
-	unsigned long pixel, px;
-	register char *src;
-	register char *dst;
-	register int i, j;
-	int bits, nbytes;
-	long plane;
-     
-	if ((ximage->bits_per_pixel | ximage->depth) == 1) {
-		src = &ximage->data[XYINDEX(x, y, ximage)];
-		dst = (char *)&pixel;
-		pixel = 0;
-		for (i = ximage->bitmap_unit >> 3; --i >= 0; ) *dst++ = *src++;
-		XYNORMALIZE(&pixel, ximage);
-          	bits = (x + ximage->xoffset) % ximage->bitmap_unit;
-		pixel = ((((char *)&pixel)[bits>>3])>>(bits&7)) & 1;
-	} else if (ximage->format == XYPixmap) {
-		pixel = 0;
-		plane = 0;
-		nbytes = ximage->bitmap_unit >> 3;
-		for (i = ximage->depth; --i >= 0; ) {
-		    src = &ximage->data[XYINDEX(x, y, ximage)+ plane];
-		    dst = (char *)&px;
-		    px = 0;
-		    for (j = nbytes; --j >= 0; ) *dst++ = *src++;
-		    XYNORMALIZE(&px, ximage);
-		    bits = (x + ximage->xoffset) % ximage->bitmap_unit;
-		    pixel = (pixel << 1) |
-			    (((((char *)&px)[bits>>3])>>(bits&7)) & 1);
-		    plane = plane + (ximage->bytes_per_line * ximage->height);
-		}
-	} else if (ximage->format == ZPixmap) {
-		src = &ximage->data[ZINDEX(x, y, ximage)];
-		dst = (char *)&px;
-		px = 0;
-		for (i = (ximage->bits_per_pixel + 7) >> 3; --i >= 0; )
-		    *dst++ = *src++;		
-		ZNORMALIZE(&px, ximage);
-		pixel = 0;
-		for (i=sizeof(unsigned long); --i >= 0; )
-		    pixel = (pixel << 8) | ((unsigned char *)&px)[i];
-		if (ximage->bits_per_pixel == 4) {
-		    if (x & 1)
-			pixel >>= 4;
-		    else
-			pixel &= 0xf;
-		}
-	} else {
-		return 0; /* bad image */
-	}
-	if (ximage->bits_per_pixel == ximage->depth)
-	  return pixel;
-	else
-	  return (pixel & low_bits_table[ximage->depth]);
-}
-
-#ifndef WORD64
-static unsigned long byteorderpixel = MSBFirst << 24;
-#endif
-
-static unsigned long _XGetPixel32 (ximage, x, y)
-    register XImage *ximage;
-    int x;
-    int y;
-{
-	register unsigned char *addr;
-	unsigned long pixel;
-
-	if ((ximage->format == ZPixmap) && (ximage->bits_per_pixel == 32)) {
-	    addr = &((unsigned char *)ximage->data)
-			[y * ximage->bytes_per_line + (x << 2)];
-#ifndef WORD64
-	    if (*((char *)&byteorderpixel) == ximage->byte_order)
-		pixel = *((CARD32 *)addr);
-	    else
-#endif
-	    if (ximage->byte_order == MSBFirst)
-		pixel = ((unsigned long)addr[0] << 24 |
-			 (unsigned long)addr[1] << 16 |
-			 (unsigned long)addr[2] << 8 |
-			 addr[3]);
-	    else
-		pixel = ((unsigned long)addr[3] << 24 |
-			 (unsigned long)addr[2] << 16 |
-			 (unsigned long)addr[1] << 8 |
-			 addr[0]);
-	    if (ximage->depth != 32)
-		pixel &= low_bits_table[ximage->depth];
-	    return pixel;
-	} else {
-	    _XInitImageFuncPtrs(ximage);
-	    return XGetPixel(ximage, x, y);
-	}
-}
-
-static unsigned long _XGetPixel16 (ximage, x, y)
-    register XImage *ximage;
-    int x;
-    int y;
-{
-	register unsigned char *addr;
-	unsigned long pixel;
-
-	if ((ximage->format == ZPixmap) && (ximage->bits_per_pixel == 16)) {
-	    addr = &((unsigned char *)ximage->data)
-			[y * ximage->bytes_per_line + (x << 1)];
-	    if (ximage->byte_order == MSBFirst)
-		pixel = addr[0] << 8 | addr[1];
-	    else
-		pixel = addr[1] << 8 | addr[0];
-	    if (ximage->depth != 16)
-		pixel &= low_bits_table[ximage->depth];
-	    return pixel;
-	} else {
-	    _XInitImageFuncPtrs(ximage);
-	    return XGetPixel(ximage, x, y);
-	}
-}
-
-static unsigned long _XGetPixel8 (ximage, x, y)
-    register XImage *ximage;
-    int x;
-    int y;
-{
-	unsigned char pixel;
-
-	if ((ximage->format == ZPixmap) && (ximage->bits_per_pixel == 8)) {
-	    pixel = ((unsigned char *)ximage->data)
-			[y * ximage->bytes_per_line + x];
-	    if (ximage->depth != 8)
-		pixel &= low_bits_table[ximage->depth];
-	    return pixel;
-	} else {
-	    _XInitImageFuncPtrs(ximage);
-	    return XGetPixel(ximage, x, y);
-	}
-}
-
-static unsigned long _XGetPixel1 (ximage, x, y)
-    register XImage *ximage;
-    int x;
-    int y;
-{
-	unsigned char bit;
-	int xoff, yoff;
-
-	if (((ximage->bits_per_pixel | ximage->depth) == 1) &&
-	    (ximage->byte_order == ximage->bitmap_bit_order)) {
-	    xoff = x + ximage->xoffset;
-	    yoff = y * ximage->bytes_per_line + (xoff >> 3);
-	    xoff &= 7;
-	    if (ximage->bitmap_bit_order == MSBFirst)
-	        bit = 0x80 >> xoff;
-	    else
-		bit = 1 << xoff;
-	    return (ximage->data[yoff] & bit) ? 1 : 0;
-	} else {
-	    _XInitImageFuncPtrs(ximage);
-	    return XGetPixel(ximage, x, y);
-	}
-}
-	
-/*
- * PutPixel
- * 
- * Overwrites the specified pixel.  The X and Y coordinates are relative to 
- * the origin (upper left [0,0]) of the image.  The input pixel value must be
- * in normalized format, i.e. the LSB of the long is the LSB of the pixel.
- * The algorithm used is:
- *
- *	copy the destination bitmap_unit or Zpixel to temp
- *	normalize temp if needed
- *	copy the pixel bits into the temp
- *	renormalize temp if needed
- *	copy the temp back into the destination image data
- *
- */
-
-static int _XPutPixel (ximage, x, y, pixel)
-    register XImage *ximage;
-    int x;
-    int y;
-    unsigned long pixel;
-
-{
-	unsigned long px, npixel;
-	register char *src;
-	register char *dst;
-	register int i;
-	int j, nbytes;
-	long plane;
-
-	if (ximage->depth == 4)
-	    pixel &= 0xf;
-        npixel = pixel;
-	for (i=0, px=pixel; i<sizeof(unsigned long); i++, px>>=8)
-	    ((unsigned char *)&pixel)[i] = px;
-	if ((ximage->bits_per_pixel | ximage->depth) == 1) {
-		src = &ximage->data[XYINDEX(x, y, ximage)];
-		dst = (char *)&px;
-		px = 0;
-		nbytes = ximage->bitmap_unit >> 3;
-		for (i = nbytes; --i >= 0; ) *dst++ = *src++;
-		XYNORMALIZE(&px, ximage);
-		i = ((x + ximage->xoffset) % ximage->bitmap_unit);
-		_putbits ((char *)&pixel, i, 1, (char *)&px);
-		XYNORMALIZE(&px, ximage);
-		src = (char *) &px;
-		dst = &ximage->data[XYINDEX(x, y, ximage)];
-		for (i = nbytes; --i >= 0; ) *dst++ = *src++;
-	} else if (ximage->format == XYPixmap) {
-		plane = (ximage->bytes_per_line * ximage->height) *
-		    (ximage->depth - 1); /* do least signif plane 1st */
-		nbytes = ximage->bitmap_unit >> 3;
-		for (j = ximage->depth; --j >= 0; ) {
-		    src = &ximage->data[XYINDEX(x, y, ximage) + plane];
-		    dst = (char *) &px;
-		    px = 0;
-		    for (i = nbytes; --i >= 0; ) *dst++ = *src++;
-		    XYNORMALIZE(&px, ximage);
-		    i = ((x + ximage->xoffset) % ximage->bitmap_unit);
-		    _putbits ((char *)&pixel, i, 1, (char *)&px);
-		    XYNORMALIZE(&px, ximage);
-		    src = (char *)&px;
-		    dst = &ximage->data[XYINDEX(x, y, ximage) + plane];
-		    for (i = nbytes; --i >= 0; ) *dst++ = *src++;
-		    npixel = npixel >> 1;
-		    for (i=0, px=npixel; i<sizeof(unsigned long); i++, px>>=8)
-			((unsigned char *)&pixel)[i] = px;
-		    plane = plane - (ximage->bytes_per_line * ximage->height);
-		}
-	} else if (ximage->format == ZPixmap) {
-		src = &ximage->data[ZINDEX(x, y, ximage)];
-		dst = (char *)&px;
-		px = 0;
-		nbytes = (ximage->bits_per_pixel + 7) >> 3;
-		for (i = nbytes; --i >= 0; ) *dst++ = *src++;
-		ZNORMALIZE(&px, ximage);
-		_putbits ((char *)&pixel, 
-			  (x * ximage->bits_per_pixel) & 7, 
-			  ximage->bits_per_pixel, (char *)&px);
-		ZNORMALIZE(&px, ximage);
-		src = (char *)&px;
-		dst = &ximage->data[ZINDEX(x, y, ximage)];
-		for (i = nbytes; --i >= 0; ) *dst++ = *src++;
-	} else {
-		return 0; /* bad image */
-	}
-	return 1;
-}
-
-static int _XPutPixel32 (ximage, x, y, pixel)
-    register XImage *ximage;
-    int x;
-    int y;
-    unsigned long pixel;
-{
-	unsigned char *addr;
-
-	if ((ximage->format == ZPixmap) && (ximage->bits_per_pixel == 32)) {
-	    addr = &((unsigned char *)ximage->data)
-			[y * ximage->bytes_per_line + (x << 2)];
-#ifndef WORD64
-	    if (*((char *)&byteorderpixel) == ximage->byte_order)
-		*((CARD32 *)addr) = pixel;
-	    else
-#endif
-	    if (ximage->byte_order == MSBFirst) {
-		addr[0] = pixel >> 24;
-		addr[1] = pixel >> 16;
-		addr[2] = pixel >> 8;
-		addr[3] = pixel;
-	    } else {
-		addr[3] = pixel >> 24;
-		addr[2] = pixel >> 16;
-		addr[1] = pixel >> 8;
-		addr[0] = pixel;
-	    }
-	    return 1;
-	} else {
-	    _XInitImageFuncPtrs(ximage);
-	    return XPutPixel(ximage, x, y, pixel);
-	}
-}
-
-static int _XPutPixel16 (ximage, x, y, pixel)
-    register XImage *ximage;
-    int x;
-    int y;
-    unsigned long pixel;
-{
-	unsigned char *addr;
-
-	if ((ximage->format == ZPixmap) && (ximage->bits_per_pixel == 16)) {
-	    addr = &((unsigned char *)ximage->data)
-			[y * ximage->bytes_per_line + (x << 1)];
-	    if (ximage->byte_order == MSBFirst) {
-		addr[0] = pixel >> 8;
-		addr[1] = pixel;
-	    } else {
-		addr[1] = pixel >> 8;
-		addr[0] = pixel;
-	    }
-	    return 1;
-	} else {
-	    _XInitImageFuncPtrs(ximage);
-	    return XPutPixel(ximage, x, y, pixel);
-	}
-}
-
-static int _XPutPixel8 (ximage, x, y, pixel)
-    register XImage *ximage;
-    int x;
-    int y;
-    unsigned long pixel;
-{
-	if ((ximage->format == ZPixmap) && (ximage->bits_per_pixel == 8)) {
-	    ximage->data[y * ximage->bytes_per_line + x] = pixel;
-	    return 1;
-	} else {
-	    _XInitImageFuncPtrs(ximage);
-	    return XPutPixel(ximage, x, y, pixel);
-	}
-}
-
-static int _XPutPixel1 (ximage, x, y, pixel)
-    register XImage *ximage;
-    int x;
-    int y;
-    unsigned long pixel;
-{
-	unsigned char bit;
-	int xoff, yoff;
-
-	if (((ximage->bits_per_pixel | ximage->depth) == 1) &&
-	    (ximage->byte_order == ximage->bitmap_bit_order)) {
-	    xoff = x + ximage->xoffset;
-	    yoff = y * ximage->bytes_per_line + (xoff >> 3);
-	    xoff &= 7;
-	    if (ximage->bitmap_bit_order == MSBFirst)
-		bit = 0x80 >> xoff;
-	    else
-		bit = 1 << xoff;
-	    if (pixel & 1)
-		ximage->data[yoff] |= bit;
-	    else
-		ximage->data[yoff] &= ~bit;
-	    return 1;
-	} else {
-	    _XInitImageFuncPtrs(ximage);
-	    return XPutPixel(ximage, x, y, pixel);
-	}
-}
-
-/*
- * SubImage
- * 
- * Creates a new image that is a subsection of an existing one.
- * Allocates the memory necessary for the new XImage data structure. 
- * Pointer to new image is returned.  The algorithm used is repetitive
- * calls to get and put pixel.
- *
- */
-
-static XImage *_XSubImage (ximage, x, y, width, height)
-    XImage *ximage;
-    register int x;	/* starting x coordinate in existing image */
-    register int y;	/* starting y coordinate in existing image */
-    unsigned int width;	/* width in pixels of new subimage */
-    unsigned int height;/* height in pixels of new subimage */
-
-{
-	register XImage *subimage;
-	int dsize;
-	register int row, col;
-	register unsigned long pixel;
-	char *data;
-
-	if ((subimage = (XImage *) Xcalloc (1, sizeof (XImage))) == NULL)
-	    return (XImage *) NULL;
-	subimage->width = width;
-	subimage->height = height;
-	subimage->xoffset = 0;
-	subimage->format = ximage->format;
-	subimage->byte_order = ximage->byte_order;
-	subimage->bitmap_unit = ximage->bitmap_unit;
-	subimage->bitmap_bit_order = ximage->bitmap_bit_order;
-	subimage->bitmap_pad = ximage->bitmap_pad;
-	subimage->bits_per_pixel = ximage->bits_per_pixel;
-	subimage->depth = ximage->depth;
-	/*
-	 * compute per line accelerator.
-	 */
-	if (subimage->format == ZPixmap) 	
-	    subimage->bytes_per_line = 
-		ROUNDUP(subimage->bits_per_pixel * width,
-			subimage->bitmap_pad);
-	else
-	    subimage->bytes_per_line =
-		ROUNDUP(width, subimage->bitmap_pad);
-	subimage->obdata = NULL;
-	_XInitImageFuncPtrs (subimage);
-	dsize = subimage->bytes_per_line * height;
-	if (subimage->format == XYPixmap) dsize = dsize * subimage->depth;
-	if (((data = Xcalloc (1, (unsigned) dsize)) == NULL) && (dsize > 0)) {
-	    Xfree((char *) subimage);
-	    return (XImage *) NULL;
-	}
-	subimage->data = data;
-
-	/*
-	 * Test for cases where the new subimage is larger than the region
-	 * that we are copying from the existing data.  In those cases,
-	 * copy the area of the existing image, and allow the "uncovered"
-	 * area of new subimage to remain with zero filled pixels.
-	 */
-	if (height > ximage->height - y ) height = ximage->height - y;
-	if (width > ximage->width - x ) width = ximage->width - x;
-
-	for (row = y; row < (y + height); row++) {
-	    for (col = x; col < (x + width); col++) {
-		pixel = XGetPixel(ximage, col, row);
-		XPutPixel(subimage, (col - x), (row - y), pixel);
-	    }
-	}
-	return subimage;
-}
-
-
-/*
- * SetImage
- * 
- * Overwrites a section of one image with all of the data from another.
- * If the two images are not of the same format (i.e. XYPixmap and ZPixmap),
- * the image data is converted to the destination format.  The following
- * restrictions apply:
- *
- *	1. The depths of the source and destination images must be equal.
- *
- *	2. If the height of the source image is too large to fit between
- *	   the specified y starting point and the bottom of the image,
- *	   then scanlines are truncated on the bottom.
- *
- *	3. If the width of the source image is too large to fit between
- *	   the specified x starting point and the end of the scanline,
- *	   then pixels are truncated on the right.
- * 
- * The images need not have the same bitmap_bit_order, byte_order,
- * bitmap_unit, bits_per_pixel, bitmap_pad, or xoffset.
- *
- */
-
-int _XSetImage (srcimg, dstimg, x, y)
-    XImage *srcimg;
-    register XImage *dstimg;
-    register int x;
-    register int y;
-
-{
-	register unsigned long pixel;
-	register int row, col;
-	int width, height, startrow, startcol;
-	if (x < 0) {
-	    startcol = -x;
-	    x = 0;
-	} else
-	    startcol = 0;
-	if (y < 0) {
-	    startrow = -y;
-	    y = 0;
-	} else
-	    startrow = 0;
-	width = dstimg->width - x;
-	if (srcimg->width < width)
-	    width = srcimg->width;
-	height = dstimg->height - y;
-	if (srcimg->height < height)
-	    height = srcimg->height;
-
-	/* this is slow, will do better later */
-	for (row = startrow; row < height; row++) {
-	    for (col = startcol; col < width; col++) {
-		pixel = XGetPixel(srcimg, col, row);
-		XPutPixel(dstimg, x + col, y + row, pixel);
-	    }
-	}
-	return 1;
-}
-
-/*
- * AddPixel
- * 
- * Adds a constant value to every pixel in a pixmap.
- *
- */
-
-static int
-_XAddPixel (ximage, value)
-    register XImage *ximage;
-    register long value;
-{
-	register int x;
-	register int y;
-
-	if (!value)
-	    return 0;
-	if ((ximage->bits_per_pixel | ximage->depth) == 1) {
-	    /* The only value that we can add here to an XYBitmap
-	     * is one.  Since 1 + value = ~value for one bit wide
-	     * data, we do this quickly by taking the ones complement
-	     * of the entire bitmap data (offset and pad included!).
-	     * Note that we don't need to be concerned with bit or
-	     * byte order at all.
-	     */
-	    register unsigned char *dp = (unsigned char *) ximage->data;
-	    x = ximage->bytes_per_line * ximage->height;
-	    while (--x >= 0) {
-		*dp = ~*dp;
-		dp++;
-	    }
-	} else if ((ximage->format == ZPixmap) &&
-		   (ximage->bits_per_pixel == 8)) {
-	    register unsigned char *dp = (unsigned char *) ximage->data;
-	    x = ximage->bytes_per_line * ximage->height;
-	    while (--x >= 0)
-		*dp++ += value;
-#ifndef WORD64
-	} else if ((ximage->format == ZPixmap) &&
-		   (ximage->bits_per_pixel == 16) &&
-		   (*((char *)&byteorderpixel) == ximage->byte_order)) {
-	    register unsigned short *dp = (unsigned short *) ximage->data;
-	    x = (ximage->bytes_per_line >> 1) * ximage->height;
-	    while (--x >= 0)
-		*dp++ += value;
-	} else if ((ximage->format == ZPixmap) &&
-		   (ximage->bits_per_pixel == 32) &&
-		   (*((char *)&byteorderpixel) == ximage->byte_order)) {
-	    register CARD32 *dp = (CARD32 *) ximage->data;
-	    x = (ximage->bytes_per_line >> 2) * ximage->height;
-	    while (--x >= 0)
-		*dp++ += value;
-#endif
-	} else {
-	    for (y = ximage->height; --y >= 0; ) {
-		for (x = ximage->width; --x >= 0; ) {
-		    register unsigned long pixel = XGetPixel(ximage, x, y);
-		    pixel = pixel + value;
-		    XPutPixel(ximage, x, y, pixel);
-		}
-	    }
-	}
-	return 0;
-}
-
diff --git a/xc/lib/X11/Imakefile b/xc/lib/X11/Imakefile
deleted file mode 100644
index 1e56341a7..000000000
--- a/xc/lib/X11/Imakefile
+++ /dev/null
@@ -1,986 +0,0 @@
-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:44:38 cpqbld Exp $
-
-
-
-
-XCOMM $XFree86: xc/lib/X11/Imakefile,v 3.40 2001/07/23 13:15:41 dawes Exp $
-
-#define DoNormalLib NormalLibX11
-#define DoSharedLib SharedLibX11
-#define DoExtraLib SharedLibX11
-#define DoDebugLib DebugLibX11
-#define DoProfileLib ProfileLibX11
-#define LibName X11
-#define SoRev SOXLIBREV
-#define HugeLibrary YES
-#define IncSubdir X11
-
-#include <Threads.tmpl>
-
-#ifndef MotifBC
-#define MotifBC NO
-#endif
-
-#ifdef SharedX11Reqs
-REQUIREDLIBS = SharedX11Reqs
-#endif
-#if defined(MacIIArchitecture) || defined(SequentArchitecture) || defined(i386ScoArchitecture)
-XBSDLIB = /**/
-#endif
-#if defined(LunaArchitecture) && defined(Mc88000Architecture)
-EXTRA_LIBRARIES = /**/
-#endif
-#if Malloc0ReturnsNull
-     MALLOC_DEFINES = XMalloc0ReturnsNullDefines
-#endif
-#if HasXdmAuth
-        XDMAUTHDEFS = -DHASXDMAUTH
-        XDMAUTHOBJS = Wrap.o Wraphelp.o
-        XDMAUTHSRCS = Wrap.c Wraphelp.c
-#endif
-#if BuildXKBlib
-    XKB_DEFINES = -DXKB 
-        XKBSRCS = XKB.c XKBBind.c XKBCompat.c XKBCtrls.c XKBCvt.c XKBGetMap.c \
-	          XKBGetByName.c XKBNames.c XKBRdBuf.c XKBSetMap.c XKBUse.c \
-		  XKBleds.c XKBBell.c XKBGeom.c XKBSetGeom.c XKBExtDev.c \
-		  XKBList.c XKBMisc.c \
-		  XKBMAlloc.c XKBGAlloc.c XKBAlloc.c
-        XKBOBJS = XKB.o XKBBind.o XKBCompat.o XKBCtrls.o XKBCvt.o XKBGetMap.o \
-		  XKBGetByName.o XKBNames.o XKBRdBuf.o XKBSetMap.o XKBUse.o \
-		  XKBleds.o XKBBell.o XKBGeom.o XKBSetGeom.o XKBExtDev.o \
-		  XKBList.o XKBMisc.o \
-		  XKBMAlloc.o XKBGAlloc.o XKBAlloc.o
-#endif
-#if HasSecureRPC
-        RPCDEFS = -DSECURE_RPC
-#endif
-#if HasPoll
-   POLL_DEFINES = -DUSE_POLL
-#endif
-   CONN_DEFINES = $(CONNECTION_FLAGS)
-   XTRANS_X_DEFINES = -DX11_t -DTRANS_CLIENT
-   XTRANS_XIM_DEFINES = -DXIM_t -DTRANS_CLIENT
-#if HasBSD44Sockets
-   SOCK_DEFINES = -DBSD44SOCKETS
-#endif
-#if HasShm
-    SHM_DEFINES = -DHAS_SHM
-#endif
-
-    XF86BIGFONT_DEFINES = XF86BigfontExtensionDefines
-
-     EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/XErrorDB\"
-     KDB_DEFINES = -DKEYSYMDB=\"$(LIBDIR)/XKeysymDB\"
-     CMS_DEFINES = -DXCMSDB=\"$(LIBDIR)/Xcms.txt\"
-#if HasSnprintf
-    MISC_DEFINES = -DHAS_SNPRINTF -DLIBX11
-#endif
-#if MotifBC
-      BC_DEFINES = -DMOTIFBC
-#endif
-#if NoRConst
- RCONST_DEFINES = -DNORCONST
-#endif
-    XLC_DEFINES = -DXLOCALEDIR=\"$(XLOCALEDIR)\"
-#if HasKrb5
-         K5OBJS = k5encode.o
-         K5SRCS = k5encode.c
-         K5INCL = Krb5Includes
-         K5DEFS = Krb5Defines
-#endif
-#if NeedLibInsideFlag
-    LIB_DEFINES = -D_XLIBINT_
-#endif
-        DEFINES = $(MALLOC_DEFINES) $(LIB_DEFINES) $(MISC_DEFINES)
-   OPEN_DEFINES = -I$(EXTINCSRC) $(K5INCL) $(K5DEFS)
- DEPEND_DEFINES = $(OPEN_DEFINES) $(TRANS_INCLUDES) $(CONN_DEFINES) $(THREADS_DEFINES) DependDefines
-       AUTHOBJS = AuDispose.o AuGetBest.o AuFileName.o AuRead.o
-       AUTHSRCS = AuDispose.c AuGetBest.c AuFileName.c AuRead.c
-           SRCS = $(SRCS1) $(SRCS2) $(SRCS3) /* try *.c if you have trouble */
-        HEADERS = Xlib.h Xresource.h Xutil.h cursorfont.h Xlibint.h \
-			Xcms.h Xlocale.h XKBlib.h
-       LINTLIBS =
-
-SRCS1 = \
-	Context.c \
-	Depths.c \
-	ParseCmd.c \
-	Quarks.c \
-	AllCells.c \
-	AllPlanes.c \
-	AllowEv.c \
-	AutoRep.c \
-	Backgnd.c \
-	BdrWidth.c \
-	Bell.c \
-	Border.c \
-	ChAccCon.c \
-	ChClMode.c \
-	ChActPGb.c \
-	ChCmap.c \
-	ChGC.c \
-	ChKeyCon.c \
-	ChPntCon.c \
-	ChProp.c \
-	ChSaveSet.c \
-	ChWAttrs.c \
-	ChWindow.c \
-	ChkIfEv.c \
-	ChkMaskEv.c \
-	ChkWinEv.c \
-	ChkTypEv.c \
-	ChkTypWEv.c \
-	CirWin.c \
-	CirWinDn.c \
-	CirWinUp.c \
-	ClDisplay.c \
-	Clear.c \
-	ClearArea.c \
-	ConfWind.c \
-	ConnDis.c \
-	ConvSel.c \
-	CopyArea.c \
-	CopyCmap.c \
-	CopyGC.c \
-	CopyPlane.c \
-	CrBFData.c \
-	CrCmap.c \
-	CrCursor.c \
-	CrGC.c \
-	CrGlCur.c \
-	CrPFBData.c \
-	CrPixmap.c \
-	CrWindow.c \
-	Cursor.c \
-	DefCursor.c \
-	DelProp.c \
-	DestSubs.c \
-	DestWind.c \
-	DisName.c \
-	DrArc.c \
-	DrArcs.c \
-	DrLine.c \
-	DrLines.c \
-	DrPoint.c \
-	DrPoints.c \
-	DrRect.c \
-	DrRects.c \
-	DrSegs.c \
-	ErrDes.c \
-	ErrHndlr.c \
-	EvToWire.c \
-	FetchName.c \
-	FillArc.c \
-	FillArcs.c \
-	FillPoly.c \
-	FillRct.c \
-	FillRcts.c \
-	Flush.c \
-	Font.c \
-	FontNames.c \
-	FontInfo.c \
-	FreeCmap.c \
-	FreeCols.c \
-	FreeCurs.c \
-	FreeEData.c \
-	FreeGC.c \
-	FreePix.c \
-	FSSaver.c \
-	GCMisc.c \
-	Geom.c \
-	GetAtomNm.c \
-	GetColor.c \
-	GetDflt.c \
-	GetFPath.c \
-	GetFProp.c \
-	GetGeom.c \
-	GetHColor.c \
-	GetHints.c \
-	GetIFocus.c \
-	GetImage.c \
-	GetKCnt.c \
-	GetMoEv.c \
-	GetPCnt.c \
-	GetPntMap.c \
-	GetProp.c \
-	GetSOwner.c \
-	GetSSaver.c \
-	GetStCmap.c \
-	GetWAttrs.c \
-	GrButton.c \
-	GrKey.c \
-	GrKeybd.c \
-	GrPointer.c \
-	GrServer.c \
-	Host.c \
-	IfEvent.c \
-	ImUtil.c \
-	ImText.c \
-	ImText16.c \
-	InitExt.c \
-	InsCmap.c \
-	IntAtom.c \
-	KeyBind.c \
-	KeysymStr.c \
-	KillCl.c \
-	LiHosts.c \
-	LiICmaps.c \
-	LiProps.c \
-	ListExt.c \
-	LoadFont.c \
-	LookupCol.c \
-	LowerWin.c 
-
-OBJS1 = \
-	Context.o \
-	Depths.o \
-	ParseCmd.o \
-	Quarks.o \
-	AllCells.o \
-	AllPlanes.o \
-	AllowEv.o \
-	AutoRep.o \
-	Backgnd.o \
-	BdrWidth.o \
-	Bell.o \
-	Border.o \
-	ChAccCon.o \
-	ChClMode.o \
-	ChActPGb.o \
-	ChCmap.o \
-	ChGC.o \
-	ChKeyCon.o \
-	ChPntCon.o \
-	ChProp.o \
-	ChSaveSet.o \
-	ChWAttrs.o \
-	ChWindow.o \
-	ChkIfEv.o \
-	ChkMaskEv.o \
-	ChkWinEv.o \
-	ChkTypEv.o \
-	ChkTypWEv.o \
-	CirWin.o \
-	CirWinDn.o \
-	CirWinUp.o \
-	ClDisplay.o \
-	Clear.o \
-	ClearArea.o \
-	ConfWind.o \
-	ConnDis.o \
-	ConvSel.o \
-	CopyArea.o \
-	CopyCmap.o \
-	CopyGC.o \
-	CopyPlane.o \
-	CrBFData.o \
-	CrCmap.o \
-	CrCursor.o \
-	CrGC.o \
-	CrGlCur.o \
-	CrPFBData.o \
-	CrPixmap.o \
-	CrWindow.o \
-	Cursor.o \
-	DefCursor.o \
-	DelProp.o \
-	DestSubs.o \
-	DestWind.o \
-	DisName.o \
-	DrArc.o \
-	DrArcs.o \
-	DrLine.o \
-	DrLines.o \
-	DrPoint.o \
-	DrPoints.o \
-	DrRect.o \
-	DrRects.o \
-	DrSegs.o \
-	ErrDes.o \
-	ErrHndlr.o \
-	EvToWire.o \
-	FetchName.o \
-	FillArc.o \
-	FillArcs.o \
-	FillPoly.o \
-	FillRct.o \
-	FillRcts.o \
-	Flush.o \
-	Font.o \
-	FontNames.o \
-	FontInfo.o \
-	FreeCmap.o \
-	FreeCols.o \
-	FreeCurs.o \
-	FreeEData.o \
-	FreeGC.o \
-	FreePix.o \
-	FSSaver.o \
-	GCMisc.o \
-	Geom.o \
-	GetAtomNm.o \
-	GetColor.o \
-	GetDflt.o \
-	GetFPath.o \
-	GetFProp.o \
-	GetGeom.o \
-	GetHColor.o \
-	GetHints.o \
-	GetIFocus.o \
-	GetImage.o \
-	GetKCnt.o \
-	GetMoEv.o \
-	GetPCnt.o \
-	GetPntMap.o \
-	GetProp.o \
-	GetSOwner.o \
-	GetSSaver.o \
-	GetStCmap.o \
-	GetWAttrs.o \
-	GrButton.o \
-	GrKey.o \
-	GrKeybd.o \
-	GrPointer.o \
-	GrServer.o \
-	Host.o \
-	IfEvent.o \
-	ImUtil.o \
-	ImText.o \
-	ImText16.o \
-	InitExt.o \
-	InsCmap.o \
-	IntAtom.o \
-	KeyBind.o \
-	KeysymStr.o \
-	KillCl.o \
-	LiHosts.o \
-	LiICmaps.o \
-	LiProps.o \
-	ListExt.o \
-	LoadFont.o \
-	LookupCol.o \
-	LowerWin.o 
-
-SRCS2 = \
-	Macros.c \
-	MapRaised.c \
-	MapSubs.c \
-	MapWindow.c \
-	MaskEvent.c \
-	Misc.c \
-	ModMap.c \
-	MoveWin.c \
-	NextEvent.c \
-	OpenDis.c \
-	ParseCol.c \
-	ParseGeom.c \
-	PeekEvent.c \
-	PeekIfEv.c \
-	Pending.c \
-	PmapBgnd.c \
-	PmapBord.c \
-	PolyReg.c \
-	PolyTxt.c \
-	PolyTxt16.c \
-	PutBEvent.c \
-	PutImage.c \
-	QuBest.c \
-	QuColor.c \
-	QuColors.c \
-	QuCurShp.c \
-	QuExt.c \
-	QuKeybd.c \
-	QuPntr.c \
-	QuStipShp.c \
-	QuTextE16.c \
-	QuTextExt.c \
-	QuTileShp.c \
-	QuTree.c \
-	RaiseWin.c \
-	RdBitF.c \
-	RecolorC.c \
-	ReconfWin.c \
-	Region.c \
-	RepWindow.c \
-	RestackWs.c \
-	RotProp.c \
-	ScrResStr.c \
-	SelInput.c \
-	SendEvent.c \
-	SetBack.c \
-	SetCRects.c \
-	SetClMask.c \
-	SetClOrig.c \
-	SetDashes.c \
-	SetFPath.c \
-	SetFont.c \
-	SetFore.c \
-	SetFunc.c \
-	SetHints.c \
-	SetIFocus.c \
-	SetLStyle.c \
-	SetPMask.c \
-	SetPntMap.c \
-	SetSOwner.c \
-	SetSSaver.c \
-	SetState.c \
-	SetStip.c \
-	SetStCmap.c \
-	SetTile.c \
-	SetTSOrig.c \
-	StBytes.c \
-	StColor.c \
-	StColors.c \
-	StNColor.c \
-	StName.c \
-	StrKeysym.c \
-	Sync.c \
-	Synchro.c \
-	Text.c \
-	Text16.c \
-	TextExt.c \
-	TextExt16.c \
-	TrCoords.c \
-	UndefCurs.c \
-	UngrabBut.c \
-	UngrabKbd.c \
-	UngrabKey.c \
-	UngrabPtr.c \
-	UngrabSvr.c \
-	UninsCmap.c \
-	UnldFont.c \
-	UnmapSubs.c \
-	UnmapWin.c \
-	VisUtil.c \
-	WarpPtr.c \
-	WinEvent.c \
-	Window.c \
-	WrBitF.c \
-	XlibAsync.c \
-	XlibInt.c \
-	Xrm.c \
-	evtomask.c \
-	globals.c \
-	GetGCVals.c \
-	GetNrmHint.c \
-	GetRGBCMap.c \
-	GetTxtProp.c \
-	GetWMCMapW.c \
-	GetWMProto.c \
-	Iconify.c \
-	PixFormats.c \
-	PropAlloc.c \
-	ReconfWM.c \
-	SetNrmHint.c \
-	SetRGBCMap.c \
-	SetTxtProp.c \
-	SetWMCMapW.c \
-	SetWMProto.c \
-	StrToText.c \
-	TextToStr.c \
-	Withdraw.c \
-	WMGeom.c \
-	WMProps.c \
-	$(AUTHSRCS) $(XDMAUTHSRCS) $(K5SRCS)
-
-OBJS2 = \
-	Macros.o \
-	MapRaised.o \
-	MapSubs.o \
-	MapWindow.o \
-	MaskEvent.o \
-	Misc.o \
-	ModMap.o \
-	MoveWin.o \
-	NextEvent.o \
-	OpenDis.o \
-	ParseCol.o \
-	ParseGeom.o \
-	PeekEvent.o \
-	PeekIfEv.o \
-	Pending.o \
-	PmapBgnd.o \
-	PmapBord.o \
-	PolyReg.o \
-	PolyTxt.o \
-	PolyTxt16.o \
-	PutBEvent.o \
-	PutImage.o \
-	QuBest.o \
-	QuColor.o \
-	QuColors.o \
-	QuCurShp.o \
-	QuExt.o \
-	QuKeybd.o \
-	QuPntr.o \
-	QuStipShp.o \
-	QuTextE16.o \
-	QuTextExt.o \
-	QuTileShp.o \
-	QuTree.o \
-	RaiseWin.o \
-	RdBitF.o \
-	RecolorC.o \
-	ReconfWin.o \
-	Region.o \
-	RepWindow.o \
-	RestackWs.o \
-	RotProp.o \
-	ScrResStr.o \
-	SelInput.o \
-	SendEvent.o \
-	SetBack.o \
-	SetCRects.o \
-	SetClMask.o \
-	SetClOrig.o \
-	SetDashes.o \
-	SetFPath.o \
-	SetFont.o \
-	SetFore.o \
-	SetFunc.o \
-	SetHints.o \
-	SetIFocus.o \
-	SetLStyle.o \
-	SetPMask.o \
-	SetPntMap.o \
-	SetSOwner.o \
-	SetSSaver.o \
-	SetState.o \
-	SetStip.o \
-	SetStCmap.o \
-	SetTile.o \
-	SetTSOrig.o \
-	StBytes.o \
-	StColor.o \
-	StColors.o \
-	StNColor.o \
-	StName.o \
-	StrKeysym.o \
-	Sync.o \
-	Synchro.o \
-	Text.o \
-	Text16.o \
-	TextExt.o \
-	TextExt16.o \
-	TrCoords.o \
-	UndefCurs.o \
-	UngrabBut.o \
-	UngrabKbd.o \
-	UngrabKey.o \
-	UngrabPtr.o \
-	UngrabSvr.o \
-	UninsCmap.o \
-	UnldFont.o \
-	UnmapSubs.o \
-	UnmapWin.o \
-	VisUtil.o \
-	WarpPtr.o \
-	WinEvent.o \
-	Window.o \
-	WrBitF.o \
-	XlibAsync.o \
-	XlibInt.o \
-	Xrm.o \
-	evtomask.o \
-	globals.o \
-	GetGCVals.o \
-	GetNrmHint.o \
-	GetRGBCMap.o \
-	GetTxtProp.o \
-	GetWMCMapW.o \
-	GetWMProto.o \
-	Iconify.o \
-	PixFormats.o \
-	PropAlloc.o \
-	ReconfWM.o \
-	SetNrmHint.o \
-	SetRGBCMap.o \
-	SetTxtProp.o \
-	SetWMCMapW.o \
-	SetWMProto.o \
-	StrToText.o \
-	TextToStr.o \
-	Withdraw.o \
-	WMGeom.o \
-	WMProps.o \
-	$(AUTHOBJS) \
-	$(XDMAUTHOBJS) \
-	$(K5OBJS)
-
-SRCS3 = \
-	Lab.c \
-	LabGcC.c \
-	LabGcL.c \
-	LabGcLC.c \
-	LabMnL.c \
-	LabMxC.c \
-	LabMxL.c \
-	LabMxLC.c \
-	LabWpAj.c \
-	Luv.c \
-	LuvGcC.c \
-	LuvGcL.c \
-	LuvGcLC.c \
-	LuvMnL.c \
-	LuvMxC.c \
-	LuvMxL.c \
-	LuvMxLC.c \
-	LuvWpAj.c \
-	XYZ.c \
-	uvY.c \
-	xyY.c \
-	HVC.c \
-	HVCGcC.c \
-	HVCGcV.c \
-	HVCGcVC.c \
-	HVCMnV.c \
-	HVCMxC.c \
-	HVCMxV.c \
-	HVCMxVC.c \
-	HVCMxVs.c \
-	HVCWpAj.c \
-	UNDEFINED.c \
-	AddDIC.c \
-	AddSF.c \
-	cmsAllNCol.c \
-	cmsAllCol.c \
-	CCC.c \
-	cmsCmap.c \
-	cmsColNm.c \
-	CvColW.c \
-	CvCols.c \
-	cmsGlobls.c \
-	IdOfPr.c \
-	cmsInt.c \
-	LRGB.c \
-	cmsLkCol.c \
-	cmsMath.c \
-	OfCCC.c \
-	PrOfId.c \
-	cmsProp.c \
-	QBlack.c \
-	QBlue.c \
-	QGreen.c \
-	QRed.c \
-	QWhite.c \
-	QuCol.c \
-	QuCols.c \
-	SetCCC.c \
-	SetGetCols.c \
-	StCol.c \
-	StCols.c \
-	cmsTrig.c \
-	XRGB.c \
-	FSWrap.c \
-	ICWrap.c \
-	IMWrap.c \
-	OCWrap.c \
-	OMWrap.c \
-	lcWrap.c \
-	mbWMProps.c \
-	utf8WMProps.c \
-	mbWrap.c \
-	wcWrap.c \
-	utf8Wrap.c \
-	FilterEv.c \
-	RegstFlt.c \
-	locking.c \
-	LockDis.c \
-	x11trans.c \
-	ximtrans.c \
-	$(XKBSRCS) $(LCSRCS) $(MISCSRCS)
-
-OBJS3 = \
-	Lab.o \
-	LabGcC.o \
-	LabGcL.o \
-	LabGcLC.o \
-	LabMnL.o \
-	LabMxC.o \
-	LabMxL.o \
-	LabMxLC.o \
-	LabWpAj.o \
-	Luv.o \
-	LuvGcC.o \
-	LuvGcL.o \
-	LuvGcLC.o \
-	LuvMnL.o \
-	LuvMxC.o \
-	LuvMxL.o \
-	LuvMxLC.o \
-	LuvWpAj.o \
-	XYZ.o \
-	uvY.o \
-	xyY.o \
-	HVC.o \
-	HVCGcC.o \
-	HVCGcV.o \
-	HVCGcVC.o \
-	HVCMnV.o \
-	HVCMxC.o \
-	HVCMxV.o \
-	HVCMxVC.o \
-	HVCMxVs.o \
-	HVCWpAj.o \
-	UNDEFINED.o \
-	AddDIC.o \
-	AddSF.o \
-	cmsAllNCol.o \
-	cmsAllCol.o \
-	CCC.o \
-	cmsCmap.o \
-	cmsColNm.o \
-	CvColW.o \
-	CvCols.o \
-	cmsGlobls.o \
-	IdOfPr.o \
-	cmsInt.o \
-	LRGB.o \
-	cmsLkCol.o \
-	cmsMath.o \
-	OfCCC.o \
-	PrOfId.o \
-	cmsProp.o \
-	QBlack.o \
-	QBlue.o \
-	QGreen.o \
-	QRed.o \
-	QWhite.o \
-	QuCol.o \
-	QuCols.o \
-	SetCCC.o \
-	SetGetCols.o \
-	StCol.o \
-	StCols.o \
-	cmsTrig.o \
-	XRGB.o \
-	FSWrap.o \
-	ICWrap.o \
-	IMWrap.o \
-	OCWrap.o \
-	OMWrap.o \
-	lcWrap.o \
-	mbWMProps.o \
-	utf8WMProps.o \
-	mbWrap.o \
-	wcWrap.o \
-	utf8Wrap.o \
-	FilterEv.o \
-	RegstFlt.o \
-	locking.o \
-	LockDis.o \
-	x11trans.o \
-	ximtrans.o \
-	$(XKBOBJS) $(LCOBJS) $(MISCOBJS)
-
-LCSRCS = \
-	SetLocale.c \
-	imCallbk.c \
-	imConv.c \
-	imDefFlt.c \
-	imDefIc.c \
-	imDefIm.c \
-	imDefLkup.c \
-	imDispch.c \
-	imEvToWire.c \
-	imExten.c \
-	imImSw.c \
-	imInsClbk.c \
-	imInt.c \
-	imKStoUCS.c \
-	imLcFlt.c \
-	imLcGIc.c \
-	imLcIc.c \
-	imLcIm.c \
-	imLcLkup.c \
-	imLcPrs.c \
-	imLcSIc.c \
-	imRm.c \
-	imRmAttr.c \
-	imThaiFlt.c \
-	imThaiIc.c \
-	imThaiIm.c \
-	imTrX.c \
-	imTransR.c \
-	imTrans.c \
-	lcCT.c \
-	lcCharSet.c \
-	lcConv.c \
-	lcDB.c \
-	lcDefConv.c \
-	lcEuc.c \
-	lcFile.c \
-	lcGenConv.c \
-	lcGeneric.c \
-	lcInit.c \
-	lcJis.c \
-	lcPrTxt.c \
-	lcPubWrap.c \
-	lcPublic.c \
-	lcRM.c \
-	lcSjis.c \
-	lcStd.c \
-	lcTxtPr.c \
-	lcUTF8.c \
-	lcUtil.c \
-	omDefault.c \
-	omGeneric.c \
-	omImText.c \
-	omText.c \
-	omTextEsc.c \
-	omTextExt.c \
-	omTextPer.c \
-	omXChar.c
-
-LCOBJS = \
-	SetLocale.o \
-	imCallbk.o \
-	imConv.o \
-	imDefFlt.o \
-	imDefIc.o \
-	imDefIm.o \
-	imDefLkup.o \
-	imDispch.o \
-	imEvToWire.o \
-	imExten.o \
-	imImSw.o \
-	imInsClbk.o \
-	imInt.o \
-	imKStoUCS.o \
-	imLcFlt.o \
-	imLcGIc.o \
-	imLcIc.o \
-	imLcIm.o \
-	imLcLkup.o \
-	imLcPrs.o \
-	imLcSIc.o \
-	imRm.o \
-	imRmAttr.o \
-	imThaiFlt.o \
-	imThaiIc.o \
-	imThaiIm.o \
-	imTrX.o \
-	imTransR.o \
-	imTrans.o \
-	lcCT.o \
-	lcCharSet.o \
-	lcConv.o \
-	lcDB.o \
-	lcDefConv.o \
-	lcEuc.o \
-	lcFile.o \
-	lcGenConv.o \
-	lcGeneric.o \
-	lcInit.o \
-	lcJis.o \
-	lcPrTxt.o \
-	lcPubWrap.o \
-	lcPublic.o \
-	lcRM.o \
-	lcSjis.o \
-	lcStd.o \
-	lcTxtPr.o \
-	lcUTF8.o \
-	lcUtil.o \
-	omDefault.o \
-	omGeneric.o \
-	omImText.o \
-	omText.o \
-	omTextEsc.o \
-	omTextExt.o \
-	omTextPer.o \
-	omXChar.o
-
-#ifdef OS2Architecture
-MISCSRCS = os2Stubs.c
-#endif
-
-#ifdef OS2Architecture
-MISCOBJS = os2Stubs.o
-#endif
-
-OBJS = $(OBJS1) $(OBJS2) $(OBJS3)
-
-#if UseCygIPC
-REQUIREDLIBS = -lcygipc
-#endif
-
-#if !BuildServersOnly || XnestServer || BuildGLXLibrary || BuildClients
-#include <Library.tmpl>
-
-SpecialCLibObjectRule(ErrDes,$(ICONFIGFILES),$(EDB_DEFINES))
-SpecialCLibObjectRule(StrKeysym,$(ICONFIGFILES),$(KDB_DEFINES))
-SpecialCLibObjectRule(ConnDis,$(ICONFIGFILES),$(XDMAUTHDEFS) $(RPCDEFS) $(CONN_DEFINES) $(SOCK_DEFINES) $(POLL_DEFINES) $(XTRANS_X_DEFINES) $(K5INCL) $(K5DEFS))
-SpecialCLibObjectRule(x11trans,$(ICONFIGFILES),$(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_X_DEFINES) $(POLL_DEFINES))
-LinkFile(x11trans.c,$(TRANSCOMMSRC)/transport.c)
-SpecialCLibObjectRule(ximtrans,$(ICONFIGFILES),$(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_XIM_DEFINES) $(POLL_DEFINES))
-LinkFile(ximtrans.c,$(TRANSCOMMSRC)/transport.c)
-SpecialCLibObjectRule(OpenDis,$(ICONFIGFILES),$(BC_DEFINES) $(OPEN_DEFINES) $(XTRANS_X_DEFINES) $(XKB_DEFINES))
-SpecialCLibObjectRule(Wrap,$(ICONFIGFILES),$(XDMAUTHDEFS))
-SpecialCLibObjectRule(XlibInt,$(ICONFIGFILES),-I$(EXTINCSRC) $(CONN_DEFINES) $(POLL_DEFINES) $(XTRANS_X_DEFINES))
-SpecialCLibObjectRule(Font,$(ICONFIGFILES),$(SHM_DEFINES) $(XF86BIGFONT_DEFINES))
-SpecialCLibObjectRule(FontInfo,$(ICONFIGFILES),$(SHM_DEFINES) $(XF86BIGFONT_DEFINES))
-SpecialCLibObjectRule(cmsColNm,$(ICONFIGFILES),$(CMS_DEFINES))
-SpecialCLibObjectRule(globals,$(ICONFIGFILES),$(CONN_DEFINES))
-SpecialCLibObjectRule(Context,$(ICONFIGFILES),$(BC_DEFINES))
-SpecialCLibObjectRule(Xrm,$(_NOOP_),$(RCONST_DEFINES))
-SpecialCLibObjectRule(imTransR,$(ICONFIGFILES),$(CONN_DEFINES) $(XTRANS_XIM_DEFINES))
-SpecialCLibObjectRule(imTrans,$(ICONFIGFILES),$(CONN_DEFINES) $(XTRANS_XIM_DEFINES))
-SpecialCLibObjectRule(lcFile,$(ICONFIGFILES),$(XLC_DEFINES))
-#if BuildXKBlib
-SpecialCLibObjectRule(XKBCvt,$(_NOOP_),$(RCONST_DEFINES))
-SpecialCLibObjectRule(KeyBind,$(ICONFIGFILES),$(XKB_DEFINES))
-SpecialCLibObjectRule(XKBBind,$(ICONFIGFILES),$(XKB_DEFINES))
-SpecialCLibObjectRule(imConv,$(ICONFIGFILES),$(XKB_DEFINES))
-#endif
-#if HasKrb5
-SpecialCLibObjectRule(k5encode,$(_NOOP_),$(K5INCL))
-#endif
-
-#if InstallXcmsTxt
-InstallNonExecFile(Xcms.txt,$(LIBDIR))
-#endif
-InstallNonExecFile(XErrorDB,$(LIBDIR))
-InstallNonExecFile(XKeysymDB,$(LIBDIR))
-InstallLintLibrary(X11,$(LINTLIBDIR))
-
-
-LinkSourceFile(AuDispose.c,$(XAUTHSRC))
-LinkSourceFile(AuGetBest.c,$(XAUTHSRC))
-LinkSourceFile(AuFileName.c,$(XAUTHSRC))
-LinkSourceFile(AuRead.c,$(XAUTHSRC))
-#if HasKrb5
-LinkSourceFile(k5encode.c,$(XAUTHSRC))
-#endif
-#if HasXdmAuth
-LinkSourceFile(Wrap.h,$(XDMCPLIBSRC))
-LinkSourceFile(Wrap.c,$(XDMCPLIBSRC))
-LinkSourceFile(Wraphelp.c,$(XDMCPLIBSRC))
-#endif
-
-#ifdef QNX4Architecture
-LOCAL_LDFLAGS=-F
-#endif
-
-MAKEKEYS = ./makekeys
-
-ks_tables.h: $(XINCLUDESRC)/keysymdef.h util/makekeys.c
-	RemoveFiles($@ HostProgramTargetName(makekeys) makekeys.Osuf)
-	-HostLinkRule(HostProgramTargetName(makekeys),$(CFLAGS) $(LOCAL_LDFLAGS),util/makekeys.c,$(LDLIBS))
-	RunProgram(MAKEKEYS,< $(XINCLUDESRC)/keysymdef.h > ks_tables_h)
-	$(MV) ks_tables_h $@
-	RemoveFiles(HostProgramTargetName(makekeys) makekeys.Osuf ks_tables_h)
-
-includes:: ks_tables.h
-
-depend:: ks_tables.h
-
-clean::
-	RemoveFiles(ks_tables_h ks_tables.h HostProgramTargetName(makekeys))
-
-DependTarget3($(SRCS1),$(SRCS2),$(SRCS3))
-#else
-all::
-
-BuildIncludes($(HEADERS),IncSubdir,..)
-#endif
diff --git a/xc/lib/X11/InitExt.c b/xc/lib/X11/InitExt.c
deleted file mode 100644
index 296b0b268..000000000
--- a/xc/lib/X11/InitExt.c
+++ /dev/null
@@ -1,380 +0,0 @@
-/* $TOG: InitExt.c /main/23 1998/02/06 17:37:56 kaleb $ */
-/*
-
-Copyright 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/InitExt.c,v 1.4 1999/05/09 10:49:37 dawes Exp $ */
-
-#include <X11/Xlibint.h>
-#include <X11/Xos.h>
-#include <stdio.h>
-
-extern Bool _XUnknownWireEvent();
-extern Status _XUnknownNativeEvent();
-extern Bool _XDefaultWireError();
-
-/*
- * This routine is used to link a extension in so it will be called
- * at appropriate times.
- */
-
-#if NeedFunctionPrototypes
-XExtCodes *XInitExtension (
-	Display *dpy,
-	_Xconst char *name)
-#else
-XExtCodes *XInitExtension (dpy, name)
-	Display *dpy;
-	char *name;
-#endif
-{
-	XExtCodes codes;	/* temp. place for extension information. */
-	register _XExtension *ext;/* need a place to build it all */
-	if (!XQueryExtension(dpy, name, 
-		&codes.major_opcode, &codes.first_event,
-		&codes.first_error)) return (NULL);
-
-	LockDisplay (dpy);
-	if (! (ext = (_XExtension *) Xcalloc (1, sizeof (_XExtension))) ||
-	    ! (ext->name = Xmalloc((unsigned) strlen(name) + 1))) {
-	    if (ext) Xfree((char *) ext);
-	    UnlockDisplay(dpy);
-	    return (XExtCodes *) NULL;
-	}
-	codes.extension = dpy->ext_number++;
-	ext->codes = codes;
-	(void) strcpy(ext->name, name);
-
-	/* chain it onto the display list */	
-	ext->next = dpy->ext_procs;
-	dpy->ext_procs = ext;
-	UnlockDisplay (dpy);
-
-	return (&ext->codes);		/* tell him which extension */
-}
-
-XExtCodes *XAddExtension (dpy)
-    Display *dpy;
-{
-    register _XExtension *ext;
-
-    LockDisplay (dpy);
-    if (! (ext = (_XExtension *) Xcalloc (1, sizeof (_XExtension)))) {
-	UnlockDisplay(dpy);
-	return (XExtCodes *) NULL;
-    }
-    ext->codes.extension = dpy->ext_number++;
-
-    /* chain it onto the display list */
-    ext->next = dpy->ext_procs;
-    dpy->ext_procs = ext;
-    UnlockDisplay (dpy);
-
-    return (&ext->codes);		/* tell him which extension */
-}
-
-static _XExtension *XLookupExtension (dpy, extension)
-	register Display *dpy;	/* display */
-	register int extension;	/* extension number */
-{
-	register _XExtension *ext;
-	for (ext = dpy->ext_procs; ext; ext = ext->next)
-	    if (ext->codes.extension == extension) return (ext);
-	return (NULL);
-}
-
-XExtData **XEHeadOfExtensionList(object)
-    XEDataObject object;
-{
-    return *(XExtData ***)&object;
-}
-
-int
-XAddToExtensionList(structure, ext_data)
-    XExtData **structure;
-    XExtData *ext_data;
-{
-    ext_data->next = *structure;
-    *structure = ext_data;
-    return 1;
-}
-
-XExtData *XFindOnExtensionList(structure, number)
-    XExtData **structure;
-    int number;
-{
-    XExtData *ext;
-
-    ext = *structure;
-    while (ext && (ext->number != number))
-	ext = ext->next;
-    return ext;
-}
-
-/*
- * Routines to hang procs on the extension structure.
- */
-CreateGCType XESetCreateGC(dpy, extension, proc)
-	Display *dpy;		/* display */
-	int extension;		/* extension number */
-	CreateGCType proc;	/* routine to call when GC created */
-{
-	register _XExtension *e;	/* for lookup of extension */
-	register int (*oldproc)();
-	if ((e = XLookupExtension (dpy, extension)) == NULL) return (NULL);
-	LockDisplay(dpy);
-	oldproc = e->create_GC;
-	e->create_GC = proc;
-	UnlockDisplay(dpy);
-	return (CreateGCType)oldproc;
-}
-
-CopyGCType XESetCopyGC(dpy, extension, proc)
-	Display *dpy;		/* display */
-	int extension;		/* extension number */
-	CopyGCType proc;	/* routine to call when GC copied */
-{
-	register _XExtension *e;	/* for lookup of extension */
-	register int (*oldproc)();
-	if ((e = XLookupExtension (dpy, extension)) == NULL) return (NULL);
-	LockDisplay(dpy);
-	oldproc = e->copy_GC;
-	e->copy_GC = proc;
-	UnlockDisplay(dpy);
-	return (CopyGCType)oldproc;
-}
-
-FlushGCType XESetFlushGC(dpy, extension, proc)
-	Display *dpy;		/* display */
-	int extension;		/* extension number */
-	FlushGCType proc;	/* routine to call when GC copied */
-{
-	register _XExtension *e;	/* for lookup of extension */
-	register int (*oldproc)();
-	if ((e = XLookupExtension (dpy, extension)) == NULL) return (NULL);
-	LockDisplay(dpy);
-	oldproc = e->flush_GC;
-	e->flush_GC = proc;
-	UnlockDisplay(dpy);
-	return (FlushGCType)oldproc;
-}
-
-FreeGCType XESetFreeGC(dpy, extension, proc)
-	Display *dpy;		/* display */
-	int extension;		/* extension number */
-	FreeGCType proc;	/* routine to call when GC freed */
-{
-	register _XExtension *e;	/* for lookup of extension */
-	register int (*oldproc)();
-	if ((e = XLookupExtension (dpy, extension)) == NULL) return (NULL);
-	LockDisplay(dpy);
-	oldproc = e->free_GC;
-	e->free_GC = proc;
-	UnlockDisplay(dpy);
-	return (FreeGCType)oldproc;
-}
-
-CreateFontType XESetCreateFont(dpy, extension, proc)
-	Display *dpy;		/* display */
-	int extension;		/* extension number */
-	CreateFontType proc;	/* routine to call when font created */
-{
-	register _XExtension *e;	/* for lookup of extension */
-	register int (*oldproc)();
-	if ((e = XLookupExtension (dpy, extension)) == NULL) return (NULL);
-	LockDisplay(dpy);
-	oldproc = e->create_Font;
-	e->create_Font = proc;
-	UnlockDisplay(dpy);
-	return (CreateFontType)oldproc;
-}
-
-FreeFontType XESetFreeFont(dpy, extension, proc)
-	Display *dpy;		/* display */
-	int extension;		/* extension number */
-	FreeFontType proc;	/* routine to call when font freed */
-{
-	register _XExtension *e;	/* for lookup of extension */
-	register int (*oldproc)();
-	if ((e = XLookupExtension (dpy, extension)) == NULL) return (NULL);
-	LockDisplay(dpy);
-	oldproc = e->free_Font;
-	e->free_Font = proc;
-	UnlockDisplay(dpy);
-	return (FreeFontType)oldproc;
-}
-
-CloseDisplayType XESetCloseDisplay(dpy, extension, proc)
-	Display *dpy;		/* display */
-	int extension;		/* extension number */
-	CloseDisplayType proc;	/* routine to call when display closed */
-{
-	register _XExtension *e;	/* for lookup of extension */
-	register int (*oldproc)();
-	if ((e = XLookupExtension (dpy, extension)) == NULL) return (NULL);
-	LockDisplay(dpy);
-	oldproc = e->close_display;
-	e->close_display = proc;
-	UnlockDisplay(dpy);
-	return (CloseDisplayType)oldproc;
-}
-
-typedef Bool (*WireToEventType) (
-#if NeedFunctionPrototypes
-    Display*	/* display */,
-    XEvent*	/* re */,
-    xEvent*	/* event */
-#endif
-);
-
-WireToEventType XESetWireToEvent(dpy, event_number, proc)
-	Display *dpy;		/* display */
-	WireToEventType proc;	/* routine to call when converting event */
-	int event_number;	/* event routine to replace */
-{
-	register Bool (*oldproc)();
-	if (proc == NULL) proc = (WireToEventType)_XUnknownWireEvent;
-	LockDisplay (dpy);
-	oldproc = dpy->event_vec[event_number];
-	dpy->event_vec[event_number] = proc;
-	UnlockDisplay (dpy);
-	return (WireToEventType)oldproc;
-}
-
-typedef Status (*EventToWireType) (
-#if NeedFunctionPrototypes
-    Display*	/* display */,
-    XEvent*	/* re */,
-    xEvent*	/* event */
-#endif
-);
-
-EventToWireType XESetEventToWire(dpy, event_number, proc)
-	Display *dpy;		/* display */
-	EventToWireType proc;	/* routine to call when converting event */
-	int event_number;	/* event routine to replace */
-{
-	register Status (*oldproc)();
-	if (proc == NULL) proc = (EventToWireType) _XUnknownNativeEvent;
-	LockDisplay (dpy);
-	oldproc = dpy->wire_vec[event_number];
-	dpy->wire_vec[event_number] = proc;
-	UnlockDisplay(dpy);
-	return (EventToWireType)oldproc;
-}
-
-typedef Bool (*WireToErrorType) (
-#if NeedFunctionPrototypes
-    Display*	/* display */,
-    XErrorEvent* /* he */,
-    xError*	/* we */
-#endif
-);
-
-WireToErrorType XESetWireToError(dpy, error_number, proc)
-	Display *dpy;		/* display */
-	WireToErrorType proc;	/* routine to call when converting error */
-	int error_number;	/* error routine to replace */
-{
-	register Bool (*oldproc)();
-	if (proc == NULL) proc = (WireToErrorType)_XDefaultWireError;
-	LockDisplay (dpy);
-	if (!dpy->error_vec) {
-	    int i;
-	    dpy->error_vec = (Bool (**)())Xmalloc(256 * sizeof(oldproc));
-	    for (i = 1; i < 256; i++)
-		dpy->error_vec[i] = _XDefaultWireError;
-	}
-	if (dpy->error_vec) {
-	    oldproc = dpy->error_vec[error_number];
-	    dpy->error_vec[error_number] = proc;
-	}
-	UnlockDisplay (dpy);
-	return (WireToErrorType)oldproc;
-}
-
-ErrorType XESetError(dpy, extension, proc)
-	Display *dpy;		/* display */
-	int extension;		/* extension number */
-	ErrorType proc;		/* routine to call when X error happens */
-{
-	register _XExtension *e;	/* for lookup of extension */
-	register int (*oldproc)();
-	if ((e = XLookupExtension (dpy, extension)) == NULL) return (NULL);
-	LockDisplay(dpy);
-	oldproc = e->error;
-	e->error = proc;
-	UnlockDisplay(dpy);
-	return (ErrorType)oldproc;
-}
-
-ErrorStringType XESetErrorString(dpy, extension, proc)
-	Display *dpy;		/* display */
-	int extension;		/* extension number */
-	ErrorStringType proc;	/* routine to call when I/O error happens */
-{
-	register _XExtension *e;	/* for lookup of extension */
-	register char *(*oldproc)();
-	if ((e = XLookupExtension (dpy, extension)) == NULL) return (NULL);
-	LockDisplay(dpy);
-	oldproc = e->error_string;
-	e->error_string = proc;
-	UnlockDisplay(dpy);
-	return (ErrorStringType)oldproc;
-}
-
-PrintErrorType XESetPrintErrorValues(dpy, extension, proc)
-	Display *dpy;		/* display */
-	int extension;		/* extension number */
-	PrintErrorType proc;	/* routine to call to print */
-{
-	register _XExtension *e;	/* for lookup of extension */
-	register void (*oldproc)();
-	if ((e = XLookupExtension (dpy, extension)) == NULL) return (NULL);
-	LockDisplay(dpy);
-	oldproc = e->error_values;
-	e->error_values = proc;
-	UnlockDisplay(dpy);
-	return (PrintErrorType)oldproc;
-}
-
-BeforeFlushType XESetBeforeFlush(dpy, extension, proc)
-	Display *dpy;		/* display */
-	int extension;		/* extension number */
-	BeforeFlushType proc;	/* routine to call on flush */
-{
-	register _XExtension *e;	/* for lookup of extension */
-	register void (*oldproc)();
-	register _XExtension *ext;
-	if ((e = XLookupExtension (dpy, extension)) == NULL) return (NULL);
-	LockDisplay(dpy);
-	oldproc = e->before_flush;
-	e->before_flush = proc;
-	for (ext = dpy->flushes; ext && ext != e; ext = ext->next)
-	    ;
-	if (!ext) {
-	    e->next_flush = dpy->flushes;
-	    dpy->flushes = e;
-	}	    
-	UnlockDisplay(dpy);
-	return (BeforeFlushType)oldproc;
-}
diff --git a/xc/lib/X11/InsCmap.c b/xc/lib/X11/InsCmap.c
deleted file mode 100644
index 100903d72..000000000
--- a/xc/lib/X11/InsCmap.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* $TOG: InsCmap.c /main/6 1998/02/06 17:38:04 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/InsCmap.c,v 1.2 1999/05/09 10:49:37 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XInstallColormap(dpy, cmap)
-register Display *dpy;
-Colormap cmap;
-{
-    register xResourceReq *req;
-    LockDisplay(dpy);
-    GetResReq(InstallColormap, cmap, req);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/IntAtom.c b/xc/lib/X11/IntAtom.c
deleted file mode 100644
index b1c3b8095..000000000
--- a/xc/lib/X11/IntAtom.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/* $TOG: IntAtom.c /main/20 1998/02/06 17:38:11 kaleb $ */
-/*
-
-Copyright 1986, 1990, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/IntAtom.c,v 1.2 1999/05/09 10:49:38 dawes Exp $ */
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-/* XXX this table def is duplicated in GetAtomNm.c, keep them consistent! */
-
-#define TABLESIZE 64
-
-typedef struct _Entry {
-    unsigned long sig;
-    Atom atom;
-} EntryRec, *Entry;
-
-#define RESERVED ((Entry) 1)
-
-#define EntryName(e) ((char *)(e+1))
-
-typedef struct _XDisplayAtoms {
-    Entry table[TABLESIZE];
-} AtomTable;
-
-#define HASH(sig) ((sig) & (TABLESIZE-1))
-#define REHASHVAL(sig) ((((sig) % (TABLESIZE-3)) + 2) | 1)
-#define REHASH(idx,rehash) ((idx + rehash) & (TABLESIZE-1))
-
-void
-_XFreeAtomTable(dpy)
-    Display *dpy;
-{
-    register Entry *table;
-    register int i;
-    register Entry e;
-
-    if (dpy->atoms) {
-	table = dpy->atoms->table;
-	for (i = TABLESIZE; --i >= 0; ) {
-	    if ((e = *table++) && (e != RESERVED))
-		Xfree((char *)e);
-	}
-	Xfree((char *)dpy->atoms);
-    }
-}
-
-static
-Atom _XInternAtom(dpy, name, onlyIfExists, psig, pidx, pn)
-    Display *dpy;
-    char *name;
-    Bool onlyIfExists;
-    unsigned long *psig;
-    int *pidx;
-    int *pn;
-{
-    register AtomTable *atoms;
-    register char *s1, c, *s2;
-    register unsigned long sig;
-    register int idx, i;
-    Entry e;
-    int n, firstidx, rehash;
-    xInternAtomReq *req;
-
-    /* look in the cache first */
-    if (!(atoms = dpy->atoms)) {
-	dpy->atoms = atoms = (AtomTable *)Xcalloc(1, sizeof(AtomTable));
-	dpy->free_funcs->atoms = _XFreeAtomTable;
-    }
-    sig = 0;
-    for (s1 = (char *)name; (c = *s1++); )
-	sig += c;
-    n = s1 - (char *)name - 1;
-    if (atoms) {
-	firstidx = idx = HASH(sig);
-	while ((e = atoms->table[idx])) {
-	    if (e != RESERVED && e->sig == sig) {
-	    	for (i = n, s1 = (char *)name, s2 = EntryName(e); --i >= 0; ) {
-		    if (*s1++ != *s2++)
-		    	goto nomatch;
-	    	}
-	    	if (!*s2)
-		    return e->atom;
-	    }
-nomatch:    if (idx == firstidx)
-		rehash = REHASHVAL(sig);
-	    idx = REHASH(idx, rehash);
-	    if (idx == firstidx)
-		break;
-	}
-    }
-    *psig = sig;
-    *pidx = idx;
-    if (atoms && !atoms->table[idx])
-	atoms->table[idx] = RESERVED; /* reserve slot */
-    *pn = n;
-    /* not found, go to the server */
-    GetReq(InternAtom, req);
-    req->nbytes = n;
-    req->onlyIfExists = onlyIfExists;
-    req->length += (n+3)>>2;
-    Data(dpy, name, n);
-    return None;
-}
-
-void
-_XUpdateAtomCache(dpy, name, atom, sig, idx, n)
-    Display *dpy;
-    char *name;
-    Atom atom;
-    unsigned long sig;
-    int idx;
-    int n;
-{
-    Entry e, oe;
-    register char *s1;
-    register char c;
-    int firstidx, rehash;
-
-    if (!dpy->atoms) {
-	if (idx < 0) {
-	    dpy->atoms = (AtomTable *)Xcalloc(1, sizeof(AtomTable));
-	    dpy->free_funcs->atoms = _XFreeAtomTable;
-	}
-	if (!dpy->atoms)
-	    return;
-    }
-    if (!sig) {
-	for (s1 = (char *)name; (c = *s1++); )
-	    sig += c;
-	n = s1 - (char *)name - 1;
-	if (idx < 0) {
-	    firstidx = idx = HASH(sig);
-	    if (dpy->atoms->table[idx]) {
-		rehash = REHASHVAL(sig);
-		do
-		    idx = REHASH(idx, rehash);
-		while (idx != firstidx && dpy->atoms->table[idx]);
-	    }
-	}
-    }
-    e = (Entry)Xmalloc(sizeof(EntryRec) + n + 1);
-    if (e) {
-	e->sig = sig;
-	e->atom = atom;
-	strcpy(EntryName(e), name);
-	if ((oe = dpy->atoms->table[idx]) && (oe != RESERVED))
-	    Xfree((char *)oe);
-	dpy->atoms->table[idx] = e;
-    }
-}
-
-#if NeedFunctionPrototypes
-Atom XInternAtom (
-    Display *dpy,
-    _Xconst char *name,
-    Bool onlyIfExists)
-#else
-Atom XInternAtom (dpy, name, onlyIfExists)
-    Display *dpy;
-    char *name;
-    Bool onlyIfExists;
-#endif
-{
-    Atom atom;
-    unsigned long sig;
-    int idx, n;
-    xInternAtomReply rep;
-
-    if (!name)
-	name = "";
-    LockDisplay(dpy);
-    if ((atom = _XInternAtom(dpy, name, onlyIfExists, &sig, &idx, &n))) {
-	UnlockDisplay(dpy);
-	return atom;
-    }
-    if (dpy->atoms && dpy->atoms->table[idx] == RESERVED)
-	dpy->atoms->table[idx] = NULL; /* unreserve slot */
-    if (_XReply (dpy, (xReply *)&rep, 0, xTrue)) {
-	if ((atom = rep.atom))
-	    _XUpdateAtomCache(dpy, name, atom, sig, idx, n);
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return (rep.atom);
-}
-
-typedef struct {
-    unsigned long start_seq;
-    unsigned long stop_seq;
-    char **names;
-    Atom *atoms;
-    int count;
-    Status status;
-} _XIntAtomState;
-
-static
-Bool _XIntAtomHandler(dpy, rep, buf, len, data)
-    register Display *dpy;
-    register xReply *rep;
-    char *buf;
-    int len;
-    XPointer data;
-{
-    register _XIntAtomState *state;
-    register int i, idx;
-    xInternAtomReply replbuf;
-    register xInternAtomReply *repl;
-
-    state = (_XIntAtomState *)data;
-    if (dpy->last_request_read < state->start_seq ||
-	dpy->last_request_read > state->stop_seq)
-	return False;
-    for (i = 0; i < state->count; i++) {
-	if (state->atoms[i] & 0x80000000) {
-	    idx = ~state->atoms[i];
-	    state->atoms[i] = None;
-	    break;
-	}
-    }
-    if (i >= state->count)
-	return False;
-    if (rep->generic.type == X_Error) {
-	state->status = 0;
-	return False;
-    }
-    repl = (xInternAtomReply *)
-	_XGetAsyncReply(dpy, (char *)&replbuf, rep, buf, len,
-			(SIZEOF(xInternAtomReply) - SIZEOF(xReply)) >> 2,
-			True);
-    if ((state->atoms[i] = repl->atom))
-	_XUpdateAtomCache(dpy, state->names[i], (Atom) repl->atom,
-			  (unsigned long)0, idx, 0);
-    return True;
-}
-
-Status
-XInternAtoms (dpy, names, count, onlyIfExists, atoms_return)
-    Display *dpy;
-    char **names;
-    int count;
-    Bool onlyIfExists;
-    Atom *atoms_return;
-{
-    int i, idx, n, tidx;
-    unsigned long sig;
-    _XAsyncHandler async;
-    _XIntAtomState async_state;
-    int missed = -1;
-    xInternAtomReply rep;
-
-    LockDisplay(dpy);
-    async_state.start_seq = dpy->request + 1;
-    async_state.atoms = atoms_return;
-    async_state.names = names;
-    async_state.count = count - 1;
-    async_state.status = 1;
-    async.next = dpy->async_handlers;
-    async.handler = _XIntAtomHandler;
-    async.data = (XPointer)&async_state;
-    dpy->async_handlers = &async;
-    for (i = 0; i < count; i++) {
-	if (!(atoms_return[i] = _XInternAtom(dpy, names[i], onlyIfExists,
-					     &sig, &idx, &n))) {
-	    missed = i;
-	    atoms_return[i] = ~((Atom)idx);
-	    async_state.stop_seq = dpy->request;
-	}
-    }
-    if (missed >= 0) {
-        if (dpy->atoms) {
-	    /* unreserve anything we just reserved */
-	    for (i = 0; i < count; i++) {
-		if (atoms_return[i] & 0x80000000) {
-		    tidx = ~atoms_return[i];
-		    if (dpy->atoms->table[tidx] == RESERVED)
-			dpy->atoms->table[tidx] = NULL;
-		}
-	    }
-        }
-	if (_XReply (dpy, (xReply *)&rep, 0, xTrue)) {
-	    if ((atoms_return[missed] = rep.atom))
-		_XUpdateAtomCache(dpy, names[missed], (Atom) rep.atom, 
-				  sig, idx, n);
-	} else {
-	    atoms_return[missed] = None;
-	    async_state.status = 0;
-	}
-    }
-    DeqAsyncHandler(dpy, &async);
-    UnlockDisplay(dpy);
-    if (missed >= 0)
-	SyncHandle();
-    return async_state.status;
-}
diff --git a/xc/lib/X11/KeyBind.c b/xc/lib/X11/KeyBind.c
deleted file mode 100644
index 1cc5e83e1..000000000
--- a/xc/lib/X11/KeyBind.c
+++ /dev/null
@@ -1,735 +0,0 @@
-/* $TOG: KeyBind.c /main/56 1998/02/06 17:38:19 kaleb $ */
-/* 
-
-Copyright 1985, 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/KeyBind.c,v 1.2 1999/05/09 10:49:38 dawes Exp $ */
-
-/* Beware, here be monsters (still under construction... - JG */
-
-#define NEED_EVENTS
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
-#define XK_MISCELLANY
-#define XK_LATIN1
-#define XK_LATIN2
-#define XK_LATIN3
-#define XK_LATIN4
-#define XK_CYRILLIC
-#define XK_GREEK
-#define XK_XKB_KEYS
-#include <X11/keysymdef.h>
-#include <stdio.h>
-
-#include "XKBlib.h"
-
-#ifdef USE_OWN_COMPOSE
-#include "imComp.h"
-
-#endif
-
-#ifdef XKB
-#define	XKeycodeToKeysym	_XKeycodeToKeysym
-#define	XKeysymToKeycode	_XKeysymToKeycode
-#define	XLookupKeysym		_XLookupKeysym
-#define	XRefreshKeyboardMapping	_XRefreshKeyboardMapping
-#define	XLookupString		_XLookupString
-/* XKBBind.c */
-#else
-#define	XkbKeysymToModifiers	_XKeysymToModifiers
-#endif
-
-#define AllMods (ShiftMask|LockMask|ControlMask| \
-		 Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask)
-
-static void ComputeMaskFromKeytrans();
-int _XKeyInitialize();
-
-struct _XKeytrans {
-	struct _XKeytrans *next;/* next on list */
-	char *string;		/* string to return when the time comes */
-	int len;		/* length of string (since NULL is legit)*/
-	KeySym key;		/* keysym rebound */
-	unsigned int state;	/* modifier state */
-	KeySym *modifiers;	/* modifier keysyms you want */
-	int mlen;		/* length of modifier list */
-};
-
-static KeySym
-#if NeedFunctionPrototypes
-KeyCodetoKeySym(register Display *dpy, KeyCode keycode, int col)
-#else
-KeyCodetoKeySym(dpy, keycode, col)
-    register Display *dpy;
-    KeyCode keycode;
-    int col;
-#endif
-{
-    register int per = dpy->keysyms_per_keycode;
-    register KeySym *syms;
-    KeySym lsym, usym;
-
-    if ((col < 0) || ((col >= per) && (col > 3)) ||
-	((int)keycode < dpy->min_keycode) || ((int)keycode > dpy->max_keycode))
-      return NoSymbol;
-
-    syms = &dpy->keysyms[(keycode - dpy->min_keycode) * per];
-    if (col < 4) {
-	if (col > 1) {
-	    while ((per > 2) && (syms[per - 1] == NoSymbol))
-		per--;
-	    if (per < 3)
-		col -= 2;
-	}
-	if ((per <= (col|1)) || (syms[col|1] == NoSymbol)) {
-	    XConvertCase(syms[col&~1], &lsym, &usym);
-	    if (!(col & 1))
-		return lsym;
-	    else if (usym == lsym)
-		return NoSymbol;
-	    else
-		return usym;
-	}
-    }
-    return syms[col];
-}
-
-#if NeedFunctionPrototypes
-KeySym
-XKeycodeToKeysym(Display *dpy,
-#if NeedWidePrototypes
-		 unsigned int kc,
-#else
-		 KeyCode kc,
-#endif
-		 int col)
-#else
-KeySym
-XKeycodeToKeysym(dpy, kc, col)
-    Display *dpy;
-    KeyCode kc;
-    int col;
-#endif
-{
-    if ((! dpy->keysyms) && (! _XKeyInitialize(dpy)))
-	return NoSymbol;
-    return KeyCodetoKeySym(dpy, kc, col);
-}
-
-KeyCode
-XKeysymToKeycode(dpy, ks)
-    Display *dpy;
-    KeySym ks;
-{
-    register int i, j;
-
-    if ((! dpy->keysyms) && (! _XKeyInitialize(dpy)))
-	return (KeyCode) 0;
-    for (j = 0; j < dpy->keysyms_per_keycode; j++) {
-	for (i = dpy->min_keycode; i <= dpy->max_keycode; i++) {
-	    if (KeyCodetoKeySym(dpy, (KeyCode) i, j) == ks)
-		return i;
-	}
-    }
-    return 0;
-}
-
-KeySym
-XLookupKeysym(event, col)
-    register XKeyEvent *event;
-    int col;
-{
-    if ((! event->display->keysyms) && (! _XKeyInitialize(event->display)))
-	return NoSymbol;
-    return KeyCodetoKeySym(event->display, event->keycode, col);
-}
-
-static void
-ResetModMap(dpy)
-    Display *dpy;
-{
-    register XModifierKeymap *map;
-    register int i, j, n;
-    KeySym sym;
-    register struct _XKeytrans *p;
-
-    map = dpy->modifiermap;
-    /* If any Lock key contains Caps_Lock, then interpret as Caps_Lock,
-     * else if any contains Shift_Lock, then interpret as Shift_Lock,
-     * else ignore Lock altogether.
-     */
-    dpy->lock_meaning = NoSymbol;
-    /* Lock modifiers are in the second row of the matrix */
-    n = 2 * map->max_keypermod;
-    for (i = map->max_keypermod; i < n; i++) {
-	for (j = 0; j < dpy->keysyms_per_keycode; j++) {
-	    sym = KeyCodetoKeySym(dpy, map->modifiermap[i], j);
-	    if (sym == XK_Caps_Lock) {
-		dpy->lock_meaning = XK_Caps_Lock;
-		break;
-	    } else if (sym == XK_Shift_Lock) {
-		dpy->lock_meaning = XK_Shift_Lock;
-	    }
-	    else if (sym == XK_ISO_Lock) {
-		dpy->lock_meaning = XK_Caps_Lock;
-		break;
-	    }
-	}
-    }
-    /* Now find any Mod<n> modifier acting as the Group or Numlock modifier */
-    dpy->mode_switch = 0;
-    dpy->num_lock = 0;
-    n *= 4;
-    for (i = 3*map->max_keypermod; i < n; i++) {
-	for (j = 0; j < dpy->keysyms_per_keycode; j++) {
-	    sym = KeyCodetoKeySym(dpy, map->modifiermap[i], j);
-	    if (sym == XK_Mode_switch)
-		dpy->mode_switch |= 1 << (i / map->max_keypermod);
-	    if (sym == XK_Num_Lock)
-		dpy->num_lock |= 1 << (i / map->max_keypermod);
-	}
-    }
-    for (p = dpy->key_bindings; p; p = p->next)
-	ComputeMaskFromKeytrans(dpy, p);
-}
-
-static int
-InitModMap(dpy)
-    Display *dpy;
-{
-    register XModifierKeymap *map;
-
-    if (! (map = XGetModifierMapping(dpy)))
-	return 0;
-    LockDisplay(dpy);
-    if (dpy->modifiermap)
-	XFreeModifiermap(dpy->modifiermap);
-    dpy->modifiermap = map;
-    dpy->free_funcs->modifiermap = XFreeModifiermap;
-    if (dpy->keysyms)
-	ResetModMap(dpy);
-    UnlockDisplay(dpy);
-    return 1;
-}
-
-int
-XRefreshKeyboardMapping(event)
-    register XMappingEvent *event;
-{
-
-    if(event->request == MappingKeyboard) {
-	/* XXX should really only refresh what is necessary
-	 * for now, make initialize test fail
-	 */
-	LockDisplay(event->display);
-	if (event->display->keysyms) {
-	     Xfree ((char *)event->display->keysyms);
-	     event->display->keysyms = NULL;
-	}
-	UnlockDisplay(event->display);
-    }
-    if(event->request == MappingModifier) {
-	LockDisplay(event->display);
-	if (event->display->modifiermap) {
-	    XFreeModifiermap(event->display->modifiermap);
-	    event->display->modifiermap = NULL;
-	}
-	UnlockDisplay(event->display);
-	/* go ahead and get it now, since initialize test may not fail */
-	if (event->display->keysyms)
-	    (void) InitModMap(event->display);
-    }
-    return 1;
-}
-
-int
-_XKeyInitialize(dpy)
-    Display *dpy;
-{
-    int per, n;
-    KeySym *keysyms;
-
-    /* 
-     * lets go get the keysyms from the server.
-     */
-    if (!dpy->keysyms) {
-	n = dpy->max_keycode - dpy->min_keycode + 1;
-	keysyms = XGetKeyboardMapping (dpy, (KeyCode) dpy->min_keycode,
-				       n, &per);
-	/* keysyms may be NULL */
-	if (! keysyms) return 0;
-
-	LockDisplay(dpy);
-	if (dpy->keysyms)
-	    Xfree ((char *)dpy->keysyms);
-	dpy->keysyms = keysyms;
-	dpy->keysyms_per_keycode = per;
-	if (dpy->modifiermap)
-	    ResetModMap(dpy);
-	UnlockDisplay(dpy);
-    }
-    if (!dpy->modifiermap)
-        return InitModMap(dpy);
-    return 1;
-}
-
-void
-XConvertCase(sym, lower, upper)
-    register KeySym sym;
-    KeySym *lower;
-    KeySym *upper;
-{
-    *lower = sym;
-    *upper = sym;
-    switch(sym >> 8) {
-    case 0: /* Latin 1 */
-	if ((sym >= XK_A) && (sym <= XK_Z))
-	    *lower += (XK_a - XK_A);
-	else if ((sym >= XK_a) && (sym <= XK_z))
-	    *upper -= (XK_a - XK_A);
-	else if ((sym >= XK_Agrave) && (sym <= XK_Odiaeresis))
-	    *lower += (XK_agrave - XK_Agrave);
-	else if ((sym >= XK_agrave) && (sym <= XK_odiaeresis))
-	    *upper -= (XK_agrave - XK_Agrave);
-	else if ((sym >= XK_Ooblique) && (sym <= XK_Thorn))
-	    *lower += (XK_oslash - XK_Ooblique);
-	else if ((sym >= XK_oslash) && (sym <= XK_thorn))
-	    *upper -= (XK_oslash - XK_Ooblique);
-	break;
-    case 1: /* Latin 2 */
-	/* Assume the KeySym is a legal value (ignore discontinuities) */
-	if (sym == XK_Aogonek)
-	    *lower = XK_aogonek;
-	else if (sym >= XK_Lstroke && sym <= XK_Sacute)
-	    *lower += (XK_lstroke - XK_Lstroke);
-	else if (sym >= XK_Scaron && sym <= XK_Zacute)
-	    *lower += (XK_scaron - XK_Scaron);
-	else if (sym >= XK_Zcaron && sym <= XK_Zabovedot)
-	    *lower += (XK_zcaron - XK_Zcaron);
-	else if (sym == XK_aogonek)
-	    *upper = XK_Aogonek;
-	else if (sym >= XK_lstroke && sym <= XK_sacute)
-	    *upper -= (XK_lstroke - XK_Lstroke);
-	else if (sym >= XK_scaron && sym <= XK_zacute)
-	    *upper -= (XK_scaron - XK_Scaron);
-	else if (sym >= XK_zcaron && sym <= XK_zabovedot)
-	    *upper -= (XK_zcaron - XK_Zcaron);
-	else if (sym >= XK_Racute && sym <= XK_Tcedilla)
-	    *lower += (XK_racute - XK_Racute);
-	else if (sym >= XK_racute && sym <= XK_tcedilla)
-	    *upper -= (XK_racute - XK_Racute);
-	break;
-    case 2: /* Latin 3 */
-	/* Assume the KeySym is a legal value (ignore discontinuities) */
-	if (sym >= XK_Hstroke && sym <= XK_Hcircumflex)
-	    *lower += (XK_hstroke - XK_Hstroke);
-	else if (sym >= XK_Gbreve && sym <= XK_Jcircumflex)
-	    *lower += (XK_gbreve - XK_Gbreve);
-	else if (sym >= XK_hstroke && sym <= XK_hcircumflex)
-	    *upper -= (XK_hstroke - XK_Hstroke);
-	else if (sym >= XK_gbreve && sym <= XK_jcircumflex)
-	    *upper -= (XK_gbreve - XK_Gbreve);
-	else if (sym >= XK_Cabovedot && sym <= XK_Scircumflex)
-	    *lower += (XK_cabovedot - XK_Cabovedot);
-	else if (sym >= XK_cabovedot && sym <= XK_scircumflex)
-	    *upper -= (XK_cabovedot - XK_Cabovedot);
-	break;
-    case 3: /* Latin 4 */
-	/* Assume the KeySym is a legal value (ignore discontinuities) */
-	if (sym >= XK_Rcedilla && sym <= XK_Tslash)
-	    *lower += (XK_rcedilla - XK_Rcedilla);
-	else if (sym >= XK_rcedilla && sym <= XK_tslash)
-	    *upper -= (XK_rcedilla - XK_Rcedilla);
-	else if (sym == XK_ENG)
-	    *lower = XK_eng;
-	else if (sym == XK_eng)
-	    *upper = XK_ENG;
-	else if (sym >= XK_Amacron && sym <= XK_Umacron)
-	    *lower += (XK_amacron - XK_Amacron);
-	else if (sym >= XK_amacron && sym <= XK_umacron)
-	    *upper -= (XK_amacron - XK_Amacron);
-	break;
-    case 6: /* Cyrillic */
-	/* Assume the KeySym is a legal value (ignore discontinuities) */
-	if (sym >= XK_Serbian_DJE && sym <= XK_Serbian_DZE)
-	    *lower -= (XK_Serbian_DJE - XK_Serbian_dje);
-	else if (sym >= XK_Serbian_dje && sym <= XK_Serbian_dze)
-	    *upper += (XK_Serbian_DJE - XK_Serbian_dje);
-	else if (sym >= XK_Cyrillic_YU && sym <= XK_Cyrillic_HARDSIGN)
-	    *lower -= (XK_Cyrillic_YU - XK_Cyrillic_yu);
-	else if (sym >= XK_Cyrillic_yu && sym <= XK_Cyrillic_hardsign)
-	    *upper += (XK_Cyrillic_YU - XK_Cyrillic_yu);
-        break;
-    case 7: /* Greek */
-	/* Assume the KeySym is a legal value (ignore discontinuities) */
-	if (sym >= XK_Greek_ALPHAaccent && sym <= XK_Greek_OMEGAaccent)
-	    *lower += (XK_Greek_alphaaccent - XK_Greek_ALPHAaccent);
-	else if (sym >= XK_Greek_alphaaccent && sym <= XK_Greek_omegaaccent &&
-		 sym != XK_Greek_iotaaccentdieresis &&
-		 sym != XK_Greek_upsilonaccentdieresis)
-	    *upper -= (XK_Greek_alphaaccent - XK_Greek_ALPHAaccent);
-	else if (sym >= XK_Greek_ALPHA && sym <= XK_Greek_OMEGA)
-	    *lower += (XK_Greek_alpha - XK_Greek_ALPHA);
-	else if (sym >= XK_Greek_alpha && sym <= XK_Greek_omega &&
-		 sym != XK_Greek_finalsmallsigma)
-	    *upper -= (XK_Greek_alpha - XK_Greek_ALPHA);
-        break;
-    }
-}
-
-int
-#if NeedFunctionPrototypes
-_XTranslateKey(	register Display *dpy,
-		KeyCode keycode,
-		register unsigned int modifiers,
-		unsigned int *modifiers_return,
-		KeySym *keysym_return)
-#else
-_XTranslateKey(dpy, keycode, modifiers, modifiers_return, keysym_return)
-    register Display *dpy;
-    KeyCode keycode;
-    register unsigned int modifiers;
-    unsigned int *modifiers_return;
-    KeySym *keysym_return;
-#endif
-{
-    int per;
-    register KeySym *syms;
-    KeySym sym, lsym, usym;
-
-    if ((! dpy->keysyms) && (! _XKeyInitialize(dpy)))
-	return 0;
-    *modifiers_return = ((ShiftMask|LockMask)
-			 | dpy->mode_switch | dpy->num_lock);
-    if (((int)keycode < dpy->min_keycode) || ((int)keycode > dpy->max_keycode))
-    {
-	*keysym_return = NoSymbol;
-	return 1;
-    }
-    per = dpy->keysyms_per_keycode;
-    syms = &dpy->keysyms[(keycode - dpy->min_keycode) * per];
-    while ((per > 2) && (syms[per - 1] == NoSymbol))
-	per--;
-    if ((per > 2) && (modifiers & dpy->mode_switch)) {
-	syms += 2;
-	per -= 2;
-    }
-    if ((modifiers & dpy->num_lock) &&
-	(per > 1 && (IsKeypadKey(syms[1]) || IsPrivateKeypadKey(syms[1])))) {
-	if ((modifiers & ShiftMask) ||
-	    ((modifiers & LockMask) && (dpy->lock_meaning == XK_Shift_Lock)))
-	    *keysym_return = syms[0];
-	else
-	    *keysym_return = syms[1];
-    } else if (!(modifiers & ShiftMask) &&
-	(!(modifiers & LockMask) || (dpy->lock_meaning == NoSymbol))) {
-	if ((per == 1) || (syms[1] == NoSymbol))
-	    XConvertCase(syms[0], keysym_return, &usym);
-	else
-	    *keysym_return = syms[0];
-    } else if (!(modifiers & LockMask) ||
-	       (dpy->lock_meaning != XK_Caps_Lock)) {
-	if ((per == 1) || ((usym = syms[1]) == NoSymbol))
-	    XConvertCase(syms[0], &lsym, &usym);
-	*keysym_return = usym;
-    } else {
-	if ((per == 1) || ((sym = syms[1]) == NoSymbol))
-	    sym = syms[0];
-	XConvertCase(sym, &lsym, &usym);
-	if (!(modifiers & ShiftMask) && (sym != syms[0]) &&
-	    ((sym != usym) || (lsym == usym)))
-	    XConvertCase(syms[0], &lsym, &usym);
-	*keysym_return = usym;
-    }
-    if (*keysym_return == XK_VoidSymbol)
-	*keysym_return = NoSymbol;
-    return 1;
-}
-
-int
-_XTranslateKeySym(dpy, symbol, modifiers, buffer, nbytes)
-    Display *dpy;
-    register KeySym symbol;
-    unsigned int modifiers;
-    char *buffer;
-    int nbytes;
-{
-    register struct _XKeytrans *p; 
-    int length;
-    unsigned long hiBytes;
-    register unsigned char c;
-
-    if (!symbol)
-	return 0;
-    /* see if symbol rebound, if so, return that string. */
-    for (p = dpy->key_bindings; p; p = p->next) {
-	if (((modifiers & AllMods) == p->state) && (symbol == p->key)) {
-	    length = p->len;
-	    if (length > nbytes) length = nbytes;
-	    memcpy (buffer, p->string, length);
-	    return length;
-	}
-    }
-    /* try to convert to Latin-1, handling control */
-    hiBytes = symbol >> 8;
-    if (!(nbytes &&
-	  ((hiBytes == 0) ||
-	   ((hiBytes == 0xFF) &&
-	    (((symbol >= XK_BackSpace) && (symbol <= XK_Clear)) ||
-	     (symbol == XK_Return) ||
-	     (symbol == XK_Escape) ||
-	     (symbol == XK_KP_Space) ||
-	     (symbol == XK_KP_Tab) ||
-	     (symbol == XK_KP_Enter) ||
-	     ((symbol >= XK_KP_Multiply) && (symbol <= XK_KP_9)) ||
-	     (symbol == XK_KP_Equal) ||
-	     (symbol == XK_Delete))))))
-	return 0;
-
-    /* if X keysym, convert to ascii by grabbing low 7 bits */
-    if (symbol == XK_KP_Space)
-	c = XK_space & 0x7F; /* patch encoding botch */
-    else if (hiBytes == 0xFF)
-	c = symbol & 0x7F;
-    else
-	c = symbol & 0xFF;
-    /* only apply Control key if it makes sense, else ignore it */
-    if (modifiers & ControlMask) {
-	if ((c >= '@' && c < '\177') || c == ' ') c &= 0x1F;
-	else if (c == '2') c = '\000';
-	else if (c >= '3' && c <= '7') c -= ('3' - '\033');
-	else if (c == '8') c = '\177';
-	else if (c == '/') c = '_' & 0x1F;
-    }
-    buffer[0] = c;
-    return 1;
-}
-  
-/*ARGSUSED*/
-int
-XLookupString (event, buffer, nbytes, keysym, status)
-    register XKeyEvent *event;
-    char *buffer;	/* buffer */
-    int nbytes;	/* space in buffer for characters */
-    KeySym *keysym;
-    XComposeStatus *status;	/* not implemented */
-{
-    unsigned int modifiers;
-    KeySym symbol;
-
-    if (! _XTranslateKey(event->display, event->keycode, event->state,
-		  &modifiers, &symbol))
-	return 0;
-
-#ifdef USE_OWN_COMPOSE
-    if ( status ) {
-	static int been_here= 0;
-	if ( !been_here ) {
-	    XimCompInitTables();
-	    been_here = 1;
-	}
-	if ( !XimCompLegalStatus(status) ) {
-	    status->compose_ptr = NULL;
-	    status->chars_matched = 0;
-	}
-	if ( ((status->chars_matched>0)&&(status->compose_ptr!=NULL)) || 
-		XimCompIsComposeKey(symbol,event->keycode,status) ) {
-	    XimCompRtrn rtrn;
-	    switch (XimCompProcessSym(status,symbol,&rtrn)) {
-		case XIM_COMP_IGNORE:
-		    break;
-		case XIM_COMP_IN_PROGRESS:
-		    if ( keysym!=NULL )
-			*keysym = NoSymbol;
-		    return 0;
-		case XIM_COMP_FAIL:
-		{
-		    int n = 0, len= 0;
-		    for (n=len=0;rtrn.sym[n]!=XK_VoidSymbol;n++) {
-			if ( nbytes-len > 0 ) {
-			    len+= _XTranslateKeySym(event->display,rtrn.sym[n],
-							event->state,
-							buffer+len,nbytes-len);
-			}
-		    }
-		    if ( keysym!=NULL ) {
-			if ( n==1 )	*keysym = rtrn.sym[0];
-			else		*keysym = NoSymbol;
-		    }
-		    return len;
-		}
-		case XIM_COMP_SUCCEED:
-		{
-		    int len,n = 0;
-
-		    symbol = rtrn.matchSym;
-		    if ( keysym!=NULL )	*keysym = symbol;
-		    if ( rtrn.str[0]!='\0' ) {
-			strncpy(buffer,rtrn.str,nbytes-1);
-			buffer[nbytes-1]= '\0';
-			len = strlen(buffer);
-		    }
-		    else {
-			len = _XTranslateKeySym(event->display,symbol,
-							event->state,
-							buffer,nbytes);
-		    }
-		    for (n=0;rtrn.sym[n]!=XK_VoidSymbol;n++) {
-			if ( nbytes-len > 0 ) {
-			    len+= _XTranslateKeySym(event->display,rtrn.sym[n],
-							event->state,
-							buffer+len,nbytes-len);
-			}
-		    }
-		    return len;
-		}
-	    }
-	}
-    }
-#endif
-
-    if (keysym)
-	*keysym = symbol;
-    /* arguable whether to use (event->state & ~modifiers) here */
-    return _XTranslateKeySym(event->display, symbol, event->state,
-			     buffer, nbytes);
-}
-
-static void
-_XFreeKeyBindings (dpy)
-    Display *dpy;
-{
-    register struct _XKeytrans *p, *np;
-
-    for (p = dpy->key_bindings; p; p = np) {
-	np = p->next;
-	Xfree(p->string);
-	Xfree((char *)p->modifiers);
-	Xfree((char *)p);
-    }   
-}
-
-int
-#if NeedFunctionPrototypes
-XRebindKeysym (
-    Display *dpy,
-    KeySym keysym,
-    KeySym *mlist,
-    int nm,		/* number of modifiers in mlist */
-    _Xconst unsigned char *str,
-    int nbytes)
-#else
-XRebindKeysym (dpy, keysym, mlist, nm, str, nbytes)
-    Display *dpy;
-    KeySym keysym;
-    KeySym *mlist;
-    int nm;		/* number of modifiers in mlist */
-    unsigned char *str;
-    int nbytes;
-#endif
-{
-    register struct _XKeytrans *tmp, *p;
-    int nb;
-
-    if ((! dpy->keysyms) && (! _XKeyInitialize(dpy)))
-	return 0;
-    LockDisplay(dpy);
-    tmp = dpy->key_bindings;
-    nb = sizeof(KeySym) * nm;
-
-    if ((! (p = (struct _XKeytrans *) Xmalloc( sizeof(struct _XKeytrans)))) ||
-	((! (p->string = (char *) Xmalloc( (unsigned) nbytes))) && 
-	 (nbytes > 0)) ||
-	((! (p->modifiers = (KeySym *) Xmalloc( (unsigned) nb))) &&
-	 (nb > 0))) {
-	if (p) {
-	    if (p->string) Xfree(p->string);
-	    if (p->modifiers) Xfree((char *) p->modifiers);
-	    Xfree((char *) p);
-	}
-	UnlockDisplay(dpy);
-	return 0;
-    }
-
-    dpy->key_bindings = p;
-    dpy->free_funcs->key_bindings = _XFreeKeyBindings;
-    p->next = tmp;	/* chain onto list */
-    memcpy (p->string, (char *) str, nbytes);
-    p->len = nbytes;
-    memcpy ((char *) p->modifiers, (char *) mlist, nb);
-    p->key = keysym;
-    p->mlen = nm;
-    ComputeMaskFromKeytrans(dpy, p);
-    UnlockDisplay(dpy);
-    return 0;
-}
-
-unsigned
-_XKeysymToModifiers(dpy,ks)
-    Display *dpy;
-    KeySym ks;
-{
-    CARD8 code,mods;
-    register KeySym *kmax;
-    register KeySym *k;
-    register XModifierKeymap *m;
-
-    if ((! dpy->keysyms) && (! _XKeyInitialize(dpy)))
-	return 0;
-    kmax = dpy->keysyms + 
-	   (dpy->max_keycode - dpy->min_keycode + 1) * dpy->keysyms_per_keycode;
-    k = dpy->keysyms;
-    m = dpy->modifiermap;
-    mods= 0;
-    while (k<kmax) {
-	if (*k == ks ) {
-	    register int j = m->max_keypermod<<3;
-
-	    code=(((k-dpy->keysyms)/dpy->keysyms_per_keycode)+dpy->min_keycode);
-
-	    while (--j >= 0) {
-		if (code == m->modifiermap[j])
-		    mods|= (1<<(j/m->max_keypermod));
-	    }
-	}
-	k++;
-    }
-    return mods;
-}
-	
-/*
- * given a list of modifiers, computes the mask necessary for later matching.
- * This routine must lookup the key in the Keymap and then search to see
- * what modifier it is bound to, if any.  Sets the AnyModifier bit if it
- * can't map some keysym to a modifier.
- */
-static void
-ComputeMaskFromKeytrans(dpy, p)
-    Display *dpy;
-    register struct _XKeytrans *p;
-{
-    register int i;
-
-    p->state = AnyModifier;
-    for (i = 0; i < p->mlen; i++) {
-	p->state|= XkbKeysymToModifiers(dpy,p->modifiers[i]);
-    }
-    p->state &= AllMods;
-}
diff --git a/xc/lib/X11/KeysymStr.c b/xc/lib/X11/KeysymStr.c
deleted file mode 100644
index 80d63a3ba..000000000
--- a/xc/lib/X11/KeysymStr.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/* $TOG: KeysymStr.c /main/13 1998/02/06 17:38:27 kaleb $ */
-
-/*
-
-Copyright 1990, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/KeysymStr.c,v 3.3 1999/05/09 10:49:39 dawes Exp $ */
-
-#include "Xlibint.h"
-#include <X11/Xresource.h>
-#include <X11/keysymdef.h>
-
-#include <stdio.h> /* sprintf */
-
-#ifdef __STDC__
-#define Const const
-#else
-#define Const /**/
-#endif
-
-typedef unsigned long Signature;
-
-#define NEEDVTABLE
-#include "ks_tables.h"
-
-extern XrmDatabase _XInitKeysymDB();
-extern Const unsigned char _XkeyTable[];
-
-
-typedef struct _GRNData {
-    char *name;
-    XrmRepresentation type;
-    XrmValuePtr value;
-} GRNData;
-
-#if NeedFunctionPrototypes
-/*ARGSUSED*/
-static Bool SameValue(
-    XrmDatabase*	db,
-    XrmBindingList      bindings,
-    XrmQuarkList	quarks,
-    XrmRepresentation*  type,
-    XrmValuePtr		value,
-    XPointer		data
-)
-#else
-static Bool SameValue(db, bindings, quarks, type, value, data)
-    XrmDatabase		*db;
-    XrmBindingList      bindings;
-    XrmQuarkList	quarks;
-    XrmRepresentation   *type;
-    XrmValuePtr		value;
-    XPointer		data;
-#endif
-{
-    GRNData *gd = (GRNData *)data;
-
-    if ((*type == gd->type) && (value->size == gd->value->size) &&
-	!strncmp((char *)value->addr, (char *)gd->value->addr, value->size))
-    {
-	gd->name = XrmQuarkToString(*quarks); /* XXX */
-	return True;
-    }
-    return False;
-}
-
-char *XKeysymToString(ks)
-    KeySym ks;
-{
-    register int i, n;
-    int h;
-    register int idx;
-    Const unsigned char *entry;
-    unsigned char val1, val2;
-    XrmDatabase keysymdb;
-
-    if (!ks || (ks & ((unsigned long) ~0x1fffffff)) != 0)
-	return ((char *)NULL);
-    if (ks == XK_VoidSymbol)
-	ks = 0;
-    if (ks <= 0xffff)
-    {
-	val1 = ks >> 8;
-	val2 = ks & 0xff;
-	i = ks % VTABLESIZE;
-	h = i + 1;
-	n = VMAXHASH;
-	while ((idx = hashKeysym[i]))
-	{
-	    entry = &_XkeyTable[idx];
-	    if ((entry[0] == val1) && (entry[1] == val2))
-		return ((char *)entry + 2);
-	    if (!--n)
-		break;
-	    i += h;
-	    if (i >= VTABLESIZE)
-		i -= VTABLESIZE;
-	}
-    }
-
-    if ((keysymdb = _XInitKeysymDB()))
-    {
-	char buf[9];
-	XrmValue resval;
-	XrmQuark empty = NULLQUARK;
-	GRNData data;
-
-	sprintf(buf, "%lX", ks);
-	resval.addr = (XPointer)buf;
-	resval.size = strlen(buf) + 1;
-	data.name = (char *)NULL;
-	data.type = XrmPermStringToQuark("String");
-	data.value = &resval;
-	(void)XrmEnumerateDatabase(keysymdb, &empty, &empty, XrmEnumAllLevels,
-				   SameValue, (XPointer)&data);
-	return data.name;
-    }
-    return ((char *) NULL);
-}
diff --git a/xc/lib/X11/KillCl.c b/xc/lib/X11/KillCl.c
deleted file mode 100644
index 554f2a44e..000000000
--- a/xc/lib/X11/KillCl.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* $TOG: KillCl.c /main/6 1998/02/06 17:38:34 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/KillCl.c,v 1.2 1999/05/09 10:49:39 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XKillClient(dpy, resource)
-	register Display *dpy;
-	XID resource;
-{
-	register xResourceReq *req;
-	LockDisplay(dpy);
-        GetResReq(KillClient, resource, req);
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return 1;
-}
-
diff --git a/xc/lib/X11/LRGB.c b/xc/lib/X11/LRGB.c
deleted file mode 100644
index 259b1dac4..000000000
--- a/xc/lib/X11/LRGB.c
+++ /dev/null
@@ -1,1820 +0,0 @@
-/* $XConsortium: LRGB.c,v 1.32 95/06/08 23:20:39 gildea Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		XcmsLRGB.c
- *
- *	DESCRIPTION
- *		This file contains the conversion routines:
- *		    1. CIE XYZ to RGB intensity
- *		    2. RGB intensity to device RGB
- *		    3. device RGB to RGB intensity
- *		    4. RGB intensity to CIE XYZ
- *
- */
-/* $XFree86: xc/lib/X11/LRGB.c,v 3.3 1999/05/09 10:49:40 dawes Exp $ */
-
-#include <stdio.h>
-#include <X11/Xos.h>
-#include <X11/Xatom.h>
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-#ifdef __STDC__
-#define Const const
-#else
-#define Const /**/
-#endif
-
-/*
- *      EXTERNS
- *              External declarations required locally to this package
- *              that are not already declared in any of the included header
- *		files (external includes or internal includes).
- */
-extern char _XcmsRGB_prefix[];
-extern char _XcmsRGBi_prefix[];
-extern unsigned long _XcmsGetElement();
-extern void _XcmsFreeIntensityMaps();
-
-/* cmsProp.c */
-extern int _XcmsGetProperty();
-
-
-/*
- *      LOCAL DEFINES
- *		#define declarations local to this package.
- */
-#define EPS	0.001
-#ifndef MIN
-#define MIN(x,y) ((x) > (y) ? (y) : (x))
-#endif /* MIN */
-#ifndef MAX
-#define MAX(x,y) ((x) > (y) ? (x) : (y))
-#endif /* MAX */
-#ifndef MIN3
-#define MIN3(x,y,z) ((x) > (MIN((y), (z))) ? (MIN((y), (z))) : (x))
-#endif /* MIN3 */
-#ifndef MAX3
-#define MAX3(x,y,z) ((x) > (MAX((y), (z))) ? (x) : (MAX((y), (z))))
-#endif /* MAX3 */
-
-/*
- *      LOCAL TYPEDEFS
- *              typedefs local to this package (for use with local vars).
- *
- */
-
-/*
- *      FORWARD DECLARATIONS
- */
-static void LINEAR_RGB_FreeSCCData();
-static int LINEAR_RGB_InitSCCData();
-static int XcmsLRGB_RGB_ParseString();
-static int XcmsLRGB_RGBi_ParseString();
-Status _XcmsGetTableType0();
-Status _XcmsGetTableType1();
-
-/*
- *      LOCALS VARIABLES
- *		Variables local to this package.
- *		    Usage example:
- *		        static int	ExampleLocalVar;
- */
-
-static unsigned short Const MASK[17] = {
-    0x0000,	/*  0 bitsPerRGB */
-    0x8000,	/*  1 bitsPerRGB */
-    0xc000,	/*  2 bitsPerRGB */
-    0xe000,	/*  3 bitsPerRGB */
-    0xf000,	/*  4 bitsPerRGB */
-    0xf800,	/*  5 bitsPerRGB */
-    0xfc00,	/*  6 bitsPerRGB */
-    0xfe00,	/*  7 bitsPerRGB */
-    0xff00,	/*  8 bitsPerRGB */
-    0xff80,	/*  9 bitsPerRGB */
-    0xffc0,	/* 10 bitsPerRGB */
-    0xffe0,	/* 11 bitsPerRGB */
-    0xfff0,	/* 12 bitsPerRGB */
-    0xfff8,	/* 13 bitsPerRGB */
-    0xfffc,	/* 14 bitsPerRGB */
-    0xfffe,	/* 15 bitsPerRGB */
-    0xffff	/* 16 bitsPerRGB */
-};
-
-
-    /*
-     * A NULL terminated array of function pointers that when applied
-     * in series will convert an XcmsColor structure from XcmsRGBFormat
-     * to XcmsCIEXYZFormat.
-     */
-static XcmsConversionProc Fl_RGB_to_CIEXYZ[] = {
-    XcmsRGBToRGBi,
-    XcmsRGBiToCIEXYZ,
-    NULL
-};
-
-    /*
-     * A NULL terminated array of function pointers that when applied
-     * in series will convert an XcmsColor structure from XcmsCIEXYZFormat
-     * to XcmsRGBFormat.
-     */
-static XcmsConversionProc Fl_CIEXYZ_to_RGB[] = {
-    XcmsCIEXYZToRGBi,
-    XcmsRGBiToRGB,
-    NULL
-};
-
-    /*
-     * A NULL terminated array of function pointers that when applied
-     * in series will convert an XcmsColor structure from XcmsRGBiFormat
-     * to XcmsCIEXYZFormat.
-     */
-static XcmsConversionProc Fl_RGBi_to_CIEXYZ[] = {
-    XcmsRGBiToCIEXYZ,
-    NULL
-};
-
-    /*
-     * A NULL terminated array of function pointers that when applied
-     * in series will convert an XcmsColor structure from XcmsCIEXYZFormat
-     * to XcmsRGBiFormat.
-     */
-static XcmsConversionProc Fl_CIEXYZ_to_RGBi[] = {
-    XcmsCIEXYZToRGBi,
-    NULL
-};
-
-    /*
-     * RGBi Color Spaces
-     */
-XcmsColorSpace	XcmsRGBiColorSpace =
-    {
-	_XcmsRGBi_prefix,	/* prefix */
-	XcmsRGBiFormat,		/* id */
-	XcmsLRGB_RGBi_ParseString,	/* parseString */
-	Fl_RGBi_to_CIEXYZ,	/* to_CIEXYZ */
-	Fl_CIEXYZ_to_RGBi,	/* from_CIEXYZ */
-	1
-    };
-
-    /*
-     * RGB Color Spaces
-     */
-XcmsColorSpace	XcmsRGBColorSpace =
-    {
-	_XcmsRGB_prefix,		/* prefix */
-	XcmsRGBFormat,		/* id */
-	XcmsLRGB_RGB_ParseString,	/* parseString */
-	Fl_RGB_to_CIEXYZ,	/* to_CIEXYZ */
-	Fl_CIEXYZ_to_RGB,	/* from_CIEXYZ */
-	1
-    };
-
-    /*
-     * Device-Independent Color Spaces known to the 
-     * LINEAR_RGB Screen Color Characteristics Function Set.
-     */
-static XcmsColorSpace	*DDColorSpaces[] = {
-    &XcmsRGBColorSpace,
-    &XcmsRGBiColorSpace,
-    NULL
-};
-
-
-/*
- *      GLOBALS
- *              Variables declared in this package that are allowed
- *		to be used globally.
- */
-
-    /*
-     * LINEAR_RGB Screen Color Characteristics Function Set.
-     */
-XcmsFunctionSet	XcmsLinearRGBFunctionSet =
-    {
-	&DDColorSpaces[0],	/* pDDColorSpaces */
-	LINEAR_RGB_InitSCCData,	/* pInitScrnFunc */
-	LINEAR_RGB_FreeSCCData	/* pFreeSCCData */
-    };
-
-/*
- *	DESCRIPTION
- *		Contents of Default SCCData should be replaced if other
- *		data should be used as default.
- *
- *
- */
-
-/*
- * NAME		Tektronix 19" (Sony) CRT
- * PART_NUMBER		119-2451-00
- * MODEL		Tek4300, Tek4800
- */
-
-static IntensityRec Const Default_RGB_RedTuples[] = {
-    /* {unsigned short value, XcmsFloat intensity} */
-            { 0x0000,    0.000000 },
-            { 0x0909,    0.000000 },
-            { 0x0a0a,    0.000936 },
-            { 0x0f0f,    0.001481 },
-            { 0x1414,    0.002329 },
-            { 0x1919,    0.003529 },
-            { 0x1e1e,    0.005127 },
-            { 0x2323,    0.007169 },
-            { 0x2828,    0.009699 },
-            { 0x2d2d,    0.012759 },
-            { 0x3232,    0.016392 },
-            { 0x3737,    0.020637 },
-            { 0x3c3c,    0.025533 },
-            { 0x4141,    0.031119 },
-            { 0x4646,    0.037431 },
-            { 0x4b4b,    0.044504 },
-            { 0x5050,    0.052373 },
-            { 0x5555,    0.061069 },
-            { 0x5a5a,    0.070624 },
-            { 0x5f5f,    0.081070 },
-            { 0x6464,    0.092433 },
-            { 0x6969,    0.104744 },
-            { 0x6e6e,    0.118026 },
-            { 0x7373,    0.132307 },
-            { 0x7878,    0.147610 },
-            { 0x7d7d,    0.163958 },
-            { 0x8282,    0.181371 },
-            { 0x8787,    0.199871 },
-            { 0x8c8c,    0.219475 },
-            { 0x9191,    0.240202 },
-            { 0x9696,    0.262069 },
-            { 0x9b9b,    0.285089 },
-            { 0xa0a0,    0.309278 },
-            { 0xa5a5,    0.334647 },
-            { 0xaaaa,    0.361208 },
-            { 0xafaf,    0.388971 },
-            { 0xb4b4,    0.417945 },
-            { 0xb9b9,    0.448138 },
-            { 0xbebe,    0.479555 },
-            { 0xc3c3,    0.512202 },
-            { 0xc8c8,    0.546082 },
-            { 0xcdcd,    0.581199 },
-            { 0xd2d2,    0.617552 },
-            { 0xd7d7,    0.655144 },
-            { 0xdcdc,    0.693971 },
-            { 0xe1e1,    0.734031 },
-            { 0xe6e6,    0.775322 },
-            { 0xebeb,    0.817837 },
-            { 0xf0f0,    0.861571 },
-            { 0xf5f5,    0.906515 },
-            { 0xfafa,    0.952662 },
-            { 0xffff,    1.000000 }
-};
-
-static IntensityRec Const Default_RGB_GreenTuples[] = {
-    /* {unsigned short value, XcmsFloat intensity} */
-            { 0x0000,    0.000000 },
-            { 0x1313,    0.000000 },
-            { 0x1414,    0.000832 },
-            { 0x1919,    0.001998 },
-            { 0x1e1e,    0.003612 },
-            { 0x2323,    0.005736 },
-            { 0x2828,    0.008428 },
-            { 0x2d2d,    0.011745 },
-            { 0x3232,    0.015740 },
-            { 0x3737,    0.020463 },
-            { 0x3c3c,    0.025960 },
-            { 0x4141,    0.032275 },
-            { 0x4646,    0.039449 },
-            { 0x4b4b,    0.047519 },
-            { 0x5050,    0.056520 },
-            { 0x5555,    0.066484 },
-            { 0x5a5a,    0.077439 },
-            { 0x5f5f,    0.089409 },
-            { 0x6464,    0.102418 },
-            { 0x6969,    0.116485 },
-            { 0x6e6e,    0.131625 },
-            { 0x7373,    0.147853 },
-            { 0x7878,    0.165176 },
-            { 0x7d7d,    0.183604 },
-            { 0x8282,    0.203140 },
-            { 0x8787,    0.223783 },
-            { 0x8c8c,    0.245533 },
-            { 0x9191,    0.268384 },
-            { 0x9696,    0.292327 },
-            { 0x9b9b,    0.317351 },
-            { 0xa0a0,    0.343441 },
-            { 0xa5a5,    0.370580 },
-            { 0xaaaa,    0.398747 },
-            { 0xafaf,    0.427919 },
-            { 0xb4b4,    0.458068 },
-            { 0xb9b9,    0.489165 },
-            { 0xbebe,    0.521176 },
-            { 0xc3c3,    0.554067 },
-            { 0xc8c8,    0.587797 },
-            { 0xcdcd,    0.622324 },
-            { 0xd2d2,    0.657604 },
-            { 0xd7d7,    0.693588 },
-            { 0xdcdc,    0.730225 },
-            { 0xe1e1,    0.767459 },
-            { 0xe6e6,    0.805235 },
-            { 0xebeb,    0.843491 },
-            { 0xf0f0,    0.882164 },
-            { 0xf5f5,    0.921187 },
-            { 0xfafa,    0.960490 },
-            { 0xffff,    1.000000 }
-};
-
-static IntensityRec Const Default_RGB_BlueTuples[] = {
-    /* {unsigned short value, XcmsFloat intensity} */
-            { 0x0000,    0.000000 },
-            { 0x0e0e,    0.000000 },
-            { 0x0f0f,    0.001341 },
-            { 0x1414,    0.002080 },
-            { 0x1919,    0.003188 },
-            { 0x1e1e,    0.004729 },
-            { 0x2323,    0.006766 },
-            { 0x2828,    0.009357 },
-            { 0x2d2d,    0.012559 },
-            { 0x3232,    0.016424 },
-            { 0x3737,    0.021004 },
-            { 0x3c3c,    0.026344 },
-            { 0x4141,    0.032489 },
-            { 0x4646,    0.039481 },
-            { 0x4b4b,    0.047357 },
-            { 0x5050,    0.056154 },
-            { 0x5555,    0.065903 },
-            { 0x5a5a,    0.076634 },
-            { 0x5f5f,    0.088373 },
-            { 0x6464,    0.101145 },
-            { 0x6969,    0.114968 },
-            { 0x6e6e,    0.129862 },
-            { 0x7373,    0.145841 },
-            { 0x7878,    0.162915 },
-            { 0x7d7d,    0.181095 },
-            { 0x8282,    0.200386 },
-            { 0x8787,    0.220791 },
-            { 0x8c8c,    0.242309 },
-            { 0x9191,    0.264937 },
-            { 0x9696,    0.288670 },
-            { 0x9b9b,    0.313499 },
-            { 0xa0a0,    0.339410 },
-            { 0xa5a5,    0.366390 },
-            { 0xaaaa,    0.394421 },
-            { 0xafaf,    0.423481 },
-            { 0xb4b4,    0.453547 },
-            { 0xb9b9,    0.484592 },
-            { 0xbebe,    0.516587 },
-            { 0xc3c3,    0.549498 },
-            { 0xc8c8,    0.583291 },
-            { 0xcdcd,    0.617925 },
-            { 0xd2d2,    0.653361 },
-            { 0xd7d7,    0.689553 },
-            { 0xdcdc,    0.726454 },
-            { 0xe1e1,    0.764013 },
-            { 0xe6e6,    0.802178 },
-            { 0xebeb,    0.840891 },
-            { 0xf0f0,    0.880093 },
-            { 0xf5f5,    0.919723 },
-            { 0xfafa,    0.959715 },
-	    { 0xffff,    1.00000 }
-};
-
-static IntensityTbl Default_RGB_RedTbl = {
-    /* IntensityRec *pBase */
-	(IntensityRec *) Default_RGB_RedTuples,
-    /* unsigned int nEntries */
-	52
-};
-
-static IntensityTbl Default_RGB_GreenTbl = {
-    /* IntensityRec *pBase */
-	(IntensityRec *)Default_RGB_GreenTuples,
-    /* unsigned int nEntries */
-	50
-};
-
-static IntensityTbl Default_RGB_BlueTbl = {
-    /* IntensityRec *pBase */
-	(IntensityRec *)Default_RGB_BlueTuples,
-    /* unsigned int nEntries */
-	51
-};
-
-static LINEAR_RGB_SCCData Default_RGB_SCCData = {
-    /* XcmsFloat XYZtoRGBmatrix[3][3] */
-  {
-    { 3.48340481253539000, -1.52176374927285200, -0.55923133354049780 },
-    {-1.07152751306193600,  1.96593795204372400,  0.03673691339553462 },
-    { 0.06351179790497788, -0.20020501000496480,  0.81070942031648220 }
-  },
-
-    /* XcmsFloat RGBtoXYZmatrix[3][3] */
-  {
-    { 0.38106149108714790, 0.32025712365352110, 0.24834578525933100 },
-    { 0.20729745115140850, 0.68054638776373240, 0.11215616108485920 },
-    { 0.02133944350088028, 0.14297193020246480, 1.24172892629665500 }
-  },
-
-    /* IntensityTbl *pRedTbl */
-	&Default_RGB_RedTbl,
-
-    /* IntensityTbl *pGreenTbl */
-	&Default_RGB_GreenTbl,
-
-    /* IntensityTbl *pBlueTbl */
-	&Default_RGB_BlueTbl
-};
-
-/************************************************************************
- *									*
- *			PRIVATE ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		LINEAR_RGB_InitSCCData()
- *
- *	SYNOPSIS
- */
-static Status
-LINEAR_RGB_InitSCCData(dpy, screenNumber, pPerScrnInfo)
-    Display *dpy;
-    int screenNumber;
-    XcmsPerScrnInfo *pPerScrnInfo;
-/*
- *	DESCRIPTION
- *
- *	RETURNS
- *		XcmsFailure if failed.
- *		XcmsSuccess if succeeded.
- *
- */
-{
-    Atom  CorrectAtom = XInternAtom (dpy, XDCCC_CORRECT_ATOM_NAME, True);
-    Atom  MatrixAtom  = XInternAtom (dpy, XDCCC_MATRIX_ATOM_NAME, True);
-    int	  format_return, count, cType, nTables;
-    unsigned long nitems, nbytes_return;
-    char *property_return, *pChar;
-    XcmsFloat *pValue;
-#ifdef ALLDEBUG
-    IntensityRec *pIRec;
-#endif /* ALLDEBUG */
-    VisualID visualID;
-
-    LINEAR_RGB_SCCData *pScreenData, *pScreenDefaultData;
-    XcmsIntensityMap *pNewMap;
-
-    /*
-     * Allocate memory for pScreenData
-     */
-    if (!(pScreenData = pScreenDefaultData = (LINEAR_RGB_SCCData *) 
-		      Xcalloc (1, sizeof(LINEAR_RGB_SCCData)))) {
-	return(XcmsFailure);
-    }
-
-    /* 
-     *  1. Get the XYZ->RGB and RGB->XYZ matrices
-     */
-
-    if (MatrixAtom == None ||
-	!_XcmsGetProperty (dpy, RootWindow(dpy, screenNumber), MatrixAtom, 
-	   &format_return, &nitems, &nbytes_return, &property_return) ||
-	   nitems != 18 || format_return != 32) {
-	/*
-	 * As per the XDCCC, there must be 18 data items and each must be
-	 * in 32 bits !
-	 */
-	goto FreeSCCData;
-
-    } else {
-
-	/*
-	 * RGBtoXYZ and XYZtoRGB matrices
-	 */
-	pValue = (XcmsFloat *) pScreenData;
-	pChar = property_return;
-	for (count = 0; count < 18; count++) {
-	    *pValue++ = (long)_XcmsGetElement(format_return, &pChar,
-		    &nitems) / (XcmsFloat)XDCCC_NUMBER;
-	}
-	Xfree ((char *)property_return);
-	pPerScrnInfo->screenWhitePt.spec.CIEXYZ.X =
-		pScreenData->RGBtoXYZmatrix[0][0] +
-		pScreenData->RGBtoXYZmatrix[0][1] +
-		pScreenData->RGBtoXYZmatrix[0][2];
-	pPerScrnInfo->screenWhitePt.spec.CIEXYZ.Y =
-		pScreenData->RGBtoXYZmatrix[1][0] +
-		pScreenData->RGBtoXYZmatrix[1][1] +
-		pScreenData->RGBtoXYZmatrix[1][2];
-	pPerScrnInfo->screenWhitePt.spec.CIEXYZ.Z =
-		pScreenData->RGBtoXYZmatrix[2][0] +
-		pScreenData->RGBtoXYZmatrix[2][1] +
-		pScreenData->RGBtoXYZmatrix[2][2];
-
-	/*
-	 * Compute the Screen White Point
-	 */
-	if ((pPerScrnInfo->screenWhitePt.spec.CIEXYZ.Y < (1.0 - EPS) )
-		|| (pPerScrnInfo->screenWhitePt.spec.CIEXYZ.Y > (1.0 + EPS))) {
-	    goto FreeSCCData;
-	} else {
-	    pPerScrnInfo->screenWhitePt.spec.CIEXYZ.Y = 1.0;
-	}
-	pPerScrnInfo->screenWhitePt.format = XcmsCIEXYZFormat;
-	pPerScrnInfo->screenWhitePt.pixel = 0;
-
-#ifdef PDEBUG
-	printf ("RGB to XYZ Matrix values:\n");
-	printf ("       %f %f %f\n       %f %f %f\n       %f %f %f\n",
-		pScreenData->RGBtoXYZmatrix[0][0],
-		pScreenData->RGBtoXYZmatrix[0][1],
-		pScreenData->RGBtoXYZmatrix[0][2],
-		pScreenData->RGBtoXYZmatrix[1][0],
-		pScreenData->RGBtoXYZmatrix[1][1],
-		pScreenData->RGBtoXYZmatrix[1][2],
-		pScreenData->RGBtoXYZmatrix[2][0],
-		pScreenData->RGBtoXYZmatrix[2][1],
-		pScreenData->RGBtoXYZmatrix[2][2]);
-	printf ("XYZ to RGB Matrix values:\n");
-	printf ("       %f %f %f\n       %f %f %f\n       %f %f %f\n",
-		pScreenData->XYZtoRGBmatrix[0][0],
-		pScreenData->XYZtoRGBmatrix[0][1],
-		pScreenData->XYZtoRGBmatrix[0][2],
-		pScreenData->XYZtoRGBmatrix[1][0],
-		pScreenData->XYZtoRGBmatrix[1][1],
-		pScreenData->XYZtoRGBmatrix[1][2],
-		pScreenData->XYZtoRGBmatrix[2][0],
-		pScreenData->XYZtoRGBmatrix[2][1],
-		pScreenData->XYZtoRGBmatrix[2][2]);
-	printf ("Screen White Pt value: %f %f %f\n",
-		pPerScrnInfo->screenWhitePt.spec.CIEXYZ.X,
-		pPerScrnInfo->screenWhitePt.spec.CIEXYZ.Y,
-		pPerScrnInfo->screenWhitePt.spec.CIEXYZ.Z);
-#endif /* PDEBUG */
-    }
-
-    /*
-     *	2. Get the Intensity Profile
-     */
-    if (CorrectAtom == None ||
-	!_XcmsGetProperty (dpy, RootWindow(dpy, screenNumber), CorrectAtom,
-	   &format_return, &nitems, &nbytes_return, &property_return)) {
-	Xfree ((char *)property_return);
-	goto FreeSCCData;
-    }
-
-    pChar = property_return;
-
-    while (nitems) {
-	switch (format_return) {
-	  case 8:
-	    /*
-	     * Must have at least:
-	     *		VisualID0
-	     *		VisualID1
-	     *		VisualID2
-	     *		VisualID3
-	     *		type
-	     *		count
-	     *		length
-	     *		intensity1
-	     *		intensity2
-	     */
-	    if (nitems < 9) {
-		Xfree ((char *)property_return);
-		goto FreeSCCData;
-	    }
-	    count = 3;
-	    break;
-	  case 16:
-	    /*
-	     * Must have at least:
-	     *		VisualID0
-	     *		VisualID3
-	     *		type
-	     *		count
-	     *		length
-	     *		intensity1
-	     *		intensity2
-	     */
-	    if (nitems < 7) {
-		Xfree ((char *)property_return);
-		goto FreeSCCData;
-	    }
-	    count = 1;
-	    break;
-	  case 32:
-	    /*
-	     * Must have at least:
-	     *		VisualID0
-	     *		type
-	     *		count
-	     *		length
-	     *		intensity1
-	     *		intensity2
-	     */
-	    if (nitems < 6) {
-		Xfree ((char *)property_return);
-		goto FreeSCCData;
-	    }
-	    count = 0;
-	    break;
-	  default:
-	    Xfree ((char *)property_return);
-	    goto FreeSCCData;
-	}
-
-	/*
-	 * Get VisualID
-	 */
-	visualID = _XcmsGetElement(format_return, &pChar, &nitems);
-	while (count--) {
-	    visualID = visualID << format_return;
-	    visualID |= _XcmsGetElement(format_return, &pChar, &nitems);
-	}
-
-	if (visualID == 0) {
-	    /*
-	     * This is a shared intensity table
-	     */
-	    pScreenData = pScreenDefaultData;
-	} else {
-	    /*
-	     * This is a per-Visual intensity table
-	     */
-	    if (!(pScreenData = (LINEAR_RGB_SCCData *) 
-			      Xcalloc (1, sizeof(LINEAR_RGB_SCCData)))) {
-		return(XcmsFailure);
-	    }
-	    /* copy matrices */
-	    memcpy((char *)pScreenData, (char *)pScreenDefaultData,
-		   18 * sizeof(XcmsFloat));
-
-	    /* Create, initialize, and add map */
-	    if (!(pNewMap = (XcmsIntensityMap *) 
-			      Xcalloc (1, sizeof(XcmsIntensityMap)))) {
-		Xfree((char *)pScreenData);
-		return(XcmsFailure);
-	    }
-	    pNewMap->visualID = visualID;
-	    pNewMap->screenData = (XPointer)pScreenData;
-	    pNewMap->pFreeScreenData = LINEAR_RGB_FreeSCCData;
-	    pNewMap->pNext =
-		    (XcmsIntensityMap *)dpy->cms.perVisualIntensityMaps;
-	    dpy->cms.perVisualIntensityMaps = (XPointer)pNewMap;
-	    dpy->free_funcs->intensityMaps = _XcmsFreeIntensityMaps;
-	}
-
-	cType = _XcmsGetElement(format_return, &pChar, &nitems);
-	nTables = _XcmsGetElement(format_return, &pChar, &nitems);
-
-	if (cType == 0) {
-
-	    /* Red Intensity Table */
-	    if (!(pScreenData->pRedTbl = (IntensityTbl *)
-		    Xcalloc (1, sizeof(IntensityTbl)))) {
-		goto FreeSCCData;
-	    }
-	    if (_XcmsGetTableType0(pScreenData->pRedTbl, format_return, &pChar,
-		    &nitems) == XcmsFailure) {
-		goto FreeRedTbl;
-	    }
-
-	    if (nTables == 1) {
-		/* Green Intensity Table */
-		pScreenData->pGreenTbl = pScreenData->pRedTbl;
-		/* Blue Intensity Table */
-		pScreenData->pBlueTbl = pScreenData->pRedTbl;
-	    } else {
-		/* Green Intensity Table */
-		if (!(pScreenData->pGreenTbl = (IntensityTbl *)
-			Xcalloc (1, sizeof(IntensityTbl)))) {
-		    goto FreeRedTblElements;
-		}
-		if (_XcmsGetTableType0(pScreenData->pGreenTbl, format_return, &pChar,
-			&nitems) == XcmsFailure) {
-		    goto FreeGreenTbl;
-		}
-
-		/* Blue Intensity Table */
-		if (!(pScreenData->pBlueTbl = (IntensityTbl *)
-			Xcalloc (1, sizeof(IntensityTbl)))) {
-		    goto FreeGreenTblElements;
-		}
-		if (_XcmsGetTableType0(pScreenData->pBlueTbl, format_return, &pChar,
-			&nitems) == XcmsFailure) {
-		    goto FreeBlueTbl;
-		}
-	    }	    
-	} else if (cType == 1) {
-	    /* Red Intensity Table */
-	    if (!(pScreenData->pRedTbl = (IntensityTbl *)
-		    Xcalloc (1, sizeof(IntensityTbl)))) {
-		goto FreeSCCData;
-	    }
-	    if (_XcmsGetTableType1(pScreenData->pRedTbl, format_return, &pChar,
-		    &nitems) == XcmsFailure) {
-		goto FreeRedTbl;
-	    }
-
-	    if (nTables == 1) {
-
-		/* Green Intensity Table */
-		pScreenData->pGreenTbl = pScreenData->pRedTbl;
-		/* Blue Intensity Table */
-		pScreenData->pBlueTbl = pScreenData->pRedTbl;
-
-	    } else {
-
-		/* Green Intensity Table */
-		if (!(pScreenData->pGreenTbl = (IntensityTbl *)
-			Xcalloc (1, sizeof(IntensityTbl)))) {
-		    goto FreeRedTblElements;
-		}
-		if (_XcmsGetTableType1(pScreenData->pGreenTbl, format_return, &pChar,
-			&nitems) == XcmsFailure) {
-		    goto FreeGreenTbl;
-		}
-
-		/* Blue Intensity Table */
-		if (!(pScreenData->pBlueTbl = (IntensityTbl *)
-			Xcalloc (1, sizeof(IntensityTbl)))) {
-		    goto FreeBlueTblElements;
-		}
-		if (_XcmsGetTableType1(pScreenData->pBlueTbl, format_return, &pChar,
-			&nitems) == XcmsFailure) {
-		    goto FreeBlueTbl;
-		}
-	    }
-	} else {
-	    Xfree ((char *)property_return);
-	    goto FreeSCCData;
-	}
-
-#ifdef ALLDEBUG
-	printf ("Intensity Table  RED    %d\n", pScreenData->pRedTbl->nEntries);
-	pIRec = (IntensityRec *) pScreenData->pRedTbl->pBase;
-	for (count = 0; count < pScreenData->pRedTbl->nEntries; count++, pIRec++) {
-	    printf ("\t0x%4x\t%f\n", pIRec->value, pIRec->intensity);
-	}
-	if (pScreenData->pGreenTbl->pBase != pScreenData->pRedTbl->pBase) {
-	    printf ("Intensity Table  GREEN  %d\n", pScreenData->pGreenTbl->nEntries);
-	    pIRec = (IntensityRec *)pScreenData->pGreenTbl->pBase;
-	    for (count = 0; count < pScreenData->pGreenTbl->nEntries; count++, pIRec++) {
-		printf ("\t0x%4x\t%f\n", pIRec->value, pIRec->intensity);
-	    }
-	}
-	if (pScreenData->pBlueTbl->pBase != pScreenData->pRedTbl->pBase) {
-	    printf ("Intensity Table  BLUE   %d\n", pScreenData->pBlueTbl->nEntries);
-	    pIRec = (IntensityRec *) pScreenData->pBlueTbl->pBase;
-	    for (count = 0; count < pScreenData->pBlueTbl->nEntries; count++, pIRec++) {
-		printf ("\t0x%4x\t%f\n", pIRec->value, pIRec->intensity);
-	    }
-	}
-#endif /* ALLDEBUG */
-    }
-
-    Xfree ((char *)property_return);
-
-    /* Free the old memory and use the new structure created. */
-    LINEAR_RGB_FreeSCCData(pPerScrnInfo->screenData);
-
-    pPerScrnInfo->functionSet = (XPointer) &XcmsLinearRGBFunctionSet;
-
-    pPerScrnInfo->screenData = (XPointer) pScreenData;
-
-    pPerScrnInfo->state = XcmsInitSuccess;
-
-    return(XcmsSuccess);
-
-FreeBlueTblElements:
-    Xfree((char *)pScreenData->pBlueTbl->pBase);
-
-FreeBlueTbl:
-    Xfree((char *)pScreenData->pBlueTbl);
-
-FreeGreenTblElements:
-    Xfree((char *)pScreenData->pBlueTbl->pBase);
-
-FreeGreenTbl:
-    Xfree((char *)pScreenData->pGreenTbl);
-
-FreeRedTblElements:
-    Xfree((char *)pScreenData->pRedTbl->pBase);
-
-FreeRedTbl:
-    Xfree((char *)pScreenData->pRedTbl);
-
-FreeSCCData:
-    Xfree((char *)pScreenData);
-    pPerScrnInfo->state = XcmsInitNone;
-    return(XcmsFailure);
-}
-
-
-/*
- *	NAME
- *		LINEAR_RGB_FreeSCCData()
- *
- *	SYNOPSIS
- */
-static void
-LINEAR_RGB_FreeSCCData(pScreenDataTemp)
-    XPointer pScreenDataTemp;
-/*
- *	DESCRIPTION
- *
- *	RETURNS
- *		0 if failed.
- *		1 if succeeded with no modifications.
- *
- */
-{
-    LINEAR_RGB_SCCData *pScreenData = (LINEAR_RGB_SCCData *) pScreenDataTemp;
-
-    if (pScreenData && pScreenData != &Default_RGB_SCCData) {
-	if (pScreenData->pRedTbl) {
-	    if (pScreenData->pGreenTbl) {
-		if (pScreenData->pRedTbl->pBase != 
-		    pScreenData->pGreenTbl->pBase) {
-		    if (pScreenData->pGreenTbl->pBase) {
-			Xfree ((char *)pScreenData->pGreenTbl->pBase);
-		    }
-		}
-		if (pScreenData->pGreenTbl != pScreenData->pRedTbl) {
-		    Xfree ((char *)pScreenData->pGreenTbl);
-		}
-	    }
-	    if (pScreenData->pBlueTbl) {
-		if (pScreenData->pRedTbl->pBase != 
-		    pScreenData->pBlueTbl->pBase) {
-		    if (pScreenData->pBlueTbl->pBase) {
-			Xfree ((char *)pScreenData->pBlueTbl->pBase);
-		    }
-		}
-		if (pScreenData->pBlueTbl != pScreenData->pRedTbl) {
-		    Xfree ((char *)pScreenData->pBlueTbl);
-		}
-	    }
-	    if (pScreenData->pRedTbl->pBase) {
-		Xfree ((char *)pScreenData->pRedTbl->pBase);
-	    }
-	    Xfree ((char *)pScreenData->pRedTbl);
-	}
-	Xfree ((char *)pScreenData);
-    }
-}
-
-
-
-/************************************************************************
- *									*
- *			API PRIVATE ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		_XcmsGetTableType0
- *
- *	SYNOPSIS
- */
-Status
-_XcmsGetTableType0(pTbl, format, pChar, pCount)
-    IntensityTbl *pTbl;
-    int	  format;
-    char **pChar;
-    unsigned long *pCount;
-/*
- *	DESCRIPTION
- *
- *	RETURNS
- *		XcmsFailure if failed.
- *		XcmsSuccess if succeeded.
- *
- */
-{
-    unsigned int nElements;
-    IntensityRec *pIRec;
-
-    nElements = pTbl->nEntries =
-	    _XcmsGetElement(format, pChar, pCount) + 1;
-    if (!(pIRec = pTbl->pBase = (IntensityRec *)
-	  Xcalloc (nElements, sizeof(IntensityRec)))) {
-	return(XcmsFailure);
-    }
-
-    switch (format) {
-      case 8: 
-	for (; nElements--; pIRec++) {
-	    /* 0xFFFF/0xFF = 0x101 */
-	    pIRec->value = _XcmsGetElement (format, pChar, pCount) * 0x101;
-	    pIRec->intensity =
-		    _XcmsGetElement (format, pChar, pCount) / (XcmsFloat)255.0;
-	}
-	break;
-      case 16: 
-	for (; nElements--; pIRec++) {
-	    pIRec->value = _XcmsGetElement (format, pChar, pCount);
-	    pIRec->intensity = _XcmsGetElement (format, pChar, pCount)
-		    / (XcmsFloat)65535.0;
-	}
-	break;
-      case 32: 
-	for (; nElements--; pIRec++) {
-	    pIRec->value = _XcmsGetElement (format, pChar, pCount);
-	    pIRec->intensity = _XcmsGetElement (format, pChar, pCount)
-		    / (XcmsFloat)4294967295.0;
-	}
-	break;
-      default:
-	return(XcmsFailure);
-    }
-    return(XcmsSuccess);
-}
-
-
-/*
- *	NAME
- *		_XcmsGetTableType1
- *
- *	SYNOPSIS
- */
-Status
-_XcmsGetTableType1(pTbl, format, pChar, pCount)
-    IntensityTbl *pTbl;
-    int	  format;
-    char **pChar;
-    unsigned long *pCount;
-/*
- *	DESCRIPTION
- *
- *	RETURNS
- *		XcmsFailure if failed.
- *		XcmsSuccess if succeeded.
- *
- */
-{
-    int count;
-    unsigned int max_index;
-    IntensityRec *pIRec;
-
-    max_index = _XcmsGetElement(format, pChar, pCount);
-    pTbl->nEntries = max_index + 1;
-    if (!(pIRec = pTbl->pBase = (IntensityRec *)
-	  Xcalloc (max_index+1, sizeof(IntensityRec)))) {
-	return(XcmsFailure);
-    }
-
-    switch (format) {
-      case 8: 
-	for (count = 0; count < max_index+1; count++, pIRec++) {
-	    pIRec->value = (count * 65535) / max_index;
-	    pIRec->intensity = _XcmsGetElement (format, pChar, pCount)
-		    / (XcmsFloat)255.0;
-	}
-	break;
-      case 16: 
-	for (count = 0; count < max_index+1; count++, pIRec++) {
-	    pIRec->value = (count * 65535) / max_index;
-	    pIRec->intensity = _XcmsGetElement (format, pChar, pCount)
-		    / (XcmsFloat)65535.0;
-	}
-	break;
-      case 32: 
-	for (count = 0; count < max_index+1; count++, pIRec++) {
-	    pIRec->value = (count * 65535) / max_index;
-	    pIRec->intensity = _XcmsGetElement (format, pChar, pCount)
-		    / (XcmsFloat)4294967295.0;
-	}
-	break;
-      default:
-	return(XcmsFailure);
-    }
-
-    return(XcmsSuccess);
-}
-
-
-/*
- *	NAME
- *		ValueCmp
- *
- *	SYNOPSIS
- */
-int
-_XcmsValueCmp (p1, p2)
-    IntensityRec *p1, *p2;
-/*
- *	DESCRIPTION
- *		Compares the value component of two IntensityRec
- *		structures.
- *
- *	RETURNS
- *		0 if p1->value is equal to p2->value
- *		< 0 if p1->value is less than p2->value
- *		> 0 if p1->value is greater than p2->value
- *
- */
-{
-    return (p1->value - p2->value);
-}
-
-
-/*
- *	NAME
- *		IntensityCmp
- *
- *	SYNOPSIS
- */
-int
-_XcmsIntensityCmp (p1, p2)
-    IntensityRec *p1, *p2;
-/*
- *	DESCRIPTION
- *		Compares the intensity component of two IntensityRec
- *		structures.
- *
- *	RETURNS
- *		0 if equal;
- *		< 0 if first precedes second
- *		> 0 if first succeeds second
- *
- */
-{
-    if (p1->intensity < p2->intensity) {
-	return (-1);
-    }
-    if (p1->intensity > p2->intensity) {
-	return (XcmsSuccess);
-    }
-    return (XcmsFailure);
-}
-
-/*
- *	NAME
- *		ValueInterpolation
- *
- *	SYNOPSIS
- */
-/* ARGSUSED */
-int
-_XcmsValueInterpolation (key, lo, hi, answer, bitsPerRGB)
-    IntensityRec *key, *lo, *hi, *answer;
-    int bitsPerRGB;
-/*
- *	DESCRIPTION
- *		Based on a given value, performs a linear interpolation
- *		on the intensities between two IntensityRec structures.
- *		Note that the bitsPerRGB parameter is ignored.
- *
- *	RETURNS
- *		Returns 0 if failed; otherwise non-zero.
- */
-{
-    XcmsFloat ratio;
-
-    ratio = ((XcmsFloat)key->value - (XcmsFloat)lo->value) / 
-	((XcmsFloat)hi->value - (XcmsFloat)lo->value);
-    answer->value = key->value;
-    answer->intensity = (hi->intensity - lo->intensity) * ratio;
-    answer->intensity += lo->intensity;
-    return (XcmsSuccess);
-}
-
-/*
- *	NAME
- *		IntensityInterpolation
- *
- *	SYNOPSIS
- */
-int
-_XcmsIntensityInterpolation (key, lo, hi, answer, bitsPerRGB)
-    IntensityRec *key, *lo, *hi, *answer;
-    int bitsPerRGB;
-/*
- *	DESCRIPTION
- *		Based on a given intensity, performs a linear interpolation
- *		on the values between two IntensityRec structures.
- *		The bitsPerRGB parameter is necessary to perform rounding
- *		to the correct number of significant bits.
- *
- *	RETURNS
- *		Returns 0 if failed; otherwise non-zero.
- */
-{
-    XcmsFloat ratio;
-    long target, up, down;
-    int shift = 16 - bitsPerRGB;
-    int max_color = (1 << bitsPerRGB) - 1;
-
-    ratio = (key->intensity - lo->intensity) / (hi->intensity - lo->intensity);
-    answer->intensity = key->intensity;
-    target = hi->value - lo->value;
-    target *= ratio;
-    target += lo->value;
-
-    /*
-     * Ok now, lets find the closest in respects to bits per RGB
-     */
-    up = ((target >> shift) * 0xFFFF) / max_color;
-    if (up < target) {
-	down = up;
-	up = (MIN((down >> shift) + 1, max_color) * 0xFFFF) / max_color;
-    } else {
-	down = (MAX((up >> shift) - 1, 0) * 0xFFFF) / max_color;
-    }
-    answer->value = ((up - target) < (target - down) ? up : down);
-    answer->value &= MASK[bitsPerRGB];
-    return (XcmsSuccess);
-}
-
-
-/*
- *	NAME
- *		_XcmsTableSearch
- *
- *	SYNOPSIS
- */
-int
-_XcmsTableSearch (key, bitsPerRGB, base, nel, nKeyPtrSize, compar, interpol, answer)
-    char *key;
-    int bitsPerRGB;
-    char *base;
-    unsigned nel;
-    unsigned nKeyPtrSize;
-    int (*compar)();
-    int (*interpol)();
-    char *answer;
-
-/*
- *	DESCRIPTION
- *		A binary search through the specificied table.
- *
- *	RETURNS
- *		Returns 0 if failed; otherwise non-zero.
- *
- */
-{
-    char *hi, *lo, *mid, *last;
-    int result;
-
-    last = hi = base + ((nel - 1) * nKeyPtrSize);
-    mid = lo = base;
-
-    /* use only the significants bits, then scale into 16 bits */
-    ((IntensityRec *)key)->value = ((unsigned long)
-	    (((IntensityRec *)key)->value >> (16 - bitsPerRGB)) * 0xFFFF)
-	    / ((1 << bitsPerRGB) - 1);
-
-    /* Special case so that zero intensity always maps to zero value */
-    if ((*compar) (key,lo) <= 0) {
-	memcpy (answer, lo, nKeyPtrSize);
-	((IntensityRec *)answer)->value &= MASK[bitsPerRGB];
-	return XcmsSuccess;
-    }
-    while (mid != last) {
-	last = mid;
-	mid = lo + (((unsigned)(hi - lo) / nKeyPtrSize) / 2) * nKeyPtrSize;
-	result = (*compar) (key, mid);
-	if (result == 0) {
-
-	    memcpy(answer, mid, nKeyPtrSize);
-	    ((IntensityRec *)answer)->value &= MASK[bitsPerRGB];
-	    return (XcmsSuccess);
-	} else if (result < 0) {
-	    hi = mid;
-	} else {
-	    lo = mid;
-	}
-    }
-
-    /*
-     * If we got to here, we didn't find a solution, so we
-     * need to apply interpolation.
-     */
-    return ((*interpol)(key, lo, hi, answer, bitsPerRGB));
-}
-
-
-/*
- *      NAME
- *		_XcmsMatVec - multiply a 3 x 3 by a 3 x 1 vector
- *
- *	SYNOPSIS
- */
-void _XcmsMatVec(pMat, pIn, pOut)
-    XcmsFloat *pMat, *pIn, *pOut;
-/*
- *      DESCRIPTION
- *		Multiply the passed vector by the passed matrix to return a 
- *		vector. Matrix is 3x3, vectors are of length 3.
- *
- *	RETURNS
- *		void
- */
-{
-    int i, j;
-
-    for (i = 0; i < 3; i++) {
-	pOut[i] = 0.0;
-	for (j = 0; j < 3; j++)
-	    pOut[i] += *(pMat+(i*3)+j) * pIn[j];
-    }
-}
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-
-/*
- *	NAME
- *		XcmsLRGB_RGB_ParseString
- *
- *	SYNOPSIS
- */
-static int
-XcmsLRGB_RGB_ParseString(spec, pColor)
-    register char *spec;
-    XcmsColor *pColor;
-/*
- *	DESCRIPTION
- *		This routines takes a string and attempts to convert
- *		it into a XcmsColor structure with XcmsRGBFormat.
- *
- *	RETURNS
- *		0 if failed, non-zero otherwise.
- */
-{
-    register int n, i;
-    unsigned short r, g, b;
-    char c;
-    char *pchar;
-    unsigned short *pShort;
-
-    /*
-     * Check for old # format
-     */
-    if (*spec == '#') {
-	/*
-	 * Attempt to parse the value portion.
-	 */
-	spec++;
-	n = strlen(spec);
-	if (n != 3 && n != 6 && n != 9 && n != 12) {
-	    return(XcmsFailure);
-	}
-
-	n /= 3;
-	g = b = 0;
-	do {
-	    r = g;
-	    g = b;
-	    b = 0;
-	    for (i = n; --i >= 0; ) {
-		c = *spec++;
-		b <<= 4;
-		if (c >= '0' && c <= '9')
-		    b |= c - '0';
-		/* assume string in lowercase
-		else if (c >= 'A' && c <= 'F')
-		    b |= c - ('A' - 10);
-		*/
-		else if (c >= 'a' && c <= 'f')
-		    b |= c - ('a' - 10);
-		else return (XcmsFailure);
-	    }
-	} while (*spec != '\0');
-
-	/*
-	 * Succeeded !
-	 */
-	n <<= 2;
-	n = 16 - n;
-	/* shift instead of scale, to match old broken semantics */
-	pColor->spec.RGB.red = r << n;
-	pColor->spec.RGB.green = g << n;
-	pColor->spec.RGB.blue =  b << n;
-    } else {
-	if ((pchar = strchr(spec, ':')) == NULL) {
-	    return(XcmsFailure);
-	}
-	n = (int)(pchar - spec);
-
-	/*
-	 * Check for proper prefix.
-	 */
-	if (strncmp(spec, _XcmsRGB_prefix, n) != 0) {
-	    return(XcmsFailure);
-	}
-
-	/*
-	 * Attempt to parse the value portion.
-	 */
-	spec += (n + 1);
-	pShort = &pColor->spec.RGB.red;
-	for (i = 0; i < 3; i++, pShort++, spec++) {
-	    n = 0;
-	    *pShort = 0;
-	    while (*spec != '/' && *spec != '\0') {
-		if (++n > 4) {
-		    return(XcmsFailure);
-		}
-		c = *spec++;
-		*pShort <<= 4;
-		if (c >= '0' && c <= '9')
-		    *pShort |= c - '0';
-		/* assume string in lowercase
-		else if (c >= 'A' && c <= 'F')
-		    *pShort |= c - ('A' - 10);
-		*/
-		else if (c >= 'a' && c <= 'f')
-		    *pShort |= c - ('a' - 10);
-		else return (XcmsFailure);
-	    }
-	    if (n == 0)
-		return (XcmsFailure);
-	    if (n < 4) {
-		*pShort = ((unsigned long)*pShort * 0xFFFF) / ((1 << n*4) - 1);
-	    }
-	}
-    }
-    pColor->format = XcmsRGBFormat;
-    pColor->pixel = 0;
-    return (XcmsSuccess);
-}
-
-
-/*
- *	NAME
- *		XcmsLRGB_RGBi_ParseString
- *
- *	SYNOPSIS
- */
-static int
-XcmsLRGB_RGBi_ParseString(spec, pColor)
-    register char *spec;
-    XcmsColor *pColor;
-/*
- *	DESCRIPTION
- *		This routines takes a string and attempts to convert
- *		it into a XcmsColor structure with XcmsRGBiFormat.
- *		The assumed RGBi string syntax is:
- *		    RGBi:<r>/<g>/<b>
- *		Where r, g, and b are in string input format for floats
- *		consisting of:
- *		    a. an optional sign
- *		    b. a string of numbers possibly containing a decimal point,
- *		    c. an optional exponent field containing an 'E' or 'e'
- *			followed by a possibly signed integer string.
- *
- *	RETURNS
- *		0 if failed, non-zero otherwise.
- */
-{
-    int n;
-    char *pchar;
-
-    if ((pchar = strchr(spec, ':')) == NULL) {
-	return(XcmsFailure);
-    }
-    n = (int)(pchar - spec);
-
-    /*
-     * Check for proper prefix.
-     */
-    if (strncmp(spec, _XcmsRGBi_prefix, n) != 0) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Attempt to parse the value portion.
-     */
-    if (sscanf(spec + n + 1, "%lf/%lf/%lf",
-	    &pColor->spec.RGBi.red,
-	    &pColor->spec.RGBi.green,
-	    &pColor->spec.RGBi.blue) != 3) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Succeeded !
-     */
-    pColor->format = XcmsRGBiFormat;
-    pColor->pixel = 0;
-    return (XcmsSuccess);
-}
-
-
-/*
- *	NAME
- *		XcmsCIEXYZToRGBi - convert CIE XYZ to RGB
- *
- *	SYNOPSIS
- */
-/* ARGSUSED */
-Status 
-XcmsCIEXYZToRGBi(ccc, pXcmsColors_in_out, nColors, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pXcmsColors_in_out;/* pointer to XcmsColors to convert 	*/
-    unsigned int nColors;	/* Number of colors			*/
-    Bool *pCompressed;		/* pointer to an array of Bool		*/
-/*
- *	DESCRIPTION
- *		Converts color specifications in an array of XcmsColor
- *		structures from RGB format to RGBi format.
- *
- *	RETURNS
- *		XcmsFailure if failed,
- *		XcmsSuccess if succeeded without gamut compression.
- *		XcmsSuccessWithCompression if succeeded with gamut
- *			compression.
- */
-{
-    LINEAR_RGB_SCCData *pScreenData;
-    XcmsFloat tmp[3];
-    int hasCompressed = 0;
-    unsigned int i;
-    XcmsColor *pColor = pXcmsColors_in_out;
-
-    if (ccc == NULL) {
-	return(XcmsFailure);
-    }
-
-    pScreenData = (LINEAR_RGB_SCCData *)ccc->pPerScrnInfo->screenData;
-
-    /*
-     * XcmsColors should be White Point Adjusted, if necessary, by now!
-     */
-
-    /*
-     * NEW!!! for extended gamut compression
-     *
-     * 1. Need to zero out pCompressed
-     *
-     * 2. Need to save initial address of pColor
-     *
-     * 3. Need to save initial address of pCompressed
-     */
-
-    for (i = 0; i < nColors; i++) {
-
-	/* Make sure format is XcmsCIEXYZFormat */
-	if (pColor->format != XcmsCIEXYZFormat) {
-	    return(XcmsFailure);
-	}
-
-	/* Multiply [A]-1 * [XYZ] to get RGB intensity */
-	_XcmsMatVec((XcmsFloat *) pScreenData->XYZtoRGBmatrix,
-		(XcmsFloat *) &pColor->spec, tmp);
-
-	if ((MIN3 (tmp[0], tmp[1], tmp[2]) < -EPS) ||
-	    (MAX3 (tmp[0], tmp[1], tmp[2]) > (1.0 + EPS))) {
-
-	    /*
-	     * RGBi out of screen's gamut
-	     */
-
-	    if (ccc->gamutCompProc == NULL) {
-		/*
-		 * Aha!! Here's that little trick that will allow
-		 * gamut compression routines to get the out of bound
-		 * RGBi.  
-		 */
-		memcpy((char *)&pColor->spec, (char *)tmp, sizeof(tmp));
-		pColor->format = XcmsRGBiFormat;
-		return(XcmsFailure);
-	    } else if ((*ccc->gamutCompProc)(ccc, pXcmsColors_in_out, nColors,
-		    i, pCompressed) == 0) {
-		return(XcmsFailure);
-	    }
-
-	    /*
-	     * The gamut compression function should return colors in CIEXYZ
-	     *	Also check again to if the new color is within gamut.
-	     */
-	    if (pColor->format != XcmsCIEXYZFormat) {
-		return(XcmsFailure);
-	    }
-	    _XcmsMatVec((XcmsFloat *) pScreenData->XYZtoRGBmatrix,
-		    (XcmsFloat *) &pColor->spec, tmp);
-	    if ((MIN3 (tmp[0], tmp[1], tmp[2]) < -EPS) ||
-		(MAX3 (tmp[0], tmp[1], tmp[2]) > (1.0 + EPS))) {
-		return(XcmsFailure);
-	    }
-	    hasCompressed++;
-	}
-	memcpy((char *)&pColor->spec, (char *)tmp, sizeof(tmp));
-	/* These if statements are done to ensure the fudge factor is */
-	/* is taken into account. */
-	if (pColor->spec.RGBi.red < 0.0) {
-		pColor->spec.RGBi.red = 0.0;
-	} else if (pColor->spec.RGBi.red > 1.0) {
-		pColor->spec.RGBi.red = 1.0;
-	}
-	if (pColor->spec.RGBi.green < 0.0) {
-		pColor->spec.RGBi.green = 0.0;
-	} else if (pColor->spec.RGBi.green > 1.0) {
-		pColor->spec.RGBi.green = 1.0;
-	}
-	if (pColor->spec.RGBi.blue < 0.0) {
-		pColor->spec.RGBi.blue = 0.0;
-	} else if (pColor->spec.RGBi.blue > 1.0) {
-		pColor->spec.RGBi.blue = 1.0;
-	}
-	(pColor++)->format = XcmsRGBiFormat;
-    }
-    return (hasCompressed ? XcmsSuccessWithCompression : XcmsSuccess);
-}
-
-
-/*
- *	NAME
- *		LINEAR_RGBi_to_CIEXYZ - convert RGBi to CIEXYZ
- *
- *	SYNOPSIS
- */
-/* ARGSUSED */
-Status 
-XcmsRGBiToCIEXYZ(ccc, pXcmsColors_in_out, nColors, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pXcmsColors_in_out;/* pointer to XcmsColors to convert 	*/
-    unsigned int nColors;	/* Number of colors			*/
-    Bool *pCompressed;		/* pointer to a bit array		*/
-/*
- *	DESCRIPTION
- *		Converts color specifications in an array of XcmsColor
- *		structures from RGBi format to CIEXYZ format.
- *
- *	RETURNS
- *		XcmsFailure if failed,
- *		XcmsSuccess if succeeded.
- */
-{
-    LINEAR_RGB_SCCData *pScreenData;
-    XcmsFloat tmp[3];
-
-    /*
-     * pCompressed ignored in this function.
-     */
-
-    if (ccc == NULL) {
-	return(XcmsFailure);
-    }
-
-    pScreenData = (LINEAR_RGB_SCCData *)ccc->pPerScrnInfo->screenData;
-
-    /*
-     * XcmsColors should be White Point Adjusted, if necessary, by now!
-     */
-
-    while (nColors--) {
-
-	/* Multiply [A]-1 * [XYZ] to get RGB intensity */
-	_XcmsMatVec((XcmsFloat *) pScreenData->RGBtoXYZmatrix,
-		(XcmsFloat *) &pXcmsColors_in_out->spec, tmp);
-
-	memcpy((char *)&pXcmsColors_in_out->spec, (char *)tmp, sizeof(tmp));
-	(pXcmsColors_in_out++)->format = XcmsCIEXYZFormat;
-    }
-    return(XcmsSuccess);
-}
-
-
-/*
- *	NAME
- *		XcmsRGBiToRGB
- *
- *	SYNOPSIS
- */
-/* ARGSUSED */
-Status 
-XcmsRGBiToRGB(ccc, pXcmsColors_in_out, nColors, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pXcmsColors_in_out;/* pointer to XcmsColors to convert 	*/
-    unsigned int nColors;	/* Number of colors			*/
-    Bool *pCompressed;		/* pointer to a bit array		*/
-/*
- *	DESCRIPTION
- *		Converts color specifications in an array of XcmsColor
- *		structures from RGBi format to RGB format.
- *
- *	RETURNS
- *		XcmsFailure if failed,
- *		XcmsSuccess if succeeded without gamut compression.
- *		XcmsSuccessWithCompression if succeeded with gamut
- *			compression.
- */
-{
-    LINEAR_RGB_SCCData *pScreenData;
-    XcmsRGB tmpRGB;
-    IntensityRec keyIRec, answerIRec;
-
-    /*
-     * pCompressed ignored in this function.
-     */
-
-    if (ccc == NULL) {
-	return(XcmsFailure);
-    }
-
-    pScreenData = (LINEAR_RGB_SCCData *)ccc->pPerScrnInfo->screenData;
-
-    while (nColors--) {
-
-	/* Make sure format is XcmsRGBiFormat */
-	if (pXcmsColors_in_out->format != XcmsRGBiFormat) {
-	    return(XcmsFailure);
-	}
-
-	keyIRec.intensity = pXcmsColors_in_out->spec.RGBi.red;
-	if (!_XcmsTableSearch((char *)&keyIRec, ccc->visual->bits_per_rgb,
-		(char *)pScreenData->pRedTbl->pBase,
-		(unsigned)pScreenData->pRedTbl->nEntries,
-		(unsigned)sizeof(IntensityRec),
-		_XcmsIntensityCmp, _XcmsIntensityInterpolation, (char *)&answerIRec)) {
-	    return(XcmsFailure);
-	}
-	tmpRGB.red = answerIRec.value;
-
-	keyIRec.intensity = pXcmsColors_in_out->spec.RGBi.green;
-	if (!_XcmsTableSearch((char *)&keyIRec, ccc->visual->bits_per_rgb,
-		(char *)pScreenData->pGreenTbl->pBase,
-		(unsigned)pScreenData->pGreenTbl->nEntries,
-		(unsigned)sizeof(IntensityRec),
-		_XcmsIntensityCmp, _XcmsIntensityInterpolation, (char *)&answerIRec)) {
-	    return(XcmsFailure);
-	}
-	tmpRGB.green = answerIRec.value;
-
-	keyIRec.intensity = pXcmsColors_in_out->spec.RGBi.blue;
-	if (!_XcmsTableSearch((char *)&keyIRec, ccc->visual->bits_per_rgb,
-		(char *)pScreenData->pBlueTbl->pBase,
-		(unsigned)pScreenData->pBlueTbl->nEntries,
-		(unsigned)sizeof(IntensityRec),
-		_XcmsIntensityCmp, _XcmsIntensityInterpolation, (char *)&answerIRec)) {
-	    return(XcmsFailure);
-	}
-	tmpRGB.blue = answerIRec.value;
-
-	memcpy((char *)&pXcmsColors_in_out->spec, (char *)&tmpRGB, sizeof(XcmsRGB));
-	(pXcmsColors_in_out++)->format = XcmsRGBFormat;
-    }
-    return(XcmsSuccess);
-}
-
-
-/*
- *	NAME
- *		XcmsRGBToRGBi
- *
- *	SYNOPSIS
- */
-/* ARGSUSED */
-Status 
-XcmsRGBToRGBi(ccc, pXcmsColors_in_out, nColors, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pXcmsColors_in_out;/* pointer to XcmsColors to convert 	*/
-    unsigned int nColors;	/* Number of colors			*/
-    Bool *pCompressed;		/* pointer to a bit array		*/
-/*
- *	DESCRIPTION
- *		Converts color specifications in an array of XcmsColor
- *		structures from RGB format to RGBi format.
- *
- *	RETURNS
- *		XcmsFailure if failed,
- *		XcmsSuccess if succeeded.
- */
-{
-    LINEAR_RGB_SCCData *pScreenData;
-    XcmsRGBi tmpRGBi;
-    IntensityRec keyIRec, answerIRec;
-
-    /*
-     * pCompressed ignored in this function.
-     */
-
-    if (ccc == NULL) {
-	return(XcmsFailure);
-    }
-
-    pScreenData = (LINEAR_RGB_SCCData *)ccc->pPerScrnInfo->screenData;
-
-    while (nColors--) {
-
-	/* Make sure format is XcmsRGBFormat */
-	if (pXcmsColors_in_out->format != XcmsRGBFormat) {
-	    return(XcmsFailure);
-	}
-
-	keyIRec.value = pXcmsColors_in_out->spec.RGB.red;
-	if (!_XcmsTableSearch((char *)&keyIRec, ccc->visual->bits_per_rgb,
-		(char *)pScreenData->pRedTbl->pBase,
-		(unsigned)pScreenData->pRedTbl->nEntries,
-		(unsigned)sizeof(IntensityRec),
-		_XcmsValueCmp, _XcmsValueInterpolation, (char *)&answerIRec)) {
-	    return(XcmsFailure);
-	}
-	tmpRGBi.red = answerIRec.intensity;
-
-	keyIRec.value = pXcmsColors_in_out->spec.RGB.green;
-	if (!_XcmsTableSearch((char *)&keyIRec, ccc->visual->bits_per_rgb,
-		(char *)pScreenData->pGreenTbl->pBase,
-		(unsigned)pScreenData->pGreenTbl->nEntries,
-		(unsigned)sizeof(IntensityRec),
-		_XcmsValueCmp, _XcmsValueInterpolation, (char *)&answerIRec)) {
-	    return(XcmsFailure);
-	}
-	tmpRGBi.green = answerIRec.intensity;
-
-	keyIRec.value = pXcmsColors_in_out->spec.RGB.blue;
-	if (!_XcmsTableSearch((char *)&keyIRec, ccc->visual->bits_per_rgb,
-		(char *)pScreenData->pBlueTbl->pBase,
-		(unsigned)pScreenData->pBlueTbl->nEntries,
-		(unsigned)sizeof(IntensityRec),
-		_XcmsValueCmp, _XcmsValueInterpolation, (char *)&answerIRec)) {
-	    return(XcmsFailure);
-	}
-	tmpRGBi.blue = answerIRec.intensity;
-
-	memcpy((char *)&pXcmsColors_in_out->spec, (char *)&tmpRGBi, sizeof(XcmsRGBi));
-	(pXcmsColors_in_out++)->format = XcmsRGBiFormat;
-    }
-    return(XcmsSuccess);
-}
-
-/*
- *	NAME
- *		_XcmsInitScrnDefaultInfo
- *
- *	SYNOPSIS
- */
-/* ARGSUSED */
-int
-_XcmsLRGB_InitScrnDefault(dpy, screenNumber, pPerScrnInfo)
-    Display *dpy;
-    int screenNumber;
-    XcmsPerScrnInfo *pPerScrnInfo;
-/*
- *	DESCRIPTION
- *		Given a display and screen number, this routine attempts
- *		to initialize the Xcms per Screen Info structure
- *		(XcmsPerScrnInfo) with defaults.
- *
- *	RETURNS
- *		Returns zero if initialization failed; non-zero otherwise.
- */
-{
-    pPerScrnInfo->screenData = (XPointer)&Default_RGB_SCCData;
-    pPerScrnInfo->screenWhitePt.spec.CIEXYZ.X =
-		Default_RGB_SCCData.RGBtoXYZmatrix[0][0] +
-		Default_RGB_SCCData.RGBtoXYZmatrix[0][1] +
-		Default_RGB_SCCData.RGBtoXYZmatrix[0][2];
-    pPerScrnInfo->screenWhitePt.spec.CIEXYZ.Y =
-		Default_RGB_SCCData.RGBtoXYZmatrix[1][0] +
-		Default_RGB_SCCData.RGBtoXYZmatrix[1][1] +
-		Default_RGB_SCCData.RGBtoXYZmatrix[1][2];
-    pPerScrnInfo->screenWhitePt.spec.CIEXYZ.Z =
-		Default_RGB_SCCData.RGBtoXYZmatrix[2][0] +
-		Default_RGB_SCCData.RGBtoXYZmatrix[2][1] +
-		Default_RGB_SCCData.RGBtoXYZmatrix[2][2];
-    if ((pPerScrnInfo->screenWhitePt.spec.CIEXYZ.Y < (1.0 - EPS) )
-	    || (pPerScrnInfo->screenWhitePt.spec.CIEXYZ.Y > (1.0 + EPS))) {
-	pPerScrnInfo->screenData = (XPointer)NULL;
-	pPerScrnInfo->state = XcmsInitNone;
-	return(0);
-    }
-    pPerScrnInfo->screenWhitePt.spec.CIEXYZ.Y = 1.0;
-    pPerScrnInfo->screenWhitePt.format = XcmsCIEXYZFormat;
-    pPerScrnInfo->screenWhitePt.pixel = 0;
-    pPerScrnInfo->functionSet = (XPointer)&XcmsLinearRGBFunctionSet;
-    pPerScrnInfo->state = XcmsInitFailure; /* default initialization */
-    return(1);
-}
diff --git a/xc/lib/X11/Lab.c b/xc/lib/X11/Lab.c
deleted file mode 100644
index c07e0ce48..000000000
--- a/xc/lib/X11/Lab.c
+++ /dev/null
@@ -1,423 +0,0 @@
-/* $XConsortium: Lab.c,v 1.11 93/09/07 21:31:18 rws Exp $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of XCMS based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *	    CIELab.c
- *
- *	DESCRIPTION
- *		This file contains routines that support the CIE L*a*b*
- *		color space to include conversions to and from the CIE
- *		XYZ space.  These conversions are from Principles of
- *		Color Technology Second Edition, Fred W. Billmeyer, Jr.
- *		and Max Saltzman, John Wiley & Sons, Inc., 1981.
- *
- *		Note that the range for L* is 0 to 1.
- */
-/* $XFree86: xc/lib/X11/Lab.c,v 1.2 1999/05/09 10:49:40 dawes Exp $ */
-
-
-#include <X11/Xos.h>
-#include <stdio.h> /* sscanf */
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/*
- *	DEFINES
- *		Internal definitions that need NOT be exported to any package
- *		or program using this package.
- */
-#ifdef DBL_EPSILON
-#  define XMY_DBL_EPSILON DBL_EPSILON
-#else
-#  define XMY_DBL_EPSILON 0.00001
-#endif
-#define DIV16BY116	0.137931
-
-/*
- *	EXTERNS
- */
-extern char	_XcmsCIELab_prefix[];
-
-/* CvCols.c */
-extern Status _XcmsDIConvertColors();
-
-/* XYZ.c */
-extern Status _XcmsCIEXYZ_ValidSpec();
-
-/*
- *	FORWARD DECLARATIONS
- */
-
-static int CIELab_ParseString();
-static Status XcmsCIELab_ValidSpec();
-
-
-/*
- *	LOCAL VARIABLES
- */
-
-
-    /*
-     * NULL terminated list of functions applied to get from CIELab to CIEXYZ
-     */
-static XcmsConversionProc Fl_CIELab_to_CIEXYZ[] = {
-    XcmsCIELabToCIEXYZ,
-    NULL
-};
-
-    /*
-     * NULL terminated list of functions applied to get from CIEXYZ to CIELab
-     */
-static XcmsConversionProc Fl_CIEXYZ_to_CIELab[] = {
-    XcmsCIEXYZToCIELab,
-    NULL
-};
-
-
-/*
- *	GLOBALS
- */
-    /*
-     * CIE Lab Color Space
-     */
-XcmsColorSpace	XcmsCIELabColorSpace =
-    {
-	_XcmsCIELab_prefix,	/* prefix */
-	XcmsCIELabFormat,		/* id */
-	CIELab_ParseString,	/* parseString */
-	Fl_CIELab_to_CIEXYZ,	/* to_CIEXYZ */
-	Fl_CIEXYZ_to_CIELab,	/* from_CIEXYZ */
-	1
-    };
-
-
-/************************************************************************
- *									*
- *			 PRIVATE ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		CIELab_ParseString
- *
- *	SYNOPSIS
- */
-static int
-CIELab_ParseString(spec, pColor)
-    register char *spec;
-    XcmsColor *pColor;
-/*
- *	DESCRIPTION
- *		This routines takes a string and attempts to convert
- *		it into a XcmsColor structure with XcmsCIELabFormat.
- *		The assumed CIELab string syntax is:
- *		    CIELab:<L>/<a>/<b>
- *		Where L, a, and b are in string input format for floats
- *		consisting of:
- *		    a. an optional sign
- *		    b. a string of numbers possibly containing a decimal point,
- *		    c. an optional exponent field containing an 'E' or 'e'
- *			followed by a possibly signed integer string.
- *
- *	RETURNS
- *		0 if failed, non-zero otherwise.
- */
-{
-    int n;
-    char *pchar;
-
-    if ((pchar = strchr(spec, ':')) == NULL) {
-	return(XcmsFailure);
-    }
-    n = (int)(pchar - spec);
-
-    /*
-     * Check for proper prefix.
-     */
-    if (strncmp(spec, _XcmsCIELab_prefix, n) != 0) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Attempt to parse the value portion.
-     */
-    if (sscanf(spec + n + 1, "%lf/%lf/%lf",
-	    &pColor->spec.CIELab.L_star,
-	    &pColor->spec.CIELab.a_star,
-	    &pColor->spec.CIELab.b_star) != 3) {
-	return(XcmsFailure);
-    }
-    pColor->format = XcmsCIELabFormat;
-    pColor->pixel = 0;
-
-    return(XcmsCIELab_ValidSpec(pColor));
-}
-
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsCIELab_ValidSpec
- *
- *	SYNOPSIS
- */
-static Status
-XcmsCIELab_ValidSpec(pColor)
-    XcmsColor *pColor;
-/*
- *	DESCRIPTION
- *		Checks if color specification valid for CIE L*a*b*.
- *
- *	RETURNS
- *		XcmsFailure if invalid,
- *		XcmsSuccess if valid.
- *
- */
-{
-    if (pColor->format != XcmsCIELabFormat
-	    ||
-	    (pColor->spec.CIELab.L_star < 0.0 - XMY_DBL_EPSILON)
-	    ||
-	    (pColor->spec.CIELab.L_star > 100.0 + XMY_DBL_EPSILON)) {
-	return(XcmsFailure);
-    }
-    return(XcmsSuccess);
-}
-
-
-/*
- *	NAME
- *		XcmsCIELabToCIEXYZ - convert CIELab to CIEXYZ
- *
- *	SYNOPSIS
- */
-Status
-XcmsCIELabToCIEXYZ(ccc, pLab_WhitePt, pColors_in_out, nColors)
-    XcmsCCC ccc;
-    XcmsColor *pLab_WhitePt;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-/*
- *	DESCRIPTION
- *		Converts color specifications in an array of XcmsColor
- *		structures from CIELab format to CIEXYZ format.
- *
- *		WARNING: This routine assumes that Yn = 1.0;
- *
- *	RETURNS
- *		XcmsFailure if failed,
- *		XcmsSuccess if succeeded.
- *
- */
-{
-    XcmsCIEXYZ XYZ_return;
-    XcmsFloat tmpFloat, tmpL;
-    XcmsColor whitePt;
-    int i;
-    XcmsColor *pColor = pColors_in_out;
-
-    /*
-     * Check arguments
-     */
-    if (pLab_WhitePt == NULL || pColors_in_out == NULL) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Make sure white point is in CIEXYZ form, if not, convert it.
-     */
-    if (pLab_WhitePt->format != XcmsCIEXYZFormat) {
-	/* Make a copy of the white point because we're going to modify it */
-	memcpy((char *)&whitePt, (char *)pLab_WhitePt, sizeof(XcmsColor));
-	if (!_XcmsDIConvertColors(ccc, &whitePt,
-		(XcmsColor *)NULL, 1, XcmsCIEXYZFormat)) {
-	    return(XcmsFailure);
-	}
-	pLab_WhitePt = &whitePt;
-    }
-
-    /*
-     * Make sure it is a white point, i.e., Y == 1.0
-     */
-    if (pLab_WhitePt->spec.CIEXYZ.Y != 1.0) {
-	return (0);
-    }
-
-    /*
-     * Now convert each XcmsColor structure to CIEXYZ form
-     */
-    for (i = 0; i < nColors; i++, pColor++) {
-
-	/* Make sure original format is CIELab */
-	if (!XcmsCIELab_ValidSpec(pColor)) {
-	    return(XcmsFailure);
-	}
-
-	/* Calculate Y: assume that Yn = 1.0 */
-	tmpL = (pColor->spec.CIELab.L_star + 16.0) / 116.0;
-	XYZ_return.Y = tmpL * tmpL * tmpL;
-
-	if (XYZ_return.Y < 0.008856) {
-	    /* Calculate Y: assume that Yn = 1.0 */
-	    tmpL = pColor->spec.CIELab.L_star / 9.03292;
-
-	    /* Calculate X */
-	    XYZ_return.X = pLab_WhitePt->spec.CIEXYZ.X *
-		    ((pColor->spec.CIELab.a_star / 3893.5) + tmpL);
-	    /* Calculate Y */
-	    XYZ_return.Y = tmpL;
-	    /* Calculate Z */
-	    XYZ_return.Z = pLab_WhitePt->spec.CIEXYZ.Z *
-		    (tmpL - (pColor->spec.CIELab.b_star / 1557.4));
-	} else {
-	    /* Calculate X */
-	    tmpFloat = tmpL + (pColor->spec.CIELab.a_star / 5.0);
-	    XYZ_return.X = pLab_WhitePt->spec.CIEXYZ.X * tmpFloat * tmpFloat * tmpFloat;
-
-	    /* Calculate Z */
-	    tmpFloat = tmpL - (pColor->spec.CIELab.b_star / 2.0);
-	    XYZ_return.Z = pLab_WhitePt->spec.CIEXYZ.Z * tmpFloat * tmpFloat * tmpFloat;
-	}
-
-	memcpy((char *)&pColor->spec.CIEXYZ, (char *)&XYZ_return,
-	       sizeof(XcmsCIEXYZ));
-	pColor->format = XcmsCIEXYZFormat;
-    }
-
-    return (1);
-}
-
-
-/*
- *	NAME
- *		XcmsCIEXYZToCIELab - convert CIEXYZ to CIELab
- *
- *	SYNOPSIS
- */
-Status
-XcmsCIEXYZToCIELab(ccc, pLab_WhitePt, pColors_in_out, nColors)
-    XcmsCCC ccc;
-    XcmsColor *pLab_WhitePt;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-/*
- *	DESCRIPTION
- *		Converts color specifications in an array of XcmsColor
- *		structures from CIEXYZ format to CIELab format.
- *
- *		WARNING: This routine assumes that Yn = 1.0;
- *
- *	RETURNS
- *		XcmsFailure if failed,
- *		XcmsSuccess if succeeded.
- *
- */
-{
-    XcmsCIELab Lab_return;
-    XcmsFloat fX_Xn, fY_Yn, fZ_Zn;
-    XcmsColor whitePt;
-    int i;
-    XcmsColor *pColor = pColors_in_out;
-
-    /*
-     * Check arguments
-     */
-    if (pLab_WhitePt == NULL || pColors_in_out == NULL) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Make sure white point is in CIEXYZ form, if not, convert it.
-     */
-    if (pLab_WhitePt->format != XcmsCIEXYZFormat) {
-	/* Make a copy of the white point because we're going to modify it */
-	memcpy((char *)&whitePt, (char *)pLab_WhitePt, sizeof(XcmsColor));
-	if (!_XcmsDIConvertColors(ccc, &whitePt, (XcmsColor *)NULL,
-		1, XcmsCIEXYZFormat)) {
-	    return(XcmsFailure);
-	}
-	pLab_WhitePt = &whitePt;
-    }
-
-    /*
-     * Make sure it is a white point, i.e., Y == 1.0
-     */
-    if (pLab_WhitePt->spec.CIEXYZ.Y != 1.0) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Now convert each XcmsColor structure to CIEXYZ form
-     */
-    for (i = 0; i < nColors; i++, pColor++) {
-
-	/* Make sure original format is CIELab */
-	if (!_XcmsCIEXYZ_ValidSpec(pColor)) {
-	    return(XcmsFailure);
-	}
-
-	/* Calculate L*:  assume Yn = 1.0 */
-	if (pColor->spec.CIEXYZ.Y < 0.008856) {
-	    fY_Yn = (0.07787 * pColor->spec.CIEXYZ.Y) + DIV16BY116;
-	    /* note fY_Yn used to compute Lab_return.a below */
-	    Lab_return.L_star = 116.0 * (fY_Yn - DIV16BY116);
-	} else {
-	    fY_Yn = (XcmsFloat)XCMS_CUBEROOT(pColor->spec.CIEXYZ.Y);
-	    /* note fY_Yn used to compute Lab_return.a_star below */
-	    Lab_return.L_star = (116.0 * fY_Yn) - 16.0;
-	}
-
-	/* Calculate f(X/Xn) */
-	if ((fX_Xn = pColor->spec.CIEXYZ.X / pLab_WhitePt->spec.CIEXYZ.X) < 0.008856) {
-	    fX_Xn = (0.07787 * fX_Xn) + DIV16BY116;
-	} else {
-	    fX_Xn = (XcmsFloat) XCMS_CUBEROOT(fX_Xn);
-	}
-
-	/* Calculate f(Z/Zn) */
-	if ((fZ_Zn = pColor->spec.CIEXYZ.Z / pLab_WhitePt->spec.CIEXYZ.Z) < 0.008856) {
-	    fZ_Zn = (0.07787 * fZ_Zn) + DIV16BY116;
-	} else {
-	    fZ_Zn = (XcmsFloat) XCMS_CUBEROOT(fZ_Zn);
-	}
-
-	Lab_return.a_star = 5.0 * (fX_Xn - fY_Yn);
-	Lab_return.b_star = 2.0 * (fY_Yn - fZ_Zn);
-
-	memcpy((char *)&pColor->spec.CIELab, (char *)&Lab_return,
-	       sizeof(XcmsCIELab));
-	pColor->format = XcmsCIELabFormat;
-    }
-
-    return(XcmsSuccess);
-}
diff --git a/xc/lib/X11/LabGcC.c b/xc/lib/X11/LabGcC.c
deleted file mode 100644
index 57ad714fb..000000000
--- a/xc/lib/X11/LabGcC.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* $XConsortium: LabGcC.c,v 1.1 91/07/24 23:26:14 rws Exp $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of XCMS based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *	NAME
- *		CIELabGcC.c
- *
- *	DESCRIPTION
- *		Source for XcmsCIELabClipuv() gamut compression routine.
- *
- */
-/* $XFree86: xc/lib/X11/LabGcC.c,v 1.2 1999/05/09 10:49:41 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-extern Status _XcmsDIConvertColors();
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsCIELabClipab - Reduce the chroma for a hue and L*
- *
- *	SYNOPSIS
- */
-/* ARGSUSED */
-Status
-XcmsCIELabClipab (ccc, pColors_in_out, nColors, i, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-    unsigned int i;
-    Bool *pCompressed;
-/*
- *	DESCRIPTION
- *		Reduce the Chroma for a specific hue and chroma to
- *		to bring the given color into the gamut of the 
- *		specified device.  As required of gamut compression
- *		functions, this routine returns pColor_in_out
- *		in XcmsCIEXYZFormat on successful completion.
- *		
- *		Since this routine works with the L* within
- *		pColor_in_out intermediate results may be returned
- *		even though it may be invalid.
- *
- *	RETURNS
- *		XcmsFailure - Failure
- *              XcmsSuccess - Succeeded
- *
- */
-{
-    Status retval;
-    XcmsColor *pColor;
-
-    /*
-     * Color specification passed as input can be assumed to:
-     *	1. Be in XcmsCIEXYZFormat
-     *	2. Already be white point adjusted for the Screen White Point.
-     *	    This means that the white point now associated with this
-     *	    color spec is the Screen White Point (even if the
-     *	    ccc->clientWhitePt differs).
-     */
-
-    pColor = pColors_in_out + i;
-
-    if (ccc->visual->class < PseudoColor) {
-	/*
-	 * GRAY !
-	 */
-	_XcmsDIConvertColors(ccc, pColor, ScreenWhitePointOfCCC(ccc),
-		1, XcmsCIELabFormat);
-	_XcmsDIConvertColors(ccc, pColor, ScreenWhitePointOfCCC(ccc),
-		1, XcmsCIEXYZFormat);
-	if (pCompressed) {
-	    *(pCompressed + i) = True;
-	}
-	return(XcmsSuccess);
-    } else {
-	if (pColor->format != XcmsCIELabFormat) {
-	    if (_XcmsDIConvertColors(ccc, pColor,
-		    &ccc->pPerScrnInfo->screenWhitePt, 1, XcmsCIELabFormat)
-		    == XcmsFailure) {
-		return(XcmsFailure);
-	    }
-	}
-	if (XcmsCIELabQueryMaxC(ccc,
-		degrees(XCMS_CIELAB_PMETRIC_HUE(pColor->spec.CIELab.a_star, 
-						pColor->spec.CIELab.b_star)),
-		pColor->spec.CIELab.L_star,
-		pColor) == XcmsFailure) {
-	    return(XcmsFailure);
-	}
-	retval = _XcmsDIConvertColors(ccc, pColor,
-		&ccc->pPerScrnInfo->screenWhitePt, 1, XcmsCIEXYZFormat);
-	if (retval != XcmsFailure && pCompressed != NULL) {
-	    *(pCompressed + i) = True;
-	}
-	return(retval);
-    }
-}
diff --git a/xc/lib/X11/LabGcL.c b/xc/lib/X11/LabGcL.c
deleted file mode 100644
index a146dfb1f..000000000
--- a/xc/lib/X11/LabGcL.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/* $XConsortium: LabGcL.c,v 1.3 93/09/07 21:31:21 rws Exp $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of XCMS based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *	NAME
- *		CIELabGcL.c
- *
- *	DESCRIPTION
- *		Source for XcmsCIELabClipL() gamut compression routine.
- *
- */
-/* $XFree86: xc/lib/X11/LabGcL.c,v 1.2 1999/05/09 10:49:41 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/*
- *	EXTERNS
- */
-extern Status _XcmsCIELabQueryMaxLCRGB();
-
-/* CvCols.c */
-extern Status _XcmsDIConvertColors();
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsCIELabClipL - Return the closest L*
- *
- *	SYNOPSIS
- */
-/* ARGSUSED */
-Status
-XcmsCIELabClipL (ccc, pColors_in_out, nColors, i, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-    unsigned int i;
-    Bool *pCompressed;
-/*
- *	DESCRIPTION
- *		Return the closest L* for a specific hue and chroma.
- *		This routine takes any color as input and outputs 
- *		a CIE XYZ color.
- *
- *		Since this routine works with the L* within
- *		pColor_in_out intermediate results may be returned
- *		even though it may be invalid.
- *
- *	RETURNS
- *		XcmsFailure - Failure
- *              XcmsSuccess - Succeeded
- *
- */
-{
-    XcmsCCCRec	myCCC;
-    XcmsColor	*pColor;
-    XcmsColor   Lab_max;
-    XcmsFloat	hue, chroma, maxChroma;
-    Status retval;
-
-    /* Use my own CCC */
-    memcpy ((char *)&myCCC, (char *)ccc, sizeof(XcmsCCCRec));
-    myCCC.clientWhitePt.format = XcmsUndefinedFormat;/* Inherit Screen WP */
-    myCCC.gamutCompProc = (XcmsCompressionProc)NULL;/* no gamut compression */
-
-    /*
-     * Color specification passed as input can be assumed to:
-     *	1. Be in XcmsCIEXYZFormat
-     *	2. Already be white point adjusted for the Screen White Point.
-     *	    This means that the white point now associated with this
-     *	    color spec is the Screen White Point (even if the
-     *	    ccc->clientWhitePt differs).
-     */
-
-    pColor = pColors_in_out + i;
-    
-    if (ccc->visual->class < StaticColor) {
-	/*
-	 * GRAY !
-	 */
-	return(XcmsFailure);
-    } else {
-	/* Convert from CIEXYZ to CIE L*u*v* format */
-	if (_XcmsDIConvertColors(&myCCC, pColor,
-		ScreenWhitePointOfCCC(&myCCC), 1, XcmsCIELabFormat)
-		== XcmsFailure) {
-	    return(XcmsFailure);
-	}
-
-	hue = XCMS_CIELAB_PMETRIC_HUE(pColor->spec.CIELab.a_star,
-				      pColor->spec.CIELab.b_star);
-	chroma = XCMS_CIELAB_PMETRIC_CHROMA(pColor->spec.CIELab.a_star,
-					    pColor->spec.CIELab.b_star);
-	/* Step 1: compute the maximum L* and chroma for this hue. */
-	/*         This copy may be overkill but it preserves the pixel etc. */
-	memcpy((char *)&Lab_max, (char *)pColor, sizeof(XcmsColor));
-	if (_XcmsCIELabQueryMaxLCRGB (&myCCC, hue, &Lab_max,
-		(XcmsRGBi *)NULL) == XcmsFailure) {
-	    return (XcmsFailure);
-	}
-	maxChroma = XCMS_CIELAB_PMETRIC_CHROMA(Lab_max.spec.CIELab.a_star,
-					       Lab_max.spec.CIELab.b_star);
-
-	/* Now check and return the appropriate L* */
-	if (chroma == maxChroma) {
-	    /* When the chroma input is equal to the maximum chroma */
-	    /* merely return the L* for that chroma. */
-	    memcpy((char *)pColor, (char *)&Lab_max, sizeof(XcmsColor));
-	    retval = _XcmsDIConvertColors(&myCCC, pColor,
-		    ScreenWhitePointOfCCC(&myCCC), 1, XcmsCIEXYZFormat);
-	} else if (chroma > maxChroma) {
-	    /* When the chroma input is greater than the maximum chroma */
-	    /* merely return the L* and chroma for the given hue. */
-	    memcpy((char *)pColor, (char *)&Lab_max, sizeof(XcmsColor));
-	    return (XcmsFailure);
-	} else if (pColor->spec.CIELab.L_star < Lab_max.spec.CIELab.L_star) {
-	    /* Find the minimum lightness for the given chroma. */  
-	    if (pColor->format != XcmsCIELabFormat) {
-		if (_XcmsDIConvertColors(ccc, pColor,
-			ScreenWhitePointOfCCC(ccc), 1, XcmsCIELabFormat)
-			== XcmsFailure) {
-		    return(XcmsFailure);
-		}
-	    }
-	    if (XcmsCIELabQueryMinL(&myCCC, degrees(hue), chroma, pColor)
-		== XcmsFailure) {
-		    return (XcmsFailure);
-	    }
-	    retval = _XcmsDIConvertColors(&myCCC, pColor,
-		           ScreenWhitePointOfCCC(&myCCC), 1, XcmsCIEXYZFormat);
-	} else {
-	    /* Find the maximum lightness for the given chroma. */
-	    if (pColor->format != XcmsCIELabFormat) {
-		if (_XcmsDIConvertColors(ccc, pColor,
-			      ScreenWhitePointOfCCC(ccc), 1, XcmsCIELabFormat)
-			== XcmsFailure) {
-		    return(XcmsFailure);
-		}
-	    }
-	    if (XcmsCIELabQueryMaxL(&myCCC, degrees(hue), chroma, pColor)
-		== XcmsFailure) {
-		    return (XcmsFailure);
-	    }
-	    retval = _XcmsDIConvertColors(&myCCC, pColor,
-		           ScreenWhitePointOfCCC(&myCCC), 1, XcmsCIEXYZFormat);
-	}
-	if (retval != XcmsFailure && pCompressed != NULL) {
-	    *(pCompressed + i) = True;
-	}
-	return(retval);
-    }
-}
diff --git a/xc/lib/X11/LabGcLC.c b/xc/lib/X11/LabGcLC.c
deleted file mode 100644
index 2356519e4..000000000
--- a/xc/lib/X11/LabGcLC.c
+++ /dev/null
@@ -1,232 +0,0 @@
-/* $XConsortium: LabGcLC.c,v 1.3 93/09/07 21:31:25 rws Exp $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of XCMS based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *	NAME
- *		CIELabGcLC.c
- *
- *	DESCRIPTION
- *		Source for XcmsCIELabClipLab() gamut
- *		compression function.
- */
-/* $XFree86: xc/lib/X11/LabGcLC.c,v 1.2 1999/05/09 10:49:41 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-#include <math.h>
-
-/*
- *	INTERNALS
- *		Internal defines that need NOT be exported to any package or
- *		program using this package.
- */
-#define MAXBISECTCOUNT	100
-
-/*
- *	EXTERNS
- */
-extern Status _XcmsCIELabQueryMaxLCRGB();
-
-/* CvCols.c */
-extern Status _XcmsDIConvertColors();
-
-/* CvColW.c */
-extern Status _XcmsConvertColorsWithWhitePt();
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsCIELabClipLab - Return the closest L* and chroma
- *
- *	SYNOPSIS
- */
-/* ARGSUSED */
-Status
-XcmsCIELabClipLab (ccc, pColors_in_out, nColors, i, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-    unsigned int i;
-    Bool *pCompressed;
-/*
- *	DESCRIPTION
- *		This routine will find the closest L* and chroma 
- *		for a specific hue.  The color input is converted to
- *		CIE L*u*v* format and returned as CIE XYZ format.
- *
- *		Since this routine works with the L* within
- *		pColor_in_out intermediate results may be returned
- *		even though it may be invalid.
- *
- *	RETURNS
- *		XcmsFailure - Failure
- *              XcmsSuccess - Succeeded
- *
- */
-{
-    Status retval;
-    XcmsCCCRec	myCCC;
-    XcmsColor	*pColor;
-    XcmsColor	Lab_max;
-    XcmsFloat	hue, chroma, maxChroma;
-    XcmsFloat	Chroma, bestChroma, Lstar, maxLstar, saveLstar;
-    XcmsFloat	bestLstar, bestastar, bestbstar;
-    XcmsFloat	nT, saveDist, tmpDist;
-    XcmsRGBi	rgb_max;
-    int		nCount, nMaxCount, nI, nILast;
-
-    /* Use my own CCC */
-    memcpy ((char *)&myCCC, (char *)ccc, sizeof(XcmsCCCRec));
-    myCCC.clientWhitePt.format = XcmsUndefinedFormat;/* inherit screen white */
-    myCCC.gamutCompProc = (XcmsCompressionProc)NULL;/* no gamut compression func */
-
-    /*
-     * Color specification passed as input can be assumed to:
-     *	1. Be in XcmsCIEXYZFormat
-     *	2. Already be white point adjusted for the Screen White Point.
-     *	    This means that the white point now associated with this
-     *	    color spec is the Screen White Point (even if the
-     *	    ccc->clientWhitePt differs).
-     */
-
-    pColor = pColors_in_out + i;
-
-    if (ccc->visual->class < StaticColor) {
-	/*
-	 * GRAY !
-	 */
-	_XcmsDIConvertColors(ccc, pColor, ScreenWhitePointOfCCC(ccc),
-		1, XcmsCIELabFormat);
-	_XcmsDIConvertColors(ccc, pColor, ScreenWhitePointOfCCC(ccc),
-		1, XcmsCIEXYZFormat);
-	if (pCompressed) {
-	    *(pCompressed + i) = True;
-	}
-	return(XcmsSuccess);
-    }
-
-    /* Convert from CIEXYZ to CIELab format */
-    if (_XcmsDIConvertColors(&myCCC, pColor,
-		            ScreenWhitePointOfCCC(&myCCC), 1, XcmsCIELabFormat)
-		== XcmsFailure) {
-	return(XcmsFailure);
-    }
-
-    /* Step 1: compute the maximum L* and chroma for this hue. */
-    /*         This copy may be overkill but it preserves the pixel etc. */
-    saveLstar = pColor->spec.CIELab.L_star;
-    hue = XCMS_CIELAB_PMETRIC_HUE(pColor->spec.CIELab.a_star,
-				  pColor->spec.CIELab.b_star);
-    chroma = XCMS_CIELAB_PMETRIC_CHROMA(pColor->spec.CIELab.a_star,
-					pColor->spec.CIELab.b_star);
-    memcpy((char *)&Lab_max, (char *)pColor, sizeof(XcmsColor));
-    if (_XcmsCIELabQueryMaxLCRGB (&myCCC, hue, &Lab_max, &rgb_max) 
-	    == XcmsFailure) {
-	return (XcmsFailure);
-    }
-    maxLstar = Lab_max.spec.CIELab.L_star;
-	
-    /* Now check and return the appropriate L* */
-    if (saveLstar == maxLstar) {
-	/* When the L* input is equal to the maximum L* */
-	/* merely return the maximum Lab point. */
-	memcpy((char *)pColor, (char *)&Lab_max, sizeof(XcmsColor));
-	retval = _XcmsDIConvertColors(&myCCC, pColor,
-		           ScreenWhitePointOfCCC(&myCCC), 1, XcmsCIEXYZFormat);
-    } else {
-	/* return the closest point on the hue leaf. */
-	/* must do a bisection here to compute the delta e. */
-	maxChroma = XCMS_CIELAB_PMETRIC_CHROMA(Lab_max.spec.CIELab.a_star,
-					       Lab_max.spec.CIELab.b_star);
-	nMaxCount = MAXBISECTCOUNT;
-	nI = nMaxCount / 2;
-	bestLstar = Lstar =  pColor->spec.CIELab.L_star;
-	bestastar = pColor->spec.CIELab.a_star;
-	bestbstar = pColor->spec.CIELab.b_star;
-	bestChroma = Chroma = chroma;
-	saveDist = XCMS_SQRT(((Chroma - maxChroma) * (Chroma - maxChroma)) +
-			     ((Lstar - maxLstar) * (Lstar - maxLstar)));
-	for (nCount = 0; nCount < nMaxCount; nCount++) {
-	    nT = (XcmsFloat) nI / (XcmsFloat) nMaxCount;
-	    if (saveLstar > maxLstar) {
-		pColor->spec.RGBi.red   = rgb_max.red * (1.0 - nT) + nT;
-		pColor->spec.RGBi.green = rgb_max.green * (1.0 - nT) + nT;
-		pColor->spec.RGBi.blue  = rgb_max.blue * (1.0 - nT) + nT;
-	    } else {
-		pColor->spec.RGBi.red   = rgb_max.red - (rgb_max.red * nT);
-		pColor->spec.RGBi.green = rgb_max.green - (rgb_max.green * nT);
-		pColor->spec.RGBi.blue  = rgb_max.blue - (rgb_max.blue * nT);
-	    }
-	    pColor->format = XcmsRGBiFormat;
-
-	    /* Convert from RGBi to CIE Lab */
-	    if (_XcmsConvertColorsWithWhitePt(&myCCC, pColor,
-	                    ScreenWhitePointOfCCC(&myCCC), 1, XcmsCIELabFormat,
-			    (Bool *) NULL) == XcmsFailure) {
-		return (XcmsFailure);
-	    }
-	    chroma = XCMS_CIELAB_PMETRIC_CHROMA(pColor->spec.CIELab.a_star,
-					        pColor->spec.CIELab.b_star);
-	    tmpDist = XCMS_SQRT(((Chroma - chroma) * (Chroma - chroma)) +
-			        ((Lstar - pColor->spec.CIELab.L_star) *
-				 (Lstar - pColor->spec.CIELab.L_star)));
-	    nILast = nI;
-	    if (tmpDist > saveDist) {
-		nI /= 2;
-	    } else {
-		nI = (nMaxCount + nI) / 2;
-		saveDist = tmpDist;
-		bestLstar = pColor->spec.CIELab.L_star;
-		bestastar = pColor->spec.CIELab.a_star;
-		bestbstar = pColor->spec.CIELab.b_star;
-		bestChroma = chroma;	    
-	    }
-	    if (nI == nILast || nI == 0) {
-		break;
-	    }
-	}
-	if (bestChroma >= maxChroma) {
-	    pColor->spec.CIELab.L_star = maxLstar;
-	    pColor->spec.CIELab.a_star = Lab_max.spec.CIELab.a_star;
-	    pColor->spec.CIELab.b_star = Lab_max.spec.CIELab.b_star;
-	} else {
-	    pColor->spec.CIELab.L_star = bestLstar;
-	    pColor->spec.CIELab.a_star = bestastar;
-	    pColor->spec.CIELab.b_star = bestbstar;
-	}
-	retval = _XcmsDIConvertColors(&myCCC, pColor,
-		           ScreenWhitePointOfCCC(&myCCC), 1, XcmsCIEXYZFormat);
-
-	if (retval != XcmsFailure && pCompressed != NULL) {
-	    *(pCompressed + i) = True;
-	}
-    }
-    return(retval);
-}
diff --git a/xc/lib/X11/LabMnL.c b/xc/lib/X11/LabMnL.c
deleted file mode 100644
index 8ca56302c..000000000
--- a/xc/lib/X11/LabMnL.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/* $XConsortium: LabMnL.c /main/4 1995/10/24 11:18:39 gildea $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of XCMS based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *	NAME
- *		CIELabMnL.c
- *
- *	DESCRIPTION
- *		Source for the XcmsCIELabQueryMinL() gamut boundary
- *		querying routine.
- *
- */
-/* $XFree86: xc/lib/X11/LabMnL.c,v 1.2 1999/05/09 10:49:42 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-#include <math.h>
-
-/*
- *	DEFINES
- */
-#define MAXBISECTCOUNT	100
-#define EPS		(XcmsFloat)0.001
-#define START_L_STAR	(XcmsFloat)40.0
-
-/*
- *	EXTERNS
- */
-extern Status _XcmsCIELabQueryMaxLCRGB();
-
-/* CvColW.c */
-extern Status _XcmsConvertColorsWithWhitePt();
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsCIELabQueryMinL - Compute max Lstar for a hue and chroma
- *
- *	SYNOPSIS
- */
-Status
-XcmsCIELabQueryMinL(ccc, hue_angle, chroma, pColor_return)
-    XcmsCCC ccc;
-    XcmsFloat hue_angle;	    /* hue angle in degrees */
-    XcmsFloat chroma;
-    XcmsColor *pColor_return;
-/*
- *	DESCRIPTION
- *		Return the maximum Lstar for a specified hue_angle and chroma.
- *
- *	ASSUMPTIONS
- *		This routine assumes that the white point associated with
- *		the color specification is the Screen White Point.  The
- *		Screen White Point will also be associated with the
- *		returned color specification.
- *
- *	RETURNS
- *		XcmsFailure - Failure
- *              XcmsSuccess - Succeeded with no modifications
- *
- */
-{
-    XcmsCCCRec	myCCC;
-    XcmsColor   max_lc, tmp, prev;
-    XcmsFloat   max_chroma, tmp_chroma;
-    XcmsFloat   hue, nT, nChroma, lastChroma, prevChroma;
-    XcmsFloat   rFactor;
-    XcmsRGBi    rgb_saved;
-    int         nCount, nMaxCount;
-
-    /*
-     * Check Arguments
-     */
-    if (ccc == NULL || pColor_return == NULL) {
-	return(XcmsFailure);
-    }
-
-    /* setup the CCC to use for the conversions. */
-    memcpy ((char *) &myCCC, (char *) ccc, sizeof(XcmsCCCRec));
-    myCCC.clientWhitePt.format = XcmsUndefinedFormat;
-    myCCC.gamutCompProc = (XcmsCompressionProc) NULL;
-
-    while (hue_angle < 0.0) {
-	hue_angle += 360.0;
-    }
-    while (hue_angle >= 360.0) {
-	hue_angle -= 360.0;
-    } 
-
-    hue = radians(hue_angle);
-    tmp.spec.CIELab.L_star = START_L_STAR;
-    tmp.spec.CIELab.a_star = XCMS_CIEASTAROFHUE(hue, chroma);
-    tmp.spec.CIELab.b_star = XCMS_CIEBSTAROFHUE(hue, chroma);
-    tmp.pixel = pColor_return->pixel;
-    tmp.format = XcmsCIELabFormat;
-    
-    /* Step 1: Obtain the maximum L_star and chroma for this hue. */
-    if (_XcmsCIELabQueryMaxLCRGB(&myCCC, hue, &max_lc, &rgb_saved)
-	    == XcmsFailure) {
-	return(XcmsFailure);
-    }
-
-    max_chroma = XCMS_CIELAB_PMETRIC_CHROMA(max_lc.spec.CIELab.a_star,
-					    max_lc.spec.CIELab.b_star);
-
-    if (max_chroma <= chroma) {
-	/*
-	 *  If the chroma is greater than the chroma for the 
-	 *  maximum L/chroma point then the L_star is the
-	 *  the L_star for the maximum L_star/chroma point.
-	 *  This is an error but I return the best approximation I can.
-         *  Thus the inconsistency.
-	 */
-	memcpy ((char *) pColor_return, (char *) &max_lc, sizeof (XcmsColor));
-	return(XcmsSuccess);
-    }
-
-    /*
-     *  If the chroma is equal to the chroma for the 
-     *  maximum L_star/chroma point then the L_star is the
-     *  the L_star for the maximum L* and chroma point.
-     */
-    /* if (max_chroma == chroma) {
-     *  memcpy ((char *) pColor_return, (char *) &max_lc, sizeof (XcmsColor));
-     *	return(XcmsSuccess);
-     *    }
-     */
-
-    /* must do a bisection here to compute the maximum L* */
-    /* save the structure input so that any elements that */
-    /* are not touched are recopied later in the routine. */
-    nChroma = chroma;
-    tmp_chroma = max_chroma;
-    lastChroma = -1.0;
-    nMaxCount = MAXBISECTCOUNT;
-    rFactor = 1.0;
-
-    for (nCount = 0; nCount < nMaxCount; nCount++) {
-	prevChroma = lastChroma;
-	lastChroma = tmp_chroma;
-	nT = (nChroma - max_chroma) / max_chroma * rFactor;
-	memcpy ((char *)&prev, (char *)&tmp, sizeof(XcmsColor));
-	tmp.spec.RGBi.red   = rgb_saved.red + (rgb_saved.red * nT);
-	tmp.spec.RGBi.green = rgb_saved.green + (rgb_saved.green * nT);
-	tmp.spec.RGBi.blue  = rgb_saved.blue + (rgb_saved.blue * nT);
-	tmp.format = XcmsRGBiFormat;
-
-	/* convert from RGB to CIELab */
-	if (_XcmsConvertColorsWithWhitePt(&myCCC, &tmp,
-		ScreenWhitePointOfCCC(&myCCC), 1, XcmsCIELabFormat,
-		(Bool *) NULL) == XcmsFailure) {
-	    return(XcmsFailure);
-	}
-
-	/* Now check the return against what is expected */
-	tmp_chroma = XCMS_CIELAB_PMETRIC_CHROMA(tmp.spec.CIELab.a_star,
-						tmp.spec.CIELab.b_star);
-	if (tmp_chroma <= chroma + EPS && tmp_chroma >= chroma - EPS) {
-	    /* Found It! */
-	    memcpy ((char *) pColor_return, (char *) &tmp, sizeof (XcmsColor));
-	    return(XcmsSuccess);
-	} 
-	nChroma += chroma - tmp_chroma;
-	if (nChroma > max_chroma) {
-	    nChroma = max_chroma;
-	    rFactor *= 0.5;  /* selective relaxation employed */
-	} else if (nChroma < 0.0) {
-	    if (XCMS_FABS(lastChroma - chroma) < 
-		XCMS_FABS(tmp_chroma - chroma)) {
-		memcpy ((char *)pColor_return, (char *)&prev, 
-			sizeof(XcmsColor));
-	    } else {
-		memcpy ((char *)pColor_return, (char *)&tmp,
- 			sizeof(XcmsColor));
-	    }
-	    return(XcmsSuccess);
-	} else if (tmp_chroma <= prevChroma + EPS &&
-		   tmp_chroma >= prevChroma - EPS) {
-	    rFactor *= 0.5;  /* selective relaxation employed */
-	}
-    }
-
-    if (nCount >= nMaxCount) {
-	if (XCMS_FABS(lastChroma - chroma) < 
-	    XCMS_FABS(tmp_chroma - chroma)) {
-		memcpy ((char *)pColor_return, (char *)&prev,
- 			sizeof(XcmsColor));
-	    } else {
-		memcpy ((char *)pColor_return, (char *)&tmp,
- 			sizeof(XcmsColor));
-	}
-    }
-    memcpy ((char *) pColor_return, (char *) &tmp, sizeof (XcmsColor));
-    return(XcmsSuccess);
-}
diff --git a/xc/lib/X11/LabMxC.c b/xc/lib/X11/LabMxC.c
deleted file mode 100644
index a792a8386..000000000
--- a/xc/lib/X11/LabMxC.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/* $XConsortium: LabMxC.c,v 1.3 93/09/07 21:31:29 rws Exp $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of XCMS based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *
- *	NAME
- *		CIELabMxC.c
- *
- *	DESCRIPTION
- *		Source for the XcmsCIELabQueryMaxC() gamut boundary
- *		querying routine.
- *
- */
-/* $XFree86: xc/lib/X11/LabMxC.c,v 1.2 1999/05/09 10:49:42 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-#include <math.h>
-
-/*
- *	DEFINES
- */
-#define MAXBISECTCOUNT	100
-#define EPS	        (XcmsFloat)0.001
-#define START_CHROMA	(XcmsFloat)3.6
-#define TOPL		(XcmsFloat)100.0
-
-/*
- *	EXTERNS
- */
-extern Status _XcmsCIELabQueryMaxLCRGB();
-
-/* CvColW.c */
-extern Status _XcmsConvertColorsWithWhitePt();
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsCIELabQueryMaxC - max chroma for a hue_angle and L_star
- *
- *	SYNOPSIS
- */
-Status
-XcmsCIELabQueryMaxC(ccc, hue_angle, L_star, pColor_return)
-    XcmsCCC ccc;
-    XcmsFloat hue_angle;	    /* hue angle in degrees */
-    XcmsFloat L_star;
-    XcmsColor *pColor_return;
-/*
- *	DESCRIPTION
- *		Return the maximum chroma for a specific hue_angle and L_star.
- *		The returned format is in XcmsCIELabFormat.
- *
- *
- *	ASSUMPTIONS
- *		This routine assumes that the white point associated with
- *		the color specification is the Screen White Point.  The
- *		Screen White Point will also be associated with the
- *		returned color specification.
- *
- *	RETURNS
- *		XcmsFailure - Failure
- *              XcmsSuccess - Succeeded
- *
- */
-{
-    XcmsCCCRec	myCCC;
-    XcmsColor  tmp;
-    XcmsColor  max_lc;
-    XcmsFloat n_L_star, last_L_star, prev_L_star;
-    XcmsFloat hue, lastaStar, lastbStar, /*lastChroma,*/ maxDist, nT, rFactor;
-    XcmsRGBi   rgb_saved;
-    int nCount, nMaxCount;
-
-    /*
-     * Check Arguments
-     */
-    if (ccc == NULL || pColor_return == NULL) {
-	return(XcmsFailure);
-    }
-
-    /* Use my own CCC and inherit screen white Pt */
-    memcpy ((char *)&myCCC, (char *)ccc, sizeof(XcmsCCCRec));
-    myCCC.clientWhitePt.format = XcmsUndefinedFormat; 
-    myCCC.gamutCompProc = (XcmsCompressionProc)NULL;/* no gamut comp func */
-
-    while (hue_angle < 0.0) {
-	hue_angle += 360.0;
-    }
-    while (hue_angle >= 360.0) {
-	hue_angle -= 360.0;
-    } 
-
-    hue = radians(hue_angle);
-    tmp.spec.CIELab.L_star = L_star;
-    tmp.spec.CIELab.a_star = XCMS_CIEASTAROFHUE(hue, START_CHROMA);
-    tmp.spec.CIELab.b_star = XCMS_CIEBSTAROFHUE(hue, START_CHROMA);
-    tmp.pixel = pColor_return->pixel;
-    tmp.format = XcmsCIELabFormat;
-
-    /* Step 1: compute the maximum L_star and chroma for this hue. */
-    memcpy((char *)&max_lc, (char *)&tmp, sizeof(XcmsColor));
-    if (_XcmsCIELabQueryMaxLCRGB(&myCCC, hue, &max_lc, &rgb_saved)
-	== XcmsFailure) {
-	    return(XcmsFailure);
-    }
-
-    /*
-     * Step 2:  Do a bisection here to compute the maximum chroma
-     *          Note the differences between when the point to be found
-     *          is above the maximum LC point and when it is below.
-     */
-    if (L_star <= max_lc.spec.CIELab.L_star) {
-	maxDist = max_lc.spec.CIELab.L_star;
-    } else {
-	maxDist = TOPL - max_lc.spec.CIELab.L_star;
-    }
-
-    n_L_star = L_star;
-    last_L_star = -1.0;
-    nMaxCount = MAXBISECTCOUNT;
-    rFactor = 1.0;
-
-    for (nCount = 0; nCount < nMaxCount; nCount++) {
-	prev_L_star =  last_L_star;
-	last_L_star =  tmp.spec.CIELab.L_star;
-/*	lastChroma = XCMS_CIELAB_PMETRIC_CHROMA(tmp.spec.CIELab.a_star,  */
-/*						tmp.spec.CIELab.b_star); */
-	lastaStar = tmp.spec.CIELab.a_star;
-	lastbStar = tmp.spec.CIELab.b_star;
-	nT = (n_L_star - max_lc.spec.CIELab.L_star) / maxDist * rFactor;
-	if (nT > 0) {
-	    tmp.spec.RGBi.red = rgb_saved.red * (1.0 - nT) + nT;
-	    tmp.spec.RGBi.green = rgb_saved.green * (1.0 - nT) + nT;
-	    tmp.spec.RGBi.blue  = rgb_saved.blue * (1.0 - nT) + nT;
-	} else {
-	    tmp.spec.RGBi.red = rgb_saved.red + (rgb_saved.red * nT);
-	    tmp.spec.RGBi.green = rgb_saved.green + (rgb_saved.green * nT);
-	    tmp.spec.RGBi.blue = rgb_saved.blue + (rgb_saved.blue * nT);
-	}
-	tmp.format = XcmsRGBiFormat;
-
-	/* convert from RGB to CIELab */
-	if (_XcmsConvertColorsWithWhitePt(&myCCC, &tmp,
-			    ScreenWhitePointOfCCC(&myCCC), 1, XcmsCIELabFormat,
-			    (Bool *) NULL) == XcmsFailure) {
-	    return(XcmsFailure);
-	}
-
-	/*
-	 * Now check if we've reached the target L_star
-	 */
-	/* printf("result Lstar = %lf\n", tmp.spec.CIELab.L_star); */
-	if (tmp.spec.CIELab.L_star <= L_star + EPS &&
-	    tmp.spec.CIELab.L_star >= L_star - EPS) {
-		memcpy((char *)pColor_return, (char *)&tmp, sizeof(XcmsColor));
-		return(XcmsSuccess);
-	}
-	if (nT > 0) {
-	    n_L_star += ((TOPL - n_L_star) *
-			 (L_star - tmp.spec.CIELab.L_star)) / (TOPL - L_star);
-	} else {
-	    n_L_star *= L_star / tmp.spec.CIELuv.L_star;
-	}
-	if (tmp.spec.CIELab.L_star <= prev_L_star + EPS &&
-	    tmp.spec.CIELab.L_star >= prev_L_star - EPS) {
-		rFactor *= 0.5;  /* selective relaxation employed */
-		/* printf("rFactor = %lf\n", rFactor); */
-	}
-    }
-    if (XCMS_FABS(last_L_star - L_star) < 
-	XCMS_FABS(tmp.spec.CIELab.L_star - L_star)) {
-	    tmp.spec.CIELab.a_star = lastaStar;
-	    tmp.spec.CIELab.b_star = lastbStar;
-/*	    tmp.spec.CIELab.a_star = XCMS_CIEASTAROFHUE(hue, lastChroma); */
-/*	    tmp.spec.CIELab.b_star = XCMS_CIEBSTAROFHUE(hue, lastChroma); */
-    }
-    tmp.spec.CIELab.L_star = L_star;
-    memcpy((char *)pColor_return, (char *)&tmp, sizeof(XcmsColor));
-    return(XcmsSuccess);
-}
diff --git a/xc/lib/X11/LabMxL.c b/xc/lib/X11/LabMxL.c
deleted file mode 100644
index d0f472354..000000000
--- a/xc/lib/X11/LabMxL.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/* $XConsortium: LabMxL.c /main/4 1995/10/24 11:18:46 gildea $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of XCMS based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *	NAME
- *		CIELabMxL.c
- *
- *	DESCRIPTION
- *		Source for the XcmsCIELabQueryMaxL() gamut boundary
- *		querying routine.
- *
- */
-/* $XFree86: xc/lib/X11/LabMxL.c,v 1.2 1999/05/09 10:49:43 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-#include <math.h>
-
-/*
- *	DEFINES
- */
-#define MAXBISECTCOUNT	100
-#define EPS		(XcmsFloat)0.001
-#define START_L_STAR	(XcmsFloat)40
-
-/*
- *	EXTERNS
- */
-extern Status _XcmsCIELabQueryMaxLCRGB();
-
-/* CvColW.c */
-extern Status _XcmsConvertColorsWithWhitePt();
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsCIELabQueryMaxL - Compute max Lstar for a hue and chroma
- *
- *	SYNOPSIS
- */
-Status
-XcmsCIELabQueryMaxL(ccc, hue_angle, chroma, pColor_return)
-    XcmsCCC ccc;
-    XcmsFloat hue_angle;	/* hue in degrees */
-    XcmsFloat chroma;
-    XcmsColor *pColor_return;
-/*
- *	DESCRIPTION
- *		Return the maximum Lstar for a specified hue_angle and chroma.
- *
- *	ASSUMPTIONS
- *		This routine assumes that the white point associated with
- *		the color specification is the Screen White Point.  The
- *		Screen White Point will also be associated with the
- *		returned color specification.
- *
- *	RETURNS
- *		XcmsFailure - Failure
- *              XcmsSuccess - Succeeded with no modifications
- *
- */
-{
-    XcmsCCCRec	myCCC;
-    XcmsColor   max_lc, tmp, prev;
-    XcmsFloat   max_chroma, tmp_chroma;
-    XcmsFloat   hue, nT, nChroma, lastChroma, prevChroma;
-    XcmsFloat   rFactor;
-    XcmsRGBi    rgb_saved;
-    int         nCount, nMaxCount;
-
-    /*
-     * Check Arguments
-     */
-    if (ccc == NULL || pColor_return == NULL) {
-	return(XcmsFailure);
-    }
-
-    /* setup the CCC to use for the conversions. */
-    memcpy ((char *) &myCCC, (char *) ccc, sizeof(XcmsCCCRec));
-    myCCC.clientWhitePt.format = XcmsUndefinedFormat;
-    myCCC.gamutCompProc = (XcmsCompressionProc) NULL;
-
-    while (hue_angle < 0.0) {
-	hue_angle += 360.0;
-    }
-    while (hue_angle >= 360.0) {
-	hue_angle -= 360.0;
-    } 
-
-    hue = radians(hue_angle);
-    tmp.spec.CIELab.L_star = START_L_STAR;
-    tmp.spec.CIELab.a_star = XCMS_CIEASTAROFHUE(hue, chroma);
-    tmp.spec.CIELab.b_star = XCMS_CIEBSTAROFHUE(hue, chroma);
-    tmp.pixel = pColor_return->pixel;
-    tmp.format = XcmsCIELabFormat;
-    
-    /* Step 1: Obtain the maximum L_star and chroma for this hue. */
-    if (_XcmsCIELabQueryMaxLCRGB(&myCCC, hue, &max_lc, &rgb_saved)
-	    == XcmsFailure) {
-	return(XcmsFailure);
-    }
-
-    max_chroma = XCMS_CIELAB_PMETRIC_CHROMA(max_lc.spec.CIELab.a_star,
-					    max_lc.spec.CIELab.b_star);
-
-    if (max_chroma <= chroma) {
-	/*
-	 *  If the chroma is greater than the chroma for the 
-	 *  maximum L/chroma point then the L_star is the
-	 *  the L_star for the maximum L_star/chroma point.
-	 *  This is an error but I return the best approximation I can.
-         *  Thus the inconsistency.
-	 */
-	memcpy ((char *) pColor_return, (char *) &max_lc, sizeof (XcmsColor));
-	return(XcmsSuccess);
-    }
-
-    /*
-     *  If the chroma is equal to the chroma for the 
-     *  maximum L_star/chroma point then the L_star is the
-     *  the L_star for the maximum L* and chroma point.
-     */
-    /* if (max_chroma == chroma) {
-     *  memcpy ((char *) pColor_return, (char *) &max_lc, sizeof (XcmsColor));
-     *	return(XcmsSuccess);
-     *    }
-     */
-
-    /* must do a bisection here to compute the maximum L* */
-    /* save the structure input so that any elements that */
-    /* are not touched are recopied later in the routine. */
-    nChroma = chroma;
-    tmp_chroma = max_chroma;
-    lastChroma = -1.0;
-    nMaxCount = MAXBISECTCOUNT;
-    rFactor = 1.0;
-
-    for (nCount = 0; nCount < nMaxCount; nCount++) {
-	prevChroma = lastChroma;
-	lastChroma = tmp_chroma;
-	nT = (1.0 - (nChroma / max_chroma)) * rFactor;
-	memcpy ((char *)&prev, (char *)&tmp, sizeof(XcmsColor));
-	tmp.spec.RGBi.red   = rgb_saved.red * (1.0 - nT) + nT;
-	tmp.spec.RGBi.green = rgb_saved.green * (1.0 - nT) + nT;
-	tmp.spec.RGBi.blue  = rgb_saved.blue * (1.0 - nT) + nT;
-	tmp.format = XcmsRGBiFormat;
-
-	/* convert from RGB to CIELab */
-	if (_XcmsConvertColorsWithWhitePt(&myCCC, &tmp,
-		ScreenWhitePointOfCCC(&myCCC), 1, XcmsCIELabFormat,
-		(Bool *) NULL) == XcmsFailure) {
-	    return(XcmsFailure);
-	}
-
-	/* Now check the return against what is expected */
-	tmp_chroma = XCMS_CIELAB_PMETRIC_CHROMA(tmp.spec.CIELab.a_star,
-						tmp.spec.CIELab.b_star);
-	if (tmp_chroma <= chroma + EPS && tmp_chroma >= chroma - EPS) {
-	    /* Found It! */
-	    memcpy ((char *) pColor_return, (char *) &tmp, sizeof (XcmsColor));
-	    return(XcmsSuccess);
-	} 
-	nChroma += chroma - tmp_chroma;
-	if (nChroma > max_chroma) {
-	    nChroma = max_chroma;
-	    rFactor *= 0.5;  /* selective relaxation employed */
-	} else if (nChroma < 0.0) {
-	    if (XCMS_FABS(lastChroma - chroma) < 
-		XCMS_FABS(tmp_chroma - chroma)) {
-		memcpy ((char *)pColor_return, (char *)&prev,
- 			sizeof(XcmsColor));
-	    } else {
-		memcpy ((char *)pColor_return, (char *)&tmp,
- 			sizeof(XcmsColor));
-	    }
-	    return(XcmsSuccess);
-	} else if (tmp_chroma <= prevChroma + EPS &&
-		   tmp_chroma >= prevChroma - EPS) {
-	    rFactor *= 0.5;  /* selective relaxation employed */
-	}
-    }
-
-    if (nCount >= nMaxCount) {
-	if (XCMS_FABS(lastChroma - chroma) < 
-	    XCMS_FABS(tmp_chroma - chroma)) {
-		memcpy ((char *)pColor_return, (char *)&prev,
- 			sizeof(XcmsColor));
-	    } else {
-		memcpy ((char *)pColor_return, (char *)&tmp,
- 			sizeof(XcmsColor));
-	}
-    }
-    memcpy ((char *) pColor_return, (char *) &tmp, sizeof (XcmsColor));
-    return(XcmsSuccess);
-}
diff --git a/xc/lib/X11/LabMxLC.c b/xc/lib/X11/LabMxLC.c
deleted file mode 100644
index 779ecb3c4..000000000
--- a/xc/lib/X11/LabMxLC.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/* $XConsortium: LabMxLC.c,v 1.4 93/10/07 18:49:34 rws Exp $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of XCMS based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *
- *	NAME
- *		CIELabMxVC.c
- *
- *	DESCRIPTION
- *		Source for the XcmsCIELabQueryMaxLC() gamut boundary
- *		querying routine.
- *
- *	DOCUMENTATION
- *		"TekColor Color Management System, System Implementor's Manual"
- *		and
- *		Fred W. Billmeyer & Max Saltzman, "Principles of Color
- *		Technology", John Wily & Sons, Inc, 1981.
- */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/*
- *	DEFINES
- */
-#define MIN(x,y)	((x) > (y) ? (y) : (x))
-#define MIN3(x,y,z)	((x) > (MIN((y), (z))) ? (MIN((y), (z))) : (x))
-#define MAX(x,y)	((x) > (y) ? (x) : (y))
-#define MAX3(x,y,z)	((x) > (MAX((y), (z))) ? (x) : (MAX((y), (z))))
-#define START_LSTAR	(XcmsFloat)40.0
-#define START_CHROMA	(XcmsFloat)3.6
-
-/*
- *	EXTERNS
- */
-extern Status _XcmsConvertColorsWithWhitePt();
-
-/*
- *	FORWARD DECLARATIONS
- */
-Status _XcmsCIELabQueryMaxLCRGB();
-
-
-/************************************************************************
- *									*
- *			 API PRIVATE ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		_XcmsCIELabQueryMaxLCRGB - Compute maximum L* and chroma.
- *
- *	SYNOPSIS
- */
-Status
-_XcmsCIELabQueryMaxLCRGB(ccc, hue, pColor_return, pRGB_return)
-    XcmsCCC	ccc;
-    XcmsFloat	hue;		    /* hue in radians */
-    XcmsColor   *pColor_return;
-    XcmsRGBi    *pRGB_return;
-
-/*
- *	DESCRIPTION
- *		Return the maximum psychometric chroma for a specified
- *		hue, and the corresponding L*.  This is computed
- *		by a binary search of all possible chromas.  An assumption
- *		is made that there are no local maxima.  Use the unrounded
- *		Max psychometric chroma because the difference check can be
- *		small.  
- *
- *		NOTE:  No local CCC is used because this is a private
- *		       routine and all routines that call it are expected
- *		       to behave properly, i.e. send a local CCC with
- *		       no white adjust function and no gamut compression
- *		       function.
- *
- *		This routine only accepts hue in radians as input and outputs
- *		Lab and RGBi.
- *
- *	RETURNS
- *		XcmsFailure - Failure
- *		XcmsSuccess - Succeeded
- *
- */ 
-{
-    XcmsFloat nSmall, nLarge;
-    XcmsColor tmp;
-
-    tmp.format = XcmsCIELabFormat;
-    /*  Use some unreachable color on the given hue */
-    tmp.spec.CIELab.L_star = START_LSTAR;
-    tmp.spec.CIELab.a_star = XCMS_CIEASTAROFHUE(hue, START_CHROMA);
-    tmp.spec.CIELab.b_star = XCMS_CIEBSTAROFHUE(hue, START_CHROMA);
-    /*
-     * Convert from Lab to RGB
-     *
-     * Note that the CIEXYZ to RGBi conversion routine must stuff the
-     * out of bounds RGBi values in tmp when the ccc->gamutCompProc
-     * is NULL.
-     */
-    if ((_XcmsConvertColorsWithWhitePt(ccc, &tmp, ScreenWhitePointOfCCC(ccc), 
-		               (unsigned int)1, XcmsRGBiFormat, (Bool *) NULL) 
-	    == XcmsFailure) && tmp.format != XcmsRGBiFormat) {
-	return (XcmsFailure);
-    }
-
-    /* Now pick the smallest RGB */
-    nSmall = MIN3(tmp.spec.RGBi.red, 
-		  tmp.spec.RGBi.green, 
-		  tmp.spec.RGBi.blue);
-    /* Make the smallest RGB equal to zero */
-    tmp.spec.RGBi.red   -= nSmall;
-    tmp.spec.RGBi.green -= nSmall;
-    tmp.spec.RGBi.blue  -= nSmall;
-
-    /* Now pick the largest RGB */
-    nLarge = MAX3(tmp.spec.RGBi.red, 
-		  tmp.spec.RGBi.green, 
-		  tmp.spec.RGBi.blue);
-    /* Scale the RGB values based on the largest one */
-    tmp.spec.RGBi.red   /= nLarge;
-    tmp.spec.RGBi.green /= nLarge;
-    tmp.spec.RGBi.blue  /= nLarge;
-    tmp.format = XcmsRGBiFormat;
-
-    /* If the calling routine wants RGB value give them the ones used. */
-    if (pRGB_return) {
-	pRGB_return->red   = tmp.spec.RGBi.red;
-	pRGB_return->green = tmp.spec.RGBi.green;
-	pRGB_return->blue  = tmp.spec.RGBi.blue;
-    }
-
-    /* Convert from RGBi to Lab */
-    if (_XcmsConvertColorsWithWhitePt(ccc, &tmp,
-	       ScreenWhitePointOfCCC(ccc), 1, XcmsCIELabFormat, (Bool *) NULL) 
-	    == XcmsFailure) {
-	return (XcmsFailure);
-    }
-
-    memcpy((char *)pColor_return, (char *)&tmp, sizeof(XcmsColor));
-    return (XcmsSuccess);    
-}
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsCIELabQueryMaxLC - Compute maximum L* and chroma.
- *
- *	SYNOPSIS
- */
-Status
-XcmsCIELabQueryMaxLC (ccc, hue_angle, pColor_return)
-    XcmsCCC ccc;
-    XcmsFloat hue_angle;	    /* hue_angle in degrees */
-    XcmsColor *pColor_return;
-
-/*
- *	DESCRIPTION
- *		Return the point of maximum chroma for the specified
- *		hue_angle.
- *
- *	ASSUMPTIONS
- *		This routine assumes that the white point associated with
- *		the color specification is the Screen White Point.  The
- *		Screen White Point will also be associated with the
- *		returned color specification.
- *
- *	RETURNS
- *		XcmsFailure - Failure
- *		XcmsSuccess - Succeeded
- *
- */ 
-{
-    XcmsCCCRec myCCC;
-
-    /*
-     * Check Arguments
-     */
-    if (ccc == NULL || pColor_return == NULL) {
-	return(XcmsFailure);
-    }
-    
-    /* Use my own CCC */
-    memcpy ((char *)&myCCC, (char *)ccc, sizeof(XcmsCCCRec));
-    myCCC.clientWhitePt.format = XcmsUndefinedFormat;
-    myCCC.gamutCompProc = (XcmsCompressionProc)NULL;
-
-    while (hue_angle < 0.0) {
-	hue_angle += 360.0;
-    }
-    while (hue_angle >= 360.0) {
-	hue_angle -= 360.0;
-    } 
-    
-    return(_XcmsCIELabQueryMaxLCRGB (&myCCC, radians(hue_angle), pColor_return,
-	    (XcmsRGBi *)NULL));
-}
diff --git a/xc/lib/X11/LabWpAj.c b/xc/lib/X11/LabWpAj.c
deleted file mode 100644
index ca938c59c..000000000
--- a/xc/lib/X11/LabWpAj.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/* $XConsortium: LabWpAj.c,v 1.4 91/05/13 22:20:55 rws Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of XCMS based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		CIELabWpAj.c
- *
- *	DESCRIPTION
- *		This file contains routine(s) that support white point
- *		adjustment of color specifications in the CIE L*a*b* color
- *		space.
- */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/*
- *	EXTERNS
- */
-
-extern Status _XcmsConvertColorsWithWhitePt();
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsCIELabWhiteShiftColors
- *
- *	SYNOPSIS
- */
-Status
-XcmsCIELabWhiteShiftColors(ccc, pWhitePtFrom, pWhitePtTo, destSpecFmt,
-	pColors_in_out, nColors, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pWhitePtFrom;
-    XcmsColor *pWhitePtTo;
-    XcmsColorFormat destSpecFmt;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-    Bool *pCompressed;
-/*
- *	DESCRIPTION
- *		Adjust color specifications in XcmsColor structures for
- *		differences in white points.
- *
- *	RETURNS
- *		XcmsFailure if failed,
- *		XcmsSuccess if succeeded without gamut compression,
- *		XcmsSuccessWithCompression if succeeded with gamut
- *			compression.
- */
-{
-    if (pWhitePtFrom == NULL || pWhitePtTo == NULL || pColors_in_out == NULL) {
-	return(0);
-    }
-
-    /*
-     * Convert to CIELab using pWhitePtFrom
-     */
-    if (_XcmsConvertColorsWithWhitePt(ccc, pColors_in_out, pWhitePtFrom,
-	    nColors, XcmsCIELabFormat, pCompressed) == XcmsFailure) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Convert from CIELab to destSpecFmt using pWhitePtTo
-     */
-    return(_XcmsConvertColorsWithWhitePt(ccc, pColors_in_out,
-	pWhitePtTo, nColors, destSpecFmt, pCompressed));
-}
diff --git a/xc/lib/X11/LiHosts.c b/xc/lib/X11/LiHosts.c
deleted file mode 100644
index 26b8425df..000000000
--- a/xc/lib/X11/LiHosts.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* $TOG: LiHosts.c /main/15 1998/02/06 17:41:59 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-/* This can really be considered an os dependent routine */
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-/*
- * can be freed using XFree.
- */
-
-XHostAddress *XListHosts (dpy, nhosts, enabled)
-    register Display *dpy;
-    int *nhosts;	/* RETURN */
-    Bool *enabled;	/* RETURN */
-    {
-    register XHostAddress *outbuf = 0, *op;
-    xListHostsReply reply;
-    long nbytes;
-    unsigned char *buf, *bp;
-    register unsigned i;
-    register xListHostsReq *req;
-
-    *nhosts = 0;
-    LockDisplay(dpy);
-    GetReq (ListHosts, req);
-
-    if (!_XReply (dpy, (xReply *) &reply, 0, xFalse)) {
-       UnlockDisplay(dpy);
-       SyncHandle();
-       return (XHostAddress *) NULL;
-    }
-
-    if (reply.nHosts) {
-	nbytes = reply.length << 2;	/* compute number of bytes in reply */
-	op = outbuf = (XHostAddress *)
-	    Xmalloc((unsigned) (nbytes + reply.nHosts * sizeof(XHostAddress)));
-
-	if (! outbuf) {	
-	    _XEatData(dpy, (unsigned long) nbytes);
-	    UnlockDisplay(dpy);
-	    SyncHandle();
-	    return (XHostAddress *) NULL;
-	}
-	bp = buf = 
-	    ((unsigned char  *) outbuf) + reply.nHosts * sizeof(XHostAddress);
-
-	_XRead (dpy, (char *) buf, nbytes);
-
-	for (i = 0; i < reply.nHosts; i++) {
-#ifdef WORD64
-	    xHostEntry xhe;
-	    memcpy((char *)&xhe, bp, SIZEOF(xHostEntry));
-	    op->family = xhe.family;
-	    op->length = xhe.length;
-#else
-	    op->family = ((xHostEntry *) bp)->family;
-	    op->length =((xHostEntry *) bp)->length; 
-#endif
-	    op->address = (char *) (bp + SIZEOF(xHostEntry));
-	    bp += SIZEOF(xHostEntry) + (((op->length + 3) >> 2) << 2);
-	    op++;
-	}
-    }
-
-    *enabled = reply.enabled;
-    *nhosts = reply.nHosts;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return (outbuf);
-}
-
-
-    
-
-
diff --git a/xc/lib/X11/LiICmaps.c b/xc/lib/X11/LiICmaps.c
deleted file mode 100644
index 07f2f16c7..000000000
--- a/xc/lib/X11/LiICmaps.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* $TOG: LiICmaps.c /main/7 1998/02/06 17:42:04 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-Colormap *XListInstalledColormaps(dpy, win, n)
-register Display *dpy;
-Window win;
-int *n;  /* RETURN */
-{
-    long nbytes;
-    Colormap *cmaps;
-    xListInstalledColormapsReply rep;
-    register xResourceReq *req;
-
-    LockDisplay(dpy);
-    GetResReq(ListInstalledColormaps, win, req);
-
-    if(_XReply(dpy, (xReply *) &rep, 0, xFalse) == 0) {
-	    UnlockDisplay(dpy);
-	    SyncHandle();
-	    *n = 0;
-	    return((Colormap *) NULL);
-	}
-
-    if (rep.nColormaps) {
-	nbytes = rep.nColormaps * sizeof(Colormap);
-	cmaps = (Colormap *) Xmalloc((unsigned) nbytes);
-	nbytes = rep.nColormaps << 2;
-	if (! cmaps) {
-	    _XEatData(dpy, (unsigned long) nbytes);
-	    UnlockDisplay(dpy);
-	    SyncHandle();
-	    return((Colormap *) NULL);
-	}
-	_XRead32 (dpy, (char *) cmaps, nbytes);
-    }
-    else cmaps = (Colormap *) NULL;
-    
-    *n = rep.nColormaps;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return(cmaps);
-}
-
diff --git a/xc/lib/X11/LiProps.c b/xc/lib/X11/LiProps.c
deleted file mode 100644
index 8a3189430..000000000
--- a/xc/lib/X11/LiProps.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* $TOG: LiProps.c /main/8 1998/02/06 17:42:10 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-Atom *XListProperties(dpy, window, n_props)
-register Display *dpy;
-Window window;
-int *n_props;  /* RETURN */
-{
-    long nbytes;
-    xListPropertiesReply rep;
-    Atom *properties;
-    register xResourceReq *req;
-
-    LockDisplay(dpy);
-    GetResReq(ListProperties, window, req);
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	*n_props = 0;
-	UnlockDisplay(dpy);
-        SyncHandle();
-	return ((Atom *) NULL);
-    }
-
-    if (rep.nProperties) {
-	nbytes = rep.nProperties * sizeof(Atom);
-	properties = (Atom *) Xmalloc ((unsigned) nbytes);
-	nbytes = rep.nProperties << 2;
-	if (! properties) {
-	    _XEatData(dpy, (unsigned long) nbytes);
-	    UnlockDisplay(dpy);
-	    SyncHandle();
-	    return (Atom *) NULL;
-	}
-	_XRead32 (dpy, (char *) properties, nbytes);
-    }
-    else properties = (Atom *) NULL;
-
-    *n_props = rep.nProperties;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return (properties);
-}
diff --git a/xc/lib/X11/ListExt.c b/xc/lib/X11/ListExt.c
deleted file mode 100644
index 2f30bede9..000000000
--- a/xc/lib/X11/ListExt.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/* $TOG: ListExt.c /main/9 1998/02/06 17:42:15 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/ListExt.c,v 1.2 1999/05/09 10:49:43 dawes Exp $ */
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-char **XListExtensions(dpy, nextensions)
-register Display *dpy;
-int *nextensions;	/* RETURN */
-{
-	xListExtensionsReply rep;
-	char **list;
-	char *ch;
-	register unsigned i;
-	register int length;
-	register xReq *req;
-	register long rlen;
-
-	LockDisplay(dpy);
-	GetEmptyReq (ListExtensions, req);
-
-	if (! _XReply (dpy, (xReply *) &rep, 0, xFalse)) {
-	    UnlockDisplay(dpy);
-	    SyncHandle();
-	    return (char **) NULL;
-	}
-
-	if (rep.nExtensions) {
-	    list = (char **) Xmalloc (
-                (unsigned)(rep.nExtensions * sizeof (char *)));
-	    rlen = rep.length << 2;
-	    ch = (char *) Xmalloc ((unsigned) rlen + 1);
-                /* +1 to leave room for last null-terminator */
-
-	    if ((!list) || (!ch)) {
-		if (list) Xfree((char *) list);
-		if (ch)   Xfree((char *) ch);
-		_XEatData(dpy, (unsigned long) rlen);
-		UnlockDisplay(dpy);
-		SyncHandle();
-		return (char **) NULL;
-	    }
-
-	    _XReadPad (dpy, ch, rlen);
-	    /*
-	     * unpack into null terminated strings.
-	     */
-	    length = *ch;
-	    for (i = 0; i < rep.nExtensions; i++) {
-		list[i] = ch+1;  /* skip over length */
-		ch += length + 1; /* find next length ... */
-		length = *ch;
-		*ch = '\0'; /* and replace with null-termination */
-	    }
-	}
-	else list = (char **) NULL;
-
-	*nextensions = rep.nExtensions;
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return (list);
-}
-
-int
-XFreeExtensionList (list)
-char **list;
-{
-	if (list != NULL) {
-	    Xfree (list[0]-1);
-	    Xfree ((char *)list);
-	}
-	return 1;
-}
diff --git a/xc/lib/X11/LoadFont.c b/xc/lib/X11/LoadFont.c
deleted file mode 100644
index df58de846..000000000
--- a/xc/lib/X11/LoadFont.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* $TOG: LoadFont.c /main/8 1998/02/06 17:42:20 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#include "Xlibint.h"
-
-#if NeedFunctionPrototypes
-Font XLoadFont (
-    register Display *dpy,
-    _Xconst char *name)
-#else
-Font XLoadFont (dpy, name)
-    register Display *dpy;
-    char *name;
-#endif
-{
-    register long nbytes;
-    Font fid;
-    register xOpenFontReq *req;
-    LockDisplay(dpy);
-    GetReq(OpenFont, req);
-    nbytes = req->nbytes = name ? strlen(name) : 0;
-    req->fid = fid = XAllocID(dpy);
-    req->length += (nbytes+3)>>2;
-    Data (dpy, name, nbytes);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return (fid); 
-       /* can't return (req->fid) since request may have already been sent */
-}
-
diff --git a/xc/lib/X11/LockDis.c b/xc/lib/X11/LockDis.c
deleted file mode 100644
index 891241b7c..000000000
--- a/xc/lib/X11/LockDis.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* $TOG: LockDis.c /main/11 1998/02/06 17:42:26 kaleb $ */
-
-/*
- 
-Copyright 1993, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-/*
- * Author: Stephen Gildea, MIT X Consortium
- *
- * XLockDis.c - multi-thread application-level locking routines
- */
-
-#include "Xlibint.h"
-#ifdef XTHREADS
-#include "locking.h"
-#endif
-
-#if NeedFunctionPrototypes
-void XLockDisplay(
-    register Display* dpy)
-#else
-void XLockDisplay(dpy)
-    register Display* dpy;
-#endif
-{
-#ifdef XTHREADS
-    LockDisplay(dpy);
-    if (dpy->lock)
-	(*dpy->lock->user_lock_display)(dpy);
-    /*
-     * We want the threads in the reply queue to all get out before
-     * XLockDisplay returns, in case they have any side effects the
-     * caller of XLockDisplay was trying to protect against.
-     * XLockDisplay puts itself at the head of the event waiters queue
-     * to wait for all the replies to come in.
-     */
-    if (dpy->lock && dpy->lock->reply_awaiters) {
-	struct _XCVList *cvl;
-
-	cvl = (*dpy->lock->create_cvl)(dpy);
-
-	/* stuff ourselves on the head of the queue */
-	cvl->next = dpy->lock->event_awaiters;
-	dpy->lock->event_awaiters = cvl;
-
-	while (dpy->lock->reply_awaiters)
-	    ConditionWait(dpy, cvl->cv);
-	UnlockNextEventReader(dpy); /* pass the signal on */
-    }
-    UnlockDisplay(dpy);
-#endif
-}
-
-#if NeedFunctionPrototypes
-void XUnlockDisplay(
-    register Display* dpy)
-#else
-void XUnlockDisplay(dpy)
-    register Display* dpy;
-#endif
-{
-#ifdef XTHREADS
-    LockDisplay(dpy);
-    if (dpy->lock)
-	(*dpy->lock->user_unlock_display)(dpy);
-    UnlockDisplay(dpy);
-#endif
-}
diff --git a/xc/lib/X11/LookupCol.c b/xc/lib/X11/LookupCol.c
deleted file mode 100644
index a63fce18f..000000000
--- a/xc/lib/X11/LookupCol.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/* $TOG: LookupCol.c /main/19 1998/02/06 17:42:44 kaleb $ */
-/*
-
-Copyright 1985, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/LookupCol.c,v 1.2 1999/05/09 10:49:44 dawes Exp $ */
-
-#define NEED_REPLIES
-#include <stdio.h>
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-extern Status _XcmsResolveColorString();
-
-extern void _XcmsRGB_to_XColor();
-extern void _XUnresolveColor();
-
-#if NeedFunctionPrototypes
-Status XLookupColor (
-	register Display *dpy,
-        Colormap cmap,
-	_Xconst char *spec,
-	XColor *def,
-	XColor *scr)
-#else
-Status XLookupColor (dpy, cmap, spec, def, scr)
-	register Display *dpy;
-        Colormap cmap;
-	char *spec;
-	XColor *def, *scr;
-#endif
-{
-	register int n;
-	xLookupColorReply reply;
-	register xLookupColorReq *req;
-	XcmsCCC ccc;
-	XcmsColor cmsColor_exact;
-
-	/*
-	 * Let's Attempt to use Xcms and i18n approach to Parse Color
-	 */
-	/* copy string to allow overwrite by _XcmsResolveColorString() */
-	if ((ccc = XcmsCCCOfColormap(dpy, cmap)) != (XcmsCCC)NULL) {
-	    if (_XcmsResolveColorString(ccc, &spec,
-		    &cmsColor_exact, XcmsRGBFormat) >= XcmsSuccess) {
-		_XcmsRGB_to_XColor(&cmsColor_exact, def, 1);
-		memcpy((char *)scr, (char *)def, sizeof(XColor));
-		_XUnresolveColor(ccc, scr);
-		return(1);
-	    }
-	    /*
-	     * Otherwise we failed; or spec was changed with yet another
-	     * name.  Thus pass name to the X Server.
-	     */
-	}
-
-
-	/*
-	 * Xcms and i18n methods failed, so lets pass it to the server
-	 * for parsing.
-	 */
-
-	n = strlen (spec);
-	LockDisplay(dpy);
-	GetReq (LookupColor, req);
-	req->cmap = cmap;
-	req->nbytes = n;
-	req->length += (n + 3) >> 2;
-	Data (dpy, spec, (long)n);
-	if (!_XReply (dpy, (xReply *) &reply, 0, xTrue)) {
-	    UnlockDisplay(dpy);
-	    SyncHandle();
-	    return (0);
-	    }
-	def->red   = reply.exactRed;
-	def->green = reply.exactGreen;
-	def->blue  = reply.exactBlue;
-
-	scr->red   = reply.screenRed;
-	scr->green = reply.screenGreen;
-	scr->blue  = reply.screenBlue;
-
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return (1);
-}
diff --git a/xc/lib/X11/LowerWin.c b/xc/lib/X11/LowerWin.c
deleted file mode 100644
index 3ebcf8e73..000000000
--- a/xc/lib/X11/LowerWin.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* $TOG: LowerWin.c /main/8 1998/02/06 17:42:50 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/LowerWin.c,v 1.2 1999/05/09 10:49:44 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XLowerWindow(dpy, w)
-Display *dpy;
-Window w;
-{
-    register xConfigureWindowReq *req;
-    unsigned long val = Below;		/* needed for macro */
-
-    LockDisplay(dpy);
-    GetReqExtra(ConfigureWindow, 4, req);
-    req->window = w;
-    req->mask = CWStackMode;
-    OneDataCard32 (dpy, NEXTPTR(req,xConfigureWindowReq), val);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/Luv.c b/xc/lib/X11/Luv.c
deleted file mode 100644
index a7e59d22b..000000000
--- a/xc/lib/X11/Luv.c
+++ /dev/null
@@ -1,394 +0,0 @@
-/* $XConsortium: Luv.c,v 1.13 93/09/07 21:31:42 rws Exp $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of XCMS based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		CIELuv.c
- *
- *	DESCRIPTION
- *		This file contains routines that support the CIE L*u*v*
- *		color space to include conversions to and from the CIE
- *		XYZ space.
- *
- *	DOCUMENTATION
- *		"TekColor Color Management System, System Implementor's Manual"
- *		and
- *		Fred W. Billmeyer & Max Saltzman, "Principles of Color
- *		Technology", John Wily & Sons, Inc, 1981.
- */
-/* $XFree86: xc/lib/X11/Luv.c,v 1.2 1999/05/09 10:49:44 dawes Exp $ */
-
-#include <X11/Xos.h>
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-#include <stdio.h> /* sscanf */
-
-/*
- *	EXTERNS
- */
-
-extern char _XcmsCIELuv_prefix[];
-
-/* CvCols.c */
-extern Status _XcmsDIConvertColors();
-
-/* uvY.c */
-Status _XcmsCIEuvY_ValidSpec();
-
-
-/*
- *	FORWARD DECLARATIONS
- */
-
-static int CIELuv_ParseString();
-static Status XcmsCIELuv_ValidSpec();
-
-/*
- *	DEFINES
- *		Internal definitions that need NOT be exported to any package
- *		or program using this package.
- */
-#ifdef DBL_EPSILON
-#  define XMY_DBL_EPSILON DBL_EPSILON
-#else
-#  define XMY_DBL_EPSILON 0.00001
-#endif
-
-
-/*
- *	LOCAL VARIABLES
- */
-
-    /*
-     * NULL terminated list of functions applied to get from CIELuv to CIEXYZ
-     */
-static XcmsConversionProc Fl_CIELuv_to_CIEXYZ[] = {
-    XcmsCIELuvToCIEuvY,
-    XcmsCIEuvYToCIEXYZ,
-    NULL
-};
-
-    /*
-     * NULL terminated list of functions applied to get from CIEXYZ to CIELuv
-     */
-static XcmsConversionProc Fl_CIEXYZ_to_CIELuv[] = {
-    XcmsCIEXYZToCIEuvY,
-    XcmsCIEuvYToCIELuv,
-    NULL
-};
-
-/*
- *	GLOBALS
- */
-
-    /*
-     * CIE Luv Color Space
-     */
-XcmsColorSpace	XcmsCIELuvColorSpace =
-    {
-	_XcmsCIELuv_prefix,	/* prefix */
-	XcmsCIELuvFormat,		/* id */
-	CIELuv_ParseString,	/* parseString */
-	Fl_CIELuv_to_CIEXYZ,	/* to_CIEXYZ */
-	Fl_CIEXYZ_to_CIELuv,	/* from_CIEXYZ */
-	1
-    };
-
-
-/************************************************************************
- *									*
- *			 PRIVATE ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		CIELuv_ParseString
- *
- *	SYNOPSIS
- */
-static int
-CIELuv_ParseString(spec, pColor)
-    register char *spec;
-    XcmsColor *pColor;
-/*
- *	DESCRIPTION
- *		This routines takes a string and attempts to convert
- *		it into a XcmsColor structure with XcmsCIELuvFormat.
- *		The assumed CIELuv string syntax is:
- *		    CIELuv:<L>/<u>/<v>
- *		Where L, u, and v are in string input format for floats
- *		consisting of:
- *		    a. an optional sign
- *		    b. a string of numbers possibly containing a decimal point,
- *		    c. an optional exponent field containing an 'E' or 'e'
- *			followed by a possibly signed integer string.
- *
- *	RETURNS
- *		0 if failed, non-zero otherwise.
- */
-{
-    int n;
-    char *pchar;
-
-    if ((pchar = strchr(spec, ':')) == NULL) {
-	return(XcmsFailure);
-    }
-    n = (int)(pchar - spec);
-
-    /*
-     * Check for proper prefix.
-     */
-    if (strncmp(spec, _XcmsCIELuv_prefix, n) != 0) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Attempt to parse the value portion.
-     */
-    if (sscanf(spec + n + 1, "%lf/%lf/%lf",
-	    &pColor->spec.CIELuv.L_star,
-	    &pColor->spec.CIELuv.u_star,
-	    &pColor->spec.CIELuv.v_star) != 3) {
-	return(XcmsFailure);
-    }
-    pColor->format = XcmsCIELuvFormat;
-    pColor->pixel = 0;
-    return(XcmsCIELuv_ValidSpec(pColor));
-}
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsCIELuv_ValidSpec
- *
- *	SYNOPSIS
- */
-static Status
-XcmsCIELuv_ValidSpec(pColor)
-    XcmsColor *pColor;
-/*
- *	DESCRIPTION
- *		Checks if color specification valid for CIE L*u*v*.
- *
- *	RETURNS
- *		XcmsFailure if invalid,
- *		XcmsSuccess if valid.
- *
- */
-{
-    if (pColor->format != XcmsCIELuvFormat
-	    ||
-	    (pColor->spec.CIELuv.L_star < 0.0 - XMY_DBL_EPSILON)
-	    ||
-	    (pColor->spec.CIELuv.L_star > 100.0 + XMY_DBL_EPSILON)) {
-	return(XcmsFailure);
-    }
-    return(XcmsSuccess);
-}
-
-
-/*
- *	NAME
- *		XcmsCIELuvToCIEuvY - convert CIELuv to CIEuvY
- *
- *	SYNOPSIS
- */
-Status
-XcmsCIELuvToCIEuvY(ccc, pLuv_WhitePt, pColors_in_out, nColors)
-    XcmsCCC ccc;
-    XcmsColor *pLuv_WhitePt;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-/*
- *	DESCRIPTION
- *		Converts color specifications in an array of XcmsColor
- *		structures from CIELuv format to CIEuvY format.
- *
- *	RETURNS
- *		XcmsFailure if failed,
- *		XcmsSuccess if succeeded.
- *
- */
-{
-    XcmsColor	*pColor = pColors_in_out;
-    XcmsColor	whitePt;
-    XcmsCIEuvY	uvY_return;
-    XcmsFloat	tmpVal;
-    register int i;
-
-    /*
-     * Check arguments
-     */
-    if (pLuv_WhitePt == NULL || pColors_in_out == NULL) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Make sure white point is in CIEuvY form
-     */
-    if (pLuv_WhitePt->format != XcmsCIEuvYFormat) {
-	/* Make copy of the white point because we're going to modify it */
-	memcpy((char *)&whitePt, (char *)pLuv_WhitePt, sizeof(XcmsColor));
-	if (!_XcmsDIConvertColors(ccc, &whitePt, (XcmsColor *)NULL,
-		1, XcmsCIEuvYFormat)) {
-	    return(XcmsFailure);
-	}
-	pLuv_WhitePt = &whitePt;
-    }
-    /* Make sure it is a white point, i.e., Y == 1.0 */
-    if (pLuv_WhitePt->spec.CIEuvY.Y != 1.0) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Now convert each XcmsColor structure to CIEXYZ form
-     */
-    for (i = 0; i < nColors; i++, pColor++) {
-
-	/* Make sure original format is CIELuv and is valid */
-	if (!XcmsCIELuv_ValidSpec(pColor)) {
-	    return(XcmsFailure);
-	}
-
-	if (pColor->spec.CIELuv.L_star < 7.99953624) {
-	    uvY_return.Y = pColor->spec.CIELuv.L_star / 903.29;
-	} else {
-	    tmpVal = (pColor->spec.CIELuv.L_star + 16.0) / 116.0;
-	    uvY_return.Y = tmpVal * tmpVal * tmpVal; /* tmpVal ** 3 */
-	}
-
-
-
-	if (pColor->spec.CIELuv.L_star == 0.0) {
-	    uvY_return.u_prime = pLuv_WhitePt->spec.CIEuvY.u_prime;
-	    uvY_return.v_prime = pLuv_WhitePt->spec.CIEuvY.v_prime;
-	} else {
-	    tmpVal = 13.0 * (pColor->spec.CIELuv.L_star / 100.0);
-	    uvY_return.u_prime = pColor->spec.CIELuv.u_star/tmpVal + 
-			    pLuv_WhitePt->spec.CIEuvY.u_prime;
-	    uvY_return.v_prime = pColor->spec.CIELuv.v_star/tmpVal +
-			    pLuv_WhitePt->spec.CIEuvY.v_prime;
-	}
-	/* Copy result to pColor */
-	memcpy((char *)&pColor->spec, (char *)&uvY_return, sizeof(XcmsCIEuvY));
-
-	/* Identify that the format is now CIEuvY */
-	pColor->format = XcmsCIEuvYFormat;
-    }
-    return(XcmsSuccess);
-}
-
-
-/*
- *	NAME
- *		XcmsCIEuvYToCIELuv - convert CIEuvY to CIELuv
- *
- *	SYNOPSIS
- */
-Status
-XcmsCIEuvYToCIELuv(ccc, pLuv_WhitePt, pColors_in_out, nColors)
-    XcmsCCC ccc;
-    XcmsColor *pLuv_WhitePt;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-/*
- *	DESCRIPTION
- *		Converts color specifications in an array of XcmsColor
- *		structures from CIEuvY format to CIELab format.
- *
- *	RETURNS
- *		XcmsFailure if failed,
- *		XcmsSuccess if succeeded.
- *
- */
-{
-    XcmsColor	*pColor = pColors_in_out;
-    XcmsColor	whitePt;
-    XcmsCIELuv	Luv_return;
-    XcmsFloat	tmpVal;
-    register int i;
-
-    /*
-     * Check arguments
-     */
-    if (pLuv_WhitePt == NULL || pColors_in_out == NULL) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Make sure white point is in CIEuvY form
-     */
-    if (pLuv_WhitePt->format != XcmsCIEuvYFormat) {
-	/* Make copy of the white point because we're going to modify it */
-	memcpy((char *)&whitePt, (char *)pLuv_WhitePt, sizeof(XcmsColor));
-	if (!_XcmsDIConvertColors(ccc, &whitePt,
-		(XcmsColor *)NULL, 1, XcmsCIEuvYFormat)) {
-	    return(XcmsFailure);
-	}
-	pLuv_WhitePt = &whitePt;
-    }
-    /* Make sure it is a white point, i.e., Y == 1.0 */
-    if (pLuv_WhitePt->spec.CIEuvY.Y != 1.0) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Now convert each XcmsColor structure to CIEXYZ form
-     */
-    for (i = 0; i < nColors; i++, pColor++) {
-
-	if (!_XcmsCIEuvY_ValidSpec(pColor)) {
-	    return(XcmsFailure);
-	}
-
-	/* Now convert the uvY to Luv */
-	Luv_return.L_star = 
-	    (pColor->spec.CIEuvY.Y < 0.008856)
-	    ?
-	    (pColor->spec.CIEuvY.Y * 903.29)
-	    :
-	    ((XcmsFloat)(XCMS_CUBEROOT(pColor->spec.CIEuvY.Y) * 116.0) - 16.0);
-	tmpVal = 13.0 * (Luv_return.L_star / 100.0);
-	Luv_return.u_star = tmpVal *
-	   (pColor->spec.CIEuvY.u_prime - pLuv_WhitePt->spec.CIEuvY.u_prime);
-	Luv_return.v_star = tmpVal *
-	   (pColor->spec.CIEuvY.v_prime - pLuv_WhitePt->spec.CIEuvY.v_prime);
-
-	/* Copy result to pColor */
-	memcpy((char *)&pColor->spec, (char *)&Luv_return, sizeof(XcmsCIELuv));
-
-	/* Identify that the format is now CIEuvY */
-	pColor->format = XcmsCIELuvFormat;
-    }
-    return(XcmsSuccess);
-}
diff --git a/xc/lib/X11/LuvGcC.c b/xc/lib/X11/LuvGcC.c
deleted file mode 100644
index c4168bdb6..000000000
--- a/xc/lib/X11/LuvGcC.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/* $XConsortium: LuvGcC.c,v 1.1 91/07/24 23:26:39 rws Exp $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of XCMS based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *	NAME
- *		CIELuvGcC.c
- *
- *	DESCRIPTION
- *		Source for XcmsCIELuvClipuv() gamut compression routine.
- *
- */
-/* $XFree86: xc/lib/X11/LuvGcC.c,v 1.2 1999/05/09 10:49:45 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/* EXTERNS */
-
-/* CvCols.c */
-extern Status _XcmsDIConvertColors();
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsCIELuvClipuv - Reduce the chroma for a hue and L*
- *
- *	SYNOPSIS
- */
-/* ARGSUSED */
-Status
-XcmsCIELuvClipuv (ccc, pColors_in_out, nColors, i, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-    unsigned int i;
-    Bool *pCompressed;
-/*
- *	DESCRIPTION
- *		Reduce the Chroma for a specific hue and chroma to
- *		to bring the given color into the gamut of the 
- *		specified device.  As required of gamut compression
- *		functions, this routine returns pColor_in_out
- *		in XcmsCIEXYZFormat on successful completion.
- *		
- *		Since this routine works with the L* within
- *		pColor_in_out intermediate results may be returned
- *		even though it may be invalid.
- *
- *	RETURNS
- *		XcmsFailure - Failure
- *              XcmsSuccess - Succeeded
- *
- */
-{
-    Status retval;
-    XcmsColor *pColor;
-
-    /*
-     * Color specification passed as input can be assumed to:
-     *	1. Be in XcmsCIEXYZFormat
-     *	2. Already be white point adjusted for the Screen White Point.
-     *	    This means that the white point now associated with this
-     *	    color spec is the Screen White Point (even if the
-     *	    ccc->clientWhitePt differs).
-     */
-
-    pColor = pColors_in_out + i;
-
-    if (ccc->visual->class < PseudoColor) {
-	/*
-	 * GRAY !
-	 */
-	_XcmsDIConvertColors(ccc, pColor, ScreenWhitePointOfCCC(ccc),
-		1, XcmsCIELuvFormat);
-	_XcmsDIConvertColors(ccc, pColor, ScreenWhitePointOfCCC(ccc),
-		1, XcmsCIEXYZFormat);
-	if (pCompressed) {
-	    *(pCompressed + i) = True;
-	}
-	return(XcmsSuccess);
-    } else {
-	if (pColor->format != XcmsCIELuvFormat) {
-	    if (_XcmsDIConvertColors(ccc, pColor,
-		    &ccc->pPerScrnInfo->screenWhitePt, 1, XcmsCIELuvFormat)
-		    == XcmsFailure) {
-		return(XcmsFailure);
-	    }
-	}
-	if (XcmsCIELuvQueryMaxC(ccc,
-		degrees(XCMS_CIELUV_PMETRIC_HUE(pColor->spec.CIELuv.u_star, 
-						pColor->spec.CIELuv.v_star)),
-		pColor->spec.CIELuv.L_star,
-		pColor) == XcmsFailure) {
-	    return(XcmsFailure);
-	}
-	retval = _XcmsDIConvertColors(ccc, pColor,
-		&ccc->pPerScrnInfo->screenWhitePt, 1, XcmsCIEXYZFormat);
-	if (retval != XcmsFailure && pCompressed != NULL) {
-	    *(pCompressed + i) = True;
-	}
-	return(retval);
-    }
-}
diff --git a/xc/lib/X11/LuvGcL.c b/xc/lib/X11/LuvGcL.c
deleted file mode 100644
index aceab8598..000000000
--- a/xc/lib/X11/LuvGcL.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/* $XConsortium: LuvGcL.c,v 1.3 93/09/07 21:31:45 rws Exp $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of XCMS based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *	NAME
- *		CIELuvGcL.c
- *
- *	DESCRIPTION
- *		Source for XcmsCIELuvClipL() gamut compression routine.
- *
- */
-/* $XFree86: xc/lib/X11/LuvGcL.c,v 1.2 1999/05/09 10:49:45 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/*
- *	EXTERNS
- */
-extern Status _XcmsCIELuvQueryMaxLCRGB();
-
-/* CvCols.c */
-extern Status _XcmsDIConvertColors();
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsCIELuvClipL - Return the closest L*
- *
- *	SYNOPSIS
- */
-/* ARGSUSED */
-Status
-XcmsCIELuvClipL (ccc, pColors_in_out, nColors, i, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-    unsigned int i;
-    Bool *pCompressed;
-/*
- *	DESCRIPTION
- *		Return the closest L* for a specific hue and chroma.
- *		This routine takes any color as input and outputs 
- *		a CIE XYZ color.
- *
- *		Since this routine works with the L* within
- *		pColor_in_out intermediate results may be returned
- *		even though it may be invalid.
- *
- *	RETURNS
- *		XcmsFailure - Failure
- *              XcmsSuccess - Succeeded
- *
- */
-{
-    XcmsCCCRec	myCCC;
-    XcmsColor	*pColor;
-    XcmsColor   Luv_max;
-    XcmsFloat	hue, chroma, maxChroma;
-    Status retval;
-
-    /* Use my own CCC */
-    memcpy ((char *)&myCCC, (char *)ccc, sizeof(XcmsCCCRec));
-    myCCC.clientWhitePt.format = XcmsUndefinedFormat;/* Inherit Screen WP */
-    myCCC.gamutCompProc = (XcmsCompressionProc)NULL;/* no gamut compression */
-
-    /*
-     * Color specification passed as input can be assumed to:
-     *	1. Be in XcmsCIEXYZFormat
-     *	2. Already be white point adjusted for the Screen White Point.
-     *	    This means that the white point now associated with this
-     *	    color spec is the Screen White Point (even if the
-     *	    ccc->clientWhitePt differs).
-     */
-
-    pColor = pColors_in_out + i;
-    
-    if (ccc->visual->class < StaticColor) {
-	/*
-	 * GRAY !
-	 */
-	return(XcmsFailure);
-    } else {
-	/* Convert from CIEXYZ to CIE L*u*v* format */
-	if (_XcmsDIConvertColors(&myCCC, pColor,
-		ScreenWhitePointOfCCC(&myCCC), 1, XcmsCIELuvFormat)
-		== XcmsFailure) {
-	    return(XcmsFailure);
-	}
-
-	hue = XCMS_CIELUV_PMETRIC_HUE(pColor->spec.CIELuv.u_star,
-				      pColor->spec.CIELuv.v_star);
-	chroma = XCMS_CIELUV_PMETRIC_CHROMA(pColor->spec.CIELuv.u_star,
-					    pColor->spec.CIELuv.v_star);
-	/* Step 1: compute the maximum L* and chroma for this hue. */
-	/*         This copy may be overkill but it preserves the pixel etc. */
-	memcpy((char *)&Luv_max, (char *)pColor, sizeof(XcmsColor));
-	if (_XcmsCIELuvQueryMaxLCRGB (&myCCC, hue, &Luv_max,
-		(XcmsRGBi *)NULL) == XcmsFailure) {
-	    return (XcmsFailure);
-	}
-	maxChroma = XCMS_CIELUV_PMETRIC_CHROMA(Luv_max.spec.CIELuv.u_star,
-					       Luv_max.spec.CIELuv.v_star);
-
-	/* Now check and return the appropriate L* */
-	if (chroma == maxChroma) {
-	    /* When the chroma input is equal to the maximum chroma */
-	    /* merely return the L* for that chroma. */
-	    memcpy((char *)pColor, (char *)&Luv_max, sizeof(XcmsColor));
-	    retval = _XcmsDIConvertColors(&myCCC, pColor,
-		    ScreenWhitePointOfCCC(&myCCC), 1, XcmsCIEXYZFormat);
-	} else if (chroma > maxChroma) {
-	    /* When the chroma input is greater than the maximum chroma */
-	    /* merely return the L* and chroma for the given hue. */
-	    memcpy((char *)pColor, (char *)&Luv_max, sizeof(XcmsColor));
-	    return (XcmsFailure);
-	} else if (pColor->spec.CIELuv.L_star < Luv_max.spec.CIELuv.L_star) {
-	    /* Find the minimum lightness for the given chroma. */  
-	    if (pColor->format != XcmsCIELuvFormat) {
-		if (_XcmsDIConvertColors(ccc, pColor,
-			ScreenWhitePointOfCCC(ccc), 1, XcmsCIELuvFormat)
-			== XcmsFailure) {
-		    return(XcmsFailure);
-		}
-	    }
-	    if (XcmsCIELuvQueryMinL(&myCCC, degrees(hue), chroma, pColor)
-		== XcmsFailure) {
-		    return (XcmsFailure);
-	    }
-	    retval = _XcmsDIConvertColors(&myCCC, pColor,
-		           ScreenWhitePointOfCCC(&myCCC), 1, XcmsCIEXYZFormat);
-	} else {
-	    /* Find the maximum lightness for the given chroma. */
-	    if (pColor->format != XcmsCIELuvFormat) {
-		if (_XcmsDIConvertColors(ccc, pColor,
-			      ScreenWhitePointOfCCC(ccc), 1, XcmsCIELuvFormat)
-			== XcmsFailure) {
-		    return(XcmsFailure);
-		}
-	    }
-	    if (XcmsCIELuvQueryMaxL(&myCCC, degrees(hue), chroma, pColor)
-		== XcmsFailure) {
-		    return (XcmsFailure);
-	    }
-	    retval = _XcmsDIConvertColors(&myCCC, pColor,
-		           ScreenWhitePointOfCCC(&myCCC), 1, XcmsCIEXYZFormat);
-	}
-	if (retval != XcmsFailure && pCompressed != NULL) {
-	    *(pCompressed + i) = True;
-	}
-	return(retval);
-    }
-}
diff --git a/xc/lib/X11/LuvGcLC.c b/xc/lib/X11/LuvGcLC.c
deleted file mode 100644
index 0e346116e..000000000
--- a/xc/lib/X11/LuvGcLC.c
+++ /dev/null
@@ -1,232 +0,0 @@
-/* $XConsortium: LuvGcLC.c,v 1.3 93/09/07 21:31:47 rws Exp $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of XCMS based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *	NAME
- *		CIELuvGcLC.c
- *
- *	DESCRIPTION
- *		Source for XcmsCIELuvClipLuv() gamut
- *		compression function.
- */
-/* $XFree86: xc/lib/X11/LuvGcLC.c,v 1.2 1999/05/09 10:49:46 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-#include <math.h>
-
-/*
- *	INTERNALS
- *		Internal defines that need NOT be exported to any package or
- *		program using this package.
- */
-#define MAXBISECTCOUNT	100
-
-/*
- *	EXTERNS
- */
-extern Status _XcmsCIELuvQueryMaxLCRGB();
-
-/* CvCols.c */
-extern Status _XcmsDIConvertColors();
-
-/* CvColW.c */
-extern Status _XcmsConvertColorsWithWhitePt();
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsCIELuvClipLuv - Return the closest L* and chroma
- *
- *	SYNOPSIS
- */
-/* ARGSUSED */
-Status
-XcmsCIELuvClipLuv (ccc, pColors_in_out, nColors, i, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-    unsigned int i;
-    Bool *pCompressed;
-/*
- *	DESCRIPTION
- *		This routine will find the closest L* and chroma 
- *		for a specific hue.  The color input is converted to
- *		CIE L*u*v* format and returned as CIE XYZ format.
- *
- *		Since this routine works with the L* within
- *		pColor_in_out intermediate results may be returned
- *		even though it may be invalid.
- *
- *	RETURNS
- *		XcmsFailure - Failure
- *              XcmsSuccess - Succeeded
- *
- */
-{
-    Status retval;
-    XcmsCCCRec	myCCC;
-    XcmsColor	*pColor;
-    XcmsColor	Luv_max;
-    XcmsFloat	hue, chroma, maxChroma;
-    XcmsFloat	Chroma, bestChroma, Lstar, maxLstar, saveLstar;
-    XcmsFloat	bestLstar, bestustar, bestvstar;
-    XcmsFloat	nT, saveDist, tmpDist;
-    XcmsRGBi	rgb_max;
-    int		nCount, nMaxCount, nI, nILast;
-
-    /* Use my own CCC */
-    memcpy ((char *)&myCCC, (char *)ccc, sizeof(XcmsCCCRec));
-    myCCC.clientWhitePt.format = XcmsUndefinedFormat;/* inherit screen white */
-    myCCC.gamutCompProc = (XcmsCompressionProc)NULL;/* no gamut compression func */
-
-    /*
-     * Color specification passed as input can be assumed to:
-     *	1. Be in XcmsCIEXYZFormat
-     *	2. Already be white point adjusted for the Screen White Point.
-     *	    This means that the white point now associated with this
-     *	    color spec is the Screen White Point (even if the
-     *	    ccc->clientWhitePt differs).
-     */
-
-    pColor = pColors_in_out + i;
-
-    if (ccc->visual->class < StaticColor) {
-	/*
-	 * GRAY !
-	 */
-	_XcmsDIConvertColors(ccc, pColor, ScreenWhitePointOfCCC(ccc),
-		1, XcmsCIELuvFormat);
-	_XcmsDIConvertColors(ccc, pColor, ScreenWhitePointOfCCC(ccc),
-		1, XcmsCIEXYZFormat);
-	if (pCompressed) {
-	    *(pCompressed + i) = True;
-	}
-	return(XcmsSuccess);
-    }
-
-    /* Convert from CIEXYZ to CIELuv format */
-    if (_XcmsDIConvertColors(&myCCC, pColor,
-		            ScreenWhitePointOfCCC(&myCCC), 1, XcmsCIELuvFormat)
-		== XcmsFailure) {
-	return(XcmsFailure);
-    }
-
-    /* Step 1: compute the maximum L* and chroma for this hue. */
-    /*         This copy may be overkill but it preserves the pixel etc. */
-    saveLstar = pColor->spec.CIELuv.L_star;
-    hue = XCMS_CIELUV_PMETRIC_HUE(pColor->spec.CIELuv.u_star,
-				  pColor->spec.CIELuv.v_star);
-    chroma = XCMS_CIELUV_PMETRIC_CHROMA(pColor->spec.CIELuv.u_star,
-					pColor->spec.CIELuv.v_star);
-    memcpy((char *)&Luv_max, (char *)pColor, sizeof(XcmsColor));
-    if (_XcmsCIELuvQueryMaxLCRGB (&myCCC, hue, &Luv_max, &rgb_max) 
-	    == XcmsFailure) {
-	return (XcmsFailure);
-    }
-    maxLstar = Luv_max.spec.CIELuv.L_star;
-	
-    /* Now check and return the appropriate L* */
-    if (saveLstar == maxLstar) {
-	/* When the L* input is equal to the maximum L* */
-	/* merely return the maximum Luv point. */
-	memcpy((char *)pColor, (char *)&Luv_max, sizeof(XcmsColor));
-	retval = _XcmsDIConvertColors(&myCCC, pColor,
-		           ScreenWhitePointOfCCC(&myCCC), 1, XcmsCIEXYZFormat);
-    } else {
-	/* return the closest point on the hue leaf. */
-	/* must do a bisection here to compute the delta e. */
-	maxChroma = XCMS_CIELUV_PMETRIC_CHROMA(Luv_max.spec.CIELuv.u_star,
-					       Luv_max.spec.CIELuv.v_star);
-	nMaxCount = MAXBISECTCOUNT;
-	nI = nMaxCount / 2;
-	bestLstar = Lstar = pColor->spec.CIELuv.L_star;
-	bestustar = pColor->spec.CIELuv.u_star;
-	bestvstar = pColor->spec.CIELuv.v_star;
-	bestChroma = Chroma = chroma;
-	saveDist = XCMS_SQRT(((Chroma - maxChroma) * (Chroma - maxChroma)) +
-			     ((Lstar - maxLstar) * (Lstar - maxLstar)));
-	for (nCount = 0; nCount < nMaxCount; nCount++) {
-	    nT = (XcmsFloat) nI / (XcmsFloat) nMaxCount;
-	    if (saveLstar > maxLstar) {
-		pColor->spec.RGBi.red   = rgb_max.red * (1.0 - nT) + nT;
-		pColor->spec.RGBi.green = rgb_max.green * (1.0 - nT) + nT;
-		pColor->spec.RGBi.blue  = rgb_max.blue * (1.0 - nT) + nT;
-	    } else {
-		pColor->spec.RGBi.red   = rgb_max.red - (rgb_max.red * nT);
-		pColor->spec.RGBi.green = rgb_max.green - (rgb_max.green * nT);
-		pColor->spec.RGBi.blue  = rgb_max.blue - (rgb_max.blue * nT);
-	    }
-	    pColor->format = XcmsRGBiFormat;
-
-	    /* Convert from RGBi to CIE Luv */
-	    if (_XcmsConvertColorsWithWhitePt(&myCCC, pColor,
-	                    ScreenWhitePointOfCCC(&myCCC), 1, XcmsCIELuvFormat,
-			    (Bool *) NULL) == XcmsFailure) {
-		return (XcmsFailure);
-	    }
-	    chroma = XCMS_CIELUV_PMETRIC_CHROMA(pColor->spec.CIELuv.u_star,
-					        pColor->spec.CIELuv.v_star);
-	    tmpDist = XCMS_SQRT(((Chroma - chroma) * (Chroma - chroma)) +
-				((Lstar - pColor->spec.CIELuv.L_star) *
-				 (Lstar - pColor->spec.CIELuv.L_star)));
-	    nILast = nI;
-	    if (tmpDist > saveDist) {
-		nI /= 2;
-	    } else {
-		nI = (nMaxCount + nI) / 2;
-		saveDist = tmpDist;
-		bestLstar = pColor->spec.CIELuv.L_star;
-		bestustar = pColor->spec.CIELuv.u_star;
-		bestvstar = pColor->spec.CIELuv.v_star;
-		bestChroma = chroma;	    
-	    }
-	    if (nI == nILast || nI == 0) {
-		break;
-	    }
-	}
-	if (bestChroma >= maxChroma) {
-	    pColor->spec.CIELuv.L_star = maxLstar;
-	    pColor->spec.CIELuv.u_star = Luv_max.spec.CIELuv.u_star;
-	    pColor->spec.CIELuv.v_star = Luv_max.spec.CIELuv.v_star;
-	} else {
-	    pColor->spec.CIELuv.L_star = bestLstar;
-	    pColor->spec.CIELuv.u_star = bestustar;
-	    pColor->spec.CIELuv.v_star = bestvstar;
-	}
-	retval = _XcmsDIConvertColors(&myCCC, pColor,
-		           ScreenWhitePointOfCCC(&myCCC), 1, XcmsCIEXYZFormat);
-
-	if (retval != XcmsFailure && pCompressed != NULL) {
-	    *(pCompressed + i) = True;
-	}
-    }
-    return(retval);
-}
diff --git a/xc/lib/X11/LuvMnL.c b/xc/lib/X11/LuvMnL.c
deleted file mode 100644
index 1308498c5..000000000
--- a/xc/lib/X11/LuvMnL.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/* $XConsortium: LuvMnL.c /main/4 1995/10/24 11:18:53 gildea $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of XCMS based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *	NAME
- *		CIELuvMnL.c
- *
- *	DESCRIPTION
- *		Source for the XcmsCIELuvQueryMinL() gamut boundary
- *		querying routine.
- *
- */
-/* $XFree86: xc/lib/X11/LuvMnL.c,v 1.2 1999/05/09 10:49:46 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-#include <math.h>
-
-/*
- *	DEFINES
- */
-#define MAXBISECTCOUNT	100
-#define EPS		(XcmsFloat)0.001
-#define START_L_STAR	(XcmsFloat)40.0
-
-/*
- *	EXTERNS
- */
-extern Status _XcmsCIELuvQueryMaxLCRGB();
-
-/* CvColW.c */
-extern Status _XcmsConvertColorsWithWhitePt();
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsCIELuvQueryMinL - Compute max Lstar for a hue and chroma
- *
- *	SYNOPSIS
- */
-Status
-XcmsCIELuvQueryMinL(ccc, hue_angle, chroma, pColor_return)
-    XcmsCCC ccc;
-    XcmsFloat hue_angle;	    /* hue angle in degrees */
-    XcmsFloat chroma;
-    XcmsColor *pColor_return;
-/*
- *	DESCRIPTION
- *		Return the maximum Lstar for a specified hue_angle and chroma.
- *
- *	ASSUMPTIONS
- *		This routine assumes that the white point associated with
- *		the color specification is the Screen White Point.  The
- *		Screen White Point will also be associated with the
- *		returned color specification.
- *
- *	RETURNS
- *		XcmsFailure - Failure
- *              XcmsSuccess - Succeeded with no modifications
- *
- */
-{
-    XcmsCCCRec	myCCC;
-    XcmsColor   max_lc, tmp, prev;
-    XcmsFloat   max_chroma, tmp_chroma;
-    XcmsFloat   hue, nT, nChroma, lastChroma, prevChroma;
-    XcmsFloat   rFactor;
-    XcmsRGBi    rgb_saved;
-    int         nCount, nMaxCount;
-
-    /*
-     * Check Arguments
-     */
-    if (ccc == NULL || pColor_return == NULL) {
-	return(XcmsFailure);
-    }
-
-    /* setup the CCC to use for the conversions. */
-    memcpy ((char *) &myCCC, (char *) ccc, sizeof(XcmsCCCRec));
-    myCCC.clientWhitePt.format = XcmsUndefinedFormat;
-    myCCC.gamutCompProc = (XcmsCompressionProc) NULL;
-
-    while (hue_angle < 0.0) {
-	hue_angle += 360.0;
-    }
-    while (hue_angle >= 360.0) {
-	hue_angle -= 360.0;
-    } 
-
-    hue = radians(hue_angle);
-    tmp.spec.CIELuv.L_star = START_L_STAR;
-    tmp.spec.CIELuv.u_star = XCMS_CIEUSTAROFHUE(hue, chroma);
-    tmp.spec.CIELuv.v_star = XCMS_CIEVSTAROFHUE(hue, chroma);
-    tmp.pixel = pColor_return->pixel;
-    tmp.format = XcmsCIELuvFormat;
-    
-    /* Step 1: Obtain the maximum L_star and chroma for this hue. */
-    if (_XcmsCIELuvQueryMaxLCRGB(&myCCC, hue, &max_lc, &rgb_saved)
-	    == XcmsFailure) {
-	return(XcmsFailure);
-    }
-
-    max_chroma = XCMS_CIELUV_PMETRIC_CHROMA(max_lc.spec.CIELuv.u_star,
-					    max_lc.spec.CIELuv.v_star);
-
-    if (max_chroma <= chroma) {
-	/*
-	 *  If the chroma is greater than the chroma for the 
-	 *  maximum L/chroma point then the L_star is the
-	 *  the L_star for the maximum L_star/chroma point.
-	 *  This is an error but I return the best approximation I can.
-         *  Thus the inconsistency.
-	 */
-	memcpy ((char *) pColor_return, (char *) &max_lc, sizeof (XcmsColor));
-	return(XcmsSuccess);
-    }
-
-    /*
-     *  If the chroma is equal to the chroma for the 
-     *  maximum L_star/chroma point then the L_star is the
-     *  the L_star for the maximum L* and chroma point.
-     */
-    /* if (max_chroma == chroma) {
-     *  memcpy ((char *) pColor_return, (char *) &max_lc, sizeof (XcmsColor));
-     *	return(XcmsSuccess);
-     *    }
-     */
-
-    /* must do a bisection here to compute the maximum L* */
-    /* save the structure input so that any elements that */
-    /* are not touched are recopied later in the routine. */
-    nChroma = chroma;
-    tmp_chroma = max_chroma;
-    lastChroma = -1.0;
-    nMaxCount = MAXBISECTCOUNT;
-    rFactor = 1.0;
-
-    for (nCount = 0; nCount < nMaxCount; nCount++) {
-	prevChroma = lastChroma;
-	lastChroma = tmp_chroma;
-	nT = (nChroma - max_chroma) / max_chroma * rFactor;
-	memcpy ((char *)&prev, (char *)&tmp, sizeof(XcmsColor));
-	tmp.spec.RGBi.red   = rgb_saved.red + (rgb_saved.red * nT);
-	tmp.spec.RGBi.green = rgb_saved.green + (rgb_saved.green * nT);
-	tmp.spec.RGBi.blue  = rgb_saved.blue + (rgb_saved.blue * nT);
-	tmp.format = XcmsRGBiFormat;
-
-	/* convert from RGB to CIELuv */
-	if (_XcmsConvertColorsWithWhitePt(&myCCC, &tmp,
-		ScreenWhitePointOfCCC(&myCCC), 1, XcmsCIELuvFormat,
-		(Bool *) NULL) == XcmsFailure) {
-	    return(XcmsFailure);
-	}
-
-	/* Now check the return against what is expected */
-	tmp_chroma = XCMS_CIELUV_PMETRIC_CHROMA(tmp.spec.CIELuv.u_star,
-						tmp.spec.CIELuv.v_star);
-	if (tmp_chroma <= chroma + EPS && tmp_chroma >= chroma - EPS) {
-	    /* Found It! */
-	    memcpy ((char *) pColor_return, (char *) &tmp, sizeof (XcmsColor));
-	    return(XcmsSuccess);
-	} 
-	nChroma += chroma - tmp_chroma;
-	if (nChroma > max_chroma) {
-	    nChroma = max_chroma;
-	    rFactor *= 0.5;  /* selective relaxation employed */
-	} else if (nChroma < 0.0) {
-	    if (XCMS_FABS(lastChroma - chroma) < 
-		XCMS_FABS(tmp_chroma - chroma)) {
-		memcpy ((char *)pColor_return, (char *)&prev, 
-			sizeof(XcmsColor));
-	    } else {
-		memcpy ((char *)pColor_return, (char *)&tmp,
- 			sizeof(XcmsColor));
-	    }
-	    return(XcmsSuccess);
-	} else if (tmp_chroma <= prevChroma + EPS &&
-		   tmp_chroma >= prevChroma - EPS) {
-	    rFactor *= 0.5;  /* selective relaxation employed */
-	}
-    }
-
-    if (nCount >= nMaxCount) {
-	if (XCMS_FABS(lastChroma - chroma) < 
-	    XCMS_FABS(tmp_chroma - chroma)) {
-		memcpy ((char *)pColor_return, (char *)&prev,
- 			sizeof(XcmsColor));
-	    } else {
-		memcpy ((char *)pColor_return, (char *)&tmp,
- 			sizeof(XcmsColor));
-	}
-    }
-    memcpy ((char *) pColor_return, (char *) &tmp, sizeof (XcmsColor));
-    return(XcmsSuccess);
-}
diff --git a/xc/lib/X11/LuvMxC.c b/xc/lib/X11/LuvMxC.c
deleted file mode 100644
index 409d3e6e3..000000000
--- a/xc/lib/X11/LuvMxC.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/* $XConsortium: LuvMxC.c,v 1.3 93/09/07 21:31:54 rws Exp $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of XCMS based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *
- *	NAME
- *		CIELuvMxC.c
- *
- *	DESCRIPTION
- *		Source for the XcmsCIELuvQueryMaxC() gamut boundary
- *		querying routine.
- *
- */
-/* $XFree86: xc/lib/X11/LuvMxC.c,v 1.2 1999/05/09 10:49:47 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-#include <math.h>
-
-/*
- *	DEFINES
- */
-#define MAXBISECTCOUNT	100
-#define EPS	        (XcmsFloat)0.001
-#define START_CHROMA	(XcmsFloat)2.2
-#define TOPL		(XcmsFloat)100.0
-/*
- *	EXTERNS
- */
-extern Status _XcmsCIELuvQueryMaxLCRGB();
-
-/* CvColW.c */
-extern Status _XcmsConvertColorsWithWhitePt();
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsCIELuvQueryMaxC - max chroma for a hue_angle and L_star
- *
- *	SYNOPSIS
- */
-Status
-XcmsCIELuvQueryMaxC(ccc, hue_angle, L_star, pColor_return)
-    XcmsCCC ccc;
-    XcmsFloat hue_angle;	    /* hue angle in degrees */
-    XcmsFloat L_star;
-    XcmsColor *pColor_return;
-/*
- *	DESCRIPTION
- *		Return the maximum chroma for a specific hue_angle and L_star.
- *		The returned format is in XcmsCIELuvFormat.
- *
- *
- *	ASSUMPTIONS
- *		This routine assumes that the white point associated with
- *		the color specification is the Screen White Point.  The
- *		Screen White Point will also be associated with the
- *		returned color specification.
- *
- *	RETURNS
- *		XcmsFailure - Failure
- *              XcmsSuccess - Succeeded
- *
- */
-{
-    XcmsCCCRec	myCCC;
-    XcmsColor  tmp;
-    XcmsColor  max_lc;
-    XcmsFloat n_L_star, last_L_star, prev_L_star;
-    XcmsFloat hue, lastuStar, lastvStar, /*lastChroma,*/ maxDist, nT, rFactor;
-    XcmsRGBi   rgb_saved;
-    int nCount, nMaxCount;
-
-    /*
-     * Check Arguments
-     */
-    if (ccc == NULL || pColor_return == NULL) {
-	return(XcmsFailure);
-    }
-
-    /* Use my own CCC  and inherit screen white Pt */
-    memcpy ((char *)&myCCC, (char *)ccc, sizeof(XcmsCCCRec));
-    myCCC.clientWhitePt.format = XcmsUndefinedFormat; 
-    myCCC.gamutCompProc = (XcmsCompressionProc)NULL;/* no gamut comp func */
-
-    while (hue_angle < 0.0) {
-	hue_angle += 360.0;
-    }
-    while (hue_angle >= 360.0) {
-	hue_angle -= 360.0;
-    } 
-
-    hue = radians(hue_angle);
-    tmp.spec.CIELuv.L_star = L_star;
-    tmp.spec.CIELuv.u_star = XCMS_CIEUSTAROFHUE(hue, START_CHROMA);
-    tmp.spec.CIELuv.v_star = XCMS_CIEVSTAROFHUE(hue, START_CHROMA);
-    tmp.pixel = pColor_return->pixel;
-    tmp.format = XcmsCIELuvFormat;
-
-    /* Step 1: compute the maximum L_star and chroma for this hue. */
-    memcpy((char *)&max_lc, (char *)&tmp, sizeof(XcmsColor));
-    if (_XcmsCIELuvQueryMaxLCRGB(&myCCC, hue, &max_lc, &rgb_saved)
-	== XcmsFailure) {
-	    return(XcmsFailure);
-    }
-
-    /*
-     * Step 2:  Do a bisection here to compute the maximum chroma
-     *          Note the differences between when the point to be found
-     *          is above the maximum LC point and when it is below.
-     */
-    if (L_star <= max_lc.spec.CIELuv.L_star) {
-	maxDist = max_lc.spec.CIELuv.L_star;
-    } else {
-	maxDist = TOPL - max_lc.spec.CIELuv.L_star;
-    }
-
-    n_L_star = L_star;
-    last_L_star = -1.0;
-    nMaxCount = MAXBISECTCOUNT;
-    rFactor = 1.0;
-
-    for (nCount = 0; nCount < nMaxCount; nCount++) {
-	prev_L_star =  last_L_star;
-	last_L_star =  tmp.spec.CIELuv.L_star;
-/*	lastChroma = XCMS_CIELUV_PMETRIC_CHROMA(tmp.spec.CIELuv.u_star,  */
-/*						tmp.spec.CIELuv.v_star); */
-	lastuStar = tmp.spec.CIELuv.u_star;
-	lastvStar = tmp.spec.CIELuv.v_star;
-	nT = (n_L_star - max_lc.spec.CIELuv.L_star) / maxDist * rFactor;
-        /* printf("(n_L_star, nT) = %lf %lf ", n_L_star, nT); */
-	if (nT > 0) {
-	    tmp.spec.RGBi.red = rgb_saved.red * (1.0 - nT) + nT;
-	    tmp.spec.RGBi.green = rgb_saved.green * (1.0 - nT) + nT;
-	    tmp.spec.RGBi.blue  = rgb_saved.blue * (1.0 - nT) + nT;
-	} else {
-	    tmp.spec.RGBi.red = rgb_saved.red + (rgb_saved.red * nT);
-	    tmp.spec.RGBi.green = rgb_saved.green + (rgb_saved.green * nT);
-	    tmp.spec.RGBi.blue = rgb_saved.blue + (rgb_saved.blue * nT);
-	}
-	tmp.format = XcmsRGBiFormat;
-
-	/* convert from RGB to CIELuv */
-	if (_XcmsConvertColorsWithWhitePt(&myCCC, &tmp,
-			    ScreenWhitePointOfCCC(&myCCC), 1, XcmsCIELuvFormat,
-			    (Bool *) NULL) == XcmsFailure) {
-	    return(XcmsFailure);
-	}
-
-	/*
-	 * Now check if we've reached the target L_star
-	 */
-	/* printf("result Lstar = %lf\n", tmp.spec.CIELuv.L_star); */
-	if (tmp.spec.CIELuv.L_star <= L_star + EPS &&
-	    tmp.spec.CIELuv.L_star >= L_star - EPS) {
-		memcpy((char *)pColor_return, (char *)&tmp, sizeof(XcmsColor));
-		return(XcmsSuccess);
-	}
-	if (nT > 0) {
-	    n_L_star += ((TOPL - n_L_star) * 
-			 (L_star - tmp.spec.CIELuv.L_star)) / (TOPL - L_star);
-	} else {
-	    n_L_star *= L_star / tmp.spec.CIELuv.L_star;
-	}
-	if (tmp.spec.CIELuv.L_star <= prev_L_star + EPS &&
-	    tmp.spec.CIELuv.L_star >= prev_L_star - EPS) {
-		rFactor *= 0.5;  /* selective relaxation employed */
-		/* printf("rFactor = %lf\n", rFactor); */
-	}
-    }
-    if (XCMS_FABS(last_L_star - L_star) < 
-	XCMS_FABS(tmp.spec.CIELuv.L_star - L_star)) {
-	    tmp.spec.CIELuv.u_star = lastuStar;
-	    tmp.spec.CIELuv.v_star = lastvStar;
-/*	    tmp.spec.CIELuv.u_star = XCMS_CIEUSTAROFHUE(hue, lastChroma); */
-/*	    tmp.spec.CIELuv.v_star = XCMS_CIEVSTAROFHUE(hue, lastChroma); */
-    }
-    tmp.spec.CIELuv.L_star = L_star;
-    memcpy((char *)pColor_return, (char *)&tmp, sizeof(XcmsColor));
-    return(XcmsSuccess);
-}
diff --git a/xc/lib/X11/LuvMxL.c b/xc/lib/X11/LuvMxL.c
deleted file mode 100644
index 4a5f0f72f..000000000
--- a/xc/lib/X11/LuvMxL.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/* $XConsortium: LuvMxL.c /main/4 1995/10/24 11:18:58 gildea $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of XCMS based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *	NAME
- *		CIELuvMxL.c
- *
- *	DESCRIPTION
- *		Source for the XcmsCIELuvQueryMaxL() gamut boundary
- *		querying routine.
- *
- */
-/* $XFree86: xc/lib/X11/LuvMxL.c,v 1.2 1999/05/09 10:49:47 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-#include <math.h>
-
-/*
- *	DEFINES
- */
-#define MAXBISECTCOUNT	100
-#define EPS		(XcmsFloat)0.001
-#define START_L_STAR	(XcmsFloat)40.0
-
-/*
- *	EXTERNS
- */
-extern Status _XcmsCIELuvQueryMaxLCRGB();
-
-/* CvColW.c */
-extern Status _XcmsConvertColorsWithWhitePt();
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsCIELuvQueryMaxL - Compute max Lstar for a hue and chroma
- *
- *	SYNOPSIS
- */
-Status
-XcmsCIELuvQueryMaxL(ccc, hue_angle, chroma, pColor_return)
-    XcmsCCC ccc;
-    XcmsFloat hue_angle;	    /* hue angle in degrees */
-    XcmsFloat chroma;
-    XcmsColor *pColor_return;
-/*
- *	DESCRIPTION
- *		Return the maximum Lstar for a specified hue_angle and chroma.
- *
- *	ASSUMPTIONS
- *		This routine assumes that the white point associated with
- *		the color specification is the Screen White Point.  The
- *		Screen White Point will also be associated with the
- *		returned color specification.
- *
- *	RETURNS
- *		XcmsFailure - Failure
- *              XcmsSuccess - Succeeded with no modifications
- *
- */
-{
-    XcmsCCCRec	myCCC;
-    XcmsColor   max_lc, tmp, prev;
-    XcmsFloat   max_chroma, tmp_chroma;
-    XcmsFloat   hue, nT, nChroma, lastChroma, prevChroma;
-    XcmsFloat   rFactor;
-    XcmsRGBi    rgb_saved;
-    int         nCount, nMaxCount;
-
-    /*
-     * Check Arguments
-     */
-    if (ccc == NULL || pColor_return == NULL) {
-	return(XcmsFailure);
-    }
-
-    /* setup the CCC to use for the conversions. */
-    memcpy ((char *) &myCCC, (char *) ccc, sizeof(XcmsCCCRec));
-    myCCC.clientWhitePt.format = XcmsUndefinedFormat;
-    myCCC.gamutCompProc = (XcmsCompressionProc) NULL;
-
-    while (hue_angle < 0.0) {
-	hue_angle += 360.0;
-    }
-    while (hue_angle >= 360.0) {
-	hue_angle -= 360.0;
-    } 
-
-    hue = radians(hue_angle);
-    tmp.spec.CIELuv.L_star = START_L_STAR;
-    tmp.spec.CIELuv.u_star = XCMS_CIEUSTAROFHUE(hue, chroma);
-    tmp.spec.CIELuv.v_star = XCMS_CIEVSTAROFHUE(hue, chroma);
-    tmp.pixel = pColor_return->pixel;
-    tmp.format = XcmsCIELuvFormat;
-    
-    /* Step 1: Obtain the maximum L_star and chroma for this hue. */
-    if (_XcmsCIELuvQueryMaxLCRGB(&myCCC, hue, &max_lc, &rgb_saved)
-	    == XcmsFailure) {
-	return(XcmsFailure);
-    }
-
-    max_chroma = XCMS_CIELUV_PMETRIC_CHROMA(max_lc.spec.CIELuv.u_star,
-					    max_lc.spec.CIELuv.v_star);
-
-    if (max_chroma <= chroma) {
-	/*
-	 *  If the chroma is greater than the chroma for the 
-	 *  maximum L/chroma point then the L_star is the
-	 *  the L_star for the maximum L_star/chroma point.
-	 *  This is an error but I return the best approximation I can.
-         *  Thus the inconsistency.
-	 */
-	memcpy ((char *) pColor_return, (char *) &max_lc, sizeof (XcmsColor));
-	return(XcmsSuccess);
-    }
-
-    /*
-     *  If the chroma is equal to the chroma for the 
-     *  maximum L_star/chroma point then the L_star is the
-     *  the L_star for the maximum L* and chroma point.
-     */
-    /* if (max_chroma == chroma) {
-     *  memcpy ((char *) pColor_return, (char *) &max_lc, sizeof (XcmsColor));
-     *	return(XcmsSuccess);
-     *    }
-     */
-
-    /* must do a bisection here to compute the maximum L* */
-    /* save the structure input so that any elements that */
-    /* are not touched are recopied later in the routine. */
-    nChroma = chroma;
-    tmp_chroma = max_chroma;
-    lastChroma = -1.0;
-    nMaxCount = MAXBISECTCOUNT;
-    rFactor = 1.0;
-
-    for (nCount = 0; nCount < nMaxCount; nCount++) {
-	prevChroma = lastChroma;
-	lastChroma = tmp_chroma;
-	nT = (1.0 - (nChroma / max_chroma)) * rFactor;
-	memcpy ((char *)&prev, (char *)&tmp, sizeof(XcmsColor));
-	tmp.spec.RGBi.red   = rgb_saved.red * (1.0 - nT) + nT;
-	tmp.spec.RGBi.green = rgb_saved.green * (1.0 - nT) + nT;
-	tmp.spec.RGBi.blue  = rgb_saved.blue * (1.0 - nT) + nT;
-	tmp.format = XcmsRGBiFormat;
-
-	/* convert from RGB to CIELuv */
-	if (_XcmsConvertColorsWithWhitePt(&myCCC, &tmp,
-		ScreenWhitePointOfCCC(&myCCC), 1, XcmsCIELuvFormat,
-		(Bool *) NULL) == XcmsFailure) {
-	    return(XcmsFailure);
-	}
-
-	/* Now check the return against what is expected */
-	tmp_chroma = XCMS_CIELUV_PMETRIC_CHROMA(tmp.spec.CIELuv.u_star,
-						tmp.spec.CIELuv.v_star);
-	if (tmp_chroma <= chroma + EPS && tmp_chroma >= chroma - EPS) {
-	    /* Found It! */
-	    memcpy ((char *) pColor_return, (char *) &tmp, sizeof (XcmsColor));
-	    return(XcmsSuccess);
-	} 
-	nChroma += chroma - tmp_chroma;
-	if (nChroma > max_chroma) {
-	    nChroma = max_chroma;
-	    rFactor *= 0.5;  /* selective relaxation employed */
-	} else if (nChroma < 0.0) {
-	    if (XCMS_FABS(lastChroma - chroma) < 
-		XCMS_FABS(tmp_chroma - chroma)) {
-		memcpy ((char *)pColor_return, (char *)&prev,
- 			sizeof(XcmsColor));
-	    } else {
-		memcpy ((char *)pColor_return, (char *)&tmp,
- 			sizeof(XcmsColor));
-	    }
-	    return(XcmsSuccess);
-	} else if (tmp_chroma <= prevChroma + EPS &&
-		   tmp_chroma >= prevChroma - EPS) {
-	    rFactor *= 0.5;  /* selective relaxation employed */
-	}
-    }
-
-    if (nCount >= nMaxCount) {
-	if (XCMS_FABS(lastChroma - chroma) < 
-	    XCMS_FABS(tmp_chroma - chroma)) {
-		memcpy ((char *)pColor_return, (char *)&prev,
- 			sizeof(XcmsColor));
-	    } else {
-		memcpy ((char *)pColor_return, (char *)&tmp,
- 			sizeof(XcmsColor));
-	}
-    }
-    memcpy ((char *) pColor_return, (char *) &tmp, sizeof (XcmsColor));
-    return(XcmsSuccess);
-}
diff --git a/xc/lib/X11/LuvMxLC.c b/xc/lib/X11/LuvMxLC.c
deleted file mode 100644
index a4290da5c..000000000
--- a/xc/lib/X11/LuvMxLC.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/* $XConsortium: LuvMxLC.c,v 1.4 93/10/07 18:49:37 rws Exp $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of XCMS based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *
- *	NAME
- *		CIELuvMxVC.c
- *
- *	DESCRIPTION
- *		Source for the XcmsCIELuvQueryMaxLC() gamut boundary
- *		querying routine.
- *
- *	DOCUMENTATION
- *		"TekColor Color Management System, System Implementor's Manual"
- *		and
- *		Fred W. Billmeyer & Max Saltzman, "Principles of Color
- *		Technology", John Wily & Sons, Inc, 1981.
- */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/*
- *	DEFINES
- */
-#define MIN(x,y)	((x) > (y) ? (y) : (x))
-#define MIN3(x,y,z)	((x) > (MIN((y), (z))) ? (MIN((y), (z))) : (x))
-#define MAX(x,y)	((x) > (y) ? (x) : (y))
-#define MAX3(x,y,z)	((x) > (MAX((y), (z))) ? (x) : (MAX((y), (z))))
-#define START_LSTAR	(XcmsFloat)40.0
-#define START_CHROMA	(XcmsFloat)2.2
-
-/*
- *	EXTERNS
- */
-extern Status _XcmsConvertColorsWithWhitePt();
-
-/*
- *	FORWARD DECLARATIONS
- */
-Status _XcmsCIELuvQueryMaxLCRGB();
-
-
-/************************************************************************
- *									*
- *			 API PRIVATE ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		_XcmsCIELuvQueryMaxLCRGB - Compute maximum L* and chroma.
- *
- *	SYNOPSIS
- */
-Status
-_XcmsCIELuvQueryMaxLCRGB(ccc, hue, pColor_return, pRGB_return)
-    XcmsCCC	ccc;
-    XcmsFloat	hue;		/* hue in radians */
-    XcmsColor   *pColor_return;
-    XcmsRGBi    *pRGB_return;
-
-/*
- *	DESCRIPTION
- *		Return the maximum psychometric chroma for a specified
- *		hue angle(radians), and the corresponding L*.  This is computed
- *		by a binary search of all possible chromas.  An assumption
- *		is made that there are no local maxima.  Use the unrounded
- *		Max psychometric chroma because the difference check can be
- *		small.
- *
- *		NOTE:  No local CCC is used because this is a private
- *		       routine and all routines that call it are expected
- *		       to behave properly, i.e. send a local CCC with
- *		       no white adjust function and no gamut compression
- *		       function.
- *
- *		This routine only accepts hue as input and outputs
- *		Luv and RGBi.
- *
- *	RETURNS
- *		XcmsFailure - Failure
- *		XcmsSuccess - Succeeded
- *
- */ 
-{
-    XcmsFloat nSmall, nLarge;
-    XcmsColor tmp;
-
-    tmp.format = XcmsCIELuvFormat;
-    /*  Use some unreachable color on the given hue angle */
-    tmp.spec.CIELuv.L_star = START_LSTAR;
-    tmp.spec.CIELuv.u_star = XCMS_CIEUSTAROFHUE(hue, START_CHROMA);
-    tmp.spec.CIELuv.v_star = XCMS_CIEVSTAROFHUE(hue, START_CHROMA);
-    /*
-     * Convert from Luv to RGB
-     *
-     * Note that the CIEXYZ to RGBi conversion routine must stuff the
-     * out of bounds RGBi values in tmp when the ccc->gamutCompProc
-     * is NULL.
-     */
-    if ((_XcmsConvertColorsWithWhitePt(ccc, &tmp, ScreenWhitePointOfCCC(ccc), 
-		               (unsigned int)1, XcmsRGBiFormat, (Bool *) NULL) 
-	    == XcmsFailure) && tmp.format != XcmsRGBiFormat) {
-	return (XcmsFailure);
-    }
-
-    /* Now pick the smallest RGB */
-    nSmall = MIN3(tmp.spec.RGBi.red, 
-		  tmp.spec.RGBi.green, 
-		  tmp.spec.RGBi.blue);
-    /* Make the smallest RGB equal to zero */
-    tmp.spec.RGBi.red   -= nSmall;
-    tmp.spec.RGBi.green -= nSmall;
-    tmp.spec.RGBi.blue  -= nSmall;
-
-    /* Now pick the largest RGB */
-    nLarge = MAX3(tmp.spec.RGBi.red, 
-		  tmp.spec.RGBi.green, 
-		  tmp.spec.RGBi.blue);
-    /* Scale the RGB values based on the largest one */
-    tmp.spec.RGBi.red   /= nLarge;
-    tmp.spec.RGBi.green /= nLarge;
-    tmp.spec.RGBi.blue  /= nLarge;
-    tmp.format = XcmsRGBiFormat;
-
-    /* If the calling routine wants RGB value give them the ones used. */
-    if (pRGB_return) {
-	pRGB_return->red   = tmp.spec.RGBi.red;
-	pRGB_return->green = tmp.spec.RGBi.green;
-	pRGB_return->blue  = tmp.spec.RGBi.blue;
-    }
-
-    /* Convert from RGBi to Luv */
-    if (_XcmsConvertColorsWithWhitePt(ccc, &tmp,
-	       ScreenWhitePointOfCCC(ccc), 1, XcmsCIELuvFormat, (Bool *) NULL) 
-	    == XcmsFailure) {
-	return (XcmsFailure);
-    }
-
-    memcpy((char *)pColor_return, (char *)&tmp, sizeof(XcmsColor));
-    return (XcmsSuccess);    
-}
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsCIELuvQueryMaxLC - Compute maximum L* and chroma.
- *
- *	SYNOPSIS
- */
-Status
-XcmsCIELuvQueryMaxLC (ccc, hue_angle, pColor_return)
-    XcmsCCC ccc;
-    XcmsFloat hue_angle;	    /* hue angle in degrees */
-    XcmsColor *pColor_return;
-
-/*
- *	DESCRIPTION
- *		Return the point of maximum chroma for the specified
- *		hue angle.
- *
- *	ASSUMPTIONS
- *		This routine assumes that the white point associated with
- *		the color specification is the Screen White Point.  The
- *		Screen White Point will also be associated with the
- *		returned color specification.
- *
- *	RETURNS
- *		XcmsFailure - Failure
- *		XcmsSuccess - Succeeded
- *
- */ 
-{
-    XcmsCCCRec myCCC;
-
-    /*
-     * Check Arguments
-     */
-    if (ccc == NULL || pColor_return == NULL) {
-	return(XcmsFailure);
-    }
-    
-    /* Use my own CCC */
-    memcpy ((char *)&myCCC, (char *)ccc, sizeof(XcmsCCCRec));
-    myCCC.clientWhitePt.format = XcmsUndefinedFormat;
-    myCCC.gamutCompProc = (XcmsCompressionProc)NULL;
-
-    while (hue_angle < 0.0) {
-	hue_angle += 360.0;
-    }
-    while (hue_angle >= 360.0) {
-	hue_angle -= 360.0;
-    } 
-    
-    return(_XcmsCIELuvQueryMaxLCRGB (&myCCC, radians(hue_angle), pColor_return,
-	    (XcmsRGBi *)NULL));
-}
diff --git a/xc/lib/X11/LuvWpAj.c b/xc/lib/X11/LuvWpAj.c
deleted file mode 100644
index 5dff3a5f7..000000000
--- a/xc/lib/X11/LuvWpAj.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/* $XConsortium: LuvWpAj.c,v 1.4 91/05/13 22:22:56 rws Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of XCMS based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		CIELuvWpAj.c
- *
- *	DESCRIPTION
- *		This file contains routine(s) that support white point
- *		adjustment of color specifications in the CIE CIELuv.color
- *		space.
- */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/*
- *	EXTERNS
- */
-
-extern Status _XcmsConvertColorsWithWhitePt();
-
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsCIELuvWhiteShiftColors
- *
- *	SYNOPSIS
- */
-Status
-XcmsCIELuvWhiteShiftColors(ccc, pWhitePtFrom, pWhitePtTo, destSpecFmt,
-	pColors_in_out, nColors, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pWhitePtFrom;
-    XcmsColor *pWhitePtTo;
-    XcmsColorFormat destSpecFmt;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-    Bool *pCompressed;
-/*
- *	DESCRIPTION
- *		Adjusts color specifications in an array of XcmsColor
- *		structures for white point differences.
- *
- *	RETURNS
- *		XcmsFailure if failed,
- *		XcmsSuccess if succeeded without gamut compression,
- *		XcmsSuccessWithCompression if succeeded with
- *			gamut compression.
- */
-{
-    if (pWhitePtFrom == NULL || pWhitePtTo == NULL || pColors_in_out == NULL) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Convert to CIELuv using pWhitePtFrom
-     *    We can ignore return value for compression because we are converting
-     *    to XcmsCIELuvFormat which is device-independent, not device-dependent.
-     */
-    if (_XcmsConvertColorsWithWhitePt(ccc, pColors_in_out, pWhitePtFrom,
-	    nColors, XcmsCIELuvFormat, pCompressed) == XcmsFailure) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Convert from CIELuv to destSpecFmt using pWhitePtTo
-     */
-    return(_XcmsConvertColorsWithWhitePt(ccc, pColors_in_out, pWhitePtTo,
-	    nColors, destSpecFmt, pCompressed));
-}
diff --git a/xc/lib/X11/Macros.c b/xc/lib/X11/Macros.c
deleted file mode 100644
index 71a643745..000000000
--- a/xc/lib/X11/Macros.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/* $TOG: Macros.c /main/16 1998/02/06 17:43:56 kaleb $ */
-/*
-
-Copyright 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/Macros.c,v 1.2 1999/05/09 10:49:47 dawes Exp $ */
-
-#include "Xlibint.h"
-/*
- * This file makes full definitions of routines for each macro.
- * We do not expect C programs to use these, but other languages may
- * need them.
- */
-
-int XConnectionNumber(dpy) Display *dpy; { return (ConnectionNumber(dpy)); }
-
-Window XRootWindow (dpy, scr)
-    Display *dpy; int scr;
-	{	return (RootWindow(dpy,scr));	}
-
-int XDefaultScreen(dpy) Display *dpy; { return (DefaultScreen(dpy)); }
-
-Window XDefaultRootWindow (dpy)
-    Display *dpy;
-	{	return (RootWindow(dpy,DefaultScreen(dpy)));	}
-
-Visual *XDefaultVisual(dpy, scr)
-    Display *dpy; int scr;
-	{	return (DefaultVisual(dpy, scr)); }
-
-GC XDefaultGC(dpy, scr) 
-    Display *dpy; int scr;
-	{	return (DefaultGC(dpy,scr)); }
-
-unsigned long XBlackPixel(dpy, scr) 
-    Display *dpy; int scr; 
-	{	return (BlackPixel(dpy, scr)); }
-
-unsigned long XWhitePixel(dpy, scr) 
-    Display *dpy; int scr; 
-	{	return (WhitePixel(dpy,scr)); }
-
-unsigned long XAllPlanes() { return AllPlanes; }
-
-int XQLength(dpy) Display *dpy; { return (QLength(dpy)); }
-
-int XDisplayWidth(dpy, scr)
-    Display *dpy; int scr;
-	{ return (DisplayWidth(dpy,scr)); }
-
-int XDisplayHeight(dpy, scr)
-    Display *dpy; int scr;
-	{ return (DisplayHeight(dpy, scr)); }
-
-int XDisplayWidthMM(dpy, scr)
-    Display *dpy; int scr;
-	{ return (DisplayWidthMM(dpy, scr)); }
-
-int XDisplayHeightMM(dpy, scr)
-    Display *dpy; int scr;
-	{ return (DisplayHeightMM(dpy, scr)); }
-
-int XDisplayPlanes(dpy, scr)
-    Display *dpy; int scr;
-	{ return (DisplayPlanes(dpy, scr)); }
-
-int XDisplayCells(dpy, scr)
-    Display *dpy; int scr;
-	{ return (DisplayCells (dpy, scr)); }
-
-int XScreenCount(dpy) Display *dpy; { return (ScreenCount(dpy)); }
-
-char *XServerVendor(dpy)  Display *dpy; { return (ServerVendor(dpy)); }
-
-int XProtocolVersion(dpy)  Display *dpy; { return (ProtocolVersion(dpy)); }
-
-int XProtocolRevision(dpy)  Display *dpy; { return (ProtocolRevision(dpy));}
-
-int XVendorRelease(dpy)  Display *dpy; { return (VendorRelease(dpy)); }
-
-char *XDisplayString(dpy)  Display *dpy; { return (DisplayString(dpy)); }
-
-int XDefaultDepth(dpy, scr) 
-    Display *dpy; int scr;
-	{ return(DefaultDepth(dpy, scr)); }
-
-Colormap XDefaultColormap(dpy, scr)
-    Display *dpy; int scr;
-	{ return (DefaultColormap(dpy, scr)); }
-
-int XBitmapUnit(dpy) Display *dpy; { return (BitmapUnit(dpy)); }
-
-int XBitmapBitOrder(dpy) Display *dpy; { return (BitmapBitOrder(dpy)); }
-
-int XBitmapPad(dpy) Display *dpy; { return (BitmapPad(dpy)); }
-
-int XImageByteOrder(dpy) Display *dpy; { return (ImageByteOrder(dpy)); }
-
-unsigned long XNextRequest(dpy)
-    Display *dpy;
-    {
-#ifdef WORD64
-	WORD64ALIGN
-	return dpy->request + 1;
-#else
-	return (NextRequest(dpy));
-#endif
-    }
-
-unsigned long XLastKnownRequestProcessed(dpy)
-    Display *dpy;
-    { return (LastKnownRequestProcessed(dpy)); }
-
-/* screen oriented macros (toolkit) */
-Screen *XScreenOfDisplay(dpy, scr) Display *dpy; int scr;
-	{ return (ScreenOfDisplay(dpy, scr)); }
-
-Screen *XDefaultScreenOfDisplay(dpy) Display *dpy;
-	{ return (DefaultScreenOfDisplay(dpy)); }
-
-Display *XDisplayOfScreen(s) Screen *s; { return (DisplayOfScreen(s)); }
-
-Window XRootWindowOfScreen(s) Screen *s; { return (RootWindowOfScreen(s)); }
-
-unsigned long XBlackPixelOfScreen(s) Screen *s; 
-	{ return (BlackPixelOfScreen(s)); }
-
-unsigned long XWhitePixelOfScreen(s) Screen *s; 
-	{ return (WhitePixelOfScreen(s)); }
-
-Colormap XDefaultColormapOfScreen(s) Screen *s; 
-	{ return (DefaultColormapOfScreen(s)); }
-
-int XDefaultDepthOfScreen(s) Screen *s; { return (DefaultDepthOfScreen(s)); }
-
-GC XDefaultGCOfScreen(s) Screen *s; { return (DefaultGCOfScreen(s)); }
-
-Visual *XDefaultVisualOfScreen(s) Screen *s; 
-	{ return (DefaultVisualOfScreen(s)); }
-
-int XWidthOfScreen(s) Screen *s; { return (WidthOfScreen(s)); }
-
-int XHeightOfScreen(s) Screen *s; { return (HeightOfScreen(s)); }
-
-int XWidthMMOfScreen(s) Screen *s; { return (WidthMMOfScreen(s)); }
-
-int XHeightMMOfScreen(s) Screen *s; { return (HeightMMOfScreen(s)); }
-
-int XPlanesOfScreen(s) Screen *s; { return (PlanesOfScreen(s)); }
-
-int XCellsOfScreen(s) Screen *s; { return (CellsOfScreen(s)); }
-
-int XMinCmapsOfScreen(s) Screen *s; { return (MinCmapsOfScreen(s)); }
-
-int XMaxCmapsOfScreen(s) Screen *s; { return (MaxCmapsOfScreen(s)); }
-
-Bool XDoesSaveUnders(s) Screen *s; { return (DoesSaveUnders(s)); }
-
-int XDoesBackingStore(s) Screen *s; { return (DoesBackingStore(s)); }
-
-long XEventMaskOfScreen(s) Screen *s; { return (EventMaskOfScreen(s)); }
-
-int XScreenNumberOfScreen (scr)
-    register Screen *scr;
-{
-    register Display *dpy = scr->display;
-    register Screen *dpyscr = dpy->screens;
-    register int i;
-
-    for (i = 0; i < dpy->nscreens; i++, dpyscr++) {
-	if (scr == dpyscr) return i;
-    }
-    return -1;
-}
-
-/*
- * These macros are used to give some sugar to the image routines so that
- * naive people are more comfortable with them.
- */
-#undef XDestroyImage
-int
-XDestroyImage(ximage)
-	XImage *ximage;
-{
-	return((*((ximage)->f.destroy_image))((ximage)));
-}
-#undef XGetPixel
-unsigned long XGetPixel(ximage, x, y)
-	XImage *ximage;
-	int x, y;
-{
-	return ((*((ximage)->f.get_pixel))((ximage), (x), (y)));
-}
-#undef XPutPixel
-int XPutPixel(ximage, x, y, pixel)
-	XImage *ximage;
-	int x, y;
-	unsigned long pixel;
-{
-	return((*((ximage)->f.put_pixel))((ximage), (x), (y), (pixel)));
-}
-#undef XSubImage
-XImage *XSubImage(ximage, x, y, width, height)
-	XImage *ximage;
-	int x, y;
-	unsigned int width, height;
-{
-	return((*((ximage)->f.sub_image))((ximage), (x),
-		(y), (width), (height)));
-}
-#undef XAddPixel
-int XAddPixel(ximage, value)
-	XImage *ximage;
-	long value;
-{
-	return((*((ximage)->f.add_pixel))((ximage), (value)));
-}
-
-
-int
-XNoOp (dpy)
-    register Display *dpy;
-{
-    register xReq *req;
-
-    LockDisplay(dpy);
-    GetEmptyReq(NoOperation, req);
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/MapRaised.c b/xc/lib/X11/MapRaised.c
deleted file mode 100644
index 69e9a2ede..000000000
--- a/xc/lib/X11/MapRaised.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $TOG: MapRaised.c /main/7 1998/02/06 17:44:01 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/MapRaised.c,v 1.2 1999/05/09 10:49:48 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XMapRaised (dpy, w)
-    Window w;
-    register Display *dpy;
-{
-    register xConfigureWindowReq *req;
-    register xResourceReq *req2;
-    unsigned long val = Above;		/* needed for macro */
-
-    LockDisplay(dpy);
-    GetReqExtra(ConfigureWindow, 4, req);
-    req->window = w;
-    req->mask = CWStackMode;
-    OneDataCard32 (dpy, NEXTPTR(req,xConfigureWindowReq), val);
-    GetResReq (MapWindow, w, req2);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/MapSubs.c b/xc/lib/X11/MapSubs.c
deleted file mode 100644
index 3aaf0867d..000000000
--- a/xc/lib/X11/MapSubs.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* $TOG: MapSubs.c /main/6 1998/02/06 17:44:07 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/MapSubs.c,v 1.2 1999/05/09 10:49:48 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XMapSubwindows(dpy, win)
-    register Display *dpy;
-    Window win;
-{
-    register xResourceReq *req;
-    LockDisplay(dpy);
-    GetResReq(MapSubwindows, win, req);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/MapWindow.c b/xc/lib/X11/MapWindow.c
deleted file mode 100644
index 77fa79b5e..000000000
--- a/xc/lib/X11/MapWindow.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* $TOG: MapWindow.c /main/6 1998/02/06 17:44:12 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/MapWindow.c,v 1.2 1999/05/09 10:49:49 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XMapWindow (dpy, w)
-	Window w;
-	register Display *dpy;
-{
-	register xResourceReq *req;
-	LockDisplay (dpy);
-        GetResReq(MapWindow, w, req);
-	UnlockDisplay (dpy);
-	SyncHandle();
-	return 1;
-}
-
diff --git a/xc/lib/X11/MaskEvent.c b/xc/lib/X11/MaskEvent.c
deleted file mode 100644
index 2960b795b..000000000
--- a/xc/lib/X11/MaskEvent.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* $TOG: MaskEvent.c /main/14 1998/02/06 17:44:18 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/MaskEvent.c,v 3.2 1999/05/09 10:49:49 dawes Exp $ */
-
-#define NEED_EVENTS
-#include "Xlibint.h"
-
-#ifdef __STDC__
-#define Const const
-#else
-#define Const /**/
-#endif
-
-extern long Const _Xevent_to_mask[];
-#define AllPointers (PointerMotionMask|PointerMotionHintMask|ButtonMotionMask)
-#define AllButtons (Button1MotionMask|Button2MotionMask|Button3MotionMask|\
-		    Button4MotionMask|Button5MotionMask)
-
-/* 
- * return the next event in the queue matching one of the events in the mask.
- * If no event, flush output, and wait until match succeeds.
- * Events earlier in the queue are not discarded.
- */
-
-int
-XMaskEvent (dpy, mask, event)
-	register Display *dpy;
-	long mask;		/* Selected event mask. */
-	register XEvent *event;	/* XEvent to be filled in. */
-{
-	register _XQEvent *prev, *qelt;
-	unsigned long qe_serial;
-
-        LockDisplay(dpy);
-	prev = NULL;
-	while (1) {
-	    for (qelt = prev ? prev->next : dpy->head;
-		 qelt;
-		 prev = qelt, qelt = qelt->next) {
-		if ((qelt->event.type < LASTEvent) &&
-		    (_Xevent_to_mask[qelt->event.type] & mask) &&
-		    ((qelt->event.type != MotionNotify) ||
-		     (mask & AllPointers) ||
-		     (mask & AllButtons & qelt->event.xmotion.state))) {
-		    *event = qelt->event;
-		    _XDeq(dpy, prev, qelt);
-		    UnlockDisplay(dpy);
-		    return 0;
-		}
-	    }
-	    if (prev)
-		qe_serial = prev->qserial_num;
-	    _XReadEvents(dpy);
-	    if (prev && prev->qserial_num != qe_serial)
-		/* another thread has snatched this event */
-		prev = NULL;
-	}
-}
diff --git a/xc/lib/X11/Misc.c b/xc/lib/X11/Misc.c
deleted file mode 100644
index d6d898066..000000000
--- a/xc/lib/X11/Misc.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* $TOG: Misc.c /main/8 1998/02/06 17:44:35 kaleb $ */
-/*
-
-Copyright 1988, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/Misc.c,v 1.2 1999/05/09 10:49:49 dawes Exp $ */
-
-#include "Xlibint.h"
-
-long XMaxRequestSize(dpy)
-    Display *dpy;
-{
-    return dpy->max_request_size;
-}
-
-char *XResourceManagerString(dpy)
-    Display *dpy;
-{
-    return dpy->xdefaults;
-}
-
-unsigned long XDisplayMotionBufferSize(dpy)
-    Display *dpy;
-{
-    return dpy->motion_buffer;
-}
-
-int
-XDisplayKeycodes(dpy, min_keycode_return, max_keycode_return)
-    Display *dpy;
-    int *min_keycode_return, *max_keycode_return;
-{
-    *min_keycode_return = dpy->min_keycode;
-    *max_keycode_return = dpy->max_keycode;
-    return 1;
-}
-
-VisualID XVisualIDFromVisual(visual)
-    Visual *visual;
-{
-    return visual->visualid;
-}
-
-long XExtendedMaxRequestSize(dpy)
-    Display *dpy;
-{
-    return dpy->bigreq_size;
-}
diff --git a/xc/lib/X11/ModMap.c b/xc/lib/X11/ModMap.c
deleted file mode 100644
index 6370ad5c7..000000000
--- a/xc/lib/X11/ModMap.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/* $TOG: ModMap.c /main/16 1998/02/06 17:44:41 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/ModMap.c,v 1.2 1999/05/09 10:49:50 dawes Exp $ */
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-XModifierKeymap *
-XGetModifierMapping(dpy)
-     register Display *dpy;
-{       
-    xGetModifierMappingReply rep;
-    register xReq *req;
-    unsigned long nbytes;
-    XModifierKeymap *res;
-
-    LockDisplay(dpy);
-    GetEmptyReq(GetModifierMapping, req);
-    (void) _XReply (dpy, (xReply *)&rep, 0, xFalse);
-
-    nbytes = (unsigned long)rep.length << 2;
-    res = (XModifierKeymap *) Xmalloc(sizeof (XModifierKeymap));
-    if (res) res->modifiermap = (KeyCode *) Xmalloc ((unsigned) nbytes);
-    if ((! res) || (! res->modifiermap)) {
-	if (res) Xfree((char *) res);
-	res = (XModifierKeymap *) NULL;
-	_XEatData(dpy, nbytes);
-    } else {
-	_XReadPad(dpy, (char *) res->modifiermap, (long) nbytes);
-	res->max_keypermod = rep.numKeyPerModifier;
-    }
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return (res);
-}
-
-/*
- *	Returns:
- *	0	Success
- *	1	Busy - one or more old or new modifiers are down
- *	2	Failed - one or more new modifiers unacceptable
- */
-int
-XSetModifierMapping(dpy, modifier_map)
-    register Display *dpy;
-    register XModifierKeymap *modifier_map;
-{
-    register xSetModifierMappingReq *req;
-    xSetModifierMappingReply rep;
-    int         mapSize = modifier_map->max_keypermod << 3;	/* 8 modifiers */
-
-    LockDisplay(dpy);
-    GetReqExtra(SetModifierMapping, mapSize, req);
-
-    req->numKeyPerModifier = modifier_map->max_keypermod;
-
-    memcpy((char *) NEXTPTR(req,xSetModifierMappingReq),
-	   (char *) modifier_map->modifiermap,
-	   mapSize);
-
-    (void) _XReply(dpy, (xReply *) & rep,
-	(SIZEOF(xSetModifierMappingReply) - SIZEOF(xReply)) >> 2, xTrue);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return (rep.success);
-}
-
-XModifierKeymap *
-XNewModifiermap(keyspermodifier)
-    int keyspermodifier;
-{
-    XModifierKeymap *res = (XModifierKeymap *) Xmalloc((sizeof (XModifierKeymap)));
-    if (res) {
-	res->max_keypermod = keyspermodifier;
-	res->modifiermap = (keyspermodifier > 0 ?
-			    (KeyCode *) Xmalloc((unsigned) (8 * keyspermodifier))
-			    : (KeyCode *) NULL);
-	if (keyspermodifier && (res->modifiermap == NULL)) {
-	    Xfree((char *) res);
-	    return (XModifierKeymap *) NULL;
-	}
-    }
-    return (res);
-}
-
-
-int
-XFreeModifiermap(map)
-    XModifierKeymap *map;
-{
-    if (map) {
-	if (map->modifiermap)
-	    Xfree((char *) map->modifiermap);
-	Xfree((char *) map);
-    }
-    return 1;
-}
-
-#if NeedFunctionPrototypes
-XModifierKeymap *
-XInsertModifiermapEntry(XModifierKeymap *map,
-#if NeedWidePrototypes
-			unsigned int keycode,
-#else
-			KeyCode keycode,
-#endif
-			int modifier)
-#else
-XModifierKeymap *
-XInsertModifiermapEntry(map, keycode, modifier)
-    XModifierKeymap *map;
-    KeyCode keycode;
-    int modifier;
-#endif
-{
-    XModifierKeymap *newmap;
-    int i,
-	row = modifier * map->max_keypermod,
-	newrow,
-	lastrow;
-
-    for (i=0; i<map->max_keypermod; i++) {
-        if (map->modifiermap[ row+i ] == keycode)
-	    return(map); /* already in the map */
-        if (map->modifiermap[ row+i ] == 0) {
-            map->modifiermap[ row+i ] = keycode;
-	    return(map); /* we added it without stretching the map */
-	}
-    }   
-
-    /* stretch the map */
-    if ((newmap = XNewModifiermap(map->max_keypermod+1)) == NULL)
-	return (XModifierKeymap *) NULL;
-    newrow = row = 0;
-    lastrow = newmap->max_keypermod * 8;
-    while (newrow < lastrow) {
-	for (i=0; i<map->max_keypermod; i++)
-	    newmap->modifiermap[ newrow+i ] = map->modifiermap[ row+i ];
-	newmap->modifiermap[ newrow+i ] = 0;
-	row += map->max_keypermod;
-	newrow += newmap->max_keypermod;
-    }
-    (void) XFreeModifiermap(map);
-    newrow = newmap->max_keypermod * modifier + newmap->max_keypermod - 1;
-    newmap->modifiermap[ newrow ] = keycode;
-    return(newmap);
-}
-
-#if NeedFunctionPrototypes
-XModifierKeymap *
-XDeleteModifiermapEntry(XModifierKeymap *map,
-#if NeedWidePrototypes
-			unsigned int keycode,
-#else
-			KeyCode keycode,
-#endif
-			int modifier)
-#else
-XModifierKeymap *
-XDeleteModifiermapEntry(map, keycode, modifier)
-    XModifierKeymap *map;
-    KeyCode keycode;
-    int modifier;
-#endif
-{
-    int i,
-	row = modifier * map->max_keypermod;
-
-    for (i=0; i<map->max_keypermod; i++) {
-        if (map->modifiermap[ row+i ] == keycode)
-            map->modifiermap[ row+i ] = 0;
-    }
-    /* should we shrink the map?? */
-    return (map);
-}
diff --git a/xc/lib/X11/MoveWin.c b/xc/lib/X11/MoveWin.c
deleted file mode 100644
index 068d24ed4..000000000
--- a/xc/lib/X11/MoveWin.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* $TOG: MoveWin.c /main/9 1998/02/06 17:44:47 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/MoveWin.c,v 1.2 1999/05/09 10:49:50 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XMoveWindow (dpy, w, x, y)
-    register Display *dpy;
-    Window w;
-    int x, y;
-{
-    register xConfigureWindowReq *req;
-
-    LockDisplay(dpy);
-    GetReqExtra(ConfigureWindow, 8, req);
-
-    req->window = w;
-    req->mask = CWX | CWY;
-
-#ifdef MUSTCOPY
-    {
-	long lx = (long) x, ly = (long) y;
-	dpy->bufptr -= 8;
-	Data32 (dpy, (long *) &lx, 4);	/* order dictated by CWX and CWY */
-	Data32 (dpy, (long *) &ly, 4);
-    }
-#else
-    {
-	CARD32 *valuePtr = (CARD32 *) NEXTPTR(req,xConfigureWindowReq);
-	*valuePtr++ = x;
-	*valuePtr = y;
-    }
-#endif /* MUSTCOPY */
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/NextEvent.c b/xc/lib/X11/NextEvent.c
deleted file mode 100644
index 5eed79e6c..000000000
--- a/xc/lib/X11/NextEvent.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* $TOG: NextEvent.c /main/8 1998/02/06 17:44:53 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/NextEvent.c,v 1.2 1999/05/09 10:49:51 dawes Exp $ */
-
-#define NEED_EVENTS
-#include "Xlibint.h"
-
-/* 
- * Return next event in queue, or if none, flush output and wait for
- * events.
- */
-
-int
-XNextEvent (dpy, event)
-	register Display *dpy;
-	register XEvent *event;
-{
-	register _XQEvent *qelt;
-	
-	LockDisplay(dpy);
-	
-	if (dpy->head == NULL)
-	    _XReadEvents(dpy);
-	qelt = dpy->head;
-	*event = qelt->event;
-	_XDeq(dpy, NULL, qelt);
-	UnlockDisplay(dpy);
-	return 0;
-}
-
diff --git a/xc/lib/X11/OCWrap.c b/xc/lib/X11/OCWrap.c
deleted file mode 100644
index 9510f19b9..000000000
--- a/xc/lib/X11/OCWrap.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/* $XConsortium: OCWrap.c,v 1.1 94/01/20 17:54:55 rws Exp $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-/* $XFree86: xc/lib/X11/OCWrap.c,v 1.2 1999/05/09 10:49:51 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xlcint.h"
-
-#if NeedVarargsPrototypes
-XOC
-XCreateOC(XOM om, ...)
-#else
-XOC
-XCreateOC(om, va_alist)
-    XOM om;
-    va_dcl
-#endif
-{
-    va_list var;
-    XlcArgList args;
-    XOC oc;
-    int num_args;
-
-    Va_start(var, om);
-    _XlcCountVaList(var, &num_args);
-    va_end(var);
-
-    Va_start(var, om);
-    _XlcVaToArgList(var, num_args, &args);
-    va_end(var);
-
-    if (args == (XlcArgList) NULL)
-	return (XOC) NULL;
-
-    oc = (*om->methods->create_oc)(om, args, num_args);
-
-    Xfree(args);
-
-    if (oc) {
-	oc->core.next = om->core.oc_list;
-	om->core.oc_list = oc;
-    }
-
-    return oc;
-}
-
-void
-XDestroyOC(oc)
-    XOC oc;
-{
-    XOC prev, oc_list;
-
-    prev = oc_list = oc->core.om->core.oc_list;
-    if (oc_list == oc)
-	oc->core.om->core.oc_list = oc_list->core.next;
-    else {
-	while ((oc_list = oc_list->core.next)) {
-	    if (oc_list == oc) {
-		prev->core.next = oc_list->core.next;
-		break;
-	    }
-	    prev = oc_list;
-	}
-    }
-
-    (*oc->methods->destroy)(oc);
-}
-
-XOM
-XOMOfOC(oc)
-    XOC oc;
-{
-    return oc->core.om;
-}
-
-#if NeedVarargsPrototypes
-char *
-XSetOCValues(XOC oc, ...)
-#else
-char *
-XSetOCValues(oc, va_alist)
-    XOC oc;
-    va_dcl
-#endif
-{
-    va_list var;
-    XlcArgList args;
-    char *ret;
-    int num_args;
-
-    Va_start(var, oc);
-    _XlcCountVaList(var, &num_args);
-    va_end(var);
-
-    Va_start(var, oc);
-    _XlcVaToArgList(var, num_args, &args);
-    va_end(var);
-
-    if (args == (XlcArgList) NULL)
-	return (char *) NULL;
-
-    ret = (*oc->methods->set_values)(oc, args, num_args);
-
-    Xfree(args);
-
-    return ret;
-}
-
-#if NeedVarargsPrototypes
-char *
-XGetOCValues(XOC oc, ...)
-#else
-char *
-XGetOCValues(oc, va_alist)
-    XOC oc;
-    va_dcl
-#endif
-{
-    va_list var;
-    XlcArgList args;
-    char *ret;
-    int num_args;
-
-    Va_start(var, oc);
-    _XlcCountVaList(var, &num_args);
-    va_end(var);
-
-    Va_start(var, oc);
-    _XlcVaToArgList(var, num_args, &args);
-    va_end(var);
-
-    if (args == (XlcArgList) NULL)
-	return (char *) NULL;
-
-    ret = (*oc->methods->get_values)(oc, args, num_args);
-
-    Xfree(args);
-
-    return ret;
-}
diff --git a/xc/lib/X11/OMWrap.c b/xc/lib/X11/OMWrap.c
deleted file mode 100644
index 40d9db172..000000000
--- a/xc/lib/X11/OMWrap.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/* $XConsortium: OMWrap.c /main/3 1996/01/05 11:22:34 kaleb $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-/* $XFree86: xc/lib/X11/OMWrap.c,v 1.2 1999/05/09 10:49:51 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xlcint.h"
-
-XOM
-#if NeedFunctionPrototypes
-XOpenOM(Display *dpy, XrmDatabase rdb, _Xconst char *res_name,
-	_Xconst char *res_class)
-#else
-XOpenOM(dpy, rdb, res_name, res_class)
-    Display *dpy;
-    XrmDatabase rdb;
-    char *res_name;
-    char *res_class;
-#endif
-{
-    XLCd lcd = _XOpenLC((char *) NULL);
-
-    if (lcd == NULL)
-	return (XOM) NULL;
-
-    if (lcd->methods->open_om)
-	return (*lcd->methods->open_om)(lcd, dpy, rdb, res_name, res_class);
-
-    return (XOM) NULL;
-}
-
-Status
-XCloseOM(om)
-    XOM om;
-{
-    XOC oc, next;
-    XLCd lcd = om->core.lcd;
-
-    next = om->core.oc_list;
-
-    while ((oc = next)) {
-	next = oc->core.next;
-	(*oc->methods->destroy)(oc);
-    }
-
-    om->core.oc_list = NULL;
-
-    _XCloseLC(lcd);
-
-    return (*om->methods->close)(om);
-}
-
-#if NeedVarargsPrototypes
-char *
-XSetOMValues(XOM om, ...)
-#else
-char *
-XSetOMValues(om, va_alist)
-    XOM om;
-    va_dcl
-#endif
-{
-    va_list var;
-    XlcArgList args;
-    char *ret;
-    int num_args;
-
-    Va_start(var, om);
-    _XlcCountVaList(var, &num_args);
-    va_end(var);
-
-    Va_start(var, om);
-    _XlcVaToArgList(var, num_args, &args);
-    va_end(var);
-
-    if (args == (XlcArgList) NULL)
-	return (char *) NULL;
-
-    ret = (*om->methods->set_values)(om, args, num_args);
-
-    Xfree(args);
-
-    return ret;
-}
-
-#if NeedVarargsPrototypes
-char *
-XGetOMValues(XOM om, ...)
-#else
-char *
-XGetOMValues(om, va_alist)
-    XOM om;
-    va_dcl
-#endif
-{
-    va_list var;
-    XlcArgList args;
-    char *ret;
-    int num_args;
-
-    Va_start(var, om);
-    _XlcCountVaList(var, &num_args);
-    va_end(var);
-
-    Va_start(var, om);
-    _XlcVaToArgList(var, num_args, &args);
-    va_end(var);
-
-    if (args == (XlcArgList) NULL)
-	return (char *) NULL;
-    
-    ret = (*om->methods->get_values)(om, args, num_args);
-
-    Xfree(args);
-
-    return ret;
-}
-
-Display *
-XDisplayOfOM(om)
-    XOM om;
-{
-    return om->core.display;
-}
-
-char *
-XLocaleOfOM(om)
-    XOM om;
-{
-    return om->core.lcd->core->name;
-}
diff --git a/xc/lib/X11/OfCCC.c b/xc/lib/X11/OfCCC.c
deleted file mode 100644
index 8c5a7c108..000000000
--- a/xc/lib/X11/OfCCC.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/* $XConsortium: OfCCC.c,v 1.1 91/05/13 22:37:17 rws Exp $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		XcmsOfCCC.c - Color Conversion Context Querying Routines
- *
- *	DESCRIPTION
- *		Routines to query components of a Color Conversion
- *		Context structure.
- *
- *
- */
-
-#include "Xlib.h"
-#include "Xcms.h"
-
-
-
-/************************************************************************
- *									*
- *			PUBLIC INTERFACES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsDisplayOfCCC
- *
- *	SYNOPSIS
- */
-
-Display *
-XcmsDisplayOfCCC(ccc)
-    XcmsCCC ccc;
-/*
- *	DESCRIPTION
- *		Queries the Display of the specified CCC.
- *
- *	RETURNS
- *		Pointer to the Display.
- *
- */
-{
-    return(ccc->dpy);
-}
-
-
-/*
- *	NAME
- *		XcmsVisualOfCCC
- *
- *	SYNOPSIS
- */
-
-Visual *
-XcmsVisualOfCCC(ccc)
-    XcmsCCC ccc;
-/*
- *	DESCRIPTION
- *		Queries the Visual of the specified CCC.
- *
- *	RETURNS
- *		Pointer to the Visual.
- *
- */
-{
-    return(ccc->visual);
-}
-
-
-/*
- *	NAME
- *		XcmsScreenNumberOfCCC
- *
- *	SYNOPSIS
- */
-
-int
-XcmsScreenNumberOfCCC(ccc)
-    XcmsCCC ccc;
-/*
- *	DESCRIPTION
- *		Queries the screen number of the specified CCC.
- *
- *	RETURNS
- *		screen number.
- *
- */
-{
-    return(ccc->screenNumber);
-}
-
-
-/*
- *	NAME
- *		XcmsScreenWhitePointOfCCC
- *
- *	SYNOPSIS
- */
-
-XcmsColor *
-XcmsScreenWhitePointOfCCC(ccc)
-    XcmsCCC ccc;
-/*
- *	DESCRIPTION
- *		Queries the screen white point of the specified CCC.
- *
- *	RETURNS
- *		Pointer to the XcmsColor containing the screen white point.
- *
- */
-{
-    return(&ccc->pPerScrnInfo->screenWhitePt);
-}
-
-
-/*
- *	NAME
- *		XcmsClientWhitePointOfCCC
- *
- *	SYNOPSIS
- */
-
-XcmsColor *
-XcmsClientWhitePointOfCCC(ccc)
-    XcmsCCC ccc;
-/*
- *	DESCRIPTION
- *		Queries the client white point of the specified CCC.
- *
- *	RETURNS
- *		Pointer to the XcmsColor containing the client white point.
- *
- */
-{
-    return(&ccc->clientWhitePt);
-}
diff --git a/xc/lib/X11/OpenDis.c b/xc/lib/X11/OpenDis.c
deleted file mode 100644
index b92d92b9f..000000000
--- a/xc/lib/X11/OpenDis.c
+++ /dev/null
@@ -1,774 +0,0 @@
-/* $TOG: OpenDis.c /main/111 1998/02/06 17:46:07 kaleb $ */
-/*
-
-Copyright 1985, 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/OpenDis.c,v 3.5 1999/05/09 10:49:52 dawes Exp $ */
-
-#define NEED_REPLIES
-#define NEED_EVENTS
-#include "Xlibint.h"
-#include <X11/Xtrans.h>
-#include <X11/Xatom.h>
-#include "bigreqstr.h"
-#include <stdio.h>
-
-#ifdef XKB
-#include "XKBlib.h"
-#endif /* XKB */
-
-#ifdef X_NOT_STDC_ENV
-extern char *getenv();
-#endif
-
-#ifdef X_NOT_POSIX
-#define Size_t unsigned int
-#else
-#define Size_t size_t
-#endif
-
-#define bignamelen (sizeof(XBigReqExtensionName) - 1)
-
-typedef struct {
-    unsigned long seq;
-    int opcode;
-} _XBigReqState;
-
-extern int _Xdebug;
-#ifdef WIN32
-int *_Xdebug_p = &_Xdebug;
-#endif
-
-#ifdef XTHREADS
-int  (*_XInitDisplayLock_fn)() = NULL;
-void (*_XFreeDisplayLock_fn)() = NULL;
-
-#define InitDisplayLock(d)	(_XInitDisplayLock_fn ? (*_XInitDisplayLock_fn)(d) : Success)
-#define FreeDisplayLock(d)	if (_XFreeDisplayLock_fn) (*_XFreeDisplayLock_fn)(d)
-#else
-#define InitDisplayLock(dis) Success
-#define FreeDisplayLock(dis)
-#endif /* XTHREADS */
-
-static xReq _dummy_request = {
-	0, 0, 0
-};
-
-static void OutOfMemory();
-static Bool _XBigReqHandler();
-
-extern Bool _XWireToEvent();
-extern Status _XUnknownNativeEvent();
-extern Bool _XUnknownWireEvent();
-
-/* XlibInt.c */
-extern Bool _XPollfdCacheInit();
-
-/* ConnDis.c */
-extern int _XDisconnectDisplay();
-
-/* FreeEData.c */
-extern int _XFreeExtData();
-
-/* 
- * Connects to a server, creates a Display object and returns a pointer to
- * the newly created Display back to the caller.
- */
-#if NeedFunctionPrototypes
-Display *XOpenDisplay (
-	register _Xconst char *display)
-#else
-Display *XOpenDisplay (display)
-	register char *display;
-#endif
-{
-	register Display *dpy;		/* New Display object being created. */
-	register int i;
-	int j, k;			/* random iterator indexes */
-	char *display_name;		/* pointer to display name */
-	int endian;			/* to determine which endian. */
-	xConnClientPrefix client;	/* client information */
-	xConnSetupPrefix prefix;	/* prefix information */
-	int vendorlen;			/* length of vendor string */
-	char *setup = NULL;		/* memory allocated at startup */
-	char *fullname = NULL;		/* expanded name of display */
-	int idisplay;			/* display number */
-	int iscreen;			/* screen number */
-	int prefixread = 0;             /* setup prefix already read? */
-	union {
-		xConnSetup *setup;
-		char *failure;
-		char *vendor;
-		xPixmapFormat *sf;
-		xWindowRoot *rp;
-		xDepth *dp;
-		xVisualType *vp;
-	} u;				/* proto data returned from server */
-	long setuplength;	/* number of bytes in setup message */
-	char *conn_auth_name, *conn_auth_data;
-	int conn_auth_namelen, conn_auth_datalen;
-	unsigned long mask;
-	extern Bool _XSendClientPrefix();
-	extern XtransConnInfo _X11TransConnectDisplay();
-	extern XID _XAllocID();
-	extern void _XAllocIDs();
-
-	bzero((char *) &client, sizeof(client));
-	bzero((char *) &prefix, sizeof(prefix));
-
-	/*
-	 * If the display specifier string supplied as an argument to this 
-	 * routine is NULL or a pointer to NULL, read the DISPLAY variable.
-	 */
-	if (display == NULL || *display == '\0') {
-		if ((display_name = getenv("DISPLAY")) == NULL) {
-			/* Oops! No DISPLAY environment variable - error. */
-			return(NULL);
-		}
-	}
-	else {
-		/* Display is non-NULL, copy the pointer */
-		display_name = (char *)display;
-	}
-/*
- * Set the default error handlers.  This allows the global variables to
- * default to NULL for use with shared libraries.
- */
-	if (_XErrorFunction == NULL) (void) XSetErrorHandler (NULL);
-	if (_XIOErrorFunction == NULL) (void) XSetIOErrorHandler (NULL);
-
-/*
- * Attempt to allocate a display structure. Return NULL if allocation fails.
- */
-	if ((dpy = (Display *)Xcalloc(1, sizeof(Display))) == NULL) {
-		return(NULL);
-	}
-
-/*
- * Call the Connect routine to get the transport connection object.
- * If NULL is returned, the connection failed. The connect routine
- * will set fullname to point to the expanded name.
- */
-
-	if ((dpy->trans_conn = _X11TransConnectDisplay (
-					 display_name, &fullname, &idisplay,
-					 &iscreen, &conn_auth_name,
-					 &conn_auth_namelen, &conn_auth_data,
-					 &conn_auth_datalen)) == NULL) {
-		Xfree ((char *) dpy);
-		return(NULL);
-	}
-
-	dpy->fd = _X11TransGetConnectionNumber (dpy->trans_conn);
-
-	/* Initialize as much of the display structure as we can.
-	 * Initialize pointers to NULL so that XFreeDisplayStructure will
-	 * work if we run out of memory before we finish initializing.
-	 */
-	dpy->display_name	= fullname;
-	dpy->keysyms		= (KeySym *) NULL;
-	dpy->modifiermap	= NULL;
-	dpy->lock_meaning	= NoSymbol;
-	dpy->keysyms_per_keycode = 0;
-	dpy->xdefaults		= (char *)NULL;
-	dpy->scratch_length	= 0L;
-	dpy->scratch_buffer	= NULL;
-	dpy->key_bindings	= NULL;
-	dpy->ext_procs		= (_XExtension *)NULL;
-	dpy->ext_data		= (XExtData *)NULL;
-	dpy->ext_number 	= 0;
-	dpy->event_vec[X_Error] = _XUnknownWireEvent;
-	dpy->event_vec[X_Reply] = _XUnknownWireEvent;
-	dpy->wire_vec[X_Error]  = _XUnknownNativeEvent;
-	dpy->wire_vec[X_Reply]  = _XUnknownNativeEvent;
-	for (i = KeyPress; i < LASTEvent; i++) {
-	    dpy->event_vec[i] 	= _XWireToEvent;
-	    dpy->wire_vec[i] 	= NULL;
-	}
-	for (i = LASTEvent; i < 128; i++) {
-	    dpy->event_vec[i] 	= _XUnknownWireEvent;
-	    dpy->wire_vec[i] 	= _XUnknownNativeEvent;
-	}
-	dpy->resource_id	= 0;
-	dpy->db 		= (struct _XrmHashBucketRec *)NULL;
-	dpy->cursor_font	= None;
-	dpy->flags		= 0;
-	dpy->async_handlers	= NULL;
-	dpy->screens		= NULL;
-	dpy->vendor		= NULL;
-	dpy->buffer		= NULL;
-	dpy->atoms		= NULL;
-	dpy->error_vec		= NULL;
-	dpy->context_db		= NULL;
-	dpy->free_funcs		= NULL;
-	dpy->pixmap_format	= NULL;
-	dpy->cms.clientCmaps	= NULL;
-	dpy->cms.defaultCCCs	= NULL;
-	dpy->cms.perVisualIntensityMaps = NULL;
-	dpy->im_filters		= NULL;
- 	dpy->bigreq_size	= 0;
-	dpy->lock		= NULL;
-	dpy->lock_fns		= NULL;
-	dpy->qfree		= NULL;
-	dpy->next_event_serial_num = 1;
-	dpy->im_fd_info		= NULL;
-	dpy->im_fd_length	= 0;
-	dpy->conn_watchers	= NULL;
-	dpy->watcher_count	= 0;
-	dpy->filedes		= NULL;
-	dpy->flushes		= NULL;
-	dpy->xcmisc_opcode	= 0;
-	dpy->xkb_info		= NULL;
-
-/*
- * Setup other information in this display structure.
- */
-	dpy->vnumber = X_PROTOCOL;
-	dpy->resource_alloc = _XAllocID;
-	dpy->idlist_alloc = _XAllocIDs;
-	dpy->synchandler = NULL;
-	dpy->savedsynchandler = NULL;
-	dpy->request = 0;
-	dpy->last_request_read = 0;
-	dpy->default_screen = iscreen;  /* Value returned by ConnectDisplay */
-	dpy->last_req = (char *)&_dummy_request;
-
-	/* Initialize the display lock */
-	if (InitDisplayLock(dpy) != 0) {
-	        OutOfMemory (dpy, setup);
-		return(NULL);
-	}
-
-	if (!_XPollfdCacheInit(dpy)) {
-	        OutOfMemory (dpy, setup);
-		return(NULL);
-	}	
-
-	/* Set up the output buffers. */
-	if ((dpy->bufptr = dpy->buffer = Xcalloc(1, BUFSIZE)) == NULL) {
-	        OutOfMemory (dpy, setup);
-		return(NULL);
-	}
-	dpy->bufmax = dpy->buffer + BUFSIZE;
- 
-	/* Set up the input event queue and input event queue parameters. */
-	dpy->head = dpy->tail = NULL;
-	dpy->qlen = 0;
-
-	/* Set up free-function record */
-	if ((dpy->free_funcs = (_XFreeFuncRec *)Xcalloc(1,
-							sizeof(_XFreeFuncRec)))
-	    == NULL) {
-	    OutOfMemory (dpy, setup);
-	    return(NULL);
-	}
-
-/*
- * The xConnClientPrefix describes the initial connection setup information
- * and is followed by the authorization information.  Sites that are interested
- * in security are strongly encouraged to use an authentication and 
- * authorization system such as Kerberos.
- */
-	endian = 1;
-	if (*(char *) &endian)
-	    client.byteOrder = '\154'; /* 'l' */
-	else
-	    client.byteOrder = '\102'; /* 'B' */
-	client.majorVersion = X_PROTOCOL;
-	client.minorVersion = X_PROTOCOL_REVISION;
-	client.nbytesAuthProto = conn_auth_namelen;
-	client.nbytesAuthString = conn_auth_datalen;
-	prefixread = _XSendClientPrefix(dpy, &client,
-					conn_auth_name, conn_auth_data,
-					&prefix);
-	if (prefixread < 0)
-	{
-	    _XDisconnectDisplay (dpy->trans_conn);
-	    Xfree ((char *)dpy);
-	    return(NULL);
-	}
-	if (conn_auth_name) Xfree(conn_auth_name);
-	if (conn_auth_data) Xfree(conn_auth_data);
-/*
- * Now see if connection was accepted...
- */
-	/* these internal functions expect the display to be locked */
-	LockDisplay(dpy);
-
-	if (prefixread == 0)
-	    _XRead (dpy, (char *)&prefix,(long)SIZEOF(xConnSetupPrefix));
-
-	/* an Authenticate reply we weren't expecting? */
-	if (prefix.success != xTrue && prefix.success != xFalse) {
-	    fprintf (stderr,
-      "Xlib: unexpected connection setup reply from server, type %d.\r\n",
-		     prefix.success);
-	    _XDisconnectDisplay (dpy->trans_conn);
-	    Xfree ((char *)dpy);
-	    return(NULL);
-	}
-
-	if (prefix.majorVersion != X_PROTOCOL) {
-	    /* XXX - printing messages marks a bad programming interface */
-	    fprintf (stderr,
-     "Xlib: client uses different protocol version (%d) than server (%d)!\r\n",
-		     X_PROTOCOL, prefix.majorVersion);
-	    _XDisconnectDisplay (dpy->trans_conn);
-	    Xfree ((char *)dpy);
-	    return(NULL);
-	}
-
-	setuplength = prefix.length << 2;
-	if ( (u.setup = (xConnSetup *)
-	      (setup =  Xmalloc ((unsigned) setuplength))) == NULL) {
-		_XDisconnectDisplay (dpy->trans_conn);
-		Xfree ((char *)dpy);
-		return(NULL);
-	}
-	_XRead (dpy, (char *)u.setup, setuplength);
-/*
- * If the connection was not accepted by the server due to problems,
- * give error message to the user....
- */
-	if (prefix.success != xTrue) {
-		/* XXX - printing messages marks a bad programming interface */
-		fprintf (stderr, 
-		      "Xlib: connection to \"%s\" refused by server\r\nXlib: ",
-			 fullname);
-		(void) fwrite (u.failure, (Size_t)sizeof(char),
-			       (Size_t)prefix.lengthReason, stderr);
-		(void) fwrite ("\r\n", sizeof(char), 2, stderr);
-		OutOfMemory(dpy, setup);
-		return (NULL);
-	}
-
-/*
- * We succeeded at authorization, so let us move the data into
- * the display structure.
- */
-	dpy->proto_major_version= prefix.majorVersion;
-	dpy->proto_minor_version= prefix.minorVersion;
-	dpy->release 		= u.setup->release;
-	dpy->resource_base	= u.setup->ridBase;
-	dpy->resource_mask	= u.setup->ridMask;
-	dpy->min_keycode	= u.setup->minKeyCode;
-	dpy->max_keycode	= u.setup->maxKeyCode;
-	dpy->motion_buffer	= u.setup->motionBufferSize;
-	dpy->nformats		= u.setup->numFormats;
-	dpy->nscreens		= u.setup->numRoots;
-	dpy->byte_order		= u.setup->imageByteOrder;
-	dpy->bitmap_unit	= u.setup->bitmapScanlineUnit;
-	dpy->bitmap_pad		= u.setup->bitmapScanlinePad;
-	dpy->bitmap_bit_order   = u.setup->bitmapBitOrder;
-	dpy->max_request_size	= u.setup->maxRequestSize;
-	mask = dpy->resource_mask;
-	dpy->resource_shift	= 0;
-	while (!(mask & 1)) {
-	    dpy->resource_shift++;
-	    mask = mask >> 1;
-	}
-	dpy->resource_max = (dpy->resource_mask >> dpy->resource_shift) - 5;
-/*
- * now extract the vendor string...  String must be null terminated,
- * padded to multiple of 4 bytes.
- */
-	dpy->vendor = (char *) Xmalloc((unsigned) (u.setup->nbytesVendor + 1));
-	if (dpy->vendor == NULL) {
-	    OutOfMemory(dpy, setup);
-	    return (NULL);
-	}
-	vendorlen = u.setup->nbytesVendor;
- 	u.setup = (xConnSetup *) (((char *) u.setup) + sz_xConnSetup);
-  	(void) strncpy(dpy->vendor, u.vendor, vendorlen);
-	dpy->vendor[vendorlen] = '\0';
- 	vendorlen = (vendorlen + 3) & ~3;	/* round up */
-	memmove (setup, u.vendor + vendorlen,
-		 (int) setuplength - sz_xConnSetup - vendorlen);
- 	u.vendor = setup;
-/*
- * Now iterate down setup information.....
- */
-	dpy->pixmap_format = 
-	    (ScreenFormat *)Xmalloc(
-		(unsigned) (dpy->nformats *sizeof(ScreenFormat)));
-	if (dpy->pixmap_format == NULL) {
-	        OutOfMemory (dpy, setup);
-		return(NULL);
-	}
-/*
- * First decode the Z axis Screen format information.
- */
-	for (i = 0; i < dpy->nformats; i++) {
-	    register ScreenFormat *fmt = &dpy->pixmap_format[i];
-	    fmt->depth = u.sf->depth;
-	    fmt->bits_per_pixel = u.sf->bitsPerPixel;
-	    fmt->scanline_pad = u.sf->scanLinePad;
-	    fmt->ext_data = NULL;
-	    u.sf = (xPixmapFormat *) (((char *) u.sf) + sz_xPixmapFormat);
-	}
-
-/*
- * next the Screen structures.
- */
-	dpy->screens = 
-	    (Screen *)Xmalloc((unsigned) dpy->nscreens*sizeof(Screen));
-	if (dpy->screens == NULL) {
-	        OutOfMemory (dpy, setup);
-		return(NULL);
-	}
-/*
- * Now go deal with each screen structure.
- */
-	for (i = 0; i < dpy->nscreens; i++) {
-	    register Screen *sp = &dpy->screens[i];
-	    VisualID root_visualID = u.rp->rootVisualID;
-	    sp->display	    = dpy;
-	    sp->root 	    = u.rp->windowId;
-	    sp->cmap 	    = u.rp->defaultColormap;
-	    sp->white_pixel = u.rp->whitePixel;
-	    sp->black_pixel = u.rp->blackPixel;
-	    sp->root_input_mask = u.rp->currentInputMask;
-	    sp->width	    = u.rp->pixWidth;
-	    sp->height	    = u.rp->pixHeight;
-	    sp->mwidth	    = u.rp->mmWidth;
-	    sp->mheight	    = u.rp->mmHeight;
-	    sp->min_maps    = u.rp->minInstalledMaps;
-	    sp->max_maps    = u.rp->maxInstalledMaps;
-	    sp->backing_store= u.rp->backingStore;
-	    sp->save_unders = u.rp->saveUnders;
-	    sp->root_depth  = u.rp->rootDepth;
-	    sp->ndepths	    = u.rp->nDepths;
-	    sp->ext_data   = NULL;
-	    u.rp = (xWindowRoot *) (((char *) u.rp) + sz_xWindowRoot);
-/*
- * lets set up the depth structures.
- */
-	    sp->depths = (Depth *)Xmalloc(
-			(unsigned)sp->ndepths*sizeof(Depth));
-	    if (sp->depths == NULL) {
-		OutOfMemory (dpy, setup);
-		return(NULL);
-	    }
-	    /*
-	     * for all depths on this screen.
-	     */
-	    for (j = 0; j < sp->ndepths; j++) {
-		Depth *dp = &sp->depths[j];
-		dp->depth = u.dp->depth;
-		dp->nvisuals = u.dp->nVisuals;
-		u.dp = (xDepth *) (((char *) u.dp) + sz_xDepth);
-		if (dp->nvisuals > 0) {
-		    dp->visuals = 
-		      (Visual *)Xmalloc((unsigned)dp->nvisuals*sizeof(Visual));
-		    if (dp->visuals == NULL) {
-			OutOfMemory (dpy, setup);
-			return(NULL);
-		    }
-		    for (k = 0; k < dp->nvisuals; k++) {
-			register Visual *vp = &dp->visuals[k];
-			vp->visualid	= u.vp->visualID;
-			vp->class	= u.vp->class;
-			vp->bits_per_rgb= u.vp->bitsPerRGB;
-			vp->map_entries	= u.vp->colormapEntries;
-			vp->red_mask	= u.vp->redMask;
-			vp->green_mask	= u.vp->greenMask;
-			vp->blue_mask	= u.vp->blueMask;
-			vp->ext_data	= NULL;
-			u.vp = (xVisualType *) (((char *) u.vp) +
-						sz_xVisualType);
-		    }
-		} else {
-		    dp->visuals = (Visual *) NULL;
-		}
-	    }
-	    sp->root_visual = _XVIDtoVisual(dpy, root_visualID);
-	}
-		
-
-/*
- * Now start talking to the server to setup all other information...
- */
-
-	Xfree (setup);	/* all finished with setup information */
-
-/*
- * Make sure default screen is legal.
- */
-	if (iscreen >= dpy->nscreens) {
-	    OutOfMemory(dpy, (char *) NULL);
-	    return(NULL);
-	}
-
-/*
- * finished calling internal routines, now unlock for external routines
- */
-	UnlockDisplay(dpy);
-
-/*
- * Set up other stuff clients are always going to use.
- */
-	for (i = 0; i < dpy->nscreens; i++) {
-	    register Screen *sp = &dpy->screens[i];
-	    XGCValues values;
-	    values.foreground = sp->black_pixel;
-	    values.background = sp->white_pixel;
-	    if ((sp->default_gc = XCreateGC (dpy, sp->root,
-					     GCForeground|GCBackground,
-					     &values)) == NULL) {
-		OutOfMemory(dpy, (char *) NULL);
-		return (NULL);
-	    }
-	}
-/*
- * call into synchronization routine so that all programs can be
- * forced synchronous
- */
-	(void) XSynchronize(dpy, _Xdebug);
-
-/*
- * get availability of large requests, and
- * get the resource manager database off the root window.
- */
-	LockDisplay(dpy);
-	{
-	    _XAsyncHandler async;
-	    _XBigReqState async_state;
-	    xQueryExtensionReq *qreq;
-	    xGetPropertyReply reply;
-	    xGetPropertyReq *req;
-	    xBigReqEnableReq *breq;
-	    xBigReqEnableReply brep;
-
-	    GetReq(QueryExtension, qreq);
-	    async_state.seq = dpy->request;
-	    async_state.opcode = 0;
-	    async.next = dpy->async_handlers;
-	    async.handler = _XBigReqHandler;
-	    async.data = (XPointer)&async_state;
-	    dpy->async_handlers = &async;
-	    qreq->nbytes = bignamelen;
-	    qreq->length += (bignamelen+3)>>2;
-	    Data(dpy, XBigReqExtensionName, bignamelen);
-
-	    GetReq (GetProperty, req);
-	    req->window = RootWindow(dpy, 0);
-	    req->property = XA_RESOURCE_MANAGER;
-	    req->type = XA_STRING;
-	    req->delete = False;
-	    req->longOffset = 0;
-	    req->longLength = 100000000L;
-
-	    if (_XReply (dpy, (xReply *) &reply, 0, xFalse)) {
-		if (reply.format == 8 && reply.propertyType == XA_STRING &&
-		    (dpy->xdefaults = Xmalloc (reply.nItems + 1))) {
-		    _XReadPad (dpy, dpy->xdefaults, reply.nItems);
-		    dpy->xdefaults[reply.nItems] = '\0';
-		}
-		else if (reply.propertyType != None)
-		    _XEatData(dpy, reply.nItems * (reply.format >> 3));
-	    }
-	    DeqAsyncHandler(dpy, &async);
-	    if (async_state.opcode) {
-		GetReq(BigReqEnable, breq);
-		breq->reqType = async_state.opcode;
-		breq->brReqType = X_BigReqEnable;
-		if (_XReply(dpy, (xReply *)&brep, 0, xFalse))
-		    dpy->bigreq_size = brep.max_request_size;
-	    }
-	}
-	UnlockDisplay(dpy);
-
-#ifdef MOTIFBC
-	{
-	    extern Display *_XHeadOfDisplayList;
-	    _XHeadOfDisplayList = dpy;
-	}
-#endif
-#ifdef XKB
-	XkbUseExtension(dpy,NULL,NULL);
-#endif
-/*
- * and return successfully
- */
- 	return(dpy);
-}
-
-static Bool
-_XBigReqHandler(dpy, rep, buf, len, data)
-    register Display *dpy;
-    register xReply *rep;
-    char *buf;
-    int len;
-    XPointer data;
-{
-    _XBigReqState *state;
-    xQueryExtensionReply replbuf;
-    xQueryExtensionReply *repl;
-
-    state = (_XBigReqState *)data;
-    if (dpy->last_request_read != state->seq)
-	return False;
-    if (rep->generic.type == X_Error)
-	return True;
-    repl = (xQueryExtensionReply *)
-	_XGetAsyncReply(dpy, (char *)&replbuf, rep, buf, len,
-			(SIZEOF(xQueryExtensionReply) - SIZEOF(xReply)) >> 2,
-			True);
-    if (repl->present)
-	state->opcode = repl->major_opcode;
-    return True;
-}
-
-
-/* XFreeDisplayStructure frees all the storage associated with a 
- * Display.  It is used by XOpenDisplay if it runs out of memory,
- * and also by XCloseDisplay.   It needs to check whether all pointers
- * are non-NULL before dereferencing them, since it may be called
- * by XOpenDisplay before the Display structure is fully formed.
- * XOpenDisplay must be sure to initialize all the pointers to NULL
- * before the first possible call on this.
- */
-
-void _XFreeDisplayStructure(dpy)
-	register Display *dpy;
-{
-	while (dpy->ext_procs) {
-	    _XExtension *ext = dpy->ext_procs;
-	    dpy->ext_procs = ext->next;
-	    if (ext->name)
-		Xfree (ext->name);
-	    Xfree ((char *)ext);
-	}
-	if (dpy->im_filters)
-	   (*dpy->free_funcs->im_filters)(dpy);
-	if (dpy->cms.clientCmaps)
-	   (*dpy->free_funcs->clientCmaps)(dpy);
-	if (dpy->cms.defaultCCCs)
-	   (*dpy->free_funcs->defaultCCCs)(dpy);
-	if (dpy->cms.perVisualIntensityMaps)
-	   (*dpy->free_funcs->intensityMaps)(dpy);
-	if (dpy->atoms)
-	    (*dpy->free_funcs->atoms)(dpy);
-	if (dpy->modifiermap)
-	   (*dpy->free_funcs->modifiermap)(dpy->modifiermap);
-	if (dpy->key_bindings)
-	   (*dpy->free_funcs->key_bindings)(dpy);
-	if (dpy->context_db)
-	   (*dpy->free_funcs->context_db)(dpy);
-	if (dpy->xkb_info)
-	   (*dpy->free_funcs->xkb)(dpy);
-
-	if (dpy->screens) {
-	    register int i;
-
-            for (i = 0; i < dpy->nscreens; i++) {
-		Screen *sp = &dpy->screens[i];
-
-		if (sp->depths) {
-		   register int j;
-
-		   for (j = 0; j < sp->ndepths; j++) {
-			Depth *dp = &sp->depths[j];
-
-			if (dp->visuals) {
-			   register int k;
-
-			   for (k = 0; k < dp->nvisuals; k++)
-			     _XFreeExtData (dp->visuals[k].ext_data);
-			   Xfree ((char *) dp->visuals);
-			   }
-			}
-
-		   Xfree ((char *) sp->depths);
-		   }
-
-		_XFreeExtData (sp->ext_data);
-		}
-
-	    Xfree ((char *)dpy->screens);
-	    }
-	
-	if (dpy->pixmap_format) {
-	    register int i;
-
-	    for (i = 0; i < dpy->nformats; i++)
-	      _XFreeExtData (dpy->pixmap_format[i].ext_data);
-            Xfree ((char *)dpy->pixmap_format);
-	    }
-
-	if (dpy->display_name)
-	   Xfree (dpy->display_name);
-	if (dpy->vendor)
-	   Xfree (dpy->vendor);
-
-        if (dpy->buffer)
-	   Xfree (dpy->buffer);
-	if (dpy->keysyms)
-	   Xfree ((char *) dpy->keysyms);
-	if (dpy->xdefaults)
-	   Xfree (dpy->xdefaults);
-	if (dpy->error_vec)
-	    Xfree ((char *)dpy->error_vec);
-
-	_XFreeExtData (dpy->ext_data);
-	if (dpy->free_funcs)
-	    Xfree ((char *)dpy->free_funcs);
- 	if (dpy->scratch_buffer)
- 	    Xfree (dpy->scratch_buffer);
-	FreeDisplayLock(dpy);
-
-	if (dpy->qfree) {
-	    register _XQEvent *qelt = dpy->qfree;
-
-	    while (qelt) {
-		register _XQEvent *qnxt = qelt->next;
-		Xfree ((char *) qelt);
-		qelt = qnxt;
-	    }
-	}
-	while (dpy->im_fd_info) {
-	    struct _XConnectionInfo *conni = dpy->im_fd_info;
-	    dpy->im_fd_info = conni->next;
-	    if (conni->watch_data)
-		Xfree (conni->watch_data);
-	    Xfree (conni);
-	}
-	if (dpy->conn_watchers) {
-	    struct _XConnWatchInfo *watcher = dpy->conn_watchers;
-	    dpy->conn_watchers = watcher->next;
-	    Xfree (watcher);
-	}
-	if (dpy->filedes)
-	    Xfree (dpy->filedes);
-
-	Xfree ((char *)dpy);
-}
-
-/* OutOfMemory is called if malloc fails.  XOpenDisplay returns NULL
-   after this returns. */
-
-static void OutOfMemory (dpy, setup)
-    Display *dpy;
-    char *setup;
-{
-    _XDisconnectDisplay (dpy->trans_conn);
-    _XFreeDisplayStructure (dpy);
-    if (setup) Xfree (setup);
-}
diff --git a/xc/lib/X11/ParseCmd.c b/xc/lib/X11/ParseCmd.c
deleted file mode 100644
index 6d8cf2e83..000000000
--- a/xc/lib/X11/ParseCmd.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/* $TOG: ParseCmd.c /main/26 1998/02/06 17:46:14 kaleb $ */
-
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-/* $XFree86: xc/lib/X11/ParseCmd.c,v 1.2 1998/12/20 11:56:57 dawes Exp $ */
-
-/* XrmParseCommand()
-
-   Parse command line and store argument values into resource database
-
-   Allows any un-ambiguous abbreviation for an option name, but requires
-   that the table be ordered with any options that are prefixes of
-   other options appearing before the longer version in the table.
-*/
-
-#include "Xlibint.h"
-#include <X11/Xresource.h>
-#include <stdio.h>
-
-
-static void _XReportParseError(arg, msg)
-    XrmOptionDescRec *arg;
-    char *msg;
-{
-    (void) fprintf(stderr, "Error parsing argument \"%s\" (%s); %s\n",
-		   arg->option, arg->specifier, msg);
-    exit(1);
-}
-
-#if NeedFunctionPrototypes
-void XrmParseCommand(
-    XrmDatabase		*pdb,		/* data base */
-    register XrmOptionDescList options, /* pointer to table of valid options */
-    int			num_options,	/* number of options		     */
-    _Xconst char	*prefix,	/* name to prefix resources with     */
-    int			*argc,		/* address of argument count 	     */
-    char		**argv)		/* argument list (command line)	     */
-#else
-void XrmParseCommand(pdb, options, num_options, prefix, argc, argv)
-    XrmDatabase		*pdb;		/* data base */
-    register XrmOptionDescList options; /* pointer to table of valid options */
-    int			num_options;	/* number of options		     */
-    char		*prefix;	/* name to prefix resources with     */
-    int			*argc;		/* address of argument count 	     */
-    char		**argv;		/* argument list (command line)	     */
-#endif
-{
-    int 		foundOption;
-    char		**argsave;
-    register int	i, myargc;
-    XrmBinding		bindings[100];
-    XrmQuark		quarks[100];
-    XrmBinding		*start_bindings;
-    XrmQuark		*start_quarks;
-    char		*optP, *argP, optchar, argchar;
-    int			matches;
-    enum {DontCare, Check, NotSorted, Sorted} table_is_sorted;
-    char		**argend;
-
-#define PutCommandResource(value_str)				\
-    {								\
-    XrmStringToBindingQuarkList(				\
-	options[i].specifier, start_bindings, start_quarks);    \
-    XrmQPutStringResource(pdb, bindings, quarks, value_str);    \
-    } /* PutCommandResource */
-
-    myargc = (*argc); 
-    argend = argv + myargc;
-    argsave = ++argv;
-
-    /* Initialize bindings/quark list with prefix (typically app name). */
-    quarks[0] = XrmStringToName(prefix);
-    bindings[0] = XrmBindTightly;
-    start_quarks = quarks+1;
-    start_bindings = bindings+1;
-
-    table_is_sorted = (myargc > 2) ? Check : DontCare;
-    for (--myargc; myargc > 0; --myargc, ++argv) {
-	foundOption = False;
-	matches = 0;
-	for (i=0; i < num_options; ++i) {
-	    /* checking the sort order first insures we don't have to
-	       re-do the check if the arg hits on the last entry in
-	       the table.  Useful because usually '=' is the last entry
-	       and users frequently specify geometry early in the command */
-	    if (table_is_sorted == Check && i > 0 &&
-		strcmp(options[i].option, options[i-1].option) < 0) {
-		table_is_sorted = NotSorted;
-	    }
-	    for (argP = *argv, optP = options[i].option;
-		 (optchar = *optP++) &&
-		 (argchar = *argP++) &&
-		 argchar == optchar;);
-	    if (!optchar) {
-		if (!*argP ||
-		    options[i].argKind == XrmoptionStickyArg ||
-		    options[i].argKind == XrmoptionIsArg) {
-		    /* give preference to exact matches, StickyArg and IsArg */
-		    matches = 1;
-		    foundOption = i;
-		    break;
-		}
-	    }
-	    else if (!argchar) {
-		/* may be an abbreviation for this option */
-		matches++;
-		foundOption = i;
-	    }
-	    else if (table_is_sorted == Sorted && optchar > argchar) {
-		break;
-	    }
-	    if (table_is_sorted == Check && i > 0 &&
-		strcmp(options[i].option, options[i-1].option) < 0) {
-		table_is_sorted = NotSorted;
-	    }
-	}
-	if (table_is_sorted == Check && i >= (num_options-1))
-	    table_is_sorted = Sorted;
-	if (matches == 1) {
-		i = foundOption;
-		switch (options[i].argKind){
-		case XrmoptionNoArg:
-		    --(*argc);
-		    PutCommandResource(options[i].value);
-		    break;
-			    
-		case XrmoptionIsArg:
-		    --(*argc);
-		    PutCommandResource(*argv);
-		    break;
-
-		case XrmoptionStickyArg:
-		    --(*argc);
-		    PutCommandResource(argP);
-		    break;
-
-		case XrmoptionSepArg:
-		    if (myargc > 1) {
-			++argv; --myargc; --(*argc); --(*argc);
-			PutCommandResource(*argv);
-		    } else
-			(*argsave++) = (*argv);
-		    break;
-		
-		case XrmoptionResArg:
-		    if (myargc > 1) {
-			++argv; --myargc; --(*argc); --(*argc);
-			XrmPutLineResource(pdb, *argv);
-		    } else
-			(*argsave++) = (*argv);
-		    break;
-		
-		case XrmoptionSkipArg:
-		    if (myargc > 1) {
-			--myargc;
-			(*argsave++) = (*argv++);
-		    }
-		    (*argsave++) = (*argv); 
-		    break;
-
-		case XrmoptionSkipLine:
-		    for (; myargc > 0; myargc--)
-			(*argsave++) = (*argv++);
-		    break;
-
-		case XrmoptionSkipNArgs:
-		    {
-			register int j = 1 + (long) options[i].value;
-
-			if (j > myargc) j = myargc;
-			for (; j > 0; j--) {
-			    (*argsave++) = (*argv++);
-			    myargc--;
-			}
-			argv--;		/* went one too far before */
-			myargc++;
-		    }
-		    break;
-
-		default:
-		    _XReportParseError (&options[i], "unknown kind");
-		    break;
-		}
-	}
-	else
-	    (*argsave++) = (*argv);  /*compress arglist*/ 
-    }
-
-    if (argsave < argend)
-	(*argsave)=NULL; /* put NULL terminator on compressed argv */
-}
diff --git a/xc/lib/X11/ParseCol.c b/xc/lib/X11/ParseCol.c
deleted file mode 100644
index 4111ef68b..000000000
--- a/xc/lib/X11/ParseCol.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/* $TOG: ParseCol.c /main/20 1998/02/06 17:46:21 kaleb $ */
-/*
-
-Copyright 1985, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/ParseCol.c,v 1.2 1999/05/09 10:49:52 dawes Exp $ */
-
-#define NEED_REPLIES
-#include <stdio.h>
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-extern void _XcmsRGB_to_XColor();
-extern Status _XcmsResolveColorString();
-
-#if NeedFunctionPrototypes
-Status XParseColor (
-	register Display *dpy,
-        Colormap cmap,
-	_Xconst char *spec,
-	XColor *def)
-#else
-Status XParseColor (dpy, cmap, spec, def)
-	register Display *dpy;
-        Colormap cmap;
-	char *spec;
-	XColor *def;
-#endif
-{
-	register int n, i;
-	int r, g, b;
-	char c;
-	XcmsCCC ccc;
-	XcmsColor cmsColor;
-
-        if (!spec) return(0);
-	n = strlen (spec);
-	if (*spec == '#') {
-	    /*
-	     * RGB
-	     */
-	    spec++;
-	    n--;
-	    if (n != 3 && n != 6 && n != 9 && n != 12)
-		return (0);
-	    n /= 3;
-	    g = b = 0;
-	    do {
-		r = g;
-		g = b;
-		b = 0;
-		for (i = n; --i >= 0; ) {
-		    c = *spec++;
-		    b <<= 4;
-		    if (c >= '0' && c <= '9')
-			b |= c - '0';
-		    else if (c >= 'A' && c <= 'F')
-			b |= c - ('A' - 10);
-		    else if (c >= 'a' && c <= 'f')
-			b |= c - ('a' - 10);
-		    else return (0);
-		}
-	    } while (*spec != '\0');
-	    n <<= 2;
-	    n = 16 - n;
-	    def->red = r << n;
-	    def->green = g << n;
-	    def->blue = b << n;
-	    def->flags = DoRed | DoGreen | DoBlue;
-	    return (1);
-	}
-
-
-	/*
-	 * Let's Attempt to use Xcms and i18n approach to Parse Color
-	 */
-	if ((ccc = XcmsCCCOfColormap(dpy, cmap)) != (XcmsCCC)NULL) {
-	    if (_XcmsResolveColorString(ccc, &spec,
-		    &cmsColor, XcmsRGBFormat) >= XcmsSuccess) {
-		cmsColor.pixel = def->pixel;
-		_XcmsRGB_to_XColor(&cmsColor, def, 1);
-		return(1);
-	    }
-	    /*
-	     * Otherwise we failed; or spec was changed with yet another
-	     * name.  Thus pass name to the X Server.
-	     */
-	}
-
-	/*
-	 * Xcms and i18n methods failed, so lets pass it to the server
-	 * for parsing.
-	 */
-	{
-	    xLookupColorReply reply;
-	    register xLookupColorReq *req;
-	    LockDisplay(dpy);
-	    GetReq (LookupColor, req);
-	    req->cmap = cmap;
-	    req->nbytes = n = strlen(spec);
-	    req->length += (n + 3) >> 2;
-	    Data (dpy, spec, (long)n);
-	    if (!_XReply (dpy, (xReply *) &reply, 0, xTrue)) {
-		UnlockDisplay(dpy);
-		SyncHandle();
-		return (0);
-		}
-	    def->red = reply.exactRed;
-	    def->green = reply.exactGreen;
-	    def->blue = reply.exactBlue;
-	    def->flags = DoRed | DoGreen | DoBlue;
-	    UnlockDisplay(dpy);
-	    SyncHandle();
-	    return (1);
-	}
-}
diff --git a/xc/lib/X11/ParseGeom.c b/xc/lib/X11/ParseGeom.c
deleted file mode 100644
index c77f7f58d..000000000
--- a/xc/lib/X11/ParseGeom.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/* $TOG: ParseGeom.c /main/11 1998/02/06 17:46:27 kaleb $ */
-
-/*
-
-Copyright 1985, 1986, 1987,1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-#include "Xlibint.h"
-#include "Xutil.h"
-
-#ifdef notdef
-/* 
- *Returns pointer to first char ins search which is also in what, else NULL.
- */
-static char *strscan (search, what)
-char *search, *what;
-{
-	int i, len = strlen (what);
-	char c;
-
-	while ((c = *(search++)) != NULL)
-		for (i = 0; i < len; i++)
-			if (c == what [i])
-				return (--search);
-	return (NULL);
-}
-#endif
-
-/*
- *    XParseGeometry parses strings of the form
- *   "=<width>x<height>{+-}<xoffset>{+-}<yoffset>", where
- *   width, height, xoffset, and yoffset are unsigned integers.
- *   Example:  "=80x24+300-49"
- *   The equal sign is optional.
- *   It returns a bitmask that indicates which of the four values
- *   were actually found in the string.  For each value found,
- *   the corresponding argument is updated;  for each value
- *   not found, the corresponding argument is left unchanged. 
- */
-
-static int
-ReadInteger(string, NextString)
-register char *string;
-char **NextString;
-{
-    register int Result = 0;
-    int Sign = 1;
-    
-    if (*string == '+')
-	string++;
-    else if (*string == '-')
-    {
-	string++;
-	Sign = -1;
-    }
-    for (; (*string >= '0') && (*string <= '9'); string++)
-    {
-	Result = (Result * 10) + (*string - '0');
-    }
-    *NextString = string;
-    if (Sign >= 0)
-	return (Result);
-    else
-	return (-Result);
-}
-
-#if NeedFunctionPrototypes
-int XParseGeometry (
-_Xconst char *string,
-int *x,
-int *y,
-unsigned int *width,    /* RETURN */
-unsigned int *height)    /* RETURN */
-#else
-int XParseGeometry (string, x, y, width, height)
-char *string;
-int *x, *y;
-unsigned int *width, *height;    /* RETURN */
-#endif
-{
-	int mask = NoValue;
-	register char *strind;
-	unsigned int tempWidth, tempHeight;
-	int tempX, tempY;
-	char *nextCharacter;
-
-	if ( (string == NULL) || (*string == '\0')) return(mask);
-	if (*string == '=')
-		string++;  /* ignore possible '=' at beg of geometry spec */
-
-	strind = (char *)string;
-	if (*strind != '+' && *strind != '-' && *strind != 'x') {
-		tempWidth = ReadInteger(strind, &nextCharacter);
-		if (strind == nextCharacter) 
-		    return (0);
-		strind = nextCharacter;
-		mask |= WidthValue;
-	}
-
-	if (*strind == 'x' || *strind == 'X') {	
-		strind++;
-		tempHeight = ReadInteger(strind, &nextCharacter);
-		if (strind == nextCharacter)
-		    return (0);
-		strind = nextCharacter;
-		mask |= HeightValue;
-	}
-
-	if ((*strind == '+') || (*strind == '-')) {
-		if (*strind == '-') {
-  			strind++;
-			tempX = -ReadInteger(strind, &nextCharacter);
-			if (strind == nextCharacter)
-			    return (0);
-			strind = nextCharacter;
-			mask |= XNegative;
-
-		}
-		else
-		{	strind++;
-			tempX = ReadInteger(strind, &nextCharacter);
-			if (strind == nextCharacter)
-			    return(0);
-			strind = nextCharacter;
-		}
-		mask |= XValue;
-		if ((*strind == '+') || (*strind == '-')) {
-			if (*strind == '-') {
-				strind++;
-				tempY = -ReadInteger(strind, &nextCharacter);
-				if (strind == nextCharacter)
-			    	    return(0);
-				strind = nextCharacter;
-				mask |= YNegative;
-
-			}
-			else
-			{
-				strind++;
-				tempY = ReadInteger(strind, &nextCharacter);
-				if (strind == nextCharacter)
-			    	    return(0);
-				strind = nextCharacter;
-			}
-			mask |= YValue;
-		}
-	}
-	
-	/* If strind isn't at the end of the string the it's an invalid
-		geometry specification. */
-
-	if (*strind != '\0') return (0);
-
-	if (mask & XValue)
-	    *x = tempX;
- 	if (mask & YValue)
-	    *y = tempY;
-	if (mask & WidthValue)
-            *width = tempWidth;
-	if (mask & HeightValue)
-            *height = tempHeight;
-	return (mask);
-}
diff --git a/xc/lib/X11/PeekEvent.c b/xc/lib/X11/PeekEvent.c
deleted file mode 100644
index 6bf6e8753..000000000
--- a/xc/lib/X11/PeekEvent.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $TOG: PeekEvent.c /main/8 1998/02/06 17:46:33 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/PeekEvent.c,v 1.2 1999/05/09 10:49:53 dawes Exp $ */
-
-#define NEED_EVENTS
-#include "Xlibint.h"
-
-/* 
- * Return the next event in the queue,
- * BUT do not remove it from the queue.
- * If none found, flush and wait until there is an event to peek.
- */
-
-int
-XPeekEvent (dpy, event)
-	register Display *dpy;
-	register XEvent *event;
-{
-	LockDisplay(dpy);
-	if (dpy->head == NULL)
-	    _XReadEvents(dpy);
-	*event = (dpy->head)->event;
-	UnlockDisplay(dpy);
-	return 1;
-}
-
diff --git a/xc/lib/X11/PeekIfEv.c b/xc/lib/X11/PeekIfEv.c
deleted file mode 100644
index 4b8b6c13b..000000000
--- a/xc/lib/X11/PeekIfEv.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* $TOG: PeekIfEv.c /main/9 1998/02/06 17:46:39 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/PeekIfEv.c,v 1.2 1999/05/09 10:49:53 dawes Exp $ */
-
-#define NEED_EVENTS
-#include "Xlibint.h"
-
-/*
- * return the next event in the queue that satisfies the predicate.
- * BUT do not remove it from the queue.
- * If none found, flush, and then wait until one satisfies the predicate.
- */
-
-int
-XPeekIfEvent (dpy, event, predicate, arg)
-	register Display *dpy;
-	register XEvent *event;
-	Bool (*predicate)(
-#if NeedNestedPrototypes
-			  Display*			/* display */,
-			  XEvent*			/* event */,
-			  char*				/* arg */
-#endif
-			  );
-	char *arg;
-{
-	register _XQEvent *prev, *qelt;
-	unsigned long qe_serial = 0;
-
-	LockDisplay(dpy);
-	prev = NULL;
-	while (1) {
-	    for (qelt = prev ? prev->next : dpy->head;
-		 qelt;
-		 prev = qelt, qelt = qelt->next) {
-		if(qelt->qserial_num > qe_serial
-		   && (*predicate)(dpy, &qelt->event, arg)) {
-		    *event = qelt->event;
-		    UnlockDisplay(dpy);
-		    return 0;
-		}
-	    }
-	    if (prev)
-		qe_serial = prev->qserial_num;
-	    _XReadEvents(dpy);
-	    if (prev && prev->qserial_num != qe_serial)
-		/* another thread has snatched this event */
-		prev = NULL;
-	}
-}
-
diff --git a/xc/lib/X11/Pending.c b/xc/lib/X11/Pending.c
deleted file mode 100644
index b04e7e4ac..000000000
--- a/xc/lib/X11/Pending.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* $TOG: Pending.c /main/7 1998/02/06 17:46:45 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#include "Xlibint.h"
-
-/* Read in pending events if needed and return the number of queued events. */
-
-int XEventsQueued (dpy, mode)
-    register Display *dpy;
-    int mode;
-{
-    int ret_val;
-    LockDisplay(dpy);
-    if (dpy->qlen || (mode == QueuedAlready))
-	ret_val = dpy->qlen;
-    else
-	ret_val = _XEventsQueued (dpy, mode);
-    UnlockDisplay(dpy);
-    return ret_val;
-}
-
-int XPending (dpy)
-    register Display *dpy;
-{
-    int ret_val;
-    LockDisplay(dpy);
-    if (dpy->qlen)
-	ret_val = dpy->qlen;
-    else
-	ret_val = _XEventsQueued (dpy, QueuedAfterFlush);
-    UnlockDisplay(dpy);
-    return ret_val;
-}
diff --git a/xc/lib/X11/PixFormats.c b/xc/lib/X11/PixFormats.c
deleted file mode 100644
index 7340787cb..000000000
--- a/xc/lib/X11/PixFormats.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* $TOG: PixFormats.c /main/7 1998/02/06 17:46:50 kaleb $ */
-/*
-
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#include "Xlibint.h"
-#include <stdio.h>
-
-/*
- * XListPixmapFormats - return info from connection setup
- */
-
-XPixmapFormatValues *XListPixmapFormats (dpy, count)
-    Display *dpy;
-    int *count;	/* RETURN */
-{
-    XPixmapFormatValues *formats = (XPixmapFormatValues *)
-	Xmalloc((unsigned) (dpy->nformats * sizeof (XPixmapFormatValues)));
-
-    if (formats) {
-	register int i;
-	register XPixmapFormatValues *f;
-	register ScreenFormat *sf;
-
-	/*
-	 * copy data from internal Xlib data structure in display
-	 */
-	for (i = dpy->nformats, f = formats, sf = dpy->pixmap_format; i > 0;
-	     i--, f++, sf++) {
-	    f->depth = sf->depth;
-	    f->bits_per_pixel = sf->bits_per_pixel;
-	    f->scanline_pad = sf->scanline_pad;
-	}
-
-	*count = dpy->nformats;
-    }
-    return formats;
-}
diff --git a/xc/lib/X11/PmapBgnd.c b/xc/lib/X11/PmapBgnd.c
deleted file mode 100644
index 171bb2a73..000000000
--- a/xc/lib/X11/PmapBgnd.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* $TOG: PmapBgnd.c /main/7 1998/02/06 17:46:56 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/PmapBgnd.c,v 1.2 1999/05/09 10:49:53 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XSetWindowBackgroundPixmap(dpy, w, pixmap)
-    register Display *dpy;
-    Window w;
-    Pixmap pixmap;
-{
-    register xChangeWindowAttributesReq *req;
-    LockDisplay (dpy);
-    GetReqExtra (ChangeWindowAttributes, 4, req);
-    req->window = w;
-    req->valueMask = CWBackPixmap;
-    OneDataCard32 (dpy, NEXTPTR(req,xChangeWindowAttributesReq), pixmap);
-    UnlockDisplay (dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/PmapBord.c b/xc/lib/X11/PmapBord.c
deleted file mode 100644
index eba7ac484..000000000
--- a/xc/lib/X11/PmapBord.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* $TOG: PmapBord.c /main/7 1998/02/06 17:47:02 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/PmapBord.c,v 1.2 1999/05/09 10:49:54 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XSetWindowBorderPixmap(dpy, w, pixmap)
-    register Display *dpy;
-    Window w;
-    Pixmap pixmap;
-{
-    register xChangeWindowAttributesReq *req;
-    LockDisplay(dpy);
-    GetReqExtra (ChangeWindowAttributes, 4, req);
-    req->window = w;
-    req->valueMask = CWBorderPixmap;
-    OneDataCard32 (dpy, NEXTPTR(req,xChangeWindowAttributesReq), pixmap);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/PolyReg.c b/xc/lib/X11/PolyReg.c
deleted file mode 100644
index d44b61383..000000000
--- a/xc/lib/X11/PolyReg.c
+++ /dev/null
@@ -1,627 +0,0 @@
-/* $TOG: PolyReg.c /main/15 1998/02/06 17:47:08 kaleb $ */
-/************************************************************************
-
-Copyright 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-************************************************************************/
-/* $XFree86: xc/lib/X11/PolyReg.c,v 1.4 1998/10/03 08:41:21 dawes Exp $ */
-
-#define LARGE_COORDINATE 1000000
-#define SMALL_COORDINATE -LARGE_COORDINATE
-
-#include "Xlibint.h"
-#include "Xutil.h"
-#include "region.h"
-#include "poly.h"
-
-/*
- *     InsertEdgeInET
- *
- *     Insert the given edge into the edge table.
- *     First we must find the correct bucket in the
- *     Edge table, then find the right slot in the
- *     bucket.  Finally, we can insert it.
- *
- */
-static void
-InsertEdgeInET(ET, ETE, scanline, SLLBlock, iSLLBlock)
-    EdgeTable *ET;
-    EdgeTableEntry *ETE;
-    int scanline;
-    ScanLineListBlock **SLLBlock;
-    int *iSLLBlock;
-{
-    register EdgeTableEntry *start, *prev;
-    register ScanLineList *pSLL, *pPrevSLL;
-    ScanLineListBlock *tmpSLLBlock;
-
-    /*
-     * find the right bucket to put the edge into
-     */
-    pPrevSLL = &ET->scanlines;
-    pSLL = pPrevSLL->next;
-    while (pSLL && (pSLL->scanline < scanline)) 
-    {
-        pPrevSLL = pSLL;
-        pSLL = pSLL->next;
-    }
-
-    /*
-     * reassign pSLL (pointer to ScanLineList) if necessary
-     */
-    if ((!pSLL) || (pSLL->scanline > scanline)) 
-    {
-        if (*iSLLBlock > SLLSPERBLOCK-1) 
-        {
-            tmpSLLBlock = 
-		  (ScanLineListBlock *)Xmalloc(sizeof(ScanLineListBlock));
-            (*SLLBlock)->next = tmpSLLBlock;
-            tmpSLLBlock->next = (ScanLineListBlock *)NULL;
-            *SLLBlock = tmpSLLBlock;
-            *iSLLBlock = 0;
-        }
-        pSLL = &((*SLLBlock)->SLLs[(*iSLLBlock)++]);
-
-        pSLL->next = pPrevSLL->next;
-        pSLL->edgelist = (EdgeTableEntry *)NULL;
-        pPrevSLL->next = pSLL;
-    }
-    pSLL->scanline = scanline;
-
-    /*
-     * now insert the edge in the right bucket
-     */
-    prev = (EdgeTableEntry *)NULL;
-    start = pSLL->edgelist;
-    while (start && (start->bres.minor_axis < ETE->bres.minor_axis)) 
-    {
-        prev = start;
-        start = start->next;
-    }
-    ETE->next = start;
-
-    if (prev)
-        prev->next = ETE;
-    else
-        pSLL->edgelist = ETE;
-}
-
-/*
- *     CreateEdgeTable
- *
- *     This routine creates the edge table for
- *     scan converting polygons. 
- *     The Edge Table (ET) looks like:
- *
- *    EdgeTable
- *     --------
- *    |  ymax  |        ScanLineLists
- *    |scanline|-->------------>-------------->...
- *     --------   |scanline|   |scanline|
- *                |edgelist|   |edgelist|
- *                ---------    ---------
- *                    |             |
- *                    |             |
- *                    V             V
- *              list of ETEs   list of ETEs
- *
- *     where ETE is an EdgeTableEntry data structure,
- *     and there is one ScanLineList per scanline at
- *     which an edge is initially entered.
- *
- */
-
-static void
-CreateETandAET(count, pts, ET, AET, pETEs, pSLLBlock)
-    register int count;
-    register XPoint *pts;
-    EdgeTable *ET;
-    EdgeTableEntry *AET;
-    register EdgeTableEntry *pETEs;
-    ScanLineListBlock   *pSLLBlock;
-{
-    register XPoint *top, *bottom;
-    register XPoint *PrevPt, *CurrPt;
-    int iSLLBlock = 0;
-    int dy;
-
-    if (count < 2)  return;
-
-    /*
-     *  initialize the Active Edge Table
-     */
-    AET->next = (EdgeTableEntry *)NULL;
-    AET->back = (EdgeTableEntry *)NULL;
-    AET->nextWETE = (EdgeTableEntry *)NULL;
-    AET->bres.minor_axis = SMALL_COORDINATE;
-
-    /*
-     *  initialize the Edge Table.
-     */
-    ET->scanlines.next = (ScanLineList *)NULL;
-    ET->ymax = SMALL_COORDINATE;
-    ET->ymin = LARGE_COORDINATE;
-    pSLLBlock->next = (ScanLineListBlock *)NULL;
-
-    PrevPt = &pts[count-1];
-
-    /*
-     *  for each vertex in the array of points.
-     *  In this loop we are dealing with two vertices at
-     *  a time -- these make up one edge of the polygon.
-     */
-    while (count--) 
-    {
-        CurrPt = pts++;
-
-        /*
-         *  find out which point is above and which is below.
-         */
-        if (PrevPt->y > CurrPt->y) 
-        {
-            bottom = PrevPt, top = CurrPt;
-            pETEs->ClockWise = 0;
-        }
-        else 
-        {
-            bottom = CurrPt, top = PrevPt;
-            pETEs->ClockWise = 1;
-        }
-
-        /*
-         * don't add horizontal edges to the Edge table.
-         */
-        if (bottom->y != top->y) 
-        {
-            pETEs->ymax = bottom->y-1;  /* -1 so we don't get last scanline */
-
-            /*
-             *  initialize integer edge algorithm
-             */
-            dy = bottom->y - top->y;
-            BRESINITPGONSTRUCT(dy, top->x, bottom->x, pETEs->bres);
-
-            InsertEdgeInET(ET, pETEs, top->y, &pSLLBlock, &iSLLBlock);
-
-	    if (PrevPt->y > ET->ymax)
-		ET->ymax = PrevPt->y;
-	    if (PrevPt->y < ET->ymin)
-		ET->ymin = PrevPt->y;
-            pETEs++;
-        }
-
-        PrevPt = CurrPt;
-    }
-}
-
-/*
- *     loadAET
- *
- *     This routine moves EdgeTableEntries from the
- *     EdgeTable into the Active Edge Table,
- *     leaving them sorted by smaller x coordinate.
- *
- */
-
-static void
-loadAET(AET, ETEs)
-    register EdgeTableEntry *AET, *ETEs;
-{
-    register EdgeTableEntry *pPrevAET;
-    register EdgeTableEntry *tmp;
-
-    pPrevAET = AET;
-    AET = AET->next;
-    while (ETEs) 
-    {
-        while (AET && (AET->bres.minor_axis < ETEs->bres.minor_axis)) 
-        {
-            pPrevAET = AET;
-            AET = AET->next;
-        }
-        tmp = ETEs->next;
-        ETEs->next = AET;
-        if (AET)
-            AET->back = ETEs;
-        ETEs->back = pPrevAET;
-        pPrevAET->next = ETEs;
-        pPrevAET = ETEs;
-
-        ETEs = tmp;
-    }
-}
-
-/*
- *     computeWAET
- *
- *     This routine links the AET by the
- *     nextWETE (winding EdgeTableEntry) link for
- *     use by the winding number rule.  The final 
- *     Active Edge Table (AET) might look something
- *     like:
- *
- *     AET
- *     ----------  ---------   ---------
- *     |ymax    |  |ymax    |  |ymax    | 
- *     | ...    |  |...     |  |...     |
- *     |next    |->|next    |->|next    |->...
- *     |nextWETE|  |nextWETE|  |nextWETE|
- *     ---------   ---------   ^--------
- *         |                   |       |
- *         V------------------->       V---> ...
- *
- */
-static void
-computeWAET(AET)
-    register EdgeTableEntry *AET;
-{
-    register EdgeTableEntry *pWETE;
-    register int inside = 1;
-    register int isInside = 0;
-
-    AET->nextWETE = (EdgeTableEntry *)NULL;
-    pWETE = AET;
-    AET = AET->next;
-    while (AET) 
-    {
-        if (AET->ClockWise)
-            isInside++;
-        else
-            isInside--;
-
-        if ((!inside && !isInside) ||
-            ( inside &&  isInside)) 
-        {
-            pWETE->nextWETE = AET;
-            pWETE = AET;
-            inside = !inside;
-        }
-        AET = AET->next;
-    }
-    pWETE->nextWETE = (EdgeTableEntry *)NULL;
-}
-
-/*
- *     InsertionSort
- *
- *     Just a simple insertion sort using
- *     pointers and back pointers to sort the Active
- *     Edge Table.
- *
- */
-
-static int
-InsertionSort(AET)
-    register EdgeTableEntry *AET;
-{
-    register EdgeTableEntry *pETEchase;
-    register EdgeTableEntry *pETEinsert;
-    register EdgeTableEntry *pETEchaseBackTMP;
-    register int changed = 0;
-
-    AET = AET->next;
-    while (AET) 
-    {
-        pETEinsert = AET;
-        pETEchase = AET;
-        while (pETEchase->back->bres.minor_axis > AET->bres.minor_axis)
-            pETEchase = pETEchase->back;
-
-        AET = AET->next;
-        if (pETEchase != pETEinsert) 
-        {
-            pETEchaseBackTMP = pETEchase->back;
-            pETEinsert->back->next = AET;
-            if (AET)
-                AET->back = pETEinsert->back;
-            pETEinsert->next = pETEchase;
-            pETEchase->back->next = pETEinsert;
-            pETEchase->back = pETEinsert;
-            pETEinsert->back = pETEchaseBackTMP;
-            changed = 1;
-        }
-    }
-    return(changed);
-}
-
-/*
- *     Clean up our act.
- */
-static void
-FreeStorage(pSLLBlock)
-    register ScanLineListBlock   *pSLLBlock;
-{
-    register ScanLineListBlock   *tmpSLLBlock;
-
-    while (pSLLBlock) 
-    {
-        tmpSLLBlock = pSLLBlock->next;
-        Xfree((char *)pSLLBlock);
-        pSLLBlock = tmpSLLBlock;
-    }
-}
-
-/*
- *     Create an array of rectangles from a list of points.
- *     If indeed these things (POINTS, RECTS) are the same,
- *     then this proc is still needed, because it allocates
- *     storage for the array, which was allocated on the
- *     stack by the calling procedure.
- *
- */
-static int PtsToRegion(numFullPtBlocks, iCurPtBlock, FirstPtBlock, reg)
-    register int  numFullPtBlocks, iCurPtBlock;
-    POINTBLOCK *FirstPtBlock;
-    REGION *reg;
-{
-    register BOX  *rects;
-    register XPoint *pts;
-    register POINTBLOCK *CurPtBlock;
-    register int i;
-    register BOX *extents;
-    register int numRects;
-    BOX *prevRects = reg->rects;
-
-    extents = &reg->extents;
- 
-    numRects = ((numFullPtBlocks * NUMPTSTOBUFFER) + iCurPtBlock) >> 1;
- 
-    if (!(reg->rects = (BOX *)Xrealloc((char *)reg->rects, 
-	    (unsigned) (sizeof(BOX) * numRects))))  {
-	Xfree(prevRects);
-	return(0);
-    }
- 
-    reg->size = numRects;
-    CurPtBlock = FirstPtBlock;
-    rects = reg->rects - 1;
-    numRects = 0;
-    extents->x1 = MAXSHORT,  extents->x2 = MINSHORT;
- 
-    for ( ; numFullPtBlocks >= 0; numFullPtBlocks--) {
-	/* the loop uses 2 points per iteration */
-	i = NUMPTSTOBUFFER >> 1;
-	if (!numFullPtBlocks)
-	    i = iCurPtBlock >> 1;
-	for (pts = CurPtBlock->pts; i--; pts += 2) {
-	    if (pts->x == pts[1].x)
-		continue;
-	    if (numRects && pts->x == rects->x1 && pts->y == rects->y2 &&
-		pts[1].x == rects->x2 &&
-		(numRects == 1 || rects[-1].y1 != rects->y1) &&
-		(i && pts[2].y > pts[1].y)) {
-		rects->y2 = pts[1].y + 1;
-		continue;
-	    }
-	    numRects++;
-	    rects++;
-	    rects->x1 = pts->x;  rects->y1 = pts->y;
-	    rects->x2 = pts[1].x;  rects->y2 = pts[1].y + 1;
-	    if (rects->x1 < extents->x1)
-		extents->x1 = rects->x1;
-	    if (rects->x2 > extents->x2)
-		extents->x2 = rects->x2;
-        }
-	CurPtBlock = CurPtBlock->next;
-    }
-
-    if (numRects) {
-	extents->y1 = reg->rects->y1;
-	extents->y2 = rects->y2;
-    } else {
-	extents->x1 = 0;
-	extents->y1 = 0;
-	extents->x2 = 0;
-	extents->y2 = 0;
-    }
-    reg->numRects = numRects;
- 
-    return(TRUE);
-}
-
-/*
- *     polytoregion
- *
- *     Scan converts a polygon by returning a run-length
- *     encoding of the resultant bitmap -- the run-length
- *     encoding is in the form of an array of rectangles.
- */
-Region 
-XPolygonRegion(Pts, Count, rule)
-    int       Count;                 /* number of pts           */
-    XPoint     *Pts;		     /* the pts                 */
-    int	rule;			     /* winding rule */
-{
-    Region region;
-    register EdgeTableEntry *pAET;   /* Active Edge Table       */
-    register int y;                  /* current scanline        */
-    register int iPts = 0;           /* number of pts in buffer */
-    register EdgeTableEntry *pWETE;  /* Winding Edge Table Entry*/
-    register ScanLineList *pSLL;     /* current scanLineList    */
-    register XPoint *pts;             /* output buffer           */
-    EdgeTableEntry *pPrevAET;        /* ptr to previous AET     */
-    EdgeTable ET;                    /* header node for ET      */
-    EdgeTableEntry AET;              /* header node for AET     */
-    EdgeTableEntry *pETEs;           /* EdgeTableEntries pool   */
-    ScanLineListBlock SLLBlock;      /* header for scanlinelist */
-    int fixWAET = FALSE;
-    POINTBLOCK FirstPtBlock, *curPtBlock; /* PtBlock buffers    */
-    POINTBLOCK *tmpPtBlock;
-    int numFullPtBlocks = 0;
- 
-    if (! (region = XCreateRegion())) return (Region) NULL;
-
-    /* special case a rectangle */
-    pts = Pts;
-    if (((Count == 4) ||
-	 ((Count == 5) && (pts[4].x == pts[0].x) && (pts[4].y == pts[0].y))) &&
-	(((pts[0].y == pts[1].y) &&
-	  (pts[1].x == pts[2].x) &&
-	  (pts[2].y == pts[3].y) &&
-	  (pts[3].x == pts[0].x)) ||
-	 ((pts[0].x == pts[1].x) &&
-	  (pts[1].y == pts[2].y) &&
-	  (pts[2].x == pts[3].x) &&
-	  (pts[3].y == pts[0].y)))) {
-	region->extents.x1 = min(pts[0].x, pts[2].x);
-	region->extents.y1 = min(pts[0].y, pts[2].y);
-	region->extents.x2 = max(pts[0].x, pts[2].x);
-	region->extents.y2 = max(pts[0].y, pts[2].y);
-	if ((region->extents.x1 != region->extents.x2) &&
-	    (region->extents.y1 != region->extents.y2)) {
-	    region->numRects = 1;
-	    *(region->rects) = region->extents;
-	}
-	return(region);
-    }
-
-    if (! (pETEs = (EdgeTableEntry *)
-	   Xmalloc((unsigned) (sizeof(EdgeTableEntry) * Count))))
-	return (Region) NULL;
-
-    pts = FirstPtBlock.pts;
-    CreateETandAET(Count, Pts, &ET, &AET, pETEs, &SLLBlock);
-    pSLL = ET.scanlines.next;
-    curPtBlock = &FirstPtBlock;
- 
-    if (rule == EvenOddRule) {
-        /*
-         *  for each scanline
-         */
-        for (y = ET.ymin; y < ET.ymax; y++) {
-            /*
-             *  Add a new edge to the active edge table when we
-             *  get to the next edge.
-             */
-            if (pSLL != NULL && y == pSLL->scanline) {
-                loadAET(&AET, pSLL->edgelist);
-                pSLL = pSLL->next;
-            }
-            pPrevAET = &AET;
-            pAET = AET.next;
- 
-            /*
-             *  for each active edge
-             */
-            while (pAET) {
-                pts->x = pAET->bres.minor_axis,  pts->y = y;
-                pts++, iPts++;
- 
-                /*
-                 *  send out the buffer
-                 */
-                if (iPts == NUMPTSTOBUFFER) {
-                    tmpPtBlock = (POINTBLOCK *)Xmalloc(sizeof(POINTBLOCK));
-                    curPtBlock->next = tmpPtBlock;
-                    curPtBlock = tmpPtBlock;
-                    pts = curPtBlock->pts;
-                    numFullPtBlocks++;
-                    iPts = 0;
-                }
-                EVALUATEEDGEEVENODD(pAET, pPrevAET, y);
-            }
-            (void) InsertionSort(&AET);
-        }
-    }
-    else {
-        /*
-         *  for each scanline
-         */
-        for (y = ET.ymin; y < ET.ymax; y++) {
-            /*
-             *  Add a new edge to the active edge table when we
-             *  get to the next edge.
-             */
-            if (pSLL != NULL && y == pSLL->scanline) {
-                loadAET(&AET, pSLL->edgelist);
-                computeWAET(&AET);
-                pSLL = pSLL->next;
-            }
-            pPrevAET = &AET;
-            pAET = AET.next;
-            pWETE = pAET;
- 
-            /*
-             *  for each active edge
-             */
-            while (pAET) {
-                /*
-                 *  add to the buffer only those edges that
-                 *  are in the Winding active edge table.
-                 */
-                if (pWETE == pAET) {
-                    pts->x = pAET->bres.minor_axis,  pts->y = y;
-                    pts++, iPts++;
- 
-                    /*
-                     *  send out the buffer
-                     */
-                    if (iPts == NUMPTSTOBUFFER) {
-                        tmpPtBlock = (POINTBLOCK *)Xmalloc(sizeof(POINTBLOCK));
-                        curPtBlock->next = tmpPtBlock;
-                        curPtBlock = tmpPtBlock;
-                        pts = curPtBlock->pts;
-                        numFullPtBlocks++;    iPts = 0;
-                    }
-                    pWETE = pWETE->nextWETE;
-                }
-                EVALUATEEDGEWINDING(pAET, pPrevAET, y, fixWAET);
-            }
- 
-            /*
-             *  recompute the winding active edge table if
-             *  we just resorted or have exited an edge.
-             */
-            if (InsertionSort(&AET) || fixWAET) {
-                computeWAET(&AET);
-                fixWAET = FALSE;
-            }
-        }
-    }
-    FreeStorage(SLLBlock.next);	
-    (void) PtsToRegion(numFullPtBlocks, iPts, &FirstPtBlock, region);
-    for (curPtBlock = FirstPtBlock.next; --numFullPtBlocks >= 0;) {
-	tmpPtBlock = curPtBlock->next;
-	Xfree((char *)curPtBlock);
-	curPtBlock = tmpPtBlock;
-    }
-    Xfree((char *)pETEs);
-    return(region);
-}
diff --git a/xc/lib/X11/PolyTxt.c b/xc/lib/X11/PolyTxt.c
deleted file mode 100644
index a9ef121ed..000000000
--- a/xc/lib/X11/PolyTxt.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/* $TOG: PolyTxt.c /main/15 1998/02/06 17:47:21 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/PolyTxt.c,v 3.3 1999/05/09 10:49:54 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XDrawText(dpy, d, gc, x, y, items, nitems)
-    register Display *dpy;
-    Drawable d;
-    GC gc;
-    int x, y;
-    XTextItem *items;
-    int nitems;
-{   
-    register int i;
-    register XTextItem *item;
-    int length = 0;
-    register xPolyText8Req *req;
-
-    LockDisplay(dpy);
-    FlushGC(dpy, gc);
-    GetReq (PolyText8, req);
-    req->drawable = d;
-    req->gc = gc->gid;
-    req->x = x;
-    req->y = y;
-
-    item = items;
-    for (i=0; i < nitems; i++) {
-	if (item->font)
-	    length += 5;  /* a 255 byte, plus size of Font id */
-        if (item->delta)
-        {
-	    if (item->delta > 0)
-	    {
-	      length += SIZEOF(xTextElt) * ((item->delta + 126) / 127);
-	    }
-            else
-            {
-   	      length += SIZEOF(xTextElt) * ((-item->delta + 127) / 128);
- 	    }
-        }
-	if (item->nchars > 0)
-	{
-	    length += SIZEOF(xTextElt) * ((item->nchars + 253) / 254 - 1);
-	    if (!item->delta) length += SIZEOF(xTextElt);
-	    length += item->nchars;
-     	}
-	item++;
-    }
-
-    req->length += (length + 3)>>2;  /* convert to number of 32-bit words */
-
-
-    /* 
-     * If the entire request does not fit into the remaining space in the
-     * buffer, flush the buffer first.   If the request does fit into the
-     * empty buffer, then we won't have to flush it at the end to keep
-     * the buffer 32-bit aligned. 
-     */
-
-    if (dpy->bufptr + length > dpy->bufmax)
-    	_XFlush (dpy);
-
-    item = items;
-    for (i=0; i< nitems; i++) {
-
-	if (item->font) {
-            /* to mark a font shift, write a 255 byte followed by
-	       the 4 bytes of font ID, big-end first */
-	    register unsigned char *f;
-	    BufAlloc (unsigned char *, f, 5);
-
-	    f[0] = 255;
-	    f[1] = (item->font & 0xff000000) >> 24;
-	    f[2] = (item->font & 0x00ff0000) >> 16;
-	    f[3] = (item->font & 0x0000ff00) >> 8;
-	    f[4] =  item->font & 0x000000ff;
-
-            /* update GC shadow */
-	    gc->values.font = item->font;
-	    }
-
-	{
-	    int nbytes = SIZEOF(xTextElt);
-	    int PartialNChars = item->nchars;
-	    int PartialDelta = item->delta;
-            /* register xTextElt *elt; */
-	    int FirstTimeThrough = True;
- 	    char *CharacterOffset = item->chars;
-            char *tbuf;
-
-	    while((PartialDelta < -128) || (PartialDelta > 127))
-            {
-	    	int nb = SIZEOF(xTextElt);
-
-	    	BufAlloc (char *, tbuf, nb); 
-	    	*tbuf = 0;    /*   elt->len  */
-	    	if (PartialDelta > 0 ) 
-		{
-		    *(tbuf+1) = 127;  /* elt->delta  */
-		    PartialDelta = PartialDelta - 127;
-		}
-		else
-		{
-		    /* -128 = 0x8, need to be careful of signed chars... */
-		    *((unsigned char *)(tbuf+1)) = 0x80;  /* elt->delta */
-		    PartialDelta = PartialDelta + 128;
-		}
-	    }
-	    if (PartialDelta)
-            {
-                BufAlloc (char *, tbuf , nbytes); 
-	        *tbuf = 0;      /* elt->len */
-		*(tbuf+1) = PartialDelta;    /* elt->delta  */
-	    }
-	    while(PartialNChars > 254)
-            {
-		nbytes = 254;
-	    	if (FirstTimeThrough)
-		{
-		    FirstTimeThrough = False;
-		    if (!item->delta)
- 		    { 
-			nbytes += SIZEOF(xTextElt);
-	   		BufAlloc (char *, tbuf, nbytes); 
-		        *(tbuf+1) = 0;     /* elt->delta */
-		    }
-		    else
-		    {
-			char *DummyChar;
-		        BufAlloc(char *, DummyChar, nbytes);
-		    }
-		}
-		else
-		{
- 		    nbytes += SIZEOF(xTextElt);
-	   	    BufAlloc (char *, tbuf, nbytes);
-		    *(tbuf+1) = 0;   /* elt->delta */
-		}
-		/* watch out for signs on chars */
-		*(unsigned char *)tbuf = 254;  /* elt->len */
-                memcpy (tbuf+2 , CharacterOffset, 254);
-		PartialNChars = PartialNChars - 254;
-		CharacterOffset += 254;
-
-	    }
-	    if (PartialNChars)
-            {
-		nbytes = PartialNChars;
-	    	if (FirstTimeThrough)
-		{
-		    FirstTimeThrough = False;
-		    if (!item->delta)
- 		    { 
-			nbytes += SIZEOF(xTextElt);
-	   		BufAlloc (char *, tbuf, nbytes); 
-			*(tbuf+1) = 0;   /*  elt->delta  */
-		    }
-		    else
-		    {
-			char *DummyChar;
-		        BufAlloc(char *, DummyChar, nbytes);
-		    }
-		}
-		else
-		{
- 		    nbytes += SIZEOF(xTextElt);
-	   	    BufAlloc (char *, tbuf, nbytes); 
-		    *(tbuf+1) = 0;   /* elt->delta  */
-		}
-	    	*tbuf = PartialNChars;   /*  elt->len  */
-                memcpy (tbuf+2 , CharacterOffset, PartialNChars);
-	    }
-	}
-    item++;
-    }
-
-    /* Pad request out to a 32-bit boundary */
-
-    if (length &= 3) {
-	char *pad;
-	/* 
-	 * BufAlloc is a macro that uses its last argument more than
-	 * once, otherwise I'd write "BufAlloc (char *, pad, 4-length)" 
-	 */
-	length = 4 - length;
-	BufAlloc (char *, pad, length);
-	/* 
-	 * if there are 3 bytes of padding, the first byte MUST be 0
-	 * so the pad bytes aren't mistaken for a final xTextElt 
-	 */
-	*pad = 0;
-        }
-
-    /* 
-     * If the buffer pointer is not now pointing to a 32-bit boundary,
-     * we must flush the buffer so that it does point to a 32-bit boundary
-     * at the end of this routine. 
-     */
-
-    if ((dpy->bufptr - dpy->buffer) & 3)
-       _XFlush (dpy);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 0;
-    }
diff --git a/xc/lib/X11/PolyTxt16.c b/xc/lib/X11/PolyTxt16.c
deleted file mode 100644
index 2bff5cbb0..000000000
--- a/xc/lib/X11/PolyTxt16.c
+++ /dev/null
@@ -1,262 +0,0 @@
-/* $TOG: PolyTxt16.c /main/14 1998/02/06 17:47:14 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/PolyTxt16.c,v 1.2 1999/05/09 10:49:54 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XDrawText16(dpy, d, gc, x, y, items, nitems)
-    register Display *dpy;
-    Drawable d;
-    GC gc;
-    int x, y;
-    XTextItem16 *items;
-    int nitems;
-{   
-    register int i;
-    register XTextItem16 *item;
-    int length = 0;
-    register xPolyText16Req *req;
-
-    LockDisplay(dpy);
-    FlushGC(dpy, gc);
-    GetReq (PolyText16, req);
-    req->drawable = d;
-    req->gc = gc->gid;
-    req->x = x;
-    req->y = y;
-
-    item = items;
-    for (i=0; i < nitems; i++) {
-	if (item->font)
-	    length += 5;  /* a 255 byte, plus size of Font id */
-        if (item->delta)
-        {
-	    if (item->delta > 0)
-	    {
-	      length += SIZEOF(xTextElt) * ((item->delta + 126) / 127);
-	    }
-            else
-            {
-   	      length += SIZEOF(xTextElt) * ((-item->delta + 127) / 128);
- 	    }
-        }
-	if (item->nchars > 0)
-	{
-	    length += SIZEOF(xTextElt) * ((item->nchars + 253) / 254 - 1);
-	    if (!item->delta) length += SIZEOF(xTextElt);
-	    length += item->nchars << 1;
-     	}
-	item++;
-    }
-
-    req->length += (length + 3)>>2;  /* convert to number of 32-bit words */
-
-
-    /*
-     * If the entire request does not fit into the remaining space in the
-     * buffer, flush the buffer first.   If the request does fit into the
-     * empty buffer, then we won't have to flush it at the end to keep
-     *  the buffer 32-bit aligned. 
-     */
-
-    if (dpy->bufptr + length > dpy->bufmax)
-    	_XFlush (dpy);
-
-    item = items;
-    for (i=0; i< nitems; i++) {
-
-	if (item->font) {
-            /* to mark a font shift, write a 255 byte followed by
-	       the 4 bytes of font ID, big-end first */
-	    register unsigned char *f;
-	    BufAlloc (unsigned char *, f, 5);
-
-	    f[0] = 255;
-	    f[1] = (item->font & 0xff000000) >> 24;
-	    f[2] = (item->font & 0x00ff0000) >> 16;
-	    f[3] = (item->font & 0x0000ff00) >> 8;
-	    f[4] =  item->font & 0x000000ff;
-
-            /* update GC shadow */
-	    gc->values.font = item->font;
-	    }
-
-	{
-	    int nbytes = SIZEOF(xTextElt);
-	    int PartialNChars = item->nchars;
-	    int PartialDelta = item->delta;
-            register xTextElt *elt;
-	    int FirstTimeThrough = True;
- 	    XChar2b *CharacterOffset = item->chars;
-
-	    while((PartialDelta < -128) || (PartialDelta > 127))
-            {
-	    	int nb = SIZEOF(xTextElt);
-
-	    	BufAlloc (xTextElt *, elt, nb); 
-	    	elt->len = 0;
-	    	if (PartialDelta > 0 ) 
-		{
-		    elt->delta = 127;
-		    PartialDelta = PartialDelta - 127;
-		}
-		else
-		{
-		    elt->delta = -128;
-		    PartialDelta = PartialDelta + 128;
-		}
-	    }
-	    if (PartialDelta)
-            {
-                BufAlloc (xTextElt *, elt, nbytes); 
-	        elt->len = 0;
-		elt->delta = PartialDelta;
-	    }
-	    while(PartialNChars > 254)
-            {
-		nbytes = 254 * 2;
-	    	if (FirstTimeThrough)
-		{
-		    FirstTimeThrough = False;
-		    if (!item->delta)
- 		    { 
-			nbytes += SIZEOF(xTextElt);
-	   		BufAlloc (xTextElt *, elt, nbytes); 
-		        elt->delta = 0;
-		    }
-		    else
-		    {
-			char *DummyChar;
-		        BufAlloc(char *, DummyChar, nbytes);
-#ifdef lint
-			DummyChar = DummyChar;
-#endif
-		    }
-		}
-		else
-		{
- 		    nbytes += SIZEOF(xTextElt);
-	   	    BufAlloc (xTextElt *, elt, nbytes);
-		    elt->delta = 0;
-		}
-	    	elt->len = 254;
-
-#if defined(MUSTCOPY) || defined(MUSTCOPY2B)
-		{
-		    register int i;
-		    register unsigned char *cp;
-		    for (i = 0, cp = ((unsigned char *)elt) + 2; i < 254; i++) {
-			*cp++ = CharacterOffset[i].byte1;
-			*cp++ = CharacterOffset[i].byte2;
-		    }
-		}
-#else
-		memcpy ((char *) (elt + 1), (char *)CharacterOffset, 254 * 2);
-#endif
-		PartialNChars = PartialNChars - 254;
-		CharacterOffset += 254;
-
-	    }
-	    if (PartialNChars)
-            {
-		nbytes = PartialNChars * 2;
-	    	if (FirstTimeThrough)
-		{
-		    FirstTimeThrough = False;
-		    if (!item->delta)
- 		    { 
-			nbytes += SIZEOF(xTextElt);
-	   		BufAlloc (xTextElt *, elt, nbytes); 
-			elt->delta = 0;
-		    }
-		    else
-		    {
-			char *DummyChar;
-		        BufAlloc(char *, DummyChar, nbytes);
-#ifdef lint
-			DummyChar = DummyChar;
-#endif
-		    }
-		}
-		else
-		{
- 		    nbytes += SIZEOF(xTextElt);
-	   	    BufAlloc (xTextElt *, elt, nbytes); 
-		    elt->delta = 0;
-		}
-	    	elt->len = PartialNChars;
-
-#if defined(MUSTCOPY) || defined(MUSTCOPY2B)
-		{
-		    register int i;
-		    register unsigned char *cp;
-		    for (i = 0, cp = ((unsigned char *)elt) + 2; i < PartialNChars;
-			 i++) {
-			*cp++ = CharacterOffset[i].byte1;
-			*cp++ = CharacterOffset[i].byte2;
-		    }
-		}
-#else
-		memcpy ((char *) (elt + 1), (char *)CharacterOffset,
-			PartialNChars *
-2);
-#endif
-	    }
-	}
-    item++;
-    }
-
-    /* Pad request out to a 32-bit boundary */
-
-    if (length &= 3) {
-	char *pad;
-	/*
-	 * BufAlloc is a macro that uses its last argument more than
-	 * once, otherwise I'd write "BufAlloc (char *, pad, 4-length)" 
-	 */
-	length = 4 - length;
-	BufAlloc (char *, pad, length);
-	/* 
-	 * if there are 3 bytes of padding, the first byte MUST be 0
-	 * so the pad bytes aren't mistaken for a final xTextElt 
-	 */
-	*pad = 0;
-        }
-
-    /* 
-     * If the buffer pointer is not now pointing to a 32-bit boundary,
-     * we must flush the buffer so that it does point to a 32-bit boundary
-     * at the end of this routine. 
-     */
-
-    if ((dpy->bufptr - dpy->buffer) & 3)
-       _XFlush (dpy);
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-    }
-
-
-
diff --git a/xc/lib/X11/PrOfId.c b/xc/lib/X11/PrOfId.c
deleted file mode 100644
index 07d3d1035..000000000
--- a/xc/lib/X11/PrOfId.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* $XConsortium: PrOfId.c,v 1.5 91/05/13 23:26:56 rws Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		XcmsPrOfId.c
- *
- *	DESCRIPTION
- *		Source for XcmsPrefixOfFormat()
- *
- *
- */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/*
- *      EXTERNS
- */
-extern XcmsColorSpace **_XcmsDIColorSpaces;
-extern XcmsColorSpace **_XcmsDDColorSpaces;
-
-
-/*
- *	NAME
- *		XcmsPrefixOfId
- *
- *	SYNOPSIS
- */
-char *
-XcmsPrefixOfFormat(id)
-    XcmsColorFormat	id;
-/*
- *	DESCRIPTION
- *		Returns the color space prefix for the specified color
- *		space ID if the color space is found in the Color
- *		Conversion Context.
- *
- *	RETURNS
- *		Returns a color space prefix.
- *
- *	CAVEATS
- *		Space is allocated for the returned string, therefore,
- *		the application is responsible for freeing (using XFree)
- *		the space.
- *
- */
-{
-    XcmsColorSpace	**papColorSpaces;
-    char *prefix;
-
-    /*
-     * First try Device-Independent color spaces
-     */
-    papColorSpaces = _XcmsDIColorSpaces;
-    if (papColorSpaces != NULL) {
-	while (*papColorSpaces != NULL) {
-	    if ((*papColorSpaces)->id == id) {
-		prefix = (char *)Xmalloc((strlen((*papColorSpaces)->prefix) +
-		1) * sizeof(char));
-		strcpy(prefix, (*papColorSpaces)->prefix);
-		return(prefix);
-	    }
-	    papColorSpaces++;
-	}
-    }
-
-    /*
-     * Next try Device-Dependent color spaces
-     */
-    papColorSpaces = _XcmsDDColorSpaces;
-    if (papColorSpaces != NULL) {
-	while (*papColorSpaces != NULL) {
-	    if ((*papColorSpaces)->id == id) {
-		prefix = (char *)Xmalloc((strlen((*papColorSpaces)->prefix) +
-		1) * sizeof(char));
-		strcpy(prefix, (*papColorSpaces)->prefix);
-		return(prefix);
-	    }
-	    papColorSpaces++;
-	}
-    }
-
-    return(NULL);
-}
diff --git a/xc/lib/X11/PropAlloc.c b/xc/lib/X11/PropAlloc.c
deleted file mode 100644
index 2c20ebe72..000000000
--- a/xc/lib/X11/PropAlloc.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* $TOG: PropAlloc.c /main/7 1998/02/06 17:47:38 kaleb $ */
-/*
-
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/PropAlloc.c,v 1.2 1999/05/09 10:49:55 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xutil.h"
-#include <stdio.h>
-
-
-/*
- * Routines for allocating space for structures that are expected to get 
- * longer at some point.
- */
-
-XSizeHints *XAllocSizeHints ()
-{
-    return ((XSizeHints *) Xcalloc (1, (unsigned) sizeof (XSizeHints)));
-}
-
-
-XStandardColormap *XAllocStandardColormap ()
-{
-    return ((XStandardColormap *)
-	    Xcalloc (1, (unsigned) sizeof (XStandardColormap)));
-}
-
-
-XWMHints *XAllocWMHints ()
-{
-    return ((XWMHints *) Xcalloc (1, (unsigned) sizeof (XWMHints)));
-}
-
-
-XClassHint *XAllocClassHint ()
-{
-    register XClassHint *h;
-
-    if ((h = (XClassHint *) Xcalloc (1, (unsigned) sizeof (XClassHint))))
-      h->res_name = h->res_class = NULL;
-
-    return h;
-}
-
-
-XIconSize *XAllocIconSize ()
-{
-    return ((XIconSize *) Xcalloc (1, (unsigned) sizeof (XIconSize)));
-}
-
-
diff --git a/xc/lib/X11/PutBEvent.c b/xc/lib/X11/PutBEvent.c
deleted file mode 100644
index d7f360082..000000000
--- a/xc/lib/X11/PutBEvent.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* $TOG: PutBEvent.c /main/8 1998/02/06 17:47:43 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/PutBEvent.c,v 1.2 1999/05/09 10:49:55 dawes Exp $ */
-
-/* XPutBackEvent puts an event back at the head of the queue. */
-#define NEED_EVENTS
-#include "Xlibint.h"
-
-int
-XPutBackEvent (dpy, event)
-	register Display *dpy;
-	register XEvent *event;
-	{
-	register _XQEvent *qelt;
-
-	LockDisplay(dpy);
-	if (!dpy->qfree) {
-    	    if ((dpy->qfree = (_XQEvent *) Xmalloc (sizeof (_XQEvent))) == NULL) {
-		UnlockDisplay(dpy);
-		return 0;
-	    }
-	    dpy->qfree->next = NULL;
-	}
-	qelt = dpy->qfree;
-	dpy->qfree = qelt->next;
-	qelt->qserial_num = dpy->next_event_serial_num++;
-	qelt->next = dpy->head;
-	qelt->event = *event;
-	dpy->head = qelt;
-	if (dpy->tail == NULL)
-	    dpy->tail = qelt;
-	dpy->qlen++;
-	UnlockDisplay(dpy);
-	return 0;
-	}
diff --git a/xc/lib/X11/PutImage.c b/xc/lib/X11/PutImage.c
deleted file mode 100644
index 597d28c36..000000000
--- a/xc/lib/X11/PutImage.c
+++ /dev/null
@@ -1,1000 +0,0 @@
-/* $TOG: PutImage.c /main/44 1998/02/06 17:47:49 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/PutImage.c,v 3.5 1999/05/09 10:49:56 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xutil.h"
-#include <stdio.h>
-
-#ifdef __STDC__
-#define Const const
-#else
-#define Const /**/
-#endif
-#if defined(__STDC__) && ((defined(sun) && defined(SVR4)) || defined(WIN32))
-#define RConst /**/
-#else
-#define RConst Const
-#endif
-
-#if defined(Lynx) && defined(ROUNDUP)
-#undef ROUNDUP
-#endif
-
-/* assumes pad is a power of 2 */
-#define ROUNDUP(nbytes, pad) (((nbytes) + ((pad) - 1)) & ~(long)((pad) - 1))
-
-static unsigned char Const _reverse_byte[0x100] = {
-	0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
-	0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
-	0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
-	0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
-	0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
-	0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
-	0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
-	0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
-	0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
-	0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
-	0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
-	0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
-	0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
-	0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
-	0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
-	0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
-	0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
-	0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
-	0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
-	0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
-	0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
-	0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
-	0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
-	0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
-	0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
-	0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
-	0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
-	0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
-	0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
-	0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
-	0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
-	0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff
-};
-
-static unsigned char Const _reverse_nibs[0x100] = {
-	0x00, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70,
-	0x80, 0x90, 0xa0, 0xb0, 0xc0, 0xd0, 0xe0, 0xf0,
-	0x01, 0x11, 0x21, 0x31, 0x41, 0x51, 0x61, 0x71,
-	0x81, 0x91, 0xa1, 0xb1, 0xc1, 0xd1, 0xe1, 0xf1,
-	0x02, 0x12, 0x22, 0x32, 0x42, 0x52, 0x62, 0x72,
-	0x82, 0x92, 0xa2, 0xb2, 0xc2, 0xd2, 0xe2, 0xf2,
-	0x03, 0x13, 0x23, 0x33, 0x43, 0x53, 0x63, 0x73,
-	0x83, 0x93, 0xa3, 0xb3, 0xc3, 0xd3, 0xe3, 0xf3,
-	0x04, 0x14, 0x24, 0x34, 0x44, 0x54, 0x64, 0x74,
-	0x84, 0x94, 0xa4, 0xb4, 0xc4, 0xd4, 0xe4, 0xf4,
-	0x05, 0x15, 0x25, 0x35, 0x45, 0x55, 0x65, 0x75,
-	0x85, 0x95, 0xa5, 0xb5, 0xc5, 0xd5, 0xe5, 0xf5,
-	0x06, 0x16, 0x26, 0x36, 0x46, 0x56, 0x66, 0x76,
-	0x86, 0x96, 0xa6, 0xb6, 0xc6, 0xd6, 0xe6, 0xf6,
-	0x07, 0x17, 0x27, 0x37, 0x47, 0x57, 0x67, 0x77,
-	0x87, 0x97, 0xa7, 0xb7, 0xc7, 0xd7, 0xe7, 0xf7,
-	0x08, 0x18, 0x28, 0x38, 0x48, 0x58, 0x68, 0x78,
-	0x88, 0x98, 0xa8, 0xb8, 0xc8, 0xd8, 0xe8, 0xf8,
-	0x09, 0x19, 0x29, 0x39, 0x49, 0x59, 0x69, 0x79,
-	0x89, 0x99, 0xa9, 0xb9, 0xc9, 0xd9, 0xe9, 0xf9,
-	0x0a, 0x1a, 0x2a, 0x3a, 0x4a, 0x5a, 0x6a, 0x7a,
-	0x8a, 0x9a, 0xaa, 0xba, 0xca, 0xda, 0xea, 0xfa,
-	0x0b, 0x1b, 0x2b, 0x3b, 0x4b, 0x5b, 0x6b, 0x7b,
-	0x8b, 0x9b, 0xab, 0xbb, 0xcb, 0xdb, 0xeb, 0xfb,
-	0x0c, 0x1c, 0x2c, 0x3c, 0x4c, 0x5c, 0x6c, 0x7c,
-	0x8c, 0x9c, 0xac, 0xbc, 0xcc, 0xdc, 0xec, 0xfc,
-	0x0d, 0x1d, 0x2d, 0x3d, 0x4d, 0x5d, 0x6d, 0x7d,
-	0x8d, 0x9d, 0xad, 0xbd, 0xcd, 0xdd, 0xed, 0xfd,
-	0x0e, 0x1e, 0x2e, 0x3e, 0x4e, 0x5e, 0x6e, 0x7e,
-	0x8e, 0x9e, 0xae, 0xbe, 0xce, 0xde, 0xee, 0xfe,
-	0x0f, 0x1f, 0x2f, 0x3f, 0x4f, 0x5f, 0x6f, 0x7f,
-	0x8f, 0x9f, 0xaf, 0xbf, 0xcf, 0xdf, 0xef, 0xff
-};
-
-int
-_XReverse_Bytes (bpt, nb)
-    register unsigned char *bpt;
-    register int nb;
-{
-    do {
-	*bpt = _reverse_byte[*bpt];
-	bpt++;
-    } while (--nb > 0);
-    return 0;
-}
-
-
-/* XXX the following functions are declared int instead of void because various
- * compilers and lints complain about later initialization of SwapFunc and/or
- * (swapfunc == NoSwap) when void is used.
- */
-
-/*ARGSUSED*/
-static void
-NoSwap (src, dest, srclen, srcinc, destinc, height, half_order)
-    register unsigned char *src, *dest;
-    long srclen, srcinc, destinc;
-    unsigned int height;
-    int half_order;
-{
-    long h = height;
-
-    if (srcinc == destinc)
-	memcpy((char *)dest, (char *)src, (int)(srcinc * (h - 1) + srclen));
-    else
-	for (; --h >= 0; src += srcinc, dest += destinc)
-	    memcpy((char *)dest, (char *)src, (int)srclen);
-}
-
-static void
-SwapTwoBytes (src, dest, srclen, srcinc, destinc, height, half_order)
-    register unsigned char *src, *dest;
-    long srclen, srcinc, destinc;
-    unsigned int height;
-    int half_order;
-{
-    long length = ROUNDUP(srclen, 2);
-    register long h, n;
-
-    srcinc -= length;
-    destinc -= length;
-    for (h = height; --h >= 0; src += srcinc, dest += destinc) {
-	if ((h == 0) && (srclen != length)) {
-	    length -= 2;
-	    if (half_order == MSBFirst)
-		*(dest + length) = *(src + length + 1);
-	    else
-		*(dest + length + 1) = *(src + length);
-	}
-	for (n = length; n > 0; n -= 2, src += 2) {
-	    *dest++ = *(src + 1);
-	    *dest++ = *src;
-	}
-    }
-}
-
-static void
-SwapThreeBytes (src, dest, srclen, srcinc, destinc, height, byte_order)
-    register unsigned char *src, *dest;
-    long srclen, srcinc, destinc;
-    unsigned int height;
-    int byte_order;
-{
-    long length = ((srclen + 2) / 3) * 3;
-    register long h, n;
-
-    srcinc -= length;
-    destinc -= length;
-    for (h = height; --h >= 0; src += srcinc, dest += destinc) {
-	if ((h == 0) && (srclen != length)) {
-	    length -= 3;
-	    if ((srclen - length) == 2)
-		*(dest + length + 1) = *(src + length + 1);
-	    if (byte_order == MSBFirst)
-		*(dest + length) = *(src + length + 2);
-	    else
-		*(dest + length + 2) = *(src + length);
-	}
-	for (n = length; n > 0; n -= 3, src += 3) {
-	    *dest++ = *(src + 2);
-	    *dest++ = *(src + 1);
-	    *dest++ = *src;
-	}
-    }
-}
-
-static void
-SwapFourBytes (src, dest, srclen, srcinc, destinc, height, half_order)
-    register unsigned char *src, *dest;
-    long srclen, srcinc, destinc;
-    unsigned int height;
-    int half_order;
-{
-    long length = ROUNDUP(srclen, 4);
-    register long h, n;
-
-    srcinc -= length;
-    destinc -= length;
-    for (h = height; --h >= 0; src += srcinc, dest += destinc) {
-	if ((h == 0) && (srclen != length)) {
-	    length -= 4;
-	    if (half_order == MSBFirst)
-		*(dest + length) = *(src + length + 3);
-	    if (((half_order == LSBFirst) && ((srclen - length) == 3)) ||
-		((half_order == MSBFirst) && (srclen & 2)))
-		*(dest + length + 1) = *(src + length + 2);
-	    if (((half_order == MSBFirst) && ((srclen - length) == 3)) ||
-		((half_order == LSBFirst) && (srclen & 2)))
-		*(dest + length + 2) = *(src + length + 1);
-	    if (half_order == LSBFirst)
-		*(dest + length + 3) = *(src + length);
-	}
-	for (n = length; n > 0; n -= 4, src += 4) {
-	    *dest++ = *(src + 3);
-	    *dest++ = *(src + 2);
-	    *dest++ = *(src + 1);
-	    *dest++ = *src;
-	}
-    }
-}
-
-static void
-SwapWords (src, dest, srclen, srcinc, destinc, height, half_order)
-    register unsigned char *src, *dest;
-    long srclen, srcinc, destinc;
-    unsigned int height;
-    int half_order;
-{
-    long length = ROUNDUP(srclen, 4);
-    register long h, n;
-
-    srcinc -= length;
-    destinc -= length;
-    for (h = height; --h >= 0; src += srcinc, dest += destinc) {
-	if ((h == 0) && (srclen != length)) {
-	    length -= 4;
-	    if (half_order == MSBFirst)
-		*(dest + length + 1) = *(src + length + 3);
-	    if (((half_order == LSBFirst) && ((srclen - length) == 3)) ||
-		((half_order == MSBFirst) && (srclen & 2)))
-		*(dest + length) = *(src + length + 2);
-	    if (((half_order == MSBFirst) && ((srclen - length) == 3)) ||
-		((half_order == LSBFirst) && (srclen & 2)))
-		*(dest + length + 3) = *(src + length + 1);
-	    if (half_order == LSBFirst)
-		*(dest + length + 2) = *(src + length);
-	}
-	for (n = length; n > 0; n -= 4, src += 2) {
-	    *dest++ = *(src + 2);
-	    *dest++ = *(src + 3);
-	    *dest++ = *src++;
-	    *dest++ = *src++;
-	}
-    }
-}
-
-static void
-SwapNibbles (src, dest, srclen, srcinc, destinc, height)
-    register unsigned char *src, *dest;
-    long srclen, srcinc, destinc;
-    unsigned int height;
-{
-    register long h, n;
-    register Const unsigned char *rev = _reverse_nibs;
-
-    srcinc -= srclen;
-    destinc -= srclen;
-    for (h = height; --h >= 0; src += srcinc, dest += destinc)
-	for (n = srclen; --n >= 0; )
-	    *dest++ = rev[*src++];
-}
-
-static void
-ShiftNibblesLeft (src, dest, srclen, srcinc, destinc, height, nibble_order)
-    register unsigned char *src, *dest;
-    long srclen, srcinc, destinc;
-    unsigned int height;
-    int nibble_order;
-{
-    register long h, n;
-    register unsigned char c1, c2;
-
-    srcinc -= srclen;
-    destinc -= srclen;
-    if (nibble_order == MSBFirst) {
-	for (h = height; --h >= 0; src += srcinc, dest += destinc)
-	    for (n = srclen; --n >= 0; ) {
-		c1 = *src++;
-		c2 = *src;
-		*dest++ = ((c1 & 0x0f) << 4) | ((c2 & (unsigned)0xf0) >> 4);
-	    }
-    } else {
-	for (h = height; --h >= 0; src += srcinc, dest += destinc)
-	    for (n = srclen; --n >= 0; ) {
-		c1 = *src++;
-		c2 = *src;
-		*dest++ = ((c2 & 0x0f) << 4) | ((c1 & (unsigned)0xf0) >> 4);
-	    }
-    }
-}
-
-/*ARGSUSED*/
-static void
-SwapBits (src, dest, srclen, srcinc, destinc, height, half_order)
-    register unsigned char *src, *dest;
-    long srclen, srcinc, destinc;
-    unsigned int height;
-    int half_order;
-{
-    register long h, n;
-    register Const unsigned char *rev = _reverse_byte;
-
-    srcinc -= srclen;
-    destinc -= srclen;
-    for (h = height; --h >= 0; src += srcinc, dest += destinc)
-	for (n = srclen; --n >= 0; )
-	    *dest++ = rev[*src++];
-}
-
-static void
-SwapBitsAndTwoBytes (src, dest, srclen, srcinc, destinc, height, half_order)
-    register unsigned char *src, *dest;
-    long srclen, srcinc, destinc;
-    unsigned int height;
-{
-    long length = ROUNDUP(srclen, 2);
-    register long h, n;
-    register Const unsigned char *rev = _reverse_byte;
-
-    srcinc -= length;
-    destinc -= length;
-    for (h = height; --h >= 0; src += srcinc, dest += destinc) {
-	if ((h == 0) && (srclen != length)) {
-	    length -= 2;
-	    if (half_order == MSBFirst)
-		*(dest + length) = rev[*(src + length + 1)];
-	    else
-		*(dest + length + 1) = rev[*(src + length)];
-	}
-	for (n = length; n > 0; n -= 2, src += 2) {
-	    *dest++ = rev[*(src + 1)];
-	    *dest++ = rev[*src];
-	}
-    }
-}
-
-static void
-SwapBitsAndFourBytes (src, dest, srclen, srcinc, destinc, height, half_order)
-    register unsigned char *src, *dest;
-    long srclen, srcinc, destinc;
-    unsigned int height;
-    int half_order;
-{
-    long length = ROUNDUP(srclen, 4);
-    register long h, n;
-    register Const unsigned char *rev = _reverse_byte;
-
-    srcinc -= length;
-    destinc -= length;
-    for (h = height; --h >= 0; src += srcinc, dest += destinc) {
-	if ((h == 0) && (srclen != length)) {
-	    length -= 4;
-	    if (half_order == MSBFirst)
-		*(dest + length) = rev[*(src + length + 3)];
-	    if (((half_order == LSBFirst) && ((srclen - length) == 3)) ||
-		((half_order == MSBFirst) && (srclen & 2)))
-		*(dest + length + 1) = rev[*(src + length + 2)];
-	    if (((half_order == MSBFirst) && ((srclen - length) == 3)) ||
-		((half_order == LSBFirst) && (srclen & 2)))
-		*(dest + length + 2) = rev[*(src + length + 1)];
-	    if (half_order == LSBFirst)
-		*(dest + length + 3) = rev[*(src + length)];
-	}
-	for (n = length; n > 0; n -= 4, src += 4) {
-	    *dest++ = rev[*(src + 3)];
-	    *dest++ = rev[*(src + 2)];
-	    *dest++ = rev[*(src + 1)];
-	    *dest++ = rev[*src];
-	}
-    }
-}
-
-static void
-SwapBitsAndWords (src, dest, srclen, srcinc, destinc, height, half_order)
-    register unsigned char *src, *dest;
-    long srclen, srcinc, destinc;
-    unsigned int height;
-    int half_order;
-{
-    long length = ROUNDUP(srclen, 4);
-    register long h, n;
-    register Const unsigned char *rev = _reverse_byte;
-
-    srcinc -= length;
-    destinc -= length;
-    for (h = height; --h >= 0; src += srcinc, dest += destinc) {
-	if ((h == 0) && (srclen != length)) {
-	    length -= 4;
-	    if (half_order == MSBFirst)
-		*(dest + length + 1) = rev[*(src + length + 3)];
-	    if (((half_order == LSBFirst) && ((srclen - length) == 3)) ||
-		((half_order == MSBFirst) && (srclen & 2)))
-		*(dest + length) = rev[*(src + length + 2)];
-	    if (((half_order == MSBFirst) && ((srclen - length) == 3)) ||
-		((half_order == LSBFirst) && (srclen & 2)))
-		*(dest + length + 3) = rev[*(src + length + 1)];
-	    if (half_order == LSBFirst)
-		*(dest + length + 2) = rev[*(src + length)];
-	}
-	for (n = length; n > 0; n -= 4, src += 2) {
-	    *dest++ = rev[*(src + 2)];
-	    *dest++ = rev[*(src + 3)];
-	    *dest++ = rev[*src++];
-	    *dest++ = rev[*src++];
-	}
-    }
-}
-
-/*
-
-The following table gives the bit ordering within bytes (when accessed
-sequentially) for a scanline containing 32 bits, with bits numbered 0 to
-31, where bit 0 should be leftmost on the display.  For a given byte
-labelled A-B, A is for the most significant bit of the byte, and B is
-for the least significant bit.
-
-legend:
-	1   scanline-unit = 8
-	2   scanline-unit = 16
-	4   scanline-unit = 32
-	M   byte-order = MostSignificant
-	L   byte-order = LeastSignificant
-	m   bit-order = MostSignificant
-	l   bit-order = LeastSignificant
-
-
-format	ordering
-
-1Mm	00-07 08-15 16-23 24-31
-2Mm	00-07 08-15 16-23 24-31
-4Mm	00-07 08-15 16-23 24-31
-1Ml	07-00 15-08 23-16 31-24
-2Ml	15-08 07-00 31-24 23-16
-4Ml	31-24 23-16 15-08 07-00
-1Lm	00-07 08-15 16-23 24-31
-2Lm	08-15 00-07 24-31 16-23
-4Lm	24-31 16-23 08-15 00-07
-1Ll	07-00 15-08 23-16 31-24
-2Ll	07-00 15-08 23-16 31-24
-4Ll	07-00 15-08 23-16 31-24
-
-
-The following table gives the required conversion between any two
-formats.  It is based strictly on the table above.  If you believe one,
-you should believe the other.
-
-legend:
-	n   no changes
-	s   reverse 8-bit units within 16-bit units
-	l   reverse 8-bit units within 32-bit units
-	w   reverse 16-bit units within 32-bit units
-	R   reverse bits within 8-bit units
-	S   s+R
-	L   l+R
-	W   w+R
-
-*/
-
-static void (* RConst (SwapFunction[12][12]))() = {
-#define n NoSwap,
-#define s SwapTwoBytes,
-#define l SwapFourBytes,
-#define w SwapWords,
-#define R SwapBits,
-#define S SwapBitsAndTwoBytes,
-#define L SwapBitsAndFourBytes,
-#define W SwapBitsAndWords,
-
-/*         1Mm 2Mm 4Mm 1Ml 2Ml 4Ml 1Lm 2Lm 4Lm 1Ll 2Ll 4Ll   */
-/* 1Mm */ { n   n   n   R   S   L   n   s   l   R   R   R },
-/* 2Mm */ { n   n   n   R   S   L   n   s   l   R   R   R },
-/* 4Mm */ { n   n   n   R   S   L   n   s   l   R   R   R },
-/* 1Ml */ { R   R   R   n   s   l   R   S   L   n   n   n },
-/* 2Ml */ { S   S   S   s   n   w   S   R   W   s   s   s },
-/* 4Ml */ { L   L   L   l   w   n   L   W   R   l   l   l },
-/* 1Lm */ { n   n   n   R   S   L   n   s   l   R   R   R },
-/* 2Lm */ { s   s   s   S   R   W   s   n   w   S   S   S },
-/* 4Lm */ { l   l   l   L   W   R   l   w   n   L   L   L },
-/* 1Ll */ { R   R   R   n   s   l   R   S   L   n   n   n },
-/* 2Ll */ { R   R   R   n   s   l   R   S   L   n   n   n },
-/* 4Ll */ { R   R   R   n   s   l   R   S   L   n   n   n }
-
-#undef n
-#undef s
-#undef l
-#undef w
-#undef R
-#undef S
-#undef L
-#undef W
-
-};
-
-/* Of course, the table above is a lie.  We also need to factor in the
- * order of the source data to cope with swapping half of a unit at the
- * end of a scanline, since we are trying to avoid de-ref'ing off the
- * end of the source.
- *
- * Defines whether the first half of a unit has the first half of the data
- */
-static int Const HalfOrder[12] = {
-	LSBFirst, /* 1Mm */
-	LSBFirst, /* 2Mm */
-	LSBFirst, /* 4Mm */
-	LSBFirst, /* 1Ml */
-	MSBFirst, /* 2Ml */
-	MSBFirst, /* 4Ml */
-	LSBFirst, /* 1Lm */
-	MSBFirst, /* 2Lm */
-	MSBFirst, /* 4Lm */
-	LSBFirst, /* 1Ll */
-	LSBFirst, /* 2Ll */
-	LSBFirst  /* 4Ll */
-	};
-
-/* Finally, for SwapWords cases, the half order depends not just on the source
- * but also on the destination scanline unit.  Use of this table changes some
- * MSBFirsts to LSBFirsts that are "do not care" (because the function will be
- * NoSwap or SwapBits) in addition to changing the desired ones.
- */
-
-static int Const HalfOrderWord[12] = {
-	MSBFirst, /* 1Mm */
-	MSBFirst, /* 2Mm */
-	MSBFirst, /* 4Mm */
-	MSBFirst, /* 1Ml */
-	MSBFirst, /* 2Ml */
-	LSBFirst, /* 4Ml */
-	MSBFirst, /* 1Lm */
-	MSBFirst, /* 2Lm */
-	LSBFirst, /* 4Lm */
-	MSBFirst, /* 1Ll */
-	MSBFirst, /* 2Ll */
-	MSBFirst  /* 4Ll */
-	};
-
-/*
- * This macro creates a value from 0 to 11 suitable for indexing
- * into the table above.
- */
-#define	ComposeIndex(bitmap_unit, bitmap_bit_order, byte_order)			\
-		(((bitmap_unit == 32) ? 2 : ((bitmap_unit == 16) ? 1 : 0))	\
-		     + (((bitmap_bit_order == MSBFirst) ? 0 : 3)		\
-		     + ((byte_order == MSBFirst) ? 0 : 6)))
-
-/* Cancel a GetReq operation, before doing _XSend or Data */
-
-#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
-#define UnGetReq(name)\
-    dpy->bufptr -= SIZEOF(x##name##Req);\
-    dpy->request--
-#else
-#define UnGetReq(name)\
-    dpy->bufptr -= SIZEOF(x/**/name/**/Req);\
-    dpy->request--
-#endif
-
-static void
-SendXYImage(dpy, req, image, req_xoffset, req_yoffset)
-    register Display *dpy;
-    register xPutImageReq *req;
-    register XImage *image;
-    int req_xoffset, req_yoffset;
-{
-    register int j;
-    long total_xoffset, bytes_per_src, bytes_per_dest, length;
-    long bytes_per_line, bytes_per_src_plane, bytes_per_dest_plane;
-    char *src, *dest, *buf;
-    char *extra = (char *)NULL;
-    register void (*swapfunc)();
-    int half_order;
-
-    total_xoffset = image->xoffset + req_xoffset;
-    req->leftPad = total_xoffset & (dpy->bitmap_unit - 1);
-    total_xoffset = (unsigned)(total_xoffset - req->leftPad) >> 3;
-    /* The protocol requires left-pad of zero on all ZPixmap, even
-     * though the 1-bit case is identical to bitmap format.  This is a
-     * bug in the protocol, caused because 1-bit ZPixmap was added late
-     * in the game.  Hairy shifting code compensation isn't worth it,
-     * just use XYPixmap format instead.
-     */
-    if ((req->leftPad != 0) && (req->format == ZPixmap))
-	req->format = XYPixmap;
-    bytes_per_dest = (unsigned long)ROUNDUP((long)req->width + req->leftPad,
-					    dpy->bitmap_pad) >> 3;
-    bytes_per_dest_plane = bytes_per_dest * req->height;
-    length = bytes_per_dest_plane * image->depth;
-    req->length += (length + 3) >> 2;
-
-    swapfunc = SwapFunction[ComposeIndex(image->bitmap_unit,
-					 image->bitmap_bit_order,
-					 image->byte_order)]
-			   [ComposeIndex(dpy->bitmap_unit,
-					 dpy->bitmap_bit_order,
-					 dpy->byte_order)];
-    half_order = HalfOrder[ComposeIndex(image->bitmap_unit,
-					image->bitmap_bit_order,
-					image->byte_order)];
-    if (half_order == MSBFirst)
-	half_order = HalfOrderWord[ComposeIndex(dpy->bitmap_unit,
-						dpy->bitmap_bit_order,
-						dpy->byte_order)];
-
-    src = image->data + (image->bytes_per_line * req_yoffset) + total_xoffset;
-
-    /* when total_xoffset > 0, we have to worry about stepping off the
-     * end of image->data.
-     */
-    if ((swapfunc == NoSwap) &&
-	(image->bytes_per_line == bytes_per_dest) &&
-	(((total_xoffset == 0) &&
-	  ((image->depth == 1) || (image->height == req->height))) ||
-	 ((image->depth == 1) &&
-	  ((req_yoffset + req->height) < (unsigned)image->height)))) {
-	Data(dpy, src, length);
-	return;
-    }
-
-    length = ROUNDUP(length, 4);
-    if ((dpy->bufptr + length) > dpy->bufmax) {
-	if ((buf = _XAllocScratch(dpy, (unsigned long) (length))) == NULL) {
-	    UnGetReq(PutImage);
-	    return;	
-	}
-    }
-    else
-	buf = dpy->bufptr;
-
-    bytes_per_src = (req->width + req->leftPad + (unsigned)7) >> 3;
-    bytes_per_line = image->bytes_per_line;
-    bytes_per_src_plane = bytes_per_line * image->height;
-    total_xoffset &= (image->bitmap_unit - 1) >> 3;
-
-    if ((total_xoffset > 0) &&
-	(image->byte_order != image->bitmap_bit_order)) {
-	char *temp;
-	long bytes_per_temp_plane, temp_length;
-
-	bytes_per_line = bytes_per_src + total_xoffset;
-	src -= total_xoffset;
-	bytes_per_temp_plane = bytes_per_line * req->height;
-	temp_length = ROUNDUP(bytes_per_temp_plane * image->depth, 4);
-	if (buf == dpy->bufptr) {
-	    if (! (temp = _XAllocScratch(dpy, (unsigned long) temp_length))) {
-		UnGetReq(PutImage);
-		return;
-	    }
-	}
-	else
-	    if ((extra = temp = Xmalloc((unsigned) temp_length)) == NULL) {
-		UnGetReq(PutImage);
-		return;
-	    }
-
-	swapfunc = SwapFunction[ComposeIndex(image->bitmap_unit,
-					     image->bitmap_bit_order,
-					     image->byte_order)]
-			       [ComposeIndex(image->bitmap_unit,
-					     dpy->byte_order,
-					     dpy->byte_order)];
-	for (dest = temp, j = image->depth;
-	     --j >= 0;
-	     src += bytes_per_src_plane, dest += bytes_per_temp_plane)
-	    (*swapfunc)((unsigned char *)src, (unsigned char *)dest,
-			bytes_per_line, (long)image->bytes_per_line,
-			bytes_per_line, req->height, half_order);
-	swapfunc = SwapFunction[ComposeIndex(image->bitmap_unit,
-					     dpy->byte_order,
-					     dpy->byte_order)]
-			       [ComposeIndex(dpy->bitmap_unit,
-					     dpy->bitmap_bit_order,
-					     dpy->byte_order)];
-	half_order = HalfOrder[ComposeIndex(image->bitmap_unit,
-					    dpy->byte_order,
-					    dpy->byte_order)];
-	src = temp + total_xoffset;
-	bytes_per_src_plane = bytes_per_temp_plane;
-    }
-
-    for (dest = buf, j = image->depth;
-	 --j >= 0;
-	 src += bytes_per_src_plane, dest += bytes_per_dest_plane)
-	(*swapfunc)((unsigned char *)src, (unsigned char *)dest,
-		    bytes_per_src, bytes_per_line,
-		    bytes_per_dest, req->height, half_order);
-
-    if (extra)
-	Xfree(extra);
-
-    if (buf == dpy->bufptr)
-	dpy->bufptr += length;
-    else
-	_XSend(dpy, buf, length);
-  }
-
-static void
-SendZImage(dpy, req, image, req_xoffset, req_yoffset,
-	   dest_bits_per_pixel, dest_scanline_pad)
-    register Display *dpy;
-    register xPutImageReq *req;
-    register XImage *image;
-    int req_xoffset, req_yoffset, dest_bits_per_pixel, dest_scanline_pad;
-{
-    long bytes_per_src, bytes_per_dest, length;
-    unsigned char *src, *dest;
-    unsigned char *shifted_src = NULL;
-
-    req->leftPad = 0;
-    bytes_per_src = ROUNDUP((long)req->width * image->bits_per_pixel, 8) >> 3;
-    bytes_per_dest = ROUNDUP((long)req->width * dest_bits_per_pixel,
-			     dest_scanline_pad) >> 3;
-    length = bytes_per_dest * req->height;
-    req->length += (length + 3) >> 2;
-
-    src = (unsigned char *)image->data +
-	  (req_yoffset * image->bytes_per_line) +
-	  ((req_xoffset * image->bits_per_pixel) >> 3);
-    if ((image->bits_per_pixel == 4) && ((unsigned int) req_xoffset & 0x01)) {
-	if (! (shifted_src = (unsigned char *)
-	       Xmalloc((unsigned) (req->height * image->bytes_per_line)))) {
-	    UnGetReq(PutImage);
-	    return;
-	}
-
-	ShiftNibblesLeft(src, shifted_src, bytes_per_src,
-			 (long) image->bytes_per_line,
-			 (long) image->bytes_per_line, req->height,
-			 image->byte_order);
-	src = shifted_src;
-    }
-
-    /* when req_xoffset > 0, we have to worry about stepping off the
-     * end of image->data.
-     */
-    if (((image->byte_order == dpy->byte_order) ||
-	 (image->bits_per_pixel == 8)) &&
-	((long)image->bytes_per_line == bytes_per_dest) &&
-	((req_xoffset == 0) ||
-	 ((req_yoffset + req->height) < (unsigned)image->height))) {
-	Data(dpy, (char *)src, length);
-	if (shifted_src)
-	    Xfree((char *)shifted_src);
-	return;
-    }
-
-    length = ROUNDUP(length, 4);
-    if ((dpy->bufptr + length) <= dpy->bufmax)
-	dest = (unsigned char *)dpy->bufptr;
-    else
-	if ((dest = (unsigned char *)
-	     _XAllocScratch(dpy, (unsigned long)(length))) == NULL) {
-	    if (shifted_src) Xfree((char *) shifted_src);
-	    UnGetReq(PutImage);
-	    return;
-	}
-
-    if ((image->byte_order == dpy->byte_order) ||
-	(image->bits_per_pixel == 8))
-	NoSwap(src, dest, bytes_per_src, (long)image->bytes_per_line,
-	       bytes_per_dest, req->height, image->byte_order);
-    else if (image->bits_per_pixel == 32)
-	SwapFourBytes(src, dest, bytes_per_src, (long)image->bytes_per_line,
-		      bytes_per_dest, req->height, image->byte_order);
-    else if (image->bits_per_pixel == 24)
-	SwapThreeBytes(src, dest, bytes_per_src, (long)image->bytes_per_line,
-		       bytes_per_dest, req->height, image->byte_order);
-    else if (image->bits_per_pixel == 16)
-	SwapTwoBytes(src, dest, bytes_per_src, (long)image->bytes_per_line,
-		     bytes_per_dest, req->height, image->byte_order);
-    else
-	SwapNibbles(src, dest, bytes_per_src, (long)image->bytes_per_line,
-		    bytes_per_dest, req->height);
-
-    if (dest == (unsigned char *)dpy->bufptr)
-	dpy->bufptr += length;
-    else
-	_XSend(dpy, (char *)dest, length);
-
-    if (shifted_src)
-        Xfree((char *)shifted_src);
-}
-
-static void
-PutImageRequest(dpy, d, gc, image, req_xoffset, req_yoffset, x, y,
-		req_width, req_height, dest_bits_per_pixel, dest_scanline_pad)
-    register Display *dpy;
-    Drawable d;
-    GC gc;
-    register XImage *image;
-    int x, y;
-    unsigned int req_width, req_height;
-    int req_xoffset, req_yoffset, dest_bits_per_pixel, dest_scanline_pad;
-{
-    register xPutImageReq *req;
-
-    GetReq(PutImage, req);
-    req->drawable = d;
-    req->gc = gc->gid;
-    req->dstX = x;
-    req->dstY = y;
-    req->width = req_width;
-    req->height = req_height;
-    req->depth = image->depth;
-    req->format = image->format;
-    if ((image->bits_per_pixel == 1) || (image->format != ZPixmap))
-	SendXYImage(dpy, req, image, req_xoffset, req_yoffset);
-    else
-	SendZImage(dpy, req, image, req_xoffset, req_yoffset,
-		   dest_bits_per_pixel, dest_scanline_pad);
-}
-	
-static void
-PutSubImage (dpy, d, gc, image, req_xoffset, req_yoffset, x, y,
-	     req_width, req_height, dest_bits_per_pixel, dest_scanline_pad)
-    register Display *dpy;
-    Drawable d;
-    GC gc;
-    register XImage *image;
-    int x, y;
-    unsigned int req_width, req_height;
-    int req_xoffset, req_yoffset, dest_bits_per_pixel, dest_scanline_pad;
-
-{
-    int left_pad, BytesPerRow, Available;
-
-    if ((req_width == 0) || (req_height == 0))
-	return;
-    
-    Available = ((65536 < dpy->max_request_size) ? (65536 << 2)
-						 : (dpy->max_request_size << 2))
-		- SIZEOF(xPutImageReq);
-
-    if ((image->bits_per_pixel == 1) || (image->format != ZPixmap)) {
-	left_pad = (image->xoffset + req_xoffset) & (dpy->bitmap_unit - 1);
-	BytesPerRow = (ROUNDUP((long)req_width + left_pad,
-			       dpy->bitmap_pad) >> 3) * image->depth;
-    } else {
-	left_pad = 0;
-	BytesPerRow = ROUNDUP((long)req_width * dest_bits_per_pixel,
-			      dest_scanline_pad) >> 3;
-    }
-
-    if ((BytesPerRow * req_height) <= Available) {
-        PutImageRequest(dpy, d, gc, image, req_xoffset, req_yoffset, x, y, 
-			req_width, req_height,
-			dest_bits_per_pixel, dest_scanline_pad);
-    } else if (req_height > 1) {
-	int SubImageHeight = Available / BytesPerRow;
-
-	if (SubImageHeight == 0)
-	    SubImageHeight = 1;
-
-	PutSubImage(dpy, d, gc, image, req_xoffset, req_yoffset, x, y, 
-		    req_width, (unsigned int) SubImageHeight,
-		    dest_bits_per_pixel, dest_scanline_pad);
-
-	PutSubImage(dpy, d, gc, image, req_xoffset, 
-		    req_yoffset + SubImageHeight, x, y + SubImageHeight,
-		    req_width, req_height - SubImageHeight,
-		    dest_bits_per_pixel, dest_scanline_pad);
-    } else {
-	int SubImageWidth = (((Available << 3) / dest_scanline_pad)
-				* dest_scanline_pad) - left_pad;
-
-	PutSubImage(dpy, d, gc, image, req_xoffset, req_yoffset, x, y, 
-		    (unsigned int) SubImageWidth, 1,
-		    dest_bits_per_pixel, dest_scanline_pad);
-
-	PutSubImage(dpy, d, gc, image, req_xoffset + SubImageWidth, 
-		    req_yoffset, x + SubImageWidth, y,
-		    req_width - SubImageWidth, 1,
-		    dest_bits_per_pixel, dest_scanline_pad);
-    }
-}
-
-int
-XPutImage (dpy, d, gc, image, req_xoffset, req_yoffset, x, y, req_width,
-							      req_height)
-    register Display *dpy;
-    Drawable d;
-    GC gc;
-    register XImage *image;
-    int x, y;
-    unsigned int req_width, req_height;
-    int req_xoffset, req_yoffset;
-
-{
-    long width = req_width;
-    long height = req_height;
-    int dest_bits_per_pixel, dest_scanline_pad;
-
-    if (req_xoffset < 0) {
-	width += req_xoffset;
-	req_xoffset = 0;
-    }
-    if (req_yoffset < 0) {
-	height += req_yoffset;
-	req_yoffset = 0;
-    }
-    if ((req_xoffset + width) > image->width)
-	width = image->width - req_xoffset;
-    if ((req_yoffset + height) > image->height)
-	height = image->height - req_yoffset;
-    if ((width <= 0) || (height <= 0))
-	return 0;
-
-    if ((image->bits_per_pixel == 1) || (image->format != ZPixmap)) {
-	dest_bits_per_pixel = 1;
-	dest_scanline_pad = dpy->bitmap_pad;
-    } else {
-	register int n;
-	register ScreenFormat *format;
-
-	dest_bits_per_pixel = image->bits_per_pixel;
-	dest_scanline_pad = image->bitmap_pad;
-	for (n = dpy->nformats, format = dpy->pixmap_format; --n >= 0; format++)
-	    if (format->depth == image->depth) {
-		dest_bits_per_pixel = format->bits_per_pixel;
-		dest_scanline_pad = format->scanline_pad;
-	    }
-	if (dest_bits_per_pixel != image->bits_per_pixel) {
-	    XImage img;
-	    register long i, j;
-	    extern void _XInitImageFuncPtrs();
-	    /* XXX slow, but works */
-	    img.width = width;
-	    img.height = height;
-	    img.xoffset = 0;
-	    img.format = ZPixmap;
-	    img.byte_order = dpy->byte_order;
-	    img.bitmap_unit = dpy->bitmap_unit;
-	    img.bitmap_bit_order = dpy->bitmap_bit_order;
-	    img.bitmap_pad = dest_scanline_pad;
-	    img.depth = image->depth;
-	    img.bits_per_pixel = dest_bits_per_pixel;
-	    img.bytes_per_line = ROUNDUP((dest_bits_per_pixel * width),
-					 dest_scanline_pad) >> 3;
-	    img.data = Xmalloc((unsigned) (img.bytes_per_line * height));
-	    if (img.data == NULL)
-		return 0;
-	    _XInitImageFuncPtrs(&img);
-	    for (j = height; --j >= 0; )
-		for (i = width; --i >= 0; )
-		    XPutPixel(&img, i, j, XGetPixel(image, req_xoffset + i,
-						    req_yoffset + j));
-	    LockDisplay(dpy);
-	    FlushGC(dpy, gc);
-	    PutSubImage(dpy, d, gc, &img, 0, 0, x, y,
-			(unsigned int) width, (unsigned int) height,
-			dest_bits_per_pixel, dest_scanline_pad);
-	    UnlockDisplay(dpy);
-	    SyncHandle();
-	    Xfree(img.data);
-	    return 0;
-	}
-    }
-
-    LockDisplay(dpy);
-    FlushGC(dpy, gc);
-
-    PutSubImage(dpy, d, gc, image, req_xoffset, req_yoffset, x, y,
-		(unsigned int) width, (unsigned int) height,
-		dest_bits_per_pixel, dest_scanline_pad);
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 0;
-}
diff --git a/xc/lib/X11/QBlack.c b/xc/lib/X11/QBlack.c
deleted file mode 100644
index cde59b43b..000000000
--- a/xc/lib/X11/QBlack.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* $XConsortium: QBlack.c,v 1.3 93/09/07 21:32:17 rws Exp $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		XcmsQBlack.c - Query Black
- *
- *	DESCRIPTION
- *		Routine to obtain a color specification for zero
- *		red, green, and blue intensities.
- *
- *
- */
-
-#include "Xlibint.h"
-#include "Xcms.h"
-
-
-
-/************************************************************************
- *									*
- *			PUBLIC INTERFACES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsQueryBlack
- *
- *	SYNOPSIS
- */
-
-Status
-XcmsQueryBlack(ccc, target_format, pColor_ret)
-    XcmsCCC ccc;
-    XcmsColorFormat target_format;
-    XcmsColor *pColor_ret;
-/*
- *	DESCRIPTION
- *		Returns the color specification in the target format for
- *		zero intensity red, green, and blue.
- *
- *	RETURNS
- *		Returns XcmsSuccess, if failed; otherwise XcmsFailure
- *
- */
-{
-    XcmsColor tmp;
-
-    tmp.format = XcmsRGBiFormat;
-    tmp.pixel = 0;
-    tmp.spec.RGBi.red = 0.0;
-    tmp.spec.RGBi.green = 0.0;
-    tmp.spec.RGBi.blue = 0.0;
-    if (XcmsConvertColors(ccc, &tmp, 1, target_format, NULL) != XcmsSuccess) {
-	return(XcmsFailure);
-    }
-    memcpy((char *)pColor_ret, (char *)&tmp, sizeof(XcmsColor));
-    return(XcmsSuccess);
-}
diff --git a/xc/lib/X11/QBlue.c b/xc/lib/X11/QBlue.c
deleted file mode 100644
index 863449162..000000000
--- a/xc/lib/X11/QBlue.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* $XConsortium: QBlue.c,v 1.3 93/09/07 21:32:19 rws Exp $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		XcmsQBlue.c - Query Blue
- *
- *	DESCRIPTION
- *		Routine to obtain a color specification for full
- *		blue intensity and zero red and green intensities.
- *
- *
- */
-
-#include "Xlibint.h"
-#include "Xcms.h"
-
-
-
-/************************************************************************
- *									*
- *			PUBLIC INTERFACES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsQueryBlue
- *
- *	SYNOPSIS
- */
-
-Status
-XcmsQueryBlue(ccc, target_format, pColor_ret)
-    XcmsCCC ccc;
-    XcmsColorFormat target_format;
-    XcmsColor *pColor_ret;
-/*
- *	DESCRIPTION
- *		Returns the color specification in the target format for
- *		full intensity blue and zero intensity red and green.
- *
- *	RETURNS
- *		Returns XcmsSuccess, if failed; otherwise XcmsFailure
- *
- */
-{
-    XcmsColor tmp;
-
-    tmp.format = XcmsRGBiFormat;
-    tmp.pixel = 0;
-    tmp.spec.RGBi.red = 0.0;
-    tmp.spec.RGBi.green = 0.0;
-    tmp.spec.RGBi.blue = 1.0;
-    if (XcmsConvertColors(ccc, &tmp, 1, target_format, NULL) != XcmsSuccess) {
-	return(XcmsFailure);
-    }
-    memcpy((char *)pColor_ret, (char *)&tmp, sizeof(XcmsColor));
-    return(XcmsSuccess);
-}
diff --git a/xc/lib/X11/QGreen.c b/xc/lib/X11/QGreen.c
deleted file mode 100644
index b75504ba9..000000000
--- a/xc/lib/X11/QGreen.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* $XConsortium: QGreen.c,v 1.3 93/09/07 21:32:21 rws Exp $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		XcmsQGreen.c - Query Green
- *
- *	DESCRIPTION
- *		Routine to obtain a color specification for full
- *		green intensity and zero red and blue intensities.
- *
- *
- */
-
-#include "Xlibint.h"
-#include "Xcms.h"
-
-
-
-/************************************************************************
- *									*
- *			PUBLIC INTERFACES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsQueryGreen
- *
- *	SYNOPSIS
- */
-
-Status
-XcmsQueryGreen(ccc, target_format, pColor_ret)
-    XcmsCCC ccc;
-    XcmsColorFormat target_format;
-    XcmsColor *pColor_ret;
-/*
- *	DESCRIPTION
- *		Returns the color specification in the target format for
- *		full intensity green and zero intensity red and blue.
- *
- *	RETURNS
- *		Returns XcmsSuccess, if failed; otherwise XcmsFailure
- *
- */
-{
-    XcmsColor tmp;
-
-    tmp.format = XcmsRGBiFormat;
-    tmp.pixel = 0;
-    tmp.spec.RGBi.red = 0.0;
-    tmp.spec.RGBi.green = 1.0;
-    tmp.spec.RGBi.blue = 0.0;
-    if (XcmsConvertColors(ccc, &tmp, 1, target_format, NULL) != XcmsSuccess) {
-	return(XcmsFailure);
-    }
-    memcpy((char *)pColor_ret, (char *)&tmp, sizeof(XcmsColor));
-    return(XcmsSuccess);
-}
diff --git a/xc/lib/X11/QRed.c b/xc/lib/X11/QRed.c
deleted file mode 100644
index b5c23b3c0..000000000
--- a/xc/lib/X11/QRed.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* $XConsortium: QRed.c,v 1.3 93/09/07 21:32:24 rws Exp $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		XcmsQRed.c - Query Red
- *
- *	DESCRIPTION
- *		Routine to obtain a color specification for full
- *		red intensity and zero  green and blue intensities.
- *
- *
- */
-
-#include "Xlibint.h"
-#include "Xcms.h"
-
-
-
-/************************************************************************
- *									*
- *			PUBLIC INTERFACES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsQueryRed
- *
- *	SYNOPSIS
- */
-
-Status
-XcmsQueryRed(ccc, target_format, pColor_ret)
-    XcmsCCC ccc;
-    XcmsColorFormat target_format;
-    XcmsColor *pColor_ret;
-/*
- *	DESCRIPTION
- *		Returns the color specification in the target format for
- *		full intensity red and zero intensity green and blue.
- *
- *	RETURNS
- *		Returns XcmsSuccess, if failed; otherwise XcmsFailure
- *
- */
-{
-    XcmsColor tmp;
-
-    tmp.format = XcmsRGBiFormat;
-    tmp.pixel = 0;
-    tmp.spec.RGBi.red = 1.0;
-    tmp.spec.RGBi.green = 0.0;
-    tmp.spec.RGBi.blue = 0.0;
-    if (XcmsConvertColors(ccc, &tmp, 1, target_format, NULL) != XcmsSuccess) {
-	return(XcmsFailure);
-    }
-    memcpy((char *)pColor_ret, (char *)&tmp, sizeof(XcmsColor));
-    return(XcmsSuccess);
-}
diff --git a/xc/lib/X11/QWhite.c b/xc/lib/X11/QWhite.c
deleted file mode 100644
index 84c0dd05b..000000000
--- a/xc/lib/X11/QWhite.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* $XConsortium: QWhite.c,v 1.3 93/09/07 21:32:26 rws Exp $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		XcmsQWhite.c - Query White
- *
- *	DESCRIPTION
- *		Routine to obtain a color specification for full
- *		red, green, and blue intensities.
- *
- *
- */
-
-#include "Xlibint.h"
-#include "Xcms.h"
-
-
-
-/************************************************************************
- *									*
- *			PUBLIC INTERFACES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsQueryWhite
- *
- *	SYNOPSIS
- */
-
-Status
-XcmsQueryWhite(ccc, target_format, pColor_ret)
-    XcmsCCC ccc;
-    XcmsColorFormat target_format;
-    XcmsColor *pColor_ret;
-/*
- *	DESCRIPTION
- *		Returns the color specification in the target format for
- *		full intensity red, green, and blue.
- *
- *	RETURNS
- *		Returns XcmsSuccess, if failed; otherwise XcmsFailure
- *
- */
-{
-    XcmsColor tmp;
-
-    tmp.format = XcmsRGBiFormat;
-    tmp.pixel = 0;
-    tmp.spec.RGBi.red = 1.0;
-    tmp.spec.RGBi.green = 1.0;
-    tmp.spec.RGBi.blue = 1.0;
-    if (XcmsConvertColors(ccc, &tmp, 1, target_format, NULL) != XcmsSuccess) {
-	return(XcmsFailure);
-    }
-    memcpy((char *)pColor_ret, (char *)&tmp, sizeof(XcmsColor));
-    return(XcmsSuccess);
-}
diff --git a/xc/lib/X11/QuBest.c b/xc/lib/X11/QuBest.c
deleted file mode 100644
index 9b9a4dc31..000000000
--- a/xc/lib/X11/QuBest.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* $TOG: QuBest.c /main/5 1998/02/06 17:48:26 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-Status XQueryBestSize(dpy, class, drawable, width, height, ret_width, ret_height)
-    register Display *dpy;
-    int class;
-    Drawable drawable;
-    unsigned int width, height;
-    unsigned int *ret_width, *ret_height;
-{       
-    xQueryBestSizeReply rep;
-    register xQueryBestSizeReq *req;
-
-    LockDisplay(dpy);
-    GetReq(QueryBestSize, req);
-    req->class = class;
-    req->drawable = drawable;
-    req->width = width;
-    req->height = height;
-    if (_XReply (dpy, (xReply *)&rep, 0, xTrue) == 0) {
-	    UnlockDisplay(dpy);
-	    SyncHandle();
-	    return 0;
-	}
-    *ret_width = rep.width;
-    *ret_height = rep.height;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/QuCol.c b/xc/lib/X11/QuCol.c
deleted file mode 100644
index 44e22c5c1..000000000
--- a/xc/lib/X11/QuCol.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* $XConsortium: QuCol.c,v 1.4 91/05/13 23:27:56 rws Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		XcmsQuCol.c
- *
- *	DESCRIPTION
- *		Source for XcmsQueryColors
- *
- *
- */
-/* $XFree86: xc/lib/X11/QuCol.c,v 1.2 1999/05/09 10:49:56 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/* EXTERN */
-
-/* SetGetCols.c */
-extern Status _XcmsSetGetColors();
-
-
-/************************************************************************
- *									*
- *			PUBLIC ROUTINES					*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsQueryColor - Query Color
- *
- *	SYNOPSIS
- */
-Status
-XcmsQueryColor(dpy, colormap, pXcmsColor_in_out, result_format)
-    Display *dpy;
-    Colormap colormap;
-    XcmsColor *pXcmsColor_in_out;
-    XcmsColorFormat result_format;
-/*
- *	DESCRIPTION
- *		This routine uses XQueryColor to obtain the X RGB values
- *		stored in the specified colormap for the specified pixel.
- *		The X RGB values are then converted to the target format as
- *		specified by the format component of the XcmsColor structure.
- *
- *	RETURNS
- *		XcmsFailure if failed;
- *		XcmsSuccess if it succeeded.
- *
- *		Returns a color specification of the color stored in the
- *		specified pixel.
- */
-{
-    return(_XcmsSetGetColors (XQueryColor, dpy, colormap,
-	    pXcmsColor_in_out, 1, result_format, (Bool *) NULL));
-}
diff --git a/xc/lib/X11/QuColor.c b/xc/lib/X11/QuColor.c
deleted file mode 100644
index 4524903a2..000000000
--- a/xc/lib/X11/QuColor.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* $TOG: QuColor.c /main/8 1998/02/06 17:48:39 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/QuColor.c,v 1.2 1999/05/09 10:49:57 dawes Exp $ */
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-int
-XQueryColor(dpy, cmap, def)
-    register Display *dpy;
-    Colormap cmap;
-    XColor *def;	/* RETURN */
-{
-    xrgb color;
-    xQueryColorsReply rep;
-    register xQueryColorsReq *req;
-    unsigned long val = def->pixel;	/* needed for macro below */
-
-    LockDisplay(dpy);
-    GetReqExtra(QueryColors, 4, req); /* a pixel (CARD32) is 4 bytes */
-    req->cmap = cmap;
-
-    OneDataCard32 (dpy, NEXTPTR(req,xQueryColorsReq), val);
-
-    if (_XReply(dpy, (xReply *) &rep, 0, xFalse) != 0) {
-
-	    _XRead(dpy, (char *)&color, (long) SIZEOF(xrgb));
-
-	    def->red = color.red;
-	    def->blue = color.blue;
-	    def->green = color.green;
-	    def->flags = DoRed | DoGreen | DoBlue;
-        }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/QuColors.c b/xc/lib/X11/QuColors.c
deleted file mode 100644
index 781d7bae5..000000000
--- a/xc/lib/X11/QuColors.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* $TOG: QuColors.c /main/11 1998/02/06 17:48:32 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/QuColors.c,v 1.2 1999/05/09 10:49:57 dawes Exp $ */
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-int
-XQueryColors(dpy, cmap, defs, ncolors)
-    register Display *dpy;
-    Colormap cmap;
-    XColor *defs; 		/* RETURN */
-    int ncolors;
-{
-    register int i;
-    xrgb *color;
-    xQueryColorsReply rep;
-    long nbytes;
-    register xQueryColorsReq *req;
-
-    LockDisplay(dpy);
-    GetReq(QueryColors, req);
-
-    req->cmap = cmap;
-    req->length += ncolors; /* each pixel is a CARD32 */
-
-    for (i = 0; i < ncolors; i++)
-      Data32 (dpy, (long *)&defs[i].pixel, 4L);
-       /* XXX this isn't very efficient */
-
-    if (_XReply(dpy, (xReply *) &rep, 0, xFalse) != 0) {
-	if ((color = (xrgb *)
-	    Xmalloc((unsigned) (nbytes = (long) ncolors * SIZEOF(xrgb))))) {
-
-	    _XRead(dpy, (char *) color, nbytes);
-
-	    for (i = 0; i < ncolors; i++) {
-		register XColor *def = &defs[i];
-		register xrgb *rgb = &color[i];
-		def->red = rgb->red;
-		def->green = rgb->green;
-		def->blue = rgb->blue;
-		def->flags = DoRed | DoGreen | DoBlue;
-	    }
-	    Xfree((char *)color);
-	}
-	else _XEatData(dpy, (unsigned long) nbytes);
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/QuCols.c b/xc/lib/X11/QuCols.c
deleted file mode 100644
index f4a4df0d9..000000000
--- a/xc/lib/X11/QuCols.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* $XConsortium: QuCols.c,v 1.4 91/05/13 23:28:26 rws Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		XcmsQuCol.c
- *
- *	DESCRIPTION
- *		Source for XcmsQueryColors
- *
- *
- */
-/* $XFree86: xc/lib/X11/QuCols.c,v 1.2 1999/05/09 10:49:57 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/* EXTERNS */
-
-/* SetGetCols.c */
-extern Status _XcmsSetGetColors();
-
-
-/************************************************************************
- *									*
- *			PUBLIC ROUTINES					*
- *									*
- ************************************************************************/
-/*
- *	NAME
- *		XcmsQueryColors - Query Colors
- *
- *	SYNOPSIS
- */
-Status
-XcmsQueryColors(dpy, colormap, pXcmsColors_in_out, nColors, result_format)
-    Display *dpy;
-    Colormap colormap;
-    XcmsColor *pXcmsColors_in_out;
-    unsigned int nColors;
-    XcmsColorFormat result_format;
-/*
- *	DESCRIPTION
- *		This routine uses XQueryColors to obtain the X RGB values
- *		stored in the specified colormap for the specified pixels.
- *		The X RGB values are then converted to the target format as
- *		specified by the format component of the XcmsColor structure.
- *
- *	RETURNS
- *		XcmsFailure if failed;
- *		XcmsSuccess if it succeeded.
- *
- *		Returns the color specifications of the colors stored in the
- *		specified pixels.
- */
-{
-    return(_XcmsSetGetColors (XQueryColors, dpy, colormap,
-	    pXcmsColors_in_out, nColors, result_format, (Bool *) NULL));
-}
diff --git a/xc/lib/X11/QuCurShp.c b/xc/lib/X11/QuCurShp.c
deleted file mode 100644
index e863d8f9d..000000000
--- a/xc/lib/X11/QuCurShp.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* $TOG: QuCurShp.c /main/5 1998/02/06 17:48:56 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-Status XQueryBestCursor(dpy, drawable, width, height, ret_width, ret_height)
-    register Display *dpy;
-    Drawable drawable;
-    unsigned int width, height;
-    unsigned int *ret_width, *ret_height;
-{       
-    xQueryBestSizeReply rep;
-    register xQueryBestSizeReq *req;
-
-    LockDisplay(dpy);
-    GetReq(QueryBestSize, req);
-    req->class = CursorShape;
-    req->drawable = drawable;
-    req->width = width;
-    req->height = height;
-    if (_XReply (dpy, (xReply *)&rep, 0, xTrue) == 0) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return 0;
-	}
-    *ret_width = rep.width;
-    *ret_height = rep.height;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/QuExt.c b/xc/lib/X11/QuExt.c
deleted file mode 100644
index 036cdf74b..000000000
--- a/xc/lib/X11/QuExt.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* $TOG: QuExt.c /main/9 1998/02/06 17:49:02 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-#if NeedFunctionPrototypes
-Bool XQueryExtension(
-    register Display *dpy,
-    _Xconst char *name,
-    int *major_opcode,  /* RETURN */
-    int *first_event,   /* RETURN */
-    int *first_error)	/* RETURN */
-#else
-Bool XQueryExtension(dpy, name, major_opcode, first_event, first_error)
-    register Display *dpy;
-    char *name;
-    int *major_opcode;  /* RETURN */
-    int *first_event;   /* RETURN */
-    int *first_error;	/* RETURN */
-#endif
-{       
-    xQueryExtensionReply rep;
-    register xQueryExtensionReq *req;
-
-    LockDisplay(dpy);
-    GetReq(QueryExtension, req);
-    req->nbytes = name ? strlen(name) : 0;
-    req->length += (req->nbytes+(unsigned)3)>>2;
-    _XSend(dpy, name, (long)req->nbytes);
-    (void) _XReply (dpy, (xReply *)&rep, 0, xTrue);
-    *major_opcode = rep.major_opcode;
-    *first_event = rep.first_event;
-    *first_error = rep.first_error;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return (rep.present);
-}
-
diff --git a/xc/lib/X11/QuKeybd.c b/xc/lib/X11/QuKeybd.c
deleted file mode 100644
index 23438e73a..000000000
--- a/xc/lib/X11/QuKeybd.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* $TOG: QuKeybd.c /main/8 1998/02/06 17:49:08 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/QuKeybd.c,v 1.2 1999/05/09 10:49:58 dawes Exp $ */
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-struct kmap {
-  char map[32];
-};
-
-int
-XQueryKeymap(dpy, keys)
-    register Display *dpy;
-    char keys[32];
-
-{       
-    xQueryKeymapReply rep;
-    register xReq *req;
-
-    LockDisplay(dpy);
-    GetEmptyReq(QueryKeymap, req);
-    (void) _XReply(dpy, (xReply *)&rep, 
-       (SIZEOF(xQueryKeymapReply) - SIZEOF(xReply)) >> 2, xTrue);
-    *(struct kmap *) keys = *(struct kmap *)rep.map;  /* faster than memcpy */
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/QuPntr.c b/xc/lib/X11/QuPntr.c
deleted file mode 100644
index 12fead63a..000000000
--- a/xc/lib/X11/QuPntr.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* $TOG: QuPntr.c /main/6 1998/02/06 17:49:13 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-Bool XQueryPointer(dpy, w, root, child, root_x, root_y, win_x, win_y, mask)
-     register Display *dpy;
-     Window w, *root, *child;
-     int *root_x, *root_y, *win_x, *win_y;
-     unsigned int *mask;
-
-{       
-    xQueryPointerReply rep;
-    xResourceReq *req;
-
-    LockDisplay(dpy);
-    GetResReq(QueryPointer, w, req);
-    if (_XReply (dpy, (xReply *)&rep, 0, xTrue) == 0) {
-	    UnlockDisplay(dpy);
-	    SyncHandle();
-	    return(False);
-	}
-
-    *root = rep.root;
-    *child = rep.child;
-    *root_x = cvtINT16toInt (rep.rootX);
-    *root_y = cvtINT16toInt (rep.rootY);
-    *win_x = cvtINT16toInt (rep.winX);
-    *win_y = cvtINT16toInt (rep.winY);
-    *mask = rep.mask;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return (rep.sameScreen);
-}
-
diff --git a/xc/lib/X11/QuStipShp.c b/xc/lib/X11/QuStipShp.c
deleted file mode 100644
index 8ce3dae03..000000000
--- a/xc/lib/X11/QuStipShp.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* $TOG: QuStipShp.c /main/5 1998/02/06 17:49:18 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-Status XQueryBestStipple(dpy, drawable, width, height, ret_width, ret_height)
-     register Display *dpy;
-     Drawable drawable;
-     unsigned int width, height;
-     unsigned int *ret_width, *ret_height;
-{       
-    xQueryBestSizeReply rep;
-    register xQueryBestSizeReq *req;
-
-    LockDisplay(dpy);
-    GetReq(QueryBestSize, req);
-    req->class = StippleShape;
-    req->drawable = drawable;
-    req->width = width;
-    req->height = height;
-    if (_XReply (dpy, (xReply *)&rep, 0, xTrue) == 0) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return 0;
-	}
-    *ret_width = rep.width;
-    *ret_height = rep.height;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/QuTextE16.c b/xc/lib/X11/QuTextE16.c
deleted file mode 100644
index 6b53eaf8c..000000000
--- a/xc/lib/X11/QuTextE16.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* $TOG: QuTextE16.c /main/14 1998/02/06 17:49:24 kaleb $ */
-/*
-
-Copyright 1986, 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/QuTextE16.c,v 1.2 1999/05/09 10:49:58 dawes Exp $ */
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-int
-#if NeedFunctionPrototypes
-XQueryTextExtents16 (
-    register Display *dpy,
-    Font fid,
-    _Xconst XChar2b *string,
-    register int nchars,
-    int *dir,
-    int *font_ascent,
-    int *font_descent,
-    register XCharStruct *overall)
-#else
-XQueryTextExtents16 (dpy, fid, string, nchars, dir, font_ascent, font_descent,
-                     overall)
-    register Display *dpy;
-    Font fid;
-    XChar2b *string;
-    register int nchars;
-    int *dir;
-    int *font_ascent, *font_descent;
-    register XCharStruct *overall;
-#endif
-{
-    register long i;
-    register unsigned char *ptr;
-    char *buf;
-    xQueryTextExtentsReply rep;
-    long nbytes;
-    register xQueryTextExtentsReq *req;
-
-    LockDisplay(dpy);
-    nbytes = nchars << 1;
-    GetReq(QueryTextExtents, req);
-    req->fid = fid;
-    if ((buf = _XAllocScratch (dpy, (unsigned long) nbytes))) {
-	req->length += (nbytes + 3)>>2;
-	req->oddLength = nchars & 1;
-	for (ptr = (unsigned char *)buf, i = nchars; --i >= 0; string++) {
-	    *ptr++ = string->byte1;
-	    *ptr++ = string->byte2;
-	}
-	Data (dpy, buf, nbytes);
-    }
-    if (!_XReply (dpy, (xReply *)&rep, 0, xTrue) || !buf) {
-        UnlockDisplay(dpy);
-	SyncHandle();
-	return 0;
-    }
-    *dir = rep.drawDirection;
-    *font_ascent = cvtINT16toInt (rep.fontAscent);
-    *font_descent = cvtINT16toInt (rep.fontDescent);
-    overall->ascent = (short) cvtINT16toShort (rep.overallAscent);
-    overall->descent = (short) cvtINT16toShort (rep.overallDescent);
-    /* XXX bogus - we're throwing away information!!! */
-    overall->width  = (short) cvtINT32toInt (rep.overallWidth);
-    overall->lbearing = (short) cvtINT32toInt (rep.overallLeft);
-    overall->rbearing = (short) cvtINT32toInt (rep.overallRight);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/QuTextExt.c b/xc/lib/X11/QuTextExt.c
deleted file mode 100644
index 96a4dad44..000000000
--- a/xc/lib/X11/QuTextExt.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* $TOG: QuTextExt.c /main/15 1998/02/06 17:49:30 kaleb $ */
-/*
-
-Copyright 1986, 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/QuTextExt.c,v 1.2 1999/05/09 10:49:58 dawes Exp $ */
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-int
-#if NeedFunctionPrototypes
-XQueryTextExtents (
-    register Display *dpy,
-    Font fid,
-    register _Xconst char *string,
-    register int nchars,
-    int *dir,
-    int *font_ascent,
-    int *font_descent,
-    register XCharStruct *overall)
-#else
-XQueryTextExtents (dpy, fid, string, nchars, dir, font_ascent, font_descent,
-                   overall)
-    register Display *dpy;
-    Font fid;
-    register char *string;
-    register int nchars;
-    int *dir;
-    int *font_ascent, *font_descent;
-    register XCharStruct *overall;
-#endif
-{
-    register int i;
-    register char *ptr;
-    char *buf;
-    xQueryTextExtentsReply rep;
-    long nbytes;
-    register xQueryTextExtentsReq *req;
-
-    LockDisplay(dpy);
-    nbytes = nchars << 1;
-    GetReq(QueryTextExtents, req);
-    req->fid = fid;
-    if ((buf = _XAllocScratch (dpy, (unsigned long) nbytes))) {
-	req->length += (nbytes + 3)>>2;
-	req->oddLength = nchars & 1;
-	for (ptr = buf, i = nchars; --i >= 0;) {
-	    *ptr++ = 0;
-	    *ptr++ = *string++;
-	}
-	Data (dpy, buf, nbytes);
-    }
-    if (!_XReply (dpy, (xReply *)&rep, 0, xTrue) || !buf) {
-        UnlockDisplay(dpy);
-	SyncHandle();
-	return 0;
-    }
-    *dir = rep.drawDirection;
-    *font_ascent = cvtINT16toInt (rep.fontAscent);
-    *font_descent = cvtINT16toInt (rep.fontDescent);
-    overall->ascent = (short) cvtINT16toShort (rep.overallAscent);
-    overall->descent = (short) cvtINT16toShort (rep.overallDescent);
-    /* XXX bogus - we're throwing away information!!! */
-    overall->width  = (short) cvtINT32toInt (rep.overallWidth);
-    overall->lbearing = (short) cvtINT32toInt (rep.overallLeft);
-    overall->rbearing = (short) cvtINT32toInt (rep.overallRight);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/QuTileShp.c b/xc/lib/X11/QuTileShp.c
deleted file mode 100644
index f87ed5773..000000000
--- a/xc/lib/X11/QuTileShp.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* $TOG: QuTileShp.c /main/5 1998/02/06 17:49:36 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-Status XQueryBestTile(dpy, drawable, width, height, ret_width, ret_height)
-     register Display *dpy;
-     Drawable drawable;
-     unsigned int width, height;
-     unsigned int *ret_width, *ret_height;
-{       
-    xQueryBestSizeReply rep;
-    register xQueryBestSizeReq *req;
-
-    LockDisplay(dpy);
-    GetReq(QueryBestSize, req);
-    req->class = TileShape;
-    req->drawable = drawable;
-    req->width = width;
-    req->height = height;
-    if (_XReply (dpy, (xReply *)&rep, 0, xTrue) == 0) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return(0);
-	}
-
-    *ret_width = rep.width;
-    *ret_height = rep.height;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/QuTree.c b/xc/lib/X11/QuTree.c
deleted file mode 100644
index 3293c2817..000000000
--- a/xc/lib/X11/QuTree.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* $TOG: QuTree.c /main/8 1998/02/06 17:49:41 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-Status XQueryTree (dpy, w, root, parent, children, nchildren)
-    register Display *dpy;
-    Window w;
-    Window *root;	/* RETURN */
-    Window *parent;	/* RETURN */
-    Window **children;	/* RETURN */
-    unsigned int *nchildren;  /* RETURN */
-{
-    long nbytes;
-    xQueryTreeReply rep;
-    register xResourceReq *req;
-
-    LockDisplay(dpy);
-    GetResReq(QueryTree, w, req);
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return (0);
-	}
-
-    *children = (Window *) NULL; 
-    if (rep.nChildren != 0) {
-	nbytes = rep.nChildren * sizeof(Window);
-	*children = (Window *) Xmalloc((unsigned) nbytes);
-	nbytes = rep.nChildren << 2;
-	if (! *children) {
-	    _XEatData(dpy, (unsigned long) nbytes);
-	    UnlockDisplay(dpy);
-	    SyncHandle();
-	    return (0);
-	}
-	_XRead32 (dpy, (char *) *children, nbytes);
-    }
-    *parent = rep.parent;
-    *root = rep.root;
-    *nchildren = rep.nChildren;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return (1);
-}
-
diff --git a/xc/lib/X11/Quarks.c b/xc/lib/X11/Quarks.c
deleted file mode 100644
index 1d74f7554..000000000
--- a/xc/lib/X11/Quarks.c
+++ /dev/null
@@ -1,428 +0,0 @@
-/* $TOG: Quarks.c /main/43 1998/02/06 17:48:19 kaleb $ */
-
-/***********************************************************
-Copyright 1987, 1988, 1990 by Digital Equipment Corporation, Maynard,
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-/*
-
-Copyright 1987, 1988, 1990, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/Quarks.c,v 1.2 1999/05/09 10:49:59 dawes Exp $ */
-
-#include "Xlibint.h"
-#include <X11/Xresource.h>
-
-/* Not cost effective, at least for vanilla MIT clients */
-/* #define PERMQ */
-
-typedef unsigned long Signature;
-typedef unsigned long Entry;
-#ifdef PERMQ
-typedef unsigned char Bits;
-#endif
-
-static XrmQuark nextQuark = 1;	/* next available quark number */
-static unsigned long quarkMask = 0;
-static Entry zero = 0;
-static Entry *quarkTable = &zero; /* crock */
-static unsigned long quarkRehash;
-static XrmString **stringTable = NULL;
-#ifdef PERMQ
-static Bits **permTable = NULL;
-#endif
-static XrmQuark nextUniq = -1;	/* next quark from XrmUniqueQuark */
-
-#define QUANTUMSHIFT	8
-#define QUANTUMMASK	((1 << QUANTUMSHIFT) - 1)
-#define CHUNKPER	8
-#define CHUNKMASK	((CHUNKPER << QUANTUMSHIFT) - 1)
-
-#define LARGEQUARK	((Entry)0x80000000L)
-#define QUARKSHIFT	18
-#define QUARKMASK	((LARGEQUARK - 1) >> QUARKSHIFT)
-#define XSIGMASK	((1L << QUARKSHIFT) - 1)
-
-#define STRQUANTSIZE	(sizeof(XrmString) * (QUANTUMMASK + 1))
-#ifdef PERMQ
-#define QUANTSIZE	(STRQUANTSIZE + \
-			 (sizeof(Bits) * ((QUANTUMMASK + 1) >> 3))
-#else
-#define QUANTSIZE	STRQUANTSIZE
-#endif
-
-#define HASH(sig) ((sig) & quarkMask)
-#define REHASHVAL(sig) ((((sig) % quarkRehash) + 2) | 1)
-#define REHASH(idx,rehash) ((idx + rehash) & quarkMask)
-#define NAME(q) stringTable[(q) >> QUANTUMSHIFT][(q) & QUANTUMMASK]
-#ifdef PERMQ
-#define BYTEREF(q) permTable[(q) >> QUANTUMSHIFT][((q) & QUANTUMMASK) >> 3]
-#define ISPERM(q) (BYTEREF(q) & (1 << ((q) & 7)))
-#define SETPERM(q) BYTEREF(q) |= (1 << ((q) & 7))
-#define CLEARPERM(q) BYTEREF(q) &= ~(1 << ((q) & 7))
-#endif
-
-/* Permanent memory allocation */
-
-#define WALIGN sizeof(unsigned long)
-#define DALIGN sizeof(double)
-
-#define NEVERFREETABLESIZE ((8192-12) & ~(DALIGN-1))
-static char *neverFreeTable = NULL;
-static int  neverFreeTableSize = 0;
-
-static char *permalloc(length)
-    register unsigned int length;
-{
-    char *ret;
-
-    if (neverFreeTableSize < length) {
-	if (length >= NEVERFREETABLESIZE)
-	    return Xmalloc(length);
-	if (! (ret = Xmalloc(NEVERFREETABLESIZE)))
-	    return (char *) NULL;
-	neverFreeTableSize = NEVERFREETABLESIZE;
-	neverFreeTable = ret;
-    }
-    ret = neverFreeTable;
-    neverFreeTable += length;
-    neverFreeTableSize -= length;
-    return(ret);
-}
-
-#ifndef WORD64
-typedef struct {char a; double b;} TestType1;
-typedef struct {char a; unsigned long b;} TestType2;
-#endif
-
-#ifdef XTHREADS
-static char *_Xpermalloc();
-
-char *Xpermalloc(length)
-    unsigned int length;
-{
-    char *p;
-
-    _XLockMutex(_Xglobal_lock);
-    p = _Xpermalloc(length);
-    _XUnlockMutex(_Xglobal_lock);
-    return p;
-}
-#define Xpermalloc _Xpermalloc
-
-static
-#endif /* XTHREADS */
-char *Xpermalloc(length)
-    unsigned int length;
-{
-    int i;
-
-    if (neverFreeTableSize && length < NEVERFREETABLESIZE) {
-#ifndef WORD64
-	if ((sizeof(TestType1) !=
-	     (sizeof(TestType2) - sizeof(unsigned long) + sizeof(double))) &&
-	    !(length & (DALIGN-1)) &&
-	    (i = (NEVERFREETABLESIZE - neverFreeTableSize) & (DALIGN-1))) {
-	    neverFreeTableSize -= DALIGN - i;
-	    neverFreeTable += DALIGN - i;
-	} else
-#endif
-	    if ((i = (NEVERFREETABLESIZE - neverFreeTableSize) & (WALIGN-1))) {
-		neverFreeTableSize -= WALIGN - i;
-		neverFreeTable += WALIGN - i;
-	    }
-    }
-    return permalloc(length);
-}
-
-static Bool
-ExpandQuarkTable()
-{
-    unsigned long oldmask, newmask;
-    register char c, *s;
-    register Entry *oldentries, *entries;
-    register Entry entry;
-    register int oldidx, newidx, rehash;
-    Signature sig;
-    XrmQuark q;
-
-    oldentries = quarkTable;
-    if ((oldmask = quarkMask))
-	newmask = (oldmask << 1) + 1;
-    else {
-	if (!stringTable) {
-	    stringTable = (XrmString **)Xmalloc(sizeof(XrmString *) *
-						CHUNKPER);
-	    if (!stringTable)
-		return False;
-	    stringTable[0] = (XrmString *)NULL;
-	}
-#ifdef PERMQ
-	if (!permTable)
-	    permTable = (Bits **)Xmalloc(sizeof(Bits *) * CHUNKPER);
-	if (!permTable)
-	    return False;
-#endif
-	stringTable[0] = (XrmString *)Xpermalloc(QUANTSIZE);
-	if (!stringTable[0])
-	    return False;
-#ifdef PERMQ
-	permTable[0] = (Bits *)((char *)stringTable[0] + STRQUANTSIZE);
-#endif
-	newmask = 0x1ff;
-    }
-    entries = (Entry *)Xmalloc(sizeof(Entry) * (newmask + 1));
-    if (!entries)
-	return False;
-    bzero((char *)entries, sizeof(Entry) * (newmask + 1));
-    quarkTable = entries;
-    quarkMask = newmask;
-    quarkRehash = quarkMask - 2;
-    for (oldidx = 0; oldidx <= oldmask; oldidx++) {
-	if ((entry = oldentries[oldidx])) {
-	    if (entry & LARGEQUARK)
-		q = entry & (LARGEQUARK-1);
-	    else
-		q = (entry >> QUARKSHIFT) & QUARKMASK;
-	    for (sig = 0, s = NAME(q); (c = *s++); )
-		sig = (sig << 1) + c;
-	    newidx = HASH(sig);
-	    if (entries[newidx]) {
-		rehash = REHASHVAL(sig);
-		do {
-		    newidx = REHASH(newidx, rehash);
-		} while (entries[newidx]);
-	    }
-	    entries[newidx] = entry;
-	}
-    }
-    if (oldmask)
-	Xfree((char *)oldentries);
-    return True;
-}
-
-#if NeedFunctionPrototypes
-XrmQuark _XrmInternalStringToQuark(
-    register _Xconst char *name, register int len, register Signature sig,
-    Bool permstring)
-#else
-XrmQuark _XrmInternalStringToQuark(name, len, sig, permstring)
-    register XrmString name;
-    register int len;
-    register Signature sig;
-    Bool permstring;
-#endif
-{
-    register XrmQuark q;
-    register Entry entry;
-    register int idx, rehash;
-    register int i;
-    register char *s1, *s2;
-    char *new;
-
-    rehash = 0;
-    idx = HASH(sig);
-    _XLockMutex(_Xglobal_lock);
-    while ((entry = quarkTable[idx])) {
-	if (entry & LARGEQUARK)
-	    q = entry & (LARGEQUARK-1);
-	else {
-	    if ((entry - sig) & XSIGMASK)
-		goto nomatch;
-	    q = (entry >> QUARKSHIFT) & QUARKMASK;
-	}
-	for (i = len, s1 = (char *)name, s2 = NAME(q); --i >= 0; ) {
-	    if (*s1++ != *s2++)
-		goto nomatch;
-	}
-	if (*s2) {
-nomatch:    if (!rehash)
-		rehash = REHASHVAL(sig);
-	    idx = REHASH(idx, rehash);
-	    continue;
-	}
-#ifdef PERMQ
-	if (permstring && !ISPERM(q)) {
-	    Xfree(NAME(q));
-	    NAME(q) = (char *)name;
-	    SETPERM(q);
-	}
-#endif
-	_XUnlockMutex(_Xglobal_lock);
-	return q;
-    }
-    if (nextUniq == nextQuark)
-	goto fail;
-    if ((nextQuark + (nextQuark >> 2)) > quarkMask) {
-	if (!ExpandQuarkTable())
-	    goto fail;
-	_XUnlockMutex(_Xglobal_lock);
-	return _XrmInternalStringToQuark(name, len, sig, permstring);
-    }
-    q = nextQuark;
-    if (!(q & QUANTUMMASK)) {
-	if (!(q & CHUNKMASK)) {
-	    if (!(new = Xrealloc((char *)stringTable,
-				 sizeof(XrmString *) *
-				 ((q >> QUANTUMSHIFT) + CHUNKPER))))
-		goto fail;
-	    stringTable = (XrmString **)new;
-#ifdef PERMQ
-	    if (!(new = Xrealloc((char *)permTable,
-				 sizeof(Bits *) *
-				 ((q >> QUANTUMSHIFT) + CHUNKPER))))
-		goto fail;
-	    permTable = (Bits **)new;
-#endif
-	}
-	new = Xpermalloc(QUANTSIZE);
-	if (!new)
-	    goto fail;
-	stringTable[q >> QUANTUMSHIFT] = (XrmString *)new;
-#ifdef PERMQ
-	permTable[q >> QUANTUMSHIFT] = (Bits *)(new + STRQUANTSIZE);
-#endif
-    }
-    if (!permstring) {
-	s2 = (char *)name;
-#ifdef PERMQ
-	name = Xmalloc(len+1);
-#else
-	name = permalloc(len+1);
-#endif
-	if (!name)
-	    goto fail;
-	for (i = len, s1 = (char *)name; --i >= 0; )
-	    *s1++ = *s2++;
-	*s1++ = '\0';
-#ifdef PERMQ
-	CLEARPERM(q);
-    }
-    else {
-	SETPERM(q);
-#endif
-    }
-    NAME(q) = (char *)name;
-    if (q <= QUARKMASK)
-	entry = (q << QUARKSHIFT) | (sig & XSIGMASK);
-    else
-	entry = q | LARGEQUARK;
-    quarkTable[idx] = entry;
-    nextQuark++;
-    _XUnlockMutex(_Xglobal_lock);
-    return q;
- fail:
-    _XUnlockMutex(_Xglobal_lock);
-    return NULLQUARK;
-}
-
-#if NeedFunctionPrototypes
-XrmQuark XrmStringToQuark(
-    _Xconst char *name)
-#else
-XrmQuark XrmStringToQuark(name)
-    XrmString name;
-#endif
-{
-    register char c, *tname;
-    register Signature sig = 0;
-
-    if (!name)
-	return (NULLQUARK);
-    
-    for (tname = (char *)name; (c = *tname++); )
-	sig = (sig << 1) + c;
-
-    return _XrmInternalStringToQuark(name, tname-(char *)name-1, sig, False);
-}
-
-#if NeedFunctionPrototypes
-XrmQuark XrmPermStringToQuark(
-    _Xconst char *name)
-#else
-XrmQuark XrmPermStringToQuark(name)
-    XrmString name;
-#endif
-{
-    register char c, *tname;
-    register Signature sig = 0;
-
-    if (!name)
-	return (NULLQUARK);
-
-    for (tname = (char *)name; (c = *tname++); )
-	sig = (sig << 1) + c;
-
-    return _XrmInternalStringToQuark(name, tname-(char *)name-1, sig, True);
-}
-
-XrmQuark XrmUniqueQuark()
-{
-    XrmQuark q;
-
-    _XLockMutex(_Xglobal_lock);
-    if (nextUniq == nextQuark)
-	q = NULLQUARK;
-    else
-	q = nextUniq--;
-    _XUnlockMutex(_Xglobal_lock);
-    return q;
-}
-
-XrmString XrmQuarkToString(quark)
-    register XrmQuark quark;
-{
-    XrmString s;
-
-    _XLockMutex(_Xglobal_lock);
-    if (quark <= 0 || quark >= nextQuark)
-    	s = NULLSTRING;
-    else {
-#ifdef PERMQ
-	/* We have to mark the quark as permanent, since the caller might hold
-	 * onto the string pointer forver.
-	 */
-	SETPERM(quark);
-#endif
-	s = NAME(quark);
-    }
-    _XUnlockMutex(_Xglobal_lock);
-    return s;
-}
diff --git a/xc/lib/X11/RaiseWin.c b/xc/lib/X11/RaiseWin.c
deleted file mode 100644
index 17b68d198..000000000
--- a/xc/lib/X11/RaiseWin.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* $TOG: RaiseWin.c /main/7 1998/02/06 17:49:52 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/RaiseWin.c,v 1.2 1999/05/09 10:49:59 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XRaiseWindow (dpy, w)
-    register Display *dpy;
-    Window w;
-{
-    register xConfigureWindowReq *req;
-    unsigned long val = Above;		/* needed for macro below */
-
-    LockDisplay(dpy);
-    GetReqExtra(ConfigureWindow, 4, req);
-    req->window = w;
-    req->mask = CWStackMode;
-    OneDataCard32 (dpy, NEXTPTR(req,xConfigureWindowReq), val);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/RdBitF.c b/xc/lib/X11/RdBitF.c
deleted file mode 100644
index 1596b1d4e..000000000
--- a/xc/lib/X11/RdBitF.c
+++ /dev/null
@@ -1,290 +0,0 @@
-/* $TOG: RdBitF.c /main/20 1998/02/06 17:49:57 kaleb $ */
-/*
-
-Copyright 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/RdBitF.c,v 3.2 1999/05/09 10:50:00 dawes Exp $ */
-
-/*
- *	Code to read bitmaps from disk files. Interprets 
- *	data from X10 and X11 bitmap files and creates
- *	Pixmap representations of files. Returns Pixmap
- *	ID and specifics about image.
- *
- *	Modified for speedup by Jim Becker, changed image
- *	data parsing logic (removed some fscanf()s). 
- *	Aug 5, 1988
- *
- * Note that this file and ../Xmu/RdBitF.c look very similar....  Keep them
- * that way (but don't use common source code so that people can have one 
- * without the other).
- */
-
-#include "Xlibint.h"
-#include <X11/Xos.h>
-#include "Xutil.h"
-#include <stdio.h>
-#include <ctype.h>
-
-
-#define MAX_SIZE 255
-
-/* shared data for the image read/parse logic */
-static short hexTable[256];		/* conversion value */
-static Bool initialized = False;	/* easier to fill in at run time */
-
-
-/*
- *	Table index for the hex values. Initialized once, first time.
- *	Used for translation value or delimiter significance lookup.
- */
-static void initHexTable()
-{
-    /*
-     * We build the table at run time for several reasons:
-     *
-     *     1.  portable to non-ASCII machines.
-     *     2.  still reentrant since we set the init flag after setting table.
-     *     3.  easier to extend.
-     *     4.  less prone to bugs.
-     */
-    hexTable['0'] = 0;	hexTable['1'] = 1;
-    hexTable['2'] = 2;	hexTable['3'] = 3;
-    hexTable['4'] = 4;	hexTable['5'] = 5;
-    hexTable['6'] = 6;	hexTable['7'] = 7;
-    hexTable['8'] = 8;	hexTable['9'] = 9;
-    hexTable['A'] = 10;	hexTable['B'] = 11;
-    hexTable['C'] = 12;	hexTable['D'] = 13;
-    hexTable['E'] = 14;	hexTable['F'] = 15;
-    hexTable['a'] = 10;	hexTable['b'] = 11;
-    hexTable['c'] = 12;	hexTable['d'] = 13;
-    hexTable['e'] = 14;	hexTable['f'] = 15;
-
-    /* delimiters of significance are flagged w/ negative value */
-    hexTable[' '] = -1;	hexTable[','] = -1;
-    hexTable['}'] = -1;	hexTable['\n'] = -1;
-    hexTable['\t'] = -1;
-	
-    initialized = True;
-}
-
-/*
- *	read next hex value in the input stream, return -1 if EOF
- */
-static int
-NextInt (fstream)
-    FILE *fstream;
-{
-    int	ch;
-    int	value = 0;
-    int gotone = 0;
-    int done = 0;
-    
-    /* loop, accumulate hex value until find delimiter  */
-    /* skip any initial delimiters found in read stream */
-
-    while (!done) {
-	ch = getc(fstream);
-	if (ch == EOF) {
-	    value	= -1;
-	    done++;
-	} else {
-	    /* trim high bits, check type and accumulate */
-	    ch &= 0xff;
-	    if (isascii(ch) && isxdigit(ch)) {
-		value = (value << 4) + hexTable[ch];
-		gotone++;
-	    } else if ((hexTable[ch]) < 0 && gotone)
-	      done++;
-	}
-    }
-    return value;
-}
-
-#if NeedFunctionPrototypes
-int XReadBitmapFileData (
-    _Xconst char *filename,
-    unsigned int *width,                /* RETURNED */
-    unsigned int *height,               /* RETURNED */
-    unsigned char **data,               /* RETURNED */
-    int *x_hot,                         /* RETURNED */
-    int *y_hot)                         /* RETURNED */
-#else
-int XReadBitmapFileData (filename, width, height, data, x_hot, y_hot)
-    char *filename;
-    unsigned int *width, *height;       /* RETURNED */
-    unsigned char **data;               /* RETURNED */
-    int *x_hot, *y_hot;                 /* RETURNED */
-#endif
-{
-    FILE *fstream;			/* handle on file  */
-    unsigned char *bits = NULL;		/* working variable */
-    char line[MAX_SIZE];		/* input line from file */
-    int size;				/* number of bytes of data */
-    char name_and_type[MAX_SIZE];	/* an input line */
-    char *type;				/* for parsing */
-    int value;				/* from an input line */
-    int version10p;			/* boolean, old format */
-    int padding;			/* to handle alignment */
-    int bytes_per_line;			/* per scanline of data */
-    unsigned int ww = 0;		/* width */
-    unsigned int hh = 0;		/* height */
-    int hx = -1;			/* x hotspot */
-    int hy = -1;			/* y hotspot */
-
-    /* first time initialization */
-    if (initialized == False) initHexTable();
-
-#ifdef __EMX__
-    filename = __XOS2RedirRoot(filename);
-#endif
-    if (!(fstream = fopen(filename, "r")))
-	return BitmapOpenFailed;
-
-    /* error cleanup and return macro	*/
-#define	RETURN(code) \
-{ if (bits) Xfree ((char *)bits); fclose (fstream); return code; }
-
-    while (fgets(line, MAX_SIZE, fstream)) {
-	if (strlen(line) == MAX_SIZE-1)
-	    RETURN (BitmapFileInvalid);
-	if (sscanf(line,"#define %s %d",name_and_type,&value) == 2) {
-	    if (!(type = strrchr(name_and_type, '_')))
-	      type = name_and_type;
-	    else
-	      type++;
-
-	    if (!strcmp("width", type))
-	      ww = (unsigned int) value;
-	    if (!strcmp("height", type))
-	      hh = (unsigned int) value;
-	    if (!strcmp("hot", type)) {
-		if (type-- == name_and_type || type-- == name_and_type)
-		  continue;
-		if (!strcmp("x_hot", type))
-		  hx = value;
-		if (!strcmp("y_hot", type))
-		  hy = value;
-	    }
-	    continue;
-	}
-    
-	if (sscanf(line, "static short %s = {", name_and_type) == 1)
-	  version10p = 1;
-	else if (sscanf(line,"static unsigned char %s = {",name_and_type) == 1)
-	  version10p = 0;
-	else if (sscanf(line, "static char %s = {", name_and_type) == 1)
-	  version10p = 0;
-	else
-	  continue;
-
-	if (!(type = strrchr(name_and_type, '_')))
-	  type = name_and_type;
-	else
-	  type++;
-
-	if (strcmp("bits[]", type))
-	  continue;
-    
-	if (!ww || !hh)
-	  RETURN (BitmapFileInvalid);
-
-	if ((ww % 16) && ((ww % 16) < 9) && version10p)
-	  padding = 1;
-	else
-	  padding = 0;
-
-	bytes_per_line = (ww+7)/8 + padding;
-
-	size = bytes_per_line * hh;
-	bits = (unsigned char *) Xmalloc ((unsigned int) size);
-	if (!bits) 
-	  RETURN (BitmapNoMemory);
-
-	if (version10p) {
-	    unsigned char *ptr;
-	    int bytes;
-
-	    for (bytes=0, ptr=bits; bytes<size; (bytes += 2)) {
-		if ((value = NextInt(fstream)) < 0)
-		  RETURN (BitmapFileInvalid);
-		*(ptr++) = value;
-		if (!padding || ((bytes+2) % bytes_per_line))
-		  *(ptr++) = value >> 8;
-	    }
-	} else {
-	    unsigned char *ptr;
-	    int bytes;
-
-	    for (bytes=0, ptr=bits; bytes<size; bytes++, ptr++) {
-		if ((value = NextInt(fstream)) < 0) 
-		  RETURN (BitmapFileInvalid);
-		*ptr=value;
-	    }
-	}
-    }					/* end while */
-
-    fclose(fstream);
-    if (!bits)
-	return (BitmapFileInvalid);
-
-    *data = bits;
-    *width = ww;
-    *height = hh;
-    if (x_hot) *x_hot = hx;
-    if (y_hot) *y_hot = hy;
-
-    return (BitmapSuccess);
-}
-
-#if NeedFunctionPrototypes
-int XReadBitmapFile (
-    Display *display,
-    Drawable d,
-    _Xconst char *filename,
-    unsigned int *width,                /* RETURNED */
-    unsigned int *height,               /* RETURNED */
-    Pixmap *pixmap,                     /* RETURNED */
-    int *x_hot,                         /* RETURNED */
-    int *y_hot)                         /* RETURNED */
-#else
-int XReadBitmapFile (display, d, filename, width, height, pixmap, x_hot, y_hot)
-    Display *display;
-    Drawable d;
-    char *filename;
-    unsigned int *width, *height;       /* RETURNED */
-    Pixmap *pixmap;                     /* RETURNED */
-    int *x_hot, *y_hot;                 /* RETURNED */
-#endif
-{
-    unsigned char *data;
-    int res;
-
-    res = XReadBitmapFileData(filename, width, height, &data, x_hot, y_hot);
-    if (res != BitmapSuccess)
-	return res;
-    *pixmap = XCreateBitmapFromData(display, d, (char *)data, *width, *height);
-    Xfree((char *)data);
-    if (*pixmap == None)
-	return (BitmapNoMemory);
-    return (BitmapSuccess);
-}
diff --git a/xc/lib/X11/RecolorC.c b/xc/lib/X11/RecolorC.c
deleted file mode 100644
index 54469ed42..000000000
--- a/xc/lib/X11/RecolorC.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* $TOG: RecolorC.c /main/6 1998/02/06 17:50:03 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/RecolorC.c,v 1.2 1999/05/09 10:50:00 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XRecolorCursor(dpy, cursor, foreground, background)
-     register Display *dpy;
-     Cursor cursor;
-     XColor *foreground, *background;
-{       
-    register xRecolorCursorReq *req;
-
-    LockDisplay(dpy);
-    GetReq(RecolorCursor, req);
-    req->cursor = cursor;
-    req->foreRed = foreground->red;
-    req->foreGreen = foreground->green;
-    req->foreBlue = foreground->blue;
-    req->backRed = background->red;
-    req->backGreen = background->green;
-    req->backBlue = background->blue;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/ReconfWM.c b/xc/lib/X11/ReconfWM.c
deleted file mode 100644
index 8cf8572e0..000000000
--- a/xc/lib/X11/ReconfWM.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/* $TOG: ReconfWM.c /main/10 1998/02/06 17:50:16 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-#define NEED_EVENTS
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-#define AllMaskBits (CWX|CWY|CWWidth|CWHeight|\
-                     CWBorderWidth|CWSibling|CWStackMode)
-
-Status XReconfigureWMWindow (dpy, w, screen, mask, changes)
-    register Display *dpy;
-    Window w;
-    int screen;
-    unsigned int mask;
-    XWindowChanges *changes;
-{
-    XConfigureRequestEvent ev;
-    Window root = RootWindow (dpy, screen);
-    _XAsyncHandler async;
-    _XAsyncErrorState async_state;
-
-    /*
-     * Only need to go through the trouble if we are actually changing the
-     * stacking mode.
-     */
-    if (!(mask & CWStackMode)) {
-	XConfigureWindow (dpy, w, mask, changes);
-	return True;
-    }
-
-
-    /*
-     * We need to inline XConfigureWindow and XSync so that everything is done
-     * while the display is locked.
-     */
-
-    LockDisplay(dpy);
-
-    /*
-     * XConfigureWindow (dpy, w, mask, changes);
-     */
-    {
-	unsigned long values[7];
-	register unsigned long *value = values;
-	long nvalues;
-	register xConfigureWindowReq *req;
-
-	GetReq(ConfigureWindow, req);
-
-	async_state.min_sequence_number = dpy->request;
-	async_state.max_sequence_number = dpy->request;
-	async_state.error_code = BadMatch;
-	async_state.major_opcode = X_ConfigureWindow;
-	async_state.minor_opcode = 0;
-	async_state.error_count = 0;
-	async.next = dpy->async_handlers;
-	async.handler = _XAsyncErrorHandler;
-	async.data = (XPointer)&async_state;
-	dpy->async_handlers = &async;
-
-	req->window = w;
-	mask &= AllMaskBits;
-	req->mask = mask;
-
-	if (mask & CWX) *value++ = changes->x;
-	if (mask & CWY) *value++ = changes->y;
-	if (mask & CWWidth) *value++ = changes->width;
-	if (mask & CWHeight) *value++ = changes->height;
-	if (mask & CWBorderWidth) *value++ = changes->border_width;
-	if (mask & CWSibling) *value++ = changes->sibling;
-	if (mask & CWStackMode) *value++ = changes->stack_mode;
-	req->length += (nvalues = value - values);
-	nvalues <<= 2;			/* watch out for macros... */
-	Data32 (dpy, (long *) values, nvalues);
-    }
-
-    /*
-     * XSync (dpy, 0)
-     */
-    {
-	xGetInputFocusReply rep;
-	register xReq *req;
-
-	GetEmptyReq(GetInputFocus, req);
-	(void) _XReply (dpy, (xReply *)&rep, 0, xTrue);
-    }
-
-    DeqAsyncHandler(dpy, &async);
-    UnlockDisplay(dpy);
-    SyncHandle();
-
-
-    /*
-     * If the request succeeded, then everything is okay; otherwise, send event
-     */
-    if (!async_state.error_count) return True;
-
-    ev.type		= ConfigureRequest;
-    ev.window		= w;
-    ev.parent		= root;
-    ev.value_mask	= (mask & AllMaskBits);
-    ev.x		= changes->x;
-    ev.y		= changes->y;
-    ev.width		= changes->width;
-    ev.height		= changes->height;
-    ev.border_width	= changes->border_width;
-    ev.above		= changes->sibling;
-    ev.detail		= changes->stack_mode;
-    return (XSendEvent (dpy, root, False,
-			SubstructureRedirectMask|SubstructureNotifyMask,
-			(XEvent *)&ev));
-}
diff --git a/xc/lib/X11/ReconfWin.c b/xc/lib/X11/ReconfWin.c
deleted file mode 100644
index 80ff67655..000000000
--- a/xc/lib/X11/ReconfWin.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* $TOG: ReconfWin.c /main/10 1998/02/06 17:50:10 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/ReconfWin.c,v 1.2 1999/05/09 10:50:01 dawes Exp $ */
-
-#include "Xlibint.h"
-
-#define AllMaskBits (CWX|CWY|CWWidth|CWHeight|\
-		     CWBorderWidth|CWSibling|CWStackMode)
-
-int
-XConfigureWindow(dpy, w, mask, changes)
-    register Display *dpy;
-    Window w;
-    unsigned int mask;
-    XWindowChanges *changes;
-    {
-    unsigned long values[7];
-    register unsigned long *value = values;
-    long nvalues;
-    register xConfigureWindowReq *req;
-
-    LockDisplay(dpy);
-    GetReq(ConfigureWindow, req);
-    req->window = w;
-    mask &= AllMaskBits;
-    req->mask = mask;
-
-    if (mask & CWX)
-	*value++ = changes->x;
-	
-    if (mask & CWY)
-    	*value++ = changes->y;
-
-    if (mask & CWWidth)
-    	*value++ = changes->width;
-
-    if (mask & CWHeight)
-    	*value++ = changes->height;
-
-    if (mask & CWBorderWidth)
-    	*value++ = changes->border_width;
-
-    if (mask & CWSibling)
-	*value++ = changes->sibling;
-
-    if (mask & CWStackMode)
-        *value++ = changes->stack_mode;
-
-    req->length += (nvalues = value - values);
-
-    nvalues <<= 2;			/* watch out for macros... */
-    Data32 (dpy, (long *) values, nvalues);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-    }
diff --git a/xc/lib/X11/Region.c b/xc/lib/X11/Region.c
deleted file mode 100644
index b08e6d7f7..000000000
--- a/xc/lib/X11/Region.c
+++ /dev/null
@@ -1,1678 +0,0 @@
-/* $TOG: Region.c /main/31 1998/02/06 17:50:22 kaleb $ */
-/************************************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-************************************************************************/
-/* $XFree86: xc/lib/X11/Region.c,v 1.5 1999/05/09 10:50:01 dawes Exp $ */
-/*
- * The functions in this file implement the Region abstraction, similar to one
- * used in the X11 sample server. A Region is simply an area, as the name
- * implies, and is implemented as a "y-x-banded" array of rectangles. To
- * explain: Each Region is made up of a certain number of rectangles sorted
- * by y coordinate first, and then by x coordinate.
- *
- * Furthermore, the rectangles are banded such that every rectangle with a
- * given upper-left y coordinate (y1) will have the same lower-right y
- * coordinate (y2) and vice versa. If a rectangle has scanlines in a band, it
- * will span the entire vertical distance of the band. This means that some
- * areas that could be merged into a taller rectangle will be represented as
- * several shorter rectangles to account for shorter rectangles to its left
- * or right but within its "vertical scope".
- *
- * An added constraint on the rectangles is that they must cover as much
- * horizontal area as possible. E.g. no two rectangles in a band are allowed
- * to touch.
- *
- * Whenever possible, bands will be merged together to cover a greater vertical
- * distance (and thus reduce the number of rectangles). Two bands can be merged
- * only if the bottom of one touches the top of the other and they have
- * rectangles in the same places (of the same width, of course). This maintains
- * the y-x-banding that's so nice to have...
- */
-
-#include "Xlibint.h"
-#include "Xutil.h"
-#include "region.h"
-#include "poly.h"
-
-#ifdef DEBUG
-#include <stdio.h>
-#define assert(expr) {if (!(expr)) fprintf(stderr,\
-"Assertion failed file %s, line %d: expr\n", __FILE__, __LINE__); }
-#else
-#define assert(expr)
-#endif
-
-typedef void (*voidProcp)();
-
-static void miRegionOp();
-/*	Create a new empty region	*/
-Region
-XCreateRegion()
-{
-    Region temp;
-
-    if (! (temp = ( Region )Xmalloc( (unsigned) sizeof( REGION ))))
-	return (Region) NULL;
-    if (! (temp->rects = ( BOX * )Xmalloc( (unsigned) sizeof( BOX )))) {
-	Xfree((char *) temp);
-	return (Region) NULL;
-    }
-    temp->numRects = 0;
-    temp->extents.x1 = 0;
-    temp->extents.y1 = 0;
-    temp->extents.x2 = 0;
-    temp->extents.y2 = 0;
-    temp->size = 1;
-    return( temp );
-}
-
-int
-XClipBox( r, rect )
-    Region r;
-    XRectangle *rect;
-{
-    rect->x = r->extents.x1;
-    rect->y = r->extents.y1;
-    rect->width = r->extents.x2 - r->extents.x1;
-    rect->height = r->extents.y2 - r->extents.y1;
-    return 1;
-}
-
-int
-XUnionRectWithRegion(rect, source, dest)
-    register XRectangle *rect;
-    Region source, dest;
-{
-    REGION region;
-
-    if (!rect->width || !rect->height)
-	return 0;
-    region.rects = &region.extents;
-    region.numRects = 1;
-    region.extents.x1 = rect->x;
-    region.extents.y1 = rect->y;
-    region.extents.x2 = rect->x + rect->width;
-    region.extents.y2 = rect->y + rect->height;
-    region.size = 1;
-
-    return XUnionRegion(&region, source, dest);
-}
-
-/*-
- *-----------------------------------------------------------------------
- * miSetExtents --
- *	Reset the extents of a region to what they should be. Called by
- *	miSubtract and miIntersect b/c they can't figure it out along the
- *	way or do so easily, as miUnion can.
- *
- * Results:
- *	None.
- *
- * Side Effects:
- *	The region's 'extents' structure is overwritten.
- *
- *-----------------------------------------------------------------------
- */
-static void
-miSetExtents (pReg)
-    Region	  	pReg;
-{
-    register BoxPtr	pBox,
-			pBoxEnd,
-			pExtents;
-
-    if (pReg->numRects == 0)
-    {
-	pReg->extents.x1 = 0;
-	pReg->extents.y1 = 0;
-	pReg->extents.x2 = 0;
-	pReg->extents.y2 = 0;
-	return;
-    }
-
-    pExtents = &pReg->extents;
-    pBox = pReg->rects;
-    pBoxEnd = &pBox[pReg->numRects - 1];
-
-    /*
-     * Since pBox is the first rectangle in the region, it must have the
-     * smallest y1 and since pBoxEnd is the last rectangle in the region,
-     * it must have the largest y2, because of banding. Initialize x1 and
-     * x2 from  pBox and pBoxEnd, resp., as good things to initialize them
-     * to...
-     */
-    pExtents->x1 = pBox->x1;
-    pExtents->y1 = pBox->y1;
-    pExtents->x2 = pBoxEnd->x2;
-    pExtents->y2 = pBoxEnd->y2;
-
-    assert(pExtents->y1 < pExtents->y2);
-    while (pBox <= pBoxEnd)
-    {
-	if (pBox->x1 < pExtents->x1)
-	{
-	    pExtents->x1 = pBox->x1;
-	}
-	if (pBox->x2 > pExtents->x2)
-	{
-	    pExtents->x2 = pBox->x2;
-	}
-	pBox++;
-    }
-    assert(pExtents->x1 < pExtents->x2);
-}
-
-int
-XSetRegion( dpy, gc, r )
-    Display *dpy;
-    GC gc;
-    register Region r;
-{
-    register int i;
-    register XRectangle *xr, *pr;
-    register BOX *pb;
-    unsigned long total;
-    extern void _XSetClipRectangles();
-
-    LockDisplay (dpy);
-    total = r->numRects * sizeof (XRectangle);
-    if ((xr = (XRectangle *) _XAllocTemp(dpy, total))) {
-	for (pr = xr, pb = r->rects, i = r->numRects; --i >= 0; pr++, pb++) {
-	    pr->x = pb->x1;
-	    pr->y = pb->y1;
-	    pr->width = pb->x2 - pb->x1;
-	    pr->height = pb->y2 - pb->y1;
-	}
-    }
-    if (xr || !r->numRects)
-	_XSetClipRectangles(dpy, gc, 0, 0, xr, r->numRects, YXBanded);
-    if (xr)
-	_XFreeTemp(dpy, (char *)xr, total);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
-int
-XDestroyRegion( r )
-    Region r;
-{
-    Xfree( (char *) r->rects );
-    Xfree( (char *) r );
-    return 1;
-}
-
-
-/* TranslateRegion(pRegion, x, y)
-   translates in place
-   added by raymond
-*/
-
-int
-XOffsetRegion(pRegion, x, y)
-    register Region pRegion;
-    register int x;
-    register int y;
-{
-    register int nbox;
-    register BOX *pbox;
-
-    pbox = pRegion->rects;
-    nbox = pRegion->numRects;
-
-    while(nbox--)
-    {
-	pbox->x1 += x;
-	pbox->x2 += x;
-	pbox->y1 += y;
-	pbox->y2 += y;
-	pbox++;
-    }
-    pRegion->extents.x1 += x;
-    pRegion->extents.x2 += x;
-    pRegion->extents.y1 += y;
-    pRegion->extents.y2 += y;
-    return 1;
-}
-
-/* 
-   Utility procedure Compress:
-   Replace r by the region r', where 
-     p in r' iff (Quantifer m <= dx) (p + m in r), and
-     Quantifier is Exists if grow is TRUE, For all if grow is FALSE, and
-     (x,y) + m = (x+m,y) if xdir is TRUE; (x,y+m) if xdir is FALSE.
-
-   Thus, if xdir is TRUE and grow is FALSE, r is replaced by the region
-   of all points p such that p and the next dx points on the same
-   horizontal scan line are all in r.  We do this using by noting
-   that p is the head of a run of length 2^i + k iff p is the head
-   of a run of length 2^i and p+2^i is the head of a run of length
-   k. Thus, the loop invariant: s contains the region corresponding
-   to the runs of length shift.  r contains the region corresponding
-   to the runs of length 1 + dxo & (shift-1), where dxo is the original
-   value of dx.  dx = dxo & ~(shift-1).  As parameters, s and t are
-   scratch regions, so that we don't have to allocate them on every
-   call.
-*/
-
-#define ZOpRegion(a,b,c) if (grow) XUnionRegion(a,b,c); \
-			 else XIntersectRegion(a,b,c)
-#define ZShiftRegion(a,b) if (xdir) XOffsetRegion(a,b,0); \
-			  else XOffsetRegion(a,0,b)
-#define ZCopyRegion(a,b) XUnionRegion(a,a,b)
-
-static void
-Compress(r, s, t, dx, xdir, grow)
-    Region r, s, t;
-    register unsigned dx;
-    register int xdir, grow;
-{
-    register unsigned shift = 1;
-
-    ZCopyRegion(r, s);
-    while (dx) {
-        if (dx & shift) {
-            ZShiftRegion(r, -(int)shift);
-            ZOpRegion(r, s, r);
-            dx -= shift;
-            if (!dx) break;
-        }
-        ZCopyRegion(s, t);
-        ZShiftRegion(s, -(int)shift);
-        ZOpRegion(s, t, s);
-        shift <<= 1;
-    }
-}
-
-#undef ZOpRegion
-#undef ZShiftRegion
-#undef ZCopyRegion
-
-int
-XShrinkRegion(r, dx, dy)
-    Region r;
-    int dx, dy;
-{
-    Region s, t;
-    int grow;
-
-    if (!dx && !dy) return 0;
-    if ((! (s = XCreateRegion()))  || (! (t = XCreateRegion()))) return 0;
-    if ((grow = (dx < 0))) dx = -dx;
-    if (dx) Compress(r, s, t, (unsigned) 2*dx, TRUE, grow);
-    if ((grow = (dy < 0))) dy = -dy;
-    if (dy) Compress(r, s, t, (unsigned) 2*dy, FALSE, grow);
-    XOffsetRegion(r, dx, dy);
-    XDestroyRegion(s);
-    XDestroyRegion(t);
-    return 0;
-}
-
-#ifdef notdef
-/***********************************************************
- *     Bop down the array of rects until we have passed
- *     scanline y.  numRects is the size of the array.
- ***********************************************************/
-
-static BOX 
-*IndexRects(rects, numRects, y)
-    register BOX *rects;
-    register int numRects;
-    register int y;
-{
-     while ((numRects--) && (rects->y2 <= y))
-        rects++;
-     return(rects);
-}
-#endif
-
-/*======================================================================
- *	    Region Intersection
- *====================================================================*/
-/*-
- *-----------------------------------------------------------------------
- * miIntersectO --
- *	Handle an overlapping band for miIntersect.
- *
- * Results:
- *	None.
- *
- * Side Effects:
- *	Rectangles may be added to the region.
- *
- *-----------------------------------------------------------------------
- */
-/* static void*/
-static int
-miIntersectO (pReg, r1, r1End, r2, r2End, y1, y2)
-    register Region	pReg;
-    register BoxPtr	r1;
-    BoxPtr  	  	r1End;
-    register BoxPtr	r2;
-    BoxPtr  	  	r2End;
-    short    	  	y1;
-    short    	  	y2;
-{
-    register short  	x1;
-    register short  	x2;
-    register BoxPtr	pNextRect;
-
-    pNextRect = &pReg->rects[pReg->numRects];
-
-    while ((r1 != r1End) && (r2 != r2End))
-    {
-	x1 = max(r1->x1,r2->x1);
-	x2 = min(r1->x2,r2->x2);
-
-	/*
-	 * If there's any overlap between the two rectangles, add that
-	 * overlap to the new region.
-	 * There's no need to check for subsumption because the only way
-	 * such a need could arise is if some region has two rectangles
-	 * right next to each other. Since that should never happen...
-	 */
-	if (x1 < x2)
-	{
-	    assert(y1<y2);
-
-	    MEMCHECK(pReg, pNextRect, pReg->rects);
-	    pNextRect->x1 = x1;
-	    pNextRect->y1 = y1;
-	    pNextRect->x2 = x2;
-	    pNextRect->y2 = y2;
-	    pReg->numRects += 1;
-	    pNextRect++;
-	    assert(pReg->numRects <= pReg->size);
-	}
-
-	/*
-	 * Need to advance the pointers. Shift the one that extends
-	 * to the right the least, since the other still has a chance to
-	 * overlap with that region's next rectangle, if you see what I mean.
-	 */
-	if (r1->x2 < r2->x2)
-	{
-	    r1++;
-	}
-	else if (r2->x2 < r1->x2)
-	{
-	    r2++;
-	}
-	else
-	{
-	    r1++;
-	    r2++;
-	}
-    }
-    return 0;	/* lint */
-}
-
-int
-XIntersectRegion(reg1, reg2, newReg)
-    Region 	  	reg1;
-    Region	  	reg2;          /* source regions     */
-    register Region 	newReg;               /* destination Region */
-{
-   /* check for trivial reject */
-    if ( (!(reg1->numRects)) || (!(reg2->numRects))  ||
-	(!EXTENTCHECK(&reg1->extents, &reg2->extents)))
-        newReg->numRects = 0;
-    else
-	miRegionOp (newReg, reg1, reg2, 
-    		(voidProcp) miIntersectO, (voidProcp) NULL, (voidProcp) NULL);
-    
-    /*
-     * Can't alter newReg's extents before we call miRegionOp because
-     * it might be one of the source regions and miRegionOp depends
-     * on the extents of those regions being the same. Besides, this
-     * way there's no checking against rectangles that will be nuked
-     * due to coalescing, so we have to examine fewer rectangles.
-     */
-    miSetExtents(newReg);
-    return 1;
-}
-
-static void
-miRegionCopy(dstrgn, rgn)
-    register Region dstrgn;
-    register Region rgn;
-
-{
-    if (dstrgn != rgn) /*  don't want to copy to itself */
-    {  
-        if (dstrgn->size < rgn->numRects)
-        {
-            if (dstrgn->rects)
-            {
-		BOX *prevRects = dstrgn->rects;
-		
-                if (! (dstrgn->rects = (BOX *)
-		       Xrealloc((char *) dstrgn->rects,
-				(unsigned) rgn->numRects * (sizeof(BOX))))) {
-		    Xfree(prevRects);
-		    return;
-		}
-            }
-            dstrgn->size = rgn->numRects;
-	}
-        dstrgn->numRects = rgn->numRects;
-        dstrgn->extents.x1 = rgn->extents.x1;
-        dstrgn->extents.y1 = rgn->extents.y1;
-        dstrgn->extents.x2 = rgn->extents.x2;
-        dstrgn->extents.y2 = rgn->extents.y2;
-
-	memcpy((char *) dstrgn->rects, (char *) rgn->rects,
-	       (int) (rgn->numRects * sizeof(BOX)));
-    }
-}
-
-#ifdef notdef
-
-/*
- *  combinRegs(newReg, reg1, reg2)
- *    if one region is above or below the other.
-*/ 
-
-static void
-combineRegs(newReg, reg1, reg2)
-    register Region newReg;
-    Region reg1;
-    Region reg2;
-{
-    register Region tempReg;
-    register BOX *rects;
-    register BOX *rects1;
-    register BOX *rects2;
-    register int total;
-
-    rects1 = reg1->rects;
-    rects2 = reg2->rects;
-
-    total = reg1->numRects + reg2->numRects;
-    if (! (tempReg = XCreateRegion()))
-	return;
-    tempReg->size = total;
-    /*  region 1 is below region 2  */
-    if (reg1->extents.y1 > reg2->extents.y1)
-    {
-        miRegionCopy(tempReg, reg2);
-        rects = &tempReg->rects[tempReg->numRects];
-        total -= tempReg->numRects;
-        while (total--)
-            *rects++ = *rects1++;
-    }
-    else
-    {
-        miRegionCopy(tempReg, reg1);
-        rects = &tempReg->rects[tempReg->numRects];
-        total -= tempReg->numRects;
-        while (total--)
-            *rects++ = *rects2++;
-    }
-    tempReg->extents = reg1->extents;
-    tempReg->numRects = reg1->numRects + reg2->numRects;
-    EXTENTS(&reg2->extents, tempReg);  
-    miRegionCopy(newReg, tempReg);
-    Xfree((char *)tempReg);
-}
-
-/*
- *  QuickCheck checks to see if it does not have to go through all the
- *  the ugly code for the region call.  It returns 1 if it did all
- *  the work for Union, otherwise 0 - still work to be done.
-*/ 
-
-static int
-QuickCheck(newReg, reg1, reg2)
-    Region newReg, reg1, reg2;
-{
-
-    /*  if unioning with itself or no rects to union with  */
-    if ( (reg1 == reg2) || (!(reg1->numRects)) )
-    {
-        miRegionCopy(newReg, reg2);
-        return TRUE;
-    }
-
-    /*   if nothing to union   */
-    if (!(reg2->numRects))
-    {
-        miRegionCopy(newReg, reg1);
-        return TRUE;
-    }
-
-    /*   could put an extent check to see if add above or below */
-
-    if ((reg1->extents.y1 >= reg2->extents.y2) ||
-        (reg2->extents.y1 >= reg1->extents.y2) )
-    {
-        combineRegs(newReg, reg1, reg2);
-        return TRUE;
-    }
-    return FALSE;
-}
-
-/*   TopRects(rects, reg1, reg2)
- * N.B. We now assume that reg1 and reg2 intersect.  Therefore we are
- * NOT checking in the two while loops for stepping off the end of the
- * region.  
- */ 
-
-static int
-TopRects(newReg, rects, reg1, reg2, FirstRect)
-    register Region newReg;
-    register BOX *rects;
-    register Region reg1;
-    register Region reg2; 
-    BOX *FirstRect;
-{
-    register BOX *tempRects;
-
-    /*  need to add some rects from region 1 */
-    if (reg1->extents.y1 < reg2->extents.y1)
-    {
-        tempRects = reg1->rects;
-        while(tempRects->y1 < reg2->extents.y1)
-	{
-	    MEMCHECK(newReg, rects, FirstRect);
-            ADDRECTNOX(newReg,rects, tempRects->x1, tempRects->y1, 
-		       tempRects->x2, MIN(tempRects->y2, reg2->extents.y1));
-            tempRects++;
-	}
-    }
-    /*  need to add some rects from region 2 */
-    if (reg2->extents.y1 < reg1->extents.y1)
-    {
-        tempRects = reg2->rects;
-        while (tempRects->y1 < reg1->extents.y1)
-        {
-            MEMCHECK(newReg, rects, FirstRect);
-            ADDRECTNOX(newReg, rects, tempRects->x1,tempRects->y1, 
-		       tempRects->x2, MIN(tempRects->y2, reg1->extents.y1));
-            tempRects++;
-	}
-    }
-    return 1;
-}
-#endif
-
-/*======================================================================
- *	    Generic Region Operator
- *====================================================================*/
-
-/*-
- *-----------------------------------------------------------------------
- * miCoalesce --
- *	Attempt to merge the boxes in the current band with those in the
- *	previous one. Used only by miRegionOp.
- *
- * Results:
- *	The new index for the previous band.
- *
- * Side Effects:
- *	If coalescing takes place:
- *	    - rectangles in the previous band will have their y2 fields
- *	      altered.
- *	    - pReg->numRects will be decreased.
- *
- *-----------------------------------------------------------------------
- */
-/* static int*/
-static int
-miCoalesce (pReg, prevStart, curStart)
-    register Region	pReg;	    	/* Region to coalesce */
-    int	    	  	prevStart;  	/* Index of start of previous band */
-    int	    	  	curStart;   	/* Index of start of current band */
-{
-    register BoxPtr	pPrevBox;   	/* Current box in previous band */
-    register BoxPtr	pCurBox;    	/* Current box in current band */
-    register BoxPtr	pRegEnd;    	/* End of region */
-    int	    	  	curNumRects;	/* Number of rectangles in current
-					 * band */
-    int	    	  	prevNumRects;	/* Number of rectangles in previous
-					 * band */
-    int	    	  	bandY1;	    	/* Y1 coordinate for current band */
-
-    pRegEnd = &pReg->rects[pReg->numRects];
-
-    pPrevBox = &pReg->rects[prevStart];
-    prevNumRects = curStart - prevStart;
-
-    /*
-     * Figure out how many rectangles are in the current band. Have to do
-     * this because multiple bands could have been added in miRegionOp
-     * at the end when one region has been exhausted.
-     */
-    pCurBox = &pReg->rects[curStart];
-    bandY1 = pCurBox->y1;
-    for (curNumRects = 0;
-	 (pCurBox != pRegEnd) && (pCurBox->y1 == bandY1);
-	 curNumRects++)
-    {
-	pCurBox++;
-    }
-    
-    if (pCurBox != pRegEnd)
-    {
-	/*
-	 * If more than one band was added, we have to find the start
-	 * of the last band added so the next coalescing job can start
-	 * at the right place... (given when multiple bands are added,
-	 * this may be pointless -- see above).
-	 */
-	pRegEnd--;
-	while (pRegEnd[-1].y1 == pRegEnd->y1)
-	{
-	    pRegEnd--;
-	}
-	curStart = pRegEnd - pReg->rects;
-	pRegEnd = pReg->rects + pReg->numRects;
-    }
-	
-    if ((curNumRects == prevNumRects) && (curNumRects != 0)) {
-	pCurBox -= curNumRects;
-	/*
-	 * The bands may only be coalesced if the bottom of the previous
-	 * matches the top scanline of the current.
-	 */
-	if (pPrevBox->y2 == pCurBox->y1)
-	{
-	    /*
-	     * Make sure the bands have boxes in the same places. This
-	     * assumes that boxes have been added in such a way that they
-	     * cover the most area possible. I.e. two boxes in a band must
-	     * have some horizontal space between them.
-	     */
-	    do
-	    {
-		if ((pPrevBox->x1 != pCurBox->x1) ||
-		    (pPrevBox->x2 != pCurBox->x2))
-		{
-		    /*
-		     * The bands don't line up so they can't be coalesced.
-		     */
-		    return (curStart);
-		}
-		pPrevBox++;
-		pCurBox++;
-		prevNumRects -= 1;
-	    } while (prevNumRects != 0);
-
-	    pReg->numRects -= curNumRects;
-	    pCurBox -= curNumRects;
-	    pPrevBox -= curNumRects;
-
-	    /*
-	     * The bands may be merged, so set the bottom y of each box
-	     * in the previous band to that of the corresponding box in
-	     * the current band.
-	     */
-	    do
-	    {
-		pPrevBox->y2 = pCurBox->y2;
-		pPrevBox++;
-		pCurBox++;
-		curNumRects -= 1;
-	    } while (curNumRects != 0);
-
-	    /*
-	     * If only one band was added to the region, we have to backup
-	     * curStart to the start of the previous band.
-	     *
-	     * If more than one band was added to the region, copy the
-	     * other bands down. The assumption here is that the other bands
-	     * came from the same region as the current one and no further
-	     * coalescing can be done on them since it's all been done
-	     * already... curStart is already in the right place.
-	     */
-	    if (pCurBox == pRegEnd)
-	    {
-		curStart = prevStart;
-	    }
-	    else
-	    {
-		do
-		{
-		    *pPrevBox++ = *pCurBox++;
-		} while (pCurBox != pRegEnd);
-	    }
-	    
-	}
-    }
-    return (curStart);
-}
-
-/*-
- *-----------------------------------------------------------------------
- * miRegionOp --
- *	Apply an operation to two regions. Called by miUnion, miInverse,
- *	miSubtract, miIntersect...
- *
- * Results:
- *	None.
- *
- * Side Effects:
- *	The new region is overwritten.
- *
- * Notes:
- *	The idea behind this function is to view the two regions as sets.
- *	Together they cover a rectangle of area that this function divides
- *	into horizontal bands where points are covered only by one region
- *	or by both. For the first case, the nonOverlapFunc is called with
- *	each the band and the band's upper and lower extents. For the
- *	second, the overlapFunc is called to process the entire band. It
- *	is responsible for clipping the rectangles in the band, though
- *	this function provides the boundaries.
- *	At the end of each band, the new region is coalesced, if possible,
- *	to reduce the number of rectangles in the region.
- *
- *-----------------------------------------------------------------------
- */
-/* static void*/
-static void
-miRegionOp(newReg, reg1, reg2, overlapFunc,  nonOverlap1Func, nonOverlap2Func)
-    register Region 	newReg;	    	    	/* Place to store result */
-    Region	  	reg1;	    	    	/* First region in operation */
-    Region	  	reg2;	    	    	/* 2d region in operation */
-    void    	  	(*overlapFunc)();   	/* Function to call for over-
-						 * lapping bands */
-    void    	  	(*nonOverlap1Func)();	/* Function to call for non-
-						 * overlapping bands in region
-						 * 1 */
-    void    	  	(*nonOverlap2Func)();	/* Function to call for non-
-						 * overlapping bands in region
-						 * 2 */
-{
-    register BoxPtr	r1; 	    	    	/* Pointer into first region */
-    register BoxPtr	r2; 	    	    	/* Pointer into 2d region */
-    BoxPtr  	  	r1End;	    	    	/* End of 1st region */
-    BoxPtr  	  	r2End;	    	    	/* End of 2d region */
-    register short  	ybot;	    	    	/* Bottom of intersection */
-    register short  	ytop;	    	    	/* Top of intersection */
-    BoxPtr  	  	oldRects;   	    	/* Old rects for newReg */
-    int	    	  	prevBand;   	    	/* Index of start of
-						 * previous band in newReg */
-    int	    	  	curBand;    	    	/* Index of start of current
-						 * band in newReg */
-    register BoxPtr 	r1BandEnd;  	    	/* End of current band in r1 */
-    register BoxPtr 	r2BandEnd;  	    	/* End of current band in r2 */
-    short     	  	top;	    	    	/* Top of non-overlapping
-						 * band */
-    short     	  	bot;	    	    	/* Bottom of non-overlapping
-						 * band */
-    
-    /*
-     * Initialization:
-     *	set r1, r2, r1End and r2End appropriately, preserve the important
-     * parts of the destination region until the end in case it's one of
-     * the two source regions, then mark the "new" region empty, allocating
-     * another array of rectangles for it to use.
-     */
-    r1 = reg1->rects;
-    r2 = reg2->rects;
-    r1End = r1 + reg1->numRects;
-    r2End = r2 + reg2->numRects;
-    
-    oldRects = newReg->rects;
-    
-    EMPTY_REGION(newReg);
-
-    /*
-     * Allocate a reasonable number of rectangles for the new region. The idea
-     * is to allocate enough so the individual functions don't need to
-     * reallocate and copy the array, which is time consuming, yet we don't
-     * have to worry about using too much memory. I hope to be able to
-     * nuke the Xrealloc() at the end of this function eventually.
-     */
-    newReg->size = max(reg1->numRects,reg2->numRects) * 2;
-
-    if (! (newReg->rects = (BoxPtr)
-	   Xmalloc ((unsigned) (sizeof(BoxRec) * newReg->size)))) {
-	newReg->size = 0;
-	return;
-    }
-    
-    /*
-     * Initialize ybot and ytop.
-     * In the upcoming loop, ybot and ytop serve different functions depending
-     * on whether the band being handled is an overlapping or non-overlapping
-     * band.
-     * 	In the case of a non-overlapping band (only one of the regions
-     * has points in the band), ybot is the bottom of the most recent
-     * intersection and thus clips the top of the rectangles in that band.
-     * ytop is the top of the next intersection between the two regions and
-     * serves to clip the bottom of the rectangles in the current band.
-     *	For an overlapping band (where the two regions intersect), ytop clips
-     * the top of the rectangles of both regions and ybot clips the bottoms.
-     */
-    if (reg1->extents.y1 < reg2->extents.y1)
-	ybot = reg1->extents.y1;
-    else
-	ybot = reg2->extents.y1;
-    
-    /*
-     * prevBand serves to mark the start of the previous band so rectangles
-     * can be coalesced into larger rectangles. qv. miCoalesce, above.
-     * In the beginning, there is no previous band, so prevBand == curBand
-     * (curBand is set later on, of course, but the first band will always
-     * start at index 0). prevBand and curBand must be indices because of
-     * the possible expansion, and resultant moving, of the new region's
-     * array of rectangles.
-     */
-    prevBand = 0;
-    
-    do
-    {
-	curBand = newReg->numRects;
-
-	/*
-	 * This algorithm proceeds one source-band (as opposed to a
-	 * destination band, which is determined by where the two regions
-	 * intersect) at a time. r1BandEnd and r2BandEnd serve to mark the
-	 * rectangle after the last one in the current band for their
-	 * respective regions.
-	 */
-	r1BandEnd = r1;
-	while ((r1BandEnd != r1End) && (r1BandEnd->y1 == r1->y1))
-	{
-	    r1BandEnd++;
-	}
-	
-	r2BandEnd = r2;
-	while ((r2BandEnd != r2End) && (r2BandEnd->y1 == r2->y1))
-	{
-	    r2BandEnd++;
-	}
-	
-	/*
-	 * First handle the band that doesn't intersect, if any.
-	 *
-	 * Note that attention is restricted to one band in the
-	 * non-intersecting region at once, so if a region has n
-	 * bands between the current position and the next place it overlaps
-	 * the other, this entire loop will be passed through n times.
-	 */
-	if (r1->y1 < r2->y1)
-	{
-	    top = max(r1->y1,ybot);
-	    bot = min(r1->y2,r2->y1);
-
-	    if ((top != bot) && (nonOverlap1Func != (void (*)())NULL))
-	    {
-		(* nonOverlap1Func) (newReg, r1, r1BandEnd, top, bot);
-	    }
-
-	    ytop = r2->y1;
-	}
-	else if (r2->y1 < r1->y1)
-	{
-	    top = max(r2->y1,ybot);
-	    bot = min(r2->y2,r1->y1);
-
-	    if ((top != bot) && (nonOverlap2Func != (void (*)())NULL))
-	    {
-		(* nonOverlap2Func) (newReg, r2, r2BandEnd, top, bot);
-	    }
-
-	    ytop = r1->y1;
-	}
-	else
-	{
-	    ytop = r1->y1;
-	}
-
-	/*
-	 * If any rectangles got added to the region, try and coalesce them
-	 * with rectangles from the previous band. Note we could just do
-	 * this test in miCoalesce, but some machines incur a not
-	 * inconsiderable cost for function calls, so...
-	 */
-	if (newReg->numRects != curBand)
-	{
-	    prevBand = miCoalesce (newReg, prevBand, curBand);
-	}
-
-	/*
-	 * Now see if we've hit an intersecting band. The two bands only
-	 * intersect if ybot > ytop
-	 */
-	ybot = min(r1->y2, r2->y2);
-	curBand = newReg->numRects;
-	if (ybot > ytop)
-	{
-	    (* overlapFunc) (newReg, r1, r1BandEnd, r2, r2BandEnd, ytop, ybot);
-
-	}
-	
-	if (newReg->numRects != curBand)
-	{
-	    prevBand = miCoalesce (newReg, prevBand, curBand);
-	}
-
-	/*
-	 * If we've finished with a band (y2 == ybot) we skip forward
-	 * in the region to the next band.
-	 */
-	if (r1->y2 == ybot)
-	{
-	    r1 = r1BandEnd;
-	}
-	if (r2->y2 == ybot)
-	{
-	    r2 = r2BandEnd;
-	}
-    } while ((r1 != r1End) && (r2 != r2End));
-
-    /*
-     * Deal with whichever region still has rectangles left.
-     */
-    curBand = newReg->numRects;
-    if (r1 != r1End)
-    {
-	if (nonOverlap1Func != (void (*)())NULL)
-	{
-	    do
-	    {
-		r1BandEnd = r1;
-		while ((r1BandEnd < r1End) && (r1BandEnd->y1 == r1->y1))
-		{
-		    r1BandEnd++;
-		}
-		(* nonOverlap1Func) (newReg, r1, r1BandEnd,
-				     max(r1->y1,ybot), r1->y2);
-		r1 = r1BandEnd;
-	    } while (r1 != r1End);
-	}
-    }
-    else if ((r2 != r2End) && (nonOverlap2Func != (void (*)())NULL))
-    {
-	do
-	{
-	    r2BandEnd = r2;
-	    while ((r2BandEnd < r2End) && (r2BandEnd->y1 == r2->y1))
-	    {
-		 r2BandEnd++;
-	    }
-	    (* nonOverlap2Func) (newReg, r2, r2BandEnd,
-				max(r2->y1,ybot), r2->y2);
-	    r2 = r2BandEnd;
-	} while (r2 != r2End);
-    }
-
-    if (newReg->numRects != curBand)
-    {
-	(void) miCoalesce (newReg, prevBand, curBand);
-    }
-
-    /*
-     * A bit of cleanup. To keep regions from growing without bound,
-     * we shrink the array of rectangles to match the new number of
-     * rectangles in the region. This never goes to 0, however...
-     *
-     * Only do this stuff if the number of rectangles allocated is more than
-     * twice the number of rectangles in the region (a simple optimization...).
-     */
-    if (newReg->numRects < (newReg->size >> 1))
-    {
-	if (REGION_NOT_EMPTY(newReg))
-	{
-	    BoxPtr prev_rects = newReg->rects;
-	    newReg->size = newReg->numRects;
-	    newReg->rects = (BoxPtr) Xrealloc ((char *) newReg->rects,
-				   (unsigned) (sizeof(BoxRec) * newReg->size));
-	    if (! newReg->rects)
-		newReg->rects = prev_rects;
-	}
-	else
-	{
-	    /*
-	     * No point in doing the extra work involved in an Xrealloc if
-	     * the region is empty
-	     */
-	    newReg->size = 1;
-	    Xfree((char *) newReg->rects);
-	    newReg->rects = (BoxPtr) Xmalloc(sizeof(BoxRec));
-	}
-    }
-    Xfree ((char *) oldRects);
-    return;
-}
-
-
-/*======================================================================
- *	    Region Union
- *====================================================================*/
-
-/*-
- *-----------------------------------------------------------------------
- * miUnionNonO --
- *	Handle a non-overlapping band for the union operation. Just
- *	Adds the rectangles into the region. Doesn't have to check for
- *	subsumption or anything.
- *
- * Results:
- *	None.
- *
- * Side Effects:
- *	pReg->numRects is incremented and the final rectangles overwritten
- *	with the rectangles we're passed.
- *
- *-----------------------------------------------------------------------
- */
-/* static void*/
-static int
-miUnionNonO (pReg, r, rEnd, y1, y2)
-    register Region	pReg;
-    register BoxPtr	r;
-    BoxPtr  	  	rEnd;
-    register short  	y1;
-    register short  	y2;
-{
-    register BoxPtr	pNextRect;
-
-    pNextRect = &pReg->rects[pReg->numRects];
-
-    assert(y1 < y2);
-
-    while (r != rEnd)
-    {
-	assert(r->x1 < r->x2);
-	MEMCHECK(pReg, pNextRect, pReg->rects);
-	pNextRect->x1 = r->x1;
-	pNextRect->y1 = y1;
-	pNextRect->x2 = r->x2;
-	pNextRect->y2 = y2;
-	pReg->numRects += 1;
-	pNextRect++;
-
-	assert(pReg->numRects<=pReg->size);
-	r++;
-    }
-    return 0;	/* lint */
-}
-
-
-/*-
- *-----------------------------------------------------------------------
- * miUnionO --
- *	Handle an overlapping band for the union operation. Picks the
- *	left-most rectangle each time and merges it into the region.
- *
- * Results:
- *	None.
- *
- * Side Effects:
- *	Rectangles are overwritten in pReg->rects and pReg->numRects will
- *	be changed.
- *
- *-----------------------------------------------------------------------
- */
-
-/* static void*/
-static int
-miUnionO (pReg, r1, r1End, r2, r2End, y1, y2)
-    register Region	pReg;
-    register BoxPtr	r1;
-    BoxPtr  	  	r1End;
-    register BoxPtr	r2;
-    BoxPtr  	  	r2End;
-    register short	y1;
-    register short	y2;
-{
-    register BoxPtr	pNextRect;
-    
-    pNextRect = &pReg->rects[pReg->numRects];
-
-#define MERGERECT(r) \
-    if ((pReg->numRects != 0) &&  \
-	(pNextRect[-1].y1 == y1) &&  \
-	(pNextRect[-1].y2 == y2) &&  \
-	(pNextRect[-1].x2 >= r->x1))  \
-    {  \
-	if (pNextRect[-1].x2 < r->x2)  \
-	{  \
-	    pNextRect[-1].x2 = r->x2;  \
-	    assert(pNextRect[-1].x1<pNextRect[-1].x2); \
-	}  \
-    }  \
-    else  \
-    {  \
-	MEMCHECK(pReg, pNextRect, pReg->rects);  \
-	pNextRect->y1 = y1;  \
-	pNextRect->y2 = y2;  \
-	pNextRect->x1 = r->x1;  \
-	pNextRect->x2 = r->x2;  \
-	pReg->numRects += 1;  \
-        pNextRect += 1;  \
-    }  \
-    assert(pReg->numRects<=pReg->size);\
-    r++;
-    
-    assert (y1<y2);
-    while ((r1 != r1End) && (r2 != r2End))
-    {
-	if (r1->x1 < r2->x1)
-	{
-	    MERGERECT(r1);
-	}
-	else
-	{
-	    MERGERECT(r2);
-	}
-    }
-    
-    if (r1 != r1End)
-    {
-	do
-	{
-	    MERGERECT(r1);
-	} while (r1 != r1End);
-    }
-    else while (r2 != r2End)
-    {
-	MERGERECT(r2);
-    }
-    return 0;	/* lint */
-}
-
-int
-XUnionRegion(reg1, reg2, newReg)
-    Region 	  reg1;
-    Region	  reg2;             /* source regions     */
-    Region 	  newReg;                  /* destination Region */
-{
-    /*  checks all the simple cases */
-
-    /*
-     * Region 1 and 2 are the same or region 1 is empty
-     */
-    if ( (reg1 == reg2) || (!(reg1->numRects)) )
-    {
-        if (newReg != reg2)
-            miRegionCopy(newReg, reg2);
-        return 1;
-    }
-
-    /*
-     * if nothing to union (region 2 empty)
-     */
-    if (!(reg2->numRects))
-    {
-        if (newReg != reg1)
-            miRegionCopy(newReg, reg1);
-        return 1;
-    }
-
-    /*
-     * Region 1 completely subsumes region 2
-     */
-    if ((reg1->numRects == 1) && 
-	(reg1->extents.x1 <= reg2->extents.x1) &&
-	(reg1->extents.y1 <= reg2->extents.y1) &&
-	(reg1->extents.x2 >= reg2->extents.x2) &&
-	(reg1->extents.y2 >= reg2->extents.y2))
-    {
-        if (newReg != reg1)
-            miRegionCopy(newReg, reg1);
-        return 1;
-    }
-
-    /*
-     * Region 2 completely subsumes region 1
-     */
-    if ((reg2->numRects == 1) && 
-	(reg2->extents.x1 <= reg1->extents.x1) &&
-	(reg2->extents.y1 <= reg1->extents.y1) &&
-	(reg2->extents.x2 >= reg1->extents.x2) &&
-	(reg2->extents.y2 >= reg1->extents.y2))
-    {
-        if (newReg != reg2)
-            miRegionCopy(newReg, reg2);
-        return 1;
-    }
-
-    miRegionOp (newReg, reg1, reg2, (voidProcp) miUnionO, 
-    		(voidProcp) miUnionNonO, (voidProcp) miUnionNonO);
-
-    newReg->extents.x1 = min(reg1->extents.x1, reg2->extents.x1);
-    newReg->extents.y1 = min(reg1->extents.y1, reg2->extents.y1);
-    newReg->extents.x2 = max(reg1->extents.x2, reg2->extents.x2);
-    newReg->extents.y2 = max(reg1->extents.y2, reg2->extents.y2);
-
-    return 1;
-}
-
-
-/*======================================================================
- * 	    	  Region Subtraction
- *====================================================================*/
-
-/*-
- *-----------------------------------------------------------------------
- * miSubtractNonO --
- *	Deal with non-overlapping band for subtraction. Any parts from
- *	region 2 we discard. Anything from region 1 we add to the region.
- *
- * Results:
- *	None.
- *
- * Side Effects:
- *	pReg may be affected.
- *
- *-----------------------------------------------------------------------
- */
-/* static void*/
-static int
-miSubtractNonO1 (pReg, r, rEnd, y1, y2)
-    register Region	pReg;
-    register BoxPtr	r;
-    BoxPtr  	  	rEnd;
-    register short  	y1;
-    register short   	y2;
-{
-    register BoxPtr	pNextRect;
-	
-    pNextRect = &pReg->rects[pReg->numRects];
-	
-    assert(y1<y2);
-
-    while (r != rEnd)
-    {
-	assert(r->x1<r->x2);
-	MEMCHECK(pReg, pNextRect, pReg->rects);
-	pNextRect->x1 = r->x1;
-	pNextRect->y1 = y1;
-	pNextRect->x2 = r->x2;
-	pNextRect->y2 = y2;
-	pReg->numRects += 1;
-	pNextRect++;
-
-	assert(pReg->numRects <= pReg->size);
-
-	r++;
-    }
-    return 0;	/* lint */
-}
-
-/*-
- *-----------------------------------------------------------------------
- * miSubtractO --
- *	Overlapping band subtraction. x1 is the left-most point not yet
- *	checked.
- *
- * Results:
- *	None.
- *
- * Side Effects:
- *	pReg may have rectangles added to it.
- *
- *-----------------------------------------------------------------------
- */
-/* static void*/
-static int
-miSubtractO (pReg, r1, r1End, r2, r2End, y1, y2)
-    register Region	pReg;
-    register BoxPtr	r1;
-    BoxPtr  	  	r1End;
-    register BoxPtr	r2;
-    BoxPtr  	  	r2End;
-    register short  	y1;
-    register short  	y2;
-{
-    register BoxPtr	pNextRect;
-    register int  	x1;
-    
-    x1 = r1->x1;
-    
-    assert(y1<y2);
-    pNextRect = &pReg->rects[pReg->numRects];
-
-    while ((r1 != r1End) && (r2 != r2End))
-    {
-	if (r2->x2 <= x1)
-	{
-	    /*
-	     * Subtrahend missed the boat: go to next subtrahend.
-	     */
-	    r2++;
-	}
-	else if (r2->x1 <= x1)
-	{
-	    /*
-	     * Subtrahend preceeds minuend: nuke left edge of minuend.
-	     */
-	    x1 = r2->x2;
-	    if (x1 >= r1->x2)
-	    {
-		/*
-		 * Minuend completely covered: advance to next minuend and
-		 * reset left fence to edge of new minuend.
-		 */
-		r1++;
-		if (r1 != r1End)
-		    x1 = r1->x1;
-	    }
-	    else
-	    {
-		/*
-		 * Subtrahend now used up since it doesn't extend beyond
-		 * minuend
-		 */
-		r2++;
-	    }
-	}
-	else if (r2->x1 < r1->x2)
-	{
-	    /*
-	     * Left part of subtrahend covers part of minuend: add uncovered
-	     * part of minuend to region and skip to next subtrahend.
-	     */
-	    assert(x1<r2->x1);
-	    MEMCHECK(pReg, pNextRect, pReg->rects);
-	    pNextRect->x1 = x1;
-	    pNextRect->y1 = y1;
-	    pNextRect->x2 = r2->x1;
-	    pNextRect->y2 = y2;
-	    pReg->numRects += 1;
-	    pNextRect++;
-
-	    assert(pReg->numRects<=pReg->size);
-
-	    x1 = r2->x2;
-	    if (x1 >= r1->x2)
-	    {
-		/*
-		 * Minuend used up: advance to new...
-		 */
-		r1++;
-		if (r1 != r1End)
-		    x1 = r1->x1;
-	    }
-	    else
-	    {
-		/*
-		 * Subtrahend used up
-		 */
-		r2++;
-	    }
-	}
-	else
-	{
-	    /*
-	     * Minuend used up: add any remaining piece before advancing.
-	     */
-	    if (r1->x2 > x1)
-	    {
-		MEMCHECK(pReg, pNextRect, pReg->rects);
-		pNextRect->x1 = x1;
-		pNextRect->y1 = y1;
-		pNextRect->x2 = r1->x2;
-		pNextRect->y2 = y2;
-		pReg->numRects += 1;
-		pNextRect++;
-		assert(pReg->numRects<=pReg->size);
-	    }
-	    r1++;
-	    x1 = r1->x1;
-	}
-    }
-
-    /*
-     * Add remaining minuend rectangles to region.
-     */
-    while (r1 != r1End)
-    {
-	assert(x1<r1->x2);
-	MEMCHECK(pReg, pNextRect, pReg->rects);
-	pNextRect->x1 = x1;
-	pNextRect->y1 = y1;
-	pNextRect->x2 = r1->x2;
-	pNextRect->y2 = y2;
-	pReg->numRects += 1;
-	pNextRect++;
-
-	assert(pReg->numRects<=pReg->size);
-
-	r1++;
-	if (r1 != r1End)
-	{
-	    x1 = r1->x1;
-	}
-    }
-    return 0;	/* lint */
-}
-	
-/*-
- *-----------------------------------------------------------------------
- * miSubtract --
- *	Subtract regS from regM and leave the result in regD.
- *	S stands for subtrahend, M for minuend and D for difference.
- *
- * Results:
- *	TRUE.
- *
- * Side Effects:
- *	regD is overwritten.
- *
- *-----------------------------------------------------------------------
- */
-
-int
-XSubtractRegion(regM, regS, regD)
-    Region 	  	regM;
-    Region	  	regS;          
-    register Region	regD;
-{
-   /* check for trivial reject */
-    if ( (!(regM->numRects)) || (!(regS->numRects))  ||
-	(!EXTENTCHECK(&regM->extents, &regS->extents)) )
-    {
-	miRegionCopy(regD, regM);
-        return 1;
-    }
- 
-    miRegionOp (regD, regM, regS, (voidProcp) miSubtractO, 
-    		(voidProcp) miSubtractNonO1, (voidProcp) NULL);
-
-    /*
-     * Can't alter newReg's extents before we call miRegionOp because
-     * it might be one of the source regions and miRegionOp depends
-     * on the extents of those regions being the unaltered. Besides, this
-     * way there's no checking against rectangles that will be nuked
-     * due to coalescing, so we have to examine fewer rectangles.
-     */
-    miSetExtents (regD);
-    return 1;
-}
-
-int
-XXorRegion( sra, srb, dr )
-    Region sra, srb, dr;
-{
-    Region tra, trb;
-
-    if ((! (tra = XCreateRegion())) || (! (trb = XCreateRegion())))
-	return 0;
-    (void) XSubtractRegion(sra,srb,tra);
-    (void) XSubtractRegion(srb,sra,trb);
-    (void) XUnionRegion(tra,trb,dr);
-    XDestroyRegion(tra);
-    XDestroyRegion(trb);
-    return 0;
-}
-
-/*
- * Check to see if the region is empty.  Assumes a region is passed 
- * as a parameter
- */
-int 
-XEmptyRegion( r )
-    Region r;
-{
-    if( r->numRects == 0 ) return TRUE;
-    else  return FALSE;
-}
-
-/*
- *	Check to see if two regions are equal	
- */
-int 
-XEqualRegion( r1, r2 )
-    Region r1, r2;
-{
-    int i;
-
-    if( r1->numRects != r2->numRects ) return FALSE;
-    else if( r1->numRects == 0 ) return TRUE;
-    else if ( r1->extents.x1 != r2->extents.x1 ) return FALSE;
-    else if ( r1->extents.x2 != r2->extents.x2 ) return FALSE;
-    else if ( r1->extents.y1 != r2->extents.y1 ) return FALSE;
-    else if ( r1->extents.y2 != r2->extents.y2 ) return FALSE;
-    else for( i=0; i < r1->numRects; i++ ) {
-    	if ( r1->rects[i].x1 != r2->rects[i].x1 ) return FALSE;
-    	else if ( r1->rects[i].x2 != r2->rects[i].x2 ) return FALSE;
-    	else if ( r1->rects[i].y1 != r2->rects[i].y1 ) return FALSE;
-    	else if ( r1->rects[i].y2 != r2->rects[i].y2 ) return FALSE;
-    }
-    return TRUE;
-}
-
-int 
-XPointInRegion( pRegion, x, y )
-    Region pRegion;
-    int x, y;
-{
-    int i;
-
-    if (pRegion->numRects == 0)
-        return FALSE;
-    if (!INBOX(pRegion->extents, x, y))
-        return FALSE;
-    for (i=0; i<pRegion->numRects; i++)
-    {
-        if (INBOX (pRegion->rects[i], x, y))
-	    return TRUE;
-    }
-    return FALSE;
-}
-
-int 
-XRectInRegion(region, rx, ry, rwidth, rheight)
-    register Region	region;
-    int rx, ry;
-    unsigned int rwidth, rheight;
-{
-    register BoxPtr pbox;
-    register BoxPtr pboxEnd;
-    Box rect;
-    register BoxPtr prect = &rect;
-    int      partIn, partOut;
-
-    prect->x1 = rx;
-    prect->y1 = ry;
-    prect->x2 = rwidth + rx;
-    prect->y2 = rheight + ry;
-    
-    /* this is (just) a useful optimization */
-    if ((region->numRects == 0) || !EXTENTCHECK(&region->extents, prect))
-        return(RectangleOut);
-
-    partOut = FALSE;
-    partIn = FALSE;
-
-    /* can stop when both partOut and partIn are TRUE, or we reach prect->y2 */
-    for (pbox = region->rects, pboxEnd = pbox + region->numRects;
-	 pbox < pboxEnd;
-	 pbox++)
-    {
-
-	if (pbox->y2 <= ry)
-	   continue;	/* getting up to speed or skipping remainder of band */
-
-	if (pbox->y1 > ry)
-	{
-	   partOut = TRUE;	/* missed part of rectangle above */
-	   if (partIn || (pbox->y1 >= prect->y2))
-	      break;
-	   ry = pbox->y1;	/* x guaranteed to be == prect->x1 */
-	}
-
-	if (pbox->x2 <= rx)
-	   continue;		/* not far enough over yet */
-
-	if (pbox->x1 > rx)
-	{
-	   partOut = TRUE;	/* missed part of rectangle to left */
-	   if (partIn)
-	      break;
-	}
-
-	if (pbox->x1 < prect->x2)
-	{
-	    partIn = TRUE;	/* definitely overlap */
-	    if (partOut)
-	       break;
-	}
-
-	if (pbox->x2 >= prect->x2)
-	{
-	   ry = pbox->y2;	/* finished with this band */
-	   if (ry >= prect->y2)
-	      break;
-	   rx = prect->x1;	/* reset x out to left again */
-	} else
-	{
-	    /*
-	     * Because boxes in a band are maximal width, if the first box
-	     * to overlap the rectangle doesn't completely cover it in that
-	     * band, the rectangle must be partially out, since some of it
-	     * will be uncovered in that band. partIn will have been set true
-	     * by now...
-	     */
-	    break;
-	}
-
-    }
-
-    return(partIn ? ((ry < prect->y2) ? RectanglePart : RectangleIn) : 
-		RectangleOut);
-}
diff --git a/xc/lib/X11/RegstFlt.c b/xc/lib/X11/RegstFlt.c
deleted file mode 100644
index 644a434a4..000000000
--- a/xc/lib/X11/RegstFlt.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/* $TOG: RegstFlt.c /main/12 1998/02/06 17:50:36 kaleb $ */
-
- /*
-  * Copyright 1990, 1991 by OMRON Corporation
-  *
-  * Permission to use, copy, modify, distribute, and sell this software and its
-  * documentation for any purpose is hereby granted without fee, provided that
-  * the above copyright notice appear in all copies and that both that
-  * copyright notice and this permission notice appear in supporting
-  * documentation, and that the name OMRON not be used in
-  * advertising or publicity pertaining to distribution of the software without
-  * specific, written prior permission.  OMRON makes no representations
-  * about the suitability of this software for any purpose.  It is provided
-  * "as is" without express or implied warranty.
-  *
-  * OMRON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-  * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-  * EVENT SHALL OMRON BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-  * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-  * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-  * TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  * PERFORMANCE OF THIS SOFTWARE. 
-  *
-  *	Author:	Seiji Kuwari	OMRON Corporation
-  *				kuwa@omron.co.jp
-  *				kuwa%omron.co.jp@uunet.uu.net
-  */				
-/*
-
-Copyright 1990, 1991, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/RegstFlt.c,v 1.2 1999/05/09 10:50:01 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xlcint.h"
-
-static void
-_XFreeIMFilters(display)
-    Display *display;
-{
-    register XFilterEventList fl;
-
-    while ((fl = display->im_filters)) {
-        display->im_filters = fl->next;
-        Xfree((char *)fl);
-    }
-}
-
-/*
- * Register a filter with the filter machinery by event mask.
- */
-void
-_XRegisterFilterByMask(display, window, event_mask, filter, client_data)
-    Display *display;
-    Window window;
-    unsigned long event_mask;
-    Bool (*filter)(
-#if NeedNestedPrototypes
-		   Display*, Window, XEvent*, XPointer
-#endif
-		   );
-    XPointer client_data;
-{
-    XFilterEventRec		*rec;
-
-    rec = (XFilterEventList)Xmalloc(sizeof(XFilterEventRec));
-    if (!rec)
-	return;
-    rec->window = window;
-    rec->event_mask = event_mask;
-    rec->start_type = 0;
-    rec->end_type = 0;
-    rec->filter = filter;
-    rec->client_data = client_data;
-    LockDisplay(display);
-    rec->next = display->im_filters;
-    display->im_filters = rec;
-    display->free_funcs->im_filters = _XFreeIMFilters;
-    UnlockDisplay(display);
-}
-
-/*
- * Register a filter with the filter machinery by type code.
- */
-void
-_XRegisterFilterByType(display, window, start_type, end_type,
-		       filter, client_data)
-    Display *display;
-    Window window;
-    int start_type;
-    int end_type;
-    Bool (*filter)(
-#if NeedNestedPrototypes
-		   Display*, Window, XEvent*, XPointer
-#endif
-		   );
-    XPointer client_data;
-{
-    XFilterEventRec		*rec;
-
-    rec = (XFilterEventList)Xmalloc(sizeof(XFilterEventRec));
-    if (!rec)
-	return;
-    rec->window = window;
-    rec->event_mask = 0;
-    rec->start_type = start_type;
-    rec->end_type = end_type;
-    rec->filter = filter;
-    rec->client_data = client_data;
-    LockDisplay(display);
-    rec->next = display->im_filters;
-    display->im_filters = rec;
-    display->free_funcs->im_filters = _XFreeIMFilters;
-    UnlockDisplay(display);
-}
-
-void
-_XUnregisterFilter(display, window, filter, client_data)
-    Display *display;
-    Window window;
-    Bool (*filter)(
-#if NeedNestedPrototypes
-		   Display*, Window, XEvent*, XPointer
-#endif
-		   );
-    XPointer client_data;
-{
-    register XFilterEventList	*prev, fl;
-
-    for (prev = &display->im_filters; (fl = *prev); ) {
-	if (fl->window == window &&
-	    fl->filter == filter && fl->client_data == client_data) {
-	    *prev = fl->next;
-	    Xfree((char *)fl);
-	} else
-	    prev = &fl->next;
-    }
-}
diff --git a/xc/lib/X11/RepWindow.c b/xc/lib/X11/RepWindow.c
deleted file mode 100644
index f00a1e94e..000000000
--- a/xc/lib/X11/RepWindow.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $TOG: RepWindow.c /main/6 1998/02/06 17:50:42 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/RepWindow.c,v 1.2 1999/05/09 10:50:02 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XReparentWindow(dpy, w, p, x, y)
-    register Display *dpy;
-    Window w, p;
-    int x, y;
-{
-    register xReparentWindowReq *req;
-
-    LockDisplay(dpy);
-    GetReq(ReparentWindow, req);
-    req->window = w;
-    req->parent = p;
-    req->x = x;
-    req->y = y;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/RestackWs.c b/xc/lib/X11/RestackWs.c
deleted file mode 100644
index c597259d3..000000000
--- a/xc/lib/X11/RestackWs.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* $TOG: RestackWs.c /main/10 1998/02/06 17:50:47 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/RestackWs.c,v 1.2 1999/05/09 10:50:02 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XRestackWindows (dpy, windows, n)
-    register Display *dpy;
-    register Window *windows;
-    int n;
-    {
-    int i = 0;
-#ifdef MUSTCOPY
-    unsigned long val = Below;		/* needed for macro below */
-#endif
-
-    LockDisplay(dpy);
-    while (windows++, ++i < n) {
-	register xConfigureWindowReq *req;
-
-    	GetReqExtra (ConfigureWindow, 8, req);
-	req->window = *windows;
-	req->mask = CWSibling | CWStackMode;
-#ifdef MUSTCOPY
-	dpy->bufptr -= 8;
-	Data32 (dpy, (long *)(windows-1), 4);
-	Data32 (dpy, (long *)&val, 4);
-#else
-	{
-	    register CARD32 *values = (CARD32 *)
-	      NEXTPTR(req,xConfigureWindowReq);
-	    *values++ = *(windows-1);
-	    *values   = Below;
-	}
-#endif /* MUSTCOPY */
-	}
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-    }
-
-    
-
-    
diff --git a/xc/lib/X11/RotProp.c b/xc/lib/X11/RotProp.c
deleted file mode 100644
index 008d1d2b6..000000000
--- a/xc/lib/X11/RotProp.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* $TOG: RotProp.c /main/9 1998/02/06 17:50:53 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/RotProp.c,v 1.2 1999/05/09 10:50:03 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XRotateWindowProperties(dpy, w, properties, nprops, npositions)
-    register Display *dpy;
-    Window w;
-    Atom *properties;
-    register int nprops;
-    int npositions;
-    {
-    register long nbytes;
-    register xRotatePropertiesReq *req;
-
-    LockDisplay(dpy);
-    GetReq (RotateProperties, req);
-    req->window = w;
-    req->nAtoms = nprops;
-    req->nPositions = npositions;
-    
-    req->length += nprops;
-    nbytes = nprops << 2;
-/* XXX Cray needs packing here.... */
-    Data32 (dpy, (long *) properties, nbytes);
-
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-    }
-
-
-
-
-
diff --git a/xc/lib/X11/ScrResStr.c b/xc/lib/X11/ScrResStr.c
deleted file mode 100644
index e2951fadc..000000000
--- a/xc/lib/X11/ScrResStr.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* $TOG: ScrResStr.c /main/4 1998/02/06 17:50:58 kaleb $ */
-/*
-
-Copyright 1991, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#include "Xlibint.h"
-#include <X11/Xatom.h>
-
-char *XScreenResourceString(screen)
-	Screen *screen;
-{
-    Atom prop_name;
-    Atom actual_type;
-    int actual_format;
-    unsigned long nitems;
-    unsigned long leftover;
-    char *val = NULL;
-
-    prop_name = XInternAtom(screen->display, "SCREEN_RESOURCES", True);
-    if (prop_name &&
-	XGetWindowProperty(screen->display, screen->root, prop_name,
-			   0L, 100000000L, False,
-			   XA_STRING, &actual_type, &actual_format,
-			   &nitems, &leftover,
-			   (unsigned char **) &val) == Success) {
-	if ((actual_type == XA_STRING) && (actual_format == 8))
-	    return val;
-	if (val)
-	    Xfree(val);
-    }
-    return (char *)NULL;
-}
diff --git a/xc/lib/X11/SelInput.c b/xc/lib/X11/SelInput.c
deleted file mode 100644
index 13882ad26..000000000
--- a/xc/lib/X11/SelInput.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* $TOG: SelInput.c /main/8 1998/02/06 17:51:04 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/SelInput.c,v 1.2 1999/05/09 10:50:03 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XSelectInput (dpy, w, mask)
-    register Display *dpy;
-    Window w;
-    long mask;
-{
-    register xChangeWindowAttributesReq *req;
-
-    LockDisplay(dpy);
-    GetReqExtra (ChangeWindowAttributes, 4, req);
-    req->window = w;
-    req->valueMask = CWEventMask;
-    OneDataCard32 (dpy, NEXTPTR(req,xChangeWindowAttributesReq), mask);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/SendEvent.c b/xc/lib/X11/SendEvent.c
deleted file mode 100644
index 8b556f13d..000000000
--- a/xc/lib/X11/SendEvent.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* $TOG: SendEvent.c /main/9 1998/02/06 17:51:10 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_EVENTS
-#include "Xlibint.h"
-
-extern Status _XEventToWire();
-/*
- * In order to avoid all images requiring _XEventToWire, we install the
- * event converter here if it has never been installed.
- */
-Status
-XSendEvent(dpy, w, propagate, event_mask, event)
-    register Display *dpy;
-    Window w;
-    Bool propagate;
-    long event_mask;
-    XEvent *event;
-{
-    register xSendEventReq *req;
-    xEvent ev;
-    register Status (**fp)();
-    Status status;
-
-    LockDisplay (dpy);
-
-    /* call through display to find proper conversion routine */
-
-    fp = &dpy->wire_vec[event->type & 0177];
-    if (*fp == NULL) *fp = _XEventToWire;
-    status = (**fp)(dpy, event, &ev);
-
-    if (status) {
-	GetReq(SendEvent, req);
-	req->destination = w;
-	req->propagate = propagate;
-	req->eventMask = event_mask;
-#ifdef WORD64
-	/* avoid quad-alignment problems */
-	memcpy ((char *) req->eventdata, (char *) &ev, SIZEOF(xEvent));
-#else
-	req->event = ev;
-#endif /* WORD64 */
-    }
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return(status);
-}
diff --git a/xc/lib/X11/SetBack.c b/xc/lib/X11/SetBack.c
deleted file mode 100644
index d1a3b0067..000000000
--- a/xc/lib/X11/SetBack.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $TOG: SetBack.c /main/6 1998/02/06 17:51:16 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/SetBack.c,v 1.2 1999/05/09 10:50:03 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XSetBackground (dpy, gc, background)
-register Display *dpy;
-GC gc;
-unsigned long background; /* CARD32 */
-{
-    LockDisplay(dpy);
-    if (gc->values.background != background) {
-	gc->values.background = background;
-	gc->dirty |= GCBackground;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/SetCCC.c b/xc/lib/X11/SetCCC.c
deleted file mode 100644
index b31c856be..000000000
--- a/xc/lib/X11/SetCCC.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/* $XConsortium: SetCCC.c,v 1.5 93/09/07 21:32:37 rws Exp $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		XcmsSetCCC.c - Color Conversion Context Setting Routines
- *
- *	DESCRIPTION
- *		Routines to set components of a Color Conversion
- *		Context structure.
- *
- *
- */
-
-#include "Xlibint.h"
-#include "Xcms.h"
-
-
-
-/************************************************************************
- *									*
- *			PUBLIC INTERFACES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsSetWhitePoint
- *
- *	SYNOPSIS
- */
-
-Status
-XcmsSetWhitePoint(ccc, pColor)
-    XcmsCCC ccc;
-    XcmsColor *pColor;
-/*
- *	DESCRIPTION
- *		Sets the Client White Point in the specified CCC.
- *
- *	RETURNS
- *		Returns XcmsSuccess if succeeded; otherwise XcmsFailure.
- *
- */
-{
-    if (pColor == NULL || pColor->format == XcmsUndefinedFormat) {
-	ccc->clientWhitePt.format = XcmsUndefinedFormat;
-    } else if (pColor->format != XcmsCIEXYZFormat &&
-	    pColor->format != XcmsCIEuvYFormat &&
-	    pColor->format != XcmsCIExyYFormat) {
-	return(XcmsFailure);
-    } else {
-	memcpy((char *)&ccc->clientWhitePt, (char *)pColor, sizeof(XcmsColor));
-    }
-    return(XcmsSuccess);
-}
-
-
-/*
- *	NAME
- *		XcmsSetCompressionProc
- *
- *	SYNOPSIS
- */
-
-XcmsCompressionProc
-#if NeedFunctionPrototypes
-XcmsSetCompressionProc(
-    XcmsCCC ccc,
-    XcmsCompressionProc compression_proc,
-    XPointer client_data)
-#else
-XcmsSetCompressionProc(ccc, compression_proc, client_data)
-    XcmsCCC ccc;
-    XcmsCompressionProc compression_proc;
-    XPointer client_data;
-#endif
-/*
- *	DESCRIPTION
- *		Set the specified CCC's compression function and client data.
- *
- *	RETURNS
- *		Returns the old compression function.
- *
- */
-{
-    XcmsCompressionProc old = ccc->gamutCompProc;
-
-    ccc->gamutCompProc = compression_proc;
-    ccc->gamutCompClientData = client_data;
-    return(old);
-}
-
-
-/*
- *	NAME
- *		XcmsSetWhiteAdjustProc
- *
- *	SYNOPSIS
- */
-
-XcmsWhiteAdjustProc
-#if NeedFunctionPrototypes
-XcmsSetWhiteAdjustProc(
-    XcmsCCC ccc,
-    XcmsWhiteAdjustProc white_adjust_proc,
-    XPointer client_data )
-#else
-XcmsSetWhiteAdjustProc(ccc, white_adjust_proc, client_data)
-    XcmsCCC ccc;
-    XcmsWhiteAdjustProc white_adjust_proc;
-    XPointer client_data;
-#endif
-/*
- *	DESCRIPTION
- *		Set the specified CCC's white_adjust function and client data.
- *
- *	RETURNS
- *		Returns the old white_adjust function.
- *
- */
-{
-    XcmsWhiteAdjustProc old = ccc->whitePtAdjProc;
-
-    ccc->whitePtAdjProc = white_adjust_proc;
-    ccc->whitePtAdjClientData = client_data;
-    return(old);
-}
diff --git a/xc/lib/X11/SetCRects.c b/xc/lib/X11/SetCRects.c
deleted file mode 100644
index 5f1c87d99..000000000
--- a/xc/lib/X11/SetCRects.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* $TOG: SetCRects.c /main/13 1998/02/06 17:51:38 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/SetCRects.c,v 1.2 1999/05/09 10:50:05 dawes Exp $ */
-
-#include "Xlibint.h"
-
-/* can only call when display is locked. */
-void _XSetClipRectangles (dpy, gc, clip_x_origin, clip_y_origin, rectangles, n,
-                    ordering)
-    register Display *dpy;
-    GC gc;
-    int clip_x_origin, clip_y_origin;
-    XRectangle *rectangles;
-    int n;
-    int ordering;
-{
-    register xSetClipRectanglesReq *req;
-    register long len;
-    unsigned long dirty;
-    register _XExtension *ext;
-
-    GetReq (SetClipRectangles, req);
-    req->gc = gc->gid;
-    req->xOrigin = gc->values.clip_x_origin = clip_x_origin;
-    req->yOrigin = gc->values.clip_y_origin = clip_y_origin;
-    req->ordering = ordering;
-    len = ((long)n) << 1;
-    SetReqLen(req, len, 1);
-    len <<= 2;
-    Data16 (dpy, (short *) rectangles, len);
-    gc->rects = 1;
-    dirty = gc->dirty & ~(GCClipMask | GCClipXOrigin | GCClipYOrigin);
-    gc->dirty = GCClipMask | GCClipXOrigin | GCClipYOrigin;
-    /* call out to any extensions interested */
-    for (ext = dpy->ext_procs; ext; ext = ext->next)
-	if (ext->flush_GC) (*ext->flush_GC)(dpy, gc, &ext->codes);
-    gc->dirty = dirty;
-}
-
-int
-XSetClipRectangles (dpy, gc, clip_x_origin, clip_y_origin, rectangles, n,
-                    ordering)
-    register Display *dpy;
-    GC gc;
-    int clip_x_origin, clip_y_origin;
-    XRectangle *rectangles;
-    int n;
-    int ordering;
-{
-    LockDisplay(dpy);
-    _XSetClipRectangles (dpy, gc, clip_x_origin, clip_y_origin, rectangles, n,
-                    ordering);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-    
diff --git a/xc/lib/X11/SetClMask.c b/xc/lib/X11/SetClMask.c
deleted file mode 100644
index e97e7d2a7..000000000
--- a/xc/lib/X11/SetClMask.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* $TOG: SetClMask.c /main/7 1998/02/06 17:51:27 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/SetClMask.c,v 1.2 1999/05/09 10:50:06 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XSetClipMask (dpy, gc, mask)
-register Display *dpy;
-GC gc;
-Pixmap mask;
-{
-    LockDisplay(dpy);
-    /* always update, since client may have changed pixmap contents */
-    gc->values.clip_mask = mask;
-    gc->dirty |= GCClipMask;
-    gc->rects = 0;
-    _XFlushGCCache(dpy, gc);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/SetClOrig.c b/xc/lib/X11/SetClOrig.c
deleted file mode 100644
index d6514539e..000000000
--- a/xc/lib/X11/SetClOrig.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* $TOG: SetClOrig.c /main/6 1998/02/06 17:51:33 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/SetClOrig.c,v 1.2 1999/05/09 10:50:06 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XSetClipOrigin (dpy, gc, xorig, yorig)
-register Display *dpy;
-GC gc;
-int xorig, yorig;
-{
-    XGCValues *gv = &gc->values;
-
-    LockDisplay(dpy);
-    if (xorig != gv->clip_x_origin) {
-        gv->clip_x_origin = xorig;
-	gc->dirty |= GCClipXOrigin;
-    }
-    if (yorig != gv->clip_y_origin) {
-        gv->clip_y_origin = yorig;
-	gc->dirty |= GCClipYOrigin;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/SetDashes.c b/xc/lib/X11/SetDashes.c
deleted file mode 100644
index 20020adb1..000000000
--- a/xc/lib/X11/SetDashes.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* $TOG: SetDashes.c /main/9 1998/02/06 17:51:44 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/SetDashes.c,v 1.2 1999/05/09 10:50:07 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-#if NeedFunctionPrototypes
-XSetDashes (
-    register Display *dpy,
-    GC gc,
-    int dash_offset,
-    _Xconst char *list,
-    int n)
-#else
-XSetDashes (dpy, gc, dash_offset, list, n)
-    register Display *dpy;
-    GC gc;
-    int dash_offset;
-    char *list;
-    int n;
-#endif
-    {
-    register xSetDashesReq *req;
-
-    LockDisplay(dpy);
-    GetReq (SetDashes,req);
-    req->gc = gc->gid;
-    req->dashOffset = gc->values.dash_offset = dash_offset;
-    req->nDashes = n;
-    req->length += (n+3)>>2;
-    gc->dashes = 1;
-    gc->dirty &= ~(GCDashList | GCDashOffset);
-    Data (dpy, list, (long)n);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-    }
-    
diff --git a/xc/lib/X11/SetFPath.c b/xc/lib/X11/SetFPath.c
deleted file mode 100644
index 33338b2f4..000000000
--- a/xc/lib/X11/SetFPath.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* $TOG: SetFPath.c /main/10 1998/02/06 17:51:59 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/SetFPath.c,v 1.4 1999/05/09 10:50:07 dawes Exp $ */
-
-#include "Xlibint.h"
-
-#define safestrlen(s) ((s) ? strlen(s) : 0)
-
-int
-XSetFontPath (dpy, directories, ndirs)
-register Display *dpy;
-char **directories;
-int ndirs;
-{
-	register int n = 0;
-	register int i;
-	register int nbytes;
-	char *p;
-	register xSetFontPathReq *req;
-	int retCode;
-
-        LockDisplay(dpy);
-	GetReq (SetFontPath, req);
-	req->nFonts = ndirs;
-	for (i = 0; i < ndirs; i++) {
-		n += safestrlen (directories[i]) + 1;
-	}
-	nbytes = (n + 3) & ~3;
-	req->length += nbytes >> 2;
-	if ((p = (char *) Xmalloc ((unsigned) nbytes))) {
-		/*
-	 	 * pack into counted strings.
-	 	 */
-		char	*tmp = p;
-
-		for (i = 0; i < ndirs; i++) {
-			register int length = safestrlen (directories[i]);
-			*p = length;
-			memcpy (p + 1, directories[i], length);
-			p += length + 1;
-		}
-		Data (dpy, tmp, nbytes);
-		Xfree ((char *) tmp);
-		retCode = 1;
-	}
-	else
-		retCode = 0;
-
-        UnlockDisplay(dpy);
-	SyncHandle();
-	return (retCode);
-}
diff --git a/xc/lib/X11/SetFont.c b/xc/lib/X11/SetFont.c
deleted file mode 100644
index 74b77b4c4..000000000
--- a/xc/lib/X11/SetFont.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* $TOG: SetFont.c /main/6 1998/02/06 17:51:49 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/SetFont.c,v 1.2 1999/05/09 10:50:07 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XSetFont (dpy, gc, font)
-register Display *dpy;
-GC gc;
-Font font;
-{
-    LockDisplay(dpy);
-    if (gc->values.font != font) {
-        gc->values.font = font;
-	gc->dirty |= GCFont;
-	_XFlushGCCache(dpy, gc);
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/SetFore.c b/xc/lib/X11/SetFore.c
deleted file mode 100644
index 24deb28dd..000000000
--- a/xc/lib/X11/SetFore.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $TOG: SetFore.c /main/6 1998/02/06 17:51:54 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/SetFore.c,v 1.2 1999/05/09 10:50:08 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XSetForeground (dpy, gc, foreground)
-register Display *dpy;
-GC gc;
-unsigned long foreground; /* CARD32 */
-{
-    LockDisplay(dpy);
-    if (gc->values.foreground != foreground) {
-	gc->values.foreground = foreground;
-	gc->dirty |= GCForeground;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/SetFunc.c b/xc/lib/X11/SetFunc.c
deleted file mode 100644
index df4d6035e..000000000
--- a/xc/lib/X11/SetFunc.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $TOG: SetFunc.c /main/6 1998/02/06 17:52:05 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/SetFunc.c,v 1.2 1999/05/09 10:50:08 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XSetFunction (dpy, gc, function)
-register Display *dpy;
-GC gc;
-int function;
-{
-    LockDisplay(dpy);
-    if (gc->values.function != function) {
-	gc->values.function = function;
-	gc->dirty |= GCFunction;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/SetGetCols.c b/xc/lib/X11/SetGetCols.c
deleted file mode 100644
index 1986cab66..000000000
--- a/xc/lib/X11/SetGetCols.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/* $XConsortium: SetGetCols.c,v 1.5 91/05/13 23:28:55 rws Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		XcmsSetGet.c
- *
- *	DESCRIPTION
- *		Source for _XcmsSetGetColors()
- *
- *
- */
-
-/*
- *      EXTERNAL INCLUDES
- *              Include files that must be exported to any package or
- *              program using this package.
- */
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-
-/*
- *      EXTERNS
- */
-
-extern void _XcmsRGB_to_XColor();
-extern void _XColor_to_XcmsRGB();
-
-
-
-/************************************************************************
- *									*
- *			API PRIVATE ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsSetColors - 
- *
- *	SYNOPSIS
- */
-Status
-_XcmsSetGetColors(xColorProc, dpy, cmap, pColors_in_out, nColors,
-	result_format, pCompressed)
-    Status (*xColorProc)();
-    Display *dpy;
-    Colormap cmap;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-    XcmsColorFormat result_format;
-    Bool *pCompressed;
-/*
- *	DESCRIPTION
- *		Routine containing code common to:
- *			XcmsAllocColor
- *			XcmsQueryColor
- *			XcmsQueryColors
- *			XcmsStoreColor
- *			XcmsStoreColors
- *
- *	RETURNS
- *		XcmsFailure if failed;
- *		XcmsSuccess if it succeeded without gamut compression;
- *		XcmsSuccessWithCompression if it succeeded with gamut
- *			compression;
- */
-{
-    XcmsCCC ccc;
-    XColor *pXColors_in_out;
-    Status retval = XcmsSuccess;
-
-    /*
-     * Argument Checking
-     *	1. Assume xColorProc is correct
-     *	2. Insure ccc not NULL
-     *	3. Assume cmap correct (should be checked by Server)
-     *	4. Insure pColors_in_out valid
-     *	5. Assume method_in is valid (should be checked by Server)
-     *	6. Insure nColors > 0
-     */
-
-    if (dpy == NULL) {
-	return(XcmsFailure);
-    }
-
-    if (nColors == 0) {
-	return(XcmsSuccess);
-    }
-
-    if (result_format == XcmsUndefinedFormat) {
-	return(XcmsFailure);
-    }
-
-    if (!((*xColorProc == XAllocColor) || (*xColorProc == XStoreColor)
-	    || (*xColorProc == XStoreColors) || (*xColorProc == XQueryColor) 
-	    || (*xColorProc == XQueryColors))) {
-	return(XcmsFailure);
-    }
-
-    if ((ccc = XcmsCCCOfColormap(dpy, cmap)) == (XcmsCCC)NULL) {
-	return(XcmsFailure);
-    }
-
-    if ((*xColorProc == XAllocColor) || (*xColorProc == XStoreColor)
-	    || (*xColorProc == XQueryColor)) {
-	nColors = 1;
-    }
-
-    /*
-     * Allocate space for XColors
-     */
-    if ((pXColors_in_out = (XColor *)Xcalloc(nColors, sizeof(XColor))) ==
-	    NULL) {
-	return(XcmsFailure);
-    }
-
-    if ((*xColorProc == XQueryColor) || (*xColorProc == XQueryColors)) {
-	goto Query;
-    }
-    /*
-     * Convert to RGB, adjusting for white point differences if necessary.
-     */
-    if ((retval = XcmsConvertColors(ccc, pColors_in_out, nColors, XcmsRGBFormat,
-	    pCompressed)) == XcmsFailure) {
-	return(XcmsFailure);
-    }
-
-Query:
-    /*
-     * Convert XcmsColor to XColor structures
-     */
-    _XcmsRGB_to_XColor(pColors_in_out, pXColors_in_out, nColors);
-
-    /*
-     * Now make appropriate X Call
-     */
-    if (*xColorProc == XAllocColor) {
-	if ((*xColorProc)(ccc->dpy, cmap, pXColors_in_out) == 0) {
-	    Xfree((char *)pXColors_in_out);
-	    return(XcmsFailure);
-	}
-    } else if ((*xColorProc == XQueryColor) || (*xColorProc == XStoreColor)) {
-	/* Note: XQueryColor and XStoreColor do not return any Status */
-	(*xColorProc)(ccc->dpy, cmap, pXColors_in_out);
-    } else if ((*xColorProc == XQueryColors) || (*xColorProc == XStoreColors)){
-	/* Note: XQueryColors and XStoreColors do not return any Status */
-	(*xColorProc)(ccc->dpy, cmap, pXColors_in_out, nColors);
-    } else {
-	Xfree((char *)pXColors_in_out);
-	return(XcmsFailure);
-    }
-
-    if ((*xColorProc == XStoreColor) || (*xColorProc == XStoreColors)) {
-	Xfree((char *)pXColors_in_out);
-	return(retval);
-    }
-
-    /*
-     * Now, convert returned XColor(i.e., rgb) to XcmsColor structures
-     */
-    _XColor_to_XcmsRGB(ccc, pXColors_in_out, pColors_in_out, nColors);
-    Xfree((char *)pXColors_in_out);
-
-    /*
-     * Then, convert XcmsColor structures to the original specification
-     *    format.  Note that we must use NULL instead of passing
-     *    pCompressed.
-     */
-
-    if (result_format != XcmsRGBFormat) {
-	if (XcmsConvertColors(ccc, pColors_in_out, nColors, result_format,
-		(Bool *) NULL) == XcmsFailure) {
-	    return(XcmsFailure);
-	}
-    }
-    return(retval);
-}
diff --git a/xc/lib/X11/SetHints.c b/xc/lib/X11/SetHints.c
deleted file mode 100644
index 8b6756771..000000000
--- a/xc/lib/X11/SetHints.c
+++ /dev/null
@@ -1,302 +0,0 @@
-/* $TOG: SetHints.c /main/25 1998/02/06 17:52:15 kaleb $ */
-
-/***********************************************************
-
-Copyright 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-/* $XFree86: xc/lib/X11/SetHints.c,v 1.2 1999/05/09 10:50:08 dawes Exp $ */
-
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
-#include "Xatomtype.h"
-#include <X11/Xatom.h>
-#include <X11/Xos.h>
-
-#define safestrlen(s) ((s) ? strlen(s) : 0)
-
-int
-XSetSizeHints(dpy, w, hints, property)		/* old routine */
-	Display *dpy;
-	Window w;
-	XSizeHints *hints;
-        Atom property;
-{
-        xPropSizeHints prop;
-	prop.flags = (hints->flags & (USPosition|USSize|PAllHints));
-	prop.x = hints->x;
-	prop.y = hints->y;
-	prop.width = hints->width;
-	prop.height = hints->height;
-	prop.minWidth = hints->min_width;
-	prop.minHeight = hints->min_height;
-	prop.maxWidth  = hints->max_width;
-	prop.maxHeight = hints->max_height;
-	prop.widthInc = hints->width_inc;
-	prop.heightInc = hints->height_inc;
-	prop.minAspectX = hints->min_aspect.x;
-	prop.minAspectY = hints->min_aspect.y;
-	prop.maxAspectX = hints->max_aspect.x;
-	prop.maxAspectY = hints->max_aspect.y;
-	return XChangeProperty (dpy, w, property, XA_WM_SIZE_HINTS, 32,
-				PropModeReplace, (unsigned char *) &prop, 
-				OldNumPropSizeElements);
-}
-
-/* 
- * XSetWMHints sets the property 
- *	WM_HINTS 	type: WM_HINTS	format:32
- */
-
-int
-XSetWMHints (dpy, w, wmhints)
-	Display *dpy;
-	Window w;
-	XWMHints *wmhints; 
-{
-	xPropWMHints prop;
-	prop.flags = wmhints->flags;
-	prop.input = (wmhints->input == True ? 1 : 0);
-	prop.initialState = wmhints->initial_state;
-	prop.iconPixmap = wmhints->icon_pixmap;
-	prop.iconWindow = wmhints->icon_window;
-	prop.iconX = wmhints->icon_x;
-	prop.iconY = wmhints->icon_y;
-	prop.iconMask = wmhints->icon_mask;
-	prop.windowGroup = wmhints->window_group;
-	return XChangeProperty (dpy, w, XA_WM_HINTS, XA_WM_HINTS, 32,
-				PropModeReplace, (unsigned char *) &prop, 
-				NumPropWMHintsElements);
-}
-
-
-
-/* 
- * XSetZoomHints sets the property 
- *	WM_ZOOM_HINTS 	type: WM_SIZE_HINTS format: 32
- */
-
-int
-XSetZoomHints (dpy, w, zhints)
-	Display *dpy;
-	Window w;
-	XSizeHints *zhints;
-{
-	return XSetSizeHints (dpy, w, zhints, XA_WM_ZOOM_HINTS);
-}
-
-
-/* 
- * XSetNormalHints sets the property 
- *	WM_NORMAL_HINTS 	type: WM_SIZE_HINTS format: 32
- */
-
-int
-XSetNormalHints (dpy, w, hints)			/* old routine */
-	Display *dpy;
-	Window w;
-	XSizeHints *hints;
-{
-	return XSetSizeHints (dpy, w, hints, XA_WM_NORMAL_HINTS);
-}
-
-
-
-/*
- * Note, the following is one of the few cases were we really do want sizeof
- * when examining a protocol structure.  This is because the XChangeProperty
- * routine will take care of converting to host to network data structures.
- */
-
-int
-XSetIconSizes (dpy, w, list, count)
-	Display *dpy;
-	Window w;	/* typically, root */
-	XIconSize *list;
-	int count; 	/* number of items on the list */
-{
-	register int i;
-	xPropIconSize *pp, *prop;
-#define size_of_the_real_thing sizeof	/* avoid grepping screwups */
-	unsigned nbytes = count * size_of_the_real_thing(xPropIconSize);
-#undef size_of_the_real_thing
-	if ((prop = pp = (xPropIconSize *) Xmalloc (nbytes))) {
-	    for (i = 0; i < count; i++) {
-		pp->minWidth  = list->min_width;
-		pp->minHeight = list->min_height;
-		pp->maxWidth  = list->max_width;
-		pp->maxHeight = list->max_height;
-		pp->widthInc  = list->width_inc;
-		pp->heightInc = list->height_inc;
-		pp += 1;
-		list += 1;
-	    }
-	    XChangeProperty (dpy, w, XA_WM_ICON_SIZE, XA_WM_ICON_SIZE, 32, 
-			     PropModeReplace, (unsigned char *) prop, 
-			     count * NumPropIconSizeElements);
-	    Xfree ((char *)prop);
-	}
-	return 1;
-}
-
-int
-XSetCommand (dpy, w, argv, argc)
-	Display *dpy;
-	Window w;
-	char **argv;
-	int argc;
-{
-	register int i;
-	register int nbytes;
-	register char *buf, *bp;
-	for (i = 0, nbytes = 0; i < argc; i++) {
-		nbytes += safestrlen(argv[i]) + 1;
-	}
-	if ((bp = buf = Xmalloc((unsigned) nbytes))) { 
-	    /* copy arguments into single buffer */
-	    for (i = 0; i < argc; i++) {
-		if (argv[i]) { 
-		    (void) strcpy(bp, argv[i]);
-		    bp += strlen(argv[i]) + 1;
-		}
-		else
-		    *bp++ = '\0';
-	    }
-	    XChangeProperty (dpy, w, XA_WM_COMMAND, XA_STRING, 8,
-			     PropModeReplace, (unsigned char *)buf, nbytes);
-	    Xfree(buf);		
-	}
-	return 1;
-}
-/* 
- * XSetStandardProperties sets the following properties:
- *	WM_NAME		  type: STRING		format: 8
- *	WM_ICON_NAME	  type: STRING		format: 8
- *	WM_HINTS	  type: WM_HINTS	format: 32
- *	WM_COMMAND	  type: STRING
- *	WM_NORMAL_HINTS	  type: WM_SIZE_HINTS 	format: 32
- */
-
-int
-#if NeedFunctionPrototypes
-XSetStandardProperties (
-    	Display *dpy,
-    	Window w,		/* window to decorate */
-    	_Xconst char *name,	/* name of application */
-    	_Xconst char *icon_string,/* name string for icon */
-	Pixmap icon_pixmap,	/* pixmap to use as icon, or None */
-    	char **argv,		/* command to be used to restart application */
-    	int argc,		/* count of arguments */
-    	XSizeHints *hints)	/* size hints for window in its normal state */
-#else
-XSetStandardProperties (dpy, w, name, icon_string, icon_pixmap, argv, argc, hints)
-    	Display *dpy;
-    	Window w;		/* window to decorate */
-    	char *name;		/* name of application */
-    	char *icon_string;	/* name string for icon */
-	Pixmap icon_pixmap;	/* pixmap to use as icon, or None */
-    	char **argv;		/* command to be used to restart application */
-    	int argc;		/* count of arguments */
-    	XSizeHints *hints;	/* size hints for window in its normal state */
-#endif
-{
-	XWMHints phints;
-	phints.flags = 0;
-
-	if (name != NULL) XStoreName (dpy, w, name);
-
-	if (icon_string != NULL) {
-	    XChangeProperty (dpy, w, XA_WM_ICON_NAME, XA_STRING, 8,
-		PropModeReplace, (unsigned char *)icon_string, safestrlen(icon_string));
-		}
-
-	if (icon_pixmap != None) {
-		phints.icon_pixmap = icon_pixmap;
-		phints.flags |= IconPixmapHint;
-		}
-	if (argv != NULL) XSetCommand(dpy, w, argv, argc);
-	
-	if (hints != NULL) XSetNormalHints(dpy, w, hints);
-
-	if (phints.flags != 0) XSetWMHints(dpy, w, &phints);
-
-	return 1;
-}
-
-int
-XSetTransientForHint(dpy, w, propWindow)
-	Display *dpy;
-	Window w;
-	Window propWindow;
-{
-	return XChangeProperty(dpy, w, XA_WM_TRANSIENT_FOR, XA_WINDOW, 32,
-			       PropModeReplace, (unsigned char *) &propWindow, 1);
-}
-
-int
-XSetClassHint(dpy, w, classhint)
-	Display *dpy;
-	Window w;
-	XClassHint *classhint;
-{
-	char *class_string;
-	char *s;
-	int len_nm, len_cl;
-
-	len_nm = safestrlen(classhint->res_name);
-	len_cl = safestrlen(classhint->res_class);
-	if ((class_string = s = Xmalloc((unsigned) (len_nm + len_cl + 2)))) { 
-	    if (len_nm) {
-		strcpy(s, classhint->res_name);
-		s += len_nm + 1;
-	    }
-	    else
-		*s++ = '\0';
-	    if (len_cl)
-		strcpy(s, classhint->res_class);
-	    else
-		*s = '\0';
-	    XChangeProperty(dpy, w, XA_WM_CLASS, XA_STRING, 8,
-			    PropModeReplace, (unsigned char *) class_string, 
-			    len_nm+len_cl+2);
-	    Xfree(class_string);
-	}
-	return 1;
-}
diff --git a/xc/lib/X11/SetIFocus.c b/xc/lib/X11/SetIFocus.c
deleted file mode 100644
index cd744d7c4..000000000
--- a/xc/lib/X11/SetIFocus.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $TOG: SetIFocus.c /main/6 1998/02/06 17:52:22 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/SetIFocus.c,v 1.2 1999/05/09 10:50:09 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XSetInputFocus(dpy, focus, revert_to, time)
-    register Display *dpy;
-    Window focus;
-    int revert_to;
-    Time time;
-{       
-    register xSetInputFocusReq *req;
-
-    LockDisplay(dpy);
-    GetReq(SetInputFocus, req);
-    req->focus = focus;
-    req->revertTo = revert_to;
-    req->time = time;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/SetLStyle.c b/xc/lib/X11/SetLStyle.c
deleted file mode 100644
index 3a5b31ec6..000000000
--- a/xc/lib/X11/SetLStyle.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* $TOG: SetLStyle.c /main/6 1998/02/06 17:52:34 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/SetLStyle.c,v 1.2 1999/05/09 10:50:09 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XSetLineAttributes(dpy, gc, linewidth, linestyle, capstyle, joinstyle)
-register Display *dpy;
-GC gc;
-unsigned int linewidth; /* CARD16 */
-int linestyle;
-int capstyle;
-int joinstyle;
-{
-    XGCValues *gv = &gc->values;
-
-    LockDisplay(dpy);
-    if (linewidth != gv->line_width) {
-	gv->line_width = linewidth;
-	gc->dirty |= GCLineWidth;
-    }
-    if (linestyle != gv->line_style) {
-	gv->line_style = linestyle;
-	gc->dirty |= GCLineStyle;
-    }
-    if (capstyle != gv->cap_style) {
-	gv->cap_style = capstyle;
-	gc->dirty |= GCCapStyle;
-    }
-    if (joinstyle != gv->join_style) {
-	gv->join_style = joinstyle;
-	gc->dirty |= GCJoinStyle;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/SetLocale.c b/xc/lib/X11/SetLocale.c
deleted file mode 100644
index fde2f8af6..000000000
--- a/xc/lib/X11/SetLocale.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/* $TOG: SetLocale.c /main/42 1998/06/17 14:47:35 kaleb $ */
-
-/*
- * Copyright 1990, 1991 by OMRON Corporation, NTT Software Corporation,
- *                      and Nippon Telegraph and Telephone Corporation
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the names of OMRON, NTT Software, and NTT
- * not be used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission. OMRON, NTT Software,
- * and NTT make no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without express or
- * implied warranty.
- *
- * OMRON, NTT SOFTWARE, AND NTT, DISCLAIM ALL WARRANTIES WITH REGARD
- * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL OMRON, NTT SOFTWARE, OR NTT, BE
- * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- *	Authors: Li Yuhong		OMRON Corporation
- *		 Tetsuya Kato		NTT Software Corporation
- *		 Hiroshi Kuribayashi	OMRON Corporation
- *   
- */
-/*
-
-Copyright 1987,1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/SetLocale.c,v 3.10 1998/10/03 08:41:23 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include <X11/Xlocale.h>
-#include <X11/Xos.h>
-
-#define MAXLOCALE	64	/* buffer size of locale name */
-
-#ifdef X_LOCALE
-
-/* alternative setlocale() for when the OS does not provide one */
-
-#ifdef X_NOT_STDC_ENV
-extern char *getenv();
-#endif
-
-#if NeedFunctionPrototypes
-char *
-_Xsetlocale(
-    int		  category,
-    _Xconst char  *name
-)
-#else
-char *
-_Xsetlocale(category, name)
-    int		category;
-    char       *name;
-#endif
-{
-    static char *xsl_name;
-    char *old_name;
-    XrmMethods methods;
-    XPointer state;
-
-    if (category != LC_CTYPE && category != LC_ALL)
-	return NULL;
-    if (!name) {
-	if (xsl_name)
-	    return xsl_name;
-	return "C";
-    }
-    if (!*name)
-	name = getenv("LC_CTYPE");
-    if (!name || !*name)
-	name = getenv("LANG");
-    if (name && strlen(name) >= MAXLOCALE)
-	name = NULL;
-    if (!name || !*name || !_XOpenLC(name))
-	name = "C";
-    old_name = xsl_name;
-    xsl_name = (char *)name;
-    methods = _XrmInitParseInfo(&state);
-    xsl_name = old_name;
-    if (!methods)
-	return NULL;
-    name = (*methods->lcname)(state);
-    xsl_name = Xmalloc(strlen(name) + 1);
-    if (!xsl_name) {
-	xsl_name = old_name;
-	(*methods->destroy)(state);
-	return NULL;
-    }
-    strcpy(xsl_name, name);
-    if (old_name)
-	Xfree(old_name);
-    (*methods->destroy)(state);
-    return xsl_name;
-}
-
-#else /* X_LOCALE */
-
-/*
- * _XlcMapOSLocaleName is an implementation dependent routine that derives
- * the LC_CTYPE locale name as used in the sample implementation from that
- * returned by setlocale.
- *
- * Should match the code in Xt ExtractLocaleName.
- * 
- * This function name is a bit of a misnomer. Even the siname parameter
- * name is a misnomer. On most modern operating systems this function is 
- * a no-op, simply returning the osname; but on older operating systems 
- * like Ultrix, or HPUX 9.x and earlier, when you set LANG=german.88591 
- * then the string returned by setlocale(LC_ALL, "") will look something 
- * like: "german.88591 german.88591 ... german.88591". Then this function
- * will pick out the LC_CTYPE component and return a pointer to that.
- */
-
-char *
-_XlcMapOSLocaleName(osname, siname)
-    char *osname;
-    char *siname;
-{
-#if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(__osf__) || defined(AIXV3) || defined(ultrix) || defined(WIN32) || defined(__EMX__)
-#ifdef hpux
-#ifndef _LastCategory
-/* HPUX 9 and earlier */
-#define SKIPCOUNT 2
-#define STARTCHAR ':'
-#define ENDCHAR ';'
-#else
-/* HPUX 10 */
-#define ENDCHAR ' '
-#endif
-#else
-#ifdef ultrix
-#define SKIPCOUNT 2
-#define STARTCHAR '\001'
-#define ENDCHAR '\001'
-#else
-#if defined(WIN32) || defined(__EMX__)
-#define SKIPCOUNT 1
-#define STARTCHAR '='
-#define ENDCHAR ';'
-#define WHITEFILL
-#else
-#if defined(__osf__) || (defined(AIXV3) && !defined(AIXV4))
-#define STARTCHAR ' '
-#define ENDCHAR ' '
-#else
-#if !defined(sun) || defined(SVR4)
-#define STARTCHAR '/'
-#endif
-#define ENDCHAR '/'
-#endif
-#endif
-#endif
-#endif
-
-    char           *start;
-    char           *end;
-    int             len;
-#ifdef SKIPCOUNT
-    int		    n;
-#endif
-
-    start = osname;
-#ifdef SKIPCOUNT
-    for (n = SKIPCOUNT;
-	 --n >= 0 && start && (start = strchr (start, STARTCHAR));
-	 start++)
-	;
-    if (!start)
-	start = osname;
-#endif
-#ifdef STARTCHAR
-    if (start && (start = strchr (start, STARTCHAR))) {
-	start++;
-#endif
-	if (end = strchr (start, ENDCHAR)) {
-	    len = end - start;
-	    if (len >= MAXLOCALE)
-		len = MAXLOCALE - 1;
-	    strncpy(siname, start, len);
-	    *(siname + len) = '\0';
-#ifdef WHITEFILL
-	    for (start = siname; start = strchr(start, ' '); )
-		*start++ = '-';
-#endif
-	    return siname;
-#ifdef STARTCHAR
-	}
-#endif
-    }
-#ifdef WHITEFILL
-    if (strchr(osname, ' ')) {
-	len = strlen(osname);
-	if (len >= MAXLOCALE - 1)
-	    len = MAXLOCALE - 1;
-	strncpy(siname, osname, len);
-	*(siname + len) = '\0';
-	for (start = siname; start = strchr(start, ' '); )
-	    *start++ = '-';
-	return siname;
-    }
-#endif
-#undef STARTCHAR
-#undef ENDCHAR
-#undef WHITEFILL
-#endif
-    return osname;
-}
-
-#endif  /* X_LOCALE */
diff --git a/xc/lib/X11/SetNrmHint.c b/xc/lib/X11/SetNrmHint.c
deleted file mode 100644
index f74dd15e2..000000000
--- a/xc/lib/X11/SetNrmHint.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/* $TOG: SetNrmHint.c /main/5 1998/02/06 17:52:40 kaleb $ */
-
-/***********************************************************
-Copyright 1988 by Wyse Technology, Inc., San Jose, Ca,
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL AND WYSE DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL DIGITAL OR WYSE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-******************************************************************/
-/*
-
-Copyright 1987, 1988, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
-#include "Xatomtype.h"
-#include <X11/Xatom.h>
-#include <X11/Xos.h>
-
-void XSetWMSizeHints (dpy, w, hints, prop)
-    Display *dpy;
-    Window w;
-    XSizeHints *hints;
-    Atom prop;
-{
-    xPropSizeHints data;
-
-    data.flags = (hints->flags & 
-		  (USPosition|USSize|PPosition|PSize|PMinSize|PMaxSize|
-		   PResizeInc|PAspect|PBaseSize|PWinGravity));
-
-    /*
-     * The x, y, width, and height fields are obsolete; but, applications
-     * that want to work with old window managers might set them.
-     */
-    data.x = hints->x;
-    data.y = hints->y;
-    data.width = hints->width;
-    data.height = hints->height;
-
-    data.minWidth = hints->min_width;
-    data.minHeight = hints->min_height;
-    data.maxWidth  = hints->max_width;
-    data.maxHeight = hints->max_height;
-    data.widthInc = hints->width_inc;
-    data.heightInc = hints->height_inc;
-    data.minAspectX = hints->min_aspect.x;
-    data.minAspectY = hints->min_aspect.y;
-    data.maxAspectX = hints->max_aspect.x;
-    data.maxAspectY = hints->max_aspect.y;
-    data.baseWidth = hints->base_width;
-    data.baseHeight = hints->base_height;
-    data.winGravity = hints->win_gravity;
-   
-    XChangeProperty (dpy, w, prop, XA_WM_SIZE_HINTS, 32,
-		     PropModeReplace, (unsigned char *) &data,
-		     NumPropSizeElements);
-}
-
-
-void XSetWMNormalHints (dpy, w, hints)
-    Display *dpy;
-    Window w;
-    XSizeHints *hints;
-{
-    XSetWMSizeHints (dpy, w, hints, XA_WM_NORMAL_HINTS);
-}
-
diff --git a/xc/lib/X11/SetPMask.c b/xc/lib/X11/SetPMask.c
deleted file mode 100644
index e14800a69..000000000
--- a/xc/lib/X11/SetPMask.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $TOG: SetPMask.c /main/6 1998/02/06 17:52:46 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/SetPMask.c,v 1.2 1999/05/09 10:50:10 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XSetPlaneMask (dpy, gc, planemask)
-register Display *dpy;
-GC gc;
-unsigned long planemask; /* CARD32 */
-{
-    LockDisplay(dpy);
-    if (gc->values.plane_mask != planemask) {
-	gc->values.plane_mask = planemask;
-	gc->dirty |= GCPlaneMask;
-    }
-    UnlockDisplay(dpy);	
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/SetPntMap.c b/xc/lib/X11/SetPntMap.c
deleted file mode 100644
index b09f3053b..000000000
--- a/xc/lib/X11/SetPntMap.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* $TOG: SetPntMap.c /main/14 1998/02/06 17:52:52 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/SetPntMap.c,v 1.2 1999/05/09 10:50:10 dawes Exp $ */
-
-#define NEED_REPLIES
-
-#include "Xlibint.h"
-/* returns either  DeviceMappingSuccess or DeviceMappingBusy  */
-
-#if NeedFunctionPrototypes
-int XSetPointerMapping (
-    register Display *dpy,
-    _Xconst unsigned char *map,
-    int nmaps)
-#else
-int XSetPointerMapping (dpy, map, nmaps)
-    register Display *dpy;
-    unsigned char *map;
-    int nmaps;
-#endif
-    {
-    register xSetPointerMappingReq *req;
-    xSetPointerMappingReply rep;
-
-    LockDisplay(dpy);
-    GetReq (SetPointerMapping, req);
-    req->nElts = nmaps;
-    req->length += (nmaps + 3)>>2;
-    Data (dpy, (char *)map, (long) nmaps);
-    if (_XReply (dpy, (xReply *)&rep, 0, xFalse) == 0) 
-	rep.success = MappingSuccess;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return ((int) rep.success);
-    }
-
-int
-XChangeKeyboardMapping (dpy, first_keycode, keysyms_per_keycode, 
-		     keysyms, nkeycodes)
-    register Display *dpy;
-    int first_keycode;
-    int keysyms_per_keycode;
-    KeySym *keysyms;
-    int nkeycodes;
-    {
-    register long nbytes;
-    register xChangeKeyboardMappingReq *req;
-
-    LockDisplay(dpy);
-    GetReq (ChangeKeyboardMapping, req);
-    req->firstKeyCode = first_keycode;
-    req->keyCodes = nkeycodes;
-    req->keySymsPerKeyCode = keysyms_per_keycode;
-    req->firstKeyCode = first_keycode;
-    req->length += nkeycodes * keysyms_per_keycode;
-    nbytes = keysyms_per_keycode * nkeycodes * 4;
-    Data32 (dpy, (long *)keysyms, nbytes);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 0;
-    }
-    
diff --git a/xc/lib/X11/SetRGBCMap.c b/xc/lib/X11/SetRGBCMap.c
deleted file mode 100644
index f552225ae..000000000
--- a/xc/lib/X11/SetRGBCMap.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/* $TOG: SetRGBCMap.c /main/6 1998/02/06 17:52:57 kaleb $ */
-/*
-
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
-#include "Xatomtype.h"
-#include <X11/Xatom.h>
-
-void XSetRGBColormaps (dpy, w, cmaps, count, property)
-    Display *dpy;
-    Window w;
-    XStandardColormap *cmaps;
-    int count;
-    Atom property;			/* XA_RGB_BEST_MAP, etc. */
-{
-    register int i;			/* iterator variable */
-    register xPropStandardColormap *map;  /* tmp variable, data in prop */
-    register XStandardColormap *cmap;	/* tmp variable, user data */
-    xPropStandardColormap *data, tmpdata;  /* scratch data */
-    int mode = PropModeReplace;		/* for partial writes */
-    Bool alloced_scratch_space;		/* do we need to free? */
-	
-
-    if (count < 1) return;
-
-    /*
-     * if doing more than one, allocate scratch space for it
-     */
-    if ((count > 1) && ((data = ((xPropStandardColormap *)
-				 Xmalloc(count*sizeof(xPropStandardColormap))))
-			 != NULL)) {
-	alloced_scratch_space = True;
-    } else {
-	data = &tmpdata;
-	alloced_scratch_space = False;
-    }
-
-
-    /*
-     * Do the iteration.  If using temp space put out each part of the prop;
-     * otherwise, wait until the end and blast it all at once.
-     */
-    for (i = count, map = data, cmap = cmaps; i > 0; i--, cmap++) {
-	map->colormap	= cmap->colormap;
-	map->red_max	= cmap->red_max;
-	map->red_mult	= cmap->red_mult;
-	map->green_max	= cmap->green_max;
-	map->green_mult	= cmap->green_mult;
-	map->blue_max	= cmap->blue_max;
-	map->blue_mult	= cmap->blue_mult;
-	map->base_pixel	= cmap->base_pixel;
-	map->visualid	= cmap->visualid;
-	map->killid	= cmap->killid;
-
-	if (alloced_scratch_space) {
-	    map++;
-	} else {
-	    XChangeProperty (dpy, w, property, XA_RGB_COLOR_MAP, 32, mode,
-			     (unsigned char *) data,
-			     NumPropStandardColormapElements);
-	    mode = PropModeAppend;
-	}
-    }
-
-    if (alloced_scratch_space) {
-	XChangeProperty (dpy, w, property, XA_RGB_COLOR_MAP, 32,
-			 PropModeReplace, (unsigned char *) data,
-			 (int) (count * NumPropStandardColormapElements));
-	Xfree ((char *) data);
-    }
-}
diff --git a/xc/lib/X11/SetSOwner.c b/xc/lib/X11/SetSOwner.c
deleted file mode 100644
index ddad6b505..000000000
--- a/xc/lib/X11/SetSOwner.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* $TOG: SetSOwner.c /main/6 1998/02/06 17:53:03 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/SetSOwner.c,v 1.2 1999/05/09 10:50:10 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XSetSelectionOwner(dpy, selection, owner, time)
-register Display *dpy;
-Atom selection;
-Window owner;
-Time time;
-{
-    register xSetSelectionOwnerReq *req;
-
-    LockDisplay(dpy);
-    GetReq(SetSelectionOwner,req);
-    req->selection = selection;
-    req->window = owner;
-    req->time = time;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/SetSSaver.c b/xc/lib/X11/SetSSaver.c
deleted file mode 100644
index 0eb3fa0ed..000000000
--- a/xc/lib/X11/SetSSaver.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $TOG: SetSSaver.c /main/6 1998/02/06 17:53:09 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/SetSSaver.c,v 1.2 1999/05/09 10:50:11 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XSetScreenSaver(dpy, timeout, interval, prefer_blank, allow_exp)
-    register Display *dpy;
-    int timeout, interval, prefer_blank, allow_exp;
-
-{
-    register xSetScreenSaverReq *req;
-
-    LockDisplay(dpy);
-    GetReq(SetScreenSaver, req);
-    req->timeout = timeout;
-    req->interval = interval;
-    req->preferBlank = prefer_blank;
-    req->allowExpose = allow_exp;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/SetStCmap.c b/xc/lib/X11/SetStCmap.c
deleted file mode 100644
index c302990a3..000000000
--- a/xc/lib/X11/SetStCmap.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* $TOG: SetStCmap.c /main/8 1998/02/06 17:53:20 kaleb $ */
-
-/***********************************************************
-
-Copyright 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
-#include "Xatomtype.h"
-#include <X11/Xatom.h>
-
-/*
- * 				    WARNING
- * 
- * This is a pre-ICCCM routine.  It must not reference any of the new fields
- * in the XStandardColormap structure.
- */
-
-void XSetStandardColormap(dpy, w, cmap, property)
-    Display *dpy;
-    Window w;
-    XStandardColormap *cmap;
-    Atom property;		/* XA_RGB_BEST_MAP, etc. */
-{
-    Screen *sp;
-    XStandardColormap stdcmap;
-
-    sp = _XScreenOfWindow (dpy, w);
-    if (!sp) {
-	/* already caught the XGetGeometry error in _XScreenOfWindow */
-	return;
-    }
-
-    stdcmap.colormap	= cmap->colormap;
-    stdcmap.red_max	= cmap->red_max;
-    stdcmap.red_mult	= cmap->red_mult;
-    stdcmap.green_max	= cmap->green_max;
-    stdcmap.green_mult  = cmap->green_mult;
-    stdcmap.blue_max	= cmap->blue_max;
-    stdcmap.blue_mult	= cmap->blue_mult;
-    stdcmap.base_pixel	= cmap->base_pixel;
-    stdcmap.visualid	= sp->root_visual->visualid;
-    stdcmap.killid	= None;		/* don't know how to kill this one */
-
-    XSetRGBColormaps (dpy, w, &stdcmap, 1, property);
-    return;
-}
diff --git a/xc/lib/X11/SetState.c b/xc/lib/X11/SetState.c
deleted file mode 100644
index fc683f28a..000000000
--- a/xc/lib/X11/SetState.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* $TOG: SetState.c /main/6 1998/02/06 17:53:15 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/SetState.c,v 1.2 1999/05/09 10:50:11 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XSetState(dpy, gc, foreground, background, function, planemask)
-register Display *dpy;
-GC gc;
-int function;
-unsigned long planemask;
-unsigned long foreground, background;
-{
-    XGCValues *gv = &gc->values;
-
-    LockDisplay(dpy);
-
-    if (function != gv->function) {
-	gv->function = function;
-	gc->dirty |= GCFunction;
-    }
-    if (planemask != gv->plane_mask) {
-	gv->plane_mask = planemask;
-	gc->dirty |= GCPlaneMask;
-    }
-    if (foreground != gv->foreground) {
-	gv->foreground = foreground;
-	gc->dirty |= GCForeground;
-    }
-    if (background != gv->background) {
-	gv->background = background;
-	gc->dirty |= GCBackground;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/SetStip.c b/xc/lib/X11/SetStip.c
deleted file mode 100644
index 39c190ff7..000000000
--- a/xc/lib/X11/SetStip.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $TOG: SetStip.c /main/7 1998/02/06 17:53:26 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/SetStip.c,v 1.2 1999/05/09 10:50:12 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XSetStipple (dpy, gc, stipple)
-register Display *dpy;
-GC gc;
-Pixmap stipple;
-{
-    LockDisplay(dpy);
-    /* always update, since client may have changed pixmap contents */
-    gc->values.stipple = stipple;
-    gc->dirty |= GCStipple;
-    _XFlushGCCache(dpy, gc);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/SetTSOrig.c b/xc/lib/X11/SetTSOrig.c
deleted file mode 100644
index 5d87e43bb..000000000
--- a/xc/lib/X11/SetTSOrig.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* $TOG: SetTSOrig.c /main/6 1998/02/06 17:53:37 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/SetTSOrig.c,v 1.2 1999/05/09 10:50:12 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XSetTSOrigin (dpy, gc, x, y)
-register Display *dpy;
-GC gc;
-int x, y;
-{
-    XGCValues *gv = &gc->values;
-
-    LockDisplay(dpy);
-    if (x != gv->ts_x_origin) {
-	gv->ts_x_origin = x;
-	gc->dirty |= GCTileStipXOrigin;
-    }
-    if (y != gv->ts_y_origin) {
-	gv->ts_y_origin = y;
-	gc->dirty |= GCTileStipYOrigin;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/SetTile.c b/xc/lib/X11/SetTile.c
deleted file mode 100644
index dcd345836..000000000
--- a/xc/lib/X11/SetTile.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $TOG: SetTile.c /main/7 1998/02/06 17:53:31 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/SetTile.c,v 1.2 1999/05/09 10:50:12 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XSetTile (dpy, gc, tile)
-register Display *dpy;
-GC gc;
-Pixmap tile;
-{
-    LockDisplay(dpy);
-    /* always update, since client may have changed pixmap contents */
-    gc->values.tile = tile;
-    gc->dirty |= GCTile;
-    _XFlushGCCache(dpy, gc);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/SetTxtProp.c b/xc/lib/X11/SetTxtProp.c
deleted file mode 100644
index bd17732eb..000000000
--- a/xc/lib/X11/SetTxtProp.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* $TOG: SetTxtProp.c /main/7 1998/02/06 17:53:43 kaleb $ */
-/***********************************************************
-Copyright 1988 by Wyse Technology, Inc., San Jose, Ca.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Wyse not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-WYSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-/*
-
-Copyright 1988, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-#include <X11/Xlibint.h>
-#include <X11/Xatom.h>
-#include <X11/Xutil.h>
-#include <X11/Xos.h>
-#include <stdio.h>
-
-void XSetTextProperty (dpy, w, tp, property)
-    Display *dpy;
-    Window w;
-    Atom property;
-    XTextProperty *tp;
-{
-    XChangeProperty (dpy, w, property, tp->encoding, tp->format,
-		     PropModeReplace, tp->value, tp->nitems);
-}
-
-void XSetWMName (dpy, w, tp)
-    Display *dpy;
-    Window w;
-    XTextProperty *tp;
-{
-    XSetTextProperty (dpy, w, tp, XA_WM_NAME);
-}
-
-void XSetWMIconName (dpy, w, tp)
-    Display *dpy;
-    Window w;
-    XTextProperty *tp;
-{
-    XSetTextProperty (dpy, w, tp, XA_WM_ICON_NAME);
-}
-
-void XSetWMClientMachine (dpy, w, tp)
-    Display *dpy;
-    Window w;
-    XTextProperty *tp;
-{
-    XSetTextProperty (dpy, w, tp, XA_WM_CLIENT_MACHINE);
-}
-
diff --git a/xc/lib/X11/SetWMCMapW.c b/xc/lib/X11/SetWMCMapW.c
deleted file mode 100644
index 3bec3ebe6..000000000
--- a/xc/lib/X11/SetWMCMapW.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* $TOG: SetWMCMapW.c /main/6 1998/02/06 17:53:48 kaleb $ */
-
-/***********************************************************
-
-Copyright 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#include "Xlibint.h"
-#include <X11/Xatom.h>
-
-/* 
- * XSetWMProtocols sets the property 
- *	WM_COLORMAP_WINDOWS 	type: WINDOW	format:32
- */
-
-Status XSetWMColormapWindows (dpy, w, windows, count)
-    Display *dpy;
-    Window w;
-    Window *windows;
-    int count;
-{
-    Atom prop;
-
-    prop = XInternAtom (dpy, "WM_COLORMAP_WINDOWS", False);
-    if (prop == None) return False;
-
-    XChangeProperty (dpy, w, prop, XA_WINDOW, 32,
-		     PropModeReplace, (unsigned char *) windows, count);
-    return True;
-}
diff --git a/xc/lib/X11/SetWMProto.c b/xc/lib/X11/SetWMProto.c
deleted file mode 100644
index 5be77e56d..000000000
--- a/xc/lib/X11/SetWMProto.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* $TOG: SetWMProto.c /main/6 1998/02/06 17:53:54 kaleb $ */
-
-/***********************************************************
-
-Copyright 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#include "Xlibint.h"
-#include <X11/Xatom.h>
-
-/* 
- * XSetWMProtocols sets the property 
- *	WM_PROTOCOLS 	type: ATOM	format: 32
- */
-
-Status XSetWMProtocols (dpy, w, protocols, count)
-    Display *dpy;
-    Window w;
-    Atom *protocols;
-    int count;
-{
-    Atom prop;
-
-    prop = XInternAtom (dpy, "WM_PROTOCOLS", False);
-    if (prop == None) return False;
-
-    XChangeProperty (dpy, w, prop, XA_ATOM, 32,
-		     PropModeReplace, (unsigned char *) protocols, count);
-    return True;
-}
diff --git a/xc/lib/X11/StBytes.c b/xc/lib/X11/StBytes.c
deleted file mode 100644
index 5c8acf263..000000000
--- a/xc/lib/X11/StBytes.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/* $TOG: StBytes.c /main/13 1998/02/06 17:54:00 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/StBytes.c,v 1.2 1999/05/09 10:50:13 dawes Exp $ */
-
-#include <X11/Xlibint.h>
-#include <X11/Xatom.h>
-
-/* insulate predefined atom numbers from cut routines */
-static Atom n_to_atom[8] = { 
-	XA_CUT_BUFFER0,
-	XA_CUT_BUFFER1,
-	XA_CUT_BUFFER2,
-	XA_CUT_BUFFER3,
-	XA_CUT_BUFFER4,
-	XA_CUT_BUFFER5,
-	XA_CUT_BUFFER6,
-	XA_CUT_BUFFER7};
-
-int
-XRotateBuffers (dpy, rotate)
-    register Display *dpy;
-    int rotate;
-{
-    return XRotateWindowProperties(dpy, RootWindow(dpy, 0), n_to_atom, 8, rotate);
-}
-    
-char *XFetchBuffer (dpy, nbytes, buffer)
-    register Display *dpy;
-    int *nbytes;
-    register int buffer;
-{
-    Atom actual_type;
-    int actual_format;
-    unsigned long nitems;
-    unsigned long leftover;
-    unsigned char *data;
-    *nbytes = 0;
-    if ((buffer < 0) || (buffer > 7)) return (NULL);
-/* XXX should be (sizeof (maxint) - 1)/4 */
-    if (XGetWindowProperty(dpy, RootWindow(dpy, 0), n_to_atom[buffer], 
-	0L, 10000000L, False, XA_STRING, 
-	&actual_type, &actual_format, &nitems, &leftover, &data) != Success) {
-	return (NULL);
-	}
-    if ( (actual_type == XA_STRING) &&  (actual_format != 32) ) {
-	*nbytes = nitems;
-	return((char *)data);
-	}
-    if ((char *) data != NULL) Xfree ((char *)data);
-    return(NULL);
-}
-
-char *XFetchBytes (dpy, nbytes)
-    register Display *dpy;
-    int *nbytes;
-{
-    return (XFetchBuffer (dpy, nbytes, 0));
-}
-
-int
-#if NeedFunctionPrototypes
-XStoreBuffer (
-    register Display *dpy,
-    _Xconst char *bytes,
-    int nbytes,
-    register int buffer)
-#else
-XStoreBuffer (dpy, bytes, nbytes, buffer)
-    register Display *dpy;
-    char *bytes;
-    int nbytes;
-    register int buffer;
-#endif
-{
-    if ((buffer < 0) || (buffer > 7)) return 0;
-    return XChangeProperty(dpy, RootWindow(dpy, 0), n_to_atom[buffer], 
-	XA_STRING, 8, PropModeReplace, (unsigned char *) bytes, nbytes);
-}
-
-int
-#if NeedFunctionPrototypes
-XStoreBytes (
-    register Display *dpy,
-    _Xconst char *bytes,
-    int nbytes)
-#else
-XStoreBytes (dpy, bytes, nbytes)
-    register Display *dpy;
-    char *bytes;
-    int nbytes;
-#endif
-{
-    return XStoreBuffer (dpy, bytes, nbytes, 0);
-}
diff --git a/xc/lib/X11/StCol.c b/xc/lib/X11/StCol.c
deleted file mode 100644
index a7592fb24..000000000
--- a/xc/lib/X11/StCol.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* $XConsortium: StCol.c,v 1.5 91/09/21 21:49:25 rws Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		XcmsStCol.c
- *
- *	DESCRIPTION
- *		Source for XcmsStoreColor
- *
- *
- */
-/* $XFree86: xc/lib/X11/StCol.c,v 1.2 1999/05/09 10:50:13 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/* EXTERN */
-
-/* SetGetCols.c */
-extern Status _XcmsSetGetColors();
-
-
-/************************************************************************
- *									*
- *			PUBLIC ROUTINES					*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsStoreColor - Store Color
- *
- *	SYNOPSIS
- */
-Status
-XcmsStoreColor(dpy, colormap, pColor_in)
-    Display *dpy;
-    Colormap colormap;
-    XcmsColor *pColor_in;
-/*
- *	DESCRIPTION
- *		Given a device-dependent or device-independent color
- *		specification, this routine will convert it to X RGB
- *		values then use it in a call to XStoreColor.
- *
- *	RETURNS
- *		XcmsFailure if failed;
- *		XcmsSuccess if it succeeded without gamut compression;
- *		XcmsSuccessWithCompression if it succeeded with gamut
- *			compression;
- *
- *		Since XStoreColor has no return value this routine
- *		does not return the color specification of the color actually
- *		stored.
- */
-{
-    XcmsColor tmpColor;
-
-    tmpColor = *pColor_in;
-    return(_XcmsSetGetColors (XStoreColor, dpy, colormap,
-			      &tmpColor, 1, XcmsRGBFormat, (Bool *) NULL));
-}
diff --git a/xc/lib/X11/StColor.c b/xc/lib/X11/StColor.c
deleted file mode 100644
index 7f08b303f..000000000
--- a/xc/lib/X11/StColor.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* $TOG: StColor.c /main/9 1998/02/06 17:54:13 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/StColor.c,v 1.2 1999/05/09 10:50:13 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XStoreColor(dpy, cmap, def)
-register Display *dpy;
-Colormap cmap;
-XColor *def;
-{
-    xColorItem *citem;
-    register xStoreColorsReq *req;
-#ifdef MUSTCOPY
-    xColorItem citemdata;
-    long len = SIZEOF(xColorItem);
-
-    citem = &citemdata;
-#endif /* MUSTCOPY */
-
-    LockDisplay(dpy);
-    GetReqExtra(StoreColors, SIZEOF(xColorItem), req); /* assume size is 4*n */
-
-    req->cmap = cmap;
-
-#ifndef MUSTCOPY
-    citem = (xColorItem *) NEXTPTR(req,xStoreColorsReq);
-#endif /* not MUSTCOPY */
-
-    citem->pixel = def->pixel;
-    citem->red = def->red;
-    citem->green = def->green;
-    citem->blue = def->blue;
-    citem->flags = def->flags; /* do_red, do_green, do_blue */
-
-#ifdef MUSTCOPY
-    dpy->bufptr -= SIZEOF(xColorItem);		/* adjust for GetReqExtra */
-    Data (dpy, (char *) citem, len);
-#endif /* MUSTCOPY */
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/StColors.c b/xc/lib/X11/StColors.c
deleted file mode 100644
index 437cc9ca2..000000000
--- a/xc/lib/X11/StColors.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* $TOG: StColors.c /main/9 1998/02/06 17:54:07 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/StColors.c,v 1.2 1999/05/09 10:50:14 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XStoreColors(dpy, cmap, defs, ncolors)
-register Display *dpy;
-Colormap cmap;
-XColor *defs;
-int ncolors;
-{
-    register int i;
-    xColorItem citem;
-    register xStoreColorsReq *req;
-
-    LockDisplay(dpy);    
-    GetReq(StoreColors, req);
-
-    req->cmap = cmap;
-
-    req->length += (ncolors * SIZEOF(xColorItem)) >> 2; /* assume size is 4*n */
-
-    for (i = 0; i < ncolors; i++) {
-	citem.pixel = defs[i].pixel;
-	citem.red = defs[i].red;
-	citem.green = defs[i].green;
-	citem.blue = defs[i].blue;
-	citem.flags = defs[i].flags;
-
-	/* note that xColorItem doesn't contain all 16-bit quantities, so
-	   we can't use Data16 */
-	Data(dpy, (char *)&citem, (long) SIZEOF(xColorItem)); 
-			/* assume size is 4*n */
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/StCols.c b/xc/lib/X11/StCols.c
deleted file mode 100644
index 86f9b41ea..000000000
--- a/xc/lib/X11/StCols.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* $XConsortium: StCols.c,v 1.8 93/09/07 21:32:42 rws Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		XcmsStCols.c
- *
- *	DESCRIPTION
- *		Source for XcmsStoreColors
- *
- *
- */
-/* $XFree86: xc/lib/X11/StCols.c,v 1.2 1999/05/09 10:50:14 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/* EXTERN */
-
-/* SetGetCols.c */
-extern Status _XcmsSetGetColors();
-
-
-/************************************************************************
- *									*
- *			PUBLIC ROUTINES					*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsStoreColors - Store Colors
- *
- *	SYNOPSIS
- */
-Status
-XcmsStoreColors(dpy, colormap, pColors_in,
-	nColors, pCompressed)
-    Display *dpy;
-    Colormap colormap;
-    XcmsColor *pColors_in;
-    unsigned int nColors;
-    Bool *pCompressed;
-/*
- *	DESCRIPTION
- *		Given device-dependent or device-independent color
- *		specifications, this routine will convert them to X RGB
- *		values then use it in a call to XStoreColors.
- *
- *	RETURNS
- *		XcmsFailure if failed;
- *		XcmsSuccess if it succeeded without gamut compression;
- *		XcmsSuccessWithCompression if it succeeded with gamut
- *			compression;
- *
- *		Since XStoreColors has no return value, this routine
- *		does not return color specifications of the colors actually
- *		stored.
- */
-{
-    XcmsColor Color1;
-    XcmsColor *pColors_tmp;
-    Status retval;
-
-    /*
-     * Make copy of array of color specifications so we don't
-     * overwrite the contents.
-     */
-    if (nColors > 1) {
-	pColors_tmp = (XcmsColor *) Xmalloc(nColors * sizeof(XcmsColor));
-    } else {
-	pColors_tmp = &Color1;
-    }
-    memcpy((char *)pColors_tmp, (char *)pColors_in,
- 	    nColors * sizeof(XcmsColor));
-
-    /*
-     * Call routine to store colors using the copied color structures
-     */
-    retval = _XcmsSetGetColors (XStoreColors, dpy, colormap,
-	    pColors_tmp, nColors, XcmsRGBFormat, pCompressed);
-
-    /*
-     * Free copies as needed.
-     */
-    if (nColors > 1) {
-	Xfree((char *)pColors_tmp);
-    }
-
-    /*
-     * Ah, finally return.
-     */
-    return(retval);
-}
diff --git a/xc/lib/X11/StNColor.c b/xc/lib/X11/StNColor.c
deleted file mode 100644
index f0593abd3..000000000
--- a/xc/lib/X11/StNColor.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* $TOG: StNColor.c /main/21 1998/02/06 17:54:35 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/StNColor.c,v 1.2 1999/05/09 10:50:15 dawes Exp $ */
-
-#include <stdio.h>
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-extern void _XcmsRGB_to_XColor();
-
-/* cmsColNm.c */
-Status _XcmsResolveColorString();
-
-int
-#if NeedFunctionPrototypes
-XStoreNamedColor(
-register Display *dpy,
-Colormap cmap,
-_Xconst char *name, /* STRING8 */
-unsigned long pixel, /* CARD32 */
-int flags)  /* DoRed, DoGreen, DoBlue */
-#else
-XStoreNamedColor(dpy, cmap, name, pixel, flags)
-register Display *dpy;
-Colormap cmap;
-char *name; /* STRING8 */
-unsigned long pixel; /* CARD32 */
-int flags;  /* DoRed, DoGreen, DoBlue */
-#endif
-{
-    unsigned int nbytes;
-    register xStoreNamedColorReq *req;
-    XcmsCCC ccc;
-    XcmsColor cmsColor_exact;
-    XColor scr_def;
-
-    /*
-     * Let's Attempt to use Xcms approach to Parse Color
-     */
-    if ((ccc = XcmsCCCOfColormap(dpy, cmap)) != (XcmsCCC)NULL) {
-	if (_XcmsResolveColorString(ccc, &name, &cmsColor_exact,
-		XcmsRGBFormat) >= XcmsSuccess) {
-	    _XcmsRGB_to_XColor(&cmsColor_exact, &scr_def, 1);
-	    scr_def.pixel = pixel;
-	    scr_def.flags = flags;
-	    return XStoreColor(dpy, cmap, &scr_def);
-	}
-	/*
-	 * Otherwise we failed; or name was changed with yet another
-	 * name.  Thus pass name to the X Server.
-	 */
-    }
-
-    /*
-     * The Xcms and i18n methods failed, so lets pass it to the server
-     * for parsing.
-     */
-
-    LockDisplay(dpy);
-    GetReq(StoreNamedColor, req);
-
-    req->cmap = cmap;
-    req->flags = flags;
-    req->pixel = pixel;
-    req->nbytes = nbytes = strlen(name);
-    req->length += (nbytes + 3) >> 2; /* round up to multiple of 4 */
-    Data(dpy, name, (long)nbytes);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 0;
-}
-
-
diff --git a/xc/lib/X11/StName.c b/xc/lib/X11/StName.c
deleted file mode 100644
index ddc21d292..000000000
--- a/xc/lib/X11/StName.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* $TOG: StName.c /main/10 1998/02/06 17:54:29 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/StName.c,v 1.2 1999/05/09 10:50:15 dawes Exp $ */
-
-#include <X11/Xlibint.h>
-#include <X11/Xatom.h>
-
-int
-#if NeedFunctionPrototypes
-XStoreName (
-    register Display *dpy,
-    Window w,
-    _Xconst char *name)
-#else
-XStoreName (dpy, w, name)
-    register Display *dpy;
-    Window w;
-    char *name;
-#endif
-{
-    return XChangeProperty(dpy, w, XA_WM_NAME, XA_STRING, 
-			   8, PropModeReplace, (unsigned char *)name,
-			   name ? strlen(name) : 0);
-}
-
-int
-#if NeedFunctionPrototypes
-XSetIconName (
-    register Display *dpy,
-    Window w,
-    _Xconst char *icon_name)
-#else
-XSetIconName (dpy, w, icon_name)
-    register Display *dpy;
-    Window w;
-    char *icon_name;
-#endif
-{
-    return XChangeProperty(dpy, w, XA_WM_ICON_NAME, XA_STRING, 
-			   8, PropModeReplace, (unsigned char *)icon_name,
-			   icon_name ? strlen(icon_name) : 0);
-}
diff --git a/xc/lib/X11/StrKeysym.c b/xc/lib/X11/StrKeysym.c
deleted file mode 100644
index 06250ca4b..000000000
--- a/xc/lib/X11/StrKeysym.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/* $TOG: StrKeysym.c /main/18 1998/02/06 17:54:40 kaleb $ */
-/*
-
-Copyright 1985, 1987, 1990, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/StrKeysym.c,v 3.2 1999/05/09 10:50:15 dawes Exp $ */
-
-#include "Xlibint.h"
-#include <X11/Xresource.h>
-#include <X11/keysymdef.h>
-#ifdef X_NOT_STDC_ENV
-extern char *getenv();
-#endif
-
-extern XrmQuark _XrmInternalStringToQuark();
-
-#ifdef __STDC__
-#define Const const
-#else
-#define Const /**/
-#endif
-
-typedef unsigned long Signature;
-
-#define NEEDKTABLE
-#include "ks_tables.h"
-
-#ifndef KEYSYMDB
-#define KEYSYMDB "/usr/lib/X11/XKeysymDB"
-#endif
-
-static Bool initialized;
-static XrmDatabase keysymdb;
-static XrmQuark Qkeysym[2];
-
-XrmDatabase
-_XInitKeysymDB()
-{
-    if (!initialized)
-    {
-	char *dbname;
-
-	XrmInitialize();
-	/* use and name of this env var is not part of the standard */
-	/* implementation-dependent feature */
-	dbname = getenv("XKEYSYMDB");
-	if (!dbname)
-	    dbname = KEYSYMDB;
-	keysymdb = XrmGetFileDatabase(dbname);
-	if (keysymdb)
-	    Qkeysym[0] = XrmStringToQuark("Keysym");
-	initialized = True;
-    }
-    return keysymdb;
-}
-
-#if NeedFunctionPrototypes
-KeySym XStringToKeysym(s)
-    _Xconst char *s;
-#else
-KeySym XStringToKeysym(s)
-    char *s;
-#endif
-{
-    register int i, n;
-    int h;
-    register Signature sig = 0;
-    register Const char *p = s;
-    register int c;
-    register int idx;
-    Const unsigned char *entry;
-    unsigned char sig1, sig2;
-    KeySym val;
-
-    while ((c = *p++))
-	sig = (sig << 1) + c;
-    i = sig % KTABLESIZE;
-    h = i + 1;
-    sig1 = (sig >> 8) & 0xff;
-    sig2 = sig & 0xff;
-    n = KMAXHASH;
-    while ((idx = hashString[i]))
-    {
-	entry = &_XkeyTable[idx];
-	if ((entry[0] == sig1) && (entry[1] == sig2) &&
-	    !strcmp(s, (char *)entry + 4))
-	{
-	    val = (entry[2] << 8) | entry[3];
-	    if (!val)
-		val = XK_VoidSymbol;
-	    return val;
-	}
-	if (!--n)
-	    break;
-	i += h;
-	if (i >= KTABLESIZE)
-	    i -= KTABLESIZE;
-    }
-
-    if (!initialized)
-	(void)_XInitKeysymDB();
-    if (keysymdb)
-    {
-	XrmValue result;
-	XrmRepresentation from_type;
-	char c;
-	KeySym val;
-	XrmQuark names[2];
-
-	names[0] = _XrmInternalStringToQuark(s, p - s - 1, sig, False);
-	names[1] = NULLQUARK;
-	(void)XrmQGetResource(keysymdb, names, Qkeysym, &from_type, &result);
-	if (result.addr && (result.size > 1))
-	{
-	    val = 0;
-	    for (i = 0; i < result.size - 1; i++)
-	    {
-		c = ((char *)result.addr)[i];
-		if ('0' <= c && c <= '9') val = (val<<4)+c-'0';
-		else if ('a' <= c && c <= 'z') val = (val<<4)+c-'a'+10;
-		else if ('A' <= c && c <= 'Z') val = (val<<4)+c-'A'+10;
-		else return NoSymbol;
-	    }
-	    return val;
-	}
-    }
-    return (NoSymbol);
-}
diff --git a/xc/lib/X11/StrToText.c b/xc/lib/X11/StrToText.c
deleted file mode 100644
index 6c41623fe..000000000
--- a/xc/lib/X11/StrToText.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* $TOG: StrToText.c /main/6 1998/02/06 17:54:45 kaleb $ */
-/*
-
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#include <X11/Xlibint.h>
-#include <X11/Xatom.h>
-#include <X11/Xutil.h>
-
-/*
- * XStringListToTextProperty - fill in TextProperty structure with 
- * concatenated list of null-separated strings.  Return True if successful 
- * else False.  Allocate room on end for trailing NULL, but don't include in
- * count.
- */
-
-Status XStringListToTextProperty (argv, argc, textprop)
-    char **argv;
-    int argc;
-    XTextProperty *textprop;
-{
-    register int i;
-    register unsigned int nbytes;
-    XTextProperty proto;
-
-    /* figure out how much space we'll need for this list */
-    for (i = 0, nbytes = 0; i < argc; i++) {
-	nbytes += (unsigned) ((argv[i] ? strlen (argv[i]) : 0) + 1);
-    }
-
-    /* fill in a prototype containing results so far */
-    proto.encoding = XA_STRING;
-    proto.format = 8;
-    if (nbytes)
-	proto.nitems = nbytes - 1;	/* subtract one for trailing <NUL> */
-    else
-	proto.nitems = 0;
-    proto.value = NULL;
-
-    /* build concatenated list of strings */
-    if (nbytes > 0) {
-	register char *buf = Xmalloc (nbytes);
-	if (!buf) return False;
-
-	proto.value = (unsigned char *) buf;
-	for (i = 0; i < argc; i++) {
-	    char *arg = argv[i];
-
-	    if (arg) {
-		(void) strcpy (buf, arg);
-		buf += (strlen (arg) + 1);
-	    } else {
-		*buf++ = '\0';
-	    }
-	}
-    } else {
-	proto.value = (unsigned char *) Xmalloc (1);	/* easier for client */
-	if (!proto.value) return False;
-
-	proto.value[0] = '\0';
-    }
-
-    /* we were successful, so set return value */
-    *textprop = proto;
-    return True;
-}
diff --git a/xc/lib/X11/Sync.c b/xc/lib/X11/Sync.c
deleted file mode 100644
index 779273860..000000000
--- a/xc/lib/X11/Sync.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* $TOG: Sync.c /main/8 1998/02/06 17:54:56 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/Sync.c,v 1.2 1999/05/09 10:50:16 dawes Exp $ */
-
-#define NEED_REPLIES
-#define NEED_EVENTS
-#include "Xlibint.h"
-
-/* Synchronize with errors and events, optionally discarding pending events */
-
-int
-XSync (dpy, discard)
-    register Display *dpy;
-    Bool discard;
-{
-    xGetInputFocusReply rep;
-    register xReq *req;
-
-    LockDisplay(dpy);
-    GetEmptyReq(GetInputFocus, req);
-    (void) _XReply (dpy, (xReply *)&rep, 0, xTrue);
-
-    if (discard && dpy->head) {
-       _XQEvent *qelt;
-
-       for (qelt=dpy->head; qelt; qelt=qelt->next)
-	   qelt->qserial_num = 0;
-
-       ((_XQEvent *)dpy->tail)->next = dpy->qfree;
-       dpy->qfree = (_XQEvent *)dpy->head;
-       dpy->head = dpy->tail = NULL;
-       dpy->qlen = 0;
-    }
-    UnlockDisplay(dpy);
-    return 1;
-}
-
diff --git a/xc/lib/X11/Synchro.c b/xc/lib/X11/Synchro.c
deleted file mode 100644
index a693675eb..000000000
--- a/xc/lib/X11/Synchro.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/* $TOG: Synchro.c /main/11 1998/02/06 17:54:51 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#include "Xlibint.h"
-
-
-int _XSyncFunction(dpy)
-register Display *dpy;
-{
-	XSync(dpy,0);
-	return 0;
-}
-
-#if NeedFunctionPrototypes
-int (*XSynchronize(Display *dpy, int onoff))()
-#else
-int (*XSynchronize(dpy,onoff))()
-     register Display *dpy;
-     int onoff;
-#endif
-{
-        int (*temp)();
-	int (*func)() = NULL;
-
-	if (onoff)
-	    func = _XSyncFunction;
-
-	LockDisplay(dpy);
-	if (dpy->flags & XlibDisplayPrivSync) {
-	    temp = dpy->savedsynchandler;
-	    dpy->savedsynchandler = func;
-	} else {
-	    temp = dpy->synchandler;
-	    dpy->synchandler = func;
-	}
-	UnlockDisplay(dpy);
-	return (temp);
-}
-
-#if NeedFunctionPrototypes
-int (*XSetAfterFunction(
-     Display *dpy,
-     int (*func)(
-#if NeedNestedPrototypes
-		 Display*
-#endif
-		 )
-))()
-#else
-int (*XSetAfterFunction(dpy,func))()
-     register Display *dpy;
-     int (*func)(
-#if NeedNestedPrototypes
-		 Display*
-#endif
-		 );
-#endif
-{
-        int (*temp)();
-
-	LockDisplay(dpy);
-	if (dpy->flags & XlibDisplayPrivSync) {
-	    temp = dpy->savedsynchandler;
-	    dpy->savedsynchandler = func;
-	} else {
-	    temp = dpy->synchandler;
-	    dpy->synchandler = func;
-	}
-	UnlockDisplay(dpy);
-	return (temp);
-}
-
diff --git a/xc/lib/X11/Text.c b/xc/lib/X11/Text.c
deleted file mode 100644
index bbf2bd5a6..000000000
--- a/xc/lib/X11/Text.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/* $TOG: Text.c /main/14 1998/02/06 17:55:26 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/Text.c,v 1.2 1999/05/09 10:50:16 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-#if NeedFunctionPrototypes
-XDrawString(
-    register Display *dpy,
-    Drawable d,
-    GC gc,
-    int x,
-    int y,
-    _Xconst char *string,
-    int length)
-#else
-XDrawString(dpy, d, gc, x, y, string, length)
-    register Display *dpy;
-    Drawable d;
-    GC gc;
-    int x, y;
-    char *string;
-    int length;
-#endif
-{   
-    int Datalength = 0;
-    register xPolyText8Req *req;
-
-    if (length <= 0)
-       return 0;
-
-    LockDisplay(dpy);
-    FlushGC(dpy, gc);
-    GetReq (PolyText8, req);
-    req->drawable = d;
-    req->gc = gc->gid;
-    req->x = x;
-    req->y = y;
-
-
-    Datalength += SIZEOF(xTextElt) * ((length + 253) / 254) + length;
-
-
-    req->length += (Datalength + 3)>>2;  /* convert to number of 32-bit words */
-
-
-    /* 
-     * If the entire request does not fit into the remaining space in the
-     * buffer, flush the buffer first.   If the request does fit into the
-     * empty buffer, then we won't have to flush it at the end to keep
-     * the buffer 32-bit aligned. 
-     */
-
-    if (dpy->bufptr + Datalength > dpy->bufmax)
-    	_XFlush (dpy);
-
-    {
-	int nbytes;
-	int PartialNChars = length;
-        /* register xTextElt *elt; */
- 	char *CharacterOffset = (char *)string;
-        unsigned char *tbuf;
-
-	while(PartialNChars > 254)
-        {
- 	    nbytes = 254 + SIZEOF(xTextElt);
-	    BufAlloc (unsigned char *, tbuf, nbytes);
-/*    elt->delta = 0;
- *    elt->len = 254;
- */
-            *(unsigned char *)tbuf = 254;
-            *(tbuf+1) = 0;
-/*       memcpy ((char *) (elt + 1), CharacterOffset, 254);
- */
-            memcpy ((char *)tbuf+2, CharacterOffset, 254);
-	    PartialNChars = PartialNChars - 254;
-	    CharacterOffset += 254;
-	}
-	    
-        if (PartialNChars)
-        {
-	    nbytes = PartialNChars + SIZEOF(xTextElt);
-	    BufAlloc (unsigned char *, tbuf, nbytes); 
-/*    elt->delta = 0;
- *    elt->len = PartialNChars;
- */
-            *(unsigned char *)tbuf =  PartialNChars;
-            *(tbuf+1) = 0;
-/*     memcpy ((char *) (elt + 1), CharacterOffset, PartialNChars);
- */
-         memcpy ((char *)tbuf+2, CharacterOffset, PartialNChars);
-	 }
-    }
-
-    /* Pad request out to a 32-bit boundary */
-
-    if (Datalength &= 3) {
-	char *pad;
-	/* 
-	 * BufAlloc is a macro that uses its last argument more than
-	 * once, otherwise I'd write "BufAlloc (char *, pad, 4-length)" 
-	 */
-	length = 4 - Datalength;
-	BufAlloc (char *, pad, length);
-	/* 
-	 * if there are 3 bytes of padding, the first byte MUST be 0
-	 * so the pad bytes aren't mistaken for a final xTextElt 
-	 */
-	*pad = 0;
-        }
-
-    /* 
-     * If the buffer pointer is not now pointing to a 32-bit boundary,
-     * we must flush the buffer so that it does point to a 32-bit boundary
-     * at the end of this routine. 
-     */
-
-    if ((dpy->bufptr - dpy->buffer) & 3)
-       _XFlush (dpy);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 0;
-}
diff --git a/xc/lib/X11/Text16.c b/xc/lib/X11/Text16.c
deleted file mode 100644
index 7bd74c0c8..000000000
--- a/xc/lib/X11/Text16.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/* $TOG: Text16.c /main/13 1998/02/06 17:55:02 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/Text16.c,v 1.2 1999/05/09 10:50:16 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-#if NeedFunctionPrototypes
-XDrawString16(
-    register Display *dpy,
-    Drawable d,
-    GC gc,
-    int x,
-    int y,
-    _Xconst XChar2b *string,
-    int length)
-#else
-XDrawString16(dpy, d, gc, x, y, string, length)
-    register Display *dpy;
-    Drawable d;
-    GC gc;
-    int x, y;
-    XChar2b *string;
-    int length;
-#endif
-{   
-    int Datalength = 0;
-    register xPolyText16Req *req;
-
-    if (length <= 0)
-       return 0;
-
-    LockDisplay(dpy);
-    FlushGC(dpy, gc);
-    GetReq (PolyText16, req);
-    req->drawable = d;
-    req->gc = gc->gid;
-    req->x = x;
-    req->y = y;
-
-
-    Datalength += SIZEOF(xTextElt) * ((length + 253) / 254) + (length << 1);
-
-
-    req->length += (Datalength + 3)>>2;  /* convert to number of 32-bit words */
-
-
-    /* 
-     * If the entire request does not fit into the remaining space in the
-     * buffer, flush the buffer first.   If the request does fit into the
-     * empty buffer, then we won't have to flush it at the end to keep
-     * the buffer 32-bit aligned. 
-     */
-
-    if (dpy->bufptr + Datalength > dpy->bufmax)
-    	_XFlush (dpy);
-
-    {
-	int nbytes;
-	int PartialNChars = length;
-        register xTextElt *elt;
- 	XChar2b *CharacterOffset = (XChar2b *)string;
-
-	while(PartialNChars > 254)
-        {
- 	    nbytes = 254 * 2 + SIZEOF(xTextElt);
-	    BufAlloc (xTextElt *, elt, nbytes);
-	    elt->delta = 0;
-	    elt->len = 254;
-#if defined(MUSTCOPY) || defined(MUSTCOPY2B)
-	    {
-		register int i;
-		register unsigned char *cp;
-		for (i = 0, cp = ((unsigned char *)elt) + 2; i < 254; i++) {
-		    *cp++ = CharacterOffset[i].byte1;
-		    *cp++ = CharacterOffset[i].byte2;
-		}
-	    }
-#else
-            memcpy ((char *) (elt + 1), (char *)CharacterOffset, 254 * 2);
-#endif
-	    PartialNChars = PartialNChars - 254;
-	    CharacterOffset += 254;
-	}
-	    
-        if (PartialNChars)
-        {
-	    nbytes = PartialNChars * 2  + SIZEOF(xTextElt);
-	    BufAlloc (xTextElt *, elt, nbytes); 
-	    elt->delta = 0;
-	    elt->len = PartialNChars;
-#if defined(MUSTCOPY) || defined(MUSTCOPY2B)
-	    {
-		register int i;
-		register unsigned char *cp;
-		for (i = 0, cp = ((unsigned char *)elt) + 2; i < PartialNChars;
-		     i++) {
-		    *cp++ = CharacterOffset[i].byte1;
-		    *cp++ = CharacterOffset[i].byte2;
-		}
-	    }
-#else
-            memcpy((char *)(elt + 1), (char *)CharacterOffset, PartialNChars * 2);
-#endif
-	 }
-    }
-
-    /* Pad request out to a 32-bit boundary */
-
-    if (Datalength &= 3) {
-	char *pad;
-	/* 
-	 * BufAlloc is a macro that uses its last argument more than
-	 * once, otherwise I'd write "BufAlloc (char *, pad, 4-length)" 
-	 */
-	length = 4 - Datalength;
-	BufAlloc (char *, pad, length);
-	/* 
-	 * if there are 3 bytes of padding, the first byte MUST be 0
-	 * so the pad bytes aren't mistaken for a final xTextElt 
-	 */
-	*pad = 0;
-        }
-
-    /* 
-     * If the buffer pointer is not now pointing to a 32-bit boundary,
-     * we must flush the buffer so that it does point to a 32-bit boundary
-     * at the end of this routine. 
-     */
-
-    if ((dpy->bufptr - dpy->buffer) & 3)
-       _XFlush (dpy);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 0;
-}
-
diff --git a/xc/lib/X11/TextExt.c b/xc/lib/X11/TextExt.c
deleted file mode 100644
index b72661176..000000000
--- a/xc/lib/X11/TextExt.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/* $TOG: TextExt.c /main/22 1998/02/06 17:55:14 kaleb $ */
-/*
-
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/TextExt.c,v 1.2 1999/05/09 10:50:17 dawes Exp $ */
-/*
- * Copyright 1995 by FUJITSU LIMITED
- * This is source code modified by FUJITSU LIMITED under the Joint
- * Development Agreement for the CDE/Motif PST.
- */
-
-
-#include "Xlibint.h"
-
-#define min_byte2 min_char_or_byte2
-#define max_byte2 max_char_or_byte2
-
-
-/* 
- * CI_GET_ROWZERO_CHAR_INFO_2D - do the same thing as CI_GET_CHAR_INFO_1D,
- * except that the font has more than one row.  This is special case of more
- * general version used in XTextExt16.c since row == 0.  This is used when
- * max_byte2 is not zero.  A further optimization would do the check for
- * min_byte1 being zero ahead of time.
- */
-
-#define CI_GET_ROWZERO_CHAR_INFO_2D(fs,col,def,cs) \
-{ \
-    cs = def; \
-    if (fs->min_byte1 == 0 && \
-	col >= fs->min_byte2 && col <= fs->max_byte2) { \
-	if (fs->per_char == NULL) { \
-	    cs = &fs->min_bounds; \
-	} else { \
-	    cs = &fs->per_char[(col - fs->min_byte2)]; \
-	    if (CI_NONEXISTCHAR(cs)) cs = def; \
-	} \
-    } \
-}
-
-
-/*
- * XTextExtents - compute the extents of string given as a sequences of eight
- * bit bytes.  Since we know that the input characters will always be from the
- * first row of the font (i.e. byte1 == 0), we can do some optimizations beyond
- * what is done in XTextExtents16.
- */
-int
-#if NeedFunctionPrototypes
-XTextExtents (
-    XFontStruct *fs,
-    _Xconst char *string,
-    int nchars,
-    int *dir,           /* RETURN font information */
-    int *font_ascent,   /* RETURN font information */
-    int *font_descent,  /* RETURN font information */
-    register XCharStruct *overall)	/* RETURN character information */
-#else
-XTextExtents (fs, string, nchars, dir, font_ascent, font_descent, overall)
-    XFontStruct *fs;
-    char *string;
-    int nchars;
-    int *dir, *font_ascent, *font_descent;  /* RETURN font information */
-    register XCharStruct *overall;	/* RETURN character information */
-#endif
-{
-    int i;				/* iterator */
-    Bool singlerow = (fs->max_byte1 == 0);  /* optimization */
-    int nfound = 0;			/* number of characters found */
-    XCharStruct *def;			/* info about default char */
-    unsigned char *us;  		/* be 8bit clean */
-
-    if (singlerow) {			/* optimization */
-	CI_GET_DEFAULT_INFO_1D (fs, def);
-    } else {
-	CI_GET_DEFAULT_INFO_2D (fs, def);
-    }
-
-    *dir = fs->direction;
-    *font_ascent = fs->ascent;
-    *font_descent = fs->descent;
-
-    /*
-     * Iterate over the input string getting the appropriate * char struct.
-     * The default (which may be null if there is no def_char) will be returned
-     * if the character doesn't exist.  On the first time * through the loop,
-     * assign the values to overall; otherwise, compute * the new values.
-     */
-
-    for (i = 0, us = (unsigned char *) string; i < nchars; i++, us++) {
-	register unsigned uc = (unsigned) *us;	/* since about to do macro */
-	register XCharStruct *cs;
-
-	if (singlerow) {		/* optimization */
-	    CI_GET_CHAR_INFO_1D (fs, uc, def, cs);
-	} else {
-	    CI_GET_ROWZERO_CHAR_INFO_2D (fs, uc, def, cs);
-	}
-
-	if (cs) {
-	    if (nfound++ == 0) {
-		*overall = *cs;
-	    } else {
-		overall->ascent = max (overall->ascent, cs->ascent);
-		overall->descent = max (overall->descent, cs->descent);
-		overall->lbearing = min (overall->lbearing, 
-					 overall->width + cs->lbearing);
-		overall->rbearing = max (overall->rbearing,
-					 overall->width + cs->rbearing);
-		overall->width += cs->width;
-	    }
-	}
-    }
-
-    /*
-     * if there were no characters, then set everything to 0
-     */
-    if (nfound == 0) {
-	overall->width = overall->ascent = overall->descent = 
-	  overall->lbearing = overall->rbearing = 0;
-    }
-
-    return 0;
-}
-
-
-/*
- * XTextWidth - compute the width of a string of eightbit bytes.  This is a 
- * subset of XTextExtents.
- */
-#if NeedFunctionPrototypes
-int XTextWidth (
-    XFontStruct *fs,
-    _Xconst char *string,
-    int count)
-#else
-int XTextWidth (fs, string, count)
-    XFontStruct *fs;
-    char *string;
-    int count;
-#endif
-{
-    int i;				/* iterator */
-    Bool singlerow = (fs->max_byte1 == 0);  /* optimization */
-    XCharStruct *def;			/* info about default char */
-    unsigned char *us;  		/* be 8bit clean */
-    int width = 0;			/* RETURN value */
-
-    if (singlerow) {			/* optimization */
-	CI_GET_DEFAULT_INFO_1D (fs, def);
-    } else {
-	CI_GET_DEFAULT_INFO_2D (fs, def);
-    }
-
-    if (def && fs->min_bounds.width == fs->max_bounds.width)
-	return (fs->min_bounds.width * count);
-
-    /*
-     * Iterate over all character in the input string; only consider characters
-     * that exist.
-     */
-    for (i = 0, us = (unsigned char *) string; i < count; i++, us++) {
-	register unsigned uc = (unsigned) *us;	/* since about to do macro */
-	register XCharStruct *cs;
-
-	if (singlerow) {		/* optimization */
-	    CI_GET_CHAR_INFO_1D (fs, uc, def, cs);
-	} else {
-	    CI_GET_ROWZERO_CHAR_INFO_2D (fs, uc, def, cs);
-	}
-
-	if (cs) width += cs->width;
-    }
-
-    return width;
-}
-
-
-
-/*
- * _XTextHeight - compute the height of a string of eightbit bytes.
- */
-#if NeedFunctionPrototypes
-int _XTextHeight (
-    XFontStruct *fs,
-    _Xconst char *string,
-    int count)
-#else
-int _XTextHeight (fs, string, count)
-    XFontStruct *fs;
-    char *string;
-    int count;
-#endif
-{
-    int i;				/* iterator */
-    Bool singlerow = (fs->max_byte1 == 0);  /* optimization */
-    XCharStruct *def;			/* info about default char */
-    unsigned char *us;  		/* be 8bit clean */
-    int height = 0;			/* RETURN value */
-
-    if (singlerow) {			/* optimization */
-	CI_GET_DEFAULT_INFO_1D (fs, def);
-    } else {
-	CI_GET_DEFAULT_INFO_2D (fs, def);
-    }
-
-    if (def && (fs->min_bounds.ascent == fs->max_bounds.ascent)
-	    && (fs->min_bounds.descent == fs->max_bounds.descent))
-	return ((fs->min_bounds.ascent + fs->min_bounds.descent) * count);
-
-    /*
-     * Iterate over all character in the input string; only consider characters
-     * that exist.
-     */
-    for (i = 0, us = (unsigned char *) string; i < count; i++, us++) {
-	register unsigned uc = (unsigned) *us;	/* since about to do macro */
-	register XCharStruct *cs;
-
-	if (singlerow) {		/* optimization */
-	    CI_GET_CHAR_INFO_1D (fs, uc, def, cs);
-	} else {
-	    CI_GET_ROWZERO_CHAR_INFO_2D (fs, uc, def, cs);
-	}
-
-	if (cs) height += (cs->ascent + cs->descent);
-    }
-
-    return height;
-}
-
diff --git a/xc/lib/X11/TextExt16.c b/xc/lib/X11/TextExt16.c
deleted file mode 100644
index 6656044d1..000000000
--- a/xc/lib/X11/TextExt16.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/* $TOG: TextExt16.c /main/17 1998/02/06 17:55:08 kaleb $ */
-/*
-
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/TextExt16.c,v 1.2 1999/05/09 10:50:17 dawes Exp $ */
-/*
- * Copyright 1995 by FUJITSU LIMITED
- * This is source code modified by FUJITSU LIMITED under the Joint
- * Development Agreement for the CDE/Motif PST.
- */
-
-
-#include "Xlibint.h"
-
-#define min_byte2 min_char_or_byte2
-#define max_byte2 max_char_or_byte2
-
-/*
- * XTextExtents16 - compute the extents of string given as a sequence of 
- * XChar2bs.
- */
-int
-#if NeedFunctionPrototypes
-XTextExtents16 (
-    XFontStruct *fs,
-    _Xconst XChar2b *string,
-    int nchars,
-    int *dir,           /* RETURN font information */
-    int *font_ascent,   /* RETURN font information */
-    int *font_descent,  /* RETURN font information */
-    register XCharStruct *overall)	/* RETURN character information */
-#else
-XTextExtents16 (fs, string, nchars, dir, font_ascent, font_descent, overall)
-    XFontStruct *fs;
-    XChar2b *string;
-    int nchars;
-    int *dir, *font_ascent, *font_descent;  /* RETURN font information */
-    register XCharStruct *overall;	/* RETURN character information */
-#endif
-{
-    int i;				/* iterator */
-    Bool singlerow = (fs->max_byte1 == 0);  /* optimization */
-    int nfound = 0;			/* number of characters found */
-    XCharStruct *def;			/* info about default char */
-
-    if (singlerow) {
-	CI_GET_DEFAULT_INFO_1D (fs, def);
-    } else {
-	CI_GET_DEFAULT_INFO_2D (fs, def);
-    }
-
-    *dir = fs->direction;
-    *font_ascent = fs->ascent;
-    *font_descent = fs->descent;
-
-    /*
-     * Iterate over the input string getting the appropriate * char struct.
-     * The default (which may be null if there is no def_char) will be returned
-     * if the character doesn't exist.  On the first time * through the loop,
-     * assign the values to overall; otherwise, compute * the new values.
-     */
-
-    for (i = 0; i < nchars; i++, string++) {
-	register XCharStruct *cs;
-	unsigned int r = (unsigned int) string->byte1;	/* watch for macros */
-	unsigned int c = (unsigned int) string->byte2;	/* watch for macros */
-
-	if (singlerow) {
-	    unsigned int ind = ((r << 8) | c);		/* watch for macros */
-	    CI_GET_CHAR_INFO_1D (fs, ind, def, cs);
-	} else {
-	    CI_GET_CHAR_INFO_2D (fs, r, c, def, cs);
-	}
-
-	if (cs) {
-	    if (nfound++ == 0) {
-		*overall = *cs;
-	    } else {
-		overall->ascent = max (overall->ascent, cs->ascent);
-		overall->descent = max (overall->descent, cs->descent);
-		overall->lbearing = min (overall->lbearing, 
-					 overall->width + cs->lbearing);
-		overall->rbearing = max (overall->rbearing,
-					 overall->width + cs->rbearing);
-		overall->width += cs->width;
-	    }
-	}
-    }
-
-    /*
-     * if there were no characters, then set everything to 0
-     */
-    if (nfound == 0) {
-	overall->width = overall->ascent = overall->descent = 
-	  overall->lbearing = overall->rbearing = 0;
-    }
-
-    return 0;
-}
-
-
-/*
- * XTextWidth16 - compute the width of sequence of XChar2bs.  This is a 
- * subset of XTextExtents16.
- */
-#if NeedFunctionPrototypes
-int XTextWidth16 (
-    XFontStruct *fs,
-    _Xconst XChar2b *string,
-    int count)
-#else
-int XTextWidth16 (fs, string, count)
-    XFontStruct *fs;
-    XChar2b *string;
-    int count;
-#endif
-{
-    int i;				/* iterator */
-    Bool singlerow = (fs->max_byte1 == 0);  /* optimization */
-    XCharStruct *def;			/* info about default char */
-    int width = 0;			/* RETURN value */
-
-    if (singlerow) {
-	CI_GET_DEFAULT_INFO_1D (fs, def);
-    } else {
-	CI_GET_DEFAULT_INFO_2D (fs, def);
-    }
-
-    if (def && fs->min_bounds.width == fs->max_bounds.width)
-	return (fs->min_bounds.width * count);
-
-    /*
-     * Iterate over all character in the input string; only consider characters
-     * that exist.
-     */
-    for (i = 0; i < count; i++, string++) {
-	register XCharStruct *cs;
-	unsigned int r = (unsigned int) string->byte1;	/* watch for macros */
-	unsigned int c = (unsigned int) string->byte2;	/* watch for macros */
-
-	if (singlerow) {
-	    unsigned int ind = ((r << 8) | c);		/* watch for macros */
-	    CI_GET_CHAR_INFO_1D (fs, ind, def, cs);
-	} else {
-	    CI_GET_CHAR_INFO_2D (fs, r, c, def, cs);
-	}
-
-	if (cs) width += cs->width;
-    }
-
-    return width;
-}
-
-
-/*
- * _XTextHeight16 - compute the height of sequence of XChar2bs.
- */
-#if NeedFunctionPrototypes
-int _XTextHeight16 (
-    XFontStruct *fs,
-    _Xconst XChar2b *string,
-    int count)
-#else
-int _XTextHeight16 (fs, string, count)
-    XFontStruct *fs;
-    XChar2b *string;
-    int count;
-#endif
-{
-    int i;				/* iterator */
-    Bool singlerow = (fs->max_byte1 == 0);  /* optimization */
-    XCharStruct *def;			/* info about default char */
-    int height = 0;			/* RETURN value */
-
-    if (singlerow) {
-	CI_GET_DEFAULT_INFO_1D (fs, def);
-    } else {
-	CI_GET_DEFAULT_INFO_2D (fs, def);
-    }
-
-    if (def && (fs->min_bounds.ascent == fs->max_bounds.ascent)
-	    && (fs->min_bounds.descent == fs->max_bounds.descent))
-	return ((fs->min_bounds.ascent + fs->min_bounds.descent) * count);
-
-    /*
-     * Iterate over all character in the input string; only consider characters
-     * that exist.
-     */
-    for (i = 0; i < count; i++, string++) {
-	register XCharStruct *cs;
-	unsigned int r = (unsigned int) string->byte1;	/* watch for macros */
-	unsigned int c = (unsigned int) string->byte2;	/* watch for macros */
-
-	if (singlerow) {
-	    unsigned int ind = ((r << 8) | c);		/* watch for macros */
-	    CI_GET_CHAR_INFO_1D (fs, ind, def, cs);
-	} else {
-	    CI_GET_CHAR_INFO_2D (fs, r, c, def, cs);
-	}
-
-	if (cs) height += (cs->ascent + cs->descent);
-    }
-
-    return height;
-}
-
diff --git a/xc/lib/X11/TextToStr.c b/xc/lib/X11/TextToStr.c
deleted file mode 100644
index 42b6c61ba..000000000
--- a/xc/lib/X11/TextToStr.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/* $TOG: TextToStr.c /main/6 1998/02/06 17:55:20 kaleb $ */
-/*
-
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-/* $XFree86: xc/lib/X11/TextToStr.c,v 1.3 1998/10/03 08:41:23 dawes Exp $ */
-
-#include <X11/Xlibint.h>
-#include <X11/Xatom.h>
-#include <X11/Xutil.h>
-
-
-/*
- * XTextPropertyToStringList - set list and count to contain data stored in
- * null-separated STRING property.
- */
-
-Status XTextPropertyToStringList (tp, list_return, count_return)
-    XTextProperty *tp;
-    char ***list_return;
-    int *count_return;
-{
-    char **list;			/* return value */
-    int nelements;			/* return value */
-    register char *cp;			/* temp variable */
-    char *start;			/* start of thing to copy */
-    int i, j;				/* iterator variables */
-    int datalen = (int) tp->nitems;	/* for convenience */
-
-    /*
-     * make sure we understand how to do it
-     */
-    if (tp->encoding != XA_STRING ||  tp->format != 8) return False;
-
-    if (datalen == 0) {
-	*list_return = NULL;
-	*count_return = 0;
-	return True;
-    }
-
-    /*
-     * walk the list to figure out how many elements there are
-     */
-    nelements = 1;			/* since null-separated */
-    for (cp = (char *) tp->value, i = datalen; i > 0; cp++, i--) {
-	if (*cp == '\0') nelements++;
-    }
-
-    /*
-     * allocate list and duplicate
-     */
-    list = (char **) Xmalloc (nelements * sizeof (char *));
-    if (!list) return False;
-	
-    start = (char *) Xmalloc ((datalen + 1) * sizeof (char));	/* for <NUL> */
-    if (!start) {
-	Xfree ((char *) list);
-	return False;
-    }
-
-    /*
-     * copy data
-     */
-    memcpy (start, (char *) tp->value, tp->nitems);
-    start[datalen] = '\0';
-
-    /*
-     * walk down list setting value
-     */
-    for (cp = start, i = datalen + 1, j = 0; i > 0; cp++, i--) {
-	if (*cp == '\0') {
-	    list[j] = start;
-	    start = (cp + 1);
-	    j++;
-	}
-    }
-
-    /*
-     * append final null pointer and then return data
-     */
-    *list_return = list;
-    *count_return = nelements;
-    return True;
-}
-
-
-void XFreeStringList (list)
-    char **list;
-{
-    if (list) {
-	if (list[0]) Xfree (list[0]);
-	Xfree ((char *) list);
-	list = NULL;
-    }
-}
-
diff --git a/xc/lib/X11/TrCoords.c b/xc/lib/X11/TrCoords.c
deleted file mode 100644
index e94b2ec9c..000000000
--- a/xc/lib/X11/TrCoords.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* $TOG: TrCoords.c /main/7 1998/02/06 17:55:31 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-
-Bool XTranslateCoordinates(dpy, src_win, dest_win, src_x, src_y, 
-		      dst_x, dst_y, child)
-     register Display *dpy;
-     Window src_win, dest_win;
-     int src_x, src_y;
-     int *dst_x, *dst_y;
-     Window *child;
-{       
-    register xTranslateCoordsReq *req;
-    xTranslateCoordsReply rep;
-
-    LockDisplay(dpy);
-    GetReq(TranslateCoords, req);
-    req->srcWid = src_win;
-    req->dstWid = dest_win;
-    req->srcX = src_x;
-    req->srcY = src_y;
-    if (_XReply (dpy, (xReply *)&rep, 0, xTrue) == 0) {
-	    UnlockDisplay(dpy);
-	    SyncHandle();
-	    return(False);
-	}
-	
-    *child = rep.child;
-    *dst_x = cvtINT16toInt (rep.dstX);
-    *dst_y = cvtINT16toInt (rep.dstY);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return ((int)rep.sameScreen);
-}
-
diff --git a/xc/lib/X11/UNDEFINED.c b/xc/lib/X11/UNDEFINED.c
deleted file mode 100644
index ad0139d25..000000000
--- a/xc/lib/X11/UNDEFINED.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* $XConsortium: UNDEFINED.c,v 1.5 91/07/25 01:10:56 rws Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *
- *	NAME
- *		UNDEFINED.c
- *
- *	DESCRIPTION
- *		UNDEFINED Color Space
- *
- *
- */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/*
- *      FORWARD DECLARATIONS
- */
-static int ReturnZero();
-
-
-/*
- *      LOCALS VARIABLES
- */
-
-static Status (*(Fl_ReturnZero[]))() = {
-    ReturnZero,
-    NULL
-};
-
-
-
-
-/*
- *      GLOBALS
- *              Variables declared in this package that are allowed
- *		to be used globally.
- */
-    /*
-     * UNDEFINED Color Space
-     */
-XcmsColorSpace	XcmsUNDEFINEDColorSpace =
-    {
-	"undefined",		/* prefix */
-	XcmsUndefinedFormat,	/* id */
-	ReturnZero,		/* parseString */
-	Fl_ReturnZero,		/* to_CIEXYZ */
-	Fl_ReturnZero		/* from_CIEXYZ */
-    };
-
-
-
-/************************************************************************
- *									*
- *			PRIVATE ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		ReturnZero
- *
- *	SYNOPSIS
- */
-/* ARGSUSED */
-static int
-ReturnZero()
-/*
- *	DESCRIPTION
- *		Does nothing.
- *
- *	RETURNS
- *		0
- *
- */
-{
-    return(0);
-}
diff --git a/xc/lib/X11/UndefCurs.c b/xc/lib/X11/UndefCurs.c
deleted file mode 100644
index 56262f40a..000000000
--- a/xc/lib/X11/UndefCurs.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* $TOG: UndefCurs.c /main/7 1998/02/06 17:55:44 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/UndefCurs.c,v 1.2 1999/05/09 10:50:18 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XUndefineCursor (dpy,w)
-    register Display *dpy;
-    Window w;
-{
-    register xChangeWindowAttributesReq *req;
-    unsigned long defcurs = None;
-
-    LockDisplay(dpy);
-    GetReqExtra (ChangeWindowAttributes, 4, req);
-    req->window = w;
-    req->valueMask = CWCursor;
-    OneDataCard32 (dpy, NEXTPTR(req,xChangeWindowAttributesReq), defcurs);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/UngrabBut.c b/xc/lib/X11/UngrabBut.c
deleted file mode 100644
index 6175c48ea..000000000
--- a/xc/lib/X11/UngrabBut.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* $TOG: UngrabBut.c /main/6 1998/02/06 17:55:56 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/UngrabBut.c,v 1.2 1999/05/09 10:50:18 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XUngrabButton(dpy, button, modifiers, grab_window)
-register Display *dpy;
-unsigned int button; /* CARD8 */
-unsigned int modifiers; /* CARD16 */
-Window grab_window;
-{
-    register xUngrabButtonReq *req;
-
-    LockDisplay(dpy);
-    GetReq(UngrabButton, req);
-    req->button = button;
-    req->modifiers = modifiers;
-    req->grabWindow = grab_window;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/UngrabKbd.c b/xc/lib/X11/UngrabKbd.c
deleted file mode 100644
index c20d22f8f..000000000
--- a/xc/lib/X11/UngrabKbd.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* $TOG: UngrabKbd.c /main/6 1998/02/06 17:56:02 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/UngrabKbd.c,v 1.2 1999/05/09 10:50:18 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XUngrabKeyboard (dpy, time)
-        register Display *dpy;
-	Time time;
-{
-        register xResourceReq *req;
-
-	LockDisplay(dpy);
-        GetResReq(UngrabKeyboard, time, req);
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return 1;
-}
-
diff --git a/xc/lib/X11/UngrabKey.c b/xc/lib/X11/UngrabKey.c
deleted file mode 100644
index f9075bbe8..000000000
--- a/xc/lib/X11/UngrabKey.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* $TOG: UngrabKey.c /main/6 1998/02/06 17:56:08 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/UngrabKey.c,v 1.2 1999/05/09 10:50:19 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XUngrabKey(dpy, key, modifiers, grab_window)
-     register Display *dpy;
-     int key;
-     unsigned int modifiers;
-     Window grab_window;
-
-{
-    register xUngrabKeyReq *req;
-
-    LockDisplay(dpy);
-    GetReq(UngrabKey, req);
-    req->grabWindow = grab_window;
-    req->modifiers = modifiers;
-    req->key = key;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
-
-
diff --git a/xc/lib/X11/UngrabPtr.c b/xc/lib/X11/UngrabPtr.c
deleted file mode 100644
index 61ca84749..000000000
--- a/xc/lib/X11/UngrabPtr.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* $TOG: UngrabPtr.c /main/6 1998/02/06 17:56:13 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/UngrabPtr.c,v 1.2 1999/05/09 10:50:19 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XUngrabPointer(dpy, time)
-register Display *dpy;
-Time time;
-{
-    register xResourceReq *req;
-
-    LockDisplay(dpy);
-    GetResReq(UngrabPointer, time, req);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/UngrabSvr.c b/xc/lib/X11/UngrabSvr.c
deleted file mode 100644
index fc60e1d71..000000000
--- a/xc/lib/X11/UngrabSvr.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* $TOG: UngrabSvr.c /main/6 1998/02/06 17:56:19 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/UngrabSvr.c,v 1.2 1999/05/09 10:50:20 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XUngrabServer (dpy)
-register Display *dpy;
-{
-        register xReq *req;
-
-        LockDisplay(dpy);
-        GetEmptyReq(UngrabServer, req);
-        UnlockDisplay(dpy);
-	SyncHandle();
-	return 1;
-}
-
diff --git a/xc/lib/X11/UninsCmap.c b/xc/lib/X11/UninsCmap.c
deleted file mode 100644
index 426d4cba1..000000000
--- a/xc/lib/X11/UninsCmap.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* $TOG: UninsCmap.c /main/6 1998/02/06 17:56:24 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/UninsCmap.c,v 1.2 1999/05/09 10:50:20 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XUninstallColormap(dpy, cmap)
-register Display *dpy;
-Colormap cmap;
-{
-    register xResourceReq *req;
-
-    LockDisplay(dpy);
-    GetResReq(UninstallColormap, cmap, req);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/UnldFont.c b/xc/lib/X11/UnldFont.c
deleted file mode 100644
index 54ad6c12b..000000000
--- a/xc/lib/X11/UnldFont.c
+++ /dev/null
@@ -1,40 +0,0 @@
- /* $TOG: UnldFont.c /main/6 1998/02/06 17:56:30 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/UnldFont.c,v 1.2 1999/05/09 10:50:20 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XUnloadFont(dpy, font)
-     register Display *dpy;
-     Font font;
-{       
-    register xResourceReq *req;
-
-    LockDisplay(dpy);
-    GetResReq(CloseFont, font, req);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/UnmapSubs.c b/xc/lib/X11/UnmapSubs.c
deleted file mode 100644
index c66fa1079..000000000
--- a/xc/lib/X11/UnmapSubs.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* $TOG: UnmapSubs.c /main/6 1998/02/06 17:56:35 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/UnmapSubs.c,v 1.2 1999/05/09 10:50:21 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XUnmapSubwindows(dpy, win)
-register Display *dpy;
-Window win;
-{
-    register xResourceReq *req;
-
-    LockDisplay(dpy);
-    GetResReq(UnmapSubwindows,win, req);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
diff --git a/xc/lib/X11/UnmapWin.c b/xc/lib/X11/UnmapWin.c
deleted file mode 100644
index 30ee84e4e..000000000
--- a/xc/lib/X11/UnmapWin.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* $TOG: UnmapWin.c /main/6 1998/02/06 17:56:41 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/UnmapWin.c,v 1.2 1999/05/09 10:50:21 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XUnmapWindow (dpy, w)
-        register Display *dpy;
-	Window w;
-{
-        register xResourceReq *req;
-
-        LockDisplay(dpy);
-        GetResReq(UnmapWindow, w, req);
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return 1;
-}
-
diff --git a/xc/lib/X11/VisUtil.c b/xc/lib/X11/VisUtil.c
deleted file mode 100644
index c418c9366..000000000
--- a/xc/lib/X11/VisUtil.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/* $TOG: VisUtil.c /main/11 1998/02/06 17:56:53 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#include "Xlibint.h"
-#include "Xutil.h"
-#include <stdio.h>
-/*
- *	This procedure returns a list of visual information structures
- *	that match the specified attributes given in the visual information 
- *	template.
- *
- *	If no visuals exist that match the specified attributes, a NULL is
- *	returned.
- *
- *	The choices for visual_info_mask are:
- *
- *		VisualNoMask
- *		VisualIDMask
- *		VisualScreenMask
- *		VisualDepthMask
- *		VisualClassMask
- *		VisualRedMaskMask
- *		VisualGreenMaskMask
- *		VisualBlueMaskMask
- *		VisualColormapSizeMask
- *		VisualBitsPerRGBMask
- *		VisualAllMask
- */
-
-XVisualInfo *XGetVisualInfo( dpy, visual_info_mask, 
-			    visual_info_template, nitems)
-Display *dpy;
-register long visual_info_mask; 
-register XVisualInfo *visual_info_template;
-int *nitems;	/* RETURN */
-{
-
-  register Visual *vp;
-  register Depth *dp;
-  Screen *sp;
-  int ii,screen_s,screen_e,total,count;
-  register XVisualInfo *vip,*vip_base;
-
-  /* NOTE: NO HIGH PERFORMING CODE TO BE FOUND HERE */
-
-  LockDisplay(dpy);
-
-  /* ALLOCATE THE ORIGINAL BUFFER; REALLOCED LATER IF OVERFLOW OCCURS;
-     FREED AT END IF NO VISUALS ARE FOUND */
-
-  count = 0;
-  total = 10;
-  if (! (vip_base = vip = (XVisualInfo *) 
-	 Xmalloc((unsigned) (sizeof(XVisualInfo) * total)))) {
-      UnlockDisplay(dpy);
-      return (XVisualInfo *) NULL;
-  }
-
-  /* DETERMINE IF WE DO ALL SCREENS OR ONLY ONE */
-
-  screen_s = 0;
-  screen_e = dpy->nscreens;
-  if (visual_info_mask & VisualScreenMask)
-    {
-      screen_s = visual_info_template->screen;
-      if (screen_s < 0 || screen_s >= screen_e)
-	  screen_e = screen_s;
-      else
-	  screen_e = screen_s + 1;
-    }
-
-  /* LOOP THROUGH SCREENS */
-
-  for (ii=screen_s; ii<screen_e; ii++)
-    {
-      sp = (Screen *)(&dpy->screens[ii]);
-
-      /* LOOP THROUGH DEPTHS */
-
-      for (dp=sp->depths; dp < (sp->depths + sp->ndepths); dp++)
-        {
-          if ((visual_info_mask & VisualDepthMask) &&
-	      (dp->depth != visual_info_template->depth)) continue;
-
-          /* LOOP THROUGH VISUALS */
-
-	  if (dp->visuals) {
-	    for (vp=dp->visuals; vp<(dp->visuals + dp->nvisuals); vp++) {
-              if ((visual_info_mask & VisualIDMask) &&
-                (vp->visualid != visual_info_template->visualid)) continue;
-              if ((visual_info_mask & VisualClassMask) &&
-                (vp->class != visual_info_template->class)) continue;
-              if ((visual_info_mask & VisualRedMaskMask) &&
-                (vp->red_mask != visual_info_template->red_mask)) continue;
-              if ((visual_info_mask & VisualGreenMaskMask) &&
-                (vp->green_mask != visual_info_template->green_mask)) continue;
-              if ((visual_info_mask & VisualBlueMaskMask) &&
-                (vp->blue_mask != visual_info_template->blue_mask)) continue;
-              if ((visual_info_mask & VisualColormapSizeMask) &&
-                (vp->map_entries != visual_info_template->colormap_size)) continue;
-              if ((visual_info_mask & VisualBitsPerRGBMask) &&
-                (vp->bits_per_rgb != visual_info_template->bits_per_rgb)) continue;
-
-              /* YEA!!! WE FOUND A GOOD ONE */
- 
-              if (count+1 > total)
-                {
-		  XVisualInfo *old_vip_base = vip_base;
-                  total += 10;
-                  if (! (vip_base = (XVisualInfo *)
-			 Xrealloc((char *) vip_base, 
-				  (unsigned) (sizeof(XVisualInfo) * total)))) {
-		      Xfree((char *) old_vip_base);
-		      UnlockDisplay(dpy);
-		      return (XVisualInfo *) NULL;
-		  }
-                  vip = &vip_base[count];
-                }
-
-              count++;
-
-              vip->visual = _XVIDtoVisual(dpy, vp->visualid);
-              vip->visualid = vp->visualid;
-              vip->screen = ii;
-              vip->depth = dp->depth;
-              vip->class = vp->class;
-              vip->red_mask = vp->red_mask;
-              vip->green_mask = vp->green_mask;
-              vip->blue_mask = vp->blue_mask;
-              vip->colormap_size = vp->map_entries;
-              vip->bits_per_rgb = vp->bits_per_rgb;
-
-              vip++;
-
-            } /* END OF LOOP ON VISUALS */
-	  } /* END OF IF THERE ARE ANY VISUALS AT THIS DEPTH */
-          
-        } /* END OF LOOP ON DEPTHS */
-
-    } /* END OF LOOP ON SCREENS */
-
-  UnlockDisplay(dpy);
-
-  if (count)
-    {
-      *nitems = count;
-      return vip_base;
-    }
-
-  Xfree((char *) vip_base);
-  *nitems = 0;
-  return NULL;
-}
-
-
-/*
- *	This procedure will return the visual information for a visual 
- *      that matches the specified depth and class for a screen.  Since 
- *	multiple visuals may exist that match the specified depth and 
- *	class, which visual chosen is undefined.
- *
- *	If a visual is found, True is returned as the function value,
- *	otherwise False is returned.
- */
-
-Status XMatchVisualInfo( dpy, screen, depth, class, visual_info)
-	Display *dpy;
-	int screen;
-	int depth;
-	int class;
-	XVisualInfo *visual_info; /* RETURNED */
-{
-
-  Visual *vp;
-  Depth *dp;
-  Screen *sp;
-  int ii,jj;
-
-  if (screen < 0 || screen >= dpy->nscreens)
-      return False;
-
-  LockDisplay(dpy);
-
-  sp = (Screen *)(&dpy->screens[screen]);
-
-  dp = sp->depths;
-
-  for (ii=0; ii < sp->ndepths; ii++)
-    {
-
-    /* LOOK THROUGH DEPTHS FOR THE WANTED DEPTH */
-
-    if (dp->depth == depth)
-      {
-        vp = dp->visuals;
-
-        /* LOOK THROUGH VISUALS FOR THE WANTED CLASS */
-
-	/* if nvisuals == 0 then vp will be NULL */
-        for (jj=0; jj<dp->nvisuals; jj++)
-          {
-            if (vp->class == class) 
-              {
-		visual_info->visual = _XVIDtoVisual(dpy, vp->visualid);
-		visual_info->visualid = vp->visualid;
-		visual_info->screen = screen;
-		visual_info->depth = depth;
-		visual_info->class = vp->class;
-		visual_info->red_mask = vp->red_mask;
-		visual_info->green_mask = vp->green_mask;
-		visual_info->blue_mask = vp->blue_mask;
-		visual_info->colormap_size = vp->map_entries;
-		visual_info->bits_per_rgb = vp->bits_per_rgb;
-                UnlockDisplay(dpy);
-                return True;
-              }
-            vp++;
-          }
-      }
-
-    dp++;
-
-    }
-
-  UnlockDisplay(dpy);
-
-  return False;
-
-}
diff --git a/xc/lib/X11/WMGeom.c b/xc/lib/X11/WMGeom.c
deleted file mode 100644
index 9f6888e96..000000000
--- a/xc/lib/X11/WMGeom.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/* $TOG: WMGeom.c /main/6 1998/02/06 17:57:27 kaleb $ */
-/*
-
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#include "Xlibint.h"
-#include "Xutil.h"
-
-static int _GeometryMaskToGravity();
-
-
-/*
- * This routine given a user supplied positional argument and a default
- * argument (fully qualified) will return the position the window should take
- * as well as the gravity to be set in the WM_NORMAL_HINTS size hints.
- * Always sets all return values and returns a mask describing which fields
- * were set by the user or'ed with whether or not the x and y values should
- * be considered "negative".
- */
-
-#if NeedFunctionPrototypes
-int XWMGeometry (
-    Display *dpy,			/* user's display connection */
-    int screen,				/* screen on which to do computation */
-    _Xconst char *user_geom,		/* user provided geometry spec */
-    _Xconst char *def_geom,		/* default geometry spec for window */
-    unsigned int bwidth,		/* border width */
-    XSizeHints *hints,			/* usually WM_NORMAL_HINTS */
-    int *x_return,			/* location of window */
-    int *y_return,			/* location of window */
-    int *width_return,			/* size of window */
-    int *height_return,			/* size of window */
-    int *gravity_return)		/* gravity of window */
-#else
-int XWMGeometry (dpy, screen, user_geom, def_geom, bwidth, hints,
-		 x_return, y_return, width_return, height_return, 
-		 gravity_return)
-    Display *dpy;			/* user's display connection */
-    int screen;				/* screen on which to do computation */
-    char *user_geom;			/* user provided geometry spec */
-    char *def_geom;			/* default geometry spec for window */
-    unsigned int bwidth;		/* border width */
-    XSizeHints *hints;			/* usually WM_NORMAL_HINTS */
-    int *x_return, *y_return;		/* location of window */
-    int *width_return, *height_return;	/* size of window */
-    int *gravity_return;		/* gravity of window */
-#endif
-{
-    int ux, uy;				/* returned values from parse */
-    unsigned int uwidth, uheight;	/* returned values from parse */
-    int umask;				/* parse mask of returned values */
-    int dx, dy;				/* default values from parse */
-    unsigned int dwidth, dheight;	/* default values from parse */
-    int dmask;				/* parse mask of returned values */
-    int base_width, base_height;	/* valid amounts */
-    int min_width, min_height;		/* valid amounts */
-    int width_inc, height_inc;		/* valid amounts */
-    int rx, ry, rwidth, rheight;	/* return values */
-    int rmask;				/* return mask */
-
-    /*
-     * Get the base sizes and increments.  Section 4.1.2.3 of the ICCCM
-     * states that the base and minimum sizes are defaults for each other.
-     * If neither is given, then the base sizes should be 0.  These parameters
-     * control the sets of sizes that window managers should allow for the 
-     * window according to the following formulae:
-     *
-     *          width = base_width  + (i * width_inc)
-     *         height = base_height + (j * height_inc)
-     */
-    base_width =  ((hints->flags & PBaseSize) ? hints->base_width : 
-		   ((hints->flags & PMinSize) ? hints->min_width : 0));
-    base_height = ((hints->flags & PBaseSize) ? hints->base_height :
-		   ((hints->flags & PMinSize) ? hints->min_height : 0));
-    min_width = ((hints->flags & PMinSize) ? hints->min_width : base_width);
-    min_height = ((hints->flags & PMinSize) ? hints->min_height : base_height);
-    width_inc = (hints->flags & PResizeInc) ? hints->width_inc : 1;
-    height_inc = (hints->flags & PResizeInc) ? hints->height_inc : 1;
-
-
-    /*
-     * parse the two geometry masks
-     */
-    rmask = umask = XParseGeometry (user_geom, &ux, &uy, &uwidth, &uheight);
-    dmask = XParseGeometry (def_geom, &dx, &dy, &dwidth, &dheight);
-
-
-    /*
-     * get the width and height:
-     *     1.  if user-specified, then take that value
-     *     2.  else, if program-specified, then take that value
-     *     3.  else, take 1
-     *     4.  multiply by the size increment
-     *     5.  and add to the base size
-     */
-    rwidth = ((((umask & WidthValue) ? uwidth : 
-		((dmask & WidthValue) ? dwidth : 1)) * width_inc) +
-	      base_width);
-    rheight = ((((umask & HeightValue) ? uheight : 
-		 ((dmask & HeightValue) ? dheight : 1)) * height_inc) + 
-	       base_height);
-
-    /*
-     * Make sure computed size is within limits.  Note that we always do the
-     * lower bounds check since the base size (which defaults to 0) should
-     * be used if a minimum size isn't specified.
-     */
-    if (rwidth < min_width) rwidth = min_width;
-    if (rheight < min_height) rheight = min_height;
-
-    if (hints->flags & PMaxSize) {
-	if (rwidth > hints->max_width) rwidth = hints->max_width;
-	if (rheight > hints->max_height) rheight = hints->max_height;
-    }
-
-
-    /*
-     * Compute the location.  Set the negative flags in the return mask
-     * (and watch out for borders), if necessary.
-     */
-    if (umask & XValue) {
-	rx = ((umask & XNegative) ?
-	      (DisplayWidth (dpy, screen) + ux - rwidth - 2 * bwidth) : ux);
-    } else if (dmask & XValue) {
-	if (dmask & XNegative) {
-	    rx = (DisplayWidth (dpy, screen) + dx - rwidth - 2 * bwidth);
-	    rmask |= XNegative;
-	} else 
-	  rx = dx;
-    } else {
-	rx = 0;				/* gotta choose something... */
-    }
-
-    if (umask & YValue) {
-	ry = ((umask & YNegative) ?
-	      (DisplayHeight(dpy, screen) + uy - rheight - 2 * bwidth) : uy);
-    } else if (dmask & YValue) {
-	if (dmask & YNegative) {
-	    ry = (DisplayHeight(dpy, screen) + dy - rheight - 2 * bwidth);
-	    rmask |= YNegative;
-	} else 
-	  ry = dy;
-    } else {
-	ry = 0;				/* gotta choose something... */
-    }
-
-
-    /*
-     * All finished, so set the return variables.
-     */
-    *x_return = rx;
-    *y_return = ry;
-    *width_return = rwidth;
-    *height_return = rheight;
-    *gravity_return = _GeometryMaskToGravity (rmask);
-    return rmask;
-}
-
-
-static int _GeometryMaskToGravity (mask)
-    int mask;
-{
-    switch (mask & (XNegative|YNegative)) {
-      case 0:
-        return NorthWestGravity;
-      case XNegative:
-        return NorthEastGravity;
-      case YNegative:
-        return SouthWestGravity;
-      default:
-        return SouthEastGravity;
-    }
-}
diff --git a/xc/lib/X11/WMProps.c b/xc/lib/X11/WMProps.c
deleted file mode 100644
index 6a22bd51c..000000000
--- a/xc/lib/X11/WMProps.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/* $TOG: WMProps.c /main/10 1998/02/06 17:57:32 kaleb $ */
-/*
-
-Copyright 1987, 1988, 1993, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/WMProps.c,v 3.2 1998/10/03 08:41:24 dawes Exp $ */
-
-/***********************************************************
-Copyright 1988 by Wyse Technology, Inc., San Jose, Ca.,
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Wyse not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-WYSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#include <X11/Xlibint.h>
-#include <X11/Xatom.h>
-#include <X11/Xutil.h>
-#include <X11/Xos.h>
-
-#ifdef X_NOT_STDC_ENV
-extern char *getenv();
-#endif
-
-/* 
- * XSetWMProperties sets the following properties:
- *	WM_NAME		  type: TEXT		format: varies?
- *	WM_ICON_NAME	  type: TEXT		format: varies?
- *	WM_HINTS	  type: WM_HINTS	format: 32
- *	WM_COMMAND	  type: TEXT		format: varies?
- *	WM_CLIENT_MACHINE type: TEXT		format: varies?
- *	WM_NORMAL_HINTS	  type: WM_SIZE_HINTS 	format: 32
- *	WM_CLASS	  type: STRING/STRING	format: 8
- */
-	
-void XSetWMProperties (dpy, w, windowName, iconName, argv, argc, sizeHints,
-		       wmHints, classHints)
-     Display *dpy;
-     Window w;			/* window to decorate */
-     XTextProperty *windowName;	/* name of application */
-     XTextProperty *iconName;	/* name string for icon */
-     char **argv;		/* command line */
-     int argc;			/* size of command line */
-     XSizeHints *sizeHints;	/* size hints for window in its normal state */
-     XWMHints *wmHints;		/* miscelaneous window manager hints */
-     XClassHint *classHints;	/* resource name and class */
-{
-    XTextProperty textprop;
-    char hostName[256];
-    int len = _XGetHostname (hostName, sizeof hostName);
-
-    /* set names of window and icon */
-    if (windowName) XSetWMName (dpy, w, windowName);
-    if (iconName) XSetWMIconName (dpy, w, iconName);
-
-    /* set the command if given */
-    if (argv) {
-	/*
-	 * for UNIX and other operating systems which use nul-terminated
-	 * arrays of STRINGs.
-	 */
-	XSetCommand (dpy, w, argv, argc);
-    }
-
-    /* set the name of the machine on which this application is running */
-    textprop.value = (unsigned char *) hostName;
-    textprop.encoding = XA_STRING;
-    textprop.format = 8;
-    textprop.nitems = len;
-    XSetWMClientMachine (dpy, w, &textprop);
-	
-    /* set hints about how geometry and window manager interaction */
-    if (sizeHints) XSetWMNormalHints (dpy, w, sizeHints);
-    if (wmHints) XSetWMHints (dpy, w, wmHints);
-    if (classHints) {
-	XClassHint tmp;
-
-	if (!classHints->res_name) {
-	    tmp.res_name = getenv ("RESOURCE_NAME");
-	    if (!tmp.res_name && argv && argv[0]) {
-		/*
-		 * UNIX uses /dir/subdir/.../basename; other operating
-		 * systems will have to change this.
-		 */
-		char *cp = strrchr (argv[0], '/');
-#ifdef __EMX__
-		char *os2_cp = strrchr (argv[0],'\\');
-		char *dot_cp = strrchr (argv[0],'.');
-		if (os2_cp && (os2_cp > cp)) {
-		    if(dot_cp && (dot_cp > os2_cp)) *dot_cp = '\0';
-		    cp=os2_cp;
-		}
-#endif
-		tmp.res_name = (cp ? cp + 1 : argv[0]);
-	    }
-	    tmp.res_class = classHints->res_class;
-	    classHints = &tmp;
-	}
-	XSetClassHint (dpy, w, classHints);
-    }
-}
-
diff --git a/xc/lib/X11/WarpPtr.c b/xc/lib/X11/WarpPtr.c
deleted file mode 100644
index 48fc3b740..000000000
--- a/xc/lib/X11/WarpPtr.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* $TOG: WarpPtr.c /main/6 1998/02/06 17:56:58 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/WarpPtr.c,v 1.2 1999/05/09 10:50:22 dawes Exp $ */
-
-#include "Xlibint.h"
-
-int
-XWarpPointer(dpy, src_win, dest_win, src_x, src_y, src_width, src_height,
-	     dest_x, dest_y)
-     register Display *dpy;
-     Window src_win, dest_win;
-     int src_x, src_y;
-     unsigned int src_width, src_height;
-     int dest_x, dest_y;
-{       
-    register xWarpPointerReq *req;
-
-    LockDisplay(dpy);
-    GetReq(WarpPointer, req);
-    req->srcWid = src_win;
-    req->dstWid = dest_win;
-    req->srcX = src_x;
-    req->srcY = src_y;
-    req->srcWidth = src_width;
-    req->srcHeight = src_height;
-    req->dstX = dest_x;
-    req->dstY = dest_y;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
diff --git a/xc/lib/X11/WinEvent.c b/xc/lib/X11/WinEvent.c
deleted file mode 100644
index 80e460ba8..000000000
--- a/xc/lib/X11/WinEvent.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* $TOG: WinEvent.c /main/13 1998/02/06 17:57:15 kaleb $ */
-/*
-
-Copyright 1985, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/WinEvent.c,v 3.2 1999/05/09 10:50:22 dawes Exp $ */
-
-#define NEED_EVENTS
-#include "Xlibint.h"
-
-#ifdef __STDC__
-#define Const const
-#else
-#define Const /**/
-#endif
-
-extern long Const _Xevent_to_mask[];
-#define AllPointers (PointerMotionMask|PointerMotionHintMask|ButtonMotionMask)
-#define AllButtons (Button1MotionMask|Button2MotionMask|Button3MotionMask|\
-		    Button4MotionMask|Button5MotionMask)
-
-/* 
- * Return the next event in the queue
- * for the given window matching one of the events in the mask.
- * Events earlier in the queue are not discarded.
- * If none found, flush, and then wait until an event arrives which
- * matches.
- */
-
-int
-XWindowEvent (dpy, w, mask, event)
-        register Display *dpy;
-	Window w;		/* Selected window. */
-	long mask;		/* Selected event mask. */
-	register XEvent *event;	/* XEvent to be filled in. */
-{
-	register _XQEvent *prev, *qelt;
-	unsigned long qe_serial;
-
-        LockDisplay(dpy);
-	prev = NULL;
-	while (1) {
-	    for (qelt = prev ? prev->next : dpy->head;
-		 qelt;
-		 prev = qelt, qelt = qelt->next) {
-		if ((qelt->event.xany.window == w) &&
-		    (qelt->event.type < LASTEvent) &&
-		    (_Xevent_to_mask[qelt->event.type] & mask) &&
-		    ((qelt->event.type != MotionNotify) ||
-		     (mask & AllPointers) ||
-		     (mask & AllButtons & qelt->event.xmotion.state))) {
-		    *event = qelt->event;
-		    _XDeq(dpy, prev, qelt);
-		    UnlockDisplay(dpy);
-		    return 0;
-		}
-	    }
-	    if (prev)
-		qe_serial = prev->qserial_num;
-	    _XReadEvents(dpy);
-	    if (prev && prev->qserial_num != qe_serial)
-		/* another thread has snatched this event */
-		prev = NULL;
-	}
-}
diff --git a/xc/lib/X11/Window.c b/xc/lib/X11/Window.c
deleted file mode 100644
index 5228fcfc6..000000000
--- a/xc/lib/X11/Window.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/* $TOG: Window.c /main/10 1998/02/06 17:57:10 kaleb $ */
-/*
-
-Copyright 1986, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/Window.c,v 1.2 1999/05/09 10:50:22 dawes Exp $ */
-
-#include "Xlibint.h"
-
-void _XProcessWindowAttributes (dpy, req, valuemask, attributes)
-    register Display *dpy;
-    xChangeWindowAttributesReq *req;
-    register unsigned long valuemask;
-    register XSetWindowAttributes *attributes;
-{
-    unsigned long values[32];
-    register unsigned long *value = values;
-    unsigned int nvalues;
-
-    if (valuemask & CWBackPixmap)
-	*value++ = attributes->background_pixmap;
-	
-    if (valuemask & CWBackPixel)
-    	*value++ = attributes->background_pixel;
-
-    if (valuemask & CWBorderPixmap)
-    	*value++ = attributes->border_pixmap;
-
-    if (valuemask & CWBorderPixel)
-    	*value++ = attributes->border_pixel;
-
-    if (valuemask & CWBitGravity)
-    	*value++ = attributes->bit_gravity;
-
-    if (valuemask & CWWinGravity)
-	*value++ = attributes->win_gravity;
-
-    if (valuemask & CWBackingStore)
-        *value++ = attributes->backing_store;
-    
-    if (valuemask & CWBackingPlanes)
-	*value++ = attributes->backing_planes;
-
-    if (valuemask & CWBackingPixel)
-    	*value++ = attributes->backing_pixel;
-
-    if (valuemask & CWOverrideRedirect)
-    	*value++ = attributes->override_redirect;
-
-    if (valuemask & CWSaveUnder)
-    	*value++ = attributes->save_under;
-
-    if (valuemask & CWEventMask)
-	*value++ = attributes->event_mask;
-
-    if (valuemask & CWDontPropagate)
-	*value++ = attributes->do_not_propagate_mask;
-
-    if (valuemask & CWColormap)
-	*value++ = attributes->colormap;
-
-    if (valuemask & CWCursor)
-	*value++ = attributes->cursor;
-
-    req->length += (nvalues = value - values);
-
-    nvalues <<= 2;			    /* watch out for macros... */
-    Data32 (dpy, (long *) values, (long)nvalues);
-
-}
-
-#define AllMaskBits (CWBackPixmap|CWBackPixel|CWBorderPixmap|\
-		     CWBorderPixel|CWBitGravity|CWWinGravity|\
-		     CWBackingStore|CWBackingPlanes|CWBackingPixel|\
-		     CWOverrideRedirect|CWSaveUnder|CWEventMask|\
-		     CWDontPropagate|CWColormap|CWCursor)
-
-Window XCreateWindow(dpy, parent, x, y, width, height, 
-                borderWidth, depth, class, visual, valuemask, attributes)
-    register Display *dpy;
-    Window parent;
-    int x, y;
-    unsigned int width, height, borderWidth;
-    int depth;
-    unsigned int class;
-    Visual *visual;
-    unsigned long valuemask;
-    XSetWindowAttributes *attributes;
-{
-    Window wid;
-    register xCreateWindowReq *req;
-
-    LockDisplay(dpy);
-    GetReq(CreateWindow, req);
-    req->parent = parent;
-    req->x = x;
-    req->y = y;
-    req->width = width;
-    req->height = height;
-    req->borderWidth = borderWidth;
-    req->depth = depth;
-    req->class = class;
-    if (visual == CopyFromParent)
-	req->visual = CopyFromParent;
-    else
-	req->visual = visual->visualid;
-    wid = req->wid = XAllocID(dpy);
-    valuemask &= AllMaskBits;
-    if ((req->mask = valuemask))
-        _XProcessWindowAttributes (dpy, (xChangeWindowAttributesReq *)req, 
-			valuemask, attributes);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return (wid);
-    }
-
diff --git a/xc/lib/X11/Withdraw.c b/xc/lib/X11/Withdraw.c
deleted file mode 100644
index 5e58aceae..000000000
--- a/xc/lib/X11/Withdraw.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* $TOG: Withdraw.c /main/7 1998/02/06 17:57:21 kaleb $ */
-
-/***********************************************************
-Copyright 1988 by Wyse Technology, Inc., San Jose, Ca.,
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name Wyse not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-WYSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-/*
-
-Copyright 1988, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-#define NEED_EVENTS
-#include <X11/Xlibint.h>
-#include <X11/Xatom.h>
-#include <X11/Xos.h>
-#include <X11/Xutil.h>
-#include <stdio.h>
-
-/*
- * This function instructs the window manager to change this window from
- * NormalState or IconicState to Withdrawn.
- */
-Status XWithdrawWindow (dpy, w, screen)
-    Display *dpy;
-    Window w;
-    int screen;
-{
-    XUnmapEvent ev;
-    Window root = RootWindow (dpy, screen);
-
-    XUnmapWindow (dpy, w);
-
-    ev.type = UnmapNotify;
-    ev.event = root;
-    ev.window = w;
-    ev.from_configure = False;
-    return (XSendEvent (dpy, root, False,
-			SubstructureRedirectMask|SubstructureNotifyMask,
-			(XEvent *)&ev));
-}
diff --git a/xc/lib/X11/WrBitF.c b/xc/lib/X11/WrBitF.c
deleted file mode 100644
index 45a7bd116..000000000
--- a/xc/lib/X11/WrBitF.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/* $TOG: WrBitF.c /main/14 1998/02/06 17:57:38 kaleb $ */
-/*
-
-Copyright 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/WrBitF.c,v 3.2 1998/10/03 08:41:24 dawes Exp $ */
-
-#include "Xlibint.h"
-#include <X11/Xos.h>
-#include "Xutil.h"
-#include <stdio.h>
-
-#define ERR_RETURN 0
-
-static char *Format_Image(image, resultsize)
-XImage *image;
-int *resultsize;
-{
-  register int x, c, b;
-  register char *ptr;
-  int y;
-  char *data;
-  int width, height;
-  int bytes_per_line;
-
-  width = image->width;
-  height = image->height;
-
-  bytes_per_line = (width+7)/8;
-  *resultsize = bytes_per_line * height;           /* Calculate size of data */
-
-  data = (char *) Xmalloc( *resultsize );           /* Get space for data */
-  if (!data)
-    return(ERR_RETURN);
-
-  /*
-   * The slow but robust brute force method of converting the image:
-   */
-  ptr = data;
-  c = 0; b=1;
-  for (y=0; y<height; y++) {
-    for (x=0; x<width;) {
-      if (XGetPixel(image, x, y))
-	c |= b;
-      b <<= 1;
-      if (!(++x & 7)) {
-	*(ptr++)=c;
-	c=0; b=1;
-      }
-    }
-    if (x & 7) {
-      *(ptr++)=c;
-      c=0; b=1;
-    }
-  }
-
-  return(data);
-}
-   
-#define BYTES_PER_OUTPUT_LINE 12
-
-#if NeedFunctionPrototypes
-int XWriteBitmapFile(
-     Display *display,
-     _Xconst char *filename,
-     Pixmap bitmap,
-     unsigned int width,
-     unsigned int height,
-     int x_hot,
-     int y_hot)
-#else
-int XWriteBitmapFile(display, filename, bitmap, width, height, x_hot, y_hot)
-     Display *display;
-     char *filename;
-     Pixmap bitmap;
-     unsigned int width, height;
-     int x_hot, y_hot;
-#endif
-{
-  char *data, *ptr;
-  int size, byte;
-  int c;
-  XImage *image;
-  FILE *stream;
-  char *name;
-
-  if (!(name = strrchr(filename, '/')))
-    name = (char *)filename;
-  else
-    name++;
-
-#ifdef __EMX__
-  filename = (char*)__XOS2RedirRoot(filename);
-#endif
-  if (!(stream = fopen(filename, "w")))
-    return(BitmapOpenFailed);
-
-  /* Convert bitmap to an image */
-  image = XGetImage(display, bitmap, 0,0,width, height, 1L, XYPixmap);
-  if (!image) {
-    fclose(stream);
-    return(4); /* XXX spec does not say what to return */
-  }
-
-  /* Get standard format for data */
-  data = Format_Image(image, &size);
-  XDestroyImage(image);
-  if (!data) {
-    fclose(stream);
-    return(BitmapNoMemory);
-  }
-
-  /* Write out standard header */
-  fprintf(stream, "#define %s_width %d\n", name, width);
-  fprintf(stream, "#define %s_height %d\n", name, height);
-  if (x_hot != -1) {
-    fprintf(stream, "#define %s_x_hot %d\n", name, x_hot);
-    fprintf(stream, "#define %s_y_hot %d\n", name, y_hot);
-  }
-
-  /* Print out the data itself */
-  fprintf(stream, "static unsigned char %s_bits[] = {", name);
-  for (byte=0, ptr=data; byte<size; byte++, ptr++) {
-    if (!byte)
-      fprintf(stream, "\n   ");
-    else if (!(byte % BYTES_PER_OUTPUT_LINE))
-      fprintf(stream, ",\n   ");
-    else
-      fprintf(stream, ", ");
-    c = *ptr;
-    if (c<0)
-      c += 256;
-    fprintf(stream, "0x%02x", c);
-  }
-  fprintf(stream, "};\n");
-
-  Xfree(data);
-  fclose(stream);
-  return(BitmapSuccess);
-}
diff --git a/xc/lib/X11/X11-def.cpp b/xc/lib/X11/X11-def.cpp
deleted file mode 100644
index 872fb6adf..000000000
--- a/xc/lib/X11/X11-def.cpp
+++ /dev/null
@@ -1,809 +0,0 @@
-LIBRARY X11
-VERSION LIBRARY_VERSION
-EXPORTS
- _Xdebug_p=_Xdebug CONSTANT
- _XCreateMutex_fn_p=_XCreateMutex_fn CONSTANT
- _XFreeMutex_fn_p=_XFreeMutex_fn CONSTANT
- _XLockMutex_fn_p=_XLockMutex_fn CONSTANT
- _XUnlockMutex_fn_p=_XUnlockMutex_fn CONSTANT
- _Xglobal_lock_p=_Xglobal_lock CONSTANT
- XActivateScreenSaver
- XAddConnectionWatch
- XAddExtension
- XAddHost
- XAddHosts
- XAddPixel
- XAddToExtensionList
- XAddToSaveSet
- XAllPlanes
- XAllocClassHint
- XAllocColor
- XAllocColorCells
- XAllocColorPlanes
- XAllocIconSize
- XAllocNamedColor
- XAllocSizeHints
- XAllocStandardColormap
- XAllocWMHints
- XAllowEvents
- XAutoRepeatOff
- XAutoRepeatOn
- XBaseFontNameListOfFontSet
- XBell
- XBitmapBitOrder
- XBitmapPad
- XBitmapUnit
- XBlackPixel
- XBlackPixelOfScreen
- XCellsOfScreen
- XChangeActivePointerGrab
- XChangeGC
- XChangeKeyboardControl
- XChangeKeyboardMapping
- XChangePointerControl
- XChangeProperty
- XChangeSaveSet
- XChangeWindowAttributes
- XCheckIfEvent
- XCheckMaskEvent
- XCheckTypedEvent
- XCheckTypedWindowEvent
- XCheckWindowEvent
- XCirculateSubwindows
- XCirculateSubwindowsDown
- XCirculateSubwindowsUp
- XClearArea
- XClearWindow
- XClipBox
- XCloseDisplay
- XCloseIM
- XCloseOM
- XConfigureWindow
- XConnectionNumber
- XContextDependentDrawing
- XContextualDrawing
- XConvertCase
- XConvertSelection
- XCopyArea
- XCopyColormapAndFree
- XCopyGC
- XCopyPlane
- XCreateBitmapFromData
- XCreateColormap
- XCreateFontCursor
- XCreateFontSet
- XCreateGC
- XCreateGlyphCursor
- XCreateIC
- XCreateImage
- XCreateOC
- XCreatePixmap
- XCreatePixmapCursor
- XCreatePixmapFromBitmapData
- XCreateRegion
- XCreateSimpleWindow
- XCreateWindow
- XDefaultColormap
- XDefaultColormapOfScreen
- XDefaultDepth
- XDefaultDepthOfScreen
- XDefaultGC
- XDefaultGCOfScreen
- XDefaultRootWindow
- XDefaultScreen
- XDefaultScreenOfDisplay
- XDefaultString
- XDefaultVisual
- XDefaultVisualOfScreen
- XDefineCursor
- XDeleteContext
- XDeleteModifiermapEntry
- XDeleteProperty
- XDestroyIC
- XDestroyImage
- XDestroyOC
- XDestroyRegion
- XDestroySubwindows
- XDestroyWindow
- XDirectionalDependentDrawing
- XDisableAccessControl
- XDisplayCells
- XDisplayHeight
- XDisplayHeightMM
- XDisplayKeycodes
- XDisplayMotionBufferSize
- XDisplayName
- XDisplayOfIM
- XDisplayOfOM
- XDisplayOfScreen
- XDisplayPlanes
- XDisplayString
- XDisplayWidth
- XDisplayWidthMM
- XDoesBackingStore
- XDoesSaveUnders
- XDrawArc
- XDrawArcs
- XDrawImageString
- XDrawImageString16
- XDrawLine
- XDrawLines
- XDrawPoint
- XDrawPoints
- XDrawRectangle
- XDrawRectangles
- XDrawSegments
- XDrawString
- XDrawString16
- XDrawText
- XDrawText16
- XEHeadOfExtensionList
- XESetBeforeFlush
- XESetCloseDisplay
- XESetCopyGC
- XESetCreateFont
- XESetCreateGC
- XESetError
- XESetErrorString
- XESetEventToWire
- XESetFlushGC
- XESetFreeFont
- XESetFreeGC
- XESetPrintErrorValues
- XESetWireToError
- XESetWireToEvent
- XEmptyRegion
- XEnableAccessControl
- XEqualRegion
- XEventMaskOfScreen
- XEventsQueued
- XExtendedMaxRequestSize
- XExtentsOfFontSet
- XFetchBuffer
- XFetchBytes
- XFetchName
- XFillArc
- XFillArcs
- XFillPolygon
- XFillRectangle
- XFillRectangles
- XFilterEvent
- XFindContext
- XFindOnExtensionList
- XFlush
- XFlushGC
- XFontsOfFontSet
- XForceScreenSaver
- XFree
- XFreeColormap
- XFreeColors
- XFreeCursor
- XFreeExtensionList
- XFreeFont
- XFreeFontInfo
- XFreeFontNames
- XFreeFontPath
- XFreeFontSet
- XFreeGC
- XFreeModifiermap
- XFreePixmap
- XFreeStringList
- XGContextFromGC
- XGeometry
- XGetAtomName
- XGetAtomNames
- XGetClassHint
- XGetCommand
- XGetDefault
- XGetErrorDatabaseText
- XGetErrorText
- XGetFontPath
- XGetFontProperty
- XGetGCValues
- XGetGeometry
- XGetICValues
- XGetIMValues
- XGetIconName
- XGetIconSizes
- XGetImage
- XGetInputFocus
- XGetKeyboardControl
- XGetKeyboardMapping
- XGetModifierMapping
- XGetMotionEvents
- XGetNormalHints
- XGetOCValues
- XGetOMValues
- XGetPixel
- XGetPointerControl
- XGetPointerMapping
- XGetRGBColormaps
- XGetScreenSaver
- XGetSelectionOwner
- XGetSizeHints
- XGetStandardColormap
- XGetSubImage
- XGetTextProperty
- XGetTransientForHint
- XGetVisualInfo
- XGetWMClientMachine
- XGetWMColormapWindows
- XGetWMHints
- XGetWMIconName
- XGetWMName
- XGetWMNormalHints
- XGetWMProtocols
- XGetWMSizeHints
- XGetWindowAttributes
- XGetWindowProperty
- XGetZoomHints
- XGrabButton
- XGrabKey
- XGrabKeyboard
- XGrabPointer
- XGrabServer
- XHeightMMOfScreen
- XHeightOfScreen
- XIMOfIC
- XIconifyWindow
- XIfEvent
- XImageByteOrder
- XInitExtension
- XInitImage
- XInitThreads
- XInsertModifiermapEntry
- XInstallColormap
- XInternAtom
- XInternAtoms
- XInternalConnectionNumbers
- XIntersectRegion
- XKeycodeToKeysym
- XKeysymToKeycode
- XKeysymToString
- XKillClient
- XLastKnownRequestProcessed
- XListDepths
- XListExtensions
- XListFonts
- XListFontsWithInfo
- XListHosts
- XListInstalledColormaps
- XListPixmapFormats
- XListProperties
- XLoadFont
- XLoadQueryFont
- XLocaleOfFontSet
- XLocaleOfIM
- XLocaleOfOM
- XLockDisplay
- XLookupColor
- XLookupKeysym
- XLookupString
- XLowerWindow
- XMapRaised
- XMapSubwindows
- XMapWindow
- XMaskEvent
- XMatchVisualInfo
- XMaxCmapsOfScreen
- XMaxRequestSize
- XMinCmapsOfScreen
- XMoveResizeWindow
- XMoveWindow
- XNewModifiermap
- XNextEvent
- XNextRequest
- XNoOp
- XOMOfOC
- XOffsetRegion
- XOpenDisplay
- XOpenIM
- XOpenOM
- XParseColor
- XParseGeometry
- XPeekEvent
- XPeekIfEvent
- XPending
- XPlanesOfScreen
- XPointInRegion
- XPolygonRegion
- XProcessInternalConnection
- XProtocolRevision
- XProtocolVersion
- XPutBackEvent
- XPutImage
- XPutPixel
- XQLength
- XQueryBestCursor
- XQueryBestSize
- XQueryBestStipple
- XQueryBestTile
- XQueryColor
- XQueryColors
- XQueryExtension
- XQueryFont
- XQueryKeymap
- XQueryPointer
- XQueryTextExtents
- XQueryTextExtents16
- XQueryTree
- XRaiseWindow
- XReadBitmapFile
- XReadBitmapFileData
- XRebindKeysym
- XRecolorCursor
- XReconfigureWMWindow
- XRectInRegion
- XRefreshKeyboardMapping
- XRegisterIMInstantiateCallback
- XRemoveConnectionWatch
- XRemoveFromSaveSet
- XRemoveHost
- XRemoveHosts
- XReparentWindow
- XResetScreenSaver
- XResizeWindow
- XResourceManagerString
- XRestackWindows
- XRootWindow
- XRootWindowOfScreen
- XRotateBuffers
- XRotateWindowProperties
- XSaveContext
- XScreenCount
- XScreenNumberOfScreen
- XScreenOfDisplay
- XScreenResourceString
- XSelectInput
- XSendEvent
- XServerVendor
- XSetAccessControl
- XSetAfterFunction
- XSetArcMode
- XSetAuthorization
- XSetBackground
- XSetClassHint
- XSetClipMask
- XSetClipOrigin
- XSetClipRectangles
- XSetCloseDownMode
- XSetCommand
- XSetDashes
- XSetErrorHandler
- XSetFillRule
- XSetFillStyle
- XSetFont
- XSetFontPath
- XSetForeground
- XSetFunction
- XSetGraphicsExposures
- XSetICFocus
- XSetICValues
- XSetIMValues
- XSetIOErrorHandler
- XSetIconName
- XSetIconSizes
- XSetInputFocus
- XSetLineAttributes
- XSetLocaleModifiers
- XSetModifierMapping
- XSetNormalHints
- XSetOCValues
- XSetOMValues
- XSetPlaneMask
- XSetPointerMapping
- XSetRGBColormaps
- XSetRegion
- XSetScreenSaver
- XSetSelectionOwner
- XSetSizeHints
- XSetStandardColormap
- XSetStandardProperties
- XSetState
- XSetStipple
- XSetSubwindowMode
- XSetTSOrigin
- XSetTextProperty
- XSetTile
- XSetTransientForHint
- XSetWMClientMachine
- XSetWMColormapWindows
- XSetWMHints
- XSetWMIconName
- XSetWMName
- XSetWMNormalHints
- XSetWMProperties
- XSetWMProtocols
- XSetWMSizeHints
- XSetWindowBackground
- XSetWindowBackgroundPixmap
- XSetWindowBorder
- XSetWindowBorderPixmap
- XSetWindowBorderWidth
- XSetWindowColormap
- XSetZoomHints
- XShrinkRegion
- XStoreBuffer
- XStoreBytes
- XStoreColor
- XStoreColors
- XStoreName
- XStoreNamedColor
- XStringListToTextProperty
- XStringToKeysym
- XSubImage
- XSubtractRegion
- XSupportsLocale
- XSync
- XSynchronize
- XTextExtents
- XTextExtents16
- XTextPropertyToStringList
- XTextWidth
- XTextWidth16
- XTranslateCoordinates
- XUndefineCursor
- XUngrabButton
- XUngrabKey
- XUngrabKeyboard
- XUngrabPointer
- XUngrabServer
- XUninstallColormap
- XUnionRectWithRegion
- XUnionRegion
- XUnloadFont
- XUnlockDisplay
- XUnmapSubwindows
- XUnmapWindow
- XUnregisterIMInstantiateCallback
- XUnsetICFocus
- XVaCreateNestedList
- XVendorRelease
- XVisualIDFromVisual
- XWMGeometry
- XWarpPointer
- XWhitePixel
- XWhitePixelOfScreen
- XWidthMMOfScreen
- XWidthOfScreen
- XWindowEvent
- XWithdrawWindow
- XWriteBitmapFile
- XXorRegion
- XcmsAddColorSpace
- XcmsAddFunctionSet
- XcmsAllocColor
- XcmsAllocNamedColor
- XcmsCCCOfColormap
- XcmsCIELabClipL
- XcmsCIELabClipLab
- XcmsCIELabClipab
- XcmsCIELabQueryMaxC
- XcmsCIELabQueryMaxL
- XcmsCIELabQueryMaxLC
- XcmsCIELabQueryMinL
- XcmsCIELabToCIEXYZ
- XcmsCIELabWhiteShiftColors
- XcmsCIELuvClipL
- XcmsCIELuvClipLuv
- XcmsCIELuvClipuv
- XcmsCIELuvQueryMaxC
- XcmsCIELuvQueryMaxL
- XcmsCIELuvQueryMaxLC
- XcmsCIELuvQueryMinL
- XcmsCIELuvToCIEuvY
- XcmsCIELuvWhiteShiftColors
- XcmsCIEXYZToCIELab
- XcmsCIEXYZToCIEuvY
- XcmsCIEXYZToCIExyY
- XcmsCIEXYZToRGBi
- XcmsCIEuvYToCIELuv
- XcmsCIEuvYToCIEXYZ
- XcmsCIEuvYToTekHVC
- XcmsCIExyYToCIEXYZ
- XcmsClientWhitePointOfCCC
- XcmsConvertColors
- XcmsCreateCCC
- XcmsDefaultCCC
- XcmsDisplayOfCCC
- XcmsFormatOfPrefix
- XcmsFreeCCC
- XcmsLookupColor
- XcmsPrefixOfFormat
- XcmsQueryBlack
- XcmsQueryBlue
- XcmsQueryColor
- XcmsQueryColors
- XcmsQueryGreen
- XcmsQueryRed
- XcmsQueryWhite
- XcmsRGBToRGBi
- XcmsRGBiToCIEXYZ
- XcmsRGBiToRGB
- XcmsScreenNumberOfCCC
- XcmsScreenWhitePointOfCCC
- XcmsSetCCCOfColormap
- XcmsSetCompressionProc
- XcmsSetWhiteAdjustProc
- XcmsSetWhitePoint
- XcmsStoreColor
- XcmsStoreColors
- XcmsTekHVCClipC
- XcmsTekHVCClipV
- XcmsTekHVCClipVC
- XcmsTekHVCQueryMaxC
- XcmsTekHVCQueryMaxV
- XcmsTekHVCQueryMaxVC
- XcmsTekHVCQueryMaxVSamples
- XcmsTekHVCQueryMinV
- XcmsTekHVCToCIEuvY
- XcmsTekHVCWhiteShiftColors
- XcmsVisualOfCCC
- XmbDrawImageString
- XmbDrawString
- XmbDrawText
- XmbLookupString
- XmbResetIC
- XmbSetWMProperties
- XmbTextEscapement
- XmbTextExtents
- XmbTextListToTextProperty
- XmbTextPerCharExtents
- XmbTextPropertyToTextList
- Xpermalloc
- XrmCombineDatabase
- XrmCombineFileDatabase
- XrmDestroyDatabase
- XrmEnumerateDatabase
- XrmGetDatabase
- XrmGetFileDatabase
- XrmGetResource
- XrmGetStringDatabase
- XrmInitialize
- XrmLocaleOfDatabase
- XrmMergeDatabases
- XrmParseCommand
- XrmPermStringToQuark
- XrmPutFileDatabase
- XrmPutLineResource
- XrmPutResource
- XrmPutStringResource
- XrmQGetResource
- XrmQGetSearchList
- XrmQGetSearchResource
- XrmQPutResource
- XrmQPutStringResource
- XrmQuarkToString
- XrmSetDatabase
- XrmStringToBindingQuarkList
- XrmStringToQuark
- XrmStringToQuarkList
- XrmUniqueQuark
- XwcDrawImageString
- XwcDrawString
- XwcDrawText
- XwcFreeStringList
- XwcLookupString
- XwcResetIC
- XwcTextEscapement
- XwcTextExtents
- XwcTextListToTextProperty
- XwcTextPerCharExtents
- XwcTextPropertyToTextList
- _XAllocID
- _XAllocIDs
- _XAllocScratch
- _XAllocTemp
- _XAsyncErrorHandler
- _XConnectDisplay
- _XDeqAsyncHandler
- _XEatData
- _XError
- _XFlushIt
- _XFlushGCCache
- _XFreeTemp
- _XGetAsyncData
- _XGetAsyncReply
- _XIOError
- _XInitImageFuncPtrs
- _XLockDisplay
- _XRead
- _XReadEvents
- _XReadPad
- _XRegisterFilterByMask
- _XRegisterFilterByType
- _XRegisterInternalConnection
- _XReply
- _XSend
- _XSetLastRequestRead
- _XUnknownNativeEvent
- _XUnregisterFilter
- _XUnregisterInternalConnection
- _XVIDtoVisual
- _Xthread_init
- _Xthread_waiter
- XkbIgnoreExtension
- XkbOpenDisplay
- XkbQueryExtension
- XkbUseExtension
- XkbLibraryVersion
- XkbSetXlibControls
- XkbGetXlibControls
- XkbSetAtomFuncs
- XkbKeycodeToKeysym
- XkbKeysymToModifiers
- XkbLookupKeySym
- XkbLookupKeyBinding
- XkbTranslateKeyCode
- XkbTranslateKeySym
- XkbSetAutoRepeatRate
- XkbGetAutoRepeatRate
- XkbChangeEnabledControls
- XkbDeviceBell
- XkbForceDeviceBell
- XkbDeviceBellEvent
- XkbBell
- XkbForceBell
- XkbBellEvent
- XkbSelectEvents
- XkbSelectEventDetails
- XkbNoteMapChanges
- XkbNoteNameChanges
- XkbGetIndicatorState
- XkbGetIndicatorMap
- XkbSetIndicatorMap
- XkbGetNamedIndicator
- XkbGetNamedDeviceIndicator
- XkbSetNamedIndicator
- XkbSetNamedDeviceIndicator
- XkbLockModifiers
- XkbLatchModifiers
- XkbLockGroup
- XkbLatchGroup
- XkbSetServerInternalMods
- XkbSetIgnoreLockMods
- XkbVirtualModsToReal
- XkbComputeEffectiveMap
- XkbInitCanonicalKeyTypes
- XkbAllocKeyboard
- XkbFreeKeyboard
- XkbAllocClientMap
- XkbAllocServerMap
- XkbFreeClientMap
- XkbFreeServerMap
- XkbAddKeyType
- XkbAllocIndicatorMaps
- XkbFreeIndicatorMaps
- XkbGetMap
- XkbGetUpdatedMap
- XkbGetMapChanges
- XkbRefreshKeyboardMapping
- XkbGetKeyTypes
- XkbGetKeySyms
- XkbGetKeyActions
- XkbGetKeyBehaviors
- XkbGetVirtualMods
- XkbGetKeyExplicitComponents
- XkbGetKeyModifierMap
- XkbAllocControls
- XkbFreeControls
- XkbGetControls
- XkbSetControls
- XkbAllocCompatMap
- XkbFreeCompatMap
- XkbGetCompatMap
- XkbSetCompatMap
- XkbAllocNames
- XkbGetNames
- XkbSetNames
- XkbChangeNames
- XkbFreeNames
- XkbGetState
- XkbSetMap
- XkbChangeMap
- XkbSetDetectableAutoRepeat
- XkbGetDetectableAutoRepeat
- XkbSetAutoResetControls
- XkbGetAutoResetControls
- XkbCopyKeyType
- XkbCopyKeyTypes
- XkbResizeKeyType
- XkbResizeKeySyms
- XkbResizeKeyActions
- XkbChangeTypesOfKey
- XkbListComponents
- XkbFreeComponentList
- XkbGetKeyboard
- XkbGetKeyboardByName
- XkbAddDeviceLedInfo
- XkbResizeDeviceButtonActions
- XkbAllocDeviceInfo
- XkbFreeDeviceInfo
- XkbNoteDeviceChanges
- XkbGetDeviceInfo
- XkbGetDeviceInfoChanges
- XkbGetDeviceButtonActions
- XkbGetDeviceLedInfo
- XkbSetDeviceInfo
- XkbChangeDeviceInfo
- XkbSetDeviceLedInfo
- XkbSetDeviceButtonActions
- XkbToControl
- XkbSetDebuggingFlags
- XkbGetPerClientControls
- XkbSetPerClientControls
- XauDisposeAuth
- XauFileName
- XauGetBestAuthByAddr
- XauReadAuth
- XcmsCIELabColorSpace
- XcmsCIELuvColorSpace
- XcmsCIEuvYColorSpace
- XcmsCIExyYColorSpace
- XcmsCIEXYZColorSpace
- XcmsLinearRGBFunctionSet
- XcmsRGBColorSpace
- XcmsRGBiColorSpace
- XcmsTekHVCColorSpace
- XcmsUNDEFINEDColorSpace
- _XimParseStringFile	/* unspecified, retain slot for binary compat */
- XkbAddGeomColor
- XkbAddGeomDoodad
- XkbAddGeomKey
- XkbAddGeomKeyAlias
- XkbAddGeomOutline
- XkbAddGeomOverlay
- XkbAddGeomOverlayKey
- XkbAddGeomOverlayRow
- XkbAddGeomProperty
- XkbAddGeomRow
- XkbAddGeomSection
- XkbAddGeomShape
- XkbAllocGeomColors
- XkbAllocGeomDoodads
- XkbAllocGeometry
- XkbAllocGeomKeyAliases
- XkbAllocGeomKeys
- XkbAllocGeomOutlines
- XkbAllocGeomOverlayKeys
- XkbAllocGeomOverlayRows
- XkbAllocGeomOverlays
- XkbAllocGeomPoints
- XkbAllocGeomProps
- XkbAllocGeomRows
- XkbAllocGeomSectionDoodads
- XkbAllocGeomSections
- XkbAllocGeomShapes
- XkbApplyCompatMapToKey
- XkbApplyVirtualModChanges
- XkbComputeRowBounds
- XkbComputeSectionBounds
- XkbComputeShapeBounds
- XkbComputeShapeTop
- XkbFindOverlayForKey
- XkbFreeGeomColors
- XkbFreeGeomDoodads
- XkbFreeGeometry
- XkbFreeGeomKeyAliases
- XkbFreeGeomKeys
- XkbFreeGeomOutlines
- XkbFreeGeomOverlayKeys
- XkbFreeGeomOverlayRows
- XkbFreeGeomOverlays
- XkbFreeGeomPoints
- XkbFreeGeomProperties
- XkbFreeGeomRows
- XkbFreeGeomSections
- XkbFreeGeomShapes
- XkbGetGeometry
- XkbGetKeyVirtualModMap
- XkbGetNamedGeometry
- XkbKeyTypesForCoreSymbols
- XkbNoteControlsChanges
- XkbSetGeometry
- XkbTranslateKey
- XkbUpdateActionVirtualMods
- XkbUpdateKeyTypeVirtualMods
- XkbUpdateMapFromCore
- XkbXlibControlsImplemented
-/* $TOG: X11-def.cpp /main/19 1998/06/16 16:04:58 kaleb $ */
diff --git a/xc/lib/X11/X11os2.def b/xc/lib/X11/X11os2.def
deleted file mode 100644
index db4d00edb..000000000
--- a/xc/lib/X11/X11os2.def
+++ /dev/null
@@ -1,1182 +0,0 @@
-LIBRARY X11
-DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/X11/X11os2.def,v 3.8 1999/04/29 09:13:28 dawes Exp $"
-CODE
-	PRELOAD
-DATA
-	MULTIPLE NONSHARED
-STACKSIZE 32768
-EXPORTS
-	XSaveContext  @ 1
-	XFindContext  @ 2
-	XDeleteContext  @ 3
-	XListDepths  @ 4
-	XrmParseCommand  @ 5
-	Xpermalloc  @ 6
-	_XrmInternalStringToQuark  @ 7
-	XrmStringToQuark  @ 8
-	XrmPermStringToQuark  @ 9
-	XrmUniqueQuark  @ 10
-	XrmQuarkToString  @ 11
-	XAllocColorCells  @ 12
-	XAllocColorPlanes  @ 13
-	XAllowEvents  @ 14
-	XAutoRepeatOn  @ 15
-	XAutoRepeatOff  @ 16
-	XSetWindowBackground  @ 17
-	XSetWindowBorderWidth  @ 18
-	XBell  @ 19
-	XSetWindowBorder  @ 20
-	XEnableAccessControl  @ 21
-	XDisableAccessControl  @ 22
-	XSetAccessControl  @ 23
-	XSetCloseDownMode  @ 24
-	XChangeActivePointerGrab  @ 25
-	XSetWindowColormap  @ 26
-	XChangeGC  @ 27
-	XChangeKeyboardControl  @ 28
-	XChangePointerControl  @ 29
-	XChangeProperty  @ 30
-	XChangeSaveSet  @ 31
-	XAddToSaveSet  @ 32
-	XRemoveFromSaveSet  @ 33
-	XChangeWindowAttributes  @ 34
-	XResizeWindow  @ 35
-	XCheckIfEvent  @ 36
-	XCheckMaskEvent  @ 37
-	XCheckWindowEvent  @ 38
-	XCheckTypedEvent  @ 39
-	XCheckTypedWindowEvent  @ 40
-	XCirculateSubwindows  @ 41
-	XCirculateSubwindowsDown  @ 42
-	XCirculateSubwindowsUp  @ 43
-	XCloseDisplay  @ 44
-	XClearWindow  @ 45
-	XClearArea  @ 46
-	XMoveResizeWindow  @ 47
-	_XConnectDisplay  @ 48
-	_XDisconnectDisplay  @ 49
-	_XSendClientPrefix  @ 50
-	XSetAuthorization  @ 51
-	XConvertSelection  @ 52
-	XCopyArea  @ 53
-	XCopyColormapAndFree  @ 54
-	XCopyGC  @ 55
-	XCopyPlane  @ 56
-	XCreateBitmapFromData  @ 57
-	XCreateColormap  @ 58
-	XCreatePixmapCursor  @ 59
-	XCreateGC  @ 60
-	_XUpdateGCCache  @ 61
-	_XFlushGCCache  @ 62
-	XFlushGC  @ 63
-	XGContextFromGC  @ 64
-	XCreateGlyphCursor  @ 65
-	XCreatePixmapFromBitmapData  @ 66
-	XCreatePixmap  @ 67
-	XCreateSimpleWindow  @ 68
-	XCreateFontCursor  @ 69
-	XDefineCursor  @ 70
-	XDeleteProperty  @ 71
-	XDestroySubwindows  @ 72
-	XDestroyWindow  @ 73
-	XDisplayName  @ 74
-	XDrawArc  @ 75
-	XDrawArcs  @ 76
-	XDrawLine  @ 77
-	XDrawLines  @ 78
-	XDrawPoint  @ 79
-	XDrawPoints  @ 80
-	XDrawRectangle  @ 81
-	XDrawRectangles  @ 82
-	XDrawSegments  @ 83
-	XGetErrorText  @ 84
-	XGetErrorDatabaseText  @ 85
-	XSetErrorHandler  @ 86
-	XSetIOErrorHandler  @ 87
-	_XEventToWire  @ 88
-	XFetchName  @ 89
-	XGetIconName  @ 90
-	XFillArc  @ 91
-	XFillArcs  @ 92
-	XFillPolygon  @ 93
-	XFillRectangle  @ 94
-	XFillRectangles  @ 95
-	XFlush  @ 96
-	XLoadQueryFont  @ 97
-	XFreeFont  @ 98
-	XQueryFont  @ 99
-	XListFonts  @ 100
-	XFreeFontNames  @ 101
-	XListFontsWithInfo  @ 102
-	XFreeFontInfo  @ 103
-	XFreeColormap  @ 104
-	XFreeColors  @ 105
-	XFreeCursor  @ 106
-	_XFreeExtData  @ 107
-	XFreeGC  @ 108
-	XFreePixmap  @ 109
-	XActivateScreenSaver  @ 110
-	XResetScreenSaver  @ 111
-	XForceScreenSaver  @ 112
-	XSetArcMode  @ 113
-	XSetFillRule  @ 114
-	XSetFillStyle  @ 115
-	XSetGraphicsExposures  @ 116
-	XSetSubwindowMode  @ 117
-	XGeometry  @ 118
-	XGetAtomName  @ 119
-	XAllocNamedColor  @ 120
-	XGetDefault  @ 121
-	XGetFontPath  @ 122
-	XFreeFontPath  @ 123
-	XGetFontProperty  @ 124
-	XGetGeometry  @ 125
-	XAllocColor  @ 126
-	XGetSizeHints  @ 127
-	XGetWMHints  @ 128
-	XGetZoomHints  @ 129
-	XGetNormalHints  @ 130
-	XGetIconSizes  @ 131
-	XGetCommand  @ 132
-	XGetTransientForHint  @ 133
-	XGetClassHint  @ 134
-	XGetInputFocus  @ 135
-	XGetImage  @ 136
-	XGetSubImage  @ 137
-	XGetKeyboardControl  @ 138
-	XGetMotionEvents  @ 139
-	XGetPointerControl  @ 140
-	XGetPointerMapping  @ 141
-	XGetKeyboardMapping  @ 142
-	XGetWindowProperty  @ 143
-	XGetSelectionOwner  @ 144
-	XGetScreenSaver  @ 145
-	XGetStandardColormap  @ 146
-	XGetWindowAttributes  @ 147
-	XGrabButton  @ 148
-	XGrabKey  @ 149
-	XGrabKeyboard  @ 150
-	XGrabPointer  @ 151
-	XGrabServer  @ 152
-	XAddHost  @ 153
-	XRemoveHost  @ 154
-	XAddHosts  @ 155
-	XRemoveHosts  @ 156
-	XIfEvent  @ 157
-	_XGetScanlinePad  @ 158
-	_XGetBitsPerPixel  @ 159
-	XCreateImage  @ 160
-	_XSetImage  @ 161
-	_XInitImageFuncPtrs  @ 162
-	XDrawImageString  @ 163
-	XDrawImageString16  @ 164
-	XInitExtension  @ 165
-	XAddExtension  @ 166
-	XEHeadOfExtensionList  @ 167
-	XAddToExtensionList  @ 168
-	XFindOnExtensionList  @ 169
-	XESetCreateGC  @ 170
-	XESetCopyGC  @ 171
-	XESetFlushGC  @ 172
-	XESetFreeGC  @ 173
-	XESetCreateFont  @ 174
-	XESetFreeFont  @ 175
-	XESetCloseDisplay  @ 176
-	XESetWireToEvent  @ 177
-	XESetEventToWire  @ 178
-	XESetWireToError  @ 179
-	XESetError  @ 180
-	XESetErrorString  @ 181
-	XESetPrintErrorValues  @ 182
-	XInstallColormap  @ 183
-	XInternAtom  @ 184
-	XKeycodeToKeysym  @ 185
-	XKeysymToKeycode  @ 186
-	XLookupKeysym  @ 187
-	XRefreshKeyboardMapping  @ 188
-	XLookupString  @ 189
-	XRebindKeysym  @ 190
-	XKeysymToString  @ 191
-	XKillClient  @ 192
-	XListHosts  @ 193
-	XListInstalledColormaps  @ 194
-	XListProperties  @ 195
-	XListExtensions  @ 196
-	XFreeExtensionList  @ 197
-	XLoadFont  @ 198
-	XLookupColor  @ 199
-	XLowerWindow  @ 200
-	XConnectionNumber  @ 942
-	XRootWindow  @ 943
-	XDefaultScreen  @ 201
-	XDefaultRootWindow  @ 202
-	XDefaultVisual  @ 203
-	XDefaultGC  @ 204
-	XBlackPixel  @ 205
-	XWhitePixel  @ 206
-	XAllPlanes  @ 207
-	XQLength  @ 208
-	XDisplayWidth  @ 209
-	XDisplayHeight  @ 210
-	XDisplayWidthMM  @ 211
-	XDisplayHeightMM  @ 212
-	XDisplayPlanes  @ 213
-	XDisplayCells  @ 214
-	XScreenCount  @ 215
-	XServerVendor  @ 216
-	XProtocolVersion  @ 217
-	XProtocolRevision  @ 218
-	XVendorRelease  @ 219
-	XDisplayString  @ 220
-	XDefaultDepth  @ 221
-	XDefaultColormap  @ 222
-	XBitmapUnit  @ 223
-	XBitmapBitOrder  @ 224
-	XBitmapPad  @ 225
-	XImageByteOrder  @ 226
-	XNextRequest  @ 227
-	XLastKnownRequestProcessed  @ 228
-	XScreenOfDisplay  @ 229
-	XDefaultScreenOfDisplay  @ 230
-	XDisplayOfScreen  @ 231
-	XRootWindowOfScreen  @ 232
-	XBlackPixelOfScreen  @ 233
-	XWhitePixelOfScreen  @ 234
-	XDefaultColormapOfScreen  @ 235
-	XDefaultDepthOfScreen  @ 236
-	XDefaultGCOfScreen  @ 237
-	XDefaultVisualOfScreen  @ 238
-	XWidthOfScreen  @ 239
-	XHeightOfScreen  @ 240
-	XWidthMMOfScreen  @ 241
-	XHeightMMOfScreen  @ 242
-	XPlanesOfScreen  @ 243
-	XCellsOfScreen  @ 244
-	XMinCmapsOfScreen  @ 245
-	XMaxCmapsOfScreen  @ 246
-	XDoesSaveUnders  @ 247
-	XDoesBackingStore  @ 248
-	XEventMaskOfScreen  @ 249
-	XScreenNumberOfScreen  @ 250
-	XDestroyImage  @ 251
-	XGetPixel  @ 252
-	XPutPixel  @ 253
-	XSubImage  @ 254
-	XAddPixel  @ 255
-	XNoOp  @ 256
-	XMapRaised  @ 257
-	XMapSubwindows  @ 258
-	XMapWindow  @ 259
-	XMaskEvent  @ 260
-	XMaxRequestSize  @ 261
-	XResourceManagerString  @ 262
-	XDisplayMotionBufferSize  @ 263
-	XDisplayKeycodes  @ 264
-	XVisualIDFromVisual  @ 265
-	XGetModifierMapping  @ 266
-	XSetModifierMapping  @ 267
-	XNewModifiermap  @ 268
-	XFreeModifiermap  @ 269
-	XInsertModifiermapEntry  @ 270
-	XDeleteModifiermapEntry  @ 271
-	XMoveWindow  @ 272
-	XNextEvent  @ 273
-	XOpenDisplay  @ 274
-	_XFreeDisplayStructure  @ 275
-	XParseColor  @ 276
-	XParseGeometry  @ 277
-	XPeekEvent  @ 278
-	XPeekIfEvent  @ 279
-	XEventsQueued  @ 280
-	XPending  @ 281
-	XSetWindowBackgroundPixmap  @ 282
-	XSetWindowBorderPixmap  @ 283
-	XPolygonRegion  @ 284
-	XDrawText  @ 285
-	XDrawText16  @ 286
-	XPutBackEvent  @ 287
-	_XReverse_Bytes  @ 288
-	XPutImage  @ 289
-	XQueryBestSize  @ 290
-	XQueryColor  @ 291
-	XQueryColors  @ 292
-	XQueryBestCursor  @ 293
-	XQueryExtension  @ 294
-	XQueryKeymap  @ 295
-	XQueryPointer  @ 296
-	XQueryBestStipple  @ 297
-	XQueryTextExtents16  @ 298
-	XQueryTextExtents  @ 299
-	XQueryBestTile  @ 300
-	XQueryTree  @ 301
-	XRaiseWindow  @ 302
-	XReadBitmapFile  @ 303
-	XRecolorCursor  @ 304
-	XConfigureWindow  @ 305
-	XCreateRegion  @ 306
-	XClipBox  @ 307
-	XUnionRectWithRegion  @ 308
-	XSetRegion  @ 309
-	XDestroyRegion  @ 310
-	XOffsetRegion  @ 311
-	XShrinkRegion  @ 312
-	XIntersectRegion  @ 313
-	XUnionRegion  @ 314
-	XSubtractRegion  @ 315
-	XXorRegion  @ 316
-	XEmptyRegion  @ 317
-	XEqualRegion  @ 318
-	XPointInRegion  @ 319
-	XRectInRegion  @ 320
-	XReparentWindow  @ 321
-	XRestackWindows  @ 322
-	XRotateWindowProperties  @ 323
-	XScreenResourceString  @ 324
-	XSelectInput  @ 325
-	XSendEvent  @ 326
-	XSetBackground  @ 327
-	XSetClipRectangles  @ 328
-	_XSetClipRectangles  @ 329
-	XSetClipMask  @ 330
-	XSetClipOrigin  @ 331
-	XSetDashes  @ 332
-	XSetFontPath  @ 333
-	XSetFont  @ 334
-	XSetForeground  @ 335
-	XSetFunction  @ 336
-	XSetSizeHints  @ 337
-	XSetWMHints  @ 338
-	XSetZoomHints  @ 339
-	XSetNormalHints  @ 340
-	XSetIconSizes  @ 341
-	XSetCommand  @ 342
-	XSetStandardProperties  @ 343
-	XSetTransientForHint  @ 344
-	XSetClassHint  @ 345
-	XSetInputFocus  @ 346
-	XSetLineAttributes  @ 347
-	XSetPlaneMask  @ 348
-	XSetPointerMapping  @ 349
-	XChangeKeyboardMapping  @ 350
-	XSetSelectionOwner  @ 351
-	XSetScreenSaver  @ 352
-	XSetState  @ 353
-	XSetStipple  @ 354
-	XSetStandardColormap  @ 355
-	XSetTile  @ 356
-	XSetTSOrigin  @ 357
-	XRotateBuffers  @ 358
-	XFetchBuffer  @ 359
-	XFetchBytes  @ 360
-	XStoreBuffer  @ 361
-	XStoreBytes  @ 362
-	XStoreColor  @ 363
-	XStoreColors  @ 364
-	XStoreNamedColor  @ 365
-	XStoreName  @ 366
-	XSetIconName  @ 367
-	_XInitKeysymDB  @ 368
-	XStringToKeysym  @ 369
-	XSync  @ 370
-	_XSyncFunction  @ 371
-	XSynchronize  @ 372
-	XSetAfterFunction  @ 373
-	XDrawString  @ 374
-	XDrawString16  @ 375
-	XTextExtents  @ 376
-	XTextWidth  @ 377
-	XTextExtents16  @ 378
-	XTextWidth16  @ 379
-	XTranslateCoordinates  @ 380
-	XUndefineCursor  @ 381
-	XUngrabButton  @ 382
-	XUngrabKeyboard  @ 383
-	XUngrabKey  @ 384
-	XUngrabPointer  @ 385
-	XUngrabServer  @ 386
-	XUninstallColormap  @ 387
-	XUnloadFont  @ 388
-	XUnmapSubwindows  @ 389
-	XUnmapWindow  @ 390
-	XGetVisualInfo  @ 391
-	XMatchVisualInfo  @ 392
-	XWarpPointer  @ 393
-	XWindowEvent  @ 394
-	XCreateWindow  @ 395
-	_XProcessWindowAttributes  @ 396
-	XWriteBitmapFile  @ 397
-	_XFlush  @ 398
-	_XEventsQueued  @ 399
-	_XReadEvents  @ 400
-	_XRead  @ 401
-	_XReadPad  @ 402
-	_XSend  @ 403
-	_XAllocID  @ 404
-	_XSetLastRequestRead  @ 405
-	_XReply  @ 406
-	_XEatData  @ 407
-	_XEnq  @ 408
-	_XUnknownWireEvent  @ 409
-	_XUnknownNativeEvent  @ 410
-	_XWireToEvent  @ 411
-	_XDefaultIOError  @ 412
-	_XDefaultError  @ 413
-	_XDefaultWireError  @ 414
-	_XError  @ 415
-	_XIOError  @ 416
-	_XAllocScratch  @ 417
-	_XVIDtoVisual  @ 418
-	XFree  @ 419
-	_XGetHostname  @ 420
-	_XScreenOfWindow  @ 421
-	_XAllocIDs  @ 423
-	_XAllocTemp  @ 424
-	_XFreeTemp  @ 425
-	XrmInitialize  @ 426
-	XrmGetDatabase  @ 427
-	XrmSetDatabase  @ 428
-	XrmStringToQuarkList  @ 429
-	XrmStringToBindingQuarkList  @ 430
-	XrmCombineDatabase  @ 431
-	XrmMergeDatabases  @ 432
-	XrmQPutResource  @ 433
-	XrmPutResource  @ 434
-	XrmQPutStringResource  @ 435
-	XrmPutStringResource  @ 436
-	XrmPutLineResource  @ 437
-	XrmGetStringDatabase  @ 438
-	XrmGetFileDatabase  @ 439
-	XrmCombineFileDatabase  @ 440
-	XrmEnumerateDatabase  @ 441
-	XrmPutFileDatabase  @ 442
-	XrmQGetSearchList  @ 443
-	XrmQGetSearchResource  @ 444
-	XrmQGetResource  @ 445
-	XrmGetResource  @ 446
-	XrmLocaleOfDatabase  @ 447
-	XrmDestroyDatabase  @ 448
-	XGetGCValues  @ 449
-	XGetWMSizeHints  @ 450
-	XGetWMNormalHints  @ 451
-	XGetRGBColormaps  @ 452
-	XGetTextProperty  @ 453
-	XGetWMName  @ 454
-	XGetWMIconName  @ 455
-	XGetWMClientMachine  @ 456
-	XGetWMColormapWindows  @ 457
-	XGetWMProtocols  @ 458
-	XIconifyWindow  @ 459
-	XListPixmapFormats  @ 460
-	XAllocSizeHints  @ 461
-	XAllocStandardColormap  @ 462
-	XAllocWMHints  @ 463
-	XAllocClassHint  @ 464
-	XAllocIconSize  @ 465
-	XReconfigureWMWindow  @ 466
-	XSetWMSizeHints  @ 467
-	XSetWMNormalHints  @ 468
-	XSetRGBColormaps  @ 469
-	XSetTextProperty  @ 470
-	XSetWMName  @ 471
-	XSetWMIconName  @ 472
-	XSetWMClientMachine  @ 473
-	XSetWMColormapWindows  @ 474
-	XSetWMProperties  @ 475
-	XSetWMProtocols  @ 476
-	XStringListToTextProperty  @ 477
-	XTextPropertyToStringList  @ 478
-	XFreeStringList  @ 479
-	XWMGeometry  @ 480
-	XWithdrawWindow  @ 481
-	XauDisposeAuth  @ 482
-	XauGetBestAuthByAddr  @ 483
-	XauFileName  @ 484
-	XauReadAuth  @ 485
-	XcmsCIELabToCIEXYZ  @ 486
-	XcmsCIEXYZToCIELab  @ 487
-	XcmsCIELabClipab  @ 488
-	XcmsCIELabClipL  @ 489
-	XcmsCIELabClipLab  @ 490
-	XcmsCIELabQueryMinL  @ 491
-	XcmsCIELabQueryMaxC  @ 492
-	XcmsCIELabQueryMaxL  @ 493
-	_XcmsCIELabQueryMaxLCRGB  @ 494
-	XcmsCIELabQueryMaxLC  @ 495
-	XcmsCIELabWhiteShiftColors  @ 496
-	XcmsCIELuvToCIEuvY  @ 497
-	XcmsCIEuvYToCIELuv  @ 498
-	XcmsCIELuvClipuv  @ 499
-	XcmsCIELuvClipL  @ 500
-	XcmsCIELuvClipLuv  @ 501
-	XcmsCIELuvQueryMinL  @ 502
-	XcmsCIELuvQueryMaxC  @ 503
-	XcmsCIELuvQueryMaxL  @ 504
-	_XcmsCIELuvQueryMaxLCRGB  @ 505
-	XcmsCIELuvQueryMaxLC  @ 506
-	XcmsCIELuvWhiteShiftColors  @ 507
-	XcmsCIEuvYToCIEXYZ  @ 508
-	XcmsCIEXYZToCIEuvY  @ 509
-	XcmsCIExyYToCIEXYZ  @ 510
-	XcmsCIEXYZToCIExyY  @ 511
-	XcmsTekHVCToCIEuvY  @ 512
-	XcmsCIEuvYToTekHVC  @ 513
-	_XcmsTekHVC_CheckModify  @ 514
-	XcmsTekHVCClipC  @ 515
-	XcmsTekHVCClipV  @ 516
-	XcmsTekHVCClipVC  @ 517
-	XcmsTekHVCQueryMinV  @ 518
-	XcmsTekHVCQueryMaxC  @ 519
-	XcmsTekHVCQueryMaxV  @ 520
-	_XcmsTekHVCQueryMaxVCRGB  @ 521
-	XcmsTekHVCQueryMaxVC  @ 522
-	XcmsTekHVCQueryMaxVSamples  @ 523
-	XcmsTekHVCWhiteShiftColors  @ 524
-	XcmsAddColorSpace  @ 525
-	XcmsAddFunctionSet  @ 526
-	XcmsAllocNamedColor  @ 527
-	XcmsAllocColor  @ 528
-	XcmsCreateCCC  @ 529
-	XcmsDefaultCCC  @ 530
-	XcmsFreeCCC  @ 531
-	_XcmsAddCmapRec  @ 532
-	_XcmsCopyCmapRecAndFree  @ 533
-	_XcmsDeleteCmapRec  @ 534
-	XcmsCCCOfColormap  @ 535
-	_XcmsCopyISOLatin1Lowered  @ 536
-	_XcmsResolveColorString  @ 537
-	_XcmsConvertColorsWithWhitePt  @ 538
-	_XcmsEqualWhitePts  @ 539
-	_XcmsDIConvertColors  @ 540
-	_XcmsDDConvertColors  @ 541
-	XcmsConvertColors  @ 542
-	_XcmsRegFormatOfPrefix  @ 543
-	XcmsFormatOfPrefix  @ 544
-	_XcmsCopyPointerArray  @ 545
-	_XcmsFreePointerArray  @ 546
-	_XcmsPushPointerArray  @ 547
-	_XcmsInitDefaultCCCs  @ 548
-	_XcmsInitScrnInfo  @ 549
-	_XcmsFreeIntensityMaps  @ 550
-	_XcmsGetIntensityMap  @ 551
-	_XcmsGetTableType0  @ 552
-	_XcmsGetTableType1  @ 553
-	_XcmsValueCmp  @ 554
-	_XcmsIntensityCmp  @ 555
-	_XcmsValueInterpolation  @ 556
-	_XcmsIntensityInterpolation  @ 557
-	_XcmsTableSearch  @ 558
-	_XcmsMatVec  @ 559
-	XcmsCIEXYZToRGBi  @ 560
-	XcmsRGBiToCIEXYZ  @ 561
-	XcmsRGBiToRGB  @ 562
-	XcmsRGBToRGBi  @ 563
-	_XcmsLRGB_InitScrnDefault  @ 564
-	XcmsLookupColor  @ 565
-	_XcmsCubeRoot  @ 566
-	_XcmsSquareRoot  @ 567
-	XcmsDisplayOfCCC  @ 568
-	XcmsVisualOfCCC  @ 569
-	XcmsScreenNumberOfCCC  @ 570
-	XcmsScreenWhitePointOfCCC  @ 571
-	XcmsClientWhitePointOfCCC  @ 572
-	XcmsPrefixOfFormat  @ 573
-	_XcmsGetElement  @ 574
-	_XcmsGetProperty  @ 575
-	XcmsQueryBlack  @ 576
-	XcmsQueryBlue  @ 577
-	XcmsQueryGreen  @ 578
-	XcmsQueryRed  @ 579
-	XcmsQueryWhite  @ 580
-	XcmsQueryColor  @ 581
-	XcmsQueryColors  @ 582
-	XcmsSetWhitePoint  @ 583
-	XcmsSetCompressionProc  @ 584
-	XcmsSetWhiteAdjustProc  @ 585
-	_XcmsSetGetColors  @ 586
-	XcmsStoreColor  @ 587
-	XcmsStoreColors  @ 588
-	_XcmsCosine  @ 589
-	_XcmsSine  @ 590
-	_XcmsArcTangent  @ 591
-	_XcmsRGB_to_XColor  @ 592
-	_XColor_to_XcmsRGB  @ 593
-	_XcmsResolveColor  @ 594
-	_XcmsUnresolveColor  @ 595
-	_XUnresolveColor  @ 596
-	_XParseBaseFontNameList  @ 597
-	XCreateFontSet  @ 598
-	XFontsOfFontSet  @ 599
-	XBaseFontNameListOfFontSet  @ 941
-	XLocaleOfFontSet  @ 600
-	XContextDependentDrawing  @ 601
-	XExtentsOfFontSet  @ 602
-	XFreeFontSet  @ 603
-	XVaCreateNestedList  @ 604
-	XGetIMValues  @ 605
-	XCreateIC  @ 606
-	XDestroyIC  @ 607
-	XGetICValues  @ 608
-	XSetICValues  @ 609
-	XSetICFocus  @ 610
-	XUnsetICFocus  @ 611
-	XIMOfIC  @ 612
-	XmbResetIC  @ 613
-	XwcResetIC  @ 614
-	XmbLookupString  @ 615
-	XwcLookupString  @ 616
-	_XIMCompileResourceList  @ 617
-	_XCopyToArg  @ 618
-	XOpenIM  @ 619
-	XCloseIM  @ 620
-	XDisplayOfIM  @ 621
-	XLocaleOfIM  @ 622
-	XSetLocaleModifiers  @ 623
-	XSupportsLocale  @ 624
-	_XlcValidModSyntax  @ 625
-	_XlcDefaultMapModifiers  @ 626
-	_XlcAddLoader  @ 627
-	_XlcCurrentLC  @ 628
-	XmbSetWMProperties  @ 629
-	XmbDrawText  @ 630
-	XmbDrawString  @ 631
-	XmbDrawImageString  @ 632
-	XmbTextEscapement  @ 633
-	XmbTextExtents  @ 634
-	XmbTextPerCharExtents  @ 635
-	XwcDrawText  @ 636
-	XwcDrawString  @ 637
-	XwcDrawImageString  @ 638
-	XwcTextEscapement  @ 639
-	XwcTextExtents  @ 640
-	XwcTextPerCharExtents  @ 641
-	XFilterEvent  @ 642
-	_XRegisterFilterByMask  @ 643
-	_XRegisterFilterByType  @ 644
-	_XUnregisterFilter  @ 645
-	_Xsetlocale  @ 646
-	XDefaultString  @ 647
-	_XlcDefaultLoader  @ 648
-	_XrmInitParseInfo  @ 649
-	XmbTextPropertyToTextList  @ 650
-	XmbTextListToTextProperty  @ 651
-	XwcTextPropertyToTextList  @ 652
-	XwcFreeStringList  @ 653
-	XwcTextListToTextProperty  @ 654
-	_X11TransConnectDisplay  @ 655
-	XGetAtomNames  @ 656
-	XInitImage  @ 657
-	XESetBeforeFlush  @ 658
-	_XFreeAtomTable  @ 659
-	_XUpdateAtomCache  @ 660
-	XInternAtoms  @ 661
-	_XKeyInitialize  @ 662
-	XConvertCase  @ 663
-	_XTranslateKey  @ 664
-	_XTranslateKeySym  @ 665
-	_XKeysymToModifiers  @ 666
-	XExtendedMaxRequestSize  @ 667
-	XReadBitmapFileData  @ 668
-	_XAsyncErrorHandler  @ 669
-	_XDeqAsyncHandler  @ 670
-	_XGetAsyncReply  @ 671
-	_XGetAsyncData  @ 672
-	_XPollfdCacheInit  @ 673
-	_XPollfdCacheAdd  @ 674
-	_XPollfdCacheDel  @ 675
-	_XRegisterInternalConnection  @ 676
-	_XUnregisterInternalConnection  @ 677
-	XInternalConnectionNumbers  @ 678
-	XProcessInternalConnection  @ 679
-	XAddConnectionWatch  @ 680
-	XRemoveConnectionWatch  @ 681
-	_XDeq  @ 682
-	_XcmsCIEXYZ_ValidSpec  @ 683
-	_XcmsCIEuvY_ValidSpec  @ 684
-	XcmsSetCCCOfColormap  @ 685
-	XDirectionalDependentDrawing  @ 686
-	XContextualDrawing  @ 687
-	XSetIMValues  @ 688
-	XRegisterIMInstantiateCallback  @ 689
-	XUnregisterIMInstantiateCallback  @ 690
-	XCreateOC  @ 691
-	XDestroyOC  @ 692
-	XOMOfOC  @ 693
-	XSetOCValues  @ 694
-	XGetOCValues  @ 695
-	XOpenOM  @ 696
-	XCloseOM  @ 697
-	XSetOMValues  @ 698
-	XGetOMValues  @ 699
-	XDisplayOfOM  @ 700
-	XLocaleOfOM  @ 701
-	_XlcRemoveLoader  @ 702
-	_XOpenLC  @ 703
-	_XCloseLC  @ 704
-	_XlcCopyFromArg  @ 705
-	_XlcCopyToArg  @ 706
-	_XlcCountVaList  @ 707
-	_XlcVaToArgList  @ 708
-	_XlcCompileResourceList  @ 709
-	_XlcGetValues  @ 710
-	_XlcSetValues  @ 711
-	XInitThreads  @ 712
-	XLockDisplay  @ 713
-	XUnlockDisplay  @ 714
-	_X11TransFreeConnInfo  @ 715
-	_X11TransOpenCOTSClient  @ 716
-	_X11TransOpenCLTSClient  @ 717
-	_X11TransSetOption  @ 718
-	_X11TransConnect  @ 719
-	_X11TransBytesReadable  @ 720
-	_X11TransRead  @ 721
-	_X11TransWrite  @ 722
-	_X11TransReadv  @ 723
-	_X11TransWritev  @ 724
-	_X11TransDisconnect  @ 725
-	_X11TransClose  @ 726
-	_X11TransCloseForCloning  @ 727
-	_X11TransIsLocal  @ 728
-	_X11TransGetMyAddr  @ 729
-	_X11TransGetPeerAddr  @ 730
-	_X11TransGetConnectionNumber  @ 731
-	_X11TransGetHostname  @ 732
-	_X11TransConvertAddress  @ 733
-	_XimCbDispatch  @ 734
-	_XimLookupMBText  @ 735
-	_XimLookupWCText  @ 736
-	_XimRegisterFilter  @ 737
-	_XimUnregisterFilter  @ 738
-	_XimReregisterFilter  @ 739
-	_XimRegisterServerFilter  @ 740
-	_XimUnregisterServerFilter  @ 741
-	_XimProtoCreateIC  @ 742
-	_XimCheckDataSize  @ 743
-	_XimSetHeader  @ 744
-	_XimProtoIMFree  @ 745
-	_XimProtoOpenIM  @ 746
-	_XimICOfXICID  @ 747
-	_XimSetEventMaskCallback  @ 748
-	_XimSync  @ 749
-	_XimProcSyncReply  @ 750
-	_XimRespSyncReply  @ 751
-	_XimSyncCallback  @ 752
-	_XimForwardEvent  @ 753
-	_XimForwardEventCallback  @ 754
-	_XimRegisterTriggerKeysCallback  @ 755
-	_XimGetWindowEventmask  @ 756
-	_XimTriggerNotify  @ 757
-	_XimFreeCommitInfo  @ 758
-	_XimCommitCallback  @ 759
-	_XimProcError  @ 760
-	_XimErrorCallback  @ 761
-	_XimError  @ 762
-	_Ximctstombs  @ 763
-	_Ximctstowcs  @ 764
-	_XimProtoMbLookupString  @ 765
-	_XimProtoWcLookupString  @ 766
-	_XimRegProtoIntrCallback  @ 767
-	_XimFreeProtoIntrCallback  @ 768
-	_XimDispatchInit  @ 769
-	_XimProtoEventToWire  @ 770
-	_XimProtoWireToEvent  @ 771
-	_XimExtension  @ 772
-	_XimRegisterIMInstantiateCallback  @ 773
-	_XimUnRegisterIMInstantiateCallback  @ 774
-	_XimResetIMInstantiateCallback  @ 775
-	_XimDestroyIMStructureList  @ 776
-	_XimServerDestroy  @ 777
-	_XInitIM  @ 779
-	_XimLocalFilter  @ 780
-	_XimLocalGetICValues  @ 781
-	_XimLocalCreateIC  @ 782
-	_XimCheckIfLocalProcessing  @ 783
-	_XimLocalIMFree  @ 784
-	_XimLocalGetIMValues  @ 785
-	_XimLocalSetIMValues  @ 786
-	_XimLocalOpenIM  @ 787
-	_XimLocalMbLookupString  @ 788
-	_XimLocalWcLookupString  @ 789
-	_XimParseStringFile  @ 790
-	_XimSetICValueData  @ 791
-	_XimLocalSetICValues  @ 792
-	_XimSetIMResourceList  @ 793
-	_XimSetICResourceList  @ 794
-	_XimSetInnerIMResourceList  @ 795
-	_XimSetInnerICResourceList  @ 796
-	_XimCheckCreateICValues  @ 797
-	_XimGetResourceListRec  @ 798
-	_XimSetIMMode  @ 799
-	_XimCheckIMMode  @ 800
-	_XimSetICMode  @ 801
-	_XimCheckICMode  @ 802
-	_XimSetLocalIMDefaults  @ 944
-	_XimSetICDefaults  @ 803
-	_XimDecodeLocalIMAttr  @ 804
-	_XimDecodeLocalICAttr  @ 805
-	_XimCheckLocalInputStyle  @ 806
-	_XimEncodeLocalIMAttr  @ 807
-	_XimEncodeLocalICAttr  @ 808
-	_XimGetCurrentIMValues  @ 809
-	_XimSetCurrentIMValues  @ 810
-	_XimGetCurrentICValues  @ 811
-	_XimSetCurrentICValues  @ 812
-	_XimInitialResourceInfo  @ 813
-	_XimDecodeIMATTRIBUTE  @ 814
-	_XimDecodeICATTRIBUTE  @ 815
-	_XimEncodeIMATTRIBUTE  @ 816
-	_XimEncodeICATTRIBUTE  @ 817
-	_XimGetAttributeID  @ 818
-	_XimThaiFilter  @ 819
-	_XimThaiCreateIC  @ 820
-	_XimCheckIfThaiProcessing  @ 821
-	_XimThaiOpenIM  @ 822
-	_XimThaiIMFree  @ 823
-	_XimThaiCloseIM  @ 824
-	_XimXConf  @ 825
-	_XimConnect  @ 826
-	_XimShutdown  @ 827
-	_XimFlush  @ 828
-	_XimFilterWaitEvent  @ 829
-	_XimFreeTransIntrCallback  @ 830
-	_XimTransFilterWaitEvent  @ 831
-	_XimTransInternalConnection  @ 832
-	_XimTransFlush  @ 833
-	_XimTransConf  @ 834
-	_XlcParseCharSet  @ 835
-	_XlcInitCTInfo  @ 836
-	_XlcGetCSValues  @ 837
-	_XlcGetCharSet  @ 838
-	_XlcAddCharSet  @ 839
-	_XlcCreateDefaultCharSet  @ 840
-	_XlcSetConverter  @ 841
-	_XlcOpenConverter  @ 842
-	_XlcCloseConverter  @ 843
-	_XlcConvert  @ 844
-	_XlcResetConverter  @ 845
-	_XlcGetResource  @ 846
-	_XlcGetLocaleDataBase  @ 847
-	_XlcDestroyLocaleDataBase  @ 848
-	_XlcCreateLocaleDataBase  @ 849
-	_XlcEucLoader  @ 850
-	_XlcFileName  @ 851
-	_XlcResolveLocaleName  @ 852
-;REMOVED	_XlcResolveDBName  @ 853
-	_XlcResolveI18NPath  @ 854
-	_XlcGenericLoader  @ 855
-	_XlcInitLoader  @ 856
-	_XmbTextPropertyToTextList  @ 857
-	_XwcTextPropertyToTextList  @ 858
-	_XwcFreeStringList  @ 859
-	_XGetLCValues  @ 860
-	_XlcDestroyLC  @ 861
-	_XlcCreateLC  @ 862
-	_XrmDefaultInitParseInfo  @ 863
-	_XlcSjisLoader  @ 864
-	_Xlcmbtowc  @ 865
-	_Xlcwctomb  @ 866
-	_Xlcmbstowcs  @ 867
-	_Xlcwcstombs  @ 868
-	_Xmbtowc  @ 869
-	_Xwctomb  @ 870
-	_Xmbstowcs  @ 871
-	_Xwcstombs  @ 872
-	_Xwcscpy  @ 873
-	_Xwcsncpy  @ 874
-	_Xwcslen  @ 875
-	_Xwcscmp  @ 876
-	_Xwcsncmp  @ 877
-	_XmbTextListToTextProperty  @ 878
-	_XwcTextListToTextProperty  @ 879
-	_XlcUtfLoader  @ 880
-	_XlcCompareISOLatin1  @ 881
-	_XlcNCompareISOLatin1  @ 882
-	_XmbDefaultTextEscapement  @ 883
-	_XwcDefaultTextEscapement  @ 884
-	_XmbDefaultTextExtents  @ 885
-	_XwcDefaultTextExtents  @ 886
-	_XmbDefaultTextPerCharExtents  @ 887
-	_XwcDefaultTextPerCharExtents  @ 888
-	_XmbDefaultDrawString  @ 889
-	_XwcDefaultDrawString  @ 890
-	_XmbDefaultDrawImageString  @ 891
-	_XwcDefaultDrawImageString  @ 892
-	_XomGenericOpenOM  @ 893
-	_XInitOM  @ 894
-	_XmbGenericDrawImageString  @ 895
-	_XwcGenericDrawImageString  @ 896
-	_XomGenericDrawString  @ 897
-	_XmbGenericDrawString  @ 898
-	_XwcGenericDrawString  @ 899
-	_XmbGenericTextEscapement  @ 900
-	_XwcGenericTextEscapement  @ 901
-	_XomGenericTextExtents  @ 902
-	_XmbGenericTextExtents  @ 903
-	_XwcGenericTextExtents  @ 904
-	_XmbGenericTextPerCharExtents  @ 905
-	_XwcGenericTextPerCharExtents  @ 906
-	_XomConvert  @ 907
-	_XomInitConverter  @ 908
-	_Xmblen  @ 909
-;;Removed 3.3.2.2	_XimGetResourceName  @ 910
-	_XimGetResourceListRecByQuark  @ 911
-	_XimSetIMValueData  @ 912
-	_XimGetIMValueData  @ 913
-	_XimGetICValueData  @ 914
-	_XimMakeIMAttrIDList  @ 915
-	_XimMakeICAttrIDList  @ 916
-	_XimWrite  @ 917
-	_XimRead  @ 918
-	_XimRegisterDispatcher  @ 919
-	_XimTransRegisterDispatcher  @ 920
-	_XimTransCallDispatcher  @ 921
-	_XimTransWrite  @ 922
-	_XimTransRead  @ 923
-	_XimXTransFreeConnInfo  @ 924
-	_XimXTransOpenCOTSClient  @ 925
-	_XimXTransOpenCLTSClient  @ 926
-	_XimXTransSetOption  @ 927
-	_XimXTransConnect  @ 928
-	_XimXTransBytesReadable  @ 929
-	_XimXTransRead  @ 930
-	_XimXTransWrite  @ 931
-	_XimXTransReadv  @ 932
-	_XimXTransWritev  @ 933
-	_XimXTransDisconnect  @ 934
-	_XimXTransClose  @ 935
-	_XimXTransCloseForCloning  @ 936
-	_XimXTransIsLocal  @ 937
-	_XimXTransGetMyAddr  @ 938
-	_XimXTransGetPeerAddr  @ 939
-	_XimXTransGetConnectionNumber  @ 940
-	_XimXTransGetHostname  @ 945
-	_Xdebug @ 946
-	__XOS2RedirRoot @ 950
-	__XOS2RedirRoot1 @ 951
-	XkbIgnoreExtension @ 1000
-	XkbOpenDisplay @ 1001
-	XkbQueryExtension @ 1002
-	XkbUseExtension @ 1003
-	XkbLibraryVersion @ 1004
-	XkbSetXlibControls @ 1005
-	XkbGetXlibControls @ 1006
-	XkbSetAtomFuncs @ 1007
-	XkbKeycodeToKeysym @ 1008
-	XkbKeysymToModifiers @ 1009
-	XkbLookupKeySym @ 1010
-	XkbLookupKeyBinding @ 1011
-	XkbTranslateKeyCode @ 1012
-	XkbTranslateKeySym @ 1013
-	XkbSetAutoRepeatRate @ 1014
-	XkbGetAutoRepeatRate @ 1015
-	XkbChangeEnabledControls @ 1016
-	XkbDeviceBell @ 1017
-	XkbForceDeviceBell @ 1018
-	XkbDeviceBellEvent @ 1019
-	XkbBell @ 1020
-	XkbForceBell @ 1021
-	XkbBellEvent @ 1022
-	XkbSelectEvents @ 1023
-	XkbSelectEventDetails @ 1024
-	XkbNoteMapChanges @ 1025
-	XkbNoteNameChanges @ 1026
-	XkbGetIndicatorState @ 1027
-	XkbGetIndicatorMap @ 1029
-	XkbSetIndicatorMap @ 1030
-	XkbGetNamedIndicator @ 1031
-	XkbGetNamedDeviceIndicator @ 1032
-	XkbSetNamedIndicator @ 1033
-	XkbSetNamedDeviceIndicator @ 1034
-	XkbLockModifiers @ 1035
-	XkbLatchModifiers @ 1036
-	XkbLockGroup @ 1037
-	XkbLatchGroup @ 1038
-	XkbSetServerInternalMods @ 1039
-	XkbSetIgnoreLockMods @ 1040
-	XkbVirtualModsToReal @ 1041
-	XkbComputeEffectiveMap @ 1042
-	XkbInitCanonicalKeyTypes @ 1043
-	XkbAllocKeyboard @ 1044
-	XkbFreeKeyboard @ 1045
-	XkbAllocClientMap @ 1046
-	XkbAllocServerMap @ 1047
-	XkbFreeClientMap @ 1048
-	XkbFreeServerMap @ 1049
-	XkbAddKeyType @ 1050
-	XkbAllocIndicatorMaps @ 1051
-	XkbFreeIndicatorMaps @ 1052
-	XkbGetMap @ 1053
-	XkbGetUpdatedMap @ 1054
-	XkbGetMapChanges @ 1055
-	XkbRefreshKeyboardMapping @ 1056
-	XkbGetKeyTypes @ 1057
-	XkbGetKeySyms @ 1058
-	XkbGetKeyActions @ 1059
-	XkbGetKeyBehaviors @ 1060
-	XkbGetVirtualMods @ 1061
-	XkbGetKeyExplicitComponents @ 1062
-	XkbGetKeyModifierMap @ 1063
-	XkbAllocControls @ 1064
-	XkbFreeControls @ 1065
-	XkbGetControls @ 1066
-	XkbSetControls @ 1067
-	XkbAllocCompatMap @ 1069
-	XkbFreeCompatMap @ 1070
-	XkbGetCompatMap @ 1071
-	XkbSetCompatMap @ 1072
-	XkbAllocNames @ 1073
-	XkbGetNames @ 1074
-	XkbSetNames @ 1075
-	XkbChangeNames @ 1076
-	XkbFreeNames @ 1077
-	XkbGetState @ 1078
-	XkbSetMap @ 1079
-	XkbChangeMap @ 1080
-	XkbSetDetectableAutoRepeat @ 1081
-	XkbGetDetectableAutoRepeat @ 1082
-	XkbSetAutoResetControls @ 1083	
-	XkbGetAutoResetControls @ 1084
-	XkbCopyKeyType @ 1085
-	XkbCopyKeyTypes @ 1086
-	XkbResizeKeyType @ 1087
-	XkbResizeKeySyms @ 1088
-	XkbResizeKeyActions @ 1089
-	XkbChangeTypesOfKey @ 1090
-	XkbListComponents @ 1091
-	XkbFreeComponentList @ 1092
-	XkbGetKeyboard @ 1093
-	XkbGetKeyboardByName @ 1094
-	XkbAddDeviceLedInfo @ 1098
-	XkbResizeDeviceButtonActions @ 1099
-	XkbAllocDeviceInfo @ 1100
-	XkbFreeDeviceInfo @ 1101
-	XkbNoteDeviceChanges @ 1102
-	XkbGetDeviceInfo @ 1103
-	XkbGetDeviceInfoChanges @ 1104
-	XkbGetDeviceButtonActions @ 1105
-	XkbGetDeviceLedInfo @ 1106
-	XkbSetDeviceInfo @ 1107
-	XkbChangeDeviceInfo @ 1108
-	XkbSetDeviceLedInfo @ 1109
-	XkbSetDeviceButtonActions @ 1110
-	XkbToControl @ 1111
-	XkbSetDebuggingFlags @ 1112
-	_XkbInternAtomFunc @ 1113
-	_XkbGetAtomNameFunc @ 1114
-	_XkbReloadDpy @ 1115
-	_XKeycodeToKeysym @ 1116
-	_XKeysymToKeycode @ 1117
-	_XLookupKeysym @ 1118
-	_XRefreshKeyboardMapping @ 1119
-	_XLookupString @ 1120
-	_XkbNoteCoreMapChanges @ 1121
-	_XkbInitReadBuffer @ 1122
-	_XkbSkipReadBufferData @ 1123
-	_XkbCopyFromReadBuffer @ 1124
-	_XkbReadCopyKeySyms @ 1125
-	_XkbWriteCopyKeySyms @ 1126
-	_XkbReadBufferCopyKeySyms @ 1127
-	_XkbPeekAtReadBuffer @ 1128
-	_XkbGetReadBufferPtr @ 1129
-	_XkbFreeReadBuffer @ 1130
-	_XkbGetReadBufferCountedString @ 1131
-	_XkbGetCharset @ 1132
-	_XkbGetConverters @ 1133
-	XkbGetGeometry @ 1134
-	XkbAddGeomShape @ 1135
-	XkbAddGeomOutline @ 1136
-	XkbComputeShapeBounds @ 1137
-	XkbAddGeomDoodad @ 1138
-	XkbAddGeomColor @ 1139
-	XkbAddGeomOverlayRow @ 1140
-	XkbAddGeomSection @ 1141
-	XkbAddGeomRow @ 1142
-	XkbAddGeomKey @ 1143
-	XkbComputeSectionBounds @ 1144
-	XkbAllocGeometry @ 1145
-	XkbAddGeomProperty @ 1146
-	XkbAddGeomOverlay @ 1147
-	XkbComputeShapeTop @ 1148
-	XkbFindOverlayForKey @ 1149
-	XkbAllocGeomKeyAliases @ 1150
-	XkbSetGeometry @ 1151
-	XkbXlibControlsImplemented @ 1152
-	XkbTranslateKey @ 1153
-	XkbAddGeomOverlayKey @ 1154
-	XkbNoteControlsChanges @ 1155
-	XkbGetKeyVirtualModMap @ 1156
-	XkbComputeRowBounds @ 1157
-	XkbGetNamedGeometry @ 1158
-	XkbKeyTypesForCoreSymbols @ 1159
-	XkbApplyCompatMapToKey @ 1160
-	XkbUpdateMapFromCore @ 1161
-	XkbUpdateActionVirtualMods @ 1162
-	XkbUpdateKeyTypeVirtualMods @ 1163
-	XkbApplyVirtualModChanges @ 1164
-	XkbFreeGeomProperties @ 1165
-	XkbFreeGeomKeyAliases @ 1166
-	XkbFreeGeomColors @ 1167
-	XkbFreeGeomPoints @ 1168
-	XkbFreeGeomOutlines @ 1169
-	XkbFreeGeomShapes @ 1170
-	XkbFreeGeomOverlayKeys @ 1171
-	XkbFreeGeomOverlayRows @ 1172
-	XkbFreeGeomOverlays @ 1173
-	XkbFreeGeomKeys @ 1174
-	XkbFreeGeomRows @ 1175
-	XkbFreeGeomSections @ 1176
-	XkbFreeGeomDoodads @ 1177
-	XkbFreeGeometry @ 1178
-	XkbAllocGeomProps @ 1179
-	XkbAllocGeomColors @ 1180
-	XkbAllocGeomShapes @ 1181
-	XkbAllocGeomSections @ 1182
-	XkbAllocGeomOverlays @ 1183
-	XkbAllocGeomOverlayRows @ 1184
-	XkbAllocGeomOverlayKeys @ 1185
-	XkbAllocGeomDoodads @ 1186
-	XkbAllocGeomSectionDoodads @ 1187
-	XkbAllocGeomOutlines @ 1188
-	XkbAllocGeomRows @ 1189
-	XkbAllocGeomPoints @ 1190
-	XkbAllocGeomKeys @ 1191
-	XkbAddGeomKeyAlias @ 1192
-	_XkeyTable @ 1200
-	_Xevent_to_mask @ 1201
-	_qfree @ 1202
-	_XIOErrorFunction @ 1203
-	_XErrorFunction @ 1204
-	_XHeadOfDisplayList @ 1205
-	XcmsCIELabColorSpace @ 1206
-	XcmsCIELuvColorSpace @ 1207
-	XcmsCIEXYZColorSpace @ 1208
-	XcmsCIEuvYColorSpace @ 1209
-	XcmsCIExyYColorSpace @ 1210
-	XcmsTekHVCColorSpace @ 1211
-	XcmsUNDEFINEDColorSpace @ 1212
-	_XcmsDIColorSpacesInit @ 1213
-	_XcmsDIColorSpaces @ 1214
-	_XcmsDDColorSpacesInit @ 1215
-	_XcmsDDColorSpaces @ 1216
-	_XcmsSCCFuncSetsInit @ 1217
-	_XcmsSCCFuncSets @ 1218
-	_XcmsCIEXYZ_prefix @ 1219
-	_XcmsCIEuvY_prefix @ 1220
-	_XcmsCIExyY_prefix @ 1221
-	_XcmsCIELab_prefix @ 1222
-	_XcmsCIELuv_prefix @ 1223
-	_XcmsTekHVC_prefix @ 1224
-	_XcmsRGBi_prefix @ 1225
-	_XcmsRGB_prefix @ 1226
-	_XcmsRegColorSpaces @ 1227
-	XcmsRGBiColorSpace @ 1228
-	XcmsRGBColorSpace @ 1229
-	XcmsLinearRGBFunctionSet @ 1230
-	_X11TransSocketINETFuncs @ 1231
-	_X11TransSocketTCPFuncs @ 1232
-	_XimXTransSocketINETFuncs @ 1233
-	_XimXTransSocketTCPFuncs @ 1234
-	_XimImSportRec @ 1235
-	_XimTransportRec @ 1236
-	_XlcGenericMethods @ 1237
-	_XlcPublicMethods @ 1238
-
diff --git a/xc/lib/X11/X11os2.rsp b/xc/lib/X11/X11os2.rsp
deleted file mode 100644
index f7d725c6f..000000000
--- a/xc/lib/X11/X11os2.rsp
+++ /dev/null
@@ -1,71 +0,0 @@
-AddDIC.obj AddSF.obj AllCells.obj AllPlanes.obj AllowEv.obj AuDispose.obj+
-AuFileName.obj AuGetBest.obj AuRead.obj AutoRep.obj Backgnd.obj+
-BdrWidth.obj Bell.obj Border.obj CCC.obj ChAccCon.obj ChActPGb.obj+
-ChClMode.obj ChCmap.obj ChGC.obj ChKeyCon.obj ChPntCon.obj ChProp.obj+
-ChSaveSet.obj ChWAttrs.obj ChWindow.obj ChkIfEv.obj ChkMaskEv.obj+
-ChkTypEv.obj ChkTypWEv.obj ChkWinEv.obj CirWin.obj CirWinDn.obj CirWinUp.obj+
-ClDisplay.obj Clear.obj ClearArea.obj ConfWind.obj ConnDis.obj Context.obj+
-ConvSel.obj CopyArea.obj CopyCmap.obj CopyGC.obj CopyPlane.obj CrBFData.obj+
-CrCmap.obj CrCursor.obj CrGC.obj CrGlCur.obj CrPFBData.obj CrPixmap.obj+
-CrWindow.obj Cursor.obj CvColW.obj CvCols.obj DefCursor.obj DelProp.obj+
-Depths.obj DestSubs.obj DestWind.obj DisName.obj DrArc.obj DrArcs.obj+
-DrLine.obj DrLines.obj DrPoint.obj DrPoints.obj DrRect.obj DrRects.obj+
-DrSegs.obj ErrDes.obj ErrHndlr.obj EvToWire.obj FSSaver.obj FSWrap.obj+
-FetchName.obj FillArc.obj FillArcs.obj FillPoly.obj FillRct.obj FillRcts.obj+
-FilterEv.obj Flush.obj Font.obj FontInfo.obj FontNames.obj FreeCmap.obj+
-FreeCols.obj FreeCurs.obj FreeEData.obj FreeGC.obj FreePix.obj GCMisc.obj+
-Geom.obj GetAtomNm.obj GetColor.obj GetDflt.obj GetFPath.obj GetFProp.obj+
-GetGCVals.obj GetGeom.obj GetHColor.obj GetHints.obj GetIFocus.obj+
-GetImage.obj GetKCnt.obj GetMoEv.obj GetNrmHint.obj GetPCnt.obj GetPntMap.obj+
-GetProp.obj GetRGBCMap.obj GetSOwner.obj GetSSaver.obj GetStCmap.obj+
-GetTxtProp.obj GetWAttrs.obj GetWMCMapW.obj GetWMProto.obj GrButton.obj+
-GrKey.obj GrKeybd.obj GrPointer.obj GrServer.obj HVC.obj HVCGcC.obj+
-HVCGcV.obj HVCGcVC.obj HVCMnV.obj HVCMxC.obj HVCMxV.obj HVCMxVC.obj+
-HVCMxVs.obj HVCWpAj.obj Host.obj ICWrap.obj IMWrap.obj Iconify.obj IdOfPr.obj+
-IfEvent.obj ImText.obj ImText16.obj ImUtil.obj InitExt.obj InsCmap.obj+
-IntAtom.obj KeyBind.obj KeysymStr.obj KillCl.obj LRGB.obj Lab.obj LabGcC.obj+
-LabGcL.obj LabGcLC.obj LabMnL.obj LabMxC.obj LabMxL.obj LabMxLC.obj+
-LabWpAj.obj LiHosts.obj LiICmaps.obj LiProps.obj ListExt.obj LoadFont.obj+
-LockDis.obj LookupCol.obj LowerWin.obj Luv.obj LuvGcC.obj LuvGcL.obj+
-LuvGcLC.obj LuvMnL.obj LuvMxC.obj LuvMxL.obj LuvMxLC.obj LuvWpAj.obj+
-Macros.obj MapRaised.obj MapSubs.obj MapWindow.obj MaskEvent.obj Misc.obj+
-ModMap.obj MoveWin.obj NextEvent.obj OCWrap.obj OMWrap.obj OfCCC.obj+
-OpenDis.obj ParseCmd.obj ParseCol.obj ParseGeom.obj PeekEvent.obj PeekIfEv.obj+
-Pending.obj PixFormats.obj PmapBgnd.obj PmapBord.obj PolyReg.obj PolyTxt.obj+
-PolyTxt16.obj PrOfId.obj PropAlloc.obj PutBEvent.obj PutImage.obj QBlack.obj+
-QBlue.obj QGreen.obj QRed.obj QWhite.obj QuBest.obj QuCol.obj QuColor.obj+
-QuColors.obj QuCols.obj QuCurShp.obj QuExt.obj QuKeybd.obj QuPntr.obj+
-QuStipShp.obj QuTextE16.obj QuTextExt.obj QuTileShp.obj QuTree.obj Quarks.obj+
-RaiseWin.obj RdBitF.obj RecolorC.obj ReconfWM.obj ReconfWin.obj Region.obj+
-RegstFlt.obj RepWindow.obj RestackWs.obj RotProp.obj ScrResStr.obj+
-SelInput.obj SendEvent.obj SetBack.obj SetCCC.obj SetCRects.obj SetClMask.obj+
-SetClOrig.obj SetDashes.obj SetFPath.obj SetFont.obj SetFore.obj SetFunc.obj+
-SetGetCols.obj SetHints.obj SetIFocus.obj SetLStyle.obj SetLocale.obj+
-SetNrmHint.obj SetPMask.obj SetPntMap.obj SetRGBCMap.obj SetSOwner.obj+
-SetSSaver.obj SetStCmap.obj SetState.obj SetStip.obj SetTSOrig.obj SetTile.obj+
-SetTxtProp.obj SetWMCMapW.obj SetWMProto.obj StBytes.obj StCol.obj StColor.obj+
-StColors.obj StCols.obj StNColor.obj StName.obj StrKeysym.obj StrToText.obj+
-Sync.obj Synchro.obj Text.obj Text16.obj TextExt.obj TextExt16.obj+
-TextToStr.obj TrCoords.obj UNDEFINED.obj UndefCurs.obj UngrabBut.obj+
-UngrabKbd.obj UngrabKey.obj UngrabPtr.obj UngrabSvr.obj UninsCmap.obj+
-UnldFont.obj UnmapSubs.obj UnmapWin.obj VisUtil.obj WMGeom.obj WMProps.obj+
-WarpPtr.obj WinEvent.obj Window.obj Withdraw.obj WrBitF.obj XRGB.obj XYZ.obj+
-XlibAsync.obj XlibInt.obj Xrm.obj cmsAllCol.obj cmsAllNCol.obj cmsCmap.obj+
-cmsColNm.obj cmsGlobls.obj cmsInt.obj cmsLkCol.obj cmsMath.obj cmsProp.obj+
-cmsTrig.obj evtomask.obj globals.obj imCallbk.obj imConv.obj imDefFlt.obj+
-imDefIc.obj imDefIm.obj imDefLkup.obj imDispch.obj imEvToWire.obj imExten.obj+
-imImSw.obj imInsClbk.obj imInt.obj imLcFlt.obj imLcGIc.obj imLcIc.obj+
-imLcIm.obj imLcLkup.obj imLcPrs.obj imLcSIc.obj imRm.obj imRmAttr.obj+
-imThaiFlt.obj imThaiIc.obj imThaiIm.obj imTrX.obj imTrans.obj imTransR.obj+
-lcCT.obj lcCharSet.obj lcConv.obj lcDB.obj lcDefConv.obj lcEuc.obj lcFile.obj+
-lcGenConv.obj lcGeneric.obj lcInit.obj lcJis.obj lcPrTxt.obj lcPubWrap.obj lcPublic.obj+
-lcRM.obj lcSjis.obj lcStd.obj lcTxtPr.obj lcUTF.obj lcUtil.obj lcWrap.obj+
-locking.obj mbWMProps.obj mbWrap.obj omDefault.obj omGeneric.obj omImText.obj+
-omText.obj omTextEsc.obj omTextExt.obj omTextPer.obj omXChar.obj uvY.obj+
-XKB.obj XKBAlloc.obj XKBBell.obj XKBBind.obj XKBCompat.obj XKBCtrls.obj+
-XKBCvt.obj XKBExtDev.obj XKBGAlloc.obj XKBGeom.obj XKBGetByName.obj+
-XKBGetMap.obj XKBleds.obj XKBList.obj XKBMAlloc.obj XKBNames.obj+
-XKBRdBuf.obj XKBSetMap.obj XKBUse.obj XKBMisc.obj XKBSetGeom.obj+
-wcWrap.obj x11trans.obj ximtrans.obj xyY.obj os2Stubs.obj /NOI /NOL /NOD /BAT
-X11.dll
-X11.map
diff --git a/xc/lib/X11/XErrorDB b/xc/lib/X11/XErrorDB
deleted file mode 100644
index 4da95e597..000000000
--- a/xc/lib/X11/XErrorDB
+++ /dev/null
@@ -1,762 +0,0 @@
-! $TOG: XErrorDB /main/48 1998/02/11 15:36:23 kaleb $
-! Copyright 1993, 1995, 1998  The Open Group
-
-! All Rights Reserved.
-! 
-! The above copyright notice and this permission notice shall be
-! included in all copies or substantial portions of the Software.
-! 
-! THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-! EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-! MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-! IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-! OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-! ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-! OTHER DEALINGS IN THE SOFTWARE.
-! 
-! Except as contained in this notice, the name of The Open Group shall
-! not be used in advertising or otherwise to promote the sale, use or
-! other dealings in this Software without prior written authorization
-! from The Open Group.
-!
-! $XFree86: xc/lib/X11/XErrorDB,v 3.26 1999/08/28 09:00:24 dawes Exp $
-!
-! these are used in XGetErrorMessage.
-XlibMessage.XError: X Error of failed request
-XlibMessage.MajorCode: Major opcode of failed request:  %d
-XlibMessage.MinorCode: Minor opcode of failed request:  %d
-XlibMessage.ResourceID: Resource id in failed request:  0x%lx
-XlibMessage.Value: Value in failed request:  0x%lx
-XlibMessage.AtomID: Atom id in failed request:  0x%lx
-XlibMessage.ErrorSerial: Serial number of failed request:  %lu
-XlibMessage.CurrentSerial: Current serial number in output stream:  %lu
-! X request codes.
-XRequest.1:X_CreateWindow
-XRequest.2:X_ChangeWindowAttributes
-XRequest.3:X_GetWindowAttributes
-XRequest.4:X_DestroyWindow
-XRequest.5:X_DestroySubwindows
-XRequest.6:X_ChangeSaveSet
-XRequest.7:X_ReparentWindow
-XRequest.8:X_MapWindow
-XRequest.9:X_MapSubwindows
-XRequest.10:X_UnmapWindow
-XRequest.11:X_UnmapSubwindows
-XRequest.12:X_ConfigureWindow
-XRequest.13:X_CirculateWindow
-XRequest.14:X_GetGeometry
-XRequest.15:X_QueryTree
-XRequest.16:X_InternAtom
-XRequest.17:X_GetAtomName
-XRequest.18:X_ChangeProperty
-XRequest.19:X_DeleteProperty
-XRequest.20:X_GetProperty
-XRequest.21:X_ListProperties
-XRequest.22:X_SetSelectionOwner
-XRequest.23:X_GetSelectionOwner
-XRequest.24:X_ConvertSelection
-XRequest.25:X_SendEvent
-XRequest.26:X_GrabPointer
-XRequest.27:X_UngrabPointer
-XRequest.28:X_GrabButton
-XRequest.29:X_UngrabButton
-XRequest.30:X_ChangeActivePointerGrab
-XRequest.31:X_GrabKeyboard
-XRequest.32:X_UngrabKeyboard
-XRequest.33:X_GrabKey
-XRequest.34:X_UngrabKey
-XRequest.35:X_AllowEvents
-XRequest.36:X_GrabServer
-XRequest.37:X_UngrabServer
-XRequest.38:X_QueryPointer
-XRequest.39:X_GetMotionEvents
-XRequest.40:X_TranslateCoords
-XRequest.41:X_WarpPointer
-XRequest.42:X_SetInputFocus
-XRequest.43:X_GetInputFocus
-XRequest.44:X_QueryKeymap
-XRequest.45:X_OpenFont
-XRequest.46:X_CloseFont
-XRequest.47:X_QueryFont
-XRequest.48:X_QueryTextExtents
-XRequest.49:X_ListFonts
-XRequest.50:X_ListFontsWithInfo
-XRequest.51:X_SetFontPath
-XRequest.52:X_GetFontPath
-XRequest.53:X_CreatePixmap
-XRequest.54:X_FreePixmap
-XRequest.55:X_CreateGC
-XRequest.56:X_ChangeGC
-XRequest.57:X_CopyGC
-XRequest.58:X_SetDashes
-XRequest.59:X_SetClipRectangles
-XRequest.60:X_FreeGC
-XRequest.61:X_ClearArea
-XRequest.62:X_CopyArea
-XRequest.63:X_CopyPlane
-XRequest.64:X_PolyPoint
-XRequest.65:X_PolyLine
-XRequest.66:X_PolySegment
-XRequest.67:X_PolyRectangle
-XRequest.68:X_PolyArc
-XRequest.69:X_FillPoly
-XRequest.70:X_PolyFillRectangle
-XRequest.71:X_PolyFillArc
-XRequest.72:X_PutImage
-XRequest.73:X_GetImage
-XRequest.74:X_PolyText8
-XRequest.75:X_PolyText16
-XRequest.76:X_ImageText8
-XRequest.77:X_ImageText16
-XRequest.78:X_CreateColormap
-XRequest.79:X_FreeColormap
-XRequest.80:X_CopyColormapAndFree
-XRequest.81:X_InstallColormap
-XRequest.82:X_UninstallColormap
-XRequest.83:X_ListInstalledColormaps
-XRequest.84:X_AllocColor
-XRequest.85:X_AllocNamedColor
-XRequest.86:X_AllocColorCells
-XRequest.87:X_AllocColorPlanes
-XRequest.88:X_FreeColors
-XRequest.89:X_StoreColors
-XRequest.90:X_StoreNamedColor
-XRequest.91:X_QueryColors
-XRequest.92:X_LookupColor
-XRequest.93:X_CreateCursor
-XRequest.94:X_CreateGlyphCursor
-XRequest.95:X_FreeCursor
-XRequest.96:X_RecolorCursor
-XRequest.97:X_QueryBestSize
-XRequest.98:X_QueryExtension
-XRequest.99:X_ListExtensions
-XRequest.100:X_ChangeKeyboardMapping
-XRequest.101:X_GetKeyboardMapping
-XRequest.102:X_ChangeKeyboardControl
-XRequest.103:X_GetKeyboardControl
-XRequest.104:X_Bell
-XRequest.105:X_ChangePointerControl
-XRequest.106:X_GetPointerControl
-XRequest.107:X_SetScreenSaver
-XRequest.108:X_GetScreenSaver
-XRequest.109:X_ChangeHosts
-XRequest.110:X_ListHosts
-XRequest.111:X_SetAccessControl
-XRequest.112:X_SetCloseDownMode
-XRequest.113:X_KillClient
-XRequest.114:X_RotateProperties
-XRequest.115:X_ForceScreenSaver
-XRequest.116:X_SetPointerMapping
-XRequest.117:X_GetPointerMapping
-XRequest.118:X_SetModifierMapping
-XRequest.119:X_GetModifierMapping
-XRequest.127:X_NoOperation
-! X Error Codes
-XProtoError.0: unknown error code 0
-XProtoError.1: BadRequest (invalid request code or no such operation)
-XProtoError.2: BadValue (integer parameter out of range for operation)
-XProtoError.3: BadWindow (invalid Window parameter)
-XProtoError.4: BadPixmap (invalid Pixmap parameter)
-XProtoError.5: BadAtom (invalid Atom parameter)
-XProtoError.6: BadCursor (invalid Cursor parameter)
-XProtoError.7: BadFont (invalid Font parameter)
-XProtoError.8: BadMatch (invalid parameter attributes)
-XProtoError.9: BadDrawable (invalid Pixmap or Window parameter)
-XProtoError.10: BadAccess (attempt to access private resource denied)
-XProtoError.11: BadAlloc (insufficient resources for operation)
-XProtoError.12: BadColor (invalid Colormap parameter)
-XProtoError.13: BadGC (invalid GC parameter)
-XProtoError.14: BadIDChoice (invalid resource ID chosen for this connection)
-XProtoError.15: BadName (named color or font does not exist)
-XProtoError.16: BadLength (poly request too large or internal Xlib length error)
-XProtoError.17: BadImplementation (server does not implement operation)
-! Multi-Buffering extension, not an X Consortium standard
-XRequest.Multi-Buffering.0: X_MbufGetBufferVersion
-XRequest.Multi-Buffering.1: X_MbufCreateImageBuffers
-XRequest.Multi-Buffering.2: X_MbufDestroyImageBuffers
-XRequest.Multi-Buffering.3: X_MbufDisplayImageBuffers
-XRequest.Multi-Buffering.4: X_MbufSetMultiBufferAttributes
-XRequest.Multi-Buffering.5: X_MbufGetMultiBufferAttributes
-XRequest.Multi-Buffering.6: X_MbufSetBufferAttributes
-XRequest.Multi-Buffering.7: X_MbufGetBufferAttributes
-XRequest.Multi-Buffering.8: X_MbufGetBufferInfo
-XRequest.Multi-Buffering.9: X_MbufCreateStereoWindow
-XProtoError.Multi-Buffering.0: BadBuffer (invalid Buffer parameter)
-XlibMessage.Multi-Buffering.0: Buffer id in failed request:  0x%lx
-! SHAPE extension, an X Consortium standard
-XRequest.SHAPE.0: X_ShapeQueryVersion
-XRequest.SHAPE.1: X_ShapeRectangles
-XRequest.SHAPE.2: X_ShapeMask
-XRequest.SHAPE.3: X_ShapeCombine
-XRequest.SHAPE.4: X_ShapeOffset
-XRequest.SHAPE.5: X_ShapeQueryExtents
-XRequest.SHAPE.6: X_ShapeSelectInput
-XRequest.SHAPE.7: X_ShapeInputSelected
-XRequest.SHAPE.8: X_ShapeGetRectangles
-! Input extension, an X Consortium standard
-XRequest.XInputExtension.1:X_GetExtensionVersion
-XRequest.XInputExtension.2:X_ListInputDevices
-XRequest.XInputExtension.3:X_OpenDevice
-XRequest.XInputExtension.4:X_CloseDevice
-XRequest.XInputExtension.5:X_SetDeviceMode
-XRequest.XInputExtension.6:X_SelectExtensionEvent
-XRequest.XInputExtension.7:X_GetSelectedExtensionEvents
-XRequest.XInputExtension.8:X_ChangeDeviceDontPropagateList
-XRequest.XInputExtension.9:X_GetDeviceDontPropagateList
-XRequest.XInputExtension.10:X_GetDeviceMotionEvents
-XRequest.XInputExtension.11:X_ChangeKeyboardDevice
-XRequest.XInputExtension.12:X_ChangePointerDevice
-XRequest.XInputExtension.13:X_GrabDevice
-XRequest.XInputExtension.14:X_UngrabDevice
-XRequest.XInputExtension.15:X_GrabDeviceKey
-XRequest.XInputExtension.16:X_UngrabDeviceKey
-XRequest.XInputExtension.17:X_GrabDeviceButton
-XRequest.XInputExtension.18:X_UngrabDeviceButton
-XRequest.XInputExtension.19:X_AllowDeviceEvents
-XRequest.XInputExtension.20:X_GetDeviceFocus
-XRequest.XInputExtension.21:X_SetDeviceFocus
-XRequest.XInputExtension.22:X_GetFeedbackControl
-XRequest.XInputExtension.23:X_ChangeFeedbackControl
-XRequest.XInputExtension.24:X_GetDeviceKeyMapping
-XRequest.XInputExtension.25:X_ChangeDeviceKeyMapping
-XRequest.XInputExtension.26:X_GetDeviceModifierMapping
-XRequest.XInputExtension.27:X_SetDeviceModifierMapping
-XRequest.XInputExtension.28:X_GetDeviceButtonMapping
-XRequest.XInputExtension.29:X_SetDeviceButtonMapping
-XRequest.XInputExtension.30:X_QueryDeviceState
-XRequest.XInputExtension.31:X_SendExtensionEvent
-XRequest.XInputExtension.32:X_DeviceBell
-XRequest.XInputExtension.33:X_SetDeviceValuators
-XRequest.XInputExtension.34:X_GetDeviceControl
-XRequest.XInputExtension.35:X_ChangeDeviceControl
-! MIT-SHM extension, experimental, not an X Consortium standard
-XRequest.MIT-SHM.0: X_ShmQueryVersion
-XRequest.MIT-SHM.1: X_ShmAttach
-XRequest.MIT-SHM.2: X_ShmDetach
-XRequest.MIT-SHM.3: X_ShmPutImage
-XRequest.MIT-SHM.4: X_ShmGetImage
-XRequest.MIT-SHM.5: X_ShmCreatePixmap
-XProtoError.MIT-SHM.0: BadShmSeg (invalid shared segment parameter)
-XlibMessage.MIT-SHM.0: Segment id in failed request:  0x%lx
-! MIT-SUNDRY-NONSTANDARD extension, definitely not an X Consortium standard
-XRequest.MIT-SUNDRY-NONSTANDARD.0: X_MITSetBugMode
-XRequest.MIT-SUNDRY-NONSTANDARD.1: X_MITGetBugMode
-! X3D-PEX extension
-XRequest.X3D-PEX.1: PEX_GetExtensionInfo
-XRequest.X3D-PEX.2: PEX_GetEnumeratedTypeInfo
-XRequest.X3D-PEX.3: PEX_GetImpDepConstants
-XRequest.X3D-PEX.4: PEX_CreateLookupTable
-XRequest.X3D-PEX.5: PEX_CopyLookupTable
-XRequest.X3D-PEX.6: PEX_FreeLookupTable
-XRequest.X3D-PEX.7: PEX_GetTableInfo
-XRequest.X3D-PEX.8: PEX_GetPredefinedEntries
-XRequest.X3D-PEX.9: PEX_GetDefinedIndices
-XRequest.X3D-PEX.10: PEX_GetTableEntry
-XRequest.X3D-PEX.11: PEX_GetTableEntries
-XRequest.X3D-PEX.12: PEX_SetTableEntries
-XRequest.X3D-PEX.13: PEX_DeleteTableEntries
-XRequest.X3D-PEX.14: PEX_CreatePipelineContext
-XRequest.X3D-PEX.15: PEX_CopyPipelineContext
-XRequest.X3D-PEX.16: PEX_FreePipelineContext
-XRequest.X3D-PEX.17: PEX_GetPipelineContext
-XRequest.X3D-PEX.18: PEX_ChangePipelineContext
-XRequest.X3D-PEX.19: PEX_CreateRenderer
-XRequest.X3D-PEX.20: PEX_FreeRenderer
-XRequest.X3D-PEX.21: PEX_ChangeRenderer
-XRequest.X3D-PEX.22: PEX_GetRendererAttributes
-XRequest.X3D-PEX.23: PEX_GetRendererDynamics
-XRequest.X3D-PEX.24: PEX_BeginRendering
-XRequest.X3D-PEX.25: PEX_EndRendering
-XRequest.X3D-PEX.26: PEX_BeginStructure
-XRequest.X3D-PEX.27: PEX_EndStructure
-XRequest.X3D-PEX.28: PEX_RenderOutputCommands
-XRequest.X3D-PEX.29: PEX_RenderNetwork
-XRequest.X3D-PEX.30: PEX_CreateStructure
-XRequest.X3D-PEX.31: PEX_CopyStructure
-XRequest.X3D-PEX.32: PEX_DestroyStructures
-XRequest.X3D-PEX.33: PEX_GetStructureInfo
-XRequest.X3D-PEX.34: PEX_GetElementInfo
-XRequest.X3D-PEX.35: PEX_GetStructuresInNetwork
-XRequest.X3D-PEX.36: PEX_GetAncestors
-XRequest.X3D-PEX.37: PEX_GetDescendants
-XRequest.X3D-PEX.38: PEX_FetchElements
-XRequest.X3D-PEX.39: PEX_SetEditingMode
-XRequest.X3D-PEX.40: PEX_SetElementPointer
-XRequest.X3D-PEX.41: PEX_SetElementPointerAtLabel
-XRequest.X3D-PEX.42: PEX_ElementSearch
-XRequest.X3D-PEX.43: PEX_StoreElements
-XRequest.X3D-PEX.44: PEX_DeleteElements
-XRequest.X3D-PEX.45: PEX_DeleteElementsToLabel
-XRequest.X3D-PEX.46: PEX_DeleteBetweenLabels
-XRequest.X3D-PEX.47: PEX_CopyElements
-XRequest.X3D-PEX.48: PEX_ChangeStructureRefs
-XRequest.X3D-PEX.49: PEX_CreateNameSet
-XRequest.X3D-PEX.50: PEX_CopyNameSet
-XRequest.X3D-PEX.51: PEX_FreeNameSet
-XRequest.X3D-PEX.52: PEX_GetNameSet
-XRequest.X3D-PEX.53: PEX_ChangeNameSet
-XRequest.X3D-PEX.54: PEX_CreateSearchContext
-XRequest.X3D-PEX.55: PEX_CopySearchContext
-XRequest.X3D-PEX.56: PEX_FreeSearchContext
-XRequest.X3D-PEX.57: PEX_GetSearchContext
-XRequest.X3D-PEX.58: PEX_ChangeSearchContext
-XRequest.X3D-PEX.59: PEX_SearchNetwork
-XRequest.X3D-PEX.60: PEX_CreatePhigsWks
-XRequest.X3D-PEX.61: PEX_FreePhigsWks
-XRequest.X3D-PEX.62: PEX_GetWksInfo
-XRequest.X3D-PEX.63: PEX_GetDynamics
-XRequest.X3D-PEX.64: PEX_GetViewRep
-XRequest.X3D-PEX.65: PEX_RedrawAllStructures
-XRequest.X3D-PEX.66: PEX_UpdateWorkstation
-XRequest.X3D-PEX.67: PEX_RedrawClipRegion
-XRequest.X3D-PEX.68: PEX_ExecuteDeferredActions
-XRequest.X3D-PEX.69: PEX_SetViewPriority
-XRequest.X3D-PEX.70: PEX_SetDisplayUpdateMode
-XRequest.X3D-PEX.71: PEX_MapDCtoWC
-XRequest.X3D-PEX.72: PEX_MapWCtoDC
-XRequest.X3D-PEX.73: PEX_SetViewRep
-XRequest.X3D-PEX.74: PEX_SetWksWindow
-XRequest.X3D-PEX.75: PEX_SetWksViewport
-XRequest.X3D-PEX.76: PEX_SetHlhsrMode
-XRequest.X3D-PEX.77: PEX_SetWksBufferMode
-XRequest.X3D-PEX.78: PEX_PostStructure
-XRequest.X3D-PEX.79: PEX_UnpostStructure
-XRequest.X3D-PEX.80: PEX_UnpostAllStructures
-XRequest.X3D-PEX.81: PEX_GetWksPostings
-XRequest.X3D-PEX.82: PEX_GetPickDevice
-XRequest.X3D-PEX.83: PEX_ChangePickDevice
-XRequest.X3D-PEX.84: PEX_CreatePickMeasure
-XRequest.X3D-PEX.85: PEX_FreePickMeasure
-XRequest.X3D-PEX.86: PEX_GetPickMeasure
-XRequest.X3D-PEX.87: PEX_UpdatePickMeasure
-XRequest.X3D-PEX.88: PEX_OpenFont
-XRequest.X3D-PEX.89: PEX_CloseFont
-XRequest.X3D-PEX.90: PEX_QueryFont
-XRequest.X3D-PEX.91: PEX_ListFonts
-XRequest.X3D-PEX.92: PEX_ListFontsWithInfo
-XRequest.X3D-PEX.93: PEX_QueryTextExtents
-XRequest.X3D-PEX.94: PEX_MatchRenderingTargets
-XRequest.X3D-PEX.95: PEX_Escape
-XRequest.X3D-PEX.96: PEX_EscapeWithReply
-XRequest.X3D-PEX.97: PEX_RenderElements
-XRequest.X3D-PEX.98: PEX_AccumulateState
-XRequest.X3D-PEX.99: PEX_BeginPickOne
-XRequest.X3D-PEX.100: PEX_EndPickOne
-XRequest.X3D-PEX.101: PEX_PickOne
-XRequest.X3D-PEX.102: PEX_BeginPickAll
-XRequest.X3D-PEX.103: PEX_EndPickAll
-XRequest.X3D-PEX.104: PEX_PickAll
-XProtoError.X3D-PEX.0: PEXColorTypeError
-XlibMessage.X3D-PEX.0: Color type in failed request:  0x%lx
-XProtoError.X3D-PEX.1: PEXRendererStateError
-XlibMessage.X3D-PEX.1: Renderer id in failed request:  0x%lx
-XProtoError.X3D-PEX.2: PEXFloatingPointFormatError
-XlibMessage.X3D-PEX.2: Format in failed request:  0x%lx
-XProtoError.X3D-PEX.3: PEXLabelError
-XlibMessage.X3D-PEX.3: Label in failed request:  0x%lx
-XProtoError.X3D-PEX.4: PEXLookupTableError
-XlibMessage.X3D-PEX.4: Table id in failed request:  0x%lx
-XProtoError.X3D-PEX.5: PEXNameSetError
-XlibMessage.X3D-PEX.5: Nameset in failed request:  0x%lx
-XProtoError.X3D-PEX.6: PEXPathError
-XlibMessage.X3D-PEX.6: Path id in failed request:  0x%lx
-XProtoError.X3D-PEX.7: PEXFontError
-XlibMessage.X3D-PEX.7: Font id in failed request:  0x%lx
-XProtoError.X3D-PEX.8: PEXPhigsWksError
-XlibMessage.X3D-PEX.8: Workstation id in failed request:  0x%lx
-XProtoError.X3D-PEX.9: PEXPickMeasureError
-XlibMessage.X3D-PEX.9: Device id in failed request:  0x%lx
-XProtoError.X3D-PEX.10: PEXPipelineContextError
-XlibMessage.X3D-PEX.10: Context id in failed request:  0x%lx
-XProtoError.X3D-PEX.11: PEXRendererError
-XlibMessage.X3D-PEX.11: Renderer id in failed request:  0x%lx
-XProtoError.X3D-PEX.12: PEXSearchContextError
-XlibMessage.X3D-PEX.12: Context id in failed request:  0x%lx
-XProtoError.X3D-PEX.13: PEXStructureError
-XlibMessage.X3D-PEX.13: Structure id in failed request:  0x%lx
-XProtoError.X3D-PEX.14: PEXOutputCommandError
-XlibMessage.X3D-PEX.14: Resource id in failed request:  0x%lx
-! XTEST extension, an X Consortium standard
-XRequest.XTEST.0: X_XTestGetVersion
-XRequest.XTEST.1: X_XTestCompareCursor
-XRequest.XTEST.2: X_XTestFakeInput
-! BIG-REQUESTS extension, an X Consortium standard
-XRequest.BIG-REQUESTS.0: X_BigReqEnable
-! XIE extension, an X Consortium standard
-XRequest.XIE.1: XIE_QueryImageExtension
-XRequest.XIE.2: XIE_QueryTechniques
-XRequest.XIE.3: XIE_CreateColorList
-XRequest.XIE.4: XIE_DestroyColorList
-XRequest.XIE.5: XIE_PurgeColorList
-XRequest.XIE.6: XIE_QueryColorList
-XRequest.XIE.7: XIE_CreateLUT
-XRequest.XIE.8: XIE_DestroyLUT
-XRequest.XIE.9: XIE_CreatePhotomap
-XRequest.XIE.10: XIE_DestroyPhotomap
-XRequest.XIE.11: XIE_QueryPhotomap
-XRequest.XIE.12: XIE_CreateROI
-XRequest.XIE.13: XIE_DestroyROI
-XRequest.XIE.14: XIE_CreatePhotospace
-XRequest.XIE.15: XIE_DestroyPhotospace
-XRequest.XIE.16: XIE_ExecuteImmediate
-XRequest.XIE.17: XIE_CreatePhotoflo
-XRequest.XIE.18: XIE_DestroyPhotoflo
-XRequest.XIE.19: XIE_ExecutePhotoflo
-XRequest.XIE.20: XIE_ModifyPhotoflo
-XRequest.XIE.21: XIE_RedefinePhotoflo
-XRequest.XIE.22: XIE_PutClientData
-XRequest.XIE.23: XIE_GetClientData
-XRequest.XIE.24: XIE_QueryPhotoflo
-XRequest.XIE.25: XIE_Await
-XRequest.XIE.26: XIE_Abort
-XProtoError.XIE.0: XIE_ColorListError
-XlibMessage.XIE.0: ColorList in failed request:  0x%lx
-XProtoError.XIE.1: XIE_LUTError
-XlibMessage.XIE.1: LUT in failed request:  0x%lx
-XProtoError.XIE.2: XIE_PhotofloError
-XlibMessage.XIE.2: Photoflo in failed request:  0x%lx
-XProtoError.XIE.3: XIE_PhotomapError
-XlibMessage.XIE.3: Photomap in failed request:  0x%lx
-XProtoError.XIE.4: XIE_PhotospaceError
-XlibMessage.XIE.4: Photospace in failed request:  0x%lx
-XProtoError.XIE.5: XIE_ROIError
-XlibMessage.XIE.5: ROI in failed request:  0x%lx
-XProtoError.XIE.6: XIE_FloError
-XlibMessage.XIE.6: Photoflo in failed request:  0x%lx
-! SYNC extension, an X Consortium standard
-XRequest.SYNC.0: X_SyncInitialize
-XRequest.SYNC.1: X_SyncListSystemCounters
-XRequest.SYNC.2: X_SyncCreateCounter
-XRequest.SYNC.3: X_SyncSetCounter
-XRequest.SYNC.4: X_SyncChangeCounter
-XRequest.SYNC.5: X_SyncQueryCounter
-XRequest.SYNC.6: X_SyncDestroyCounter
-XRequest.SYNC.7: X_SyncAwait
-XRequest.SYNC.8: X_SyncCreateAlarm
-XRequest.SYNC.9: X_SyncChangeAlarm
-XRequest.SYNC.10: X_SyncQueryAlarm
-XRequest.SYNC.11: X_SyncDestroyAlarm
-XRequest.SYNC.12: X_SyncSetPriority
-XRequest.SYNC.13: X_SyncGetPriority
-XProtoError.SYNC.0: XSyncBadCounter
-XlibMessage.SYNC.0: Counter in failed request:  0x%lx
-XProtoError.SYNC.1: XSyncBadAlarm
-XlibMessage.SYNC.1: Alarm in failed request:  0x%lx
-! XKB extension
-XRequest.XKEYBOARD.0: XkbUseExtension
-XRequest.XKEYBOARD.1: XkbSelectEvents
-XRequest.XKEYBOARD.2: OBSOLETE
-XRequest.XKEYBOARD.3: XkbBell
-XRequest.XKEYBOARD.4: XkbGetState
-XRequest.XKEYBOARD.5: XkbLatchLockState
-XRequest.XKEYBOARD.6: XkbGetControls
-XRequest.XKEYBOARD.7: XkbSetControls
-XRequest.XKEYBOARD.8: XkbGetMap
-XRequest.XKEYBOARD.9: XkbSetMap
-XRequest.XKEYBOARD.10: XkbGetCompatMap
-XRequest.XKEYBOARD.11: XkbSetCompatMap
-XRequest.XKEYBOARD.12: XkbGetIndicatorState
-XRequest.XKEYBOARD.13: XkbGetIndicatorMap
-XRequest.XKEYBOARD.14: XkbSetIndicatorMap
-XRequest.XKEYBOARD.15: XkbGetNamedIndicator
-XRequest.XKEYBOARD.16: XkbSetNamedIndicator
-XRequest.XKEYBOARD.17: XkbGetNames
-XRequest.XKEYBOARD.18: XkbSetNames
-XRequest.XKEYBOARD.19: XkbGetGeometry
-XRequest.XKEYBOARD.20: XkbSetGeometry
-XRequest.XKEYBOARD.21: XkbPerClientFlags
-XRequest.XKEYBOARD.22: XkbListComponents
-XRequest.XKEYBOARD.23: XkbGetKbdByName
-XRequest.XKEYBOARD.24: XkbGetDeviceInfo
-XRequest.XKEYBOARD.25: XkbSetDeviceInfo
-XRequest.XKEYBOARD.101: XkbSetDebuggingFlags
-XProtoError.XKEYBOARD.0: XkbBadKeyboard
-XlibMessage.XKEYBOARD.0: Device id in failed request:  0x%lx
-! GLX extension for OpenGL, an OpenGL Architectural Review Board standard
-! GLX Commands
-XRequest.GLX.7: X_GLXQueryVersion
-XRequest.GLX.3: X_GLXCreateContext
-XRequest.GLX.4: X_GLXDestroyContext
-XRequest.GLX.5: X_GLXMakeCurrent
-XRequest.GLX.6: X_GLXIsDirect
-XRequest.GLX.10: X_GLXCopyContext
-XRequest.GLX.8: X_GLXWaitGL
-XRequest.GLX.9: X_GLXWaitX
-XRequest.GLX.11: X_GLXSwapBuffers
-XRequest.GLX.12: X_GLXUseXFont
-XRequest.GLX.13: X_GLXCreateGLXPixmap
-XRequest.GLX.15: X_GLXDestroyGLXPixmap
-XRequest.GLX.14: X_GLXGetVisualConfigs
-XRequest.GLX.16: X_GLXVendorPrivate
-XRequest.GLX.17: X_GLXVendorPrivateWithReply
-XRequest.GLX.18: X_GLXQueryExtensionsString
-XRequest.GLX.19: X_GLXQueryServerString
-XRequest.GLX.20: X_GLXClientInfo
-! GL Non-rendering Commands
-XRequest.GLX.103: X_GLXDeleteLists
-XRequest.GLX.102: X_GLXEndList
-XRequest.GLX.105: X_GLXFeedbackBuffer
-XRequest.GLX.108: X_GLXFinish
-XRequest.GLX.142: X_GLXFlush
-XRequest.GLX.104: X_GLXGenLists
-XRequest.GLX.112: X_GLXGetBooleanv
-XRequest.GLX.113: X_GLXGetClipPlane
-XRequest.GLX.114: X_GLXGetDoublev
-XRequest.GLX.115: X_GLXGetError
-XRequest.GLX.116: X_GLXGetFloatv
-XRequest.GLX.117: X_GLXGetIntegerv
-XRequest.GLX.118: X_GLXGetLightfv
-XRequest.GLX.119: X_GLXGetLightiv
-XRequest.GLX.120: X_GLXGetMapdv
-XRequest.GLX.121: X_GLXGetMapfv
-XRequest.GLX.122: X_GLXGetMapiv
-XRequest.GLX.123: X_GLXGetMaterialfv
-XRequest.GLX.124: X_GLXGetMaterialiv
-XRequest.GLX.125: X_GLXGetPixelfv
-XRequest.GLX.126: X_GLXGetPixelMapuiv
-XRequest.GLX.127: X_GLXGetPixelMapusv
-XRequest.GLX.129: X_GLXGetString
-XRequest.GLX.130: X_GLXGetTexEnvfv
-XRequest.GLX.131: X_GLXGetTexEnviv
-XRequest.GLX.132: X_GLXGetTexGendv
-XRequest.GLX.133: X_GLXGetTexGenfv
-XRequest.GLX.134: X_GLXGetTexGeniv
-XRequest.GLX.138: X_GLXGetTexLevelParameterfv
-XRequest.GLX.139: X_GLXGetTexLevelParameteriv
-XRequest.GLX.136: X_GLXGetTexParameterfv
-XRequest.GLX.137: X_GLXGetTexParameteriv
-XRequest.GLX.140: X_GLXIsEnabled
-XRequest.GLX.141: X_GLXIsList
-XRequest.GLX.101: X_GLXNewList
-XRequest.GLX.109: X_GLXPixelStoref
-XRequest.GLX.110: X_GLXPixelStorei
-XRequest.GLX.107: X_GLXRenderMode
-XRequest.GLX.106: X_GLXSelectBuffer
-! GL Non-rendering Commands That Return Pixel Data
-XRequest.GLX.128: X_GLXGetPolygonStipple
-XRequest.GLX.135: X_GLXGetTexImage
-XRequest.GLX.111: X_GLXReadPixels
-! GL Rendering Commands
-XRequest.GLX.1: X_GLXRender
-XRequest.GLX.2: X_GLXRenderLarge
-! GLX Errors
-XProtoError.GLX.0: GLXBadContext
-XProtoError.GLX.1: GLXBadContextState
-XProtoError.GLX.2: GLXBadDrawable
-XProtoError.GLX.3: GLXBadPixmap
-XProtoError.GLX.4: GLXBadContextTag
-XProtoError.GLX.5: GLXBadCurrentWindow
-XProtoError.GLX.6: GLXBadRenderRequest
-XProtoError.GLX.7: GLXBadLargeRequest
-XProtoError.GLX.8: GLXUnsupportedPrivateRequest
-! XC-MISC extension, an X Consortium standard
-XRequest.XC-MISC.0: XCMiscGetVersion
-XRequest.XC-MISC.1: XCMiscGetXIDRange
-! RECORD extension
-XRequest.RECORD.0: XRecordQueryVersion
-XRequest.RECORD.1: XRecordCreateContext
-XRequest.RECORD.2: XRecordRegisterClients
-XRequest.RECORD.3: XRecordUnregisterClients
-XRequest.RECORD.4: XRecordGetContext
-XRequest.RECORD.5: XRecordEnableContext
-XRequest.RECORD.6: XRecordDisableContext
-XRequest.RECORD.7: XRecordFreeContext
-XProtoError.RECORD.0: XRecordBadContext
-XlibMessage.RECORD.0: Context in failed request:  0x%lx
-! XFree86-VidModeExtension  -- not an X Consortium standard
-XRequest.XFree86-VidModeExtension.0: XF86VidModeQueryVersion
-XRequest.XFree86-VidModeExtension.1: XF86VidModeGetModeLine
-XRequest.XFree86-VidModeExtension.2: XF86VidModeModModeLine
-XRequest.XFree86-VidModeExtension.3: XF86VidModeSwitchMode
-XRequest.XFree86-VidModeExtension.4: XF86VidModeGetMonitor
-XRequest.XFree86-VidModeExtension.5: XF86VidModeLockModeSwitch
-XRequest.XFree86-VidModeExtension.6: XF86VidModeGetAllModeLines
-XRequest.XFree86-VidModeExtension.7: XF86VidModeAddModeLine
-XRequest.XFree86-VidModeExtension.8: XF86VidModeDeleteModeLine
-XRequest.XFree86-VidModeExtension.9: XF86VidModeValidateModeLine
-XRequest.XFree86-VidModeExtension.10: XF86VidModeSwitchToMode
-XRequest.XFree86-VidModeExtension.11: XF86VidModeGetViewPort
-XRequest.XFree86-VidModeExtension.12: XF86VidModeSetViewPort
-XRequest.XFree86-VidModeExtension.13: XF86VidModeGetDotClocks
-XRequest.XFree86-VidModeExtension.14: XF86VidModeSetClientVersion
-XRequest.XFree86-VidModeExtension.15: XF86VidModeSetGamma
-XRequest.XFree86-VidModeExtension.16: XF86VidModeGetGamma
-XProtoError.XFree86-VidModeExtension.0: XF86VidModeBadClock
-XProtoError.XFree86-VidModeExtension.1: XF86VidModeBadHTimings
-XProtoError.XFree86-VidModeExtension.2: XF86VidModeBadVTimings
-XProtoError.XFree86-VidModeExtension.3: XF86VidModeModeUnsuitable
-XProtoError.XFree86-VidModeExtension.4: XF86VidModeClientNotLocal
-XProtoError.XFree86-VidModeExtension.5: XF86VidModeExtensionDisabled
-XProtoError.XFree86-VidModeExtension.6: XF86VidModeZoomLocked
-! XFree86-Misc -- not an X Consortium standard
-XRequest.XFree86-Misc.0: XF86MiscQueryVersion
-XRequest.XFree86-Misc.1: XF86MiscGetSaver
-XRequest.XFree86-Misc.2: XF86MiscSetSaver
-XRequest.XFree86-Misc.3: XF86MiscGetMouseSettings
-XRequest.XFree86-Misc.4: XF86MiscGetKbdSettings
-XRequest.XFree86-Misc.5: XF86MiscSetMouseSettings
-XRequest.XFree86-Misc.6: XF86MiscSetKbdSettings
-XProtoError.XFree86-Misc.0: XF86MiscBadMouseProtocol
-XProtoError.XFree86-Misc.1: XF86MiscBadMouseBaudRate
-XProtoError.XFree86-Misc.2: XF86MiscBadMouseFlags
-XProtoError.XFree86-Misc.3: XF86MiscBadMouseCombo
-XProtoError.XFree86-Misc.4: XF86MiscBadKbdType
-XProtoError.XFree86-Misc.5: XF86MiscModInDevDisabled
-XProtoError.XFree86-Misc.6: XF86MiscModInDevClientNotLocal
-! XFree86-DGA  -- not an X Consortium standard
-XRequest.XFree86-DGA.0: XDGAQueryVersion
-XRequest.XFree86-DGA.1: XF86DGAGetVideoLL
-XRequest.XFree86-DGA.2: XF86DGADirectVideo
-XRequest.XFree86-DGA.3: XF86DGAGetViewPortSize
-XRequest.XFree86-DGA.4: XF86DGASetViewPort
-XRequest.XFree86-DGA.5: XF86DGAGetVidPage
-XRequest.XFree86-DGA.6: XF86DGASetVidPage
-XRequest.XFree86-DGA.7: XF86DGAInstallColormap
-XRequest.XFree86-DGA.8: XF86DGAQueryDirectVideo
-XRequest.XFree86-DGA.9: XF86DGAViewPortChanged
-XRequest.XFree86-DGA.10: XF86DGAObsolete1
-XRequest.XFree86-DGA.11: XF86DGAObsolete2
-XRequest.XFree86-DGA.12: XDGAQueryModes
-XRequest.XFree86-DGA.13: XDGASetMode
-XRequest.XFree86-DGA.14: XDGASetViewport
-XRequest.XFree86-DGA.15: XDGAInstallColormap
-XRequest.XFree86-DGA.16: XDGASelectInput
-XRequest.XFree86-DGA.17: XDGAFillRectangle
-XRequest.XFree86-DGA.18: XDGACopyArea
-XRequest.XFree86-DGA.19: XDGACopyTransparentArea
-XRequest.XFree86-DGA.20: XDGAGetViewportStatus
-XRequest.XFree86-DGA.21: XDGASync
-XRequest.XFree86-DGA.22: XDGAOpenFramebuffer
-XRequest.XFree86-DGA.23: XDGACloseFramebuffer
-XRequest.XFree86-DGA.24: XDGASetClientVersion
-XRequest.XFree86-DGA.25: XDGAChangePixmapMode
-XRequest.XFree86-DGA.26: XDGACreateColormap
-XProtoError.XFree86-DGA.0: XF86DGAClientNotLocal
-XProtoError.XFree86-DGA.1: XF86DGANoDirectVideoMode
-XProtoError.XFree86-DGA.2: XF86DGAScreenNotActive
-XProtoError.XFree86-DGA.3: XF86DGADirectNotActivated
-XProtoError.XFree86-DGA.4: XF86DGAOperationNotSupported
-! DOUBLE-BUFFER (DBE), an X Consortium standard
-XRequest.DOUBLE-BUFFER.0: DBEGetVersion
-XRequest.DOUBLE-BUFFER.1: DBEAllocateBackBufferName
-XRequest.DOUBLE-BUFFER.2: DBEDeallocateBackBufferName
-XRequest.DOUBLE-BUFFER.3: DBESwapBuffers
-XRequest.DOUBLE-BUFFER.4: DBEBeginIdiom
-XRequest.DOUBLE-BUFFER.5: DBEEndIdiom
-XRequest.DOUBLE-BUFFER.6: DBEGetVisualInfo
-XRequest.DOUBLE-BUFFER.7: DBEGetBackBufferAttributes
-XProtoError.DOUBLE-BUFFER.0: DBEBadBuffer  (invalid BackBuffer parameter)
-XlibMessage.DOUBLE-BUFFER.0: BackBuffer in failed request:  0x%lx
-! SECURITY
-XRequest.SECURITY.0: SecurityQueryVersion
-XRequest.SECURITY.1: SecurityGenerateAuthorization
-XProtoError.SECURITY.0: SecurityBadAuthorization  (invalid authorization id)
-XProtoError.SECURITY.1: SecurityBadAuthorizationProtocol  (invalid authorization name or data)
-XlibMessage.SECURITY.1: authorization id in failed request:  0x%lx
-! AppGroup
-XRequest.APPGROUP.0: XagQueryVersion
-XRequest.APPGROUP.1: XagCreate
-XRequest.APPGROUP.2: XagDestroy
-XRequest.APPGROUP.3: XagGetAttr
-XRequest.APPGROUP.4: XagQuery
-XRequest.APPGROUP.5: XagCreateAssoc
-XRequest.APPGROUP.6: XagDestroyAssoc
-XProtoError.APPGROUP.0: XagBadAppGroup  (invalid AppGroup parameter)
-! LBX
-XRequest.LBX.0: LbxQueryVersion
-XRequest.LBX.1: LbxStartProxy
-XRequest.LBX.2: LbxStopProxy
-XRequest.LBX.3: LbxSwitch
-XRequest.LBX.4: LbxNewClient
-XRequest.LBX.5: LbxCloseClient
-XRequest.LBX.6: LbxModifySequence
-XRequest.LBX.7: LbxAllowMotion
-XRequest.LBX.8: LbxIncrementPixel
-XRequest.LBX.9: LbxDelta
-XRequest.LBX.10: LbxGetModifierMapping
-XRequest.LBX.11: LbxQueryTag
-XRequest.LBX.12: LbxInvalidateTag
-XRequest.LBX.13: LbxPolyPoint
-XRequest.LBX.14: LbxPolyLine
-XRequest.LBX.15: LbxPolySegment
-XRequest.LBX.16: LbxPolyRectangle
-XRequest.LBX.17: LbxPolyArc
-XRequest.LBX.18: LbxFillPoly
-XRequest.LBX.19: LbxPolyFillRectangle
-XRequest.LBX.20: LbxPolyFillArc
-XRequest.LBX.21: LbxGetKeyboardMapping
-XRequest.LBX.22: LbxQueryFont
-XRequest.LBX.23: LbxChangeProperty
-XRequest.LBX.24: LbxGetProperty
-XRequest.LBX.25: LbxTagData
-XRequest.LBX.26: LbxCopyArea
-XRequest.LBX.27: LbxCopyPlane
-XRequest.LBX.28: LbxPolyText8
-XRequest.LBX.29: LbxPolyText16
-XRequest.LBX.30: LbxImageText8
-XRequest.LBX.31: LbxImageText16
-XRequest.LBX.32: LbxQueryExtension
-XRequest.LBX.33: LbxPutImage
-XRequest.LBX.34: LbxGetImage
-XRequest.LBX.35: LbxBeginLargeRequest
-XRequest.LBX.36: LbxLargeRequestData
-XRequest.LBX.37: LbxEndLargeRequest
-XRequest.LBX.38: LbxInternAtoms
-XRequest.LBX.39: LbxGetWinAttrAndGeom
-XRequest.LBX.40: LbxGrabCmap
-XRequest.LBX.41: LbxReleaseCmap
-XRequest.LBX.42: LbxAllocColor
-XRequest.LBX.43: LbxSync
-XProtoError.LBX.0: BadLbxClient
-! XpExtension
-XRequest.XpExtension.0: PrintQueryVersion
-XRequest.XpExtension.1: PrintGetPrinterList
-XRequest.XpExtension.2: PrintCreateContext
-XRequest.XpExtension.3: PrintSetContext
-XRequest.XpExtension.4: PrintGetContext
-XRequest.XpExtension.5: PrintDestroyContext
-XRequest.XpExtension.6: PrintGetContextScreen
-XRequest.XpExtension.7: PrintStartJob
-XRequest.XpExtension.8: PrintEndJob
-XRequest.XpExtension.9: PrintStartDoc
-XRequest.XpExtension.10: PrintEndDoc
-XRequest.XpExtension.11: PrintPutDocumentData
-XRequest.XpExtension.12: PrintGetDocumentData
-XRequest.XpExtension.13: PrintStartPage
-XRequest.XpExtension.14: PrintEndPage
-XRequest.XpExtension.15: PrintSelectInput
-XRequest.XpExtension.16: PrintInputSelected
-XRequest.XpExtension.17: PrintGetAttributes
-XRequest.XpExtension.18: PrintSetAttributes
-XRequest.XpExtension.19: PrintGetOneAttribute
-XRequest.XpExtension.20: PrintRehashPrinterList
-XRequest.XpExtension.21: PrintGetPageDimensions
-XRequest.XpExtension.22: PrintQueryScreens
-XRequest.XpExtension.23: PrintSetImageResolution
-XRequest.XpExtension.24: PrintGetImageResolution
-XProtoError.XpExtension.0: XPBadContext (Print Context invalid or missing)
-XlibMessage.XpExtension.0: Context in failed request:  0x%lx
-XProtoError.XpExtension.1: XPBadSequence (Illegal sequence of XP operations)
-XProtoError.XpExtension.2: XPBadResourceID (X resource not valid)
-! TOG-CUP, an X Project Team specification
-XRequest.TOG-CUP.0: CUPQueryVersion
-XRequest.TOG-CUP.1: CUPGetReservedColormapEntries
-XRequest.TOG-CUP.2: CUPStoreColors
-! Extended-Visual-Information, an X Project Team specification
-XRequest.Extended-Visual-Information.0: EVIQueryVersion
-XRequest.Extended-Visual-Information.1: EVIGetVisualInfo
-! DPMS (Display Power Management Signaling), an X Project Team specification
-XRequest.DPMS.0: DPMSGetVersion
-XRequest.DPMS.1: DPMSCapable
-XRequest.DPMS.2: DPMSGetTimeouts
-XRequest.DPMS.3: DPMSSetTimeouts
-XRequest.DPMS.4: DPMSEnable
-XRequest.DPMS.5: DPMSDisable
-XRequest.DPMS.6: DPMSForceLevel
-XRequest.DPMS.7: DPMSInfo
-! XINERAMA, not an X Project Team specification
-XRequest.XINERAMA.0: XINERAMAQueryVersion
-XRequest.XINERAMA.1: XINERAMAGetState
-XRequest.XINERAMA.2: XINERAMAGetScreenCount
-XRequest.XINERAMA.3: XINERAMAGetScreenSize
-! XF86Rush extension, not a standard spec
diff --git a/xc/lib/X11/XKB.c b/xc/lib/X11/XKB.c
deleted file mode 100644
index 5865e870d..000000000
--- a/xc/lib/X11/XKB.c
+++ /dev/null
@@ -1,929 +0,0 @@
-/* $TOG: XKB.c /main/23 1997/11/10 15:13:33 kaleb $ */
-/************************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-/* $XFree86: xc/lib/X11/XKB.c,v 1.3 1999/05/09 10:50:23 dawes Exp $ */
-
-#include <stdio.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
-#include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
-#include "XKBlibint.h"
-
-XkbInternAtomFunc	_XkbInternAtomFunc= XInternAtom;
-XkbGetAtomNameFunc	_XkbGetAtomNameFunc= XGetAtomName;
-
-Bool 
-#if NeedFunctionPrototypes
-XkbQueryExtension(	Display *dpy,
-			int *	opcodeReturn,
-			int *	eventBaseReturn,
-			int *	errorBaseReturn,
-			int *	majorReturn,
-			int *	minorReturn)
-#else
-XkbQueryExtension(dpy,opcodeReturn,eventBaseReturn,errorBaseReturn,
-						majorReturn,minorReturn)
-    Display *dpy;
-    int *opcodeReturn;
-    int *eventBaseReturn;
-    int *errorBaseReturn;
-    int *majorReturn;
-    int *minorReturn;
-#endif
-{
-    if (!XkbUseExtension(dpy,majorReturn,minorReturn))
-	return False;
-    if (opcodeReturn)
-	*opcodeReturn = dpy->xkb_info->codes->major_opcode;
-    if (eventBaseReturn)
-	*eventBaseReturn = dpy->xkb_info->codes->first_event;
-    if (errorBaseReturn)
-	*errorBaseReturn = dpy->xkb_info->codes->first_error;
-    if (majorReturn)
-	*majorReturn = dpy->xkb_info->srv_major;
-    if (minorReturn)
-	*minorReturn = dpy->xkb_info->srv_minor;
-    return True;
-}
-
-Bool 
-#if NeedFunctionPrototypes
-XkbLibraryVersion(int *libMajorRtrn,int *libMinorRtrn)
-#else
-XkbLibraryVersion(libMajorRtrn,libMinorRtrn)
-    int *libMajorRtrn;
-    int *libMinorRtrn;
-#endif
-{
-int supported;
-
-    if (*libMajorRtrn != XkbMajorVersion) {
-	/* version 0.65 is (almost) compatible with 1.00 */
-	if ((XkbMajorVersion==1)&&(((*libMajorRtrn)==0)&&((*libMinorRtrn)==65)))
-	     supported= True;
-	else supported= False;
-    }
-    else { 
-	supported = True;
-    }
-
-    *libMajorRtrn = XkbMajorVersion;
-    *libMinorRtrn = XkbMinorVersion;
-    return supported;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbSelectEvents(	Display *	dpy,
-			unsigned int 	deviceSpec,
-			unsigned int 	affect,
-			unsigned int 	selectAll)
-#else
-XkbSelectEvents(dpy,deviceSpec,affect,selectAll)
-    Display *dpy;
-    unsigned int deviceSpec;
-    unsigned int affect;
-    unsigned int selectAll;
-#endif
-{
-    register xkbSelectEventsReq *req;
-    XkbInfoPtr xkbi;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    xkbi->selected_events&= ~affect;
-    xkbi->selected_events|= (affect&selectAll);
-    GetReq(kbSelectEvents, req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbSelectEvents;
-    req->deviceSpec = deviceSpec;
-    req->affectWhich = (CARD16)affect;
-    req->clear = affect&(~selectAll);
-    req->selectAll = affect&selectAll;
-    if (affect&XkbMapNotifyMask) {
-	req->affectMap= XkbAllMapComponentsMask;
-	/* the implicit support needs the client info */
-	/* even if the client itself doesn't want it */
-	if (selectAll&XkbMapNotifyMask)
-	     req->map= XkbAllMapEventsMask;
-	else req->map= XkbAllClientInfoMask;
-	if (selectAll&XkbMapNotifyMask)
-	     xkbi->selected_map_details= XkbAllMapEventsMask;
-	else xkbi->selected_map_details= 0;
-    }
-    if (affect&XkbNewKeyboardNotifyMask) {
-	if (selectAll&XkbNewKeyboardNotifyMask) 
-	     xkbi->selected_nkn_details= XkbAllNewKeyboardEventsMask;
-	else xkbi->selected_nkn_details= 0;
-	if (!(xkbi->xlib_ctrls&XkbLC_IgnoreNewKeyboards)) {
-	    /* we want it, even if the client doesn't.  Don't mess */
-	    /* around with details -- ask for all of them and throw */
-	    /* away the ones we don't need */
-	    req->selectAll|= XkbNewKeyboardNotifyMask;
-	}
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbSelectEventDetails(	Display *		dpy,
-			unsigned 		deviceSpec,
-			unsigned 		eventType,
-			unsigned long int 	affect,
-			unsigned long int 	details)
-#else
-XkbSelectEventDetails(dpy,deviceSpec,eventType,affect,details)
-    Display *dpy;
-    unsigned deviceSpec;
-    unsigned eventType;
-    unsigned long int affect;
-    unsigned long int details;
-#endif
-{
-    register xkbSelectEventsReq *req;
-    XkbInfoPtr xkbi;
-    int	     size;
-    char     *out;
-    union {
-	CARD8	*c8;
-	CARD16	*c16;
-	CARD32	*c32;
-    } u;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    if (affect&details)	xkbi->selected_events|= (1<<eventType);
-    else		xkbi->selected_events&= ~(1<<eventType);
-    GetReq(kbSelectEvents, req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbSelectEvents;
-    req->deviceSpec = deviceSpec;
-    req->clear= req->selectAll= 0;
-    if (eventType==XkbMapNotify) {
-	/* we need all of the client info, even if the application */
-	/* doesn't.   Make sure that we always request the stuff */
-	/* that the implicit support needs, and just filter out anything */
-	/* the client doesn't want later */
-	req->affectWhich = 0;
-	req->selectAll = 0;
-	req->clear = 0;
-	req->affectMap = (CARD16)affect;
-	req->map = (CARD16)details|(XkbAllClientInfoMask&affect);
-	req->affectWhich = XkbMapNotifyMask;
-	xkbi->selected_map_details&= ~affect;
-	xkbi->selected_map_details|=  (details&affect);
-    }
-    else {
-	req->affectMap = req->map = 0;
-	req->affectWhich= (1<<eventType);
-	switch (eventType) {
-	    case XkbNewKeyboardNotify:
-		xkbi->selected_nkn_details&= ~affect;
-		xkbi->selected_nkn_details|= (details&affect);
-		if (!(xkbi->xlib_ctrls&XkbLC_IgnoreNewKeyboards))
-		    details= (affect&XkbAllNewKeyboardEventsMask);
-	    case XkbStateNotify:
-	    case XkbNamesNotify:
-	    case XkbAccessXNotify:
-	    case XkbExtensionDeviceNotify:
-		size= 2;
-		req->length+= 1;
-		break;
-	    case XkbControlsNotify:
-	    case XkbIndicatorStateNotify:
-	    case XkbIndicatorMapNotify:
-		size= 4;
-		req->length+= 2;
-		break;
-	    case XkbBellNotify:
-	    case XkbActionMessage:
-	    case XkbCompatMapNotify:
-		size= 1;
-		req->length+= 1;
-		break;
-	}
-	BufAlloc(char *,out,(((size*2)+(unsigned)3)/4)*4);
-	u.c8= (CARD8 *)out;
-	if (size==2) {
-	    u.c16[0]= (CARD16)affect;
-	    u.c16[1]= (CARD16)details;
-	}
-	else if (size==4) {
-	    u.c32[0]= (CARD32)affect;
-	    u.c32[1]= (CARD32)details;
-	}
-	else {
-	    u.c8[0]= (CARD8)affect;
-	    u.c8[1]= (CARD8)details;
-	}
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbLockModifiers(	Display *	dpy,
-			unsigned int 	deviceSpec,
-			unsigned int 	affect,
-			unsigned int 	values)
-#else
-XkbLockModifiers(dpy,deviceSpec,affect,values)
-    Display *dpy;
-    unsigned int deviceSpec;
-    unsigned int affect;
-    unsigned int values;
-#endif
-{
-    register xkbLatchLockStateReq *req;
-    XkbInfoPtr xkbi;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbLatchLockState, req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbLatchLockState;
-    req->deviceSpec = deviceSpec;
-    req->affectModLocks= affect;
-    req->modLocks = values;
-    req->lockGroup = False;
-    req->groupLock = 0;
-
-    req->affectModLatches = req->modLatches = 0;
-    req->latchGroup = False;
-    req->groupLatch = 0;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbLatchModifiers(	Display *	dpy,
-			unsigned int	deviceSpec,
-			unsigned int	affect,
-			unsigned int	values)
-#else
-XkbLatchModifiers(dpy,deviceSpec,affect,values)
-    Display *dpy;
-    unsigned int deviceSpec;
-    unsigned int affect;
-    unsigned int values;
-#endif
-{
-    register xkbLatchLockStateReq *req;
-    XkbInfoPtr xkbi;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbLatchLockState, req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbLatchLockState;
-    req->deviceSpec = deviceSpec;
-
-    req->affectModLatches= affect;
-    req->modLatches = values;
-    req->latchGroup = False;
-    req->groupLatch = 0;
-
-    req->affectModLocks = req->modLocks = 0;
-    req->lockGroup = False;
-    req->groupLock = 0;
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbLockGroup(Display *dpy,unsigned int deviceSpec,unsigned int group)
-#else
-XkbLockGroup(dpy,deviceSpec,group)
-    Display *dpy;
-    unsigned int deviceSpec;
-    unsigned int group;
-#endif
-{
-    register xkbLatchLockStateReq *req;
-    XkbInfoPtr xkbi;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbLatchLockState, req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbLatchLockState;
-    req->deviceSpec = deviceSpec;
-    req->affectModLocks= 0;
-    req->modLocks = 0;
-    req->lockGroup = True;
-    req->groupLock = group;
-
-    req->affectModLatches = req->modLatches = 0;
-    req->latchGroup = False;
-    req->groupLatch = 0;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbLatchGroup(Display *dpy,unsigned int deviceSpec,unsigned int group)
-#else
-XkbLatchGroup(dpy,deviceSpec,group)
-    Display *dpy;
-    unsigned int deviceSpec;
-    unsigned int group;
-#endif
-{
-    register xkbLatchLockStateReq *req;
-    XkbInfoPtr xkbi;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbLatchLockState, req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbLatchLockState;
-    req->deviceSpec = deviceSpec;
-
-    req->affectModLatches= 0;
-    req->modLatches = 0;
-    req->latchGroup = True;
-    req->groupLatch = group;
-
-    req->affectModLocks = req->modLocks = 0;
-    req->lockGroup = False;
-    req->groupLock = 0;
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-unsigned
-#if NeedFunctionPrototypes
-XkbSetXlibControls(Display *dpy,unsigned affect,unsigned values)
-#else
-XkbSetXlibControls(dpy,affect,values)
-    Display *	dpy;
-    unsigned	affect;
-    unsigned	values;
-#endif
-{
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    affect&= XkbLC_AllControls;
-    dpy->xkb_info->xlib_ctrls&= ~affect;
-    dpy->xkb_info->xlib_ctrls|= (affect&values);
-    return dpy->xkb_info->xlib_ctrls;
-}
-
-unsigned
-#if NeedFunctionPrototypes
-XkbGetXlibControls(Display *dpy)
-#else
-XkbGetXlibControls(dpy)
-    Display *	dpy;
-#endif
-{
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return 0;
-    return dpy->xkb_info->xlib_ctrls;
-}
-
-unsigned int
-#if NeedFunctionPrototypes
-XkbXlibControlsImplemented(void)
-#else
-XkbXlibControlsImplemented()
-#endif
-{
-#ifdef __sgi
-    return XkbLC_AllControls;
-#else
-    return XkbLC_AllControls&~XkbLC_AllComposeControls;
-#endif
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbSetDebuggingFlags(	Display *	dpy,
-			unsigned int 	mask,
-			unsigned int 	flags,
-			char *		msg,
-			unsigned int	ctrls_mask,
-			unsigned int	ctrls,
-			unsigned int *	rtrn_flags,
-			unsigned int *	rtrn_ctrls)
-#else
-XkbSetDebuggingFlags(dpy,mask,flags,msg,ctrls_mask,ctrls,rtrn_flags,rtrn_ctrls)
-    Display *		dpy;
-    unsigned int 	mask;
-    unsigned int 	flags;
-    char *		msg;
-    unsigned int 	ctrls_mask;
-    unsigned int 	ctrls;
-    unsigned int *	rtrn_flags;
-    unsigned int *	rtrn_ctrls;
-#endif
-{
-    register xkbSetDebuggingFlagsReq *req;
-    xkbSetDebuggingFlagsReply rep;
-    XkbInfoPtr xkbi;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbSetDebuggingFlags, req);
-    req->reqType= 	xkbi->codes->major_opcode;
-    req->xkbReqType=	X_kbSetDebuggingFlags;
-    req->affectFlags=	mask;
-    req->flags= 	flags;
-    req->affectCtrls=	ctrls_mask;
-    req->ctrls= 	ctrls;
-
-    if (msg) {
-	char *out;
-	req->msgLength= (unsigned short)strlen(msg)+1;
-	req->length+= (req->msgLength+(unsigned)3)>>2;
-	BufAlloc(char *,out,((req->msgLength+(unsigned)3)/4)*4);
-	memcpy(out,msg,req->msgLength);
-    }
-    else req->msgLength= 0;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-    if (rtrn_flags)
-	*rtrn_flags= rep.currentFlags;
-    if (rtrn_ctrls)
-	*rtrn_ctrls= rep.currentCtrls;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbComputeEffectiveMap(	XkbDescPtr 	xkb,
-			XkbKeyTypePtr 	type,
-			unsigned char *	map_rtrn)
-#else
-XkbComputeEffectiveMap(xkb,type,map_rtrn)
-    XkbDescPtr		xkb;
-    XkbKeyTypePtr	type;
-    unsigned char *	map_rtrn;
-#endif
-{
-register int 		i;
-unsigned     		tmp;
-XkbKTMapEntryPtr	entry;
-
-    if ((!xkb)||(!type)||(!xkb->server))
-	return False;
-
-    if (type->mods.vmods!=0) {
-	if (!XkbVirtualModsToReal(xkb,type->mods.vmods,&tmp))
-	    return False;
-
-	type->mods.mask= tmp|type->mods.real_mods;
-	entry= type->map;
-	for (i=0;i<type->map_count;i++,entry++) {
-	    tmp= 0;
-	    if (entry->mods.vmods!=0) {
-		if (!XkbVirtualModsToReal(xkb,entry->mods.vmods,&tmp))
-		    return False;
-		if (tmp==0) {
-		    entry->active= False;
-		    continue;
-		}
-	    }
-	    entry->active= True;
-	    entry->mods.mask= (entry->mods.real_mods|tmp)&type->mods.mask;
-	}
-    }
-    else {
-	type->mods.mask= type->mods.real_mods;
-    }
-    if (map_rtrn!=NULL) {
-	bzero(map_rtrn,type->mods.mask+1);
-	for (i=0;i<type->map_count;i++) {
-	    if (entry->active) {
-		map_rtrn[type->map[i].mods.mask]= type->map[i].level;
-	    }
-	}
-    }
-    return True;
-}
-
-Status
-#if NeedFunctionPrototypes
-XkbGetState(Display *dpy,unsigned deviceSpec,XkbStatePtr rtrn)
-#else
-XkbGetState(dpy,deviceSpec,rtrn)
-    Display *	dpy;
-    unsigned 	deviceSpec;
-    XkbStatePtr	rtrn;
-#endif
-{
-    register xkbGetStateReq	*req;
-    xkbGetStateReply rep;
-    XkbInfoPtr xkbi;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return BadAccess;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbGetState, req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbGetState;
-    req->deviceSpec = deviceSpec;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return BadImplementation;
-    }
-    rtrn->mods= 		rep.mods;
-    rtrn->base_mods= 		rep.baseMods;
-    rtrn->latched_mods= 	rep.latchedMods;
-    rtrn->locked_mods= 		rep.lockedMods;
-    rtrn->group= 		rep.group;
-    rtrn->base_group= 		rep.baseGroup;
-    rtrn->latched_group= 	rep.latchedGroup;
-    rtrn->locked_group= 	rep.lockedGroup;
-    rtrn->compat_state= 	rep.compatState;
-    rtrn->grab_mods=		rep.grabMods;
-    rtrn->compat_grab_mods=	rep.compatGrabMods;
-    rtrn->lookup_mods=		rep.lookupMods;
-    rtrn->compat_lookup_mods=	rep.compatLookupMods;
-    rtrn->ptr_buttons=		rep.ptrBtnState;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return Success;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbSetDetectableAutoRepeat(Display *dpy,Bool detectable,Bool *supported)
-#else
-XkbSetDetectableAutoRepeat(dpy,detectable,supported)
-    Display *		dpy;
-    Bool		detectable;
-    Bool *		supported;
-#endif
-{
-register xkbPerClientFlagsReq *	req;
-xkbPerClientFlagsReply 		rep;
-XkbInfoPtr 			xkbi;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbPerClientFlags, req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbPerClientFlags;
-    req->deviceSpec = XkbUseCoreKbd;
-    req->change = XkbPCF_DetectableAutoRepeatMask;
-    if (detectable)
-	 req->value = XkbPCF_DetectableAutoRepeatMask;
-    else req->value = 0;
-    req->ctrlsToChange = req->autoCtrls= req->autoCtrlValues= 0;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    if (supported!=NULL)
-	*supported= ((rep.supported&XkbPCF_DetectableAutoRepeatMask)!=0);
-    return ((rep.value&XkbPCF_DetectableAutoRepeatMask)!=0);
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbGetDetectableAutoRepeat(Display *dpy,Bool *supported)
-#else
-XkbGetDetectableAutoRepeat(dpy,supported)
-    Display *		dpy;
-    Bool *		supported;
-#endif
-{
-register xkbPerClientFlagsReq *	req;
-xkbPerClientFlagsReply 		rep;
-XkbInfoPtr 			xkbi;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbPerClientFlags, req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbPerClientFlags;
-    req->deviceSpec = XkbUseCoreKbd;
-    req->change = 0;
-    req->value = 0;
-    req->ctrlsToChange = req->autoCtrls= req->autoCtrlValues= 0;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    if (supported!=NULL)
-	*supported= ((rep.supported&XkbPCF_DetectableAutoRepeatMask)!=0);
-    return ((rep.value&XkbPCF_DetectableAutoRepeatMask)!=0);
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbSetAutoResetControls(	Display *	dpy,
-				unsigned 	changes,
-				unsigned *	auto_ctrls,
-				unsigned *	auto_values)
-#else
-XkbSetAutoResetControls(dpy,changes,auto_ctrls,auto_values)
-    Display *		dpy;
-    unsigned 		changes;
-    unsigned *		auto_ctrls;
-    unsigned *		auto_values;
-#endif
-{
-register xkbPerClientFlagsReq *	req;
-xkbPerClientFlagsReply 		rep;
-XkbInfoPtr 			xkbi;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbPerClientFlags, req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbPerClientFlags;
-    req->change = XkbPCF_AutoResetControlsMask;
-    req->deviceSpec = XkbUseCoreKbd;
-    req->value = XkbPCF_AutoResetControlsMask;
-    req->ctrlsToChange= changes;
-    req->autoCtrls= *auto_ctrls;
-    req->autoCtrlValues= *auto_values;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    *auto_ctrls= rep.autoCtrls;
-    *auto_values= rep.autoCtrlValues;
-    return ((rep.value&XkbPCF_AutoResetControlsMask)!=0);
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbGetAutoResetControls(	Display *	dpy,
-				unsigned *	auto_ctrls,
-				unsigned *	auto_ctrl_values)
-#else
-XkbGetAutoResetControls(dpy,auto_ctrls,auto_ctrl_values)
-    Display *		dpy;
-    unsigned *		auto_ctrls;
-    unsigned *		auto_ctrl_values;
-#endif
-{
-register xkbPerClientFlagsReq *	req;
-xkbPerClientFlagsReply 		rep;
-XkbInfoPtr 			xkbi;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbPerClientFlags, req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbPerClientFlags;
-    req->deviceSpec = XkbUseCoreKbd;
-    req->change = 0;
-    req->value = 0;
-    req->ctrlsToChange = req->autoCtrls= req->autoCtrlValues= 0;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    if (auto_ctrls)
-	*auto_ctrls= rep.autoCtrls;
-    if (auto_ctrl_values)
-	*auto_ctrl_values= rep.autoCtrlValues;
-    return ((rep.value&XkbPCF_AutoResetControlsMask)!=0);
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbSetPerClientControls(	Display *	dpy,
-				unsigned 	change,
-				unsigned *	values)
-#else
-XkbSetPerClientControls(dpy,change,values)
-    Display *		dpy;
-    unsigned 		change;
-    unsigned *		values;
-#endif
-{
-register xkbPerClientFlagsReq *	req;
-xkbPerClientFlagsReply 		rep;
-XkbInfoPtr 			xkbi;
-unsigned			value_hold = *values;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)) ||
-	(change & ~(XkbPCF_GrabsUseXKBStateMask|XkbPCF_LookupStateWhenGrabbed|XkbPCF_SendEventUsesXKBState)))
-	return False;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbPerClientFlags, req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbPerClientFlags;
-    req->change = change;
-    req->deviceSpec = XkbUseCoreKbd;
-    req->value = *values;
-    req->ctrlsToChange = req->autoCtrls = req->autoCtrlValues= 0;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    *values = rep.value;
-    return ((rep.value&value_hold)!=0);
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbGetPerClientControls(	Display *	dpy,
-				unsigned *	ctrls)
-#else
-XkbGetPerClientControls(dpy,ctrls)
-    Display *		dpy;
-    unsigned *		ctrls;
-#endif
-{
-register xkbPerClientFlagsReq *	req;
-xkbPerClientFlagsReply 		rep;
-XkbInfoPtr 			xkbi;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)) ||
-	(*ctrls & ~(XkbPCF_GrabsUseXKBStateMask|XkbPCF_LookupStateWhenGrabbed|XkbPCF_SendEventUsesXKBState)))
-	return False;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbPerClientFlags, req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbPerClientFlags;
-    req->deviceSpec = XkbUseCoreKbd;
-    req->change = 0;
-    req->value = 0;
-    req->ctrlsToChange = req->autoCtrls= req->autoCtrlValues= 0;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    if (ctrls)
-	*ctrls= ((rep.value & XkbPCF_GrabsUseXKBStateMask) |
-		 XkbPCF_LookupStateWhenGrabbed |
-		 XkbPCF_SendEventUsesXKBState);
-    return (True);
-}
-
-Display *
-#if NeedFunctionPrototypes
-XkbOpenDisplay(	char *	name,
-		int *	ev_rtrn,
-		int *	err_rtrn,
-		int *	major_rtrn,
-		int *	minor_rtrn,
-		int *	reason)
-#else
-XkbOpenDisplay(name,ev_rtrn,err_rtrn,major_rtrn,minor_rtrn,reason)
-    char *	name;
-    int *	ev_rtrn;
-    int *	err_rtrn;
-    int *	major_rtrn;
-    int *	minor_rtrn;
-    int *	reason;
-#endif
-{
-    Display* dpy;
-    int	 major_num,minor_num;
-
-    if ((major_rtrn!=NULL) && (minor_rtrn!=NULL)) {
-	if (!XkbLibraryVersion(major_rtrn,minor_rtrn)) {
-	    if (reason!=NULL)
-		*reason= XkbOD_BadLibraryVersion;
-	    return NULL;
-	}
-    }
-    else {
-	major_num= XkbMajorVersion;
-	minor_num= XkbMinorVersion;
-	major_rtrn= &major_num;
-	minor_rtrn= &minor_num;
-    }
-    dpy= XOpenDisplay(name);
-    if (dpy==NULL) {
-	if (reason!=NULL)
-	    *reason= XkbOD_ConnectionRefused;
-	return NULL;
-    }
-    if (!XkbQueryExtension(dpy,NULL,ev_rtrn,err_rtrn,major_rtrn,minor_rtrn)) {
-	if (reason!=NULL) {
-	    if ((*major_rtrn!=0)||(*minor_rtrn!=0))
-		 *reason= XkbOD_BadServerVersion;
-	    else *reason= XkbOD_NonXkbServer;
-	}
-	XCloseDisplay(dpy);
-	return NULL;
-    }
-    if (reason!=NULL)
-	*reason= XkbOD_Success;
-    return dpy;
-}
-
-void
-#if NeedFunctionPrototypes
-XkbSetAtomFuncs(XkbInternAtomFunc getAtom,XkbGetAtomNameFunc getName)
-#else
-XkbSetAtomFuncs(getAtom,getName)
-    XkbInternAtomFunc	getAtom;
-    XkbGetAtomNameFunc	getName;
-#endif
-{
-    _XkbInternAtomFunc= (getAtom?getAtom:XInternAtom);
-    _XkbGetAtomNameFunc= (getName?getName:XGetAtomName);
-    return;
-}
diff --git a/xc/lib/X11/XKBBell.c b/xc/lib/X11/XKBBell.c
deleted file mode 100644
index b2417d654..000000000
--- a/xc/lib/X11/XKBBell.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/* $XConsortium: XKBBell.c /main/4 1996/01/01 11:25:48 kaleb $ */
-/************************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-
-#include <stdio.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
-#include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
-#include "XKBlibint.h"
-
-
-Bool
-#if NeedFunctionPrototypes
-XkbDeviceBell(	Display *	dpy,
-		Window 		window,
-		int 		deviceID,
-		int 		bellClass,
-		int 		bellID, 
-		int 		percent,
-		Atom 		name)
-#else
-XkbDeviceBell(dpy,window,deviceID,bellClass,bellID,percent,name)
-    Display *dpy;
-    Window window;
-    int deviceID;
-    int bellClass;
-    int bellID;
-    int percent;
-    Atom name;
-#endif
-{
-    register xkbBellReq *req;
-    XkbInfoPtr xkbi;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbBell,req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbBell;
-    req->deviceSpec = deviceID;
-    req->window = (CARD32)window;
-    req->bellClass = (CARD16)bellClass;
-    req->bellID = (CARD16)bellID;
-    req->percent = percent;
-    req->forceSound = False;
-    req->eventOnly = False;
-    req->pitch = 0;
-    req->duration = 0;
-    req->name = (CARD32)name;
-    req->pad1= 0; req->pad2= 0;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbForceDeviceBell(	Display *	dpy,
-			int 		deviceID,
-			int 		bellClass,
-			int 		bellID,
-			int 		percent)
-#else
-XkbForceDeviceBell(dpy,deviceID,bellClass,bellID,percent)
-    Display *dpy;
-    int	deviceID;
-    int	bellClass;
-    int	bellID;
-    int	percent;
-#endif
-{
-    register xkbBellReq *req;
-    XkbInfoPtr xkbi;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbBell,req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbBell;
-    req->deviceSpec = deviceID;
-    req->window = (CARD32)None;
-    req->bellClass = (CARD16)bellClass;
-    req->bellID = (CARD16)bellID;
-    req->percent = percent;
-    req->forceSound = True;
-    req->eventOnly = False;
-    req->pitch = 0;
-    req->duration = 0;
-    req->name = None;
-    req->pad1= 0; req->pad2= 0;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbDeviceBellEvent(	Display *	dpy,
-			Window 		window,
-			int		deviceID,
-			int		bellClass,
-			int		bellID,
-			int		percent,
-			Atom 		name)
-#else
-XkbDeviceBellEvent(dpy,window,deviceID,bellClass,bellID,percent,name)
-    Display *dpy;
-    Window window;
-    int	deviceID;
-    int	bellClass;
-    int	bellID;
-    int	percent;
-    Atom name;
-#endif
-{
-    register xkbBellReq *req;
-    XkbInfoPtr xkbi;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbBell,req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbBell;
-    req->deviceSpec = deviceID;
-    req->window = (CARD32)window;
-    req->bellClass = (CARD16)bellClass;
-    req->bellID = (CARD16)bellID;
-    req->percent = percent;
-    req->forceSound = False;
-    req->eventOnly = True;
-    req->pitch = 0;
-    req->duration = 0;
-    req->name = (CARD32)name;
-    req->pad1= 0; req->pad2= 0;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbBell(Display *dpy,Window window,int percent,Atom name)
-#else
-XkbBell(dpy,window,percent,name)
-    Display *dpy;
-    Window   window;
-    int percent;
-    Atom name;
-#endif
-{
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL))) {
-	XBell(dpy,percent);
-	return False;
-    }
-    return XkbDeviceBell(dpy,window,XkbUseCoreKbd,XkbDfltXIClass,XkbDfltXIId,
-								percent,name);
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbForceBell(Display *dpy,int percent)
-#else
-XkbForceBell(dpy,percent)
-    Display *	dpy;
-    int      	percent;
-#endif
-{
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL))) {
-	XBell(dpy,percent);
-	return False;
-    }
-    return XkbForceDeviceBell(dpy,XkbUseCoreKbd,XkbDfltXIClass,XkbDfltXIId,
-								percent);
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbBellEvent(Display *dpy,Window window,int percent,Atom name)
-#else
-XkbBellEvent(dpy,window,percent,name)
-    Display *dpy;
-    Window   window;
-    int percent;
-    Atom name;
-#endif
-{
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL))) {
-	return False;
-    }
-    /* class 0 = KbdFeedbackClass (X Input Extension) */
-    return XkbDeviceBellEvent(dpy,window,XkbUseCoreKbd,
-					XkbDfltXIClass,XkbDfltXIId,
-					percent,name);
-}
-
diff --git a/xc/lib/X11/XKBBind.c b/xc/lib/X11/XKBBind.c
deleted file mode 100644
index d730790af..000000000
--- a/xc/lib/X11/XKBBind.c
+++ /dev/null
@@ -1,962 +0,0 @@
-/* $TOG: XKBBind.c /main/28 1998/02/06 17:59:23 kaleb $ */
-/*
-
-Copyright 1985, 1987, 1994, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-	/* the new monsters ate the old ones */
-
-#define NEED_EVENTS
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
-#include <X11/keysym.h>
-#include <stdio.h>
-#include <ctype.h>
-
-#include <X11/extensions/XKBproto.h>
-#include "XKBlibint.h"
-
-#ifdef USE_OWN_COMPOSE
-#define	COMPOSE_NO_CONST_MEMBERS
-#include "imComp.h"
-#endif
-
-#define AllMods (ShiftMask|LockMask|ControlMask| \
-		 Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask)
-
-static int _XkbLoadDpy(
-#if NeedFunctionPrototypes
-    Display *dpy
-#endif
-);
-
-struct _XKeytrans {
-	struct _XKeytrans *next;/* next on list */
-	char *string;		/* string to return when the time comes */
-	int len;		/* length of string (since NULL is legit)*/
-	KeySym key;		/* keysym rebound */
-	unsigned int state;	/* modifier state */
-	KeySym *modifiers;	/* modifier keysyms you want */
-	int mlen;		/* length of modifier list */
-};
-
-KeySym
-#if NeedFunctionPrototypes
-XkbKeycodeToKeysym(Display *dpy,
-#if NeedWidePrototypes
-		 unsigned int kc,
-#else
-		 KeyCode kc,
-#endif
-		 int 	group,
-		 int	level)
-#else
-XkbKeycodeToKeysym(dpy, kc, group, level)
-    Display *dpy;
-    KeyCode kc;
-    int group;
-    int level;
-#endif
-{
-    XkbDescRec	*xkb;
-    
-    if (_XkbUnavailable(dpy))
-	return NoSymbol;
-
-    _XkbCheckPendingRefresh(dpy,dpy->xkb_info);
-
-    xkb = dpy->xkb_info->desc;
-    if ((kc<xkb->min_key_code)||(kc>xkb->max_key_code))
-	return NoSymbol;
-
-    if ((group<0)||(level<0)||(group>=XkbKeyNumGroups(xkb,kc)))
-	return NoSymbol;
-    if (level>=XkbKeyGroupWidth(xkb,kc,group)) {
-	/* for compatibility with the core protocol, _always_ allow  */
-	/* two symbols in the first two groups.   If either of the   */
-	/* two is of type ONE_LEVEL, just replicate the first symbol */
-	if ((group>XkbGroup2Index)||(XkbKeyGroupWidth(xkb,kc,group)!=1)||
-								(level!=1)) {
-	    return NoSymbol;
-	}
-	level= 0;
-    }
-    return XkbKeySymEntry(xkb,kc,level,group);
-}
-
-KeySym
-#if NeedFunctionPrototypes
-XKeycodeToKeysym(Display *dpy,
-#if NeedWidePrototypes
-		 unsigned int kc,
-#else
-		 KeyCode kc,
-#endif
-		 int col)
-#else
-XKeycodeToKeysym(dpy, kc, col)
-    Display *dpy;
-    KeyCode kc;
-    int col;
-#endif
-{
-    XkbDescRec	*xkb;
-    
-    if (_XkbUnavailable(dpy))
-	return _XKeycodeToKeysym(dpy, kc, col);
-
-    _XkbCheckPendingRefresh(dpy,dpy->xkb_info);
-
-    xkb = dpy->xkb_info->desc;
-    if ((kc<xkb->min_key_code)||(kc>xkb->max_key_code))
-	return NoSymbol;
-    
-    if (col>3) {
-	int lastSym,tmp,nGrp;
-
-	lastSym= 3;
-	nGrp= XkbKeyNumGroups(xkb,kc);
-	if ((nGrp>0)&&((tmp=XkbKeyGroupWidth(xkb,kc,XkbGroup1Index))>2)) {
-	    if (col<=(lastSym+tmp-2))
-		return XkbKeycodeToKeysym(dpy,kc,XkbGroup1Index,col-lastSym+2);
-	    lastSym+= tmp-2;
-	}
-	if ((nGrp>1)&&((tmp=XkbKeyGroupWidth(xkb,kc,XkbGroup2Index))>2)) {
-	    if (col<=(lastSym+tmp-2))
-		return XkbKeycodeToKeysym(dpy,kc,XkbGroup2Index,col-lastSym+2);
-	    lastSym+= tmp-2;
-	}
-	if (nGrp>2) {
-	    tmp= XkbKeyGroupWidth(xkb,kc,XkbGroup3Index);
-	    if (col<=lastSym+tmp)
-		return XkbKeycodeToKeysym(dpy,kc,XkbGroup3Index,col-lastSym);
-	    lastSym+= tmp;
-	}
-	if (nGrp>3) {
-	    tmp= XkbKeyGroupWidth(xkb,kc,XkbGroup4Index);
-	    if (col<=lastSym+tmp)
-		return XkbKeycodeToKeysym(dpy,kc,XkbGroup4Index,col-lastSym);
-	}
-	return NoSymbol;
-    }
-    return XkbKeycodeToKeysym(dpy,kc,(col>>1),(col&1));
-}
-
-KeyCode
-#if NeedFunctionPrototypes
-XKeysymToKeycode(Display *dpy, KeySym ks)
-#else
-XKeysymToKeycode(dpy, ks)
-    Display *dpy;
-    KeySym ks;
-#endif
-{
-    register int i, j, gotOne;
-
-    if (_XkbUnavailable(dpy))
-	return _XKeysymToKeycode(dpy,ks);
-    _XkbCheckPendingRefresh(dpy,dpy->xkb_info);
-
-    j= 0;
-    do {
-	register XkbDescRec *xkb = dpy->xkb_info->desc;
-	gotOne= 0;
-	for (i = dpy->min_keycode; i <= dpy->max_keycode; i++) {
-	    if ( j<(int)XkbKeyNumSyms(xkb,i) ) {
-		gotOne = 1;
-		if ((XkbKeySym(xkb,i,j)==ks))
-		    return i;
-	    }
-	}
-	j++;
-    } while (gotOne);
-    return 0;
-}
-
-static int
-#if NeedFunctionPrototypes
-_XkbComputeModmap(Display *dpy)
-#else
-_XkbComputeModmap(dpy)
-    Display *dpy;
-#endif
-{
-register XkbDescPtr xkb;
-
-    xkb= dpy->xkb_info->desc;
-    if (XkbGetUpdatedMap(dpy,XkbModifierMapMask,xkb)==Success)
-	return 1;
-    return 0;
-}
-
-unsigned
-#if NeedFunctionPrototypes
-XkbKeysymToModifiers(Display *dpy,KeySym ks)
-#else
-XkbKeysymToModifiers(dpy,ks)
-    Display *dpy;
-    KeySym ks;
-#endif
-{
-    XkbDescRec *xkb;
-    register int i,j;
-    register KeySym *pSyms;
-    CARD8 mods;
-
-    if (_XkbUnavailable(dpy))
-	return _XKeysymToModifiers(dpy,ks);
-    _XkbCheckPendingRefresh(dpy,dpy->xkb_info);
-
-    if (_XkbNeedModmap(dpy->xkb_info)&&(!_XkbComputeModmap(dpy)))
-	return _XKeysymToModifiers(dpy,ks);
-
-    xkb= dpy->xkb_info->desc;
-    mods= 0;
-    for (i = xkb->min_key_code; i <= (int)xkb->max_key_code; i++) {
-	pSyms= XkbKeySymsPtr(xkb,i);
-	for (j=XkbKeyNumSyms(xkb,i)-1;j>=0;j--) {
-	    if (pSyms[j]==ks) {
-		mods|= xkb->map->modmap[i];
-		break;
-	    }
-	}
-    }
-    return mods;
-}
-
-KeySym
-#if NeedFunctionPrototypes
-XLookupKeysym(register XKeyEvent *event, int col)
-#else
-XLookupKeysym(event, col)
-    register XKeyEvent *event;
-    int col;
-#endif
-{
-    Display *dpy = event->display;
-    if (_XkbUnavailable(dpy))
-	return _XLookupKeysym(event, col);
-    _XkbCheckPendingRefresh(dpy,dpy->xkb_info);
-    return XKeycodeToKeysym(dpy, event->keycode, col);
-}
-
-   /*
-    * Not a public entry point -- XkbTranslateKey is an obsolete name 
-    * that is preserved here so that functions linked against the old 
-    * version will continue to work in a shared library environment.
-    */
-int
-#if NeedFunctionPrototypes
-XkbTranslateKey(	register Display *	dpy,
-			KeyCode 		key,
-			register unsigned int 	mods,
-			unsigned int *		mods_rtrn,
-			KeySym *		keysym_rtrn)
-#else
-XkbTranslateKey(dpy, key, mods, mods_rtrn, keysym_rtrn)
-    register Display *dpy;
-    KeyCode key;
-    register unsigned int mods;
-    unsigned int *mods_rtrn;
-    KeySym *keysym_rtrn;
-#endif
-{
-    return XkbLookupKeySym(dpy,key,mods,mods_rtrn,keysym_rtrn);
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbLookupKeySym(	register Display *	dpy,
-			KeyCode 		key,
-			register unsigned int 	mods,
-			unsigned int *		mods_rtrn,
-			KeySym *		keysym_rtrn)
-#else
-XkbLookupKeySym(dpy, key, mods, mods_rtrn, keysym_rtrn)
-    register Display *dpy;
-    KeyCode key;
-    register unsigned int mods;
-    unsigned int *mods_rtrn;
-    KeySym *keysym_rtrn;
-#endif
-{
-    if (_XkbUnavailable(dpy))
-	return _XTranslateKey(dpy, key, mods, mods_rtrn, keysym_rtrn);
-    _XkbCheckPendingRefresh(dpy,dpy->xkb_info);
-    return XkbTranslateKeyCode(dpy->xkb_info->desc,key,mods,mods_rtrn,
-								keysym_rtrn);
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbTranslateKeyCode(	register XkbDescPtr	xkb,
-			KeyCode 		key,
-			register unsigned int 	mods,
-			unsigned int *		mods_rtrn,
-			KeySym *		keysym_rtrn)
-#else
-XkbTranslateKeyCode(xkb, key, mods, mods_rtrn, keysym_rtrn)
-    register XkbDescPtr xkb;
-    KeyCode key;
-    register unsigned int mods;
-    unsigned int *mods_rtrn;
-    KeySym *keysym_rtrn;
-#endif
-{
-    XkbKeyTypeRec *type;
-    int col,nKeyGroups;
-    unsigned preserve,effectiveGroup;
-    KeySym *syms;
-
-    if (mods_rtrn!=NULL)
-	*mods_rtrn = 0;
-
-    nKeyGroups= XkbKeyNumGroups(xkb,key);
-    if ((!XkbKeycodeInRange(xkb,key))||(nKeyGroups==0)) {
-	if (keysym_rtrn!=NULL)
-	    *keysym_rtrn = NoSymbol;
-	return False;
-    }
-
-    syms = XkbKeySymsPtr(xkb,key);
-
-    /* find the offset of the effective group */
-    col = 0;
-    effectiveGroup= XkbGroupForCoreState(mods);
-    if ( effectiveGroup>=nKeyGroups ) {
-	unsigned groupInfo= XkbKeyGroupInfo(xkb,key);
-	switch (XkbOutOfRangeGroupAction(groupInfo)) {
-	    default:
-		effectiveGroup %= nKeyGroups;
-		break;
-	    case XkbClampIntoRange:
-		effectiveGroup = nKeyGroups-1;
-		break;
-	    case XkbRedirectIntoRange:
-		effectiveGroup = XkbOutOfRangeGroupNumber(groupInfo);
-		if (effectiveGroup>=nKeyGroups)
-		    effectiveGroup= 0;
-		break;
-	}
-    }
-    col= effectiveGroup*XkbKeyGroupsWidth(xkb,key);
-    type = XkbKeyKeyType(xkb,key,effectiveGroup);
-
-    preserve= 0;
-    if (type->map) { /* find the column (shift level) within the group */
-	register int i;
-	register XkbKTMapEntryPtr entry;
-	for (i=0,entry=type->map;i<type->map_count;i++,entry++) {
-	    if ((entry->active)&&((mods&type->mods.mask)==entry->mods.mask)) {
-		col+= entry->level;
-		if (type->preserve)
-		    preserve= type->preserve[i].mask;
-		break;
-	    }
-	}
-    }
-
-    if (keysym_rtrn!=NULL)
-	*keysym_rtrn= syms[col];
-    if (mods_rtrn) {
-	*mods_rtrn= type->mods.mask&(~preserve);
-	/* The Motif VTS doesn't get the help callback called if help
-	 * is bound to Shift+<whatever>, and it appears as though it 
-	 * is XkbTranslateKeyCode that is causing the problem.  The 
-	 * core X version of XTranslateKey always OR's in ShiftMask 
-	 * and LockMask for mods_rtrn, so this "fix" keeps this behavior 
-	 * and solves the VTS problem.
-	 */
-	if ((xkb->dpy)&&(xkb->dpy->xkb_info)&&
-	    (xkb->dpy->xkb_info->xlib_ctrls&XkbLC_AlwaysConsumeShiftAndLock)) {
-	    *mods_rtrn|= (ShiftMask|LockMask);
-	}
-    }
-    return (syms[col]!=NoSymbol);
-}
-
-Status
-#if NeedFunctionPrototypes
-XkbRefreshKeyboardMapping(register XkbMapNotifyEvent *event)
-#else
-XkbRefreshKeyboardMapping(event)
-    register XkbMapNotifyEvent *event;
-#endif
-{
-    Display *dpy = event->display;
-    XkbInfoPtr xkbi;
-
-    if (_XkbUnavailable(dpy)) {
-	_XRefreshKeyboardMapping((XMappingEvent *)event);
-	return Success;
-    }
-    xkbi= dpy->xkb_info;
-
-    if (((event->type&0x7f)-xkbi->codes->first_event)!=XkbEventCode)
-	return BadMatch;
-    if (event->xkb_type==XkbNewKeyboardNotify) {
-	_XkbReloadDpy(dpy);
-	return Success;
-    }
-    if (event->xkb_type==XkbMapNotify) {
-	XkbMapChangesRec	changes;
-	Status			rtrn;
-
-	if (xkbi->flags&XkbMapPending)
-	     changes= xkbi->changes;
-	else bzero(&changes,sizeof(XkbChangesRec));
-	XkbNoteMapChanges(&changes,event,XKB_XLIB_MAP_MASK);
-	LockDisplay(dpy);
-	if ((rtrn=XkbGetMapChanges(dpy,xkbi->desc,&changes))!=Success) {
-#ifdef DEBUG
-	    fprintf(stderr,"Internal Error! XkbGetMapChanges failed:\n");
-#endif
-	    xkbi->changes= changes;
-	}
-	else if (xkbi->flags&XkbMapPending) {
-	    xkbi->flags&= ~XkbMapPending;
-	    bzero(&xkbi->changes,sizeof(XkbMapChangesRec));
-	}
-	UnlockDisplay(dpy);
-	return rtrn;
-    }
-    return BadMatch;
-}
-
-int
-#if NeedFunctionPrototypes
-XRefreshKeyboardMapping(register XMappingEvent *event)
-#else
-XRefreshKeyboardMapping(event)
-    register XMappingEvent *event;
-#endif
-{
-    XkbEvent	*xkbevent = (XkbEvent *)event;
-    Display *dpy = event->display;
-    XkbMapChangesRec changes;
-    XkbInfoPtr xkbi;
-
-    /* always do this for input methods, which still use the old keymap */
-    (void) _XRefreshKeyboardMapping(event);
-
-    if (_XkbUnavailable(dpy))
-	return 1;
-
-    xkbi = dpy->xkb_info;
-
-    if (((event->type&0x7f)-xkbi->codes->first_event)==XkbEventCode)
-	return XkbRefreshKeyboardMapping(&xkbevent->map);
-
-    if (xkbi->flags&XkbXlibNewKeyboard) {
-	_XkbReloadDpy(dpy);
-	return 1;
-    }
-
-    if ((xkbi->flags&XkbMapPending)||(event->request==MappingKeyboard)) {
-	if (xkbi->flags&XkbMapPending) {
-	    changes= xkbi->changes;
-	    _XkbNoteCoreMapChanges(&changes,event,XKB_XLIB_MAP_MASK);
-	}
-	else {
-	    bzero(&changes,sizeof(changes));
-	    changes.changed= XkbKeySymsMask;
-	    if (xkbi->desc->min_key_code<xkbi->desc->max_key_code) {
-		changes.first_key_sym= xkbi->desc->min_key_code;
-		changes.num_key_syms= xkbi->desc->max_key_code-
-						xkbi->desc->min_key_code+1;
-	    }
-	    else {
-		changes.first_key_sym= event->first_keycode;
-		changes.num_key_syms= event->count;
-	    }
-	}
-
-	if (XkbGetMapChanges(dpy,xkbi->desc, &changes)!=Success) {
-#ifdef DEBUG
-		fprintf(stderr,"Internal Error! XkbGetMapChanges failed:\n");
-		if (changes.changed&XkbKeyTypesMask) {
-		    int first= changes.first_type;
-		    int last= changes.first_type+changes.num_types-1;
-		    fprintf(stderr,"       types:  %d..%d\n",first,last);
-		}
-		if (changes.changed&XkbKeySymsMask) {
-		    int first= changes.first_key_sym;
-		    int last= changes.first_key_sym+changes.num_key_syms-1;
-		    fprintf(stderr,"     symbols:  %d..%d\n",first,last);
-		}
-		if (changes.changed&XkbKeyActionsMask) {
-		    int last,first= changes.first_key_act;
-		    last= changes.first_key_act+changes.num_key_acts-1;
-		    fprintf(stderr,"     acts:  %d..%d\n",first,last);
-		}
-		if (changes.changed&XkbKeyBehaviorsMask) {
-		    int last,first= changes.first_key_behavior;
-		    last= first+changes.num_key_behaviors-1;
-		    fprintf(stderr,"   behaviors:  %d..%d\n",first,last);
-		}
-		if (changes.changed&XkbVirtualModsMask) {
-		    fprintf(stderr,"virtual mods: 0x%04x\n",
-					changes.vmods);
-		}
-		if (changes.changed&XkbExplicitComponentsMask) {
-		    int last,first= changes.first_key_explicit;
-		    last= first+changes.num_key_explicit-1;
-		    fprintf(stderr,"    explicit:  %d..%d\n",first,last);
-		}
-#endif
-	}
-	LockDisplay(dpy);
-	if (xkbi->flags&XkbMapPending) {
-	    xkbi->flags&= ~XkbMapPending;
-	    bzero(&xkbi->changes,sizeof(XkbMapChangesRec));
-	}
-	UnlockDisplay(dpy);
-    }
-    if (event->request==MappingModifier) {
-	if (xkbi->desc->map->modmap) {
-	    _XkbFree(xkbi->desc->map->modmap);
-	    xkbi->desc->map->modmap= NULL;
-	}
-	if (dpy->key_bindings) {
-	    register struct _XKeytrans *p;
-	    for (p = dpy->key_bindings; p; p = p->next) {
-		register int i;
-		p->state= 0;
-	  	if (p->mlen>0) {
-		    for (i = 0; i < p->mlen; i++) {
-			p->state|= XkbKeysymToModifiers(dpy,p->modifiers[i]);
-		    }
-		    if (p->state)	p->state &= AllMods;
-		    else		p->state = AnyModifier;
-		}
-	    }
-	}
-	UnlockDisplay(dpy);
-    }
-    return 1;
-}
-
-static int
-#if NeedFunctionPrototypes
-_XkbLoadDpy(Display *dpy)
-#else
-_XkbLoadDpy(dpy)
-    Display *dpy;
-#endif
-{
-    XkbInfoPtr xkbi;
-    unsigned query,oldEvents;
-    XkbDescRec *desc;
-
-    if (!XkbUseExtension(dpy,NULL,NULL))
-	return 0;
-
-    xkbi = dpy->xkb_info;
-    query = XkbAllClientInfoMask;
-    desc = XkbGetMap(dpy,query,XkbUseCoreKbd);
-    if (!desc) {
-#ifdef DEBUG
-	fprintf(stderr,"Warning! XkbGetMap failed!\n");
-#endif
-	return 0;
-    }
-    LockDisplay(dpy);
-    xkbi->desc = desc;
-
-    _XkbGetConverters(_XkbGetCharset(),&xkbi->cvt);
-    _XkbGetConverters("ISO8859-1",&xkbi->latin1cvt);
-    UnlockDisplay(dpy);
-    oldEvents= xkbi->selected_events;
-    if (!(xkbi->xlib_ctrls&XkbLC_IgnoreNewKeyboards)) {
-	XkbSelectEventDetails(dpy,xkbi->desc->device_spec,XkbNewKeyboardNotify,
-				XkbNKN_KeycodesMask|XkbNKN_DeviceIDMask,
-				XkbNKN_KeycodesMask|XkbNKN_DeviceIDMask);
-    }
-    XkbSelectEventDetails(dpy,xkbi->desc->device_spec,XkbMapNotify,
-				XkbAllClientInfoMask,XkbAllClientInfoMask);
-    LockDisplay(dpy);
-    xkbi->selected_events= oldEvents;
-    UnlockDisplay(dpy);
-    return 1;
-}
-
-void
-#if NeedFunctionPrototypes
-_XkbReloadDpy(Display *dpy)
-#else
-_XkbReloadDpy(dpy)
-    Display *dpy;
-#endif
-{
-    XkbInfoPtr xkbi;
-    XkbDescRec *desc;
-    unsigned	oldDeviceID;
-
-    if (_XkbUnavailable(dpy))
-	return;
-
-    xkbi = dpy->xkb_info;
-    LockDisplay(dpy);
-    if (xkbi->desc) {
-	oldDeviceID= xkbi->desc->device_spec;
-	XkbFreeKeyboard(xkbi->desc,XkbAllComponentsMask,True);
-	xkbi->desc= NULL;
-	xkbi->flags&= ~(XkbMapPending|XkbXlibNewKeyboard);
-	xkbi->changes.changed= 0;
-    }
-    else oldDeviceID= XkbUseCoreKbd;
-    UnlockDisplay(dpy);
-    desc = XkbGetMap(dpy,XkbAllClientInfoMask,XkbUseCoreKbd);
-    if (!desc)
-	return;
-    LockDisplay(dpy);
-    xkbi->desc = desc;
-    UnlockDisplay(dpy);
-
-    if (desc->device_spec!=oldDeviceID) {
-	/* transfer(?) event masks here */
-#ifdef NOTYET
-	unsigned oldEvents;
-	oldEvents= xkbi->selected_events;
-	XkbSelectEventDetails(dpy,xkbi->desc->device_spec,XkbMapNotify,
-				XkbAllMapComponentsMask,XkbAllClientInfoMask);
-	LockDisplay(dpy);
-	xkbi->selected_events= oldEvents;
-	UnlockDisplay(dpy);
-#endif
-    }
-    return;
-}
-
-int
-#if NeedFunctionPrototypes
-XkbTranslateKeySym(	register Display *	dpy,
-			register KeySym *	sym_rtrn,
-			unsigned int 		mods,
-			char *			buffer,
-			int 			nbytes,
-			int *			extra_rtrn)
-#else
-XkbTranslateKeySym(dpy, sym_rtrn, mods, buffer, nbytes, extra_rtrn)
-    register Display *dpy;
-    register KeySym *sym_rtrn;
-    unsigned int mods;
-    char *buffer;
-    int nbytes;
-    int *extra_rtrn;
-#endif
-{
-    register XkbInfoPtr	xkb;
-    XkbKSToMBFunc cvtr;
-    XPointer priv;
-    char tmp[4];
-    register struct _XKeytrans *p; 
-    int n;
-
-    if (extra_rtrn)
-	*extra_rtrn= 0;
-
-    if (_XkbUnavailable(dpy))
-        return _XTranslateKeySym(dpy, *sym_rtrn, mods, buffer, nbytes);
-    _XkbCheckPendingRefresh(dpy,dpy->xkb_info);
-
-    xkb= dpy->xkb_info;
-    if ((buffer==NULL)||(nbytes==0)) {
-	buffer= tmp;
-	nbytes= 4;
-    }
-
-    /* see if symbol rebound, if so, return that string. */
-    for (p = dpy->key_bindings; p; p = p->next) {
-	if (((mods & AllMods) == p->state) && (*sym_rtrn == p->key)) {
-	    int tmp = p->len;
-	    if (tmp > nbytes) {
-		if (extra_rtrn)
-		    *extra_rtrn= tmp-nbytes;
-		tmp = nbytes;
-	    }
-	    memcpy (buffer, p->string, tmp);
-	    return tmp;
-	}
-    }
-
-    if ( nbytes>0 )
-	buffer[0]= '\0';
-
-    if ( xkb->cvt.KSToUpper && (mods&LockMask) ) {
-	*sym_rtrn = (*xkb->cvt.KSToUpper)(*sym_rtrn);
-    }
-    if (xkb->xlib_ctrls & XkbLC_ForceLatin1Lookup) {
-	cvtr = xkb->latin1cvt.KSToMB;
-	priv = xkb->latin1cvt.KSToMBPriv;
-    } else {
-	cvtr = xkb->cvt.KSToMB;
-	priv = xkb->cvt.KSToMBPriv;
-    }
-
-    n = (*cvtr)(priv,*sym_rtrn,buffer,nbytes,extra_rtrn);
-
-    if ((!xkb->cvt.KSToUpper)&&( mods&LockMask )) {
-	register int i;
-
-	if (!xkb->cvt.KSToUpper) {
-	    int change;
-	    char ch;
-	    for (i=change=0;i<n;i++) {
-		ch= toupper(buffer[i]);
-		change= (change||(buffer[i]!=ch));
-		buffer[i] = ch;
-	    }
-	    if (change) {
-		if (n==1)
-		     *sym_rtrn=(*xkb->cvt.MBToKS)(xkb->cvt.MBToKSPriv,
-								buffer,n,0);
-		else *sym_rtrn= NoSymbol;
-	    }
-	}
-    }
-
-    if ( mods&ControlMask ) {
-	if ( n==1 ) {
-	    register char c = buffer[0];
-
-	    if ((c >= '@' && c < '\177') || c == ' ') c &= 0x1F;
-	    else if (c == '2') c = '\000';
-	    else if (c >= '3' && c <= '7') c -= ('3' - '\033');
-	    else if (c == '8') c = '\177';
-	    else if (c == '/') c = '_' & 0x1F;
-
-	    buffer[0]= c;
-	    if ( nbytes>1 )
-		buffer[1]= '\0';
-	    return 1;
-	}
-	if ( nbytes > 0 )
-	    buffer[0]= '\0';
-	return 0;
-    }
-    return n;
-}
-
-int
-#if NeedFunctionPrototypes
-XLookupString (	register XKeyEvent *	event,
-		char *			buffer,
-		int 			nbytes,
-		KeySym *		keysym,
-		XComposeStatus *	status)
-#else
-XLookupString (event, buffer, nbytes, keysym, status)
-    register XKeyEvent *event;
-    char *buffer;	/* buffer */
-    int nbytes;	/* space in buffer for characters */
-    KeySym *keysym;
-    XComposeStatus *status;
-#endif
-{
-    KeySym	dummy;
-    int rtrnLen;
-    unsigned int new_mods;
-    Display *dpy = event->display;
-    XkbDescPtr	xkb;
-
-    if (_XkbUnavailable(dpy))
-	return _XLookupString(event, buffer, nbytes, keysym, status);
-    _XkbCheckPendingRefresh(dpy,dpy->xkb_info);
-
-    if (keysym==NULL)
-	keysym= &dummy;
-    xkb= dpy->xkb_info->desc;
-    if (!XkbTranslateKeyCode(xkb,event->keycode,event->state, &new_mods,keysym))
-	return 0;
-    new_mods= (event->state&(~new_mods));
-
-#ifdef USE_OWN_COMPOSE
-    if ( status ) {
-	static int been_here= 0;
-	if ( !been_here ) {
-	    XimCompInitTables();
-	    been_here = 1;
-	}
-	if ( !XimCompLegalStatus(status) ) {
-	    status->compose_ptr = NULL;
-	    status->chars_matched = 0;
-	}
-	if ( ((status->chars_matched>0)&&(status->compose_ptr!=NULL)) || 
-		XimCompIsComposeKey(*keysym,event->keycode,status) ) {
-	    XimCompRtrn rtrn;
-
-	    switch (XimCompProcessSym(status,*keysym,&rtrn)) {
-		case XIM_COMP_IGNORE:
-		    break;
-		case XIM_COMP_IN_PROGRESS:
-		    if ( keysym!=NULL )
-			*keysym = NoSymbol;
-#ifndef NO_COMPOSE_LED
-		    if ( dpy->xkb_info->xlib_ctrls&XkbLC_ComposeLED ) {
-			XkbSetNamedIndicator(dpy,dpy->xkb_info->composeLED,
-						True,True,False,NULL);
-		    }
-#endif
-		    return 0;
-		case XIM_COMP_FAIL:
-		{
-		    static Atom _ComposeFail= None;
-		    int n = 0, len= 0;
-#ifndef NO_COMPOSE_LED
-		    if ( dpy->xkb_info->xlib_ctrls&XkbLC_ComposeLED ) {
-			XkbSetNamedIndicator(dpy,dpy->xkb_info->composeLED,
-						True,False,False,NULL);
-		    }
-#endif
-#ifndef NO_BELL_ON_COMPOSE_FAIL
-		    if (dpy->xkb_info->xlib_ctrls&XkbLC_BeepOnComposeFail) {
-			if (_ComposeFail==None)
-			    _ComposeFail= XInternAtom(dpy,"ComposeFail",0);
-			XkbBell(dpy,event->window,0,_ComposeFail);
-		    }
-#endif
-		    for (n=len=0;rtrn.sym[n]!=XK_VoidSymbol;n++) {
-			if ( nbytes-len > 0 ) {
-			    len+= XkbTranslateKeySym(dpy,&rtrn.sym[n],new_mods,
-							buffer+len,nbytes-len,
-							NULL);
-			}
-		    }
-		    if ( keysym!=NULL ) {
-			if ( n==1 )	*keysym = rtrn.sym[0];
-			else		*keysym = NoSymbol;
-		    }
-		    return len;
-		}
-		case XIM_COMP_SUCCEED:
-		{
-		    int len,n = 0;
-
-#ifndef NO_COMPOSE_LED
-		    if ( dpy->xkb_info->xlib_ctrls&XkbLC_ComposeLED ) {
-			XkbSetNamedIndicator(dpy,dpy->xkb_info->composeLED,
-						True,False,False,NULL);
-		    }
-#endif
-		    *keysym = rtrn.matchSym;
-		    if ( rtrn.str[0]!='\0' ) {
-			strncpy(buffer,rtrn.str,nbytes-1);
-			buffer[nbytes-1]= '\0';
-			len = (int)strlen(buffer);
-		    }
-		    else {
-			len = XkbTranslateKeySym(dpy,keysym,new_mods,
-							buffer,nbytes,
-							NULL);
-		    }
-		    for (n=0;rtrn.sym[n]!=XK_VoidSymbol;n++) {
-			if ( nbytes-len > 0 ) {
-			    len+= XkbTranslateKeySym(dpy,&rtrn.sym[n],
-							event->state,
-							buffer+len,nbytes-len,
-							NULL);
-			}
-		    }
-		    return len;
-		}
-	    }
-	}
-    }
-#endif
-
-    /* We *should* use the new_mods (which does not contain any modifiers */
-    /* that were used to compute the symbol here, but pre-XKB XLookupString */
-    /* did not and we have to remain compatible.  Sigh. */
-    if ((dpy->xkb_info->flags&XkbLC_ConsumeLookupMods)==0)
-	new_mods= event->state;
-
-    rtrnLen= XkbLookupKeyBinding(dpy,*keysym,new_mods,buffer,nbytes,NULL);
-    if (rtrnLen>0)
-	return rtrnLen;
-
-    rtrnLen = XkbTranslateKeySym(dpy,keysym,new_mods,buffer,nbytes,NULL);
-    if ((event->state&ControlMask)&&(nbytes>0)&&
-			((rtrnLen==0)||((rtrnLen==1)&&(buffer[0]>=' ')))&&
-			(XkbGroupForCoreState(event->state)!=XkbGroup1Index)&&
-			(dpy->xkb_info->xlib_ctrls&XkbLC_ControlFallback)) {
-	XKeyEvent	tmp_ev;
-	tmp_ev= *event;
-	tmp_ev.state= XkbBuildCoreState(event->state,XkbGroup1Index);
-	return XLookupString (&tmp_ev, buffer, nbytes, keysym, status);
-    }
-    return rtrnLen;
-}
-
-
-int
-#if NeedFunctionPrototypes
-XkbLookupKeyBinding(	Display *		dpy,
-			register KeySym 	sym,
-			unsigned int 		mods,
-			char *			buffer,
-			int 			nbytes,
-			int * 			extra_rtrn)
-#else
-XkbLookupKeyBinding(dpy, sym, mods, buffer, nbytes, extra_rtrn)
-    Display *dpy;
-    register KeySym sym;
-    unsigned int mods;
-    char *buffer;
-    int nbytes;
-    int * extra_rtrn;
-#endif
-{
-    register struct _XKeytrans *p; 
-
-    if (extra_rtrn)
-	*extra_rtrn= 0;
-    for (p = dpy->key_bindings; p; p = p->next) {
-	if (((mods & AllMods) == p->state) && (sym == p->key)) {
-	    int tmp = p->len;
-	    if (tmp > nbytes) {
-		if (extra_rtrn)
-		    *extra_rtrn= (tmp-nbytes);
-		tmp = nbytes;
-	    }
-	    memcpy (buffer, p->string, tmp);
-	    if (tmp < nbytes)	buffer[tmp]= '\0';
-	    return tmp;
-	}
-    }
-    return 0;
-}
-
-char
-#if NeedFunctionPrototypes
-XkbToControl( char c )
-#else
-XkbToControl( c )
-    char c;
-#endif
-{
-    if ((c >= '@' && c < '\177') || c == ' ') c &= 0x1F;
-    else if (c == '2') c = '\000';
-    else if (c >= '3' && c <= '7') c -= ('3' - '\033');
-    else if (c == '8') c = '\177';
-    else if (c == '/') c = '_' & 0x1F;
-    return c;
-}
diff --git a/xc/lib/X11/XKBCompat.c b/xc/lib/X11/XKBCompat.c
deleted file mode 100644
index 4a1b81650..000000000
--- a/xc/lib/X11/XKBCompat.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/* $XConsortium: XKBCompat.c /main/8 1996/03/01 14:29:32 kaleb $ */
-/************************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-
-#include <stdio.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
-#define	NEED_MAP_READERS
-#include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
-#include "XKBlibint.h"
-
-Status
-#if NeedFunctionPrototypes
-_XkbReadGetCompatMapReply(	Display *		dpy,
-				xkbGetCompatMapReply *	rep,
-				XkbDescPtr		xkb,
-				int	*		nread_rtrn)
-#else
-_XkbReadGetCompatMapReply(dpy,rep,xkb,nread_rtrn)
-    Display *			dpy;
-    xkbGetCompatMapReply *	rep;
-    XkbDescPtr			xkb;
-    int	*			nread_rtrn;
-#endif
-{
-register int 		i;
-XkbReadBufferRec	buf;
-
-    if (!_XkbInitReadBuffer(dpy,&buf,(int)rep->length*4)) 
-	return BadAlloc;
-
-    if (nread_rtrn)
-	*nread_rtrn= (int)rep->length*4;
-
-    i= rep->firstSI+rep->nSI;
-    if ((!xkb->compat)&&
-	(XkbAllocCompatMap(xkb,XkbAllCompatMask,i)!=Success))
-	return BadAlloc;
-
-    if (rep->nSI!=0) {
-	XkbSymInterpretRec *syms;
-	xkbSymInterpretWireDesc *wire;
-
-	wire= (xkbSymInterpretWireDesc *)_XkbGetReadBufferPtr(&buf,
-				   rep->nSI*SIZEOF(xkbSymInterpretWireDesc));
-	if (wire==NULL)
-	    goto BAILOUT;
-	syms= &xkb->compat->sym_interpret[rep->firstSI];
-
-	for (i=0;i<rep->nSI;i++,syms++,wire++) {
-	    syms->sym= wire->sym;
-	    syms->mods= wire->mods;
-	    syms->match= wire->match;
-	    syms->virtual_mod= wire->virtualMod;
-	    syms->flags= wire->flags;
-	    syms->act= *((XkbAnyAction *)&wire->act);
-	}
-	xkb->compat->num_si+= rep->nSI;
-    }
-
-    if (rep->groups&XkbAllGroupsMask) {
-	register unsigned	bit,nGroups;
-	xkbModsWireDesc * 	wire;
-	for (i=0,nGroups=0,bit=1;i<XkbNumKbdGroups;i++,bit<<=1) {
-	    if (rep->groups&bit)
-		nGroups++;
-	}
-	wire= (xkbModsWireDesc *)_XkbGetReadBufferPtr(&buf,
-				  nGroups*SIZEOF(xkbModsWireDesc));
-	if (wire==NULL)
-	    goto BAILOUT;
-	for (i=0,bit=1;i<XkbNumKbdGroups;i++,bit<<=1) {
-	    if ((rep->groups&bit)==0)
-		continue;
-	    xkb->compat->groups[i].mask= wire->mask;
-	    xkb->compat->groups[i].real_mods= wire->realMods;
-	    xkb->compat->groups[i].vmods= wire->virtualMods;
-	    wire++;
-	}
-    }
-    i= _XkbFreeReadBuffer(&buf);
-    if (i) 
-	fprintf(stderr,"CompatMapReply! Bad length (%d extra bytes)\n",i);
-    if (i || buf.error)
-	return BadLength;
-    return Success;
-BAILOUT:
-    _XkbFreeReadBuffer(&buf);
-    return BadLength;
-}
-
-Status
-#if NeedFunctionPrototypes
-XkbGetCompatMap(Display *dpy,unsigned which,XkbDescPtr xkb)
-#else
-XkbGetCompatMap(dpy,which,xkb)
-    Display *	dpy;
-    unsigned 	which;
-    XkbDescPtr	xkb;
-#endif
-{
-    register xkbGetCompatMapReq *req;
-    xkbGetCompatMapReply	 rep;
-    Status			status;
-    XkbInfoPtr xkbi;
-
-    if ( (!dpy) || (!xkb) || (dpy->flags & XlibDisplayNoXkb) ||
-	((xkb->dpy!=NULL)&&(xkb->dpy!=dpy)) ||
-	(!dpy->xkb_info && (!XkbUseExtension(dpy,NULL,NULL))))
-	return BadAccess;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbGetCompatMap, req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbGetCompatMap;
-    req->deviceSpec = xkb->device_spec;
-    if (which&XkbSymInterpMask)
-	 req->getAllSI= True;
-    else req->getAllSI= False;
-    req->firstSI= req->nSI= 0;
-
-    if (which&XkbGroupCompatMask)
-	 req->groups= XkbAllGroupsMask;
-    else req->groups=  0;
-
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return BadLength;
-    }
-    if (xkb->dpy==NULL)
-	xkb->dpy= dpy;
-    if (xkb->device_spec==XkbUseCoreKbd)
-	xkb->device_spec= rep.deviceID;
-
-    status = _XkbReadGetCompatMapReply(dpy,&rep,xkb,NULL);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return status;
-}
-
-static Bool
-#if NeedFunctionPrototypes
-_XkbWriteSetCompatMap(Display *dpy,xkbSetCompatMapReq *req,XkbDescPtr xkb)
-#else
-_XkbWriteSetCompatMap(dpy,req,xkb)
-    Display *		dpy;
-    xkbSetCompatMapReq	*req;
-    XkbDescPtr		xkb;
-#endif
-{
-CARD16			firstSI;
-CARD16			nSI;
-int			size;
-register int 		i,nGroups;
-register unsigned	bit;
-unsigned		groups;
-char *			buf;
-
-    firstSI = req->firstSI;
-    nSI = req->nSI;
-    size= nSI*SIZEOF(xkbSymInterpretWireDesc);
-    nGroups= 0;
-    groups= req->groups;
-    if (groups&XkbAllGroupsMask) {
-	for (i=0,bit=1;i<XkbNumKbdGroups;i++,bit<<=1) {
-	    if (groups&bit)
-		nGroups++;
-	}
-	size+= SIZEOF(xkbModsWireDesc)*nGroups;
-    }
-    req->length+= size/4;
-    BufAlloc(char *,buf,size);
-    if (!buf)
-	return False;
-
-    if (nSI) {
-	XkbSymInterpretPtr sym= &xkb->compat->sym_interpret[firstSI];
-	xkbSymInterpretWireDesc *wire= (xkbSymInterpretWireDesc *)buf;
-	for (i=0;i<nSI;i++,wire++,sym++) {
-	    wire->sym= (CARD32)sym->sym;
-	    wire->mods= sym->mods;
-	    wire->match= sym->match;
-	    wire->flags= sym->flags;
-	    wire->virtualMod= sym->virtual_mod;
-	    memcpy(&wire->act,&sym->act,sz_xkbActionWireDesc);
-	}
-	buf+= nSI*SIZEOF(xkbSymInterpretWireDesc);
-    }
-    if (groups&XkbAllGroupsMask) {
-	xkbModsWireDesc *	out;
-
-	out= (xkbModsWireDesc *)buf;
-	for (i=0,bit=1;i<XkbNumKbdGroups;i++,bit<<=1) {
-	    if ((groups&bit)!=0) {
-		out->mask= xkb->compat->groups[i].mask;
-		out->realMods= xkb->compat->groups[i].real_mods;
-		out->virtualMods=  xkb->compat->groups[i].vmods;
-		out++;
-	    }
-	}
-	buf+= nGroups*SIZEOF(xkbModsWireDesc);
-    }
-    return True;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbSetCompatMap(Display *dpy,unsigned which,XkbDescPtr xkb,Bool updateActions)
-#else
-XkbSetCompatMap(dpy,which,xkb,updateActions)
-    Display *		dpy;
-    unsigned 		which;
-    XkbDescPtr		xkb;
-    Bool		updateActions;
-#endif
-{
-    register xkbSetCompatMapReq *req;
-    Status		     ok;
-    XkbInfoPtr xkbi;
-
-    if ((dpy->flags & XlibDisplayNoXkb) || (dpy!=xkb->dpy) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    if ((!xkb->compat) ||
-	((which&XkbSymInterpMask)&&(!xkb->compat->sym_interpret)))
-	return False;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbSetCompatMap, req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbSetCompatMap;
-    req->deviceSpec = xkb->device_spec;
-    req->recomputeActions = updateActions;
-    if (which&XkbSymInterpMask) {
-	req->truncateSI = True;
-	req->firstSI= 0;
-	req->nSI= xkb->compat->num_si;
-    }
-    else {
-	req->truncateSI = False;
-	req->firstSI= 0;
-	req->nSI= 0;
-    }
-    if (which&XkbGroupCompatMask)
-	 req->groups= XkbAllGroupsMask;
-    else req->groups=  0;
-    ok= _XkbWriteSetCompatMap(dpy,req,xkb);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return ok;
-}
-
diff --git a/xc/lib/X11/XKBCtrls.c b/xc/lib/X11/XKBCtrls.c
deleted file mode 100644
index e7f2c901d..000000000
--- a/xc/lib/X11/XKBCtrls.c
+++ /dev/null
@@ -1,418 +0,0 @@
-/* $XConsortium: XKBCtrls.c /main/7 1996/02/02 14:09:20 kaleb $ */
-/************************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-
-#include <stdio.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
-#include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
-#include "XKBlibint.h"
-
-
-static xkbSetControlsReq *
-#if NeedFunctionPrototypes
-_XkbGetSetControlsReq(Display *dpy,XkbInfoPtr xkbi,unsigned int deviceSpec)
-#else
-_XkbGetSetControlsReq(dpy,xkbi,deviceSpec)
-    Display *		dpy;
-    XkbInfoPtr		xkbi;
-    unsigned int	deviceSpec;
-#endif
-{
-xkbSetControlsReq *req;
-
-    GetReq(kbSetControls,req);
-    bzero(req,SIZEOF(xkbSetControlsReq));
-    req->reqType = xkbi->codes->major_opcode;
-    req->length = (SIZEOF(xkbSetControlsReq)>>2);
-    req->xkbReqType = X_kbSetControls;
-    req->deviceSpec = deviceSpec;
-    return req;
-}
-
-Bool 
-#if NeedFunctionPrototypes
-XkbSetAutoRepeatRate(	Display *dpy,
-			unsigned int deviceSpec, 
-			unsigned int timeout, 
-			unsigned int interval)
-#else
-XkbSetAutoRepeatRate(dpy, deviceSpec, timeout, interval)
-    Display *dpy;
-    unsigned int deviceSpec;
-    unsigned int timeout;
-    unsigned int interval;
-#endif
-{
-    register xkbSetControlsReq *req;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    LockDisplay(dpy);
-    req= _XkbGetSetControlsReq(dpy,dpy->xkb_info,deviceSpec);
-    req->changeCtrls = XkbRepeatKeysMask;
-    req->repeatDelay = timeout;
-    req->repeatInterval = interval;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-Bool 
-#if NeedFunctionPrototypes
-XkbGetAutoRepeatRate(	Display *	dpy,
-			unsigned int 	deviceSpec,
-			unsigned int *	timeoutp,
-			unsigned int *	intervalp)
-#else
-XkbGetAutoRepeatRate(dpy, deviceSpec, timeoutp, intervalp)
-    Display *dpy;
-    unsigned int deviceSpec;
-    unsigned int *timeoutp;
-    unsigned int *intervalp;
-#endif
-{
-    register xkbGetControlsReq *req;
-    xkbGetControlsReply rep;
-    XkbInfoPtr xkbi;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbGetControls, req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbGetControls;
-    req->deviceSpec = deviceSpec;
-    if (!_XReply(dpy, (xReply *)&rep, 
-		(SIZEOF(xkbGetControlsReply)-SIZEOF(xReply))>>2, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    *timeoutp = rep.repeatDelay;
-    *intervalp = rep.repeatInterval;
-    return True;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbSetServerInternalMods(	Display *	dpy,
-				unsigned 	deviceSpec,
-				unsigned 	affectReal,
-				unsigned 	realValues,
-				unsigned 	affectVirtual,
-				unsigned 	virtualValues)
-#else
-XkbSetServerInternalMods(dpy,deviceSpec,
-			     affectReal,realValues,affectVirtual,virtualValues)
-    Display *dpy;
-    unsigned deviceSpec;
-    unsigned affectReal;
-    unsigned realValues;
-    unsigned affectVirtual;
-    unsigned virtualValues;
-#endif
-{
-    register xkbSetControlsReq *req;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    LockDisplay(dpy);
-    req= _XkbGetSetControlsReq(dpy,dpy->xkb_info,deviceSpec);
-    req->affectInternalMods = affectReal;
-    req->internalMods = realValues;
-    req->affectInternalVMods= affectVirtual;
-    req->internalVMods= virtualValues;
-    req->changeCtrls = XkbInternalModsMask;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbSetIgnoreLockMods(	Display *	dpy,
-			unsigned int 	deviceSpec,
-			unsigned 	affectReal,
-			unsigned 	realValues,
-			unsigned 	affectVirtual,
-			unsigned 	virtualValues)
-#else
-XkbSetIgnoreLockMods(dpy,deviceSpec,
-			 affectReal,realValues,affectVirtual,virtualValues)
-    Display *dpy;
-    unsigned int deviceSpec;
-    unsigned affectReal;
-    unsigned realValues;
-    unsigned affectVirtual;
-    unsigned virtualValues;
-#endif
-{
-    register xkbSetControlsReq *req;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    LockDisplay(dpy);
-    req= _XkbGetSetControlsReq(dpy,dpy->xkb_info,deviceSpec);
-    req->affectIgnoreLockMods= affectReal;
-    req->ignoreLockMods = realValues;
-    req->affectIgnoreLockVMods= affectVirtual;
-    req->ignoreLockVMods= virtualValues;
-    req->changeCtrls = XkbIgnoreLockModsMask;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbChangeEnabledControls(	Display *	dpy,
-				unsigned	deviceSpec,
-				unsigned	affect,
-				unsigned	values)
-#else
-XkbChangeEnabledControls(dpy,deviceSpec,affect,values)
-    Display *	dpy;
-    unsigned	deviceSpec;
-    unsigned	affect;
-    unsigned	values;
-#endif
-{
-    register xkbSetControlsReq *req;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    LockDisplay(dpy);
-    req= _XkbGetSetControlsReq(dpy,dpy->xkb_info,deviceSpec);
-    req->affectEnabledCtrls= affect;
-    req->enabledCtrls= (affect&values);
-    req->changeCtrls = XkbControlsEnabledMask;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-Status 
-#if NeedFunctionPrototypes
-XkbGetControls(Display *dpy, unsigned long which, XkbDescPtr xkb)
-#else
-XkbGetControls(dpy, which, xkb)
-    Display *dpy;
-    unsigned long which;
-    XkbDescPtr xkb;
-#endif
-{
-    register xkbGetControlsReq *req;
-    xkbGetControlsReply rep;
-    XkbControlsPtr	ctrls;
-    XkbInfoPtr xkbi;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return BadAccess;
-    if ((!xkb) || (!which))
-	return BadMatch;
-
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbGetControls, req);
-    if (!xkb->ctrls)  {
-	xkb->ctrls = _XkbTypedCalloc(1,XkbControlsRec);
-	if (!xkb->ctrls) {
-	    UnlockDisplay(dpy);
-	    SyncHandle();
-	    return BadAlloc;
-	} 
-    }
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbGetControls;
-    req->deviceSpec = xkb->device_spec;
-    if (!_XReply(dpy, (xReply *)&rep, 
-		(SIZEOF(xkbGetControlsReply)-SIZEOF(xReply))>>2, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return BadImplementation;
-    }
-    if (xkb->device_spec==XkbUseCoreKbd)
-	xkb->device_spec= rep.deviceID;
-    ctrls= xkb->ctrls;
-    if (which&XkbControlsEnabledMask)
-	ctrls->enabled_ctrls = rep.enabledCtrls;
-    ctrls->num_groups= rep.numGroups;
-    if (which&XkbGroupsWrapMask)
-	ctrls->groups_wrap= rep.groupsWrap;
-    if (which&XkbInternalModsMask) {
-	ctrls->internal.mask = rep.internalMods;
-	ctrls->internal.real_mods = rep.internalRealMods;
-	ctrls->internal.vmods = rep.internalVMods;
-    }
-    if (which&XkbIgnoreLockModsMask) {
-	ctrls->ignore_lock.mask = rep.ignoreLockMods;
-	ctrls->ignore_lock.real_mods = rep.ignoreLockRealMods;
-	ctrls->ignore_lock.vmods = rep.ignoreLockVMods;
-    }
-    if (which&XkbRepeatKeysMask) {
-	ctrls->repeat_delay = rep.repeatDelay;
-	ctrls->repeat_interval = rep.repeatInterval;
-    }
-    if (which&XkbSlowKeysMask)
-	ctrls->slow_keys_delay = rep.slowKeysDelay;
-    if (which&XkbBounceKeysMask)
-	ctrls->debounce_delay = rep.debounceDelay;
-    if (which&XkbMouseKeysMask) {
-	ctrls->mk_dflt_btn = rep.mkDfltBtn;
-    }
-    if (which&XkbMouseKeysAccelMask) {
-	ctrls->mk_delay = rep.mkDelay;
-	ctrls->mk_interval = rep.mkInterval;
-	ctrls->mk_time_to_max = rep.mkTimeToMax;
-	ctrls->mk_max_speed = rep.mkMaxSpeed;
-	ctrls->mk_curve = rep.mkCurve;
-    }
-    if (which&XkbAccessXKeysMask)
-	ctrls->ax_options= rep.axOptions;
-    if (which&XkbAccessXTimeoutMask) {
-	ctrls->ax_timeout = rep.axTimeout;
-	ctrls->axt_ctrls_mask = rep.axtCtrlsMask;
-	ctrls->axt_ctrls_values = rep.axtCtrlsValues;
-	ctrls->axt_opts_mask = rep.axtOptsMask;
-	ctrls->axt_opts_values= rep.axtOptsValues;
-    }
-    if (which&XkbPerKeyRepeatMask) {
-   	memcpy(ctrls->per_key_repeat,rep.perKeyRepeat,
-					  XkbPerKeyBitArraySize); 
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return Success;
-}
-
-Bool 
-#if NeedFunctionPrototypes
-XkbSetControls(Display *dpy, unsigned long which, XkbDescPtr xkb)
-#else
-XkbSetControls(dpy, which, xkb)
-    Display *		dpy;
-    unsigned long 	which;
-    XkbDescPtr		xkb;
-#endif
-{
-    register xkbSetControlsReq *req;
-    XkbControlsPtr	ctrls;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    if ((!xkb)||(!xkb->ctrls))
-	return False;
-
-    ctrls= xkb->ctrls;
-    LockDisplay(dpy);
-    req= _XkbGetSetControlsReq(dpy,dpy->xkb_info,xkb->device_spec);
-    req->changeCtrls = (CARD32)which;
-    if (which&XkbInternalModsMask) {
-	req->affectInternalMods= ~0;
-	req->internalMods= ctrls->internal.real_mods;
-	req->affectInternalVMods = ~0;
-	req->internalVMods= ctrls->internal.vmods;
-    }
-    if (which&XkbIgnoreLockModsMask) {
-	req->affectIgnoreLockMods= ~0;
-	req->ignoreLockMods= ctrls->ignore_lock.real_mods;
-	req->affectIgnoreLockVMods= ~0;
-	req->ignoreLockVMods= ctrls->ignore_lock.vmods;
-    }
-    if (which&XkbControlsEnabledMask) {
-	req->affectEnabledCtrls= XkbAllBooleanCtrlsMask;
-	req->enabledCtrls= ctrls->enabled_ctrls;
-    }
-    if (which&XkbRepeatKeysMask) {
-	req->repeatDelay = ctrls->repeat_delay;
-	req->repeatInterval = ctrls->repeat_interval;
-    }
-    if (which&XkbSlowKeysMask)
-	 req->slowKeysDelay = ctrls->slow_keys_delay;
-    if (which&XkbBounceKeysMask)
-	 req->debounceDelay = ctrls->debounce_delay;
-    if (which&XkbMouseKeysMask) {
-	req->mkDfltBtn = ctrls->mk_dflt_btn;
-    }
-    if (which&XkbGroupsWrapMask)
-	req->groupsWrap= ctrls->groups_wrap;
-    if (which&(XkbAccessXKeysMask|XkbStickyKeysMask|XkbAccessXFeedbackMask))
-	req->axOptions= ctrls->ax_options;
-    if (which&XkbMouseKeysAccelMask) {
-	req->mkDelay = ctrls->mk_delay;
-	req->mkInterval = ctrls->mk_interval;
-	req->mkTimeToMax = ctrls->mk_time_to_max;
-	req->mkMaxSpeed = ctrls->mk_max_speed;
-	req->mkCurve = ctrls->mk_curve;
-    }
-    if (which&XkbAccessXTimeoutMask) {
-	 req->axTimeout = ctrls->ax_timeout;
-	 req->axtCtrlsMask = ctrls->axt_ctrls_mask;
-	 req->axtCtrlsValues = ctrls->axt_ctrls_values;
-	 req->axtOptsMask = ctrls->axt_opts_mask;
-	 req->axtOptsValues=ctrls->axt_opts_values;
-    }
-    if (which&XkbPerKeyRepeatMask) {
-	memcpy(req->perKeyRepeat,ctrls->per_key_repeat,
-					XkbPerKeyBitArraySize);
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return False;
-}
-
-/***====================================================================***/
-
-void
-#if NeedFunctionPrototypes
-XkbNoteControlsChanges(	XkbControlsChangesPtr		old,
-			XkbControlsNotifyEvent *	new,
-			unsigned int	 		wanted)
-#else
-XkbNoteControlsChanges(old,new,wanted)
-    XkbControlsChangesPtr	old;
-    XkbControlsNotifyEvent *	new;
-    unsigned int	 	wanted;
-#endif
-{
-    old->changed_ctrls|= (new->changed_ctrls&wanted);
-    if (new->changed_ctrls&XkbControlsEnabledMask&wanted)
-	old->enabled_ctrls_changes^= new->enabled_ctrl_changes;
-    /* num_groups_changed?? */
-    return;
-}
diff --git a/xc/lib/X11/XKBCvt.c b/xc/lib/X11/XKBCvt.c
deleted file mode 100644
index fbf7d079f..000000000
--- a/xc/lib/X11/XKBCvt.c
+++ /dev/null
@@ -1,713 +0,0 @@
-/* $TOG: XKBCvt.c /main/35 1998/05/30 20:29:41 kaleb $ */
-/*
-
-Copyright 1988, 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/XKBCvt.c,v 3.20 1999/06/06 14:05:52 dawes Exp $ */
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <X11/X.h>
-#include <X11/Xlib.h>
-#define NEED_EVENTS
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "XlcPubI.h"
-#include <X11/Xutil.h>
-#include <X11/Xmd.h>
-#define XK_LATIN1
-#define XK_PUBLISHING
-#include <X11/keysym.h>
-#include <X11/extensions/XKBproto.h>
-#include "XKBlibint.h"
-#include <X11/Xlocale.h>
-#include <ctype.h>
-#include <X11/Xos.h>
-
-#ifdef __sgi_not_xconsortium
-#define	XKB_EXTEND_LOOKUP_STRING
-#endif
-
-#ifdef X_NOT_STDC_ENV
-extern char *getenv();
-#endif
-
-#ifdef __STDC__
-#define Const const
-#else
-#define Const /**/
-#endif
-#if defined(__STDC__) && !defined(NORCONST)
-#define RConst const
-#else
-#define RConst /**/
-#endif
-
-/* bit (1<<i) means character is in codeset i at the same codepoint */
-extern unsigned int _Xlatin1[];
-
-/* bit (1<<i) means character is in codeset i at the same codepoint */
-extern unsigned int _Xlatin2[];
-
-/* maps Cyrillic keysyms to KOI8-R */
-extern unsigned char _Xkoi8_r[];
-
-/* maps Cyrillic keysyms to KOI8-U */
-extern unsigned char _Xkoi8_u[];
-
-extern unsigned short _Xkoi8_size;
-
-#define sLatin1         0
-#define sLatin2         1
-#define sLatin3         2
-#define sLatin4         3
-#define sKana           4
-#define sX0201          0x01000004
-#define sArabic         5
-#define sCyrillic       6
-#define sGreek          7
-#define sAPL            11
-#define sHebrew         12
-#define sThai		13
-#define sKorean		14
-#define sLatin5		15
-#define sLatin6		16
-#define sLatin7		17
-#define sLatin8		18
-#define sLatin9		19
-#define sArmenian 	20
-#define sGeorgian 	21
-#define sCurrency	32
-
-
-static unsigned long	WantLatin1 = sLatin1;
-static unsigned long	WantLatin2 = sLatin2;
-static unsigned long	WantLatin3 = sLatin3;
-static unsigned long	WantLatin4 = sLatin4;
-static unsigned long	WantLatin5 = sLatin5;
-static unsigned long	WantLatin6 = sLatin6;
-static unsigned long	WantKana = sKana;
-static unsigned long	WantX0201 = sX0201;
-static unsigned long	WantArabic = sArabic;
-static unsigned long	WantCyrillic = sCyrillic;
-static unsigned long	WantGreek = sGreek;
-static unsigned long	WantAPL = sAPL;
-static unsigned long	WantHebrew = sHebrew;
-static unsigned long	WantArmenian = sArmenian;
-static unsigned long	WantGeorgian = sGeorgian;
-
-static int 
-#if NeedFunctionPrototypes
-_XkbHandleSpecialSym(KeySym keysym, char *buffer, int nbytes, int *extra_rtrn)
-#else
-_XkbHandleSpecialSym(keysym, buffer, nbytes, extra_rtrn)
-    KeySym	 keysym;
-    char	*buffer;
-    int		 nbytes;
-    int *	 extra_rtrn;
-#endif
-{
-
-    /* try to convert to Latin-1, handling ctrl */
-    if (!(((keysym >= XK_BackSpace) && (keysym <= XK_Clear)) ||
-	   (keysym == XK_Return) || (keysym == XK_Escape) ||
-	   (keysym == XK_KP_Space) || (keysym == XK_KP_Tab) ||
-	   (keysym == XK_KP_Enter) || 
-	   ((keysym >= XK_KP_Multiply) && (keysym <= XK_KP_9)) ||
-	   (keysym == XK_KP_Equal) ||
-	   (keysym == XK_Delete)))
-	return 0;
-
-    if (nbytes<1) {
-	if (extra_rtrn) 
-	    *extra_rtrn= 1;
-	return 0;
-    }
-    /* if X keysym, convert to ascii by grabbing low 7 bits */
-    if (keysym == XK_KP_Space)
-	 buffer[0] = XK_space & 0x7F; /* patch encoding botch */
-    else if (keysym == XK_hyphen)
-	 buffer[0] = (char)(XK_minus & 0xFF); /* map to equiv character */
-    else buffer[0] = (char)(keysym & 0x7F);
-    return 1;
-}
-
-extern int
-_XGetCharCode (
-#if NeedFunctionPrototypes
-    unsigned long, KeySym, char*, int
-#endif
-);
-
-/*ARGSUSED*/
-int 
-#if NeedFunctionPrototypes
-_XkbKSToKnownSet (	XPointer 	priv,
-			KeySym 		keysym,
-			char *		buffer,
-			int 		nbytes,
-			int *		extra_rtrn)
-#else
-_XkbKSToKnownSet (priv, keysym, buffer, nbytes, extra_rtrn)
-    XPointer priv;
-    KeySym keysym;
-    char *buffer;
-    int nbytes;
-    int *extra_rtrn;
-#endif
-{
-    unsigned long kset,keysymSet;
-    int	count,isLatin1;
-    char tbuf[8],*buf;
-
-    if (extra_rtrn)
-	*extra_rtrn= 0;
-
-    keysymSet = *((unsigned long *)priv);
-    kset = keysymSet&0xffffff;
-
-    /* convert "dead" diacriticals for dumb applications */
-    if ( (keysym&0xffffff00)== 0xfe00 ) {
-	switch ( keysym ) {
-	    case XK_dead_grave:		keysym = XK_grave; break;
-	    case XK_dead_acute:		keysym = XK_acute; break;
-	    case XK_dead_circumflex:	keysym = XK_asciicircum; break;
-	    case XK_dead_tilde:		keysym = XK_asciitilde; break;
-	    case XK_dead_macron:	keysym = XK_macron; break;
-	    case XK_dead_breve:		keysym = XK_breve; break;
-	    case XK_dead_abovedot:	keysym = XK_abovedot; break;
-	    case XK_dead_diaeresis:	keysym = XK_diaeresis; break;
-	    case XK_dead_abovering:	keysym = XK_degree; break;
-	    case XK_dead_doubleacute:	keysym = XK_doubleacute; break;
-	    case XK_dead_caron:		keysym = XK_caron; break;
-	    case XK_dead_cedilla:	keysym = XK_cedilla; break;
-	    case XK_dead_ogonek	:	keysym = XK_ogonek; break;
-	    case XK_dead_iota:		keysym = XK_Greek_iota; break;
-#ifdef XK_KATAKANA
-	    case XK_dead_voiced_sound:	keysym = XK_voicedsound; break;
-	    case XK_dead_semivoiced_sound:keysym = XK_semivoicedsound; break;
-#endif
-	}
-    }
-
-    isLatin1 = ((keysym&0xffffff00)==0);
-    count = 0;
-
-    if (nbytes<1)	buf= tbuf;
-    else		buf= buffer;
-
-    if ((keysym&0xffffff00)==0xff00) {
-	return _XkbHandleSpecialSym(keysym, buf, nbytes, extra_rtrn);
-    }
-    return _XGetCharCode (keysymSet, keysym, buf, nbytes);
-}
-
-typedef struct _XkbToKS {
-	unsigned	 prefix;
-	char		*map;
-} XkbToKS;
-
-/*ARGSUSED*/
-static KeySym
-#if NeedFunctionPrototypes
-_XkbKnownSetToKS(XPointer priv,char *buffer,int nbytes,Status *status)
-#else
-_XkbKnownSetToKS(priv,buffer,nbytes,status)
-    XPointer priv;
-    char *buffer;
-    int nbytes;
-    Status *status;
-#endif
-{
-    if (nbytes!=1)
-	return NoSymbol;
-    if (((buffer[0]&0x80)==0)&&(buffer[0]>=32))
-	return buffer[0];
-    else if ((buffer[0]&0x7f)>=32) { 
-	XkbToKS *map= (XkbToKS *)priv;
-	if ( map ) {
-	    if ( map->map )	return map->prefix|map->map[buffer[0]&0x7f];
-	    else		return map->prefix|buffer[0];
-	}
-	return buffer[0];
-    }
-    return NoSymbol;
-}
-
-/*ARGSUSED*/
-int 
-#if NeedFunctionPrototypes
-_XkbKSToThai (	XPointer 	priv,
-		KeySym 		keysym,
-		char *		buffer,
-		int 		nbytes,
-		int *		extra_rtrn)
-#else
-_XkbKSToThai (priv, keysym, buffer, nbytes, extra_rtrn)
-    XPointer priv;
-    KeySym keysym;
-    char *buffer;
-    int nbytes;
-    int *extra_rtrn;
-#endif
-{
-
-    if ((keysym&0xffffff00)==0xff00) {
-        return _XkbHandleSpecialSym(keysym, buffer, nbytes, extra_rtrn);
-    }
-    else if (((keysym&0xffffff80)==0xd80)||((keysym&0xffffff80)==0)) {
-        if (nbytes>0) {
-            buffer[0]= (char)(keysym&0xff);
-            if (nbytes>1)
-                buffer[1]= '\0';
-            return 1;
-        }
-	if (extra_rtrn)
-	    *extra_rtrn= 1;
-    }
-    return 0;
-}
-
-/*ARGSUSED*/
-static KeySym
-#if NeedFunctionPrototypes
-_XkbThaiToKS(XPointer priv,char *buffer,int nbytes,Status *status)
-#else
-_XkbThaiToKS(priv,buffer,nbytes,status)
-    XPointer priv;
-    char *buffer;
-    int nbytes;
-    Status *status;
-#endif
-{
-    if (nbytes!=1)
-        return NoSymbol;
-    if (((buffer[0]&0x80)==0)&&(buffer[0]>=32))
-        return buffer[0];
-    else if ((buffer[0]&0x7f)>=32) {
-        return 0xd00|buffer[0];
-    }
-    return NoSymbol;
-}
-
-static KeySym
-#if NeedFunctionPrototypes
-__XkbDefaultToUpper(KeySym sym)
-#else
-__XkbDefaultToUpper(sym)
-    KeySym	sym;
-#endif
-{
-    KeySym	lower,upper;
-
-    XConvertCase(sym, &lower, &upper);
-    return upper;
-}
-
-static int
-_XkbKSToKoi8_r (priv, keysym, buffer, nbytes, status)
-    XPointer priv;
-    KeySym keysym;
-    char *buffer;
-    int nbytes;
-    Status *status;
-{
-    if ((keysym&0xffffff00)==0xff00) {
-        return _XkbHandleSpecialSym(keysym, buffer, nbytes, status);
-    }
-    else if (((keysym&0xffffff80)==0x680)||((keysym&0xffffff80)==0)) {
-	if (nbytes>0) {
-	    if ( (keysym&0x80)==0 )
-		 buffer[0] = keysym&0x7f;
-	    else buffer[0] = _Xkoi8_r[keysym & 0x7f];
-	    if (nbytes>1)
-		buffer[1]= '\0';
-	    return 1;
-	}
-    }
-    return 0;
-}
-
-static KeySym
-_XkbKoi8_rToKS(priv,buffer,nbytes,status)
-    XPointer priv;
-    char *buffer;
-    int nbytes;
-    Status *status;
-{
-    if (nbytes!=1)
-        return NoSymbol;
-    if (((buffer[0]&0x80)==0)&&(buffer[0]>=32))
-        return buffer[0];
-    else if ((buffer[0]&0x7f)>=32) {
-	register int i;
-	for (i=0;i<_Xkoi8_size;i++) {
-	    if (_Xkoi8_r[i]==buffer[0])
-		return 0x680|i;
-	}
-    }
-    return NoSymbol;
-}
-
-/***========================KOI8-U======================================***/
-static int _XkbKSToKoi8_u (priv, keysym, buffer, nbytes, status)
-    XPointer priv;
-    KeySym keysym;
-    char *buffer;
-    int nbytes;
-    Status *status;
-{
-    if ((keysym&0xffffff00)==0xff00) {
-        return _XkbHandleSpecialSym(keysym, buffer, nbytes, status);
-    }
-    else if (((keysym&0xffffff80)==0x680)||((keysym&0xffffff80)==0)) {
-	if (nbytes>0) {
-	    if ( (keysym&0x80)==0 )
-		 buffer[0] = keysym&0x7f;
-	    else buffer[0] = _Xkoi8_u[keysym & 0x7f];
-	    if (nbytes>1)
-		buffer[1]= '\0';
-	    return 1;
-	}
-    }
-    return 0;
-}
-
-static KeySym
-_XkbKoi8_uToKS(priv,buffer,nbytes,status)
-    XPointer priv;
-    char *buffer;
-    int nbytes;
-    Status *status;
-{
-    if (nbytes!=1)
-        return NoSymbol;
-    if (((buffer[0]&0x80)==0)&&(buffer[0]>=32))
-        return buffer[0];
-    else if ((buffer[0]&0x7f)>=32) {
-	register int i;
-	for (i=0;i<_Xkoi8_size;i++) {
-	    if (_Xkoi8_u[i]==buffer[0])
-		return 0x680|i;
-	}
-    }
-    return NoSymbol;
-}
-
-
-
-
-/***====================================================================***/
-
-
-static XkbConverters RConst cvt_ascii = {
-	_XkbKSToKnownSet,(XPointer)&WantLatin1,_XkbKnownSetToKS,NULL,__XkbDefaultToUpper
-};
-
-static XkbConverters RConst cvt_latin1 = {
-	_XkbKSToKnownSet,(XPointer)&WantLatin1,_XkbKnownSetToKS,NULL,NULL
-};
-
-static XkbConverters RConst cvt_latin2 = {
-	_XkbKSToKnownSet,(XPointer)&WantLatin2,_XkbKnownSetToKS,NULL,NULL
-};
-
-static XkbConverters RConst cvt_latin3 = {
-	_XkbKSToKnownSet,(XPointer)&WantLatin3,_XkbKnownSetToKS,NULL,NULL
-};
-
-static XkbConverters RConst cvt_latin4 = {
-	_XkbKSToKnownSet,(XPointer)&WantLatin4,_XkbKnownSetToKS,NULL,NULL
-};
-
-static XkbConverters RConst cvt_latin5 = {
-	_XkbKSToKnownSet,(XPointer)&WantLatin5,_XkbKnownSetToKS,NULL,NULL
-};
-
-static XkbConverters RConst cvt_latin6 = {
-	_XkbKSToKnownSet,(XPointer)&WantLatin6,_XkbKnownSetToKS,NULL,NULL
-};
-
-static XkbConverters RConst cvt_kana = {
-	_XkbKSToKnownSet,(XPointer)&WantKana,_XkbKnownSetToKS,NULL,NULL
-};
-
-static XkbConverters RConst cvt_X0201 = {
-	_XkbKSToKnownSet,(XPointer)&WantX0201,_XkbKnownSetToKS,NULL,NULL
-};
-
-static XkbConverters RConst cvt_Arabic = {
-	_XkbKSToKnownSet,(XPointer)&WantArabic,_XkbKnownSetToKS,NULL,NULL
-};
-
-static XkbConverters RConst cvt_Cyrillic = {
-	_XkbKSToKnownSet,(XPointer)&WantCyrillic,_XkbKnownSetToKS,NULL,NULL
-};
-
-static XkbConverters RConst cvt_Greek = {
-	_XkbKSToKnownSet,(XPointer)&WantGreek,_XkbKnownSetToKS,NULL,NULL
-};
-
-static XkbConverters RConst cvt_APL = {
-	_XkbKSToKnownSet,(XPointer)&WantAPL,_XkbKnownSetToKS,NULL,NULL
-};
-
-static XkbConverters RConst cvt_Hebrew = {
-	_XkbKSToKnownSet,(XPointer)&WantHebrew,_XkbKnownSetToKS,NULL,NULL
-};
-
-static XkbConverters    cvt_Thai = {
-        _XkbKSToThai, NULL, _XkbThaiToKS, NULL, NULL
-};
-
-static XkbConverters    cvt_Koi8_r = {
-        _XkbKSToKoi8_r, NULL, _XkbKoi8_rToKS, NULL, NULL
-};
-
-static XkbConverters    cvt_Koi8_u = {
-        _XkbKSToKoi8_u, NULL, _XkbKoi8_uToKS, NULL, NULL
-};
-
-static int
-#if NeedFunctionPrototypes
-Strcmp(char *str1, char *str2)
-#else
-Strcmp(str1, str2)
-    char *str1, *str2;
-#endif
-{
-    char str[256];
-    char c, *s;
-
-    /*
-     * unchecked strings from the environment can end up here, so check
-     * the length before copying.
-     */
-    if (strlen(str1) >= sizeof(str)) /* almost certain it's a mismatch */
-	return 1;
-
-    for (s = str; (c = *str1++); ) {
-	if (isupper(c))
-	    c = tolower(c);
-	*s++ = c;
-    }
-    *s = '\0';
-    return (strcmp(str, str2));
-}
-
-int 
-#if NeedFunctionPrototypes
-_XkbGetConverters(char *encoding_name, XkbConverters *cvt_rtrn)
-#else
-_XkbGetConverters(encoding_name, cvt_rtrn)
-    char *encoding_name;
-    XkbConverters *cvt_rtrn;
-#endif
-{
-    if ( cvt_rtrn ) {
-	if ( (encoding_name==NULL) || 
-	     (Strcmp(encoding_name,"ascii")==0) ||
-	     (Strcmp(encoding_name,"string")==0) )
-	     *cvt_rtrn = cvt_ascii;
-	else if (Strcmp(encoding_name,"iso8859-1")==0)
-	     *cvt_rtrn = cvt_latin1;
-	else if (Strcmp(encoding_name, "iso8859-2")==0)
-	     *cvt_rtrn = cvt_latin2;
-	else if (Strcmp(encoding_name, "iso8859-3")==0)
-	     *cvt_rtrn = cvt_latin3;
-	else if (Strcmp(encoding_name, "iso8859-4")==0)
-	     *cvt_rtrn = cvt_latin4;
-	else if (Strcmp(encoding_name, "iso8859-5")==0)
-	     *cvt_rtrn = cvt_Cyrillic;
-	else if (Strcmp(encoding_name, "iso8859-6")==0)
-	     *cvt_rtrn = cvt_Arabic;
-	else if (Strcmp(encoding_name, "iso8859-7")==0)
-	     *cvt_rtrn = cvt_Greek;
-	else if (Strcmp(encoding_name, "iso8859-8")==0)
-	     *cvt_rtrn = cvt_Hebrew;
-	else if (Strcmp(encoding_name, "iso8859-9")==0)
-	     *cvt_rtrn = cvt_latin5;
-	else if (Strcmp(encoding_name, "iso8859-10")==0)
-	     *cvt_rtrn = cvt_latin6;
-	else if (Strcmp(encoding_name, "apl")==0)
-	     *cvt_rtrn = cvt_APL;
-#if 0
-	else if (Strcmp(encoding_name, "ja.euc")==0)
-	     *cvt_rtrn = ???;
-	else if (Strcmp(encoding_name, "ja.jis")==0)
-	     *cvt_rtrn = ???;
-	else if (Strcmp(encoding_name, "ja.sjis")==0)
-	     *cvt_rtrn = ???;
-#endif 
-	else if (Strcmp(encoding_name, "jisx0201")==0) /* ??? */
-	     *cvt_rtrn = cvt_X0201;
-	else if (Strcmp(encoding_name, "kana")==0) /* ??? */
-	     *cvt_rtrn = cvt_kana;
-	else if ((Strcmp(encoding_name, "tactis")==0) ||
-		 (Strcmp(encoding_name, "tis620.2533-1")==0))
-	     *cvt_rtrn = cvt_Thai;
-	else if (Strcmp(encoding_name, "koi8-r")==0)
-	     *cvt_rtrn = cvt_Koi8_r;
-        else if (Strcmp(encoding_name, "koi8-u")==0)
-	     *cvt_rtrn = cvt_Koi8_u;
-	/* other codesets go here */
-	else *cvt_rtrn = cvt_latin1;
-	return 1;
-    }
-    *cvt_rtrn= cvt_latin1;
-    return 1;
-}
-
-/***====================================================================***/
-
-/* 
- * The function _XkbGetCharset seems to be missnamed as what it seems to
- * be used for is to determine the encoding-name for the locale. ???
- */
-
-#ifdef XKB_EXTEND_LOOKUP_STRING
-
-/* 
- * XKB_EXTEND_LOOKUP_STRING is not used by the SI. It is used by various
- * X Consortium/X Project Team members, so we leave it in the source as
- * an simplify integration by these companies.
- */
-
-#define	CHARSET_FILE	"/usr/lib/X11/input/charsets"
-static char *_XkbKnownLanguages = "c=ascii:da,de,en,es,fi,fr,is,it,nl,no,pt,sv=iso8859-1:hu,pl,cs=iso8859-2:eo=iso8859-3:lt,lv,ee=iso8859-4:bg,sr=iso8859-5:ar,ara=iso8859-6:el=iso8859-7:he=iso8859-8:tr=iso8859-9:ru=koi8-r:uk=koi8-u:th,th_TH,th_TH.TACTIS=tactis:hy=armscii-8:vi=tcvn-5712:ka=georgian-academy";
-
-char	*
-_XkbGetCharset()
-{
-    /*
-     * PAGE USAGE TUNING: explicitly initialize to move these to data
-     * instead of bss
-     */
-    static char buf[100] = { 0 };
-    char lang[256];
-    char *start,*tmp,*end,*next,*set;
-    char *country,*charset;
-    char *locale;
-
-    tmp = getenv( "_XKB_CHARSET" );
-    if ( tmp )
-	return tmp;
-    locale = setlocale(LC_CTYPE,NULL);
-
-    if ( locale == NULL )
-	return NULL;
-
-    if (strlen(locale) >= sizeof(lang))
-	return NULL;
-
-    for (tmp = lang; *tmp = *locale++; tmp++) {
-	if (isupper(*tmp))
-	    *tmp = tolower(*tmp);
-    }
-    country = strchr( lang, '_');
-    if ( country ) {
-	*country++ = '\0';
-	charset = strchr( country, '.' );
-	if ( charset )	*charset++ = '\0';
-	if ( charset ) {
-	    strncpy(buf,charset,99);
-	    buf[99] = '\0';
-	    return buf;
-	}
-    }
-    else { 
-	charset = NULL;
-    }
-
-    if ((tmp = getenv("_XKB_LOCALE_CHARSETS"))!=NULL) {
-	start = _XkbAlloc(strlen(tmp) + 1);
-	strcpy(start, tmp);
-	tmp = start;
-    } else {
-	struct stat sbuf;
-	FILE *file;
-#ifndef __EMX__
-	char *cf = CHARSET_FILE;
-#else
-        char *cf = __XOS2RedirRoot(CHARSET_FILE);
-#endif
-	if ( (stat(cf,&sbuf)==0) && (sbuf.st_mode&S_IFREG) &&
-	    (file = fopen(cf,"r")) ) {
-	    tmp = _XkbAlloc(sbuf.st_size+1);
-	    if (tmp!=NULL) {
-		sbuf.st_size = (long)fread(tmp,1,sbuf.st_size,file);
-		tmp[sbuf.st_size] = '\0';
-	    }
-	    fclose(file);
-	}
-    }
-
-    if ( tmp == NULL ) {
-	tmp = _XkbAlloc(strlen(_XkbKnownLanguages) + 1);
-	if (!tmp)
-	    return NULL;
-	strcpy(tmp, _XkbKnownLanguages);
-    }
-    start = tmp;
-    do {
-	if ( (set=strchr(tmp,'=')) == NULL )
-	    break;
-	*set++ = '\0';
-	if ( (next=strchr(set,':')) != NULL ) 
-	    *next++ = '\0';
-	while ( tmp && *tmp ) {
-	    if ( (end=strchr(tmp,',')) != NULL )
-		*end++ = '\0';
-	    if ( Strcmp( tmp, lang ) == 0 ) {
-		strncpy(buf,set,100);
-		buf[99] = '\0';
-		Xfree(start);
-		return buf;
-	    }
-	    tmp = end;
-	}
-	tmp = next;
-    } while ( tmp && *tmp );
-    Xfree(start);
-    return NULL;
-}
-#else
-char	*
-_XkbGetCharset()
-{
-    char *tmp;
-    XLCd lcd;
-
-    tmp = getenv( "_XKB_CHARSET" );
-    if ( tmp )
-	return tmp;
-
-    lcd = _XlcCurrentLC();
-    if ( lcd )
-	return XLC_PUBLIC(lcd,encoding_name);
-
-    return NULL;
-}
-#endif
-
diff --git a/xc/lib/X11/XKBExtDev.c b/xc/lib/X11/XKBExtDev.c
deleted file mode 100644
index d0056089a..000000000
--- a/xc/lib/X11/XKBExtDev.c
+++ /dev/null
@@ -1,956 +0,0 @@
-/* $XConsortium: XKBExtDev.c /main/3 1996/08/31 12:44:26 kaleb $ */
-/************************************************************
-Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-/* $XFree86: xc/lib/X11/XKBExtDev.c,v 3.2 1999/05/09 10:50:23 dawes Exp $ */
-
-#include <stdio.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
-#define	NEED_MAP_READERS
-#include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
-#include "XKBlibint.h"
-#include <X11/extensions/XI.h>
-
-/***====================================================================***/
-
-extern	void
-#if NeedFunctionPrototypes
-XkbNoteDeviceChanges(	XkbDeviceChangesPtr		old,
-			XkbExtensionDeviceNotifyEvent *	new,
-			unsigned int			wanted)
-#else
-XkbNoteDeviceChanges(old,new,wanted)
-    XkbDeviceChangesPtr			old;
-    XkbExtensionDeviceNotifyEvent *	new;
-    unsigned int			wanted;
-#endif
-{
-    if ((!old)||(!new)||(!wanted)||((new->reason&wanted)==0))
-	return;
-    if ((wanted&new->reason)&XkbXI_ButtonActionsMask) {
-	if (old->changed&XkbXI_ButtonActionsMask) {
-	    int first,last,newLast;
-	    if (new->first_btn<old->first_btn)
-		 first= new->first_btn;
-	    else first= old->first_btn;
-	    last= old->first_btn+old->num_btns-1;
-	    newLast= new->first_btn+new->num_btns-1;
-	    if (newLast>last)
-		last= newLast;
-	    old->first_btn= first;
-	    old->num_btns= (last-first)+1;
-	}
-	else {
-	    old->changed|= XkbXI_ButtonActionsMask;
-	    old->first_btn= new->first_btn;
-	    old->num_btns= new->num_btns;
-	}
-    }
-    if ((wanted&new->reason)&XkbXI_IndicatorsMask) {
-	XkbDeviceLedChangesPtr this;
-	if (old->changed&XkbXI_IndicatorsMask) {
-	    XkbDeviceLedChangesPtr found;
-	    found= NULL;
-	    for (this= &old->leds;this&&(!found);this=this->next) {
-		if ((this->led_class==new->led_class)&&
-						(this->led_id==new->led_id)) {
-		    found= this;
-		}
-	    }
-	    if (!found) {
-		found= _XkbTypedCalloc(1,XkbDeviceLedChangesRec);
-		if (!found)
-		    return;
-		found->next= old->leds.next;
-		found->led_class= new->led_class;
-		found->led_id= new->led_id;
-		old->leds.next= found;
-	    }
-	    if ((wanted&new->reason)&XkbXI_IndicatorNamesMask)
-		found->defined= new->leds_defined;
-	}
-	else {
-	    old->changed|= ((wanted&new->reason)&XkbXI_IndicatorsMask);
-	    old->leds.led_class= new->led_class;
-	    old->leds.led_id= new->led_id;
-	    old->leds.defined= new->leds_defined;
-	    if (old->leds.next) {
-		XkbDeviceLedChangesPtr next;
-		for (this=old->leds.next;this;this=next) {
-		    next= this->next;
-		    _XkbFree(this);
-		}
-		old->leds.next= NULL;
-	    }
-	}
-    }
-    return;
-}
-
-/***====================================================================***/
-
-static Status
-#if NeedFunctionPrototypes
-_XkbReadDeviceLedInfo(	XkbReadBufferPtr	buf,
-			unsigned 		present,
-			XkbDeviceInfoPtr 	devi)
-#else
-_XkbReadDeviceLedInfo(buf,present,devi)
-    XkbReadBufferPtr	buf;
-    unsigned		present;
-    XkbDeviceInfoPtr	devi;
-#endif
-{
-register unsigned	i,bit;
-XkbDeviceLedInfoPtr	devli;
-xkbDeviceLedsWireDesc *	wireli;
-
-    wireli= _XkbGetTypedRdBufPtr(buf,1,xkbDeviceLedsWireDesc);
-    if (!wireli)
-	return BadLength;
-    devli= XkbAddDeviceLedInfo(devi,wireli->ledClass,wireli->ledID);
-    if (!devli)
-	return BadAlloc;
-    devli->phys_indicators= 	wireli->physIndicators;
-
-    if (present&XkbXI_IndicatorStateMask)
-	devli->state= wireli->state;
-
-    if (present&XkbXI_IndicatorNamesMask) {
-	devli->names_present= 	wireli->namesPresent;
-	if (devli->names_present) {
-	    for (i=0,bit=1;i<XkbNumIndicators;i++,bit<<=1) {
-		if (wireli->namesPresent&bit) {
-		    if (!_XkbCopyFromReadBuffer(buf,(char *)&devli->names[i],4))
-			return BadLength;
-		}
-	    }
-	}
-    }
-
-    if (present&XkbXI_IndicatorMapsMask) {
-	devli->maps_present= 	wireli->mapsPresent;
-	if (devli->maps_present) {
-	    XkbIndicatorMapPtr	 	im;
-	    xkbIndicatorMapWireDesc *	wireim;
-	    for (i=0,bit=1;i<XkbNumIndicators;i++,bit<<=1) {
-		if (wireli->mapsPresent&bit) {
-		    wireim= _XkbGetTypedRdBufPtr(buf,1,xkbIndicatorMapWireDesc);
-		    if (!wireim)
-			return BadAlloc;
-		    im= &devli->maps[i];
-		    im->flags= 		wireim->flags;
-		    im->which_groups= 	wireim->whichGroups;
-		    im->groups= 	wireim->groups;
-		    im->which_mods= 	wireim->whichMods;
-		    im->mods.mask= 	wireim->mods;
-		    im->mods.real_mods= wireim->realMods;
-		    im->mods.vmods= 	wireim->virtualMods;
-		    im->ctrls= 		wireim->ctrls;
-		}
-	    }
-	}
-    }
-    return Success;
-}
-
-static Status
-#if NeedFunctionPrototypes
-_XkbReadGetDeviceInfoReply(	Display *		dpy,
-				xkbGetDeviceInfoReply *	rep,
-				XkbDeviceInfoPtr	devi)
-#else
-_XkbReadGetDeviceInfoReply(dpy,rep,devi)
-    Display *			dpy;
-    xkbGetDeviceInfoReply *	rep;
-    XkbDeviceInfoPtr		devi;
-#endif
-{
-XkbReadBufferRec	buf;
-XkbAction *		act;
-int			tmp;
-
-    if (!_XkbInitReadBuffer(dpy,&buf,(int)rep->length*4)) 
-	return BadAlloc;
-
-    if ((rep->totalBtns>0)&&(rep->totalBtns!=devi->num_btns)) {
-	tmp= XkbResizeDeviceButtonActions(devi,rep->totalBtns);
-	if (tmp!=Success)
-	    return tmp;
-    }
-    if (rep->nBtnsWanted>0) {
-	act= &devi->btn_acts[rep->firstBtnWanted];
-	bzero((char *)act,(rep->nBtnsWanted*sizeof(XkbAction)));
-    }
-    if (devi->name!=NULL)
-	_XkbFree(devi->name);
-    if (!_XkbGetReadBufferCountedString(&buf,&devi->name))
-	goto BAILOUT;
-    if (rep->nBtnsRtrn>0) {
-	int size;
-	act= &devi->btn_acts[rep->firstBtnRtrn];
-	size= rep->nBtnsRtrn*SIZEOF(xkbActionWireDesc);
-	if (!_XkbCopyFromReadBuffer(&buf,(char *)act,size))
-	    goto BAILOUT;
-    }
-    if (rep->nDeviceLedFBs>0) {
-	register int 		i;
-	for (i=0;i<rep->nDeviceLedFBs;i++) {
-	    if ((tmp= _XkbReadDeviceLedInfo(&buf,rep->present,devi))!=Success)
-		return tmp;
-	}
-    }
-    tmp= _XkbFreeReadBuffer(&buf);
-    if (tmp) 
-	fprintf(stderr,"GetDeviceInfo! Bad length (%d extra bytes)\n",tmp);
-    if (tmp || buf.error)
-	return BadLength;
-    return Success;
-BAILOUT:
-    _XkbFreeReadBuffer(&buf);
-    return BadLength;
-}
-
-XkbDeviceInfoPtr
-#if NeedFunctionPrototypes
-XkbGetDeviceInfo(	Display *	dpy,
-			unsigned 	which,
-			unsigned 	deviceSpec,
-			unsigned 	class,
-			unsigned 	id)
-#else
-XkbGetDeviceInfo(dpy,which,deviceSpec,class,id)
-    Display *	dpy;
-    unsigned	which;
-    unsigned	deviceSpec;
-    unsigned	class;
-    unsigned	id;
-#endif
-{
-    register xkbGetDeviceInfoReq *	req;
-    xkbGetDeviceInfoReply	 	rep;
-    Status				status;
-    XkbDeviceInfoPtr			devi;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return NULL;
-    LockDisplay(dpy);
-    GetReq(kbGetDeviceInfo, req);
-    req->reqType = dpy->xkb_info->codes->major_opcode;
-    req->xkbReqType = X_kbGetDeviceInfo;
-    req->deviceSpec = deviceSpec;
-    req->wanted= which;
-    req->allBtns= ((which&XkbXI_ButtonActionsMask)!=0);
-    req->firstBtn= req->nBtns= 0;
-    req->ledClass= class;
-    req->ledID= id;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return NULL;
-    }
-    devi= XkbAllocDeviceInfo(rep.deviceID,rep.totalBtns,rep.nDeviceLedFBs);
-    if (devi) {
-	devi->supported= rep.supported;
-	devi->unsupported= rep.unsupported;
-	devi->type= rep.devType;
-	devi->has_own_state= rep.hasOwnState;
-	devi->dflt_kbd_fb = rep.dfltKbdFB;
-	devi->dflt_led_fb = rep.dfltLedFB;
-	status= _XkbReadGetDeviceInfoReply(dpy,&rep,devi);
-	if (status!=Success) {
-	    XkbFreeDeviceInfo(devi,XkbXI_AllDeviceFeaturesMask,True);
-	    devi= NULL;
-	}
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return devi;
-}
-
-Status
-#if NeedFunctionPrototypes
-XkbGetDeviceInfoChanges(	Display *		dpy,
-				XkbDeviceInfoPtr 	devi,
-				XkbDeviceChangesPtr	changes)
-#else
-XkbGetDeviceInfoChanges(dpy,devi,changes)
-    Display *		dpy;
-    XkbDeviceInfoPtr	devi;
-    XkbDeviceChangesPtr	changes;
-#endif
-{
-    register xkbGetDeviceInfoReq *	req;
-    xkbGetDeviceInfoReply	 	rep;
-    Status				status;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return BadMatch;
-    if ((changes->changed&XkbXI_AllDeviceFeaturesMask)==0)
-	return Success;
-    changes->changed&= ~XkbXI_AllDeviceFeaturesMask;
-    status= Success;
-    LockDisplay(dpy);
-    while ((changes->changed)&&(status==Success)) {
-	GetReq(kbGetDeviceInfo, req);
-	req->reqType = dpy->xkb_info->codes->major_opcode;
-	req->xkbReqType = X_kbGetDeviceInfo;
-	req->deviceSpec = devi->device_spec;
-	req->wanted= changes->changed;
-	req->allBtns= False;
-	if (changes->changed&XkbXI_ButtonActionsMask) {
-	     req->firstBtn= changes->first_btn;
-	     req->nBtns= 	changes->num_btns;
-	     changes->changed&= ~XkbXI_ButtonActionsMask;
-	}
-	else req->firstBtn= req->nBtns= 0;
-	if (changes->changed&XkbXI_IndicatorsMask) {
-	    req->ledClass= changes->leds.led_class;
-	    req->ledID= changes->leds.led_id;
-	    if (changes->leds.next==NULL)
-		changes->changed&= ~XkbXI_IndicatorsMask;
-	    else {
-		XkbDeviceLedChangesPtr next;
-		next= changes->leds.next;
-		changes->leds= *next;
-		_XkbFree(next);
-	    }
-	}
-	else {
-	    req->ledClass= XkbDfltXIClass;
-	    req->ledID= XkbDfltXIId;
-	}
-	if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	    status= BadLength;
-	    break;
-	}
-	devi->supported|= rep.supported;
-	devi->unsupported|= rep.unsupported;
-	devi->type= rep.devType;
-	status= _XkbReadGetDeviceInfoReply(dpy,&rep,devi);
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return status;
-}
-
-Status
-#if NeedFunctionPrototypes
-XkbGetDeviceButtonActions(	Display *		dpy,
-				XkbDeviceInfoPtr	devi,
-				Bool			all,
-				unsigned int		first,
-				unsigned int		num)
-#else
-XkbGetDeviceButtonActions(dpy,devi,all,first,num)
-    Display *		dpy;
-    XkbDeviceInfoPtr	devi;
-    Bool		all;
-    unsigned int	first;
-    unsigned int	num;
-#endif
-{
-    register xkbGetDeviceInfoReq *	req;
-    xkbGetDeviceInfoReply	 	rep;
-    Status				status;
-
-    if ((dpy->flags & XlibDisplayNoXkb) || 
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return BadMatch;
-    if (!devi)
-	return BadValue;
-    LockDisplay(dpy);
-    GetReq(kbGetDeviceInfo, req);
-    req->reqType = dpy->xkb_info->codes->major_opcode;
-    req->xkbReqType = X_kbGetDeviceInfo;
-    req->deviceSpec = devi->device_spec;
-    req->wanted= XkbXI_ButtonActionsMask;
-    req->allBtns= all;
-    req->firstBtn= first;
-    req->nBtns= num;
-    req->ledClass= XkbDfltXIClass;
-    req->ledID= XkbDfltXIId;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return BadLength;
-    }
-    devi->type= rep.devType;
-    devi->supported= rep.supported;
-    devi->unsupported= rep.unsupported;
-    status= _XkbReadGetDeviceInfoReply(dpy,&rep,devi);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return status;
-}
-
-Status
-#if NeedFunctionPrototypes
-XkbGetDeviceLedInfo(	Display *		dpy,
-			XkbDeviceInfoPtr	devi,
-			unsigned int		ledClass,
-			unsigned int		ledId,
-			unsigned int		which)
-#else
-XkbGetDeviceLedInfo(dpy,devi,ledClass,ledId,which)
-    Display *		dpy;
-    XkbDeviceInfoPtr	devi;
-    unsigned int	ledClass;
-    unsigned int	ledId;
-    unsigned int	which;
-#endif
-{
-    register xkbGetDeviceInfoReq *	req;
-    xkbGetDeviceInfoReply	 	rep;
-    Status				status;
-
-    if ((dpy->flags & XlibDisplayNoXkb) || 
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return BadMatch;
-    if (((which&XkbXI_IndicatorsMask)==0)||(which&(~XkbXI_IndicatorsMask)))
-	return BadMatch;
-    if (!devi)
-	return BadValue;
-    LockDisplay(dpy);
-    GetReq(kbGetDeviceInfo, req);
-    req->reqType = dpy->xkb_info->codes->major_opcode;
-    req->xkbReqType = X_kbGetDeviceInfo;
-    req->deviceSpec = devi->device_spec;
-    req->wanted= which;
-    req->allBtns= False;
-    req->firstBtn= req->nBtns= 0;
-    req->ledClass= ledClass;
-    req->ledID= ledId;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return BadLength;
-    } 
-    devi->type= rep.devType;
-    devi->supported= rep.supported;
-    devi->unsupported= rep.unsupported;
-    status= _XkbReadGetDeviceInfoReply(dpy,&rep,devi);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return status;
-}
-
-/***====================================================================***/
-
-typedef struct _LedInfoStuff {
-	Bool			used;
-	XkbDeviceLedInfoPtr	devli;
-} LedInfoStuff;
-
-typedef struct _SetLedStuff {
-	unsigned		wanted;
-	int			num_info;
-	int			dflt_class;
-	LedInfoStuff *		dflt_kbd_fb;
-	LedInfoStuff *		dflt_led_fb;
-	LedInfoStuff *		info;
-} SetLedStuff;
-
-static void
-#if NeedFunctionPrototypes
-_InitLedStuff(SetLedStuff *stuff,unsigned wanted,XkbDeviceInfoPtr devi)
-#else
-_InitLedStuff(stuff,wanted,devi)
-    SetLedStuff	 *	stuff;
-    unsigned		wanted;
-    XkbDeviceInfoPtr	devi;
-#endif
-{
-int				i;
-register XkbDeviceLedInfoPtr	devli;
-
-    bzero(stuff,sizeof(SetLedStuff));
-    stuff->wanted= wanted;
-    stuff->dflt_class=	XkbXINone;
-    if ((devi->num_leds<1)||((wanted&XkbXI_IndicatorsMask)==0))
-	return;
-    stuff->info= _XkbTypedCalloc(devi->num_leds,LedInfoStuff);
-    if (!stuff->info)
-	return;
-    stuff->num_info= devi->num_leds;
-    for (devli=&devi->leds[0],i=0;i<devi->num_leds;i++,devli++) {
-	stuff->info[i].devli= devli;
-	if (devli->led_class==KbdFeedbackClass) {
-	    stuff->dflt_class= KbdFeedbackClass;
-	    if (stuff->dflt_kbd_fb==NULL)
-		stuff->dflt_kbd_fb= &stuff->info[i];
-	}
-	else if (devli->led_class==LedFeedbackClass) {
-	    if (stuff->dflt_class==XkbXINone)
-		stuff->dflt_class= LedFeedbackClass;
-	    if (stuff->dflt_led_fb==NULL)
-		stuff->dflt_led_fb= &stuff->info[i];
-	}
-    }
-    return;
-}
-
-static void
-#if NeedFunctionPrototypes
-_FreeLedStuff(SetLedStuff *stuff)
-#else
-_FreeLedStuff(stuff)
-    SetLedStuff	*stuff;
-#endif
-{
-    if ((stuff->num_info>0)&&(stuff->info!=NULL))
-	_XkbFree(stuff->info);
-    bzero(stuff,sizeof(SetLedStuff));
-    return;
-}
-
-static int
-#if NeedFunctionPrototypes
-_XkbSizeLedInfo(unsigned changed,XkbDeviceLedInfoPtr devli)
-#else
-_XkbSizeLedInfo(changed,devli)
-    unsigned		changed;
-    XkbDeviceLedInfoPtr	devli;
-#endif
-{
-register int i,size;
-register unsigned bit,namesNeeded,mapsNeeded;
-
-    size= SIZEOF(xkbDeviceLedsWireDesc);
-    namesNeeded= mapsNeeded= 0;
-    if (changed&XkbXI_IndicatorNamesMask)
-	namesNeeded= devli->names_present;
-    if (changed&XkbXI_IndicatorMapsMask)
-	mapsNeeded= devli->maps_present;
-    if ((namesNeeded)||(mapsNeeded)) {
-	for (i=0,bit=1;i<XkbNumIndicators;i++,bit<<=1) {
-	    if (namesNeeded&bit)
-		size+= 4; /* atoms are 4 bytes on the wire */
-	    if (mapsNeeded&bit)
-		size+= SIZEOF(xkbIndicatorMapWireDesc);
-	}
-    }
-    return size;
-}
-
-static Bool
-#if NeedFunctionPrototypes
-_SizeMatches(	SetLedStuff *		stuff,
-		XkbDeviceLedChangesPtr 	changes,
-		int *			sz_rtrn,
-		int *			nleds_rtrn)
-#else
-_SizeMatches(stuff,changes,sz_rtrn,nleds_rtrn)
-    SetLedStuff *		stuff;
-    XkbDeviceLedChangesPtr	changes;
-    int *			sz_rtrn;
-    int *			nleds_rtrn;
-#endif
-{
-int		i,nMatch,class,id;
-LedInfoStuff *	linfo;
-Bool		match;
-
-    nMatch= 0;
-    class= changes->led_class;
-    id= changes->led_id;
-    if (class==XkbDfltXIClass)
-	class= stuff->dflt_class;
-    for (i=0,linfo=&stuff->info[0];i<stuff->num_info;i++,linfo++) {
-	XkbDeviceLedInfoPtr	devli;
-	LedInfoStuff *		dflt;
-
-	devli= linfo->devli;
-	match= ((class==devli->led_class)||(class==XkbAllXIClasses));
-	if (devli->led_class==KbdFeedbackClass)	dflt= stuff->dflt_kbd_fb;
-	else					dflt= stuff->dflt_led_fb;
-	match = (match && (id == devli->led_id)) ||
-	  (id == XkbAllXIIds) ||
-	  ((id == XkbDfltXIId) &&
-	   (linfo == dflt));
-	if (match) {
-	    if (!linfo->used) {
-		*sz_rtrn+= _XkbSizeLedInfo(stuff->wanted,devli);
-		*nleds_rtrn+= 1;
-		linfo->used= True;
-		if ((class!=XkbAllXIClasses)&&(id!=XkbAllXIIds))
-		    return True;
-	    }
-	    nMatch++;
-	    linfo->used= True;
-	}
-    }
-    return (nMatch>0);
-}
-
-/***====================================================================***/
-
-
-static Status
-#if NeedFunctionPrototypes
-_XkbSetDeviceInfoSize(	XkbDeviceInfoPtr	devi,
-			XkbDeviceChangesPtr	changes,
-			SetLedStuff *		stuff,
-			int *			sz_rtrn,
-			int *			num_leds_rtrn)
-#else
-_XkbSetDeviceInfoSize(devi,changes,stuff,sz_rtrn,num_leds_rtrn)
-    XkbDeviceInfoPtr	devi;
-    XkbDeviceChangesPtr	changes;
-    SetLedStuff *	stuff;
-    int *		sz_rtrn;
-    int *		num_leds_rtrn;
-#endif
-{
-    *sz_rtrn= 0;
-    if ((changes->changed&XkbXI_ButtonActionsMask)&&(changes->num_btns>0)) {
-	if (!XkbXI_LegalDevBtn(devi,(changes->first_btn+changes->num_btns-1)))
-	    return BadMatch;
-	*sz_rtrn+= changes->num_btns*SIZEOF(xkbActionWireDesc);
-    }
-    else {
-	changes->changed&= ~XkbXI_ButtonActionsMask;
-	changes->first_btn= changes->num_btns= 0;
-    }
-    if ((changes->changed&XkbXI_IndicatorsMask)&&
-				XkbLegalXILedClass(changes->leds.led_class)) {
-	XkbDeviceLedChangesPtr	leds;
-
-	for (leds=&changes->leds;leds!=NULL;leds= leds->next) {
-	    if (!_SizeMatches(stuff,leds,sz_rtrn,num_leds_rtrn))
-		return BadMatch;
-	}
-    }
-    else {
-	changes->changed&= ~XkbXI_IndicatorsMask;
-	*num_leds_rtrn= 0;
-    }
-    return Success;
-}
-
-static char *
-#if NeedFunctionPrototypes
-_XkbWriteLedInfo(char *wire,unsigned changed,XkbDeviceLedInfoPtr devli)
-#else
-_XkbWriteLedInfo(wire,changed,devli)
-    char *			wire;
-    unsigned			changed;
-    XkbDeviceLedInfoPtr		devli;
-#endif
-{
-register int 		i;
-register unsigned 	bit,namesNeeded,mapsNeeded;
-xkbDeviceLedsWireDesc *	lwire;
-
-    namesNeeded= mapsNeeded= 0;
-    if (changed&XkbXI_IndicatorNamesMask)
-	namesNeeded= devli->names_present;
-    if (changed&XkbXI_IndicatorMapsMask)
-	mapsNeeded= devli->maps_present;
-
-    lwire= (xkbDeviceLedsWireDesc *)wire;
-    lwire->ledClass= devli->led_class;
-    lwire->ledID= devli->led_id;
-    lwire->namesPresent= namesNeeded;
-    lwire->mapsPresent=  mapsNeeded;
-    lwire->physIndicators= devli->phys_indicators;
-    lwire->state= devli->state;
-    wire= (char *)&lwire[1];
-    if (namesNeeded) {
-	CARD32 *awire;
-	awire= (CARD32 *)wire;
-	for (i=0,bit=1;i<XkbNumIndicators;i++,bit<<=1) {
-	    if (namesNeeded&bit) {
-		*awire= (CARD32)devli->names[i];
-		awire++;
-	    }
-	}
-	wire= (char *)awire;
-    }
-    if (mapsNeeded) {
-	xkbIndicatorMapWireDesc *mwire;
-
-	mwire= (xkbIndicatorMapWireDesc *)wire;
-	for (i=0,bit=1;i<XkbNumIndicators;i++,bit<<=1) {
-	    if (mapsNeeded&bit) {
-		XkbIndicatorMapPtr	map;
-		map= 			&devli->maps[i];
-		mwire->flags= 		map->flags;
-		mwire->whichGroups=	map->which_groups;
-		mwire->groups=		map->groups;
-		mwire->whichMods=	map->which_mods;
-		mwire->mods=		map->mods.mask;
-		mwire->realMods=	map->mods.real_mods;
-		mwire->virtualMods=	map->mods.vmods;
-		mwire->ctrls=		map->ctrls;
-		mwire++;
-	    }
-	}
-	wire= (char *)mwire;
-    }
-    return wire;
-}
-
-
-static int
-#if NeedFunctionPrototypes
-_XkbWriteSetDeviceInfo(	char *			wire,
-			XkbDeviceChangesPtr	changes,
-			SetLedStuff *		stuff,
-			XkbDeviceInfoPtr	devi)
-#else
-_XkbWriteSetDeviceInfo(wire,changes,stuff,devi)
-    char *			wire;
-    XkbDeviceChangesPtr		changes;
-    SetLedStuff *		stuff;
-    XkbDeviceInfoPtr		devi;
-#endif
-{
-char *start;
-
-    start= wire;
-    if (changes->changed&XkbXI_ButtonActionsMask) {
-	int			size;
-	size= changes->num_btns*SIZEOF(xkbActionWireDesc);
-	memcpy(wire,(char *)&devi->btn_acts[changes->first_btn],size);
-	wire+= size;
-    }
-    if (changes->changed&XkbXI_IndicatorsMask) {
-	register int i;
-	register LedInfoStuff *linfo;
-
-	for (i=0,linfo=&stuff->info[0];i<stuff->num_info;i++,linfo++) {
-	    if (linfo->used) {
-		register char *new_wire;
-		new_wire= _XkbWriteLedInfo(wire,stuff->wanted,linfo->devli);
-		if (!new_wire)
-		    return wire-start;
-		wire= new_wire;
-	    }
-	}
-    }
-    return wire-start;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbSetDeviceInfo(	Display *		dpy,
-			unsigned 		which,
-			XkbDeviceInfoPtr	devi)
-#else
-XkbSetDeviceInfo(dpy,which,devi)
-    Display *		dpy;
-    unsigned 		which;
-    XkbDeviceInfoPtr	devi;
-#endif
-{
-    register xkbSetDeviceInfoReq *req;
-    Status		     	ok;
-    int				size,nLeds;
-    XkbInfoPtr 			xkbi;
-    XkbDeviceChangesRec		changes;
-    SetLedStuff			lstuff;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    if ((!devi) || (which&(~XkbXI_AllDeviceFeaturesMask)) ||
-	((which&XkbXI_ButtonActionsMask)&&(!XkbXI_DevHasBtnActs(devi)))||
-	((which&XkbXI_IndicatorsMask)&&(!XkbXI_DevHasLeds(devi))))
-	return False;
-
-    bzero((char *)&changes,sizeof(XkbDeviceChangesRec));
-    changes.changed= which;
-    changes.first_btn=		0;
-    changes.num_btns=		devi->num_btns;
-    changes.leds.led_class=	XkbAllXIClasses;
-    changes.leds.led_id=	XkbAllXIIds;
-    changes.leds.defined=	0;
-    size= nLeds= 		0;
-    _InitLedStuff(&lstuff,changes.changed,devi);
-    if (_XkbSetDeviceInfoSize(devi,&changes,&lstuff,&size,&nLeds)!=Success)
-	return False;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbSetDeviceInfo, req);
-    req->length+=	size/4;
-    req->reqType= 	xkbi->codes->major_opcode;
-    req->xkbReqType= 	X_kbSetDeviceInfo;
-    req->deviceSpec= 	devi->device_spec;
-    req->firstBtn=	changes.first_btn;
-    req->nBtns=		changes.num_btns;
-    req->change=	changes.changed;
-    req->nDeviceLedFBs=	nLeds;
-    if (size>0) {
-	char * 	wire;
-	BufAlloc(char *,wire,size);
-	ok= (wire!=NULL)&&
-		(_XkbWriteSetDeviceInfo(wire,&changes,&lstuff,devi)==size);
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    _FreeLedStuff(&lstuff);
-    /* 12/11/95 (ef) -- XXX!! should clear changes here */
-    return ok;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbChangeDeviceInfo(	Display *		dpy,
-			XkbDeviceInfoPtr	devi,
-			XkbDeviceChangesPtr	changes)
-#else
-XkbChangeDeviceInfo(dpy,devi,changes)
-    Display *		dpy;
-    XkbDeviceInfoPtr	devi;
-    XkbDeviceChangesPtr	changes;
-#endif
-{
-    register xkbSetDeviceInfoReq *req;
-    Status		     	ok;
-    int				size,nLeds;
-    XkbInfoPtr 			xkbi;
-    SetLedStuff			lstuff;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    if ((!devi) || (changes->changed&(~XkbXI_AllDeviceFeaturesMask)) ||
-	((changes->changed&XkbXI_ButtonActionsMask)&&
-					(!XkbXI_DevHasBtnActs(devi)))||
-	((changes->changed&XkbXI_IndicatorsMask)&&(!XkbXI_DevHasLeds(devi))))
-	return False;
-
-    size= nLeds= 0;
-    _InitLedStuff(&lstuff,changes->changed,devi);
-    if (_XkbSetDeviceInfoSize(devi,changes,&lstuff,&size,&nLeds)!=Success)
-	return False;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbSetDeviceInfo, req);
-    req->length+=	size/4;
-    req->reqType= 	xkbi->codes->major_opcode;
-    req->xkbReqType= 	X_kbSetDeviceInfo;
-    req->deviceSpec= 	devi->device_spec;
-    req->firstBtn=	changes->first_btn;
-    req->nBtns=		changes->num_btns;
-    req->change=	changes->changed;
-    req->nDeviceLedFBs=	nLeds;
-    if (size>0) {
-	char * 	wire;
-	BufAlloc(char *,wire,size);
-	ok= (wire!=NULL)&&
-		(_XkbWriteSetDeviceInfo(wire,changes,&lstuff,devi)==size);
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    _FreeLedStuff(&lstuff);
-    /* 12/11/95 (ef) -- XXX!! should clear changes here */
-    return ok;
-}
-
-Bool 
-#if NeedFunctionPrototypes
-XkbSetDeviceLedInfo(	Display *		dpy,
-			XkbDeviceInfoPtr	devi,
-			unsigned 		ledClass,
-			unsigned		ledID,
-			unsigned		which)
-#else
-XkbSetDeviceLedInfo(dpy,devi,ledClass,ledID,which)
-    Display *		dpy;
-    XkbDeviceInfoPtr	devi;
-    unsigned 		ledClass;
-    unsigned		ledID;
-    unsigned		which;
-#endif
-{
-    return False;
-}
-
-Bool 
-#if NeedFunctionPrototypes
-XkbSetDeviceButtonActions(	Display *		dpy,
-				XkbDeviceInfoPtr 	devi,
-				unsigned int		first,
-				unsigned int		nBtns)
-#else
-XkbSetDeviceButtonActions(dpy,devi,first,nBtns)
-	Display *		dpy;
-	XkbDeviceInfoPtr	devi;
-	unsigned int		first;
-	unsigned int		nBtns;
-#endif
-{
-    register xkbSetDeviceInfoReq *req;
-    Status		     	ok;
-    int				size,nLeds;
-    XkbInfoPtr 			xkbi;
-    XkbDeviceChangesRec		changes;
-    SetLedStuff			lstuff;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    if ((!devi)||(!XkbXI_DevHasBtnActs(devi))||(first+nBtns>devi->num_btns))
-	return False;
-    if (nBtns==0)
-	return True;
-
-    bzero((char *)&changes,sizeof(XkbDeviceChangesRec));
-    changes.changed= 		XkbXI_ButtonActionsMask;
-    changes.first_btn=		first;
-    changes.num_btns=		nBtns;
-    changes.leds.led_class=	XkbXINone;
-    changes.leds.led_id=	XkbXINone;
-    changes.leds.defined=	0;
-    size= nLeds= 		0;
-    if (_XkbSetDeviceInfoSize(devi,&changes,NULL,&size,&nLeds)!=Success)
-	return False;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbSetDeviceInfo, req);
-    req->length+=	size/4;
-    req->reqType= 	xkbi->codes->major_opcode;
-    req->xkbReqType= 	X_kbSetDeviceInfo;
-    req->deviceSpec= 	devi->device_spec;
-    req->firstBtn=	changes.first_btn;
-    req->nBtns=		changes.num_btns;
-    req->change=	changes.changed;
-    req->nDeviceLedFBs=	nLeds;
-    if (size>0) {
-	char * 	wire;
-	BufAlloc(char *,wire,size);
-	ok= (wire!=NULL)&&
-		(_XkbWriteSetDeviceInfo(wire,&changes,&lstuff,devi)==size);
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return ok;
-}
diff --git a/xc/lib/X11/XKBGeom.c b/xc/lib/X11/XKBGeom.c
deleted file mode 100644
index ae4fd473b..000000000
--- a/xc/lib/X11/XKBGeom.c
+++ /dev/null
@@ -1,780 +0,0 @@
-/* $XConsortium: XKBGeom.c /main/7 1996/02/02 14:38:29 kaleb $ */
-/************************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-/* $XFree86: xc/lib/X11/XKBGeom.c,v 1.2 1999/05/09 10:50:24 dawes Exp $ */
-
-#ifdef DEBUG
-#include <stdio.h>
-#endif
-
-#define NEED_EVENTS
-#define NEED_REPLIES
-#include "Xlibint.h"
-#include "XKBlibint.h"
-#include <X11/extensions/XKBgeom.h>
-#include <X11/extensions/XKBproto.h>
-
-#ifndef MINSHORT
-#define	MINSHORT	-32768
-#endif
-#ifndef MAXSHORT
-#define	MAXSHORT	32767
-#endif
-
-/***====================================================================***/
-
-static void
-#if NeedFunctionPrototypes
-_XkbCheckBounds(XkbBoundsPtr bounds,int	x,int y)
-#else
-_XkbCheckBounds(bounds,x,y)
-    XkbBoundsPtr	bounds;
-    int			x,y;
-#endif
-{
-    if (x<bounds->x1)	bounds->x1= x;
-    if (x>bounds->x2)	bounds->x2= x;
-    if (y<bounds->y1)	bounds->y1= y;
-    if (y>bounds->y2)	bounds->y2= y;
-    return;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbComputeShapeBounds(XkbShapePtr shape)
-#else
-XkbComputeShapeBounds(shape)
-   XkbShapePtr	shape;
-#endif
-{
-register int	o,p;
-XkbOutlinePtr	outline;
-XkbPointPtr	pt;
-
-    if ((!shape)||(shape->num_outlines<1))
-	return False;
-    shape->bounds.x1= shape->bounds.y1= MAXSHORT;
-    shape->bounds.x2= shape->bounds.y2= MINSHORT;
-    for (outline=shape->outlines,o=0;o<shape->num_outlines;o++,outline++) {
-	for (pt=outline->points,p=0;p<outline->num_points;p++,pt++) {
-	    _XkbCheckBounds(&shape->bounds,pt->x,pt->y);
-	}
-    }
-    return True;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbComputeShapeTop(XkbShapePtr shape,XkbBoundsPtr bounds)
-#else
-XkbComputeShapeTop(shape,bounds)
-   XkbShapePtr	shape;
-   XkbBoundsPtr	bounds;
-#endif
-{
-register int	p;
-XkbOutlinePtr	outline;
-XkbPointPtr	pt;
-
-    if ((!shape)||(shape->num_outlines<1))
-	return False;
-    if (shape->approx)	outline= shape->approx;
-    else		outline= &shape->outlines[shape->num_outlines-1];
-    if (outline->num_points<2) {
-	 bounds->x1= bounds->y1= 0;
-	 bounds->x2= bounds->y2= 0;
-    }
-    else {
-	bounds->x1= bounds->y1= MAXSHORT;
-	bounds->x2= bounds->y2= MINSHORT;
-    }
-    for (pt=outline->points,p=0;p<outline->num_points;p++,pt++) {
-	_XkbCheckBounds(bounds,pt->x,pt->y);
-    }
-    return True;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbComputeRowBounds(XkbGeometryPtr geom,XkbSectionPtr section,XkbRowPtr row)
-#else
-XkbComputeRowBounds(geom,section,row)
-    XkbGeometryPtr	geom;
-    XkbSectionPtr	section;
-    XkbRowPtr		row;
-#endif
-{
-register int	k,pos;
-XkbKeyPtr	key;
-XkbBoundsPtr	bounds,sbounds;
-
-    if ((!geom)||(!section)||(!row))
-	return False;
-    pos= 0;
-    bounds= &row->bounds;
-    bzero(bounds,sizeof(XkbBoundsRec));
-    for (key=row->keys,pos=k=0;k<row->num_keys;k++,key++) {
-	sbounds= &XkbKeyShape(geom,key)->bounds;
-	_XkbCheckBounds(bounds,pos,0);
-	if (!row->vertical) {
-	    if (key->gap!=0) {
-		pos+= key->gap;
-		_XkbCheckBounds(bounds,pos,0);
-	    }
-	    _XkbCheckBounds(bounds,pos+sbounds->x1,sbounds->y1);
-	    _XkbCheckBounds(bounds,pos+sbounds->x2,sbounds->y2);
-	    pos+= sbounds->x2;
-	}
-	else {
-	    if (key->gap!=0) {
-		pos+= key->gap;
-		_XkbCheckBounds(bounds,0,pos);
-	    }
-	    _XkbCheckBounds(bounds,pos+sbounds->x1,sbounds->y1);
-	    _XkbCheckBounds(bounds,pos+sbounds->x2,sbounds->y2);
-	    pos+= sbounds->y2;
-	}
-    }
-    return True;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbComputeSectionBounds(XkbGeometryPtr geom,XkbSectionPtr section)
-#else
-XkbComputeSectionBounds(geom,section)
-    XkbGeometryPtr	geom;
-    XkbSectionPtr	section;
-#endif
-{
-register int	i;
-XkbShapePtr	shape;
-XkbRowPtr	row;
-XkbDoodadPtr	doodad;
-XkbBoundsPtr	bounds,rbounds;
-
-    if ((!geom)||(!section))
-	return False;
-    bounds= &section->bounds;
-    bzero(bounds,sizeof(XkbBoundsRec));
-    for (i=0,row=section->rows;i<section->num_rows;i++,row++) {
-	if (!XkbComputeRowBounds(geom,section,row))
-	    return False;
-	rbounds= &row->bounds;
-	_XkbCheckBounds(bounds,row->left+rbounds->x1,row->top+rbounds->y1);
-	_XkbCheckBounds(bounds,row->left+rbounds->x2,row->top+rbounds->y2);
-    }
-    for (i=0,doodad=section->doodads;i<section->num_doodads;i++,doodad++) {
-	static XkbBoundsRec	tbounds;
-	switch (doodad->any.type) {
-	    case XkbOutlineDoodad:
-	    case XkbSolidDoodad:
-		shape= XkbShapeDoodadShape(geom,&doodad->shape);
-		rbounds= &shape->bounds;
-		break;
-	    case XkbTextDoodad:
-		tbounds.x1= doodad->text.left;
-		tbounds.y1= doodad->text.top;
-		tbounds.x2= tbounds.x1+doodad->text.width;
-		tbounds.y2= tbounds.y1+doodad->text.height;
-		rbounds= &tbounds;
-		break;
-	    case XkbIndicatorDoodad:
-		shape= XkbIndicatorDoodadShape(geom,&doodad->indicator);
-		rbounds= &shape->bounds;
-		break;
-	    case XkbLogoDoodad:
-		shape= XkbLogoDoodadShape(geom,&doodad->logo);
-		rbounds= &shape->bounds;
-		break;
-	    default:
-		tbounds.x1= tbounds.x2= doodad->any.left;
-		tbounds.y1= tbounds.y2= doodad->any.top;
-		break;
-	}
-	_XkbCheckBounds(bounds,rbounds->x1,rbounds->y1);
-	_XkbCheckBounds(bounds,rbounds->x2,rbounds->y2);
-    }
-    return True;
-}
-
-/***====================================================================***/
-
-char *
-#if NeedFunctionPrototypes
-XkbFindOverlayForKey(XkbGeometryPtr geom,XkbSectionPtr wanted,char *under)
-#else
-XkbFindOverlayForKey(geom,wanted,under)
-    XkbGeometryPtr	geom;
-    XkbSectionPtr	wanted;
-    char *		under;
-#endif
-{
-int		s;
-XkbSectionPtr	section;
-
-    if ((geom==NULL)||(under==NULL)||(geom->num_sections<1))
-	return NULL;
-
-    if (wanted)
-	 section= wanted;
-    else section= geom->sections;
-
-    for (s=0;s<geom->num_sections;s++,section++) {
-	XkbOverlayPtr	ol;
-	int		o;
-
-	if (section->num_overlays<1)
-	    continue;
-	for (o=0,ol=section->overlays;o<section->num_overlays;o++,ol++) {
-	    XkbOverlayRowPtr	row;
-	    int			r;
-
-	    for (r=0,row=ol->rows;r<ol->num_rows;r++,row++) {
-		XkbOverlayKeyPtr	key;
-		int			k;
-		for (k=0,key=row->keys;k<row->num_keys;k++,key++) {
-		    if (strncmp(under,key->under.name,XkbKeyNameLength)==0)
-			return key->over.name;
-		}
-	    }
-	}
-	if (wanted!=NULL)
-	    break;
-    }
-    return NULL;
-}
-
-/***====================================================================***/
-
-static Status
-#if NeedFunctionPrototypes
-_XkbReadGeomProperties(	XkbReadBufferPtr	buf,
-			XkbGeometryPtr 		geom,
-			xkbGetGeometryReply *	rep)
-#else
-_XkbReadGeomProperties(buf,geom,rep)
-    XkbReadBufferPtr		buf;
-    XkbGeometryPtr		geom;
-    xkbGetGeometryReply *	rep;
-#endif
-{
-Status	rtrn;
-
-    if (rep->nProperties<1)
-	return Success;
-    if ((rtrn=XkbAllocGeomProps(geom,rep->nProperties))==Success) {
-	register int i;
-	register Bool ok;
-	char *name,*value;
-	ok= True;
-	for (i=0;(i<rep->nProperties)&&ok;i++) {
-	    ok= _XkbGetReadBufferCountedString(buf,&name)&&ok;
-	    ok= _XkbGetReadBufferCountedString(buf,&value)&&ok;
-	    ok= ok&&(XkbAddGeomProperty(geom,name,value)!=NULL);
-	}
-	if (ok)	rtrn= Success;
-	else	rtrn= BadLength;
-    }
-    return rtrn;
-}
-
-static Status
-#if NeedFunctionPrototypes
-_XkbReadGeomKeyAliases(	XkbReadBufferPtr	buf,
-			XkbGeometryPtr		geom,
-			xkbGetGeometryReply *	rep)
-#else
-_XkbReadGeomKeyAliases(buf,geom,rep)
-    XkbReadBufferPtr		buf;
-    XkbGeometryPtr		geom;
-    xkbGetGeometryReply *	rep;
-#endif
-{
-Status	rtrn;
-
-    if (rep->nKeyAliases<1)
-	return Success;
-    if ((rtrn=XkbAllocGeomKeyAliases(geom,rep->nKeyAliases))==Success) {
-	if (!_XkbCopyFromReadBuffer(buf,(char *)geom->key_aliases,
-					(rep->nKeyAliases*XkbKeyNameLength*2)))
-	    return BadLength;
-	geom->num_key_aliases= rep->nKeyAliases;
-	return Success;
-    }
-    else { /* alloc failed, just skip the aliases */
-	_XkbSkipReadBufferData(buf,(rep->nKeyAliases*XkbKeyNameLength*2));
-    }
-    return rtrn;
-}
-
-static Status
-#if NeedFunctionPrototypes
-_XkbReadGeomColors(	XkbReadBufferPtr	buf,
-			XkbGeometryPtr		geom,
-			xkbGetGeometryReply *	rep)
-#else
-_XkbReadGeomColors(buf,geom,rep)
-    XkbReadBufferPtr		buf;
-    XkbGeometryPtr		geom;
-    xkbGetGeometryReply *	rep;
-#endif
-{
-Status	rtrn;
-
-    if (rep->nColors<1)
-	return Success;
-    if ((rtrn=XkbAllocGeomColors(geom,rep->nColors))==Success) {
-	register int i;
-	char *spec;
-	for (i=0;i<rep->nColors;i++) {
-	    if (!_XkbGetReadBufferCountedString(buf,&spec))
-		return BadLength;
-	    if (XkbAddGeomColor(geom,spec,geom->num_colors)==NULL)
-		return BadAlloc;
-	}
-	return Success;
-    }
-    return rtrn;
-}
-
-static Status
-#if NeedFunctionPrototypes
-_XkbReadGeomShapes(	XkbReadBufferPtr	buf,
-			XkbGeometryPtr		geom,
-			xkbGetGeometryReply *	rep)
-#else
-_XkbReadGeomShapes(buf,geom,rep)
-    XkbReadBufferPtr		buf;
-    XkbGeometryPtr		geom;
-    xkbGetGeometryReply *	rep;
-#endif
-{
-register int i;
-Status	rtrn;
-
-    if (rep->nShapes<1)
-	return Success;
-    if ((rtrn=XkbAllocGeomShapes(geom,rep->nShapes))!=Success)
-	return rtrn;
-    for (i=0;i<rep->nShapes;i++) {
-	xkbShapeWireDesc *shapeWire;
-	XkbShapePtr	 shape;
-	register int	 o;
-	shapeWire= (xkbShapeWireDesc *)
-		   _XkbGetReadBufferPtr(buf,SIZEOF(xkbShapeWireDesc));
-	if (!shapeWire)
-	    return BadLength;
-	shape= XkbAddGeomShape(geom,shapeWire->name,shapeWire->nOutlines);
-	if (!shape)
-	   return BadAlloc;
-	for (o=0;o<shapeWire->nOutlines;o++) {
-	    xkbOutlineWireDesc *olWire;
-	    XkbOutlinePtr	ol;
-	    register int	p;
-	    XkbPointPtr		pt;
-	    olWire=  (xkbOutlineWireDesc *)
-		 _XkbGetReadBufferPtr(buf,SIZEOF(xkbOutlineWireDesc));
-	    if (!olWire)
-		return BadLength;
-	    ol= XkbAddGeomOutline(shape,olWire->nPoints);
-	    if (!ol)
-		return BadAlloc;
-	    ol->corner_radius=  olWire->cornerRadius;
-	    for (p=0,pt=ol->points;p<olWire->nPoints;p++,pt++) {
-		xkbPointWireDesc *	ptWire;
-		ptWire= (xkbPointWireDesc *)
-		    _XkbGetReadBufferPtr(buf,SIZEOF(xkbPointWireDesc));
-		if (!ptWire)
-		    return BadLength;
-		pt->x= ptWire->x;
-		pt->y= ptWire->y;
-	    }
-	    ol->num_points= olWire->nPoints;
-	}
-	if (shapeWire->primaryNdx!=XkbNoShape)
-	     shape->primary= &shape->outlines[shapeWire->primaryNdx];
-	else shape->primary= NULL;
-	if (shapeWire->approxNdx!=XkbNoShape)
-	     shape->approx= &shape->outlines[shapeWire->approxNdx];
-	else shape->approx= NULL;
-	XkbComputeShapeBounds(shape);
-    }
-    return Success;
-}
-
-static Status
-#if NeedFunctionPrototypes
-_XkbReadGeomDoodad(	XkbReadBufferPtr 	buf,
-			XkbGeometryPtr 		geom,
-			XkbSectionPtr 		section)
-#else
-_XkbReadGeomDoodad(buf,geom,section)
-    XkbReadBufferPtr		buf;
-    XkbGeometryPtr		geom;
-    XkbSectionPtr		section;
-#endif
-{
-XkbDoodadPtr		doodad;
-xkbDoodadWireDesc *	doodadWire;
-
-    doodadWire= (xkbDoodadWireDesc *)
-		   _XkbGetReadBufferPtr(buf,SIZEOF(xkbDoodadWireDesc));
-    if (!doodadWire)
-	return 	BadLength;
-    doodad= XkbAddGeomDoodad(geom,section,doodadWire->any.name);
-    if (!doodad)
-	return BadAlloc;
-    doodad->any.type= doodadWire->any.type;
-    doodad->any.priority= doodadWire->any.priority;
-    doodad->any.top= doodadWire->any.top;
-    doodad->any.left= doodadWire->any.left;
-    doodad->any.angle= doodadWire->any.angle;
-    switch (doodad->any.type) {
-	case XkbOutlineDoodad:
-	case XkbSolidDoodad:
-	    doodad->shape.color_ndx= doodadWire->shape.colorNdx;
-	    doodad->shape.shape_ndx= doodadWire->shape.shapeNdx;
-	    break;
-	case XkbTextDoodad:
-	    doodad->text.width= doodadWire->text.width;
-	    doodad->text.height= doodadWire->text.height;
-	    doodad->text.color_ndx= doodadWire->text.colorNdx;
-	    if (!_XkbGetReadBufferCountedString(buf,&doodad->text.text))
-		return BadLength;
-	    if (!_XkbGetReadBufferCountedString(buf,&doodad->text.font))
-		return BadLength;
-	    break;
-	case XkbIndicatorDoodad:
-	    doodad->indicator.shape_ndx= doodadWire->indicator.shapeNdx;
-	    doodad->indicator.on_color_ndx= doodadWire->indicator.onColorNdx;
-	    doodad->indicator.off_color_ndx= doodadWire->indicator.offColorNdx;
-	    break;
-	case XkbLogoDoodad:
-	    doodad->logo.color_ndx= doodadWire->logo.colorNdx;
-	    doodad->logo.shape_ndx= doodadWire->logo.shapeNdx;
-	    if (!_XkbGetReadBufferCountedString(buf,&doodad->logo.logo_name))
-		return BadLength;
-	    break;
-	default:
-	    return BadValue;
-    }
-    return Success;
-}
-
-static Status
-#if NeedFunctionPrototypes
-_XkbReadGeomOverlay(	XkbReadBufferPtr	buf,
-			XkbGeometryPtr		geom,
-			XkbSectionPtr		section)
-#else
-_XkbReadGeomOverlay(buf,geom,section)
-    XkbReadBufferPtr		buf;
-    XkbGeometryPtr		geom;
-    XkbSectionPtr		section;
-#endif
-{
-XkbOverlayPtr		ol;
-xkbOverlayWireDesc *	olWire;
-register int		r;
-
-    olWire= (xkbOverlayWireDesc *)
-		   _XkbGetReadBufferPtr(buf,SIZEOF(xkbOverlayWireDesc));
-    if (olWire==NULL)
-	return BadLength;
-    ol= XkbAddGeomOverlay(section,olWire->name,olWire->nRows);
-    if (ol==NULL)
-	return BadLength;
-    for (r=0;r<olWire->nRows;r++) {
-	register int 			k;
-	XkbOverlayRowPtr		row;
-	xkbOverlayRowWireDesc *		rowWire;
-	xkbOverlayKeyWireDesc *		keyWire;
-	rowWire= (xkbOverlayRowWireDesc *)
-			_XkbGetReadBufferPtr(buf,SIZEOF(xkbOverlayRowWireDesc));
-	if (rowWire==NULL)
-	    return BadLength;
-	row= XkbAddGeomOverlayRow(ol,rowWire->rowUnder,rowWire->nKeys);
-	row->row_under= rowWire->rowUnder;
-	if (!row)
-	    return BadAlloc;
-	if (rowWire->nKeys<1)
-	    continue;
-	keyWire= (xkbOverlayKeyWireDesc *)
-     			_XkbGetReadBufferPtr(buf,
-				SIZEOF(xkbOverlayKeyWireDesc)*rowWire->nKeys);
-	if (keyWire==NULL)
-	    return BadLength;
-	for (k=0;k<rowWire->nKeys;k++,keyWire++,row->num_keys++) {
-	    memcpy(row->keys[row->num_keys].over.name,keyWire->over,
-	    						XkbKeyNameLength);
-	    memcpy(row->keys[row->num_keys].under.name,keyWire->under,
-	    						XkbKeyNameLength);
-	}
-    }
-    return Success;
-}
-
-static Status
-#if NeedFunctionPrototypes
-_XkbReadGeomSections(	XkbReadBufferPtr	buf,
-			XkbGeometryPtr		geom,
-			xkbGetGeometryReply *	rep)
-#else
-_XkbReadGeomSections(buf,geom,rep)
-    XkbReadBufferPtr		buf;
-    XkbGeometryPtr		geom;
-    xkbGetGeometryReply *	rep;
-#endif
-{
-register int 		s;
-XkbSectionPtr		section;
-xkbSectionWireDesc *	sectionWire;
-Status			rtrn;
-
-    if (rep->nSections<1)
-	return Success;
-    if ((rtrn=XkbAllocGeomSections(geom,rep->nSections))!=Success)
-	return rtrn;
-    for (s=0;s<rep->nSections;s++) {
-	sectionWire= (xkbSectionWireDesc *)
-			_XkbGetReadBufferPtr(buf,SIZEOF(xkbSectionWireDesc));
-	if (!sectionWire)
-	    return BadLength;
-	section= XkbAddGeomSection(geom,sectionWire->name,sectionWire->nRows,
-						sectionWire->nDoodads,
-						sectionWire->nOverlays);
-	if (!section)
-	    return BadAlloc;
-	section->top= sectionWire->top;
-	section->left= sectionWire->left;
-	section->width= sectionWire->width;
-	section->height= sectionWire->height;
-	section->angle= sectionWire->angle;
-	section->priority= sectionWire->priority;
-	if (sectionWire->nRows>0) {
-	    register int 	r;
-	    XkbRowPtr		row;
-	    xkbRowWireDesc *	rowWire;
-	    for (r=0;r<sectionWire->nRows;r++) {
-		rowWire= (xkbRowWireDesc *)
-			 _XkbGetReadBufferPtr(buf,SIZEOF(xkbRowWireDesc));
-		if (!rowWire)
-		    return BadLength;
-		row= XkbAddGeomRow(section,rowWire->nKeys);
-		if (!row)
-		    return BadAlloc;
-		row->top= rowWire->top;
-		row->left= rowWire->left;
-		row->vertical= rowWire->vertical;
-		if (rowWire->nKeys>0) {
-		    register int	k;
-		    XkbKeyPtr		key;
-		    xkbKeyWireDesc *	keyWire;
-		    for (k=0;k<rowWire->nKeys;k++) {
-			keyWire= (xkbKeyWireDesc *)
-			      _XkbGetReadBufferPtr(buf,SIZEOF(xkbKeyWireDesc));
-			if (!keyWire)
-			    return BadLength;
-			key= XkbAddGeomKey(row);
-			if (!key)
-			    return BadAlloc;
-			memcpy(key->name.name,keyWire->name,XkbKeyNameLength);
-			key->gap= keyWire->gap;
-			key->shape_ndx= keyWire->shapeNdx;
-			key->color_ndx= keyWire->colorNdx;
-		    }
-		}
-	    }
-	}
-	if (sectionWire->nDoodads>0) {
-	    register int d;
-	    for (d=0;d<sectionWire->nDoodads;d++) {
-		if ((rtrn=_XkbReadGeomDoodad(buf,geom,section))!=Success)
-		    return rtrn;
-	    }
-	}
-	if (sectionWire->nOverlays>0) {
-	    register int o;
-	    for (o=0;o<sectionWire->nOverlays;o++) {
-		if ((rtrn=_XkbReadGeomOverlay(buf,geom,section))!=Success)
-		    return rtrn;
-	    }
-	}
-    }
-    return Success;
-}
-
-static Status
-#if NeedFunctionPrototypes
-_XkbReadGeomDoodads(	XkbReadBufferPtr	buf,
-			XkbGeometryPtr		geom,
-			xkbGetGeometryReply *	rep)
-#else
-_XkbReadGeomDoodads(buf,geom,rep)
-    XkbReadBufferPtr		buf;
-    XkbGeometryPtr		geom;
-    xkbGetGeometryReply *	rep;
-#endif
-{
-register int d;
-Status	rtrn;
-
-    if (rep->nDoodads<1)
-	return Success;
-    if ((rtrn=XkbAllocGeomDoodads(geom,rep->nDoodads))!=Success)
-	return rtrn;
-    for (d=0;d<rep->nDoodads;d++) {
-	if ((rtrn=_XkbReadGeomDoodad(buf,geom,NULL))!=Success)
-	    return rtrn;
-    }
-    return Success;
-}
-
-Status
-#if NeedFunctionPrototypes
-_XkbReadGetGeometryReply(	Display * dpy,
-				xkbGetGeometryReply * rep,
-				XkbDescPtr xkb,
-				int * nread_rtrn)
-#else
-_XkbReadGetGeometryReply(dpy,rep,xkb,nread_rtrn)
-    Display *			dpy;
-    xkbGetGeometryReply *	rep;
-    XkbDescPtr			xkb;
-    int *			nread_rtrn;
-#endif
-{
-XkbGeometryPtr	geom;
-
-    geom= _XkbTypedCalloc(1,XkbGeometryRec);
-    if (!geom)
-	return BadAlloc;
-    if (xkb->geom)
-	XkbFreeGeometry(xkb->geom,XkbGeomAllMask,True);
-    xkb->geom= geom;
-
-    geom->name= rep->name;
-    geom->width_mm= rep->widthMM;
-    geom->height_mm= rep->heightMM;
-    if (rep->length) {
-	XkbReadBufferRec	buf;
-	int			left;
-	if (_XkbInitReadBuffer(dpy,&buf,(int)rep->length*4)) {
-	    Status status= Success;
-	    if (nread_rtrn)
-		*nread_rtrn= (int)rep->length*4;
-	    if (!_XkbGetReadBufferCountedString(&buf,&geom->label_font))
-		status= BadLength;
-	    if (status==Success)
-		status= _XkbReadGeomProperties(&buf,geom,rep);
-	    if (status==Success)
-		status= _XkbReadGeomColors(&buf,geom,rep);
-	    if (status==Success)
-		status= _XkbReadGeomShapes(&buf,geom,rep);
-	    if (status==Success)
-		status= _XkbReadGeomSections(&buf,geom,rep);
-	    if (status==Success)
-		status= _XkbReadGeomDoodads(&buf,geom,rep);
-	    if (status==Success)
-		status= _XkbReadGeomKeyAliases(&buf,geom,rep);
-	    left= _XkbFreeReadBuffer(&buf);
-	    if ((status!=Success) || left || buf.error) {
-		if (status==Success)	
-		    status= BadLength;
-		XkbFreeGeometry(geom,XkbGeomAllMask,True);
-		xkb->geom= NULL;
-		return status;
-	    }
-	    geom->base_color= &geom->colors[rep->baseColorNdx];
-	    geom->label_color= &geom->colors[rep->labelColorNdx];
-	}
-	else {
-	    XkbFreeGeometry(geom,XkbGeomAllMask,True);
-	    xkb->geom= NULL;
-	    return BadAlloc;
-	}
-    }
-    return Success;
-}
-
-Status
-#if NeedFunctionPrototypes
-XkbGetGeometry(Display *dpy,XkbDescPtr xkb)
-#else
-XkbGetGeometry(dpy,xkb)
-    Display *	dpy;
-    XkbDescPtr	xkb;
-#endif
-{
-xkbGetGeometryReq	*req;
-xkbGetGeometryReply	 rep;
-
-    if ( (!xkb) || (dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return BadAccess;
-    
-    GetReq(kbGetGeometry, req);
-    req->reqType = dpy->xkb_info->codes->major_opcode;
-    req->xkbReqType = X_kbGetGeometry;
-    req->deviceSpec = xkb->device_spec;
-    req->name= None;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse))
-	return BadImplementation;
-    if (!rep.found)
-	return BadName;
-    return _XkbReadGetGeometryReply(dpy,&rep,xkb,NULL);
-}
-
-Status
-#if NeedFunctionPrototypes
-XkbGetNamedGeometry(Display *dpy,XkbDescPtr xkb,Atom name)
-#else
-XkbGetNamedGeometry(dpy,xkb,name)
-    Display *	dpy;
-    XkbDescPtr	xkb;
-    Atom	name;
-#endif
-{
-xkbGetGeometryReq	*req;
-xkbGetGeometryReply	 rep;
-
-    if ( (name==None) || (dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)) )
-	return BadAccess;
-    
-    GetReq(kbGetGeometry, req);
-    req->reqType = dpy->xkb_info->codes->major_opcode;
-    req->xkbReqType = X_kbGetGeometry;
-    req->deviceSpec = xkb->device_spec;
-    req->name= (CARD32)name;
-    if ((!_XReply(dpy, (xReply *)&rep, 0, xFalse))||(!rep.found))
-	return BadImplementation;
-    if (!rep.found)
-	return BadName;
-    return _XkbReadGetGeometryReply(dpy,&rep,xkb,NULL);
-}
-
diff --git a/xc/lib/X11/XKBGetByName.c b/xc/lib/X11/XKBGetByName.c
deleted file mode 100644
index 8460664c1..000000000
--- a/xc/lib/X11/XKBGetByName.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/* $XConsortium: XKBGetByName.c /main/4 1996/01/01 11:26:52 kaleb $ */
-/************************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-
-#define NEED_REPLIES
-#define NEED_EVENTS
-#define	NEED_MAP_READERS
-#include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
-#include "XKBlibint.h"
-
-/***====================================================================***/
-
-XkbDescPtr
-#if NeedFunctionPrototypes
-XkbGetKeyboardByName(	Display *		dpy,
-			unsigned		deviceSpec,
-			XkbComponentNamesPtr	names,
-			unsigned		want,
-			unsigned		need,
-			Bool			load)
-#else
-XkbGetKeyboardByName(dpy,deviceSpec,names,want,need,load)
-    Display *			dpy;
-    unsigned			deviceSpec;
-    XkbComponentNamesPtr	names;
-    unsigned			want;
-    unsigned			need;
-    Bool			load;
-#endif
-{
-    register xkbGetKbdByNameReq	*	req;
-    xkbGetKbdByNameReply 		rep;
-    int					len,extraLen;
-    char *				str;
-    XkbDescPtr				xkb;
-    int					mapLen,codesLen,typesLen,compatLen;
-    int					symsLen,geomLen;
-    XkbInfoPtr 				xkbi;
-
-    if ( (dpy==NULL) || (dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)) )
-	return NULL;
-
-    xkbi= dpy->xkb_info;
-    xkb = (XkbDescRec *)_XkbCalloc(1,sizeof(XkbDescRec));
-    if (!xkb)
-	return NULL;
-    xkb->device_spec = deviceSpec;
-    xkb->map = (XkbClientMapRec *)_XkbCalloc(1,sizeof(XkbClientMapRec));
-    xkb->dpy = dpy;
-
-    LockDisplay(dpy);
-    GetReq(kbGetKbdByName, req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbGetKbdByName;
-    req->deviceSpec = xkb->device_spec;
-    req->want= want;
-    req->need= need;
-    req->load= load;
-
-    mapLen= codesLen= typesLen= compatLen= symsLen= geomLen= 0;
-    if (names) {
-	if (names->keymap)
-	    mapLen= (int)strlen(names->keymap);
-	if (names->keycodes)
-	    codesLen= (int)strlen(names->keycodes);
-	if (names->types)
-	    typesLen= (int)strlen(names->types);
-	if (names->compat)
-	    compatLen= (int)strlen(names->compat);
-	if (names->symbols)
-	    symsLen= (int)strlen(names->symbols);
-	if (names->geometry)
-	    geomLen= (int)strlen(names->geometry);
-	if (mapLen>255)		mapLen= 255;
-	if (codesLen>255)	codesLen= 255;
-	if (typesLen>255)	typesLen= 255;
-	if (compatLen>255)	compatLen= 255;
-	if (symsLen>255)	symsLen= 255;
-	if (geomLen>255)	geomLen= 255;
-    }
-    else mapLen= codesLen= typesLen= compatLen= symsLen= geomLen= 0;
-
-    len= mapLen+codesLen+typesLen+compatLen+symsLen+geomLen+6;
-    len= XkbPaddedSize(len);
-    req->length+= len/4;
-    BufAlloc(char *,str,len);
-    *str++= mapLen;
-    if (mapLen>0) {
-	 memcpy(str,names->keymap,mapLen);
-	 str+= mapLen;
-    }
-    *str++= codesLen;
-    if (codesLen>0) {
-	 memcpy(str,names->keycodes,codesLen);
-	 str+= codesLen;
-    }
-    *str++= typesLen;
-    if (typesLen>0) {
-	 memcpy(str,names->types,typesLen);
-	 str+= typesLen;
-    }
-    *str++= compatLen;
-    if (compatLen>0) {
-	 memcpy(str,names->compat,compatLen);
-	 str+= compatLen;
-    }
-    *str++= symsLen;
-    if (symsLen>0) {
-	 memcpy(str,names->symbols,symsLen);
-	 str+= symsLen;
-    }
-    *str++= geomLen;
-    if (geomLen>0) {
-	 memcpy(str,names->geometry,geomLen);
-	 str+= geomLen;
-    }
-    if ((!_XReply(dpy, (xReply *)&rep, 0, xFalse))||(!rep.reported))
-	goto BAILOUT;
-    extraLen= (int)rep.length*4;
-
-    xkb->device_spec= rep.deviceID;
-    xkb->min_key_code = rep.minKeyCode;
-    xkb->max_key_code = rep.maxKeyCode;
-    if (rep.reported&(XkbGBN_SymbolsMask|XkbGBN_TypesMask)) {
-	xkbGetMapReply 	mrep;
-	Status		status;
-	int		nread= 0;
-
-	_XRead(dpy, (char *)&mrep, SIZEOF(xkbGetMapReply));
-	extraLen-= SIZEOF(xkbGetMapReply);
-	status= _XkbReadGetMapReply(dpy,&mrep,xkb,&nread);
-	extraLen-= nread;
-	if (status!=Success)
-	    goto BAILOUT;
-    }
-    if (rep.reported&XkbGBN_CompatMapMask) {
-	xkbGetCompatMapReply 	crep;
-	Status			status;
-	int			nread= 0;
-
-	_XRead(dpy, (char *)&crep, SIZEOF(xkbGetCompatMapReply));
-	extraLen-= SIZEOF(xkbGetCompatMapReply);
-	status= _XkbReadGetCompatMapReply(dpy,&crep,xkb,&nread);
-	extraLen-= nread;
-	if (status!=Success)
-	    goto BAILOUT;
-    }
-    if (rep.reported&XkbGBN_IndicatorMapMask) {
-	xkbGetIndicatorMapReply irep;
-	Status			status;
-	int			nread= 0;
-
-	_XRead(dpy, (char *)&irep, SIZEOF(xkbGetIndicatorMapReply));
-	extraLen-= SIZEOF(xkbGetIndicatorMapReply);
-	status= _XkbReadGetIndicatorMapReply(dpy,&irep,xkb,&nread);
-	extraLen-= nread;
-	if (status!=Success)
-	    goto BAILOUT;
-    }
-    if (rep.reported&(XkbGBN_KeyNamesMask|XkbGBN_OtherNamesMask)) {
-	xkbGetNamesReply	nrep;
-	Status			status;
-	int			nread= 0;
-
-	_XRead(dpy, (char *)&nrep, SIZEOF(xkbGetNamesReply));
-	extraLen-= SIZEOF(xkbGetNamesReply);
-	status= _XkbReadGetNamesReply(dpy,&nrep,xkb,&nread);
-	extraLen-= nread;
-	if (status!=Success)
-	    goto BAILOUT;
-    }
-    if (rep.reported&XkbGBN_GeometryMask) {
-	xkbGetGeometryReply	grep;
-	Status			status;
-	int			nread= 0;
-
-	_XRead(dpy, (char *)&grep, SIZEOF(xkbGetGeometryReply));
-	extraLen-= SIZEOF(xkbGetGeometryReply);
-	status= _XkbReadGetGeometryReply(dpy,&grep,xkb,&nread);
-	extraLen-= nread;
-	if (status!=Success)
-	    goto BAILOUT;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return xkb;
-BAILOUT:
-    if (xkb!=NULL)
-	XkbFreeKeyboard(xkb,XkbAllComponentsMask,xTrue);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return NULL;
-}
-
-XkbDescPtr
-#if NeedFunctionPrototypes
-XkbGetKeyboard(Display *dpy,unsigned which,unsigned deviceSpec)
-#else
-XkbGetKeyboard(dpy,which,deviceSpec)
-    Display *		dpy;
-    unsigned		which;
-    unsigned		deviceSpec;
-#endif
-{
-    return XkbGetKeyboardByName(dpy,deviceSpec,NULL,which,which,False);
-}
diff --git a/xc/lib/X11/XKBGetMap.c b/xc/lib/X11/XKBGetMap.c
deleted file mode 100644
index 395eba5de..000000000
--- a/xc/lib/X11/XKBGetMap.c
+++ /dev/null
@@ -1,977 +0,0 @@
-/* $TOG: XKBGetMap.c /main/11 1998/06/17 13:24:49 kaleb $ */
-/************************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-
-/* $XFree86: xc/lib/X11/XKBGetMap.c,v 1.4 1998/10/03 08:41:26 dawes Exp $ */
-
-#define NEED_REPLIES
-#define NEED_EVENTS
-#define	NEED_MAP_READERS
-#include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
-#include "XKBlibint.h"
-
-static Status
-#if NeedFunctionPrototypes
-_XkbReadKeyTypes(XkbReadBufferPtr buf,XkbDescPtr xkb,xkbGetMapReply *rep)
-#else
-_XkbReadKeyTypes(buf,xkb,rep)
-    XkbReadBufferPtr	buf;
-    XkbDescPtr 		xkb;
-    xkbGetMapReply *	rep;
-#endif
-{
-int		 i,n,lastMapCount;
-XkbKeyTypePtr	type;
-
-    if ( rep->nTypes>0 ) {
-	n = rep->firstType+rep->nTypes;
-	if (xkb->map->num_types>=n)
-	    n= xkb->map->num_types;
-	else if (XkbAllocClientMap(xkb,XkbKeyTypesMask,n)!=Success)
-	    return BadAlloc;
-
-	type = &xkb->map->types[rep->firstType];
-	for (i=0;i<(int)rep->nTypes;i++,type++) {
-	    xkbKeyTypeWireDesc	*desc;
-	    register int ndx;
-
-	    ndx= i+rep->firstType;
-	    if (ndx>=xkb->map->num_types)
-		xkb->map->num_types= ndx+1;
-
-	    desc= (xkbKeyTypeWireDesc *)_XkbGetReadBufferPtr(buf,
-						SIZEOF(xkbKeyTypeWireDesc));
-	    if (desc==NULL)
-		return BadLength;
-
-	    lastMapCount= type->map_count;
-	    if ( desc->nMapEntries>0 ) {
-		if ((type->map==NULL)||(desc->nMapEntries>type->map_count)) {
-		    XkbKTMapEntryRec *prev_map = type->map;
-
-		    type->map= _XkbTypedRealloc(type->map,desc->nMapEntries,
-							      XkbKTMapEntryRec);
-		    if (type->map==NULL) {
-			_XkbFree(prev_map);
-			return BadAlloc;
-		    }
-		}
-	    }
-	    else if (type->map!=NULL) {
-		Xfree(type->map);
-		type->map_count= 0;
-		type->map= NULL;
-	    }
-
-	    if ( desc->preserve && (desc->nMapEntries>0) ) {
-		if ((!type->preserve)||
-		    (desc->nMapEntries>lastMapCount)) {
-		    XkbModsRec *prev_preserve = type->preserve;
-
-		    type->preserve= _XkbTypedRealloc(type->preserve,
-							desc->nMapEntries,
-							XkbModsRec);
-		    if (type->preserve==NULL) {
-			_XkbFree(prev_preserve);
-			return BadAlloc;
-		    }
-		}
-	    }
-	    else if (type->preserve!=NULL) {
-		Xfree(type->preserve);
-		type->preserve= NULL;
-	    }
-
-	    type->mods.mask = desc->mask;
-	    type->mods.real_mods = desc->realMods;
-	    type->mods.vmods = desc->virtualMods;
-	    type->num_levels = desc->numLevels;
-	    type->map_count = desc->nMapEntries;
-	    if (desc->nMapEntries>0) {
-		register xkbKTMapEntryWireDesc *wire; 
-		register XkbKTMapEntryPtr	entry;
-		register int size;
-
-		size= type->map_count*SIZEOF(xkbKTMapEntryWireDesc);
-		wire= (xkbKTMapEntryWireDesc *)_XkbGetReadBufferPtr(buf,size);
-		if (wire==NULL)
-		    return BadLength;
-		entry= type->map;
-		for (n=0;n<type->map_count;n++,wire++,entry++) {
-		    entry->active= wire->active;
-		    entry->level= wire->level;
-		    entry->mods.mask= wire->mask;
-		    entry->mods.real_mods= wire->realMods;
-		    entry->mods.vmods= wire->virtualMods;
-		}
-
-	 	if (desc->preserve) {
-		    register xkbModsWireDesc *	pwire; 
-		    register XkbModsPtr		preserve;
-		    register int sz;
-
-		    sz= desc->nMapEntries*SIZEOF(xkbModsWireDesc);
-		    pwire=(xkbModsWireDesc *)_XkbGetReadBufferPtr(buf,sz);
-		    if (pwire==NULL)
-			return BadLength;
-		    preserve= type->preserve;
-		    for (n=0;n<desc->nMapEntries;n++,pwire++,preserve++) {
-			preserve->mask=  pwire->mask;
-			preserve->vmods=  pwire->virtualMods;
-			preserve->real_mods= pwire->realMods;
-		    }
-		}
-	    }
-	}
-    }
-    return Success;
-}
-
-static Status
-#if NeedFunctionPrototypes
-_XkbReadKeySyms(XkbReadBufferPtr buf,XkbDescPtr xkb,xkbGetMapReply *rep)
-#else
-_XkbReadKeySyms(buf,xkb,rep)
-    XkbReadBufferPtr	buf;
-    XkbDescPtr 		xkb;
-    xkbGetMapReply *	rep;
-#endif
-{
-register int i;
-XkbClientMapPtr	map;
-
-    map= xkb->map;
-    if (map->key_sym_map==NULL) {
-	register int offset;
-	XkbSymMapPtr	oldMap;
-	xkbSymMapWireDesc *newMap;
-	map->key_sym_map= _XkbTypedCalloc((xkb->max_key_code+1),XkbSymMapRec);
-	if (map->key_sym_map==NULL)
-	    return BadAlloc;
-	if (map->syms==NULL) {
-	    int sz;
-	    sz= (rep->totalSyms*12)/10;
-	    sz= ((sz+(unsigned)128)/128)*128;
-	    map->syms = _XkbTypedCalloc(sz,KeySym);
-	    if (map->syms==NULL)
-		return BadAlloc;
-	    map->size_syms = sz;
-	}
-	offset = 1;
-	oldMap = &map->key_sym_map[rep->firstKeySym];
-	for (i=0;i<(int)rep->nKeySyms;i++,oldMap++) {
-	    newMap= (xkbSymMapWireDesc *)
-			_XkbGetReadBufferPtr(buf,SIZEOF(xkbSymMapWireDesc));
-	    if (newMap==NULL)
-		return BadLength;
-	    oldMap->kt_index[0]= newMap->ktIndex[0];
-	    oldMap->kt_index[1]= newMap->ktIndex[1];
-	    oldMap->kt_index[2]= newMap->ktIndex[2];
-	    oldMap->kt_index[3]= newMap->ktIndex[3];
-	    oldMap->group_info= newMap->groupInfo;
-	    oldMap->width= newMap->width;
-	    oldMap->offset= offset;
-	    if (offset+newMap->nSyms>=map->size_syms) {
-		register int sz;
-		KeySym *prev_syms = map->syms;
-
-		sz= map->size_syms+128;
-		map->syms= _XkbTypedRealloc(map->syms,sz,KeySym);
-		if (map->syms==NULL) {
-		    _XkbFree(prev_syms);
-		    map->size_syms= 0;
-		    return BadAlloc;
-		}
-		map->size_syms= sz;
-	    }
-	    if (newMap->nSyms>0) {
-		_XkbReadBufferCopyKeySyms(buf,(KeySym *)&map->syms[offset],
-							newMap->nSyms);
-		offset+= newMap->nSyms;
-	    }
-	    else {
-		map->syms[offset]= 0;
-	    }
-	}
-	map->num_syms= offset;
-    }
-    else {
-	xkbSymMapWireDesc *	newMap;
-	XkbSymMapPtr		oldMap;
-	KeySym *		newSyms;
-	int			tmp;
-
-	oldMap = &map->key_sym_map[rep->firstKeySym];
-	for (i=0;i<(int)rep->nKeySyms;i++,oldMap++) {
-	    newMap= (xkbSymMapWireDesc *)
-			_XkbGetReadBufferPtr(buf,SIZEOF(xkbSymMapWireDesc));
-	    if (newMap==NULL)
-		return BadLength;
-
-	    if (newMap->nSyms>0)
-		 tmp= newMap->nSyms;
-	    else tmp= 0;
-
-	    newSyms = XkbResizeKeySyms(xkb,i+rep->firstKeySym,tmp);
-	    if (newSyms==NULL)
-		return BadAlloc;
-	    if (newMap->nSyms>0)
-		_XkbReadBufferCopyKeySyms(buf,newSyms,newMap->nSyms);
-	    else newSyms[0]= NoSymbol;
-	    oldMap->kt_index[0] = newMap->ktIndex[0];
-	    oldMap->kt_index[1] = newMap->ktIndex[1];
-	    oldMap->kt_index[2] = newMap->ktIndex[2];
-	    oldMap->kt_index[3] = newMap->ktIndex[3];
-	    oldMap->group_info = newMap->groupInfo;
-	    oldMap->width = newMap->width;
-	}
-    }
-    return Success;
-}
-
-static Status
-#if NeedFunctionPrototypes
-_XkbReadKeyActions(XkbReadBufferPtr buf,XkbDescPtr info,xkbGetMapReply *rep)
-#else
-_XkbReadKeyActions(buf,info,rep)
-    XkbReadBufferPtr	buf;
-    XkbDescPtr		info;
-    xkbGetMapReply *	rep;
-#endif
-{
-int		i;
-CARD8		numDescBuf[248];
-CARD8*		numDesc = NULL;
-register int	nKeyActs;
-Status		ret = Success;
-
-    if ( (nKeyActs=rep->nKeyActs)>0 ) {
-	XkbSymMapPtr	symMap;
-
-	if (nKeyActs < sizeof numDescBuf) numDesc = numDescBuf;
-	else numDesc = Xmalloc (nKeyActs * sizeof(CARD8));
-
-	if (!_XkbCopyFromReadBuffer(buf, (char *)numDesc, nKeyActs)) {
-	    ret = BadLength;
-	    goto done;
-	}
-	i= XkbPaddedSize(nKeyActs)-nKeyActs;
-	if ((i>0)&&(!_XkbSkipReadBufferData(buf,i))) {
-	    ret = BadLength;
-	    goto done;
-	}
-	symMap = &info->map->key_sym_map[rep->firstKeyAct];
-	for (i=0;i<(int)rep->nKeyActs;i++,symMap++) {
-	    if (numDesc[i]==0) {
-		info->server->key_acts[i+rep->firstKeyAct]= 0;
-	    }
-	    else {
-		XkbAction *newActs;
-		/* 8/16/93 (ef) -- XXX! Verify size here (numdesc must be */
-		/*                 either zero or XkbKeyNumSyms(info,key) */
-		newActs=XkbResizeKeyActions(info,i+rep->firstKeyAct,
-								numDesc[i]);
-		if (newActs==NULL) {
-		    ret = BadAlloc;
-		    goto done;
-		}
-		if (!_XkbCopyFromReadBuffer(buf,(char *)newActs,
-					(int)(numDesc[i]*sizeof(XkbAction)))) {
-		    ret = BadLength;
-		    goto done;
-		}
-	    }
-	}
-    }
-done:
-    if (numDesc != NULL && numDesc != numDescBuf) Xfree (numDesc);
-    return ret;
-}
-
-static Status
-#if NeedFunctionPrototypes
-_XkbReadKeyBehaviors(XkbReadBufferPtr buf,XkbDescPtr xkb,xkbGetMapReply *rep)
-#else
-_XkbReadKeyBehaviors(buf,xkb,rep)
-    XkbReadBufferPtr	buf;
-    XkbDescPtr 		xkb;
-    xkbGetMapReply *	rep;
-#endif
-{
-register int i;
-xkbBehaviorWireDesc	*wire;
-
-    if ( rep->totalKeyBehaviors>0 ) {
-	if ( xkb->server->behaviors == NULL ) {
-	    int size = xkb->max_key_code+1;
-	    xkb->server->behaviors = _XkbTypedCalloc(size,XkbBehavior);
-	    if (xkb->server->behaviors==NULL)
-		return BadAlloc;
-	}
-	else {
-	    bzero(&xkb->server->behaviors[rep->firstKeyBehavior],
-	    		(rep->nKeyBehaviors*sizeof(XkbBehavior)));
-	}
-	for (i=0;i<rep->totalKeyBehaviors;i++) {
-	    wire= (xkbBehaviorWireDesc *)_XkbGetReadBufferPtr(buf,
-						SIZEOF(xkbBehaviorWireDesc));
-	    if (wire==NULL)
-		return BadLength;
-	    xkb->server->behaviors[wire->key].type= wire->type;
-	    xkb->server->behaviors[wire->key].data= wire->data;
-	}
-    }
-    return Success;
-}
-
-static Status
-#if NeedFunctionPrototypes
-_XkbReadVirtualMods(XkbReadBufferPtr buf,XkbDescPtr xkb,xkbGetMapReply *rep)
-#else
-_XkbReadVirtualMods(buf,xkb,rep)
-    XkbReadBufferPtr	buf;
-    XkbDescPtr		xkb;
-    xkbGetMapReply *	rep;
-#endif
-{
-    if ( rep->virtualMods ) {
-	register int i,bit,nVMods;
-	register char *data;
-
-	for (i=nVMods=0,bit=1;i<XkbNumVirtualMods;i++,bit<<=1) {
-	    if (rep->virtualMods&bit)
-		nVMods++;
-	}
-	data= _XkbGetReadBufferPtr(buf,XkbPaddedSize(nVMods));
-	if (data==NULL)
-	    return BadLength;
-	for (i=0,bit=1;(i<XkbNumVirtualMods)&&(nVMods>0);i++,bit<<=1) {
-	    if (rep->virtualMods&bit) {
-		xkb->server->vmods[i]= *data++;
-		nVMods--;
-	    }
-	}
-    }
-    return Success;
-}
-
-static Status
-#if NeedFunctionPrototypes
-_XkbReadExplicitComponents(	XkbReadBufferPtr	buf,
-				XkbDescPtr 		xkb,
-				xkbGetMapReply *	rep)
-#else
-_XkbReadExplicitComponents(buf,xkb,rep)
-    XkbReadBufferPtr	buf;
-    XkbDescPtr		xkb;
-    xkbGetMapReply *	rep;
-#endif
-{
-register int i;
-unsigned char *wire;
-
-    if ( rep->totalKeyExplicit>0 ) {
-	if ( xkb->server->explicit == NULL ) {
-	    int size = xkb->max_key_code+1;
-	    xkb->server->explicit = _XkbTypedCalloc(size,unsigned char);
-	    if (xkb->server->explicit==NULL)
-		return BadAlloc;
-	}
-	else {
-	    bzero(&xkb->server->explicit[rep->firstKeyExplicit],
-	    						rep->nKeyExplicit);
-	}
-	i= XkbPaddedSize(2*rep->totalKeyExplicit);
-	wire=(unsigned char *)_XkbGetReadBufferPtr(buf,i);
-	if (!wire)
-	    return BadLength;
-	for (i=0;i<rep->totalKeyExplicit;i++,wire+=2) {
-	    xkb->server->explicit[wire[0]]= wire[1];
-	}
-    }
-    return Success;
-}
-
-static Status
-#if NeedFunctionPrototypes
-_XkbReadModifierMap(XkbReadBufferPtr buf,XkbDescPtr xkb,xkbGetMapReply *rep)
-#else
-_XkbReadModifierMap(buf,xkb,rep)
-    XkbReadBufferPtr	buf;
-    XkbDescPtr		xkb;
-    xkbGetMapReply *	rep;
-#endif
-{
-register int i;
-unsigned char *wire;
-
-    if ( rep->totalModMapKeys>0 ) {
-	if ((xkb->map->modmap==NULL)&&
-	    (XkbAllocClientMap(xkb,XkbModifierMapMask,0)!=Success)) {
-	    return BadAlloc;
-	}
-	else {
-	    bzero(&xkb->map->modmap[rep->firstModMapKey],rep->nModMapKeys);
-	}
-	i= XkbPaddedSize(2*rep->totalModMapKeys);
-	wire=(unsigned char *)_XkbGetReadBufferPtr(buf,i);
-	if (!wire)
-	    return BadLength;
-	for (i=0;i<rep->totalModMapKeys;i++,wire+=2) {
-	    xkb->map->modmap[wire[0]]= wire[1];
-	}
-    }
-    return Success;
-}
-
-static Status
-#if NeedFunctionPrototypes
-_XkbReadVirtualModMap(XkbReadBufferPtr buf,XkbDescPtr xkb,xkbGetMapReply *rep)
-#else
-_XkbReadVirtualModMap(buf,xkb,rep)
-    XkbReadBufferPtr	buf;
-    XkbDescPtr		xkb;
-    xkbGetMapReply *	rep;
-#endif
-{
-register int 		i;
-xkbVModMapWireDesc *	wire;
-XkbServerMapPtr		srv;
-
-    if ( rep->totalVModMapKeys>0 ) {
-	if (((xkb->server==NULL)||(xkb->server->vmodmap==NULL))&&
-	    (XkbAllocServerMap(xkb,XkbVirtualModMapMask,0)!=Success)) {
-	    return BadAlloc;
-	}
-	else {
-	    srv= xkb->server;
-	    bzero((char *)&srv->vmodmap[rep->firstVModMapKey],
-				rep->nVModMapKeys*sizeof(unsigned short));
-	}
-	srv= xkb->server;
-	i= rep->totalVModMapKeys*SIZEOF(xkbVModMapWireDesc);
-	wire=(xkbVModMapWireDesc *)_XkbGetReadBufferPtr(buf,i);
-	if (!wire)
-	    return BadLength;
-	for (i=0;i<rep->totalVModMapKeys;i++,wire++) {
-	    if ((wire->key>=xkb->min_key_code)&&(wire->key<=xkb->max_key_code))
-		srv->vmodmap[wire->key]= wire->vmods;
-	}
-    }
-    return Success;
-}
-
-static xkbGetMapReq *
-#if NeedFunctionPrototypes
-_XkbGetGetMapReq(Display *dpy,XkbDescPtr xkb)
-#else
-_XkbGetGetMapReq(dpy,xkb)
-    Display *	dpy;
-    XkbDescPtr	xkb;
-#endif
-{
-xkbGetMapReq *req;
-
-    GetReq(kbGetMap, req);
-    req->reqType = dpy->xkb_info->codes->major_opcode;
-    req->xkbReqType = X_kbGetMap;
-    req->deviceSpec = xkb->device_spec;
-    req->full = req->partial = 0;
-    req->firstType = req->nTypes = 0;
-    req->firstKeySym = req->nKeySyms = 0;
-    req->firstKeyAct = req->nKeyActs = 0;
-    req->firstKeyBehavior = req->nKeyBehaviors = 0;
-    req->virtualMods = 0;
-    req->firstKeyExplicit = req->nKeyExplicit = 0;
-    req->firstModMapKey = req->nModMapKeys = 0;
-    req->firstVModMapKey = req->nVModMapKeys = 0;
-    return req;
-}
-
-Status
-#if NeedFunctionPrototypes
-_XkbReadGetMapReply(	Display *	dpy,
-			xkbGetMapReply *rep,
-			XkbDescPtr	xkb,
-			int *		nread_rtrn)
-#else
-_XkbReadGetMapReply(dpy,rep,xkb,nread_rtrn)
-    Display *		dpy;
-    xkbGetMapReply *	rep;
-    XkbDescPtr		xkb;
-    int *		nread_rtrn;
-#endif
-{
-int		extraData;
-unsigned	mask;
-
-    if ( xkb->device_spec == XkbUseCoreKbd )
-	xkb->device_spec= rep->deviceID;
-    xkb->min_key_code = rep->minKeyCode;
-    xkb->max_key_code = rep->maxKeyCode;
-
-    if (!xkb->map) {
-	mask= rep->present&XkbAllClientInfoMask;
-	if (mask&&(XkbAllocClientMap(xkb,mask,rep->nTypes)!=Success))
-	    return BadAlloc;
-    }
-    if (!xkb->server) {
-	mask= rep->present&XkbAllServerInfoMask;
-	if (mask&&(XkbAllocServerMap(xkb,mask,rep->totalActs)!=Success))
-	    return BadAlloc;
-    }
-    extraData= (int)(rep->length*4);
-    extraData-= (SIZEOF(xkbGetMapReply)-SIZEOF(xGenericReply));
-    if (rep->length) {
-	XkbReadBufferRec	buf;
-	int			left;
-	if (_XkbInitReadBuffer(dpy,&buf,extraData)) {
-	    Status status= Success;
-	    if (nread_rtrn!=NULL)
-		*nread_rtrn= extraData;
-	    if (status==Success)
-		status= _XkbReadKeyTypes(&buf,xkb,rep);
-	    if (status==Success)
-		status= _XkbReadKeySyms(&buf,xkb,rep);
-	    if (status==Success)
-		status= _XkbReadKeyActions(&buf,xkb,rep);
-	    if (status==Success)
-		status= _XkbReadKeyBehaviors(&buf,xkb,rep);
-	    if (status==Success)
-		status= _XkbReadVirtualMods(&buf,xkb,rep);
-	    if (status==Success)
-		status= _XkbReadExplicitComponents(&buf,xkb,rep);
-	    if (status==Success)
-		status= _XkbReadModifierMap(&buf,xkb,rep);
-	    if (status==Success)
-		status= _XkbReadVirtualModMap(&buf,xkb,rep);
-	    left= _XkbFreeReadBuffer(&buf);
-	    if (status!=Success)		return status;
-	    else if ( left || buf.error )	return BadLength;
-	}
-	else return BadAlloc;
-    }
-    return Success;
-}
-
-static Status
-#if NeedFunctionPrototypes
-_XkbHandleGetMapReply(Display *dpy,XkbDescPtr xkb)
-#else
-_XkbHandleGetMapReply(dpy,xkb)
-    Display *	dpy;
-    XkbDescPtr	xkb;
-#endif
-{
-xkbGetMapReply	rep;
-
-    if (!_XReply(dpy, (xReply *)&rep,
-    		 ( (SIZEOF(xkbGetMapReply)-SIZEOF(xGenericReply)) >> 2 ), 
-		 xFalse)) {
-	return BadImplementation;
-    }
-    return _XkbReadGetMapReply(dpy,&rep,xkb,NULL);
-}
-
-Status
-#if NeedFunctionPrototypes
-XkbGetUpdatedMap(Display *dpy,unsigned which,XkbDescPtr xkb)
-#else
-XkbGetUpdatedMap(dpy,which,xkb)
-    Display *	dpy;
-    unsigned 	which;
-    XkbDescPtr	xkb;
-#endif
-{
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return BadAccess;
-    if (which) {
-	register xkbGetMapReq *req;
-	Status status;
-
-	LockDisplay(dpy);
-
-	req = _XkbGetGetMapReq(dpy, xkb);
-	req->full = which;
-	status= _XkbHandleGetMapReply(dpy, xkb);
-
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return status;
-    }
-    return Success;
-}
-
-XkbDescPtr
-#if NeedFunctionPrototypes
-XkbGetMap(Display *dpy,unsigned which,unsigned deviceSpec)
-#else
-XkbGetMap(dpy,which,deviceSpec)
-    Display *dpy;
-    unsigned which;
-    unsigned deviceSpec;
-#endif
-{
-XkbDescPtr xkb;
-
-    xkb = _XkbTypedCalloc(1,XkbDescRec);
-    if (xkb) {
-	xkb->device_spec = deviceSpec;
-	xkb->map = _XkbTypedCalloc(1,XkbClientMapRec);
-	if ((xkb->map==NULL)||
-	    ((which)&&(XkbGetUpdatedMap(dpy,which,xkb)!=Success))) {
-	    if (xkb->map) {
-		Xfree(xkb->map);
-		xkb->map= NULL;
-	    }
-	    Xfree(xkb);
-	    return NULL;
-	}
-	xkb->dpy= dpy;
-    }
-    return xkb;
-}
-
-Status
-#if NeedFunctionPrototypes
-XkbGetKeyTypes(Display *dpy,unsigned first,unsigned num,XkbDescPtr xkb)
-#else
-XkbGetKeyTypes(dpy,first,num,xkb)
-    Display *dpy;
-    unsigned first;
-    unsigned num;
-    XkbDescPtr xkb;
-#endif
-{
-    register xkbGetMapReq *req;
-    Status status;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return BadAccess;
-    if ((num<1)||(num>XkbMaxKeyTypes))
-	return BadValue;
-
-    LockDisplay(dpy);
-
-    req = _XkbGetGetMapReq(dpy, xkb);
-    req->firstType = first;
-    req->nTypes = num;
-    status= _XkbHandleGetMapReply(dpy, xkb);
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return status;
-}
-
-Status
-#if NeedFunctionPrototypes
-XkbGetKeyActions(Display *dpy,unsigned first,unsigned num,XkbDescPtr xkb)
-#else
-XkbGetKeyActions(dpy,first,num,xkb)
-    Display *dpy;
-    unsigned first;
-    unsigned num;
-    XkbDescPtr xkb;
-#endif
-{
-    register xkbGetMapReq *req;
-    Status status;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return BadAccess;
-
-    if ((num<1)||(num>XkbMaxKeyCount))
-	return BadValue;
-
-    LockDisplay(dpy);
-
-    req = _XkbGetGetMapReq(dpy, xkb);
-    req->firstKeyAct = first;
-    req->nKeyActs = num;
-    status= _XkbHandleGetMapReply(dpy, xkb);
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return status;
-}
-
-Status
-#if NeedFunctionPrototypes
-XkbGetKeySyms(Display *dpy,unsigned first,unsigned num,XkbDescPtr xkb)
-#else
-XkbGetKeySyms(dpy,first,num,xkb)
-    Display *dpy;
-    unsigned first;
-    unsigned num;
-    XkbDescPtr xkb;
-#endif
-{
-    register xkbGetMapReq *req;
-    Status status;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return BadAccess;
-
-    if ((num<1)||(num>XkbMaxKeyCount))
-	return BadValue;
-
-    LockDisplay(dpy);
-
-    req = _XkbGetGetMapReq(dpy, xkb);
-    req->firstKeySym = first;
-    req->nKeySyms = num;
-    status= _XkbHandleGetMapReply(dpy, xkb);
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-
-    return status;
-}
-
-Status
-#if NeedFunctionPrototypes
-XkbGetKeyBehaviors(Display *dpy,unsigned first,unsigned num,XkbDescPtr xkb)
-#else
-XkbGetKeyBehaviors(dpy,first,num,xkb)
-    Display *	dpy;
-    unsigned 	first;
-    unsigned 	num;
-    XkbDescPtr	xkb;
-#endif
-{
-    register xkbGetMapReq *req;
-    Status status;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return BadAccess;
-
-    if ((num<1)||(num>XkbMaxKeyCount))
-	return BadValue;
-
-    LockDisplay(dpy);
-
-    req = _XkbGetGetMapReq(dpy, xkb);
-    req->firstKeyBehavior = first;
-    req->nKeyBehaviors = num;
-    status= _XkbHandleGetMapReply(dpy, xkb);
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return status;
-}
-
-Status
-#if NeedFunctionPrototypes
-XkbGetVirtualMods(Display *dpy,unsigned which,XkbDescPtr xkb)
-#else
-XkbGetVirtualMods(dpy,which,xkb)
-    Display *	dpy;
-    unsigned 	which;
-    XkbDescPtr	xkb;
-#endif
-{
-    register xkbGetMapReq *req;
-    Status status;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return BadAccess;
-
-    LockDisplay(dpy);
-
-    req = _XkbGetGetMapReq(dpy, xkb);
-    req->virtualMods = which;
-    status= _XkbHandleGetMapReply(dpy, xkb);
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return status;
-}
-
-Status
-#if NeedFunctionPrototypes
-XkbGetKeyExplicitComponents(	Display *	dpy,
-				unsigned	first,
-				unsigned 	num,
-				XkbDescPtr	xkb)
-#else
-XkbGetKeyExplicitComponents(dpy,first,num,xkb)
-    Display *dpy;
-    unsigned first;
-    unsigned num;
-    XkbDescPtr xkb;
-#endif
-{
-    register xkbGetMapReq *req;
-    Status status;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return BadAccess;
-
-    if ((num<1)||(num>XkbMaxKeyCount))
-	return BadValue;
-
-    LockDisplay(dpy);
-
-    req = _XkbGetGetMapReq(dpy, xkb);
-    req->firstKeyExplicit = first;
-    req->nKeyExplicit = num;
-    if ((xkb!=NULL) && (xkb->server!=NULL) && (xkb->server->explicit!=NULL)) {
-	if ((num>0)&&(first>=xkb->min_key_code)&&(first+num<=xkb->max_key_code))
-	    bzero(&xkb->server->explicit[first],num);
-    }
-    status= _XkbHandleGetMapReply(dpy, xkb);
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return status;
-}
-
-Status
-#if NeedFunctionPrototypes
-XkbGetKeyModifierMap(Display *dpy,unsigned first,unsigned num,XkbDescPtr xkb)
-#else
-XkbGetKeyModifierMap(dpy,first,num,xkb)
-    Display *	dpy;
-    unsigned 	first;
-    unsigned 	num;
-    XkbDescPtr	xkb;
-#endif
-{
-    register xkbGetMapReq *req;
-    Status status;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return BadAccess;
-
-    if ((num<1)||(num>XkbMaxKeyCount))
-	return BadValue;
-
-    LockDisplay(dpy);
-
-    req = _XkbGetGetMapReq(dpy, xkb);
-    req->firstModMapKey = first;
-    req->nModMapKeys = num;
-    if ((xkb!=NULL) && (xkb->map!=NULL) && (xkb->map->modmap!=NULL)) {
-	if ((num>0)&&(first>=xkb->min_key_code)&&(first+num<=xkb->max_key_code))
-	    bzero(&xkb->map->modmap[first],num);
-    }
-    status= _XkbHandleGetMapReply(dpy, xkb);
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return status;
-}
-
-Status
-#if NeedFunctionPrototypes
-XkbGetKeyVirtualModMap(Display *dpy,unsigned first,unsigned num,XkbDescPtr xkb)
-#else
-XkbGetKeyVirtualModMap(dpy,first,num,xkb)
-    Display *dpy;
-    unsigned first;
-    unsigned num;
-    XkbDescPtr xkb;
-#endif
-{
-    register xkbGetMapReq *req;
-    Status status;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return BadAccess;
-
-    if ((num<1)||(num>XkbMaxKeyCount))
-	return BadValue;
-
-    LockDisplay(dpy);
-
-    req = _XkbGetGetMapReq(dpy, xkb);
-    req->firstVModMapKey = first;
-    req->nVModMapKeys = num;
-    if ((xkb!=NULL) && (xkb->map!=NULL) && (xkb->map->modmap!=NULL)) {
-	if ((num>0)&&(first>=xkb->min_key_code)&&(first+num<=xkb->max_key_code))
-	    bzero(&xkb->server->vmodmap[first],num*sizeof(unsigned short));
-    }
-    status= _XkbHandleGetMapReply(dpy, xkb);
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return status;
-}
-
-Status
-#if NeedFunctionPrototypes
-XkbGetMapChanges(Display *dpy,XkbDescPtr xkb,XkbMapChangesPtr changes)
-#else
-XkbGetMapChanges(dpy,xkb,changes)
-    Display *		dpy;
-    XkbDescPtr		xkb;
-    XkbMapChangesPtr	changes;
-#endif
-{
-    xkbGetMapReq *req;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return BadAccess;
-    LockDisplay(dpy);
-    if (changes->changed) {
-	Status status= Success;
-	req = _XkbGetGetMapReq(dpy, xkb);
-	req->full = 0;
-	req->partial = changes->changed;
-	req->firstType = changes->first_type;
-	req->nTypes = changes->num_types;
-	req->firstKeySym = changes->first_key_sym;
-	req->nKeySyms = changes->num_key_syms;
-	req->firstKeyAct = changes->first_key_act;
-	req->nKeyActs = changes->num_key_acts;
-	req->firstKeyBehavior = changes->first_key_behavior;
-	req->nKeyBehaviors = changes->num_key_behaviors;
-	req->virtualMods = changes->vmods;
-	req->firstKeyExplicit = changes->first_key_explicit;
-	req->nKeyExplicit = changes->num_key_explicit;
-	req->firstModMapKey = changes->first_modmap_key;
-	req->nModMapKeys = changes->num_modmap_keys;
-	req->firstVModMapKey = changes->first_vmodmap_key;
-	req->nVModMapKeys = changes->num_vmodmap_keys;
-	status= _XkbHandleGetMapReply(dpy, xkb);
-	SyncHandle();
-	UnlockDisplay(dpy);
-	return status;
-    }
-    return Success;
-}
-
diff --git a/xc/lib/X11/XKBList.c b/xc/lib/X11/XKBList.c
deleted file mode 100644
index 69b4732d7..000000000
--- a/xc/lib/X11/XKBList.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/* $XConsortium: XKBList.c /main/3 1996/02/05 06:00:46 kaleb $ */
-/************************************************************
-Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-
-#define NEED_REPLIES
-#define NEED_EVENTS
-#define	NEED_MAP_READERS
-#include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
-#include "XKBlibint.h"
-
-/***====================================================================***/
-
-static void
-#if NeedFunctionPrototypes
-_FreeComponentNames(int num,XkbComponentNamePtr names)
-#else
-_FreeComponentNames(num,names)
-    int			num;
-    XkbComponentNamePtr	names;
-#endif
-{
-int			i;
-XkbComponentNamePtr	tmp;
-
-    if ((num<1)||(names==NULL))
-	return;
-    for (i=0,tmp=names;i<num;i++,tmp++) {
-	if (tmp->name) {
-	    _XkbFree(tmp->name);
-	    tmp->name= NULL;
-	}
-    }
-    _XkbFree(names);
-    return;
-}
-
-/***====================================================================***/
-
-static XkbComponentNamePtr
-#if NeedFunctionPrototypes
-_ReadListing(XkbReadBufferPtr buf,int count,Status *status_rtrn)
-#else
-_ReadListing(buf,count,status_rtrn)
-    XkbReadBufferPtr	buf;
-    int			count;
-    Status *		status_rtrn;
-#endif
-{
-XkbComponentNamePtr	first,this;
-register int		i;
-CARD16 *		flags;
-int			slen,wlen;
-char *			str;
-
-    if (count<1)
-	return NULL;
-    first= _XkbTypedCalloc(count,XkbComponentNameRec);
-    if (!first)
-	return NULL;
-    for (this=first,i=0;i<count;i++,this++) {
-	flags= (CARD16 *)_XkbGetReadBufferPtr(buf,2*sizeof(CARD16));
-	if (!flags)
-	    goto BAILOUT;
-	this->flags= 	flags[0];
-	slen=		flags[1];
-	wlen= 		((slen+1)/2)*2; /* pad to 2 byte boundary */
-	this->name=	_XkbTypedCalloc(slen+1,char);
-	if (!this->name)
-	    goto BAILOUT;
-	str= (char *)_XkbGetReadBufferPtr(buf,wlen);
-	memcpy(this->name,str,slen);
-    }
-    return first;
-BAILOUT:
-    *status_rtrn= BadAlloc;
-    _FreeComponentNames(i,first);
-    return NULL;
-}
-
-/***====================================================================***/
-
-XkbComponentListPtr
-#if NeedFunctionPrototypes
-XkbListComponents(	Display *		dpy,
-			unsigned		deviceSpec,
-			XkbComponentNamesPtr	ptrns,
-			int *			max_inout)
-#else
-XkbListComponents(dpy,deviceSpec,ptrns,max_inout)
-    Display *			dpy;
-    unsigned			deviceSpec;
-    XkbComponentNamesPtr	ptrns;
-    int *			max_inout;
-#endif
-{
-register xkbListComponentsReq*	req;
-xkbListComponentsReply 		rep;
-XkbInfoPtr 			xkbi;
-XkbComponentListPtr		list;
-XkbReadBufferRec		buf;
-int				left;
-char *				str;
-int extraLen,len,mapLen,codesLen,typesLen,compatLen,symsLen,geomLen;
-
-    if ( (dpy==NULL) || (dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)) ||
-	(ptrns==NULL) || (max_inout==NULL))
-	return NULL;
-
-    xkbi= dpy->xkb_info;
-    LockDisplay(dpy);
-    GetReq(kbListComponents, req);
-    req->reqType = 	xkbi->codes->major_opcode;
-    req->xkbReqType = 	X_kbListComponents;
-    req->deviceSpec = 	deviceSpec;
-    req->maxNames =	*max_inout;
-
-    mapLen= codesLen= typesLen= compatLen= symsLen= geomLen= 0;
-    if (ptrns->keymap)
-	mapLen= (int)strlen(ptrns->keymap);
-    if (ptrns->keycodes)
-	codesLen= (int)strlen(ptrns->keycodes);
-    if (ptrns->types)
-	typesLen= (int)strlen(ptrns->types);
-    if (ptrns->compat)
-	compatLen= (int)strlen(ptrns->compat);
-    if (ptrns->symbols)
-	symsLen= (int)strlen(ptrns->symbols);
-    if (ptrns->geometry)
-	geomLen= (int)strlen(ptrns->geometry);
-    if (mapLen>255)	mapLen= 255;
-    if (codesLen>255)	codesLen= 255;
-    if (typesLen>255)	typesLen= 255;
-    if (compatLen>255)	compatLen= 255;
-    if (symsLen>255)	symsLen= 255;
-    if (geomLen>255)	geomLen= 255;
-
-    len= mapLen+codesLen+typesLen+compatLen+symsLen+geomLen+6;
-    len= XkbPaddedSize(len);
-    req->length+= len/4;
-    BufAlloc(char *,str,len);
-    *str++= mapLen;
-    if (mapLen>0) {
-	 memcpy(str,ptrns->keymap,mapLen);
-	 str+= mapLen;
-    }
-    *str++= codesLen;
-    if (codesLen>0) {
-	 memcpy(str,ptrns->keycodes,codesLen);
-	 str+= codesLen;
-    }
-    *str++= typesLen;
-    if (typesLen>0) {
-	 memcpy(str,ptrns->types,typesLen);
-	 str+= typesLen;
-    }
-    *str++= compatLen;
-    if (compatLen>0) {
-	 memcpy(str,ptrns->compat,compatLen);
-	 str+= compatLen;
-    }
-    *str++= symsLen;
-    if (symsLen>0) {
-	 memcpy(str,ptrns->symbols,symsLen);
-	 str+= symsLen;
-    }
-    *str++= geomLen;
-    if (geomLen>0) {
-	 memcpy(str,ptrns->geometry,geomLen);
-	 str+= geomLen;
-    }
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse))
-	goto BAILOUT;
-    extraLen= (int)rep.length*4;
-    *max_inout= rep.extra;
-    if (extraLen==0) { /* no matches, but we don't want to report a failure */
-	list= _XkbTypedCalloc(1,XkbComponentListRec);
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return list;
-    }
-    if (_XkbInitReadBuffer(dpy,&buf,extraLen)) {
-	Status status;
-	
-	status= Success;
-	list= _XkbTypedCalloc(1,XkbComponentListRec);
-	if (!list) {
-	    _XkbFreeReadBuffer(&buf);
-	    goto BAILOUT;
-	}
-	list->num_keymaps= rep.nKeymaps;
-	list->num_keycodes= rep.nKeycodes;
-	list->num_types= rep.nTypes;
-	list->num_compat= rep.nCompatMaps;
-	list->num_symbols= rep.nSymbols;
-	list->num_geometry= rep.nGeometries;
-	if ((status==Success)&&(list->num_keymaps>0))
-	    list->keymaps= _ReadListing(&buf,list->num_keymaps,&status);
-	if ((status==Success)&&(list->num_keycodes>0))
-	    list->keycodes= _ReadListing(&buf,list->num_keycodes,&status);
-	if ((status==Success)&&(list->num_types>0))
-	    list->types= _ReadListing(&buf,list->num_types,&status);
-	if ((status==Success)&&(list->num_compat>0))
-	    list->compat= _ReadListing(&buf,list->num_compat,&status);
-	if ((status==Success)&&(list->num_symbols>0))
-	    list->symbols= _ReadListing(&buf,list->num_symbols,&status);
-	if ((status==Success)&&(list->num_geometry>0))
-	    list->geometry= _ReadListing(&buf,list->num_geometry,&status);
-	left= _XkbFreeReadBuffer(&buf);
-	if ((status!=Success)||(buf.error)||(left>2)) {
-	    XkbFreeComponentList(list);
-	    goto BAILOUT;
-	}
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return list;
-    }
-BAILOUT:
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return NULL;
-}
-
-void
-#if NeedFunctionPrototypes
-XkbFreeComponentList(XkbComponentListPtr list)
-#else
-XkbFreeComponentList(list)
-    XkbComponentListPtr	list;
-#endif
-{
-    if (list) {
-	if (list->keymaps)
-	    _FreeComponentNames(list->num_keymaps,list->keymaps);
-	if (list->keycodes)
-	    _FreeComponentNames(list->num_keycodes,list->keycodes);
-	if (list->types)
-	    _FreeComponentNames(list->num_types,list->types);
-	if (list->compat)
-	    _FreeComponentNames(list->num_compat,list->compat);
-	if (list->symbols)
-	    _FreeComponentNames(list->num_symbols,list->symbols);
-	if (list->geometry)
-	    _FreeComponentNames(list->num_geometry,list->geometry);
-	bzero((char *)list,sizeof(XkbComponentListRec));
-	_XkbFree(list);
-    }
-    return;
-}
diff --git a/xc/lib/X11/XKBNames.c b/xc/lib/X11/XKBNames.c
deleted file mode 100644
index b1a5ea43d..000000000
--- a/xc/lib/X11/XKBNames.c
+++ /dev/null
@@ -1,953 +0,0 @@
-/* $TOG: XKBNames.c /main/10 1997/09/08 13:56:03 kaleb $ */
-/************************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-
-#define NEED_REPLIES
-#define NEED_EVENTS
-#include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
-#include "XKBlibint.h"
-
-
-static Status
-#if NeedFunctionPrototypes
-_XkbReadAtoms(	XkbReadBufferPtr	buf,
-		Atom *			atoms,
-		int			maxAtoms,
-		CARD32		 	present)
-#else
-_XkbReadAtoms(buf,atoms,maxAtoms,present)
-    XkbReadBufferPtr	 buf;
-    Atom		*atoms;
-    int			 maxAtoms;
-    CARD32		 present;
-#endif
-{
-register int i,bit;
-
-    for (i=0,bit=1;(i<maxAtoms)&&(present);i++,bit<<=1) {
-	if (present&bit) {
-	    if (!_XkbReadBufferCopy32(buf,(long *)&atoms[i],1))
-		return BadLength;
-	    present&= ~bit;
-	}
-    }
-    return Success;
-}
-
-Status
-#if NeedFunctionPrototypes
-_XkbReadGetNamesReply(	Display *		dpy,
-			xkbGetNamesReply *	rep,
-			XkbDescPtr 		xkb,
-			int *			nread_rtrn)
-#else
-_XkbReadGetNamesReply(dpy,rep,xkb,nread_rtrn)
-    Display *		dpy;
-    xkbGetNamesReply *	rep;
-    XkbDescPtr 		xkb;
-    int *		nread_rtrn;
-#endif
-{
-    int				 i,len;
-    XkbReadBufferRec		 buf;
-    register XkbNamesPtr	 names;
-
-    if ( xkb->device_spec == XkbUseCoreKbd )
-	xkb->device_spec = rep->deviceID;
-
-    if ((xkb->names==NULL)&&
-	(XkbAllocNames(xkb,rep->which,
-				rep->nRadioGroups,rep->nKeyAliases)!=Success)) {
-	return BadAlloc;
-    }
-    names= xkb->names;
-    if (rep->length==0)
-	return Success;
-
-    if (!_XkbInitReadBuffer(dpy,&buf,(int)rep->length*4))
-	return BadAlloc;
-    if (nread_rtrn)
-	*nread_rtrn= (int)rep->length*4;
-
-    if ((rep->which&XkbKeycodesNameMask)&&
-	(!_XkbReadBufferCopy32(&buf,(long *)&names->keycodes,1)))
-	    goto BAILOUT;
-    if ((rep->which&XkbGeometryNameMask)&&
-	(!_XkbReadBufferCopy32(&buf,(long *)&names->geometry,1)))
-	    goto BAILOUT;
-    if ((rep->which&XkbSymbolsNameMask)&&
-	(!_XkbReadBufferCopy32(&buf,(long *)&names->symbols,1)))
-	    goto BAILOUT;
-    if ((rep->which&XkbPhysSymbolsNameMask)&&
-	(!_XkbReadBufferCopy32(&buf,(long *)&names->phys_symbols,1)))
-	    goto BAILOUT;
-    if ((rep->which&XkbTypesNameMask)&&
-	(!_XkbReadBufferCopy32(&buf,(long *)&names->types,1)))
-	    goto BAILOUT;
-    if ((rep->which&XkbCompatNameMask)&&
-	(!_XkbReadBufferCopy32(&buf,(long *)&names->compat,1)))
-	    goto BAILOUT;
-
-    if ( rep->which & XkbKeyTypeNamesMask ) {
-	XkbClientMapPtr	map= xkb->map;
-	XkbKeyTypePtr	type;
-
-	len= rep->nTypes*4;
-	if (map!=NULL) {
-	    type= map->types;
-	    for (i=0;(i<map->num_types)&&(i<rep->nTypes);i++,type++) {
-		if (!_XkbReadBufferCopy32(&buf,(long *)&type->name,1))
-		    goto BAILOUT;
-		len-= 4;
-	    }
-	}
-	if ((len>0)&&(!_XkbSkipReadBufferData(&buf,len)))
-	    goto BAILOUT;
-    }
-    if ( rep->which&XkbKTLevelNamesMask ) {
-	CARD8 *nLevels;
-	XkbClientMapPtr	map= xkb->map;
-	XkbKeyTypePtr	type;
-
-	nLevels=(CARD8*)_XkbGetReadBufferPtr(&buf,XkbPaddedSize(rep->nTypes));
-	if (nLevels==NULL)
-	    goto BAILOUT;
-	if (map!=NULL) {
-	    type= map->types;
-	    for (i=0;i<(int)rep->nTypes;i++,type++) {
-		if (i>=map->num_types) {
-		    if (!_XkbSkipReadBufferData(&buf,nLevels[i]*4))
-			goto BAILOUT;
-		    continue;
-		}
-		if ((nLevels[i]>0)&&(nLevels[i]!=type->num_levels)) {
-		    goto BAILOUT;
-		}
-		if (type->level_names!=NULL)
-		    Xfree(type->level_names);
-		if (nLevels[i]==0) {
-		    type->level_names= NULL;
-		    continue;
-		}
-		type->level_names= _XkbTypedCalloc(nLevels[i],Atom);
-		if (type->level_names!=NULL) {
-		    if (!_XkbReadBufferCopy32(&buf,(long *)type->level_names,
-								nLevels[i]))
-			goto BAILOUT;
-		}
-		else {
-		    _XkbSkipReadBufferData(&buf,nLevels[i]*4);
-		}
-	    }
-	}
-	else {
-	    for (i=0;i<(int)rep->nTypes;i++) {
-		_XkbSkipReadBufferData(&buf,nLevels[i]*4);
-	    }
-	}
-    }
-    if (rep->which & XkbIndicatorNamesMask) {
-	if (_XkbReadAtoms(&buf,names->indicators,XkbNumIndicators,
-						rep->indicators)!=Success)
-	    goto BAILOUT;
-    }
-    if ( rep->which&XkbVirtualModNamesMask ) {
-	if (_XkbReadAtoms(&buf,names->vmods,XkbNumVirtualMods,
-					(CARD32)rep->virtualMods)!=Success)
-	    goto BAILOUT;
-    }
-    if ( rep->which&XkbGroupNamesMask ) {
-	if (_XkbReadAtoms(&buf,names->groups,XkbNumKbdGroups,
-					(CARD32)rep->groupNames)!=Success)
-	    goto BAILOUT;
-    }
-    if ( rep->which&XkbKeyNamesMask ) {
-	if (names->keys==NULL) {
-	    int nKeys;
-	    if (xkb->max_key_code==0) {
-		xkb->min_key_code= rep->minKeyCode;
-		xkb->max_key_code= rep->maxKeyCode;
-	    }
-	    nKeys= xkb->max_key_code+1;
-	    names->keys= _XkbTypedCalloc(nKeys,XkbKeyNameRec);
-	}
-	if (names->keys!=NULL) {
-	    if (!_XkbCopyFromReadBuffer(&buf,
-					(char *)&names->keys[rep->firstKey],
-					rep->nKeys*XkbKeyNameLength))
-		goto BAILOUT;
-	}
-	else _XkbSkipReadBufferData(&buf,rep->nKeys*XkbKeyNameLength);
-    }
-    if ( rep->which&XkbKeyAliasesMask && (rep->nKeyAliases>0) ) {
-	if (XkbAllocNames(xkb,XkbKeyAliasesMask,0,rep->nKeyAliases)!=Success)
-	    goto BAILOUT;
-	if (!_XkbCopyFromReadBuffer(&buf,(char *)names->key_aliases,
-				rep->nKeyAliases*XkbKeyNameLength*2))
-	    goto BAILOUT;
-    }
-    if ( rep->which&XkbRGNamesMask ) {
-	if (rep->nRadioGroups>0) {
-	    Atom *rgNames;
-
-	    if (names->radio_groups==NULL)
-		names->radio_groups = _XkbTypedCalloc(rep->nRadioGroups,Atom);
-	    else if (names->num_rg<rep->nRadioGroups) {
-		names->radio_groups = _XkbTypedRealloc(names->radio_groups,
-							rep->nRadioGroups,
-							Atom);
-	    }
-	    rgNames= names->radio_groups;
-	    if (!rgNames) {
-		goto BAILOUT;
-	    }
-	    if (!_XkbReadBufferCopy32(&buf,(long *)rgNames,rep->nRadioGroups))
-		goto BAILOUT;
-	    names->num_rg= rep->nRadioGroups;
-	}
-	else if (names->num_rg>0) {
-	    names->num_rg= 0;
-	    Xfree(names->radio_groups);
-	}
-    }
-    len= _XkbFreeReadBuffer(&buf);
-    if (len!=0) 	return BadLength;
-    else		return Success;
-BAILOUT:
-    _XkbFreeReadBuffer(&buf);
-    return BadLength;
-}
-
-Status
-#if NeedFunctionPrototypes
-XkbGetNames(Display *dpy,unsigned which,XkbDescPtr xkb)
-#else
-XkbGetNames(dpy,which,xkb)
-    Display *	dpy;
-    unsigned	which;
-    XkbDescPtr	xkb;
-#endif
-{
-    register xkbGetNamesReq *req;
-    xkbGetNamesReply	     rep;
-    Status		     status;
-    XkbInfoPtr xkbi;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return BadAccess;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    if (!xkb->names) {
-	xkb->names = _XkbTypedCalloc(1,XkbNamesRec);
-	if (!xkb->names) {
-	    UnlockDisplay(dpy);
-	    SyncHandle();
-	    return BadAlloc;
-	}
-    }
-    GetReq(kbGetNames, req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbGetNames;
-    req->deviceSpec = xkb->device_spec;
-    req->which = which;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return BadImplementation;
-    }
-
-    status = _XkbReadGetNamesReply(dpy,&rep,xkb,NULL);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return status;
-}
-
-/***====================================================================***/
-
-static int
-#if NeedFunctionPrototypes
-_XkbCountBits(int nBitsMax,unsigned long mask)
-#else
-_XkbCountBits(nBitsMax,mask)
-    int			nBitsMax;
-    unsigned long	mask;
-#endif
-{
-register unsigned long y, nBits;
-
-    y = (mask >> 1) &033333333333;
-    y = mask - y - ((y >>1) & 033333333333);
-    nBits = ((unsigned int) (((y + (y >> 3)) & 030707070707) % 077));
-
-    /* nBitsMax really means max+1 */
-    return (nBits < nBitsMax) ? nBits : (nBitsMax - 1);
-}
-
-static CARD32
-#if NeedFunctionPrototypes
-_XkbCountAtoms(Atom *atoms,int maxAtoms,int *count)
-#else
-_XkbCountAtoms(atoms,maxAtoms,count)
-    Atom *atoms;
-    int   maxAtoms;
-    int  *count;
-#endif
-{
-register unsigned int i,bit,nAtoms;
-register CARD32 atomsPresent;
-
-    for (i=nAtoms=atomsPresent=0,bit=1;i<maxAtoms;i++,bit<<=1) {
-        if (atoms[i]!=None) {
-            atomsPresent|= bit;
-            nAtoms++;
-        }
-    }
-    if (count)
-        *count= nAtoms;
-    return atomsPresent;
-}
-
-static void
-#if NeedFunctionPrototypes
-_XkbCopyAtoms(Display *dpy,Atom *atoms,CARD32 mask,int maxAtoms)
-#else
-_XkbCopyAtoms(dpy,atoms,mask,maxAtoms)
-    Display *	dpy;
-    Atom *	atoms;
-    CARD32	mask;
-    int   	maxAtoms;
-#endif
-{
-register unsigned int i,bit;
-
-    for (i=0,bit=1;i<maxAtoms;i++,bit<<=1) {
-        if (mask&bit)
-	    Data32(dpy,&atoms[i],4);
-    }
-    return;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbSetNames(	Display *	dpy,
-		unsigned int 	which,
-		unsigned int 	firstType,
-		unsigned int 	nTypes,
-		XkbDescPtr 	xkb)
-#else
-XkbSetNames(dpy,which,firstType,nTypes,xkb)
-    Display *		dpy;
-    unsigned int 	which;
-    unsigned int 	firstType;
-    unsigned int 	nTypes;
-    XkbDescPtr		xkb;
-#endif
-{
-    register xkbSetNamesReq *req;
-    int  nLvlNames;
-    XkbInfoPtr xkbi;
-    XkbNamesPtr names;
-    unsigned firstLvlType,nLvlTypes;
-    int	nVMods,nLEDs,nRG,nKA,nGroups;
-    int nKeys,firstKey,nAtoms;
-    CARD32 leds,vmods,groups;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    if ((!xkb)||(!xkb->names))
-	return False;
-    firstLvlType= firstType;
-    nLvlTypes= nTypes;
-    if (nTypes<1)
-	which&= ~(XkbKTLevelNamesMask|XkbKeyTypeNamesMask);
-    else if (firstType<=XkbLastRequiredType) {
-	int	adjust;
-	adjust= XkbLastRequiredType-firstType+1;
-	firstType+= adjust;
-	nTypes-= adjust;
-	if (nTypes<1)
-	    which&= ~XkbKeyTypeNamesMask;
-    }
-    names= xkb->names;
-    if (which&(XkbKTLevelNamesMask|XkbKeyTypeNamesMask)) {
-	register int	i;
-	XkbKeyTypePtr	type;
-	if((xkb->map==NULL)||(xkb->map->types==NULL)||(nTypes==0)||
-				(firstType+nTypes>xkb->map->num_types)||
-				(firstLvlType+nLvlTypes>xkb->map->num_types))
-	    return False;
-	if (which&XkbKTLevelNamesMask) {
-	    type= &xkb->map->types[firstLvlType];
-	    for (i=nLvlNames=0;i<nLvlTypes;i++,type++) {
-		if (type->level_names!=NULL)
-		    nLvlNames+= type->num_levels;
-	    }
-	}
-    }
- 
-    nVMods= nLEDs= nRG= nKA= nAtoms= nGroups= 0;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbSetNames, req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbSetNames;
-    req->deviceSpec = xkb->device_spec;
-    req->firstType = firstType;
-    req->nTypes = nTypes;
-    req->firstKey = xkb->min_key_code;
-    req->nKeys = xkb->max_key_code-xkb->min_key_code+1;
-
-    if (which&XkbKeycodesNameMask)
-	nAtoms++;
-    if (which&XkbGeometryNameMask)
-	nAtoms++;
-    if (which&XkbSymbolsNameMask)
-	nAtoms++;
-    if (which&XkbPhysSymbolsNameMask)
-	nAtoms++;
-    if (which&XkbTypesNameMask)
-	nAtoms++;
-    if (which&XkbCompatNameMask)
-	nAtoms++;
-    if (which&XkbKeyTypeNamesMask)
-	nAtoms+= nTypes;
-    if (which&XkbKTLevelNamesMask) {
-	req->firstKTLevel= firstLvlType;
-	req->nKTLevels= nLvlTypes;
-	req->length+= XkbPaddedSize(nLvlTypes)/4; /* room for group widths */
-	nAtoms+= nLvlNames;
-    }
-    else req->firstKTLevel= req->nKTLevels= 0;
-
-    if (which&XkbIndicatorNamesMask) {
-	req->indicators= leds=
-		_XkbCountAtoms(names->indicators,XkbNumIndicators,&nLEDs);
-	if (nLEDs>0)
-	     nAtoms+= nLEDs;
-	else which&= ~XkbIndicatorNamesMask;
-    }
-    else req->indicators= leds= 0;
-
-    if (which&XkbVirtualModNamesMask) {
-	vmods= req->virtualMods= (CARD16) 
-		_XkbCountAtoms(names->vmods,XkbNumVirtualMods,&nVMods);
-	if (nVMods>0)
-	     nAtoms+= nVMods;
-	else which&= ~XkbVirtualModNamesMask;
-    }
-    else vmods= req->virtualMods= 0;
-
-    if (which&XkbGroupNamesMask) {
-	groups= req->groupNames= (CARD8)
-		_XkbCountAtoms(names->groups,XkbNumKbdGroups,&nGroups);
-	if (nGroups>0)
-	     nAtoms+= nGroups;
-	else which&= ~XkbGroupNamesMask;
-    }
-    else groups= req->groupNames= 0;
-
-    if ((which&XkbKeyNamesMask)&&(names->keys!=NULL)) {
-	firstKey= req->firstKey;
-	nKeys= req->nKeys;
-	nAtoms+= nKeys;	/* technically not atoms, but 4 bytes wide */
-    }
-    else which&= ~XkbKeyNamesMask;
-
-    if (which&XkbKeyAliasesMask) {
-	nKA= ((names->key_aliases!=NULL)?names->num_key_aliases:0);
-	if (nKA>0) {
-	    req->nKeyAliases= nKA;
-	    nAtoms+= nKA*2; /* not atoms, but 8 bytes on the wire */
-	}
-	else {
-	    which&= ~XkbKeyAliasesMask;
-	    req->nKeyAliases = 0;
-	}
-    }
-    else req->nKeyAliases= 0;
-
-    if (which&XkbRGNamesMask) {
-	nRG= names->num_rg;
-	if (nRG>0)
-	     nAtoms+= nRG;
-	else which&= ~XkbRGNamesMask;
-    }
-
-    req->which= which;
-    req->nRadioGroups= nRG;
-    req->length+= (nAtoms*4)/4;
-
-    if (which&XkbKeycodesNameMask)
-	Data32(dpy,(long *)&names->keycodes,4);
-    if (which&XkbGeometryNameMask)
-	Data32(dpy,(long *)&names->geometry,4);
-    if (which&XkbSymbolsNameMask)
-	Data32(dpy,(long *)&names->symbols,4);
-    if (which&XkbPhysSymbolsNameMask)
-	Data32(dpy,(long *)&names->phys_symbols,4);
-    if (which&XkbTypesNameMask)
-	Data32(dpy,(long *)&names->types,4);
-    if (which&XkbCompatNameMask)
-	Data32(dpy,(long *)&names->compat,4);
-    if (which&XkbKeyTypeNamesMask) {
-	register int 		i;
-	register XkbKeyTypePtr	type;
-	type= &xkb->map->types[firstType];
-	for (i=0;i<nTypes;i++,type++) {
-	    Data32(dpy,(long *)&type->name,4);
-	}
-    }
-    if (which&XkbKTLevelNamesMask) {
-	XkbKeyTypePtr type;
-	int i;
-	char *tmp;
-
-	BufAlloc(char *,tmp,XkbPaddedSize(nLvlTypes));
-	type = &xkb->map->types[firstLvlType];
-	for (i=0;i<nLvlTypes;i++,type++) {
-	    *tmp++ = type->num_levels;
-	}
-	type = &xkb->map->types[firstLvlType];
-	for (i=0;i<nLvlTypes;i++,type++) {
-	    if (type->level_names!=NULL)
-		Data32(dpy,(long *)type->level_names,type->num_levels*4);
-	}
-    }
-    if (which&XkbIndicatorNamesMask)
-	_XkbCopyAtoms(dpy,names->indicators,leds,XkbNumIndicators);
-    if (which&XkbVirtualModNamesMask)
-	_XkbCopyAtoms(dpy,names->vmods,vmods,XkbNumVirtualMods);
-    if (which&XkbGroupNamesMask)
-	_XkbCopyAtoms(dpy,names->groups,groups,XkbNumKbdGroups);
-    if (which&XkbKeyNamesMask) {
-#ifdef WORD64
-	char *tmp;
-	register int i;
-	BufAlloc(char *,tmp,nKeys*XkbKeyNameLength);
-	for (i=0;i<nKeys;i++,tmp+= XkbKeyNameLength) {
-	    tmp[0]= names->keys[firstKey+i].name[0];
-	    tmp[1]= names->keys[firstKey+i].name[1];
-	    tmp[2]= names->keys[firstKey+i].name[2];
-	    tmp[3]= names->keys[firstKey+i].name[3];
-	}
-#else
-	Data(dpy,(char *)&names->keys[firstKey],nKeys*XkbKeyNameLength);
-#endif
-    }
-    if (which&XkbKeyAliasesMask) {
-#ifdef WORD64
-	char *tmp;
-	register int i;
-	BufAlloc(char *,tmp,nKA*XkbKeyNameLength*2);
-	for (i=0;i<nKeys;i++,tmp+= 2*XkbKeyNameLength) {
-	    tmp[0]= names->key_aliases[i].real[0];
-	    tmp[1]= names->key_aliases[i].real[1];
-	    tmp[2]= names->key_aliases[i].real[2];
-	    tmp[3]= names->key_aliases[i].real[3];
-	    tmp[4]= names->key_aliases[i].alias[0];
-	    tmp[5]= names->key_aliases[i].alias[1];
-	    tmp[6]= names->key_aliases[i].alias[2];
-	    tmp[7]= names->key_aliases[i].alias[3];
-	}
-#else
-	Data(dpy,(char *)names->key_aliases,nKA*XkbKeyNameLength*2);
-#endif
-    }
-    if (which&XkbRGNamesMask) {
-	Data32(dpy,(long *)names->radio_groups,nRG*4);
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbChangeNames(Display *dpy,XkbDescPtr xkb,XkbNameChangesPtr changes)
-#else
-XkbChangeNames(dpy,xkb,changes)
-    Display *		dpy;
-    XkbDescPtr		xkb;
-    XkbNameChangesPtr	changes;
-#endif
-{
-    register xkbSetNamesReq *req;
-    int  nLvlNames;
-    XkbInfoPtr xkbi;
-    XkbNamesPtr names;
-    unsigned which,firstType,nTypes;
-    unsigned firstLvlType,nLvlTypes;
-    int	nVMods,nLEDs,nRG,nKA,nGroups;
-    int nKeys,firstKey,nAtoms;
-    CARD32 leds,vmods,groups;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    if ((!xkb)||(!xkb->names)||(!changes))
-	return False;
-    which= changes->changed;
-    firstType= changes->first_type;
-    nTypes= changes->num_types;
-    firstLvlType= changes->first_lvl;;
-    nLvlTypes= changes->num_lvls;
-    if (which&XkbKeyTypeNamesMask) {
-	if (nTypes<1)	
-	    which&= ~XkbKeyTypeNamesMask;
-	else if (firstType<=XkbLastRequiredType) {
-	    int	adjust;
-	    adjust= XkbLastRequiredType-firstType+1;
-	    firstType+= adjust;
-	    nTypes-= adjust;
-	    if (nTypes<1)
-		which&= ~XkbKeyTypeNamesMask;
-	}
-    }
-    else firstType= nTypes= 0;
-
-    if (which&XkbKTLevelNamesMask) {
-	if (nLvlTypes<1)
-	    which&= ~XkbKTLevelNamesMask;
-    }
-    else firstLvlType= nLvlTypes= 0;
-
-    names= xkb->names;
-    if (which&(XkbKTLevelNamesMask|XkbKeyTypeNamesMask)) {
-	register int	i;
-	XkbKeyTypePtr	type;
-	if((xkb->map==NULL)||(xkb->map->types==NULL)||(nTypes==0)||
-				(firstType+nTypes>xkb->map->num_types)||
-				(firstLvlType+nLvlTypes>xkb->map->num_types))
-	    return False;
-	if (which&XkbKTLevelNamesMask) {
-	    type= &xkb->map->types[firstLvlType];
-	    for (i=nLvlNames=0;i<nLvlTypes;i++,type++) {
-		if (type->level_names!=NULL)
-		    nLvlNames+= type->num_levels;
-	    }
-	}
-    }
-
-    if (changes->num_keys<1)
-	which&= ~XkbKeyNamesMask;
-    if ((which&XkbKeyNamesMask)==0)
-	changes->first_key= changes->num_keys= 0;
-    else if ((changes->first_key<xkb->min_key_code)||
-	     (changes->first_key+changes->num_keys>xkb->max_key_code)) {
-	return False;
-    }
-
-    if ((which&XkbVirtualModNamesMask)==0)
-	changes->changed_vmods= 0;
-    else if (changes->changed_vmods==0)
-	which&= ~XkbVirtualModNamesMask;
-
-    if ((which&XkbIndicatorNamesMask)==0)
-	changes->changed_indicators= 0;
-    else if (changes->changed_indicators==0)
-	which&= ~XkbIndicatorNamesMask;
-
-    if ((which&XkbGroupNamesMask)==0)
-	changes->changed_groups= 0;
-    else if (changes->changed_groups==0)
-	which&= ~XkbGroupNamesMask;
- 
-    nVMods= nLEDs= nRG= nKA= nAtoms= nGroups= 0;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbSetNames, req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbSetNames;
-    req->deviceSpec = xkb->device_spec;
-    req->firstType = firstType;
-    req->nTypes = nTypes;
-    req->firstKey = changes->first_key;
-    req->nKeys = changes->num_keys;
-
-    if (which&XkbKeycodesNameMask)
-	nAtoms++;
-    if (which&XkbGeometryNameMask)
-	nAtoms++;
-    if (which&XkbSymbolsNameMask)
-	nAtoms++;
-    if (which&XkbPhysSymbolsNameMask)
-	nAtoms++;
-    if (which&XkbTypesNameMask)
-	nAtoms++;
-    if (which&XkbCompatNameMask)
-	nAtoms++;
-    if (which&XkbKeyTypeNamesMask)
-	nAtoms+= nTypes;
-    if (which&XkbKTLevelNamesMask) {
-	req->firstKTLevel= firstLvlType;
-	req->nKTLevels= nLvlTypes;
-	req->length+= XkbPaddedSize(nLvlTypes)/4; /* room for group widths */
-	nAtoms+= nLvlNames;
-    }
-    else req->firstKTLevel= req->nKTLevels= 0;
-
-    if (which&XkbIndicatorNamesMask) {
-	leds= req->indicators= (CARD32)changes->changed_indicators;
-	nLEDs= _XkbCountBits(XkbNumIndicators,changes->changed_indicators);
-	if (nLEDs>0)
-	     nAtoms+= nLEDs;
-	else which&= ~XkbIndicatorNamesMask;
-    }
-    else req->indicators= 0;
-
-    if (which&XkbVirtualModNamesMask) {
-	vmods= req->virtualMods= changes->changed_vmods;
-	nVMods= _XkbCountBits(XkbNumVirtualMods,
-					(unsigned long)changes->changed_vmods);
-	if (nVMods>0)
-	     nAtoms+= nVMods;
-	else which&= ~XkbVirtualModNamesMask;
-    }
-    else req->virtualMods= 0;
-
-    if (which&XkbGroupNamesMask) {
-	groups= req->groupNames= changes->changed_groups;
-	nGroups= _XkbCountBits(XkbNumKbdGroups,
-					(unsigned long)changes->changed_groups);
-	if (nGroups>0)
-	     nAtoms+= nGroups;
-	else which&= ~XkbGroupNamesMask;
-    }
-    else req->groupNames= 0;
-
-    if ((which&XkbKeyNamesMask)&&(names->keys!=NULL)) {
-	firstKey= req->firstKey;
-	nKeys= req->nKeys;
-	nAtoms+= nKeys;	/* technically not atoms, but 4 bytes wide */
-    }
-    else which&= ~XkbKeyNamesMask;
-
-    if (which&XkbKeyAliasesMask) {
-	nKA= ((names->key_aliases!=NULL)?names->num_key_aliases:0);
-	if (nKA>0)
-	    nAtoms+= nKA*2; /* not atoms, but 8 bytes on the wire */
-	else which&= ~XkbKeyAliasesMask;
-    }
-
-    if (which&XkbRGNamesMask) {
-	nRG= names->num_rg;
-	if (nRG>0)
-	     nAtoms+= nRG;
-	else which&= ~XkbRGNamesMask;
-    }
-
-    req->which= which;
-    req->nRadioGroups= nRG;
-    req->length+= (nAtoms*4)/4;
-
-    if (which&XkbKeycodesNameMask)
-	Data32(dpy,(long *)&names->keycodes,4);
-    if (which&XkbGeometryNameMask)
-	Data32(dpy,(long *)&names->geometry,4);
-    if (which&XkbSymbolsNameMask)
-	Data32(dpy,(long *)&names->symbols,4);
-    if (which&XkbPhysSymbolsNameMask)
-	Data32(dpy,(long *)&names->phys_symbols,4);
-    if (which&XkbTypesNameMask)
-	Data32(dpy,(long *)&names->types,4);
-    if (which&XkbCompatNameMask)
-	Data32(dpy,(long *)&names->compat,4);
-    if (which&XkbKeyTypeNamesMask) {
-	register int 		i;
-	register XkbKeyTypePtr	type;
-	type= &xkb->map->types[firstType];
-	for (i=0;i<nTypes;i++,type++) {
-	    Data32(dpy,(long *)&type->name,4);
-	}
-    }
-    if (which&XkbKTLevelNamesMask) {
-	XkbKeyTypePtr type;
-	int i;
-	char *tmp;
-
-	BufAlloc(char *,tmp,XkbPaddedSize(nLvlTypes));
-	type = &xkb->map->types[firstLvlType];
-	for (i=0;i<nLvlTypes;i++,type++) {
-	    *tmp++ = type->num_levels;
-	}
-	type = &xkb->map->types[firstLvlType];
-	for (i=0;i<nLvlTypes;i++,type++) {
-	    if (type->level_names!=NULL)
-		Data32(dpy,(long *)type->level_names,type->num_levels*4);
-	}
-    }
-    if (which&XkbIndicatorNamesMask)
-	_XkbCopyAtoms(dpy,names->indicators,leds,XkbNumIndicators);
-    if (which&XkbVirtualModNamesMask)
-	_XkbCopyAtoms(dpy,names->vmods,vmods,XkbNumVirtualMods);
-    if (which&XkbGroupNamesMask)
-	_XkbCopyAtoms(dpy,names->groups,groups,XkbNumKbdGroups);
-    if (which&XkbKeyNamesMask) {
-#ifdef WORD64
-	char *tmp;
-	register int i;
-	BufAlloc(char *,tmp,nKeys*4);
-	for (i=0;i<nKeys;i++,tmp+= 4) {
-	    tmp[0]= names->keys[firstKey+i].name[0];
-	    tmp[1]= names->keys[firstKey+i].name[1];
-	    tmp[2]= names->keys[firstKey+i].name[2];
-	    tmp[3]= names->keys[firstKey+i].name[3];
-	}
-#else
-	Data(dpy,(char *)&names->keys[firstKey],nKeys*XkbKeyNameLength);
-#endif
-    }
-    if (which&XkbKeyAliasesMask) {
-#ifdef WORD64
-	char *tmp;
-	register int i;
-	BufAlloc(char *,tmp,nKA*XkbKeyNameLength*2);
-	for (i=0;i<nKeys;i++,tmp+= 2*XkbKeyNameLength) {
-	    tmp[0]= names->key_aliases[i].real[0];
-	    tmp[1]= names->key_aliases[i].real[1];
-	    tmp[2]= names->key_aliases[i].real[2];
-	    tmp[3]= names->key_aliases[i].real[3];
-	    tmp[4]= names->key_aliases[i].alias[0];
-	    tmp[5]= names->key_aliases[i].alias[1];
-	    tmp[6]= names->key_aliases[i].alias[2];
-	    tmp[7]= names->key_aliases[i].alias[3];
-	}
-#else
-	Data(dpy,(char *)names->key_aliases,nKA*XkbKeyNameLength*2);
-#endif
-    }
-    if (which&XkbRGNamesMask) {
-	Data32(dpy,(long *)names->radio_groups,nRG*4);
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-void
-#if NeedFunctionPrototypes
-XkbNoteNameChanges(	XkbNameChangesPtr	old,
-			XkbNamesNotifyEvent *	new,
-			unsigned int	 	wanted)
-#else
-XkbNoteNameChanges(old,new,wanted)
-    XkbNameChangesPtr		old;
-    XkbNamesNotifyEvent	*	new;
-    unsigned int	 	wanted;
-#endif
-{
-int	first,last,old_last,new_last;
-
-    wanted&= new->changed;
-    if ((old==NULL)||(new==NULL)||(wanted==0))
-	return;
-    if (wanted&XkbKeyTypeNamesMask) {
-	if (old->changed&XkbKeyTypeNamesMask) {
-	    new_last= (new->first_type+new->num_types-1);
-	    old_last= (old->first_type+old->num_types-1);
-
-	    if (new->first_type<old->first_type)
-		 first= new->first_type;
-	    else first= old->first_type;
-
-	    if (old_last>new_last)
-		 last= old_last;
-	    else last= new_last;
-
-	    old->first_type= first;
-	    old->num_types= (last-first)+1;
-	}
-	else {
-	    old->first_type= new->first_type;
-	    old->num_types= new->num_types;
-	}
-    }
-    if (wanted&XkbKTLevelNamesMask) {
-	if (old->changed&XkbKTLevelNamesMask) {
-	    new_last= (new->first_lvl+new->num_lvls-1);
-	    old_last= (old->first_lvl+old->num_lvls-1);
-
-	    if (new->first_lvl<old->first_lvl)
-		 first= new->first_lvl;
-	    else first= old->first_lvl;
-
-	    if (old_last>new_last)
-		 last= old_last;
-	    else last= new_last;
-
-	    old->first_lvl= first;
-	    old->num_lvls= (last-first)+1;
-	}
-	else {
-	    old->first_lvl= new->first_lvl;
-	    old->num_lvls= new->num_lvls;
-	}
-    }
-    if (wanted&XkbIndicatorNamesMask) {
-	if (old->changed&XkbIndicatorNamesMask)
-	     old->changed_indicators|= new->changed_indicators;
-	else old->changed_indicators=  new->changed_indicators;
-    }
-    if (wanted&XkbKeyNamesMask) {
-	if (old->changed&XkbKeyNamesMask) {
-	    new_last= (new->first_key+new->num_keys-1);
-	    old_last= (old->first_key+old->num_keys-1);
-
-	    first= old->first_key;
-
-	    if (new->first_key<old->first_key)
-		first= new->first_key;
-	    if (old_last>new_last)
-		new_last= old_last;
-
-	    old->first_key= first;
-	    old->num_keys= (new_last-first)+1;
-	}
-	else {
-	    old->first_key= new->first_key;
-	    old->num_keys= new->num_keys;
-	}
-    }
-    if (wanted&XkbVirtualModNamesMask) {
-	if (old->changed&XkbVirtualModNamesMask)
-	     old->changed_vmods|= new->changed_vmods;
-	else old->changed_vmods=  new->changed_vmods;
-    }
-    if (wanted&XkbGroupNamesMask) {
-	if (old->changed&XkbGroupNamesMask)
-	     old->changed_groups|= new->changed_groups;
-	else old->changed_groups=  new->changed_groups;
-    }
-    if (wanted&XkbRGNamesMask) 
-	old->num_rg= new->num_radio_groups;
-    if (wanted&XkbKeyAliasesMask) 
-	old->num_aliases= new->num_aliases;
-    old->changed|= wanted;
-    return;
-}
diff --git a/xc/lib/X11/XKBRdBuf.c b/xc/lib/X11/XKBRdBuf.c
deleted file mode 100644
index a6449ed4a..000000000
--- a/xc/lib/X11/XKBRdBuf.c
+++ /dev/null
@@ -1,322 +0,0 @@
-/* $XConsortium: XKBRdBuf.c /main/7 1996/01/14 16:43:48 kaleb $ */
-/************************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-
-#include <stdio.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
-#include "Xlibint.h"
-#include "XKBlibint.h"
-#include <X11/extensions/XKBproto.h>
-
-/***====================================================================***/
-
-int 
-#if NeedFunctionPrototypes
-_XkbInitReadBuffer(Display *dpy,XkbReadBufferPtr buf,int size)
-#else
-_XkbInitReadBuffer(dpy,buf,size)
-    Display		*dpy;
-    XkbReadBufferPtr	 buf;
-    int			 size;
-#endif
-{
-    if ((dpy!=NULL) && (buf!=NULL) && (size>0)) {
-	buf->error=  0;
-	buf->size=   size;
-	buf->start= buf->data= _XkbAlloc(size);
-	if (buf->start) {
-	    _XRead(dpy, buf->start, size);
-	    return 1;
-	}
-    }
-    return 0;
-}
-
-#define	_XkbReadBufferDataLeft(b)	(((b)->size)-((b)->data-(b)->start))
-
-int
-#if NeedFunctionPrototypes
-_XkbSkipReadBufferData(XkbReadBufferPtr	from,int size)
-#else
-_XkbSkipReadBufferData(from,size)
-    XkbReadBufferPtr	 from;
-    int			 size;
-#endif
-{
-    if (size==0)
-	return 1;
-    if ((from==NULL)||(from->error)||(size<1)||
-					(_XkbReadBufferDataLeft(from)<size))
-	return 0;
-    from->data+= size;
-    return 1;
-}
-
-int
-#if NeedFunctionPrototypes
-_XkbCopyFromReadBuffer(XkbReadBufferPtr	from,char *to,int size)
-#else
-_XkbCopyFromReadBuffer(from,to,size)
-    XkbReadBufferPtr	 from;
-    char		*to;
-    int			 size;
-#endif
-{
-    if (size==0)
-	return 1;
-    if ((from==NULL)||(from->error)||(to==NULL)||(size<1)||
-					(_XkbReadBufferDataLeft(from)<size))
-	return 0;
-    memcpy(to,from->data,size);
-    from->data+= size;
-    return 1;
-}
-
-#ifdef XKB_FORCE_INT_KEYSYM
-int
-#if NeedFunctionPrototypes
-_XkbReadCopyKeySyms(int *wire,KeySym *to,int num_words)
-#else
-_XkbReadCopyKeySyms(wire,to,num_words)
-    int *               wire;
-    KeySym *            to;
-    int                 num_words;
-#endif
-{
-    while (num_words-->0) {
-	*to++= *wire++;
-    }
-    return 1;
-}
-
-int
-#if NeedFunctionPrototypes
-_XkbReadBufferCopyKeySyms(XkbReadBufferPtr from,KeySym *to,int num_words)
-#else
-_XkbReadBufferCopyKeySyms(from,to,num_words)
-    XkbReadBufferPtr    from;
-    KeySym *            to;
-    int                 num_words;
-#endif
-{
-    if ((unsigned)(num_words*4)>_XkbReadBufferDataLeft(from))
-        return 0;
-    _XkbReadCopyKeySyms((int *)from->data,to,num_words);
-    from->data+= (4*num_words);
-    return True;
-}
-
-int
-#if NeedFunctionPrototypes
-_XkbWriteCopyKeySyms (register KeySym *from,CARD32 *to,int len)
-#else
-_XkbWriteCopyKeySyms (from,to,len)
-    register KeySym *           from;
-    CARD32 *                    to;
-    int                         len;
-#endif
-{
-
-    while (len-->0) {
-        *to++= (CARD32)*from++;
-    }
-    return True;
-}
-#endif
-
-#ifdef LONG64
-int
-#if NeedFunctionPrototypes
-_XkbReadCopyData32(int *wire,long *to,int num_words)
-#else
-_XkbReadCopyData32(wire,to,num_words)
-    int *		wire;
-    long *		to;
-    int			num_words;
-#endif
-{
-    while (num_words-->0) {
-	*to++= *wire++;
-    }
-    return 1;
-}
-#endif
-#ifdef WORD64
-int
-#if NeedFunctionPrototypes
-_XkbReadCopyData32(int *from,long *lp,int num_words)
-#else
-_XkbReadCopyData32(from,lp,num_words)
-    int *		from;
-    long *		lp;
-    int			num_words;
-#endif
-{
-long *lpack;
-long mask32 = 0x00000000ffffffff;
-long maskw, i, bits;
-
-    lpack = (long *)from;
-    bits = 32;
-
-    for (i=0;i<num_words;i++) {
-	maskw = mask32 << bits;
-	*lp++ = (*lpack & maskw) >> bits;
-	bits = bits ^ 32;
-	if (bits)
-	    lpack++;
-    }
-    return 1;
-}
-#endif
-
-#if defined(LONG64) || defined(WORD64)
-int
-#if NeedFunctionPrototypes
-_XkbReadBufferCopy32(XkbReadBufferPtr from,long *to,int num_words)
-#else
-_XkbReadBufferCopy32(from,to,num_words)
-    XkbReadBufferPtr	from;
-    long *		to;
-    int			num_words;
-#endif
-{
-    if ((unsigned)(num_words*4)>_XkbReadBufferDataLeft(from))
-	return 0;
-    _XkbReadCopyData32((int *)from->data,to,num_words);
-    from->data+= (4*num_words);
-    return True;
-}
-#endif
-
-#ifdef LONG64
-int
-#if NeedFunctionPrototypes
-_XkbWriteCopyData32 (register unsigned long *from,CARD32 *to,int len)
-#else
-_XkbWriteCopyData32 (from,to,len)
-    register unsigned long *	from;
-    CARD32 *			to;
-    int 			len;
-#endif
-{
-
-    while (len-->0) {
-	*to++= (CARD32)*from++;
-    }
-    return True;
-}
-#endif /* LONG64 */
-
-#ifdef WORD64
-_XkbWriteCopyData32 Not Implemented Yet for sizeof(int)==8
-#endif
-
-char *
-#if NeedFunctionPrototypes
-_XkbPeekAtReadBuffer(XkbReadBufferPtr from,int size)
-#else
-_XkbPeekAtReadBuffer(from,size)
-    XkbReadBufferPtr	 from;
-    int			 size;
-#endif
-{
-    if ((from==NULL)||(from->error)||(size<1)||
-					(_XkbReadBufferDataLeft(from)<size))
-	return 0;
-    return from->data;
-}
-
-char *
-#if NeedFunctionPrototypes
-_XkbGetReadBufferPtr(XkbReadBufferPtr from,int size)
-#else
-_XkbGetReadBufferPtr(from,size)
-    XkbReadBufferPtr	 from;
-    int			 size;
-#endif
-{
-char	*ptr;
-    if ((from==NULL)||(from->error)||(size<1)||
-					(_XkbReadBufferDataLeft(from)<size))
-	return 0;
-    ptr= from->data;
-    from->data+= size;
-    return ptr;
-}
-
-
-int
-#if NeedFunctionPrototypes
-_XkbFreeReadBuffer(XkbReadBufferPtr buf)
-#else
-_XkbFreeReadBuffer(buf)
-    XkbReadBufferPtr	buf;
-#endif
-{
-    if ((buf!=NULL) && (buf->start!=NULL)) {
-	int left;
-	left= (int)_XkbReadBufferDataLeft(buf);
-	if (buf->start!=NULL)
-	    Xfree(buf->start);
-	buf->size= 0;
-	buf->start= buf->data= NULL;
-	return left;
-    }
-    return 0;
-}
-
-Bool
-#if NeedFunctionPrototypes
-_XkbGetReadBufferCountedString(XkbReadBufferPtr buf,char **rtrn)
-#else
-_XkbGetReadBufferCountedString(buf,rtrn)
-    XkbReadBufferPtr	buf;
-    char **		rtrn;
-#endif
-{
-CARD16	len,*pLen;
-int	left;
-char *	str;
-
-    if ((buf==NULL)||(buf->error)||((left=(int)_XkbReadBufferDataLeft(buf))<4))
-	return False;
-    pLen= (CARD16 *)buf->data;
-    len= *pLen;
-    if (len>0) {
-	if (XkbPaddedSize(len+2)>left)
-	    return False;
-	str= _XkbAlloc(len+1);
-	if (str) {
-	    memcpy(str,&buf->data[2],len);
-	    str[len]= '\0';
-	}
-    }
-    buf->data+= XkbPaddedSize(len+2);
-    *rtrn= str;
-    return True;
-}
diff --git a/xc/lib/X11/XKBSetGeom.c b/xc/lib/X11/XKBSetGeom.c
deleted file mode 100644
index afa4f06a5..000000000
--- a/xc/lib/X11/XKBSetGeom.c
+++ /dev/null
@@ -1,561 +0,0 @@
-/* $TOG: XKBSetGeom.c /main/8 1997/06/10 06:53:24 kaleb $ */
-/************************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-
-#ifdef DEBUG
-#include <stdio.h>
-#endif
-
-#define NEED_EVENTS
-#define NEED_REPLIES
-#include "Xlibint.h"
-#include "XKBlibint.h"
-#include <X11/extensions/XKBgeom.h>
-#include <X11/extensions/XKBproto.h>
-
-#ifndef MINSHORT
-#define	MINSHORT	-32768
-#endif
-#ifndef MAXSHORT
-#define	MAXSHORT	32767
-#endif
-
-/***====================================================================***/
-
-#define	_SizeCountedString(s)  ((s)?XkbPaddedSize(2+strlen(s)):4)
-
-static char *
-#if NeedFunctionPrototypes
-_WriteCountedString(char *wire,char *str)
-#else
-_WriteCountedString(wire,str)
-    char *	wire;
-    char *	str;
-#endif
-{
-CARD16	len,*pLen;
-
-    len= (str?strlen(str):0);
-    pLen= (CARD16 *)wire;
-    *pLen= len;
-    if (len && str)
-	memcpy(&wire[2],str,len);
-    wire+= XkbPaddedSize(len+2);
-    return wire;
-}
-
-static int
-#if NeedFunctionPrototypes
-_SizeGeomProperties(XkbGeometryPtr geom)
-#else
-_SizeGeomProperties(geom)
-    XkbGeometryPtr	geom;
-#endif
-{
-register int 	i,size;
-XkbPropertyPtr	prop;
-    
-    for (size=i=0,prop=geom->properties;i<geom->num_properties;i++,prop++) {
-	size+= _SizeCountedString(prop->name);
-	size+= _SizeCountedString(prop->value);
-    }
-    return size;
-}
-
-static int
-#if NeedFunctionPrototypes
-_SizeGeomColors(XkbGeometryPtr geom)
-#else
-_SizeGeomColors(geom)
-    XkbGeometryPtr	geom;
-#endif
-{
-register int 		i,size;
-register XkbColorPtr	color;
-
-    for (i=size=0,color=geom->colors;i<geom->num_colors;i++,color++) {
-	size+= _SizeCountedString(color->spec);
-    }
-    return size;
-}
-
-static int
-#if NeedFunctionPrototypes
-_SizeGeomShapes(XkbGeometryPtr geom)
-#else
-_SizeGeomShapes(geom)
-    XkbGeometryPtr	geom;
-#endif
-{
-register int		i,size;
-register XkbShapePtr	shape;
-
-    for (i=size=0,shape=geom->shapes;i<geom->num_shapes;i++,shape++) {
-	register int		n;
-	register XkbOutlinePtr	ol;
-	size+= SIZEOF(xkbShapeWireDesc);
-	for (n=0,ol=shape->outlines;n<shape->num_outlines;n++,ol++) {
-	    size+= SIZEOF(xkbOutlineWireDesc);
-	    size+= ol->num_points*SIZEOF(xkbPointWireDesc);
-	}
-    }
-    return size;
-}
-
-static int
-#if NeedFunctionPrototypes
-_SizeGeomDoodads(int num_doodads,XkbDoodadPtr doodad)
-#else
-_SizeGeomDoodads(num_doodads,doodad)
-    int			num_doodads;
-    XkbDoodadPtr	doodad;
-#endif
-{
-register int	i,size;
-
-    for (i=size=0;i<num_doodads;i++,doodad++) {
-	size+= SIZEOF(xkbAnyDoodadWireDesc);
-	if (doodad->any.type==XkbTextDoodad) {
-	    size+= _SizeCountedString(doodad->text.text);
-	    size+= _SizeCountedString(doodad->text.font);
-	}
-	else if (doodad->any.type==XkbLogoDoodad) {
-	    size+= _SizeCountedString(doodad->logo.logo_name);
-	}
-    }
-    return size;
-}
-
-static int
-#if NeedFunctionPrototypes
-_SizeGeomSections(XkbGeometryPtr geom)
-#else
-_SizeGeomSections(geom)
-    XkbGeometryPtr	geom;
-#endif
-{
-register int 	i,size;
-XkbSectionPtr	section;
-
-    for (i=size=0,section=geom->sections;i<geom->num_sections;i++,section++) {
-	size+= SIZEOF(xkbSectionWireDesc);
-	if (section->rows) {
-	    int		r;
-	    XkbRowPtr	row;
-	    for (r=0,row=section->rows;r<section->num_rows;row++,r++) {
-		size+= SIZEOF(xkbRowWireDesc);
-		size+= row->num_keys*SIZEOF(xkbKeyWireDesc);
-	    }
-	}
-	if (section->doodads)
-	    size+= _SizeGeomDoodads(section->num_doodads,section->doodads);
-	if (section->overlays) {
-	    int			o;
-	    XkbOverlayPtr	ol;
-	    for (o=0,ol=section->overlays;o<section->num_overlays;o++,ol++) {
-		int			r;
-		XkbOverlayRowPtr	row;
-		size+= SIZEOF(xkbOverlayWireDesc);
-		for (r=0,row=ol->rows;r<ol->num_rows;r++,row++) {
-		   size+= SIZEOF(xkbOverlayRowWireDesc);
-		   size+= row->num_keys*SIZEOF(xkbOverlayKeyWireDesc);
-		}
-	    }
-	}
-    }
-    return size;
-}
-
-static int
-#if NeedFunctionPrototypes
-_SizeGeomKeyAliases(XkbGeometryPtr geom)
-#else
-_SizeGeomKeyAliases(geom)
-    XkbGeometryPtr	geom;
-#endif
-{
-    return geom->num_key_aliases*(2*XkbKeyNameLength);
-}
-
-/***====================================================================***/
-
-static char *
-#if NeedFunctionPrototypes
-_WriteGeomProperties(char *wire,XkbGeometryPtr geom)
-#else
-_WriteGeomProperties(wire,geom)
-    char *		wire;
-    XkbGeometryPtr 	geom;
-#endif
-{
-register int 	i;
-register XkbPropertyPtr	prop;
-    
-    for (i=0,prop=geom->properties;i<geom->num_properties;i++,prop++) {
-	wire= _WriteCountedString(wire,prop->name);
-	wire= _WriteCountedString(wire,prop->value);
-    }
-    return wire;
-}
-
-static char *
-#if NeedFunctionPrototypes
-_WriteGeomColors(char *wire,XkbGeometryPtr geom)
-#else
-_WriteGeomColors(wire,geom)
-    char *		wire;
-    XkbGeometryPtr 	geom;
-#endif
-{
-register int		i;
-register XkbColorPtr	color;
-
-    for (i=0,color=geom->colors;i<geom->num_colors;i++,color++) {
-	wire= _WriteCountedString(wire,color->spec);
-    }
-    return wire;
-}
-
-static char *
-#if NeedFunctionPrototypes
-_WriteGeomShapes(char *wire,XkbGeometryPtr geom)
-#else
-_WriteGeomShapes(wire,geom)
-    char *		wire;
-    XkbGeometryPtr 	geom;
-#endif
-{
-int			i;
-XkbShapePtr		shape;
-xkbShapeWireDesc *	shapeWire;
-
-    for (i=0,shape=geom->shapes;i<geom->num_shapes;i++,shape++) {
-	register int 		o;
-	XkbOutlinePtr		ol;
-	xkbOutlineWireDesc *	olWire;
-	shapeWire= (xkbShapeWireDesc *)wire;
-	shapeWire->name= shape->name;
-	shapeWire->nOutlines= shape->num_outlines;
-	if (shape->primary!=NULL)
-	     shapeWire->primaryNdx= XkbOutlineIndex(shape,shape->primary);
-	else shapeWire->primaryNdx= XkbNoShape;
-	if (shape->approx!=NULL)
-	     shapeWire->approxNdx= XkbOutlineIndex(shape,shape->approx);
-	else shapeWire->approxNdx= XkbNoShape;
-	wire= (char *)&shapeWire[1];
-	for (o=0,ol=shape->outlines;o<shape->num_outlines;o++,ol++) {
-	    register int	p;
-	    XkbPointPtr		pt;
-	    xkbPointWireDesc *	ptWire;
-	    olWire= (xkbOutlineWireDesc *)wire;
-	    olWire->nPoints= ol->num_points;
-	    olWire->cornerRadius= ol->corner_radius;
-	    wire= (char *)&olWire[1];
-	    ptWire= (xkbPointWireDesc *)wire;
-	    for (p=0,pt=ol->points;p<ol->num_points;p++,pt++) {
-		ptWire[p].x= pt->x;
-		ptWire[p].y= pt->y;
-	    }
-	    wire= (char *)&ptWire[ol->num_points];
-	}
-    }
-    return wire;
-}
-
-static char *
-#if NeedFunctionPrototypes
-_WriteGeomDoodads(char *wire,int num_doodads,XkbDoodadPtr doodad)
-#else
-_WriteGeomDoodads(wire,num_doodads,doodad)
-    char *		wire;
-    int			num_doodads;
-    XkbDoodadPtr	doodad;
-#endif
-{
-register int		i;
-xkbDoodadWireDesc *	doodadWire;
-
-    for (i=0;i<num_doodads;i++,doodad++) {
-	doodadWire= (xkbDoodadWireDesc *)wire;
-	wire= (char *)&doodadWire[1];
-	bzero(doodadWire,SIZEOF(xkbDoodadWireDesc));
-	doodadWire->any.name= doodad->any.name;
-	doodadWire->any.type= doodad->any.type;
-	doodadWire->any.priority= doodad->any.priority;
-	doodadWire->any.top= doodad->any.top;
-	doodadWire->any.left= doodad->any.left;
-	doodadWire->any.angle= doodad->any.angle;
-	switch (doodad->any.type) {
-	    case XkbOutlineDoodad:
-	    case XkbSolidDoodad:
-		doodadWire->shape.colorNdx= doodad->shape.color_ndx;
-		doodadWire->shape.shapeNdx= doodad->shape.shape_ndx;
-		break;
-	    case XkbTextDoodad:
-		doodadWire->text.width= doodad->text.width;
-		doodadWire->text.height= doodad->text.height;
-		doodadWire->text.colorNdx= doodad->text.color_ndx;
-		wire= _WriteCountedString(wire,doodad->text.text);
-		wire= _WriteCountedString(wire,doodad->text.font);
-		break;
-	    case XkbIndicatorDoodad:
-		doodadWire->indicator.shapeNdx= doodad->indicator.shape_ndx;
-		doodadWire->indicator.onColorNdx=doodad->indicator.on_color_ndx;
-		doodadWire->indicator.offColorNdx=
-						doodad->indicator.off_color_ndx;
-		break;
-	    case XkbLogoDoodad:
-		doodadWire->logo.colorNdx= doodad->logo.color_ndx;
-		doodadWire->logo.shapeNdx= doodad->logo.shape_ndx;
-		wire= _WriteCountedString(wire,doodad->logo.logo_name);
-		break;
-	    default:
-		break;
-	}
-    }
-    return wire;
-}
-
-static char *
-#if NeedFunctionPrototypes
-_WriteGeomOverlay(char *wire,XkbOverlayPtr ol)
-#else
-_WriteGeomOverlay(wire,ol)
-    char *		wire;
-    XkbOverlayPtr	ol;
-#endif
-{
-register int		r;
-XkbOverlayRowPtr	row;
-xkbOverlayWireDesc *	olWire;
-
-   olWire= (xkbOverlayWireDesc *)wire;
-   olWire->name= ol->name;
-   olWire->nRows= ol->num_rows;
-   wire= (char *)&olWire[1];
-   for (r=0,row=ol->rows;r<ol->num_rows;r++,row++) {
-   	unsigned int		k;
-	XkbOverlayKeyPtr	key;
-	xkbOverlayRowWireDesc *	rowWire;
-	rowWire= (xkbOverlayRowWireDesc *)wire;
-	rowWire->rowUnder= row->row_under;
-	rowWire->nKeys= row->num_keys;
-	wire= (char *)&rowWire[1];
-	for (k=0,key=row->keys;k<row->num_keys;k++,key++) {
-	    xkbOverlayKeyWireDesc *	keyWire;
-	    keyWire= (xkbOverlayKeyWireDesc *)wire;
-	    memcpy(keyWire->over,key->over.name,XkbKeyNameLength);
-	    memcpy(keyWire->under,key->under.name,XkbKeyNameLength);
-	    wire= (char *)&keyWire[1];
-	}
-   }
-   return wire;
-}
-
-static char *
-#if NeedFunctionPrototypes
-_WriteGeomSections(char *wire,XkbGeometryPtr geom)
-#else
-_WriteGeomSections(wire,geom)
-    char *		wire;
-    XkbGeometryPtr 	geom;
-#endif
-{
-register int		i;
-XkbSectionPtr		section;
-xkbSectionWireDesc *	sectionWire;
-
-    for (i=0,section=geom->sections;i<geom->num_sections;i++,section++) {
-	sectionWire= (xkbSectionWireDesc *)wire;
-	sectionWire->name= section->name;
-	sectionWire->top= section->top;
-	sectionWire->left= section->left;
-	sectionWire->width= section->width;
-	sectionWire->height= section->height;
-	sectionWire->angle= section->angle;
-	sectionWire->priority= section->priority;
-	sectionWire->nRows= section->num_rows;
-	sectionWire->nDoodads= section->num_doodads;
-	sectionWire->nOverlays= section->num_overlays;
-	sectionWire->pad= 0;
-	wire= (char *)&sectionWire[1];
-	if (section->rows) {
-	    int			r;
-	    XkbRowPtr		row;
-	    xkbRowWireDesc *	rowWire;
-	    for (r=0,row=section->rows;r<section->num_rows;r++,row++) {
-		rowWire= (xkbRowWireDesc *)wire;
-		rowWire->top= row->top;
-		rowWire->left= row->left;
-		rowWire->nKeys= row->num_keys;
-		rowWire->vertical= row->vertical;
-		rowWire->pad= 0;
-		wire= (char *)&rowWire[1];
-		if (row->keys) {
-		    int			k;
-		    XkbKeyPtr		key;
-		    xkbKeyWireDesc *	keyWire;
-		    keyWire= (xkbKeyWireDesc *)wire;
-		    for (k=0,key=row->keys;k<row->num_keys;k++,key++) {
-			memcpy(keyWire[k].name,key->name.name,XkbKeyNameLength);
-			keyWire[k].gap= key->gap;
-			keyWire[k].shapeNdx= key->shape_ndx;
-			keyWire[k].colorNdx= key->color_ndx;
-		    }
-		    wire= (char *)&keyWire[row->num_keys];
-		}
-	    }
-	}
-	if (section->doodads) {
-	    wire= _WriteGeomDoodads(wire,
-	    			      section->num_doodads,section->doodads);
-	}
-	if (section->overlays) {
-	    register int o;
-	    for (o=0;o<section->num_overlays;o++) {
-		wire= _WriteGeomOverlay(wire,&section->overlays[o]);
-	    }
-	}
-    }
-    return wire;
-}
-
-static char *
-#if NeedFunctionPrototypes
-_WriteGeomKeyAliases(char *wire,XkbGeometryPtr geom)
-#else
-_WriteGeomKeyAliases(wire,geom)
-    char *		wire;
-    XkbGeometryPtr 	geom;
-#endif
-{
-register int sz;
-    
-    sz= geom->num_key_aliases*(XkbKeyNameLength*2);
-    if (sz>0) {
-	memcpy(wire,(char *)geom->key_aliases,sz);
-	wire+= sz;
-    }
-    return wire;
-}
-
-/***====================================================================***/
-
-static Status
-#if NeedFunctionPrototypes
-_SendSetGeometry(Display *dpy,XkbGeometryPtr geom,xkbSetGeometryReq *req)
-#else
-_SendSetGeometry(dpy,geom,req)
-    Display *		dpy;
-    XkbGeometryPtr	geom;
-    xkbSetGeometryReq *	req;
-#endif
-{
-xkbSetGeometryReq	tmp;
-int			sz;
-char *			wire,*tbuf;
-
-    sz= 0;
-    sz+= _SizeCountedString(geom->label_font);
-    sz+= _SizeGeomProperties(geom);
-    sz+= _SizeGeomColors(geom);
-    sz+= _SizeGeomShapes(geom);
-    sz+= _SizeGeomSections(geom);
-    sz+= _SizeGeomDoodads(geom->num_doodads,geom->doodads);
-    sz+= _SizeGeomKeyAliases(geom);
-    req->length+= (sz/4);
-    tmp= *req;
-    if (sz<BUFSIZE) {
-	BufAlloc(char *,wire,sz);
-	tbuf= NULL;
-    }
-    else {
-	tbuf= _XAllocTemp(dpy,sz);
-	if (!tbuf)
-	    return BadAlloc;
-	wire= tbuf;
-    }
-    wire= _WriteCountedString(wire,geom->label_font);
-    if (geom->num_properties>0)
-	wire= _WriteGeomProperties(wire,geom);
-    if (geom->num_colors>0)
-	wire= _WriteGeomColors(wire,geom);
-    if (geom->num_shapes>0)
-	wire= _WriteGeomShapes(wire,geom);
-    if (geom->num_sections>0)
-	wire= _WriteGeomSections(wire,geom);
-    if (geom->num_doodads>0)
-	wire= _WriteGeomDoodads(wire,geom->num_doodads,geom->doodads);
-    if (geom->num_key_aliases>0)
-	wire= _WriteGeomKeyAliases(wire,geom);
-    if (tbuf!=NULL) {
-	Data(dpy,tbuf,sz);
-	_XFreeTemp(dpy,tbuf,sz);
-    }
-    return Success;
-}
-
-/***====================================================================***/
-
-Status
-#if NeedFunctionPrototypes
-XkbSetGeometry(Display *dpy,unsigned deviceSpec,XkbGeometryPtr geom)
-#else
-XkbSetGeometry(dpy,deviceSpec,geom)
-    Display *		dpy;
-    unsigned		deviceSpec;
-    XkbGeometryPtr	geom;
-#endif
-{
-xkbSetGeometryReq	*req;
-Status ret;
-
-    if ( (!geom) || (dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return BadAccess;
-    
-    GetReq(kbSetGeometry, req);
-    req->reqType = dpy->xkb_info->codes->major_opcode;
-    req->xkbReqType = X_kbSetGeometry;
-    req->deviceSpec = deviceSpec;
-    req->nShapes= geom->num_shapes;
-    req->nSections= geom->num_sections;
-    req->name= geom->name;
-    req->widthMM= geom->width_mm;
-    req->heightMM= geom->height_mm;
-    req->nProperties= geom->num_properties;
-    req->nColors= geom->num_colors;
-    req->nDoodads= geom->num_doodads;
-    req->nKeyAliases= geom->num_key_aliases;
-    req->baseColorNdx= (geom->base_color-geom->colors);
-    req->labelColorNdx= (geom->label_color-geom->colors);
-
-    ret = _SendSetGeometry(dpy,geom,req);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return ret;
-}
-
diff --git a/xc/lib/X11/XKBSetMap.c b/xc/lib/X11/XKBSetMap.c
deleted file mode 100644
index 414e722e6..000000000
--- a/xc/lib/X11/XKBSetMap.c
+++ /dev/null
@@ -1,717 +0,0 @@
-/* $XConsortium: XKBSetMap.c /main/8 1996/03/01 14:30:01 kaleb $ */
-/************************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-/* $XFree86: xc/lib/X11/XKBSetMap.c,v 3.1 1999/05/09 10:50:25 dawes Exp $ */
-
-#include <stdio.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
-#include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
-#include "XKBlibint.h"
-
-static int
-#if NeedFunctionPrototypes
-_XkbSizeKeyTypes(XkbDescPtr xkb,xkbSetMapReq *req)
-#else
-_XkbSizeKeyTypes(xkb,req)
-    XkbDescPtr		xkb;
-    xkbSetMapReq *	req;
-#endif
-{
-    XkbKeyTypePtr	map;
-    int			i,len;
-
-    if (((req->present&XkbKeyTypesMask)==0)||(req->nTypes==0)) {
-	req->present&= ~XkbKeyTypesMask;
-	req->firstType= req->nTypes= 0;
-	return 0;
-    }
-    len= 0;
-    map= &xkb->map->types[req->firstType];
-    for (i=0;i<req->nTypes;i++,map++){
-	len+= SIZEOF(xkbKeyTypeWireDesc);
-	len+= map->map_count*SIZEOF(xkbKTSetMapEntryWireDesc);
-	if (map->preserve)
-	    len+= map->map_count*SIZEOF(xkbModsWireDesc);
-    }
-    return len;
-}
-
-static void
-#if NeedFunctionPrototypes
-_XkbWriteKeyTypes(Display *dpy,XkbDescPtr xkb,xkbSetMapReq *req)
-#else
-_XkbWriteKeyTypes(dpy,xkb,req)
-    Display	*	dpy;
-    XkbDescPtr		xkb;
-    xkbSetMapReq *	req;
-#endif
-{
-    char *		buf;
-    XkbKeyTypePtr 	type;
-    int			i,n,sz;
-    xkbKeyTypeWireDesc *desc;
-
-    if ((req->present&XkbKeyTypesMask)==0)
-	return;
-    type= &xkb->map->types[req->firstType];
-    for (i=0;i<req->nTypes;i++,type++) {
-	sz= SIZEOF(xkbKeyTypeWireDesc);
-	sz+= type->map_count*SIZEOF(xkbKTSetMapEntryWireDesc);
-	if (type->preserve)
-	    sz+= type->map_count*SIZEOF(xkbModsWireDesc);
-	BufAlloc(xkbKeyTypeWireDesc *,desc,sz);
-	desc->mask = type->mods.mask;
-	desc->realMods = type->mods.real_mods;
-	desc->virtualMods = type->mods.vmods;
-	desc->numLevels = type->num_levels;
-	desc->nMapEntries = type->map_count;
-	desc->preserve = (type->preserve!=NULL);
-	buf= (char *)&desc[1];
-	if (desc->nMapEntries>0) {
-	    xkbKTSetMapEntryWireDesc *wire;
-	    wire= (xkbKTSetMapEntryWireDesc *)buf;
-	    for (n=0;n<type->map_count;n++,wire++) {
-		wire->level= type->map[n].level;
-		wire->realMods= type->map[n].mods.real_mods;
-		wire->virtualMods= type->map[n].mods.vmods;
-	    }
-	    buf= (char *)wire;
-	    if (type->preserve) {
-		xkbModsWireDesc *pwire;
-		pwire= (xkbModsWireDesc *)buf;
-		for (n=0;n<type->map_count;n++,pwire++) {
-		    pwire->realMods= type->preserve[n].real_mods;
-		    pwire->virtualMods= type->preserve[n].vmods;
-		}
-	    }
-	}
-    }
-    return;
-}
-
-static int
-#if NeedFunctionPrototypes
-_XkbSizeKeySyms(XkbDescPtr xkb,xkbSetMapReq *req)
-#else
-_XkbSizeKeySyms(xkb,req)
-    XkbDescPtr		xkb;
-    xkbSetMapReq *	req;
-#endif
-{
-    int			i,len;
-    unsigned		nSyms;
-
-    if (((req->present&XkbKeySymsMask)==0)||(req->nKeySyms==0)) {
-	req->present&= ~XkbKeySymsMask;
-	req->firstKeySym= req->nKeySyms= 0;
-	req->totalSyms= 0;
-	return 0;
-    }
-    len= (int)(req->nKeySyms*sizeof(XkbSymMapRec));
-    for (i=nSyms=0;i<req->nKeySyms;i++) {
-	nSyms+= XkbKeyNumSyms(xkb,i+req->firstKeySym);
-    }
-    len+= nSyms*sizeof(CARD32);
-    req->totalSyms= nSyms;
-    return len;
-}
-
-static void
-#if NeedFunctionPrototypes
-_XkbWriteKeySyms(Display *dpy,XkbDescPtr xkb,xkbSetMapReq *req)
-#else
-_XkbWriteKeySyms(dpy,xkb,req)
-    Display *		dpy;
-    XkbDescPtr		xkb;
-    xkbSetMapReq *	req;
-#endif
-{
-register KeySym *	pSym;
-CARD32 *		outSym;
-XkbSymMapPtr		symMap;
-xkbSymMapWireDesc *desc;
-register int	i;
-
-    if ((req->present&XkbKeySymsMask)==0)
-	return;
-    symMap = &xkb->map->key_sym_map[req->firstKeySym];
-    for (i=0;i<req->nKeySyms;i++,symMap++) {
-	BufAlloc(xkbSymMapWireDesc *,desc,
-		 SIZEOF(xkbSymMapWireDesc)+
-		 (XkbKeyNumSyms(xkb,i+req->firstKeySym)*sizeof(CARD32)));
-	desc->ktIndex[0] = symMap->kt_index[0];
-	desc->ktIndex[1] = symMap->kt_index[1];
-	desc->ktIndex[2] = symMap->kt_index[2];
-	desc->ktIndex[3] = symMap->kt_index[3];
-	desc->groupInfo = symMap->group_info;
-	desc->width = symMap->width;
-	desc->nSyms = XkbKeyNumSyms(xkb,i+req->firstKeySym);
-	outSym = (CARD32 *)&desc[1];
-	if (desc->nSyms>0) {
-	     pSym = XkbKeySymsPtr(xkb,i+req->firstKeySym);
-	    _XkbWriteCopyKeySyms(pSym,outSym,desc->nSyms);
-	}
-    }
-    return;
-}
-
-static int
-#if NeedFunctionPrototypes
-_XkbSizeKeyActions(XkbDescPtr xkb,xkbSetMapReq *req)
-#else
-_XkbSizeKeyActions(xkb,req)
-    XkbDescPtr		xkb;
-    xkbSetMapReq *	req;
-#endif
-{
-    int			i,len,nActs;
-
-    if (((req->present&XkbKeyActionsMask)==0)||(req->nKeyActs==0)) {
-	req->present&= ~XkbKeyActionsMask;
-	req->firstKeyAct= req->nKeyActs= 0;
-	req->totalActs= 0;
-	return 0;
-    }
-    for (nActs=i=0;i<req->nKeyActs;i++) {
-	if (xkb->server->key_acts[i+req->firstKeyAct]!=0)
-	    nActs+= XkbKeyNumActions(xkb,i+req->firstKeyAct);
-    }
-    len= XkbPaddedSize(req->nKeyActs)+(nActs*SIZEOF(xkbActionWireDesc));
-    req->totalActs= nActs;
-    return len;
-}
-
-static void
-#if NeedFunctionPrototypes
-_XkbWriteKeyActions(Display *dpy,XkbDescPtr xkb,xkbSetMapReq *req)
-#else
-_XkbWriteKeyActions(dpy,xkb,req)
-    Display *		dpy;
-    XkbDescPtr		xkb;
-    xkbSetMapReq *	req;
-#endif
-{
-    register int	 i;
-    int	 		 n;
-    CARD8		*numDesc;
-    XkbAction		*actDesc;
-
-    if ((req->present&XkbKeyActionsMask)==0)
-	return;
-    n = XkbPaddedSize(req->nKeyActs);
-    n+= (req->totalActs*SIZEOF(xkbActionWireDesc));
-
-    BufAlloc(CARD8 *,numDesc,n);
-    for (i=0;i<req->nKeyActs;i++) {
-	if (xkb->server->key_acts[i+req->firstKeyAct]==0)
-	     numDesc[i] = 0;
-	else numDesc[i] = XkbKeyNumActions(xkb,(i+req->firstKeyAct));
-    }
-    actDesc = (XkbAction *)&numDesc[XkbPaddedSize(req->nKeyActs)];
-    for (i=0;i<req->nKeyActs;i++) {
-	if (xkb->server->key_acts[i+req->firstKeyAct]!=0) {
-	    n = XkbKeyNumActions(xkb,(i+req->firstKeyAct));
-	    memcpy(actDesc,XkbKeyActionsPtr(xkb,(i+req->firstKeyAct)),
-                                                   n*SIZEOF(xkbActionWireDesc));
-	    actDesc+= n;
-	}
-    }
-    return;
-}
-
-static int
-#if NeedFunctionPrototypes
-_XkbSizeKeyBehaviors(XkbDescPtr	xkb,xkbSetMapReq *req)
-#else
-_XkbSizeKeyBehaviors(xkb,req)
-    XkbDescPtr		xkb;
-    xkbSetMapReq *	req;
-#endif
-{
-register int i,first,last,nFound;
-
-    if (((req->present&XkbKeyBehaviorsMask)==0)||(req->nKeyBehaviors<1)) {
-	req->present&= ~XkbKeyBehaviorsMask;
-	req->firstKeyBehavior= req->nKeyBehaviors= 0;
-	req->totalKeyBehaviors= 0;
-	return 0;
-    }
-    first= req->firstKeyBehavior;
-    last= first+req->nKeyBehaviors-1;
-    for (i=first,nFound=0;i<=last;i++) {
-	if (xkb->server->behaviors[i].type!=XkbKB_Default)
-	    nFound++;
-    }
-    req->totalKeyBehaviors= nFound;
-    return (nFound*SIZEOF(xkbBehaviorWireDesc));
-}
-
-static void
-#if NeedFunctionPrototypes
-_XkbWriteKeyBehaviors(Display *dpy,XkbDescPtr xkb,xkbSetMapReq *req)
-#else
-_XkbWriteKeyBehaviors(dpy,xkb,req)
-    Display *		dpy;
-    XkbDescPtr		xkb;
-    xkbSetMapReq *	req;
-#endif
-{
-register int 		i,first,last;
-xkbBehaviorWireDesc *	wire;
-char *			buf;
-
-    if ((req->present&XkbKeyBehaviorsMask)==0)
-	return;
-    first= req->firstKeyBehavior;
-    last= first+req->nKeyBehaviors-1;
-
-    i= req->totalKeyBehaviors*SIZEOF(xkbBehaviorWireDesc);
-    BufAlloc(char *,buf,i);
-    wire= (xkbBehaviorWireDesc *)buf;
-    for (i=first;i<=last;i++) {
-	if (xkb->server->behaviors[i].type!=XkbKB_Default) {
-	    wire->key= i;
-	    wire->type= xkb->server->behaviors[i].type;
-	    wire->data= xkb->server->behaviors[i].data;
-	    buf+= SIZEOF(xkbBehaviorWireDesc);
-	    wire= (xkbBehaviorWireDesc *)buf;
-	}
-    }
-    return;
-}
-
-static unsigned
-#if NeedFunctionPrototypes
-_XkbSizeVirtualMods(xkbSetMapReq *req)
-#else
-_XkbSizeVirtualMods(req)
-    xkbSetMapReq *	req;
-#endif
-{
-register int i,bit,nMods;
-
-   if (((req->present&XkbVirtualModsMask)==0)||(req->virtualMods==0)) {
-	req->present&= ~XkbVirtualModsMask;
-	req->virtualMods= 0;
-	return 0;
-   }
-   for (i=nMods=0,bit=1;i<XkbNumVirtualMods;i++,bit<<=1) {
-	if (req->virtualMods&bit)
-	    nMods++;
-   }
-   return XkbPaddedSize(nMods);
-}
-
-static void
-#if NeedFunctionPrototypes
-_XkbWriteVirtualMods(	Display *	dpy,
-			XkbDescPtr 	xkb,
-			xkbSetMapReq *	req,
-			unsigned 	size)
-#else
-_XkbWriteVirtualMods(dpy,xkb,req,size)
-    Display *		dpy;
-    XkbDescPtr		xkb;
-    xkbSetMapReq *	req;
-    unsigned 		size;
-#endif
-{
-    register int	 i,bit;
-    CARD8		*vmods;
-
-    /* This was req->present&XkbVirtualModsMask==0, and '==' beats '&' */
-    if (((req->present & XkbVirtualModsMask) == 0) || (size < 1))
-	return;
-    BufAlloc(CARD8 *,vmods,size);
-    for (i=0,bit=1;i<XkbNumVirtualMods;i++,bit<<=1) {
-	if (req->virtualMods&bit)
-	    *vmods++= xkb->server->vmods[i];
-    }
-    return;
-}
-
-static int
-#if NeedFunctionPrototypes
-_XkbSizeKeyExplicit(XkbDescPtr xkb,xkbSetMapReq *req)
-#else
-_XkbSizeKeyExplicit(xkb,req)
-    XkbDescPtr		xkb;
-    xkbSetMapReq *	req;
-#endif
-{
-register int i,first,last,nFound;
-
-    if (((req->present&XkbExplicitComponentsMask)==0)||(req->nKeyExplicit==0)) {
-	req->present&= ~XkbExplicitComponentsMask;
-	req->firstKeyExplicit= req->nKeyExplicit= 0;
-	req->totalKeyExplicit= 0;
-	return 0;
-    }
-    first= req->firstKeyExplicit;
-    last= first+req->nKeyExplicit-1;
-
-    for (i=first,nFound=0;i<=last;i++) {
-	if (xkb->server->explicit[i]!=0)
-	    nFound++;
-    }
-    req->totalKeyExplicit= nFound;
-    return XkbPaddedSize((nFound*2));
-}
-
-static void
-#if NeedFunctionPrototypes
-_XkbWriteKeyExplicit(Display *dpy,XkbDescPtr xkb,xkbSetMapReq *req)
-#else
-_XkbWriteKeyExplicit(dpy,xkb,req)
-    Display *		dpy;
-    XkbDescPtr		xkb;
-    xkbSetMapReq *	req;
-#endif
-{
-register int	i,first,last;
-CARD8 *		wire;
-
-    if ((req->present&XkbExplicitComponentsMask)==0)
-	return;
-    first= req->firstKeyExplicit;
-    last= first+req->nKeyExplicit;
-    i= XkbPaddedSize((req->totalKeyExplicit*2));
-    BufAlloc(CARD8 *,wire,i);
-    for (i=first;i<=last;i++) {
-	if (xkb->server->explicit[i]!=0) {
-	    wire[0]= i;
-	    wire[1]= xkb->server->explicit[i];
-	    wire+= 2;
-	}
-    }
-    return;
-}
-
-static int
-#if NeedFunctionPrototypes
-_XkbSizeModifierMap(XkbDescPtr xkb,xkbSetMapReq *req)
-#else
-_XkbSizeModifierMap(xkb,req)
-    XkbDescPtr		xkb;
-    xkbSetMapReq *	req;
-#endif
-{
-register int i,first,last,nFound;
-
-    if (((req->present&XkbModifierMapMask)==0)||(req->nModMapKeys==0)) {
-	req->present&= ~XkbModifierMapMask;
-	req->firstModMapKey= req->nModMapKeys= 0;
-	req->totalModMapKeys= 0;
-	return 0;
-    }
-    first= req->firstModMapKey;
-    last= first+req->nModMapKeys-1;
-
-    for (i=first,nFound=0;i<=last;i++) {
-	if (xkb->map->modmap[i]!=0)
-	    nFound++;
-    }
-    req->totalModMapKeys= nFound;
-    return XkbPaddedSize((nFound*2));
-}
-
-static void
-#if NeedFunctionPrototypes
-_XkbWriteModifierMap(Display *dpy,XkbDescPtr xkb,xkbSetMapReq *req)
-#else
-_XkbWriteModifierMap(dpy,xkb,req)
-    Display *		dpy;
-    XkbDescPtr		xkb;
-    xkbSetMapReq *	req;
-#endif
-{
-register int	i,first,last;
-CARD8 *		wire;
-
-    if ((req->present&XkbModifierMapMask)==0)
-	return;
-    first= req->firstModMapKey;
-    last= first+req->nModMapKeys-1;
-    if (req->totalModMapKeys>0) {
-	i= XkbPaddedSize((req->totalModMapKeys*2));
-	BufAlloc(CARD8 *,wire,i);
-	for (i=first;i<=last;i++) {
-	    if (xkb->map->modmap[i]!=0) {
-		wire[0]= i;
-		wire[1]= xkb->map->modmap[i];
-		wire+= 2;
-	    }
-	}
-    }
-    return;
-}
-
-static int
-#if NeedFunctionPrototypes
-_XkbSizeVirtualModMap(XkbDescPtr xkb,xkbSetMapReq *req)
-#else
-_XkbSizeVirtualModMap(xkb,req)
-    XkbDescPtr		xkb;
-    xkbSetMapReq *	req;
-#endif
-{
-register int i,first,last,nFound;
-
-    if (((req->present&XkbVirtualModMapMask)==0)||(req->nVModMapKeys==0)) {
-	req->present&= ~XkbVirtualModMapMask;
-	req->firstVModMapKey= req->nVModMapKeys= 0;
-	req->totalVModMapKeys= 0;
-	return 0;
-    }
-    first= req->firstVModMapKey;
-    last= first+req->nVModMapKeys-1;
-
-    for (i=first,nFound=0;i<=last;i++) {
-	if (xkb->server->vmodmap[i]!=0)
-	    nFound++;
-    }
-    req->totalVModMapKeys= nFound;
-    return nFound*SIZEOF(xkbVModMapWireDesc);
-}
-
-static void
-#if NeedFunctionPrototypes
-_XkbWriteVirtualModMap(Display *dpy,XkbDescPtr xkb,xkbSetMapReq *req)
-#else
-_XkbWriteVirtualModMap(dpy,xkb,req)
-    Display *		dpy;
-    XkbDescPtr		xkb;
-    xkbSetMapReq *	req;
-#endif
-{
-register int		i,first,last;
-xkbVModMapWireDesc *	wire;
-
-    if ((req->present&XkbVirtualModMapMask)==0)
-	return;
-    first= req->firstVModMapKey;
-    last= first+req->nVModMapKeys-1;
-    if (req->totalVModMapKeys>0) {
-	i= req->totalVModMapKeys*SIZEOF(xkbVModMapWireDesc);
-	BufAlloc(xkbVModMapWireDesc *,wire,i);
-	for (i=first;i<=last;i++) {
-	    if (xkb->server->vmodmap[i]!=0) {
-		wire->key= i;
-		wire->vmods= xkb->server->vmodmap[i];
-		wire++;
-	    }
-	}
-    }
-    return;
-}
-
-static void
-#if NeedFunctionPrototypes
-SendSetMap(Display *dpy,XkbDescPtr xkb,xkbSetMapReq *req)
-#else
-SendSetMap(dpy,xkb,req)
-    Display *		dpy;
-    XkbDescPtr 		xkb;
-    xkbSetMapReq *	req;
-#endif
-{
-xkbSetMapReq tmp;
-unsigned szMods;
-
-    req->length+= _XkbSizeKeyTypes(xkb,req)/4;
-    req->length+= _XkbSizeKeySyms(xkb,req)/4;
-    req->length+= _XkbSizeKeyActions(xkb,req)/4;
-    req->length+= _XkbSizeKeyBehaviors(xkb,req)/4;
-    szMods= _XkbSizeVirtualMods(req);
-    req->length+= szMods/4;
-    req->length+= _XkbSizeKeyExplicit(xkb,req)/4;
-    req->length+= _XkbSizeModifierMap(xkb,req)/4;
-    req->length+= _XkbSizeVirtualModMap(xkb,req)/4;
-
-    tmp= *req;
-    if ( tmp.nTypes>0 )
-	_XkbWriteKeyTypes(dpy,xkb,&tmp);
-    if ( tmp.nKeySyms>0 )
-	_XkbWriteKeySyms(dpy,xkb,&tmp);
-    if ( tmp.nKeyActs )
-	_XkbWriteKeyActions(dpy,xkb,&tmp);
-    if ( tmp.totalKeyBehaviors>0 )
-	_XkbWriteKeyBehaviors(dpy,xkb,&tmp);
-    if ( tmp.virtualMods )
-	_XkbWriteVirtualMods(dpy,xkb,&tmp,szMods);
-    if ( tmp.totalKeyExplicit>0)
-	_XkbWriteKeyExplicit(dpy,xkb,&tmp);
-    if ( tmp.totalModMapKeys>0)
-	_XkbWriteModifierMap(dpy,xkb,&tmp);
-    if ( tmp.totalVModMapKeys>0)
-	_XkbWriteVirtualModMap(dpy,xkb,&tmp);
-    return;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbSetMap(Display *dpy,unsigned which,XkbDescPtr xkb)
-#else
-XkbSetMap(dpy,which,xkb)
-    Display *	dpy;
-    unsigned 	which;
-    XkbDescPtr	xkb;
-#endif
-{
-register xkbSetMapReq *	req;
-XkbInfoPtr 		xkbi;
-XkbServerMapPtr		srv;
-XkbClientMapPtr		map;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL))||
-	(!xkb))
-	return False;
-    map= xkb->map;
-    srv= xkb->server;
-
-    if (((which&XkbKeyTypesMask)&&((!map)||(!map->types)))||
-	((which&XkbKeySymsMask)&&((!map)||(!map->syms)||(!map->key_sym_map)))||
-	((which&XkbKeyActionsMask)&&((!srv)||(!srv->key_acts)))||
-	((which&XkbKeyBehaviorsMask)&&((!srv)||(!srv->behaviors)))||
-	((which&XkbVirtualModsMask)&&(!srv))||
-	((which&XkbExplicitComponentsMask)&&((!srv)||(!srv->explicit)))||
-	((which&XkbModifierMapMask)&&((!map)||(!map->modmap)))||
-	((which&XkbVirtualModMapMask)&&((!srv)||(!srv->vmodmap))))
-	return False;
-
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbSetMap, req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbSetMap;
-    req->deviceSpec = xkb->device_spec;
-    req->present = which;
-    req->flags = XkbSetMapAllFlags;
-    req->minKeyCode= xkb->min_key_code;
-    req->maxKeyCode= xkb->max_key_code;
-    req->firstType = 0;
-    if (which&XkbKeyTypesMask)	req->nTypes = map->num_types;
-    else			req->nTypes = 0;
-    if (which&XkbKeySymsMask) {
-	req->firstKeySym = xkb->min_key_code;
-	req->nKeySyms = XkbNumKeys(xkb);
-    }
-    if (which&XkbKeyActionsMask) {
-	req->firstKeyAct = xkb->min_key_code;
-	req->nKeyActs = XkbNumKeys(xkb);
-    }
-    if (which&XkbKeyBehaviorsMask) {
-	req->firstKeyBehavior = xkb->min_key_code;
-	req->nKeyBehaviors = XkbNumKeys(xkb);
-    }
-    if (which&XkbVirtualModsMask)
-	req->virtualMods= ~0;
-    if (which&XkbExplicitComponentsMask) {
-	req->firstKeyExplicit= xkb->min_key_code;
-	req->nKeyExplicit = XkbNumKeys(xkb);
-    }
-    if (which&XkbModifierMapMask) {
-	req->firstModMapKey= xkb->min_key_code;
-	req->nModMapKeys = XkbNumKeys(xkb);
-    }
-    if (which&XkbVirtualModMapMask) {
-	req->firstVModMapKey= xkb->min_key_code;
-	req->nVModMapKeys = XkbNumKeys(xkb);
-    }
-    SendSetMap(dpy,xkb,req);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbChangeMap(Display *dpy,XkbDescPtr xkb,XkbMapChangesPtr changes)
-#else
-XkbChangeMap(dpy,xkb,changes)
-    Display *		dpy;
-    XkbDescPtr		xkb;
-    XkbMapChangesPtr	changes;
-#endif
-{
-register xkbSetMapReq *	req;
-XkbInfoPtr 		xkbi;
-XkbServerMapPtr		srv;
-XkbClientMapPtr		map;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL))||
-	(!xkb)||(!changes))
-	return False;
-    srv= xkb->server;
-    map= xkb->map;
-
-    if (((changes->changed&XkbKeyTypesMask)&&((!map)||(!map->types)))||
-	((changes->changed&XkbKeySymsMask)&&((!map)||(!map->syms)||
-				(!map->key_sym_map)))||
-	((changes->changed&XkbKeyActionsMask)&&((!srv)||(!srv->key_acts)))||
-	((changes->changed&XkbKeyBehaviorsMask)&&((!srv)||(!srv->behaviors)))||
-	((changes->changed&XkbVirtualModsMask)&&(!srv))||
-	((changes->changed&XkbExplicitComponentsMask)&&
-				((!srv)||(!srv->explicit)))||
-	((changes->changed&XkbModifierMapMask)&&((!map)||(!map->modmap)))||
-	((changes->changed&XkbVirtualModMapMask)&&((!srv)||(!srv->vmodmap))))
-	return False;
-
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbSetMap, req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbSetMap;
-    req->deviceSpec = xkb->device_spec;
-    req->present = changes->changed;
-    req->flags = XkbSetMapRecomputeActions;
-    req->minKeyCode= xkb->min_key_code;
-    req->maxKeyCode= xkb->max_key_code;
-    req->firstType = changes->first_type;
-    req->nTypes = changes->num_types;
-    req->firstKeySym = changes->first_key_sym;
-    req->nKeySyms = changes->num_key_syms;
-    req->firstKeyAct = changes->first_key_act;
-    req->nKeyActs = changes->num_key_acts;
-    req->firstKeyBehavior = changes->first_key_behavior;
-    req->nKeyBehaviors = changes->num_key_behaviors;
-    req->virtualMods = changes->vmods;
-    req->firstKeyExplicit = changes->first_key_explicit;
-    req->nKeyExplicit = changes->num_key_explicit;
-    req->firstModMapKey = changes->first_modmap_key;
-    req->nModMapKeys = changes->num_modmap_keys;
-    req->firstVModMapKey = changes->first_vmodmap_key;
-    req->nVModMapKeys = changes->num_vmodmap_keys;
-    SendSetMap(dpy,xkb,req);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
diff --git a/xc/lib/X11/XKBUse.c b/xc/lib/X11/XKBUse.c
deleted file mode 100644
index c1c3465fd..000000000
--- a/xc/lib/X11/XKBUse.c
+++ /dev/null
@@ -1,837 +0,0 @@
-/* $XConsortium: XKBUse.c /main/15 1996/09/28 16:34:51 rws $ */
-/************************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-
-#include <stdio.h>
-#include <ctype.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
-#include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
-#include "XKBlibint.h"
-
-#ifdef X_NOT_STDC_ENV
-extern char *getenv();
-#endif
-
-static Bool	_XkbIgnoreExtension = False;
-
-void
-#if NeedFunctionPrototypes
-XkbNoteMapChanges(XkbMapChangesPtr old,XkbMapNotifyEvent *new,unsigned wanted)
-#else
-XkbNoteMapChanges(old,new,wanted)
-    XkbMapChangesPtr	old;
-    XkbMapNotifyEvent *	new;
-    unsigned int	wanted;
-#endif
-{
-    int first,oldLast,newLast;
-    wanted&= new->changed;
-
-    if (wanted&XkbKeyTypesMask) {
-	if (old->changed&XkbKeyTypesMask) {
-	    first = old->first_type;
-	    oldLast = old->first_type+old->num_types-1;
-	    newLast = new->first_type+new->num_types-1;
-
-	    if (new->first_type<first)
-		first = new->first_type;
-	    if (oldLast>newLast)
-		newLast= oldLast;
-	    old->first_type = first;
-	    old->num_types = newLast-first+1;
-	}
-	else {
-	    old->first_type= new->first_type;
-	    old->num_types = new->num_types;
-	}
-    }
-    if (wanted&XkbKeySymsMask) {
-	if (old->changed&XkbKeySymsMask) {
-	    first = old->first_key_sym;
-	    oldLast = old->first_key_sym+old->num_key_syms-1;
-	    newLast = new->first_key_sym+new->num_key_syms-1;
-
-	    if (new->first_key_sym<first)
-		first = new->first_key_sym;
-	    if (oldLast>newLast)
-		newLast= oldLast;
-	    old->first_key_sym = first;
-	    old->num_key_syms = newLast-first+1;
-	}
-	else {
-	    old->first_key_sym = new->first_key_sym;
-	    old->num_key_syms = new->num_key_syms;
-	}
-    }
-    if (wanted&XkbKeyActionsMask) {
-	if (old->changed&XkbKeyActionsMask) {
-	    first = old->first_key_act;
-	    oldLast = old->first_key_act+old->num_key_acts-1;
-	    newLast = new->first_key_act+new->num_key_acts-1;
-
-	    if (new->first_key_act<first)
-		first = new->first_key_act;
-	    if (oldLast>newLast)
-		newLast= oldLast;
-	    old->first_key_act = first;
-	    old->num_key_acts = newLast-first+1;
-	}
-	else {
-	    old->first_key_act = new->first_key_act;
-	    old->num_key_acts = new->num_key_acts;
-	}
-    }
-    if (wanted&XkbKeyBehaviorsMask) {
-	if (old->changed&XkbKeyBehaviorsMask) {
-	    first = old->first_key_behavior;
-	    oldLast = old->first_key_behavior+old->num_key_behaviors-1;
-	    newLast = new->first_key_behavior+new->num_key_behaviors-1;
-
-	    if (new->first_key_behavior<first)
-		first = new->first_key_behavior;
-	    if (oldLast>newLast)
-		newLast= oldLast;
-	    old->first_key_behavior = first;
-	    old->num_key_behaviors = newLast-first+1;
-	}
-	else {
-	    old->first_key_behavior = new->first_key_behavior;
-	    old->num_key_behaviors = new->num_key_behaviors;
-	}
-    }
-    if (wanted&XkbVirtualModsMask) {
-	old->vmods|= new->vmods;
-    }
-    if (wanted&XkbExplicitComponentsMask) {
-	if (old->changed&XkbExplicitComponentsMask) {
-	    first = old->first_key_explicit;
-	    oldLast = old->first_key_explicit+old->num_key_explicit-1;
-	    newLast = new->first_key_explicit+new->num_key_explicit-1;
-
-	    if (new->first_key_explicit<first)
-		first = new->first_key_explicit;
-	    if (oldLast>newLast)
-		newLast= oldLast;
-	    old->first_key_explicit = first;
-	    old->num_key_explicit = newLast-first+1;
-	}
-	else {
-	    old->first_key_explicit = new->first_key_explicit;
-	    old->num_key_explicit = new->num_key_explicit;
-	}
-    }
-    if (wanted&XkbModifierMapMask) {
-	if (old->changed&XkbModifierMapMask) {
-	    first = old->first_modmap_key;
-	    oldLast = old->first_modmap_key+old->num_modmap_keys-1;
-	    newLast = new->first_modmap_key+new->num_modmap_keys-1;
-
-	    if (new->first_modmap_key<first)
-		first = new->first_modmap_key;
-	    if (oldLast>newLast)
-		newLast= oldLast;
-	    old->first_modmap_key = first;
-	    old->num_modmap_keys = newLast-first+1;
-	}
-	else {
-	    old->first_modmap_key = new->first_modmap_key;
-	    old->num_modmap_keys = new->num_modmap_keys;
-	}
-    }
-    if (wanted&XkbVirtualModMapMask) {
-	if (old->changed&XkbVirtualModMapMask) {
-	    first = old->first_vmodmap_key;
-	    oldLast = old->first_vmodmap_key+old->num_vmodmap_keys-1;
-	    newLast = new->first_vmodmap_key+new->num_vmodmap_keys-1;
-
-	    if (new->first_vmodmap_key<first)
-		first = new->first_vmodmap_key;
-	    if (oldLast>newLast)
-		newLast= oldLast;
-	    old->first_vmodmap_key = first;
-	    old->num_vmodmap_keys = newLast-first+1;
-	}
-	else {
-	    old->first_vmodmap_key = new->first_vmodmap_key;
-	    old->num_vmodmap_keys = new->num_vmodmap_keys;
-	}
-    }
-    old->changed|= wanted;
-    return;
-}
-
-void
-#if NeedFunctionPrototypes
-_XkbNoteCoreMapChanges(	XkbMapChangesPtr	 old,
-			XMappingEvent * 	new,
-			unsigned int 		wanted)
-#else
-_XkbNoteCoreMapChanges(old,new,wanted)
-    XkbMapChangesPtr	old;
-    XMappingEvent *	new;
-    unsigned int	wanted;
-#endif
-{
-    int first,oldLast,newLast;
-
-    if ((new->request==MappingKeyboard)&&(wanted&XkbKeySymsMask)) {
-	if (old->changed&XkbKeySymsMask) {
-	    first = old->first_key_sym;
-	    oldLast = old->first_key_sym+old->num_key_syms-1;
-	    newLast = new->first_keycode+new->count-1;
-
-	    if (new->first_keycode<first)
-		first = new->first_keycode;
-	    if (oldLast>newLast)
-		newLast= oldLast;
-	    old->first_key_sym = first;
-	    old->num_key_syms = newLast-first+1;
-	}
-	else {
-	    old->changed|= XkbKeySymsMask;
-	    old->first_key_sym = new->first_keycode;
-	    old->num_key_syms = new->count;
-	}
-    }
-    return;
-}
-
-static Bool
-#if NeedFunctionPrototypes
-wire_to_event(Display *dpy,XEvent *re,xEvent *event)
-#else
-wire_to_event(dpy,re,event)
-    Display *dpy;
-    XEvent *re;
-    xEvent *event;
-#endif
-{
-    xkbEvent *xkbevent= (xkbEvent *)event;
-    XkbInfoPtr xkbi;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    xkbi = dpy->xkb_info;
-    if (((event->u.u.type&0x7f)-xkbi->codes->first_event)!=XkbEventCode)
-	return False;
-
-    switch (xkbevent->u.any.xkbType) {
-	case XkbStateNotify:
-	    {
-		xkbStateNotify *sn = (xkbStateNotify *)event;
-		if ( xkbi->selected_events&XkbStateNotifyMask ) {
-		    XkbStateNotifyEvent *sev=(XkbStateNotifyEvent *)re;
-		    sev->type = XkbEventCode+xkbi->codes->first_event;
-		    sev->xkb_type = XkbStateNotify;
-		    sev->serial = _XSetLastRequestRead(dpy,
-					(xGenericReply *)event);
-		    sev->send_event = ((event->u.u.type & 0x80) != 0);
-		    sev->display = dpy;
-		    sev->time = sn->time; 
-		    sev->device = sn->deviceID;
-		    sev->keycode = sn->keycode;
-		    sev->event_type = sn->eventType;
-		    sev->req_major = sn->requestMajor;
-		    sev->req_minor = sn->requestMinor;
-		    sev->changed = sn->changed;
-		    sev->group = sn->group;
-		    sev->base_group = sn->baseGroup;
-		    sev->latched_group = sn->latchedGroup;
-		    sev->locked_group = sn->lockedGroup;
-		    sev->mods = sn->mods;
-		    sev->base_mods = sn->baseMods;
-		    sev->latched_mods = sn->latchedMods;
-		    sev->locked_mods = sn->lockedMods;
-		    sev->compat_state = sn->compatState;
-		    sev->grab_mods = sn->grabMods;
-		    sev->compat_grab_mods = sn->compatGrabMods;
-		    sev->lookup_mods = sn->lookupMods;
-		    sev->compat_lookup_mods = sn->compatLookupMods;
-		    sev->ptr_buttons = sn->ptrBtnState;
-		    return True;
-		}
-	    }
-	    break;
-	case XkbMapNotify:
-	    {
-		xkbMapNotify *mn = (xkbMapNotify *)event;
-		if ((xkbi->selected_events&XkbMapNotifyMask)&&
-				(xkbi->selected_map_details&mn->changed)) {
-		    XkbMapNotifyEvent *mev;
-		    mev =(XkbMapNotifyEvent *)re;
-		    mev->type = XkbEventCode+xkbi->codes->first_event;
-		    mev->xkb_type = XkbMapNotify;
-		    mev->serial = _XSetLastRequestRead(dpy,
-						(xGenericReply *)event);
-		    mev->send_event = ((event->u.u.type&0x80)!=0);
-		    mev->display = dpy;
-		    mev->time = mn->time;
-		    mev->device = mn->deviceID;
-		    mev->changed =  mn->changed;
-		    mev->min_key_code = mn->minKeyCode;
-		    mev->max_key_code = mn->maxKeyCode;
-		    mev->first_type = mn->firstType;
-		    mev->num_types = mn->nTypes;
-		    mev->first_key_sym = mn->firstKeySym;
-		    mev->num_key_syms = mn->nKeySyms;
-		    mev->first_key_act = mn->firstKeyAct;
-		    mev->num_key_acts = mn->nKeyActs;
-		    mev->first_key_behavior = mn->firstKeyBehavior;
-		    mev->num_key_behaviors = mn->nKeyBehaviors;
-		    mev->vmods = mn->virtualMods;
-		    mev->first_key_explicit = mn->firstKeyExplicit;
-		    mev->num_key_explicit = mn->nKeyExplicit;
-		    mev->first_modmap_key = mn->firstModMapKey;
-		    mev->num_modmap_keys = mn->nModMapKeys;
-		    mev->first_vmodmap_key = mn->firstVModMapKey;
-		    mev->num_vmodmap_keys = mn->nVModMapKeys;
-		    XkbNoteMapChanges(&xkbi->changes,mev,XKB_XLIB_MAP_MASK);
-		    if (xkbi->changes.changed)
-			xkbi->flags|= XkbMapPending;
-		    return True;
-		}
-		else if (mn->nKeySyms>0) {
-		    register XMappingEvent *ev = (XMappingEvent *)re;
-		    ev->type = MappingNotify;
-		    ev->serial = _XSetLastRequestRead(dpy,
-						(xGenericReply *)event);
-		    ev->send_event = ((event->u.u.type&0x80)!=0);
-		    ev->display = dpy;
-		    ev->window = 0;
-		    ev->first_keycode = mn->firstKeySym;
-		    ev->request = MappingKeyboard;
-		    ev->count = mn->nKeySyms;
-		    _XkbNoteCoreMapChanges(&xkbi->changes,ev,XKB_XLIB_MAP_MASK);
-		    if (xkbi->changes.changed)
-			xkbi->flags|= XkbMapPending;
-		    return True;
-		}
-	    }
-	    break;
-	case XkbControlsNotify:
-	    {
-		if (xkbi->selected_events&XkbControlsNotifyMask) {
-		    xkbControlsNotify *cn =(xkbControlsNotify *)event;
-		    XkbControlsNotifyEvent *cev;
-		    cev =(XkbControlsNotifyEvent *)re;
-		    cev->type = XkbEventCode+xkbi->codes->first_event;
-		    cev->xkb_type = XkbControlsNotify;
-		    cev->serial = _XSetLastRequestRead(dpy,
-						(xGenericReply *)event);
-		    cev->send_event = ((event->u.u.type&0x80)!=0);
-		    cev->display = dpy;
-		    cev->time = cn->time;
-		    cev->device = cn->deviceID;
-		    cev->changed_ctrls =  cn->changedControls;
-		    cev->enabled_ctrls =  cn->enabledControls;
-		    cev->enabled_ctrl_changes = cn->enabledControlChanges;
-		    cev->keycode = cn->keycode;
-		    cev->num_groups = cn->numGroups;
-		    cev->event_type = cn->eventType;
-		    cev->req_major = cn->requestMajor;
-		    cev->req_minor = cn->requestMinor;
-		    return True;
-		}
-	    }
-	    break;
-	case XkbIndicatorMapNotify:
-	    {
-		if (xkbi->selected_events&XkbIndicatorMapNotifyMask) {
-		    xkbIndicatorNotify *in =(xkbIndicatorNotify *)event;
-		    XkbIndicatorNotifyEvent *iev;
-		    iev =(XkbIndicatorNotifyEvent *)re;
-		    iev->type = XkbEventCode+xkbi->codes->first_event;
-		    iev->xkb_type = XkbIndicatorMapNotify;
-		    iev->serial = _XSetLastRequestRead(dpy,
-						(xGenericReply *)event);
-		    iev->send_event = ((event->u.u.type&0x80)!=0);
-		    iev->display = dpy;
-		    iev->time = in->time;
-		    iev->device = in->deviceID;
-		    iev->changed =  in->changed;
-		    iev->state=  in->state;
-		    return True;
-		}
-	    }
-	    break;
-	case XkbIndicatorStateNotify:
-	    {
-		if (xkbi->selected_events&XkbIndicatorStateNotifyMask) {
-		    xkbIndicatorNotify *in =(xkbIndicatorNotify *)event;
-		    XkbIndicatorNotifyEvent *iev;
-		    iev =(XkbIndicatorNotifyEvent *)re;
-		    iev->type = XkbEventCode+xkbi->codes->first_event;
-		    iev->xkb_type = XkbIndicatorStateNotify;
-		    iev->serial = _XSetLastRequestRead(dpy,
-						(xGenericReply *)event);
-		    iev->send_event = ((event->u.u.type&0x80)!=0);
-		    iev->display = dpy;
-		    iev->time = in->time;
-		    iev->device = in->deviceID;
-		    iev->changed =  in->changed;
-		    iev->state=  in->state;
-		    return True;
-		}
-	    }
-	    break;
-	case XkbBellNotify:
-	    {
-		if (xkbi->selected_events&XkbBellNotifyMask) {
-		    xkbBellNotify *bn =(xkbBellNotify *)event;
-		    XkbBellNotifyEvent *bev;
-		    bev =(XkbBellNotifyEvent *)re;
-		    bev->type = XkbEventCode+xkbi->codes->first_event;
-		    bev->xkb_type = XkbBellNotify;
-		    bev->serial = _XSetLastRequestRead(dpy,
-						(xGenericReply *)event);
-		    bev->send_event = ((event->u.u.type&0x80)!=0);
-		    bev->display = dpy;
-		    bev->time = bn->time;
-		    bev->device = bn->deviceID;
-		    bev->percent = bn->percent;
-		    bev->pitch = bn->pitch;
-		    bev->duration = bn->duration;
-		    bev->bell_class = bn->bellClass;
-		    bev->bell_id = bn->bellID;
-		    bev->name = bn->name;
-		    bev->window = bn->window;
-		    bev->event_only = bn->eventOnly;
-		    return True;
-		}
-	    }
-	    break;
-	case XkbAccessXNotify:
-	    {
-		if (xkbi->selected_events&XkbAccessXNotifyMask) {
-		    xkbAccessXNotify *axn =(xkbAccessXNotify *)event;
-		    XkbAccessXNotifyEvent *axev;
-		    axev =(XkbAccessXNotifyEvent *)re;
-		    axev->type = XkbEventCode+xkbi->codes->first_event;
-		    axev->xkb_type = XkbAccessXNotify;
-		    axev->serial = _XSetLastRequestRead(dpy,
-						(xGenericReply *)event);
-		    axev->send_event = ((event->u.u.type&0x80)!=0);
-		    axev->display = dpy;
-		    axev->time = axn->time;
-		    axev->device = axn->deviceID;
-		    axev->detail = axn->detail;
-		    axev->keycode = axn->keycode;
-		    axev->sk_delay = axn->slowKeysDelay;
-		    axev->debounce_delay = axn->debounceDelay;
-		    return True;
-		}
-	    }
-	    break;
-	case XkbNamesNotify:
-	    {
-		if (xkbi->selected_events&XkbNamesNotifyMask) {
-		    xkbNamesNotify *nn =(xkbNamesNotify *)event;
-		    XkbNamesNotifyEvent *nev;
-		    nev =(XkbNamesNotifyEvent *)re;
-		    nev->type = XkbEventCode+xkbi->codes->first_event;
-		    nev->xkb_type = XkbNamesNotify;
-		    nev->serial = _XSetLastRequestRead(dpy,
-						(xGenericReply *)event);
-		    nev->send_event = ((event->u.u.type&0x80)!=0);
-		    nev->display = dpy;
-		    nev->time = nn->time;
-		    nev->device = nn->deviceID;
-		    nev->changed = nn->changed;
-		    nev->first_type = nn->firstType;
-		    nev->num_types = nn->nTypes;
-		    nev->first_lvl = nn->firstLevelName;
-		    nev->num_lvls = nn->nLevelNames;
-		    nev->num_aliases = nn->nAliases;
-		    nev->num_radio_groups = nn->nRadioGroups;
-		    nev->changed_vmods = nn->changedVirtualMods;
-		    nev->changed_groups = nn->changedGroupNames;
-		    nev->changed_indicators = nn->changedIndicators;
-		    nev->first_key = nn->firstKey;
-		    nev->num_keys = nn->nKeys;
-		    return True;
-		}
-	    }
-	    break;
-	case XkbCompatMapNotify:
-	    {
-		if (xkbi->selected_events&XkbCompatMapNotifyMask) {
-		    xkbCompatMapNotify *cmn =(xkbCompatMapNotify *)event;
-		    XkbCompatMapNotifyEvent *cmev;
-		    cmev =(XkbCompatMapNotifyEvent *)re;
-		    cmev->type = XkbEventCode+xkbi->codes->first_event;
-		    cmev->xkb_type = XkbCompatMapNotify;
-		    cmev->serial = _XSetLastRequestRead(dpy,
-						(xGenericReply *)event);
-		    cmev->send_event = ((event->u.u.type&0x80)!=0);
-		    cmev->display = dpy;
-		    cmev->time = cmn->time;
-		    cmev->device = cmn->deviceID;
-		    cmev->changed_groups = cmn->changedGroups;
-		    cmev->first_si = cmn->firstSI;
-		    cmev->num_si = cmn->nSI;
-		    cmev->num_total_si = cmn->nTotalSI;
-		    return True;
-		}
-	    }
-	    break;
-	case XkbActionMessage:
-	    {
-		if (xkbi->selected_events&XkbActionMessageMask) {
-		    xkbActionMessage *am= (xkbActionMessage *)event;
-		    XkbActionMessageEvent *amev;
-		    amev= (XkbActionMessageEvent *)re;
-		    amev->type = XkbEventCode+xkbi->codes->first_event;
-		    amev->xkb_type = XkbActionMessage;
-		    amev->serial = _XSetLastRequestRead(dpy,
-						(xGenericReply *)event);
-		    amev->send_event = ((event->u.u.type&0x80)!=0);
-		    amev->display = dpy;
-		    amev->time = am->time;
-		    amev->device = am->deviceID;
-		    amev->keycode = am->keycode;
-		    amev->press = am->press;
-		    amev->key_event_follows = am->keyEventFollows;
-		    amev->group = am->group;
-		    amev->mods = am->mods;
-		    memcpy(amev->message,am->message,XkbActionMessageLength);
-		    amev->message[XkbActionMessageLength]= '\0';
-		    return True;
-		}
-	    }
-	    break;
-	case XkbExtensionDeviceNotify:
-	    {
-		if (xkbi->selected_events&XkbExtensionDeviceNotifyMask) {
-		    xkbExtensionDeviceNotify *ed=
-					(xkbExtensionDeviceNotify *)event;
-		    XkbExtensionDeviceNotifyEvent *edev;
-		    edev= (XkbExtensionDeviceNotifyEvent *)re;
-		    edev->type= XkbEventCode+xkbi->codes->first_event;
-		    edev->xkb_type= XkbExtensionDeviceNotify;
-		    edev->serial= _XSetLastRequestRead(dpy,
-						(xGenericReply *)event);
-		    edev->send_event= ((event->u.u.type&0x80)!=0);
-		    edev->display= dpy;
-		    edev->time= ed->time;
-		    edev->device= ed->deviceID;
-		    edev->led_class= ed->ledClass;
-		    edev->led_id= ed->ledID;
-		    edev->reason= ed->reason;
-		    edev->supported= ed->supported;
-		    edev->leds_defined= ed->ledsDefined;
-		    edev->led_state= ed->ledState;
-		    edev->first_btn= ed->firstBtn;
-		    edev->num_btns= ed->nBtns;
-		    edev->unsupported= ed->unsupported;
-		    return True;
-		}
-	    }
-	    break;
-	case XkbNewKeyboardNotify:
-	    {
-		xkbNewKeyboardNotify *nkn = (xkbNewKeyboardNotify *)event;
-		if ((xkbi->selected_events&XkbNewKeyboardNotifyMask)&&
-				    (xkbi->selected_nkn_details&nkn->changed)) {
-		    XkbNewKeyboardNotifyEvent *nkev;
-		    nkev =(XkbNewKeyboardNotifyEvent *)re;
-		    nkev->type = XkbEventCode+xkbi->codes->first_event;
-		    nkev->xkb_type = XkbNewKeyboardNotify;
-		    nkev->serial = _XSetLastRequestRead(dpy,
-						(xGenericReply *)event);
-		    nkev->send_event = ((event->u.u.type&0x80)!=0);
-		    nkev->display = dpy;
-		    nkev->time = nkn->time;
-		    nkev->device = nkn->deviceID;
-		    nkev->old_device = nkn->oldDeviceID;
-		    nkev->min_key_code = nkn->minKeyCode;
-		    nkev->max_key_code = nkn->maxKeyCode;
-		    nkev->old_min_key_code = nkn->oldMinKeyCode;
-		    nkev->old_max_key_code = nkn->oldMaxKeyCode;
-		    nkev->req_major = nkn->requestMajor;
-		    nkev->req_minor = nkn->requestMinor;
-		    nkev->changed = nkn->changed;
-		    if ((xkbi->desc)&&(nkev->send_event==0)&&
-			((xkbi->desc->device_spec==nkev->old_device)||
-			 (nkev->device!=nkev->old_device))) {
-			xkbi->flags= XkbMapPending|XkbXlibNewKeyboard;
-		    }
-		    return True;
-		}
-		else if(nkn->changed&(XkbNKN_KeycodesMask|XkbNKN_DeviceIDMask)){
-		    register XMappingEvent *ev = (XMappingEvent *)re;
-		    ev->type = MappingNotify;
-		    ev->serial = _XSetLastRequestRead(dpy,
-						(xGenericReply *)event);
-		    ev->send_event = ((event->u.u.type&0x80)!=0);
-		    ev->display = dpy;
-		    ev->window = 0;
-		    ev->first_keycode = dpy->min_keycode;
-		    ev->request = MappingKeyboard;
-		    ev->count = (dpy->max_keycode-dpy->min_keycode)+1;
-		    if ((xkbi->desc)&&(ev->send_event==0)&&
-			((xkbi->desc->device_spec==nkn->oldDeviceID)||
-			 (nkn->deviceID!=nkn->oldDeviceID))) {
-			xkbi->flags|= XkbMapPending|XkbXlibNewKeyboard;
-		    }
-		    return True;
-		}
-	    }
-	    break;
-	default:
-#ifdef DEBUG
-	    fprintf(stderr,"Got unknown XKEYBOARD event (%d, base=%d)\n",
-						re->type,
-						xkbi->codes->first_event);
-#endif
-	    break;
-    }
-    return False;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbIgnoreExtension(Bool ignore)
-#else
-XkbIgnoreExtension(ignore)
-    Bool ignore;
-#endif
-{
-    if (getenv("XKB_FORCE")!=NULL) {
-#ifdef DEBUG
-	fprintf(stderr,"Forcing use of XKEYBOARD (overriding an IgnoreExtensions)\n");
-#endif
-	return False;
-    }
-#ifdef DEBUG
-    else if (getenv("XKB_DEBUG")!=NULL) {
-	fprintf(stderr,"Explicitly %signoring XKEYBOARD\n",ignore?"":"not ");
-    }
-#endif
-    _XkbIgnoreExtension = ignore;
-    return True;
-}
-
-static void
-#if NeedFunctionPrototypes
-_XkbFreeInfo(Display *dpy)
-#else
-_XkbFreeInfo(dpy)
-    Display *dpy;
-#endif
-{
-    XkbInfoPtr xkbi = dpy->xkb_info;
-    if (xkbi) {
-	if (xkbi->desc)
-	    XkbFreeKeyboard(xkbi->desc,XkbAllComponentsMask,True);
-	Xfree(xkbi);
-      }
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbUseExtension(Display *dpy,int *major_rtrn,int *minor_rtrn)
-#else
-XkbUseExtension(dpy,major_rtrn,minor_rtrn)
-    Display *	dpy;
-    int *	major_rtrn;
-    int *	minor_rtrn;
-#endif
-{
-    xkbUseExtensionReply rep;
-    register xkbUseExtensionReq *req;
-    XExtCodes		*codes;
-    int	ev_base,forceIgnore;
-    XkbInfoPtr xkbi;
-    char *	str;
-    static int debugMsg;
-    static int been_here= 0;
-
-    if ( dpy->xkb_info ) {
-	if (major_rtrn)	*major_rtrn= dpy->xkb_info->srv_major;
-	if (minor_rtrn)	*minor_rtrn= dpy->xkb_info->srv_minor;
-	return True;
-    }
-    if (!been_here) {
-	debugMsg= (getenv("XKB_DEBUG")!=NULL);
-	been_here= 1;
-    }
-
-    if (major_rtrn)	*major_rtrn= 0;
-    if (minor_rtrn)	*minor_rtrn= 0;
-
-    forceIgnore= (dpy->flags&XlibDisplayNoXkb)||dpy->keysyms;
-    forceIgnore= forceIgnore&(major_rtrn==NULL)&&(minor_rtrn==NULL);
-    if ( forceIgnore || _XkbIgnoreExtension || getenv("XKB_DISABLE")) {
-	LockDisplay(dpy);
-	dpy->flags |= XlibDisplayNoXkb;
-	UnlockDisplay(dpy);
-	if (debugMsg)
-	    fprintf(stderr,"XKEYBOARD extension disabled or missing\n");
-	return False;
-    }
-
-    xkbi = _XkbTypedCalloc(1, XkbInfoRec);
-    if ( !xkbi )
-	return False;
-
-    if ( (codes=XInitExtension(dpy,XkbName))==NULL ) {
-	LockDisplay(dpy);
-	dpy->flags |= XlibDisplayNoXkb;
-	UnlockDisplay(dpy);
-	Xfree(xkbi);
-	if (debugMsg)
-	    fprintf(stderr,"XKEYBOARD extension not present\n");
-	return False;
-    }
-    xkbi->codes = codes;
-    LockDisplay(dpy);
-
-    GetReq(kbUseExtension, req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbUseExtension;
-    req->wantedMajor = XkbMajorVersion;
-    req->wantedMinor = XkbMinorVersion;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse) || !rep.supported ) {
-	Bool	fail;
-	fail= True;
-	if (debugMsg)
-	    fprintf(stderr,
-		"XKEYBOARD version mismatch (want %d.%02d, got %d.%02d)\n", 
-		XkbMajorVersion,XkbMinorVersion,
-		rep.serverMajor, rep.serverMinor);
-
-	/* pre-release 0.65 is very close to 1.00 */
-	if ((rep.serverMajor==0)&&(rep.serverMinor==65)) {
-	    if (debugMsg)
-		fprintf(stderr,"Trying to fall back to version 0.65...");
-	    GetReq(kbUseExtension, req);
-	    req->reqType = xkbi->codes->major_opcode;
-	    req->xkbReqType = X_kbUseExtension;
-	    req->wantedMajor = 0;
-	    req->wantedMinor = 65;
-	    if ( _XReply(dpy, (xReply *)&rep, 0, xFalse) && rep.supported ) {
-		if (debugMsg)
-		    fprintf(stderr,"succeeded\n");
-		fail= False;
-	    }
-	    else if (debugMsg) fprintf(stderr,"failed\n");
-	}
-	if (fail) {
-	    dpy->flags |= XlibDisplayNoXkb;
-	    UnlockDisplay(dpy);
-	    SyncHandle();
-	    Xfree(xkbi);
-	    if (major_rtrn)	*major_rtrn= rep.serverMajor;
-	    if (minor_rtrn) *minor_rtrn= rep.serverMinor;
-	    return False;
-	}
-    }
-#ifdef DEBUG
-    else if ( forceIgnore ) {
-	fprintf(stderr,"Internal Error!  XkbUseExtension succeeded with forceIgnore set\n");
-    }
-#endif
-    UnlockDisplay(dpy);
-    xkbi->srv_major= rep.serverMajor;
-    xkbi->srv_minor= rep.serverMinor;
-    if (major_rtrn)	*major_rtrn= rep.serverMajor;
-    if (minor_rtrn)	*minor_rtrn= rep.serverMinor;
-    if (debugMsg)
-	fprintf(stderr,"XKEYBOARD (version %d.%02d/%d.%02d) OK!\n",
-				XkbMajorVersion,XkbMinorVersion,
-				rep.serverMajor,rep.serverMinor);
-    dpy->xkb_info = xkbi;
-    dpy->free_funcs->xkb = _XkbFreeInfo;
-    ev_base = codes->first_event;
-    xkbi->xlib_ctrls|= 
-	(XkbLC_BeepOnComposeFail|XkbLC_ComposeLED|XkbLC_ControlFallback);
-    if ((str=getenv("_XKB_OPTIONS_ENABLE"))!=NULL) {
-	if ((str=getenv("_XKB_LATIN1_LOOKUP"))!=NULL) {
-	    if ((strcmp(str,"off")==0)||(strcmp(str,"0")==0))
-		 xkbi->xlib_ctrls&= ~XkbLC_ForceLatin1Lookup;
-	    else xkbi->xlib_ctrls|= XkbLC_ForceLatin1Lookup;
-	}
-	if ((str=getenv("_XKB_CONSUME_LOOKUP_MODS"))!=NULL) {
-	    if ((strcmp(str,"off")==0)||(strcmp(str,"0")==0))
-		 xkbi->xlib_ctrls&= ~XkbLC_ConsumeLookupMods;
-	    else xkbi->xlib_ctrls|= XkbLC_ConsumeLookupMods;
-	}
-	if ((str=getenv("_XKB_CONSUME_SHIFT_AND_LOCK"))!=NULL) {
-	    if ((strcmp(str,"off")==0)||(strcmp(str,"0")==0))
-		 xkbi->xlib_ctrls&= ~XkbLC_AlwaysConsumeShiftAndLock;
-	    else xkbi->xlib_ctrls|= XkbLC_AlwaysConsumeShiftAndLock;
-	}
-	if ((str=getenv("_XKB_IGNORE_NEW_KEYBOARDS"))!=NULL) {
-	    if ((strcmp(str,"off")==0)||(strcmp(str,"0")==0))
-		 xkbi->xlib_ctrls&= ~XkbLC_IgnoreNewKeyboards;
-	    else xkbi->xlib_ctrls|= XkbLC_IgnoreNewKeyboards;
-	}
-	if ((str=getenv("_XKB_CONTROL_FALLBACK"))!=NULL) {
-	    if ((strcmp(str,"off")==0)||(strcmp(str,"0")==0))
-		 xkbi->xlib_ctrls&= ~XkbLC_ControlFallback;
-	    else xkbi->xlib_ctrls|= XkbLC_ControlFallback;
-	}
-	if ((str=getenv("_XKB_COMP_LED"))!=NULL) {
-	    if ((strcmp(str,"off")==0)||(strcmp(str,"0")==0))
-		 xkbi->xlib_ctrls&= ~XkbLC_ComposeLED;
-	    else {
-		xkbi->xlib_ctrls|= XkbLC_ComposeLED;
-		if (strlen(str)>0)
-		    xkbi->composeLED= XInternAtom(dpy,str,False);
-	    }
-	}
-	if ((str=getenv("_XKB_COMP_FAIL_BEEP"))!=NULL) {
-	    if ((strcmp(str,"off")==0)||(strcmp(str,"0")==0))
-		 xkbi->xlib_ctrls&= ~XkbLC_BeepOnComposeFail;
-	    else xkbi->xlib_ctrls|= XkbLC_BeepOnComposeFail;
-	}
-    }
-    if ((xkbi->composeLED==None)&&((xkbi->xlib_ctrls&XkbLC_ComposeLED)!=0))
-	xkbi->composeLED= XInternAtom(dpy,"Compose",False);
-#ifdef DEBUG
-    if (debugMsg) {
-	register unsigned c= xkbi->xlib_ctrls;
-	fprintf(stderr,"XKEYBOARD compose: beep on failure is %s, LED is %s\n",
-		((c&XkbLC_BeepOnComposeFail)?"on":"off"),
-		((c&XkbLC_ComposeLED)?"on":"off"));
-	fprintf(stderr,"XKEYBOARD XLookupString: %slatin-1, %s lookup modifiers\n",
-		((c&XkbLC_ForceLatin1Lookup)?"allow non-":"force "),
-		((c&XkbLC_ConsumeLookupMods)?"consume":"re-use"));
-	fprintf(stderr,
-	    "XKEYBOARD XLookupString: %sconsume shift and lock, %scontrol fallback\n",
-	    ((c&XkbLC_AlwaysConsumeShiftAndLock)?"always ":"don't "),
-	    ((c&XkbLC_ControlFallback)?"":"no "));
-
-    }
-#endif
-    XESetWireToEvent(dpy,ev_base+XkbEventCode,wire_to_event);
-    SyncHandle();
-    return True;
-}
-
diff --git a/xc/lib/X11/XKBleds.c b/xc/lib/X11/XKBleds.c
deleted file mode 100644
index 4d368e0b3..000000000
--- a/xc/lib/X11/XKBleds.c
+++ /dev/null
@@ -1,408 +0,0 @@
-/* $XConsortium: XKBleds.c /main/6 1996/01/14 16:43:58 kaleb $ */
-/************************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-
-#define NEED_REPLIES
-#define NEED_EVENTS
-#include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
-#include "XKBlibint.h"
-
-Status
-#if NeedFunctionPrototypes
-XkbGetIndicatorState(Display *dpy,unsigned deviceSpec,unsigned *pStateRtrn)
-#else
-XkbGetIndicatorState(dpy,deviceSpec,pStateRtrn)
-    Display *		dpy;
-    unsigned int	deviceSpec;
-    unsigned int *	pStateRtrn;
-#endif
-{
-    register xkbGetIndicatorStateReq *req;
-    xkbGetIndicatorStateReply	rep;
-    XkbInfoPtr xkbi;
-    Bool ok;
-    
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return BadAccess;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbGetIndicatorState, req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbGetIndicatorState;
-    req->deviceSpec = deviceSpec;
-    ok=_XReply(dpy, (xReply *)&rep, 0, xFalse);
-    if (ok && (pStateRtrn!=NULL))
-	*pStateRtrn= rep.state;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return (ok?Success:BadImplementation);
-}
-
-Status	
-#if NeedFunctionPrototypes
-_XkbReadGetIndicatorMapReply(	Display *			dpy,
-				xkbGetIndicatorMapReply *	rep,
-				XkbDescPtr			xkb,
-				int	*			nread_rtrn)
-#else
-_XkbReadGetIndicatorMapReply(dpy,rep,xkb,nread_rtrn)
-    Display *			dpy;
-    xkbGetIndicatorMapReply *	rep;
-    XkbDescPtr			xkb;
-    int	*			nread_rtrn;
-#endif
-{
-XkbIndicatorPtr		leds;
-XkbReadBufferRec	buf;
-
-    if ((!xkb->indicators)&&(XkbAllocIndicatorMaps(xkb)!=Success))
-	return BadAlloc;
-    leds= xkb->indicators;
-
-    leds->phys_indicators = rep->realIndicators;
-    if (rep->length>0) {
-	register int left;
-	if (!_XkbInitReadBuffer(dpy,&buf,(int)rep->length*4))
-	    return BadAlloc;
-	if (nread_rtrn)
-	    *nread_rtrn= (int)rep->length*4;
-	if (rep->which) {
-	    register int i,bit;
-	    left= (int)rep->which;
-	    for (i=0,bit=1;(i<XkbNumIndicators)&&(left);i++,bit<<=1) {
-		if (left&bit) {
-		    xkbIndicatorMapWireDesc *wire;
-		    wire= (xkbIndicatorMapWireDesc *)
-			  _XkbGetReadBufferPtr(&buf,
-					SIZEOF(xkbIndicatorMapWireDesc));
-		    if (wire==NULL) {
-			_XkbFreeReadBuffer(&buf);
-			return BadAlloc;
-		    }
-		    leds->maps[i].flags= wire->flags;
-		    leds->maps[i].which_groups= wire->whichGroups;
-		    leds->maps[i].groups= wire->groups;
-		    leds->maps[i].which_mods= wire->whichMods;
-		    leds->maps[i].mods.mask= wire->mods;
-		    leds->maps[i].mods.real_mods= wire->realMods;
-		    leds->maps[i].mods.vmods= wire->virtualMods;
-		    leds->maps[i].ctrls= wire->ctrls;
-		    left&= ~bit;
-		}
-	    }
-	}
-	left= _XkbFreeReadBuffer(&buf);
-    }
-    return Success;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbGetIndicatorMap(Display *dpy,unsigned long which,XkbDescPtr xkb)
-#else
-XkbGetIndicatorMap(dpy,which,xkb)
-    Display *		dpy;
-    unsigned long 	which;
-    XkbDescPtr		xkb;
-#endif
-{
-    register xkbGetIndicatorMapReq *	req;
-    xkbGetIndicatorMapReply 		rep;
-    XkbInfoPtr 				xkbi;
-    Status				status;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return BadAccess;
-    if ((!which)||(!xkb))
-	return BadValue;
-
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    if (!xkb->indicators) {
-	xkb->indicators = _XkbTypedCalloc(1,XkbIndicatorRec);
-	if (!xkb->indicators) {
-	    UnlockDisplay(dpy);
-	    SyncHandle();
-	    return BadAlloc;
-	}
-    }
-    GetReq(kbGetIndicatorMap, req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbGetIndicatorMap;
-    req->deviceSpec = xkb->device_spec;
-    req->which = (CARD32)which;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return BadValue;
-    }
-    status= _XkbReadGetIndicatorMapReply(dpy,&rep,xkb,NULL);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return status;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbSetIndicatorMap(Display *dpy,unsigned long which,XkbDescPtr xkb)
-#else
-XkbSetIndicatorMap(dpy,which,xkb)
-    Display *		dpy;
-    unsigned long 	which;
-    XkbDescPtr		xkb;
-#endif
-{
-    register xkbSetIndicatorMapReq	*req;
-    register int i,bit;
-    int nMaps;
-    xkbIndicatorMapWireDesc *wire;
-    XkbInfoPtr xkbi;
-
-    if ((dpy->flags & XlibDisplayNoXkb) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    if ((!xkb)||(!which)||(!xkb->indicators))
-	return False;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbSetIndicatorMap, req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbSetIndicatorMap;
-    req->deviceSpec = xkb->device_spec;
-    req->which = (CARD32)which;
-    for (i=nMaps=0,bit=1;i<32;i++,bit<<=1) {
-	if (which&bit)
-	    nMaps++;
-    }
-    req->length+= (nMaps*sizeof(XkbIndicatorMapRec))/4;
-    BufAlloc(xkbIndicatorMapWireDesc *,wire,
-				       (nMaps*SIZEOF(xkbIndicatorMapWireDesc)));
-    for (i=0,bit=1;i<32;i++,bit<<=1) {
-	if (which&bit) {
-	    wire->flags= xkb->indicators->maps[i].flags;
-	    wire->whichGroups= xkb->indicators->maps[i].which_groups;
-	    wire->groups= xkb->indicators->maps[i].groups;
-	    wire->whichMods= xkb->indicators->maps[i].which_mods;
-	    wire->mods= xkb->indicators->maps[i].mods.real_mods;
-	    wire->virtualMods= xkb->indicators->maps[i].mods.vmods;
-	    wire->ctrls= xkb->indicators->maps[i].ctrls;
-	    wire++;
-	}
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbGetNamedDeviceIndicator(	Display *		dpy,
-				unsigned		device,
-				unsigned		class,
-				unsigned		id,
-				Atom			name,
-				int	*		pNdxRtrn,
-    				Bool *			pStateRtrn,
-				XkbIndicatorMapPtr	pMapRtrn,
-				Bool *			pRealRtrn)
-#else
-XkbGetNamedDeviceIndicator(dpy,device,class,id,name,pNdxRtrn,pStateRtrn,
-							pMapRtrn,pRealRtrn)
-    Display *		dpy;
-    unsigned		device;
-    unsigned		class;
-    unsigned		id;
-    Atom		name;
-    int	*		pNdxRtrn;
-    Bool *		pStateRtrn;
-    XkbIndicatorMapPtr	pMapRtrn;
-    Bool *		pRealRtrn;
-#endif
-{
-    register xkbGetNamedIndicatorReq *req;
-    xkbGetNamedIndicatorReply	rep;
-    XkbInfoPtr xkbi;
-    
-    if ((dpy->flags & XlibDisplayNoXkb) || (name==None) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
-	return False;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbGetNamedIndicator, req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbGetNamedIndicator;
-    req->deviceSpec = device;
-    req->ledClass = class;
-    req->ledID = id;
-    req->indicator = (CARD32)name;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-    if ((!rep.found)||(!rep.supported))
-	return False;
-    if (pNdxRtrn!=NULL)
-	*pNdxRtrn= rep.ndx;
-    if (pStateRtrn!=NULL)
-	*pStateRtrn= rep.on;
-    if (pMapRtrn!=NULL) {
-	pMapRtrn->flags= rep.flags;
-	pMapRtrn->which_groups= rep.whichGroups;
-	pMapRtrn->groups= rep.groups;
-	pMapRtrn->which_mods= rep.whichMods;
-	pMapRtrn->mods.mask= rep.mods;
-	pMapRtrn->mods.real_mods= rep.realMods;
-	pMapRtrn->mods.vmods= rep.virtualMods;
-	pMapRtrn->ctrls= rep.ctrls;
-    }
-    if (pRealRtrn!=NULL) 
-	*pRealRtrn= rep.realIndicator;
-    return True;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbGetNamedIndicator(	Display *		dpy,
-			Atom			name,
-			int	*		pNdxRtrn,
-    			Bool *			pStateRtrn,
-			XkbIndicatorMapPtr	pMapRtrn,
-			Bool *			pRealRtrn)
-#else
-XkbGetNamedIndicator(dpy,name,pNdxRtrn,pStateRtrn,pMapRtrn,pRealRtrn)
-    Display *		dpy;
-    Atom		name;
-    int	*		pNdxRtrn;
-    Bool *		pStateRtrn;
-    XkbIndicatorMapPtr	pMapRtrn;
-    Bool *		pRealRtrn;
-#endif
-{
-    return XkbGetNamedDeviceIndicator(dpy,XkbUseCoreKbd,
-					  XkbDfltXIClass,XkbDfltXIId,
-					  name,pNdxRtrn,pStateRtrn,
-					  pMapRtrn,pRealRtrn);
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbSetNamedDeviceIndicator(	Display *		dpy,
-				unsigned		device,
-				unsigned		class,
-				unsigned		id,
-				Atom			name,
-				Bool			changeState,
-				Bool			state,
-				Bool			createNewMap,
-				XkbIndicatorMapPtr	pMap)
-#else
-XkbSetNamedDeviceIndicator(dpy,device,class,id,name,changeState,
-							state,createNewMap,pMap)
-    Display *		dpy;
-    unsigned		device;
-    unsigned		class;
-    unsigned		id;
-    Atom		name;
-    Bool		changeState;
-    Bool		state;
-    Bool		createNewMap;
-    XkbIndicatorMapPtr	pMap;
-#endif
-{
-    register xkbSetNamedIndicatorReq	*req;
-    XkbInfoPtr xkbi;
-
-    if ((dpy->flags & XlibDisplayNoXkb) || (name==None) ||
-	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)) ||
-	(pMap==NULL))
-	return False;
-    LockDisplay(dpy);
-    xkbi = dpy->xkb_info;
-    GetReq(kbSetNamedIndicator, req);
-    req->reqType = xkbi->codes->major_opcode;
-    req->xkbReqType = X_kbSetNamedIndicator;
-    req->deviceSpec = device;
-    req->ledClass = class;
-    req->ledID = id;
-    req->indicator= (CARD32)name;
-    req->setState= changeState;
-    if (req->setState)
-	 req->on= state;
-    else req->on= False;
-    if (pMap!=NULL) {
-	req->setMap= True;
-	req->createMap= createNewMap;
-	req->flags= pMap->flags;
-	req->whichGroups= pMap->which_groups;
-	req->groups= pMap->groups;
-	req->whichMods= pMap->which_mods;
-	req->realMods= pMap->mods.real_mods;
-	req->virtualMods= pMap->mods.vmods;
-	req->ctrls= pMap->ctrls;
-    }
-    else {
-	req->setMap= 		False;
-	req->createMap= 	False;
-	req->flags= 		0;
-	req->whichGroups= 	0;
-	req->groups= 		0;
-	req->whichMods= 	0;
-	req->realMods= 		0;
-	req->virtualMods= 	0;
-	req->ctrls=		0;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-Bool
-#if NeedFunctionPrototypes
-XkbSetNamedIndicator(	Display *		dpy,
-			Atom			name,
-			Bool			changeState,
-			Bool			state,
-			Bool			createNewMap,
-			XkbIndicatorMapPtr	pMap)
-#else
-XkbSetNamedIndicator(dpy,name,changeState,state,createNewMap,pMap)
-    Display *		dpy;
-    Atom		name;
-    Bool		changeState;
-    Bool		state;
-    Bool		createNewMap;
-    XkbIndicatorMapPtr	pMap;
-#endif
-{
-    return XkbSetNamedDeviceIndicator(dpy,XkbUseCoreKbd,
-					  XkbDfltXIClass,XkbDfltXIId,
-					  name,changeState,state,
-					  createNewMap,pMap);
-}
diff --git a/xc/lib/X11/XKBlib.h b/xc/lib/X11/XKBlib.h
deleted file mode 100644
index 333d132e1..000000000
--- a/xc/lib/X11/XKBlib.h
+++ /dev/null
@@ -1,1350 +0,0 @@
-/* $TOG: XKBlib.h /main/18 1997/12/12 09:03:32 kaleb $ */
-/************************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-
-#ifndef _XKBLIB_H_
-#define _XKBLIB_H_
-
-#include <X11/extensions/XKBstr.h>
-
-typedef struct _XkbAnyEvent {
-	int 		type;		/* XkbAnyEvent */
-	unsigned long 	serial;		/* # of last req processed by server */
-	Bool 		send_event;	/* is this from a SendEvent request? */
-	Display *	display;	/* Display the event was read from */
-	Time 		time;		/* milliseconds */
-	int 		xkb_type;	/* XKB event minor code */
-	unsigned int 	device;		/* device ID */
-} XkbAnyEvent;
-
-typedef struct _XkbNewKeyboardNotify {
-	int 		type;		/* XkbAnyEvent */
-	unsigned long 	serial;		/* of last req processed by server */
-	Bool 		send_event;	/* is this from a SendEvent request? */
-	Display *	display;	/* Display the event was read from */
-	Time 		time;		/* milliseconds */
-	int 		xkb_type;	/* XkbNewKeyboardNotify */
-	int	 	device;		/* device ID */
-	int	 	old_device;	/* device ID of previous keyboard */
-	int	 	min_key_code;	/* minimum key code */
-	int		max_key_code;	/* maximum key code */
-	int	 	old_min_key_code;/* min key code of previous kbd */
-	int		old_max_key_code;/* max key code of previous kbd */
-	unsigned int	changed;	/* changed aspects of the keyboard */
-	char	 	req_major;	/* major and minor opcode of req */
-	char	 	req_minor;	/* that caused change, if applicable */
-} XkbNewKeyboardNotifyEvent;
-
-typedef struct _XkbMapNotifyEvent {
-	int 		type;		/* XkbAnyEvent */
-	unsigned long 	serial;		/* of last req processed by server */
-	Bool 		send_event;	/* is this from a SendEvent request */
-	Display *	display;	/* Display the event was read from */
-	Time 		time;		/* milliseconds */
-	int 		xkb_type;	/* XkbMapNotify */
-	int 		device;		/* device ID */
-	unsigned int 	changed;	/* fields which have been changed */
-	unsigned int 	flags;		/* reserved */
-	int 		first_type;	/* first changed key type */
-	int 		num_types;	/* number of changed key types */
-	KeyCode		min_key_code;
-	KeyCode		max_key_code;
-	KeyCode		first_key_sym;
-	KeyCode		first_key_act;
-	KeyCode		first_key_behavior;
-	KeyCode		first_key_explicit;
-	KeyCode		first_modmap_key;  
-	KeyCode		first_vmodmap_key;
-	int		num_key_syms;
-	int		num_key_acts;
-	int		num_key_behaviors;
-	int		num_key_explicit;
-	int 		num_modmap_keys;
-	int 		num_vmodmap_keys;
-	unsigned int 	vmods;		/* mask of changed virtual mods */
-} XkbMapNotifyEvent;
-
-typedef struct _XkbStateNotifyEvent {
-	int 		type;		/* XkbAnyEvent */
-	unsigned long 	serial;		/* # of last req processed by server */
-	Bool 		send_event;	/* is this from a SendEvent request? */
-	Display *	display;	/* Display the event was read from */
-	Time 		time;		/* milliseconds */
-	int 		xkb_type;	/* XkbStateNotify */
-	int 		device;		/* device ID */
-	unsigned int 	changed;	/* mask of changed state components */
-	int 		group;		/* keyboard group */
-	int 		base_group;	/* base keyboard group */
-	int 		latched_group;	/* latched keyboard group */
-	int 		locked_group;	/* locked keyboard group */
-	unsigned int	mods;		/* modifier state */
-	unsigned int 	base_mods;	/* base modifier state */
-	unsigned int	latched_mods;	/* latched modifiers */
-	unsigned int	locked_mods;	/* locked modifiers */
-	int 		compat_state;	/* compatibility state */
-	unsigned char	grab_mods;	/* mods used for grabs */
-	unsigned char	compat_grab_mods;/* grab mods for non-XKB clients */
-	unsigned char	lookup_mods;	/* mods sent to clients */
-	unsigned char	compat_lookup_mods; /* mods sent to non-XKB clients */
-	int 		ptr_buttons;	/* pointer button state */
-	KeyCode		keycode;	/* keycode that caused the change */
-	char 		event_type;	/* KeyPress or KeyRelease */
-	char 		req_major;	/* Major opcode of request */
-	char 		req_minor;	/* Minor opcode of request */
-} XkbStateNotifyEvent;
-
-typedef struct _XkbControlsNotify {
-	int 		type;		/* XkbAnyEvent */
-	unsigned long 	serial;		/* of last req processed by server */
-	Bool 		send_event;	/* is this from a SendEvent request? */
-	Display *	display;	/* Display the event was read from */
-	Time 		time;		/* milliseconds */
-	int 		xkb_type;	/* XkbControlsNotify */
-	int 		device;		/* device ID */
-	unsigned int	changed_ctrls;	/* controls with changed sub-values */
-	unsigned int 	enabled_ctrls;	/* controls currently enabled */
-	unsigned int	enabled_ctrl_changes;/* controls just {en,dis}abled */
-	int 		num_groups;	/* total groups on keyboard */
-	KeyCode		keycode;	/* key that caused change or 0 */
-	char 		event_type;	/* type of event that caused change */
-	char 		req_major;	/* if keycode==0, major and minor */
-	char 		req_minor;	/* opcode of req that caused change */
-} XkbControlsNotifyEvent;
-
-typedef struct _XkbIndicatorNotify {
-	int 		type;		/* XkbAnyEvent */
-	unsigned long 	serial;		/* of last req processed by server */
-	Bool 		send_event;	/* is this from a SendEvent request? */
-	Display *	display;	/* Display the event was read from */
-	Time 		time;		/* milliseconds */
-	int 		xkb_type;	/* XkbIndicatorNotify */
-	int 		device;		/* device ID */
-	unsigned int	changed;	/* indicators with new state or map */
-	unsigned int	state;	 	/* current state of all indicators */
-} XkbIndicatorNotifyEvent;
-
-typedef struct _XkbNamesNotify {
-	int 		type;		/* XkbAnyEvent */
-	unsigned long 	serial;		/* of last req processed by server */
-	Bool 		send_event;	/* is this from a SendEvent request? */
-	Display *	display;	/* Display the event was read from */
-	Time 		time;		/* milliseconds */
-	int 		xkb_type;	/* XkbNamesNotify */
-	int	 	device;		/* device ID */
-	unsigned int 	changed;	/* names that have changed */
-	int	 	first_type;	/* first key type with new name */
-	int	 	num_types;	/* number of key types with new names */
-	int	 	first_lvl;	/* first key type new new level names */
-	int	 	num_lvls;	/* # of key types w/new level names */
-	int	 	num_aliases;	/* total number of key aliases*/
-	int	 	num_radio_groups;/* total number of radio groups */
-	unsigned int 	changed_vmods;	/* virtual modifiers with new names */
-	unsigned int 	changed_groups;	/* groups with new names */
-	unsigned int 	changed_indicators;/* indicators with new names */
-	int		first_key;	/* first key with new name */
-	int		num_keys;	/* number of keys with new names */
-} XkbNamesNotifyEvent;
-
-typedef struct _XkbCompatMapNotify {
-	int 		type;		/* XkbAnyEvent */
-	unsigned long 	serial;		/* of last req processed by server */
-	Bool 		send_event;	/* is this from a SendEvent request? */
-	Display *	display;	/* Display the event was read from */
-	Time 		time;		/* milliseconds */
-	int 		xkb_type;	/* XkbCompatMapNotify */
-	int	 	device;		/* device ID */
-	unsigned int 	changed_groups; /* groups with new compat maps */
-	int	 	first_si;	/* first new symbol interp */
-	int	 	num_si;		/* number of new symbol interps */
-	int	 	num_total_si;	/* total # of symbol interps */
-} XkbCompatMapNotifyEvent;
-
-typedef struct _XkbBellNotify {
-	int 		type;		/* XkbAnyEvent */
-	unsigned long 	serial;		/* of last req processed by server */
-	Bool 		send_event;	/* is this from a SendEvent request? */
-	Display *	display;	/* Display the event was read from */
-	Time 		time;		/* milliseconds */
-	int 		xkb_type;	/* XkbBellNotify */
-	int	 	device;		/* device ID */
-	int	 	percent;	/* requested volume as a % of maximum */
-	int	 	pitch;		/* requested pitch in Hz */
-	int	 	duration;	/* requested duration in useconds */
-	int	 	bell_class;	/* (input extension) feedback class */
-	int	 	bell_id;	/* (input extension) ID of feedback */
-	Atom 		name;		/* "name" of requested bell */
-	Window 		window;		/* window associated with event */
-	Bool		event_only;	/* "event only" requested */
-} XkbBellNotifyEvent;
-
-typedef struct _XkbActionMessage {
-	int 		type;		/* XkbAnyEvent */
-	unsigned long 	serial;		/* of last req processed by server */
-	Bool 		send_event;	/* is this from a SendEvent request? */
-	Display *	display;	/* Display the event was read from */
-	Time 		time;		/* milliseconds */
-	int 		xkb_type;	/* XkbActionMessage */
-	int	 	device;		/* device ID */
-	KeyCode		keycode;	/* key that generated the event */
-	Bool 		press;		/* true if act caused by key press */
-	Bool 		key_event_follows;/* true if key event also generated */
-	int		group;		/* effective group */
-	unsigned int	mods;		/* effective mods */
-	char 		message[XkbActionMessageLength+1]; 
-					/* message -- leave space for NUL */
-} XkbActionMessageEvent;
-
-typedef struct _XkbAccessXNotify {
-	int 		type;		/* XkbAnyEvent */
-	unsigned long 	serial;		/* of last req processed by server */
-	Bool 		send_event;	/* is this from a SendEvent request? */
-	Display *	display;	/* Display the event was read from */
-	Time 		time;		/* milliseconds */
-	int 		xkb_type;	/* XkbAccessXNotify */
-	int	 	device;		/* device ID */
-	int	 	detail;		/* XkbAXN_* */
-	int	 	keycode;	/* key of event */
-	int	 	sk_delay;	/* current slow keys delay */
-	int		debounce_delay;	/* current debounce delay */
-} XkbAccessXNotifyEvent;
-
-typedef struct _XkbExtensionDeviceNotify {
-	int 		type;		/* XkbAnyEvent */
-	unsigned long 	serial;		/* of last req processed by server */
-	Bool 		send_event;	/* is this from a SendEvent request? */
-	Display *	display;	/* Display the event was read from */
-	Time 		time;		/* milliseconds */
-	int 		xkb_type;	/* XkbExtensionDeviceNotify */
-	int	 	device;		/* device ID */
-	unsigned int	reason;		/* reason for the event */	
-	unsigned int	supported;	/* mask of supported features */	
-	unsigned int	unsupported;	/* mask of unsupported features */
-					/* that some app tried to use */
-	int	 	first_btn;	/* first button that changed */
-	int	 	num_btns;	/* range of buttons changed */
-	unsigned int	leds_defined;   /* indicators with names or maps */
-	unsigned int	led_state;	/* current state of the indicators */
-	int		led_class;	/* feedback class for led changes */
-	int		led_id;   	/* feedback id for led changes */
-} XkbExtensionDeviceNotifyEvent;
-
-typedef union _XkbEvent {
-	int				type;
-	XkbAnyEvent			any;
-	XkbNewKeyboardNotifyEvent	new_kbd;
-	XkbMapNotifyEvent		map;
-	XkbStateNotifyEvent		state;
-	XkbControlsNotifyEvent		ctrls;
-	XkbIndicatorNotifyEvent 	indicators;
-	XkbNamesNotifyEvent		names;
-	XkbCompatMapNotifyEvent		compat;
-	XkbBellNotifyEvent		bell;
-	XkbActionMessageEvent		message;
-	XkbAccessXNotifyEvent		accessx;
-	XkbExtensionDeviceNotifyEvent 	device;
-	XEvent				core;
-} XkbEvent;
-
-typedef struct	_XkbKbdDpyState	XkbKbdDpyStateRec,*XkbKbdDpyStatePtr;
-
-	/* XkbOpenDisplay error codes */
-#define	XkbOD_Success		0
-#define	XkbOD_BadLibraryVersion	1
-#define	XkbOD_ConnectionRefused	2
-#define	XkbOD_NonXkbServer	3
-#define	XkbOD_BadServerVersion	4
-
-	/* Values for XlibFlags */
-#define	XkbLC_ForceLatin1Lookup		(1<<0)
-#define	XkbLC_ConsumeLookupMods		(1<<1)
-#define	XkbLC_AlwaysConsumeShiftAndLock (1<<2)
-#define	XkbLC_IgnoreNewKeyboards	(1<<3)
-#define	XkbLC_ControlFallback		(1<<4)
-#define	XkbLC_ConsumeKeysOnComposeFail	(1<<29)
-#define	XkbLC_ComposeLED		(1<<30)
-#define	XkbLC_BeepOnComposeFail		(1<<31)
-
-#define	XkbLC_AllComposeControls	(0xc0000000)
-#define	XkbLC_AllControls		(0xc000001f)
-
-_XFUNCPROTOBEGIN
-
-extern	Bool	XkbIgnoreExtension(
-#if NeedFunctionPrototypes
-	Bool			/* ignore */
-#endif
-);
-
-extern	Display *XkbOpenDisplay(
-#if NeedFunctionPrototypes
-	char *			/* name */,
-	int *			/* ev_rtrn */,
-	int *			/* err_rtrn */,
-	int *			/* major_rtrn */,
-	int *			/* minor_rtrn */,
-	int *			/* reason */
-#endif
-);
-
-extern	Bool	XkbQueryExtension(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	int *			/* opcodeReturn */,
-	int *			/* eventBaseReturn */,
-	int *			/* errorBaseReturn */,
-	int *			/* majorRtrn */,
-	int *			/* minorRtrn */
-#endif
-);
-
-extern	Bool	XkbUseExtension(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	int *			/* major_rtrn */,
-	int *			/* minor_rtrn */
-#endif
-);
-
-extern	Bool	XkbLibraryVersion(
-#if NeedFunctionPrototypes
-	int *			/* libMajorRtrn */,
-	int *			/* libMinorRtrn */
-#endif
-);
-
-extern	unsigned int	XkbSetXlibControls(
-#if NeedFunctionPrototypes
-	Display*		/* dpy */,
-	unsigned int		/* affect */,
-	unsigned int		/* values */
-#endif
-);
-
-extern	unsigned int	XkbGetXlibControls(
-#if NeedFunctionPrototypes
-	Display*		/* dpy */
-#endif
-);
-
-typedef	Atom	(*XkbInternAtomFunc)(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	_Xconst char *		/* name */,
-	Bool			/* only_if_exists */
-#endif
-);
-
-typedef char *	(*XkbGetAtomNameFunc)(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	Atom			/* atom */
-#endif
-);
-
-extern void		XkbSetAtomFuncs(
-#if NeedFunctionPrototypes
-	XkbInternAtomFunc	/* getAtom */,
-	XkbGetAtomNameFunc	/* getName */
-#endif
-);
-
-extern	KeySym XkbKeycodeToKeysym(
-#if NeedFunctionPrototypes
-		Display *	/* dpy */,
-#if NeedWidePrototypes
-		 unsigned int 	/* kc */,
-#else
-		 KeyCode 	/* kc */,
-#endif
-		 int 		/* group */,
-		 int		/* level */
-#endif
-);
-
-extern	unsigned int	XkbKeysymToModifiers(
-#if NeedFunctionPrototypes
-    Display *			/* dpy */,
-    KeySym 			/* ks */
-#endif
-);
-
-extern	Bool		XkbLookupKeySym(
-#if NeedFunctionPrototypes
-    Display *			/* dpy */,
-    KeyCode 			/* keycode */,
-    unsigned int 		/* modifiers */,
-    unsigned int *		/* modifiers_return */,
-    KeySym *			/* keysym_return */
-#endif
-);
-
-extern	int		XkbLookupKeyBinding(
-#if NeedFunctionPrototypes
-    Display *			/* dpy */,
-    KeySym 			/* sym_rtrn */,
-    unsigned int 		/* mods */,
-    char *			/* buffer */,
-    int 			/* nbytes */,
-    int * 			/* extra_rtrn */
-#endif
-);
-
-extern	Bool		XkbTranslateKeyCode(
-#if NeedFunctionPrototypes
-    XkbDescPtr			/* xkb */,
-    KeyCode 			/* keycode */,
-    unsigned int 		/* modifiers */,
-    unsigned int *		/* modifiers_return */,
-    KeySym *			/* keysym_return */
-#endif
-);
-
-extern	int		XkbTranslateKeySym(
-#if NeedFunctionPrototypes
-    Display *			/* dpy */,
-    register KeySym *		/* sym_return */,
-    unsigned int 		/* modifiers */,
-    char *			/* buffer */,
-    int 			/* nbytes */,
-    int *			/* extra_rtrn */
-#endif
-);
-
-extern	Bool	XkbSetAutoRepeatRate(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int		/* deviceSpec */,
-	unsigned int		/* delay */,
-	unsigned int		/* interval */
-#endif
-);
-
-extern	Bool	XkbGetAutoRepeatRate(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int		/* deviceSpec */,
-	unsigned int *		/* delayRtrn */,
-	unsigned int *		/* intervalRtrn */
-#endif
-);
-
-extern	Bool	XkbChangeEnabledControls(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int		/* deviceSpec */,
-	unsigned int		/* affect */,
-	unsigned int		/* values */
-#endif
-);
-
-extern	Bool	XkbDeviceBell(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	Window			/* win */,
-	int			/* deviceSpec */,
-	int			/* bellClass */,
-	int			/* bellID */,
-	int			/* percent */,
-	Atom			/* name */
-#endif
-);
-
-extern	Bool	XkbForceDeviceBell(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	int			/* deviceSpec */,
-	int			/* bellClass */,
-	int			/* bellID */,
-	int			/* percent */
-#endif
-);
-
-extern	Bool	XkbDeviceBellEvent(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	Window			/* win */,
-	int			/* deviceSpec */,
-	int			/* bellClass */,
-	int			/* bellID */,
-	int			/* percent */,
-	Atom			/* name */
-#endif
-);
-
-extern	Bool	XkbBell(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	Window			/* win */,
-	int			/* percent */,
-	Atom			/* name */
-#endif
-);
-
-extern	Bool	XkbForceBell(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	int			/* percent */
-#endif
-);
-
-extern	Bool	XkbBellEvent(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	Window			/* win */,
-	int			/* percent */,
-	Atom			/* name */
-#endif
-);
-
-extern	Bool	XkbSelectEvents(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int		/* deviceID */,
-	unsigned int 		/* affect */,
-	unsigned int 		/* values */
-#endif
-);
-
-extern	Bool	XkbSelectEventDetails(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int 		/* deviceID */,
-	unsigned int 		/* eventType */,
-	unsigned long 		/* affect */,
-	unsigned long 		/* details */
-#endif
-);
-
-extern	void	XkbNoteMapChanges(
-#if NeedFunctionPrototypes
-    XkbMapChangesPtr		/* old */,
-    XkbMapNotifyEvent	*	/* new */,
-    unsigned int	 	/* wanted */
-#endif
-);
-
-extern	void	XkbNoteNameChanges(
-#if NeedFunctionPrototypes
-    XkbNameChangesPtr		/* old */,
-    XkbNamesNotifyEvent	*	/* new */,
-    unsigned int	 	/* wanted */
-#endif
-);
-
-extern	Status	XkbGetIndicatorState(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int		/* deviceSpec */,
-	unsigned int *		/* pStateRtrn */
-#endif
-);
-
-extern	Status	XkbGetDeviceIndicatorState(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int		/* deviceSpec */,
-	unsigned int		/* ledClass */,
-	unsigned int		/* ledID */,
-	unsigned int *		/* pStateRtrn */
-#endif
-);
-
-extern	Status	 XkbGetIndicatorMap(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned long		/* which */,
-	XkbDescPtr		/* desc */
-#endif
-);
-
-extern	Bool	 XkbSetIndicatorMap(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned long 		/* which */,
-	XkbDescPtr		/* desc */
-#endif
-);
-
-#define	XkbNoteIndicatorMapChanges(o,n,w) \
-				((o)->map_changes|=((n)->map_changes&(w)))
-#define	XkbNoteIndicatorStateChanges(o,n,w)\
-				((o)->state_changes|=((n)->state_changes&(w)))
-#define	XkbGetIndicatorMapChanges(d,x,c) \
-				(XkbGetIndicatorMap((d),(c)->map_changes,x)
-#define	XkbChangeIndicatorMaps(d,x,c) \
-				(XkbSetIndicatorMap((d),(c)->map_changes,x))
-
-extern	Bool	XkbGetNamedIndicator(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	Atom			/* name */,
-	int *			/* pNdxRtrn */,
-	Bool *			/* pStateRtrn */,
-	XkbIndicatorMapPtr	/* pMapRtrn */,
-	Bool *			/* pRealRtrn */
-#endif
-);
-
-extern	Bool	XkbGetNamedDeviceIndicator(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int		/* deviceSpec */,
-	unsigned int		/* ledClass */,
-	unsigned int		/* ledID */,
-	Atom			/* name */,
-	int *			/* pNdxRtrn */,
-	Bool *			/* pStateRtrn */,
-	XkbIndicatorMapPtr	/* pMapRtrn */,
-	Bool *			/* pRealRtrn */
-#endif
-);
-
-extern	Bool	XkbSetNamedIndicator(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	Atom			/* name */,
-	Bool			/* changeState */,
-	Bool 			/* state */,
-	Bool			/* createNewMap */,
-	XkbIndicatorMapPtr	/* pMap */
-#endif
-);
-
-extern	Bool	XkbSetNamedDeviceIndicator(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int		/* deviceSpec */,
-	unsigned int		/* ledClass */,
-	unsigned int		/* ledID */,
-	Atom			/* name */,
-	Bool			/* changeState */,
-	Bool 			/* state */,
-	Bool			/* createNewMap */,
-	XkbIndicatorMapPtr	/* pMap */
-#endif
-);
-
-extern	Bool	XkbLockModifiers(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int 		/* deviceSpec */,
-	unsigned int 		/* affect */,
-	unsigned int 		/* values */
-#endif
-);
-
-extern	Bool	XkbLatchModifiers(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int 		/* deviceSpec */,
-	unsigned int 		/* affect */,
-	unsigned int 		/* values */
-#endif
-);
-
-extern	Bool	XkbLockGroup(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int 		/* deviceSpec */,
-	unsigned int 		/* group */
-#endif
-);
-
-extern	Bool	XkbLatchGroup(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int 		/* deviceSpec */,
-	unsigned int 		/* group */
-#endif
-);
-
-extern	Bool	XkbSetServerInternalMods(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int 		/* deviceSpec */,
-	unsigned int 		/* affectReal */,
-	unsigned int 		/* realValues */,
-	unsigned int		/* affectVirtual */,
-	unsigned int		/* virtualValues */
-#endif
-);
-
-extern	Bool	XkbSetIgnoreLockMods(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int 		/* deviceSpec */,
-	unsigned int 		/* affectReal */,
-	unsigned int 		/* realValues */,
-	unsigned int		/* affectVirtual */,
-	unsigned int		/* virtualValues */
-#endif
-);
-
-
-extern	Bool	XkbVirtualModsToReal(
-#if NeedFunctionPrototypes
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* virtual_mask */,
-	unsigned int *		/* mask_rtrn */
-#endif
-);
-
-extern	Bool	XkbComputeEffectiveMap(
-#if NeedFunctionPrototypes
-	XkbDescPtr 		/* xkb */,
-	XkbKeyTypePtr		/* type */,
-	unsigned char *		/* map_rtrn */
-#endif
-);
-
-extern	Status XkbInitCanonicalKeyTypes(
-#if NeedFunctionPrototypes
-    XkbDescPtr			/* xkb */,
-    unsigned int		/* which */,
-    int				/* keypadVMod */
-#endif
-);
-
-extern	XkbDescPtr XkbAllocKeyboard(
-#if NeedFunctionPrototypes
-	void
-#endif
-);
-
-extern	void	XkbFreeKeyboard(
-#if NeedFunctionPrototypes
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which */,
-	Bool			/* freeDesc */
-#endif
-);
-
-extern	Status XkbAllocClientMap(
-#if NeedFunctionPrototypes
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which */,
-	unsigned int		/* nTypes */
-#endif
-);
-
-extern	Status XkbAllocServerMap(
-#if NeedFunctionPrototypes
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which */,
-	unsigned int		/* nActions */
-#endif
-);
-
-extern	void	XkbFreeClientMap(
-#if NeedFunctionPrototypes
-    XkbDescPtr			/* xkb */,
-    unsigned int		/* what */,
-    Bool			/* freeMap */
-#endif
-);
-
-extern	void	XkbFreeServerMap(
-#if NeedFunctionPrototypes
-    XkbDescPtr			/* xkb */,
-    unsigned int		/* what */,
-    Bool			/* freeMap */
-#endif
-);
-
-extern	XkbKeyTypePtr	XkbAddKeyType(
-#if NeedFunctionPrototypes
-    XkbDescPtr			/* xkb */,
-    Atom			/* name */,
-    int				/* map_count */,
-    Bool			/* want_preserve */,
-    int				/* num_lvls */
-#endif
-);
-
-extern	Status XkbAllocIndicatorMaps(
-#if NeedFunctionPrototypes
-	XkbDescPtr		/* xkb */
-#endif
-);
-
-extern	void XkbFreeIndicatorMaps(
-#if NeedFunctionPrototypes
-    XkbDescPtr			/* xkb */
-#endif
-);
-
-extern	XkbDescPtr XkbGetMap(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int 		/* which */,
-	unsigned int 		/* deviceSpec */
-#endif
-);
-
-extern	Status	XkbGetUpdatedMap(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int 		/* which */,
-	XkbDescPtr		/* desc */
-#endif
-);
-
-extern	Status	XkbGetMapChanges(
-#if NeedFunctionPrototypes
-    Display *			/* dpy */,
-    XkbDescPtr			/* xkb */,
-    XkbMapChangesPtr		/* changes */
-#endif
-);
-
-
-extern	Status	XkbRefreshKeyboardMapping(
-#if NeedFunctionPrototypes
-    XkbMapNotifyEvent *		/* event */
-#endif
-);
-
-extern	Status	XkbGetKeyTypes(
-#if NeedFunctionPrototypes
-    Display *			/* dpy */,
-    unsigned int		/* first */,
-    unsigned int 		/* num */,
-    XkbDescPtr			/* xkb */
-#endif
-);
-
-extern	Status	XkbGetKeySyms(
-#if NeedFunctionPrototypes
-    Display *			/* dpy */,
-    unsigned int		/* first */,
-    unsigned int		/* num */,
-    XkbDescPtr			/* xkb */
-#endif
-);
-
-extern	Status	XkbGetKeyActions(
-#if NeedFunctionPrototypes
-    Display *			/* dpy */,
-    unsigned int 		/* first */,
-    unsigned int 		/* num */,
-    XkbDescPtr			/* xkb */
-#endif
-);
-
-extern	Status	XkbGetKeyBehaviors(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int 		/* firstKey */,
-	unsigned int		/* nKeys */,
-	XkbDescPtr		/* desc */
-#endif
-);
-
-extern	Status	XkbGetVirtualMods(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int 		/* which */,
-	XkbDescPtr		/* desc */
-#endif
-);
-
-extern	Status	XkbGetKeyExplicitComponents(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int 		/* firstKey */,
-	unsigned int		/* nKeys */,
-	XkbDescPtr		/* desc */
-#endif
-);
-
-extern	Status	XkbGetKeyModifierMap(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int 		/* firstKey */,
-	unsigned int		/* nKeys */,
-	XkbDescPtr		/* desc */
-#endif
-);
-
-extern	Status	XkbAllocControls(
-#if NeedFunctionPrototypes
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which*/
-#endif
-);
-
-extern	void	XkbFreeControls(
-#if NeedFunctionPrototypes
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which */,
-	Bool			/* freeMap */
-#endif
-);
-
-extern	Status	XkbGetControls(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned long		/* which */,
-	XkbDescPtr		/* desc */
-#endif
-);
-
-extern	Bool	XkbSetControls(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned long		/* which */,
-	XkbDescPtr		/* desc */
-#endif
-);
-
-extern	void	XkbNoteControlsChanges(
-#if NeedFunctionPrototypes
-    XkbControlsChangesPtr	/* old */,
-    XkbControlsNotifyEvent *	/* new */,
-    unsigned int	 	/* wanted */
-#endif
-);
-
-#define	XkbGetControlsChanges(d,x,c)	XkbGetControls(d,(c)->changed_ctrls,x)
-#define	XkbChangeControls(d,x,c)	XkbSetControls(d,(c)->changed_ctrls,x)
-
-extern	Status	XkbAllocCompatMap(
-#if NeedFunctionPrototypes
-    XkbDescPtr			/* xkb */,
-    unsigned int		/* which */,
-    unsigned int		/* nInterpret */
-#endif
-);
-
-extern	void	XkbFreeCompatMap(
-#if NeedFunctionPrototypes
-    XkbDescPtr			/* xkb */,
-    unsigned int		/* which */,
-    Bool			/* freeMap */
-#endif
-);
-
-extern Status XkbGetCompatMap(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int 		/* which */,
-	XkbDescPtr 		/* xkb */
-#endif
-);
-
-extern Bool XkbSetCompatMap(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int 		/* which */,
-	XkbDescPtr 		/* xkb */,
-	Bool			/* updateActions */
-#endif
-);
-
-extern	XkbSymInterpretPtr XkbAddSymInterpret(
-#if NeedFunctionPrototypes
-	XkbDescPtr		/* xkb */,
-	XkbSymInterpretPtr	/* si */,
-	Bool			/* updateMap */,
-	XkbChangesPtr		/* changes */
-#endif
-);
-
-extern	Status XkbAllocNames(
-#if NeedFunctionPrototypes
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which */,
-	int			/* nTotalRG */,
-	int			/* nTotalAliases */
-#endif
-);
-
-extern	Status	XkbGetNames(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int		/* which */,
-	XkbDescPtr		/* desc */
-#endif
-);
-
-extern	Bool	XkbSetNames(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int		/* which */,
-	unsigned int		/* firstType */,
-	unsigned int		/* nTypes */,
-	XkbDescPtr		/* desc */
-#endif
-);
-
-extern	Bool	XkbChangeNames(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	XkbDescPtr		/* xkb */,
-	XkbNameChangesPtr	/* changes */
-#endif
-);
-
-extern	void XkbFreeNames(
-#if NeedFunctionPrototypes
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which */,
-	Bool			/* freeMap */
-#endif
-);
-
-
-extern	Status	XkbGetState(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int 		/* deviceSpec */,
-	XkbStatePtr		/* rtrnState */
-#endif
-);
-
-extern	Bool	XkbSetMap(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int		/* which */,
-	XkbDescPtr		/* desc */
-#endif
-);
-
-extern	Bool	XkbChangeMap(
-#if NeedFunctionPrototypes
-	Display*		/* dpy */,
-	XkbDescPtr		/* desc */,
-	XkbMapChangesPtr	/* changes */
-#endif
-);
-
-extern	Bool	XkbSetDetectableAutoRepeat(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	Bool			/* detectable */,
-	Bool *			/* supported */
-#endif
-);
-
-extern	Bool	XkbGetDetectableAutoRepeat(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	Bool *			/* supported */
-#endif
-);
-
-extern	Bool	XkbSetAutoResetControls(
-#if NeedFunctionPrototypes
-    Display *			/* dpy */,
-    unsigned int 		/* changes */,
-    unsigned int *		/* auto_ctrls */,
-    unsigned int *		/* auto_values */
-#endif
-);
-
-extern	Bool	XkbGetAutoResetControls(
-#if NeedFunctionPrototypes
-    Display *			/* dpy */,
-    unsigned int *		/* auto_ctrls */,
-    unsigned int *		/* auto_ctrl_values */
-#endif
-);
-
-extern	Bool	XkbSetPerClientControls(
-#if NeedFunctionPrototypes
-    Display *			/* dpy */,
-    unsigned int		/* change */,
-    unsigned int *		/* values */
-#endif
-);
-
-extern	Bool	XkbGetPerClientControls(
-#if NeedFunctionPrototypes
-    Display *			/* dpy */,
-    unsigned int *		/* ctrls */
-#endif
-);
-
-extern Status XkbCopyKeyType(
-#if NeedFunctionPrototypes
-    XkbKeyTypePtr	/* from */,
-    XkbKeyTypePtr	/* into */
-#endif
-);
-
-extern Status XkbCopyKeyTypes(
-#if NeedFunctionPrototypes
-    XkbKeyTypePtr	/* from */,
-    XkbKeyTypePtr	/* into */,
-    int			/* num_types */
-#endif
-);
-
-extern	Status	XkbResizeKeyType(
-#if NeedFunctionPrototypes
-    XkbDescPtr		/* xkb */,
-    int			/* type_ndx */,
-    int			/* map_count */,
-    Bool		/* want_preserve */,
-    int			/* new_num_lvls */
-#endif
-);
-
-extern	KeySym *XkbResizeKeySyms(
-#if NeedFunctionPrototypes
-	XkbDescPtr		/* desc */,
-	int 			/* forKey */,
-	int 			/* symsNeeded */
-#endif
-);
-
-extern	XkbAction *XkbResizeKeyActions(
-#if NeedFunctionPrototypes
-	XkbDescPtr		/* desc */,
-	int 			/* forKey */,
-	int 			/* actsNeeded */
-#endif
-);
-
-extern	Status XkbChangeTypesOfKey(
-#if NeedFunctionPrototypes
-	XkbDescPtr		/* xkb */,
-	int 			/* key */,
-	int			/* num_groups */,
-	unsigned int		/* groups */,
-	int *			/* newTypes */,
-	XkbMapChangesPtr	/* pChanges */
-#endif
-);
-
-/***====================================================================***/
-
-extern	XkbComponentListPtr	XkbListComponents(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int		/* deviceSpec */,
-	XkbComponentNamesPtr	/* ptrns */,
-	int *			/* max_inout */
-#endif
-);
-
-extern	void XkbFreeComponentList(
-#if NeedFunctionPrototypes
-	XkbComponentListPtr	/* list */
-#endif
-);
-
-extern	XkbDescPtr XkbGetKeyboard(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int 		/* which */,
-	unsigned int 		/* deviceSpec */
-#endif
-);
-
-extern XkbDescPtr XkbGetKeyboardByName(
-#if NeedFunctionPrototypes
-    Display *			/* dpy */,
-    unsigned int		/* deviceSpec */,
-    XkbComponentNamesPtr	/* names */,
-    unsigned int 		/* want */,
-    unsigned int 		/* need */,
-    Bool			/* load */
-#endif
-);
-
-/***====================================================================***/
-
-extern	int	XkbKeyTypesForCoreSymbols(	/* returns # of groups */
-#if NeedFunctionPrototypes
-    XkbDescPtr	/* xkb */,			/* keyboard device */
-    int		/* map_width */,		/* width of core KeySym array */
-    KeySym *	/* core_syms */,		/* always mapWidth symbols */
-    unsigned int	/* protected */,	/* explicit key types */
-    int *	/* types_inout */,		/* always four type indices */
-    KeySym * 	/* xkb_syms_rtrn */		/* must have enough space */
-#endif
-);
-
-extern	Bool	XkbApplyCompatMapToKey(	/* False only on error */
-#if NeedFunctionPrototypes
-    XkbDescPtr		/* xkb */,		/* keymap to be edited */
-    KeyCode		/* key */,		/* key to be updated */
-    XkbChangesPtr	/* changes */		/* resulting changes to map */
-#endif
-);
-
-extern	Bool	XkbUpdateMapFromCore( /* False only on error */
-#if NeedFunctionPrototypes
-    XkbDescPtr		/* xkb */,		/* XKB keyboard to be edited */
-    KeyCode		/* first_key */,	/* first changed key */
-    int			/* num_keys */, 	/* number of changed keys */
-    int			/* map_width */,	/* width of core keymap */
-    KeySym *		/* core_keysyms */,	/* symbols from core keymap */
-    XkbChangesPtr	/* changes */		/* resulting changes */
-#endif
-);
-
-/***====================================================================***/
-
-extern	XkbDeviceLedInfoPtr	XkbAddDeviceLedInfo(
-#if NeedFunctionPrototypes
-	XkbDeviceInfoPtr	/* devi */,
-	unsigned int		/* ledClass */,
-	unsigned int		/* ledId */
-#endif
-);
-
-extern	Status			XkbResizeDeviceButtonActions(
-#if NeedFunctionPrototypes
-	XkbDeviceInfoPtr	/* devi */,
-	unsigned int		/* newTotal */
-#endif
-);
-
-extern	XkbDeviceInfoPtr	XkbAllocDeviceInfo(
-#if NeedFunctionPrototypes
-	unsigned int		/* deviceSpec */,
-	unsigned int		/* nButtons */,
-	unsigned int		/* szLeds */
-#endif
-);
-
-extern	void XkbFreeDeviceInfo(
-#if NeedFunctionPrototypes
-	XkbDeviceInfoPtr	/* devi */,
-	unsigned int		/* which */,
-	Bool			/* freeDevI */
-#endif
-);
-
-extern	void	XkbNoteDeviceChanges(
-#if NeedFunctionPrototypes
-    XkbDeviceChangesPtr			/* old */,
-    XkbExtensionDeviceNotifyEvent *	/* new */,
-    unsigned int	 		/* wanted */
-#endif
-);
-
-extern	XkbDeviceInfoPtr XkbGetDeviceInfo(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int 		/* which */,
-	unsigned int		/* deviceSpec */,
-	unsigned int		/* ledClass */,
-	unsigned int		/* ledID */
-#endif
-);
-
-extern	Status	XkbGetDeviceInfoChanges(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	XkbDeviceInfoPtr	/* devi */,
-	XkbDeviceChangesPtr 	/* changes */
-#endif
-);
-
-extern	Status	XkbGetDeviceButtonActions(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	XkbDeviceInfoPtr	/* devi */,
-	Bool			/* all */,
-	unsigned int		/* first */,
-	unsigned int		/* nBtns */
-#endif
-);
-
-extern	Status	XkbGetDeviceLedInfo(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	XkbDeviceInfoPtr	/* devi */,
-	unsigned int		/* ledClass (class, XIDflt, XIAll) */,
-	unsigned int		/* ledId (id, XIDflt, XIAll) */,
-	unsigned int		/* which (XkbXI_Indicator{Names,Map}Mask */
-#endif
-);
-
-extern	Bool	XkbSetDeviceInfo(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned int		/* which */,
-	XkbDeviceInfoPtr	/* devi */
-#endif
-);
-
-extern	Bool	XkbChangeDeviceInfo(
-#if NeedFunctionPrototypes
-	Display*		/* dpy */,
-	XkbDeviceInfoPtr	/* desc */,
-	XkbDeviceChangesPtr	/* changes */
-#endif
-);
-
-extern  Bool XkbSetDeviceLedInfo(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	XkbDeviceInfoPtr	/* devi */,
-	unsigned int 		/* ledClass */,
-	unsigned int		/* ledID */,
-	unsigned int		/* which */
-#endif
-);
-
-extern	Bool XkbSetDeviceButtonActions(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	XkbDeviceInfoPtr	/* devi */,
-	unsigned int		/* first */,
-	unsigned int		/* nBtns */
-#endif
-);
-
-/***====================================================================***/
-
-extern	char	XkbToControl(
-#if NeedFunctionPrototypes
-	char		/* c */
-#endif
-);
-
-/***====================================================================***/
-
-extern	Bool XkbSetDebuggingFlags(
-#if NeedFunctionPrototypes
-    Display *		/* dpy */,
-    unsigned int	/* mask */,
-    unsigned int	/* flags */,
-    char *		/* msg */,
-    unsigned int	/* ctrls_mask */,
-    unsigned int	/* ctrls */,
-    unsigned int *	/* rtrn_flags */,
-    unsigned int *	/* rtrn_ctrls */
-#endif
-);
-
-_XFUNCPROTOEND
-
-#endif /* _XKBLIB_H_ */
diff --git a/xc/lib/X11/XKBlibint.h b/xc/lib/X11/XKBlibint.h
deleted file mode 100644
index 2945fc7cc..000000000
--- a/xc/lib/X11/XKBlibint.h
+++ /dev/null
@@ -1,407 +0,0 @@
-/* $TOG: XKBlibint.h /main/15 1997/06/10 06:53:27 kaleb $ */
-/************************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-/* $XFree86: xc/lib/X11/XKBlibint.h,v 3.3 1997/06/22 10:16:51 dawes Exp $ */
-
-#ifndef _XKBLIBINT_H_
-#define	_XKBLIBINT_H_
-
-#include <X11/Xutil.h>
-#include <X11/XKBlib.h>
-
-#define	XkbMapPending		(1<<0)
-#define	XkbXlibNewKeyboard	(1<<1)
-
-typedef int	(*XkbKSToMBFunc)(
-#if NeedFunctionPrototypes
-	XPointer	/* priv */,
-	KeySym		/* sym */,
-	char *		/* buf */,
-	int		/* len */,
-	int *		/* extra_rtrn */
-#endif
-);
-
-typedef KeySym	(*XkbMBToKSFunc)(
-#if NeedFunctionPrototypes
-	XPointer	/* priv */,
-	char *		/* buf */,
-	int		/* len */,
-	Status *	/* status */
-#endif
-);
-
-typedef KeySym	(*XkbToUpperFunc)(
-#if NeedFunctionPrototypes
-	KeySym		/* sym */
-#endif
-);
-
-typedef struct _XkbConverters {
-	XkbKSToMBFunc	 KSToMB;
-	XPointer	 KSToMBPriv;
-	XkbMBToKSFunc	 MBToKS;
-	XPointer	 MBToKSPriv;
-	XkbToUpperFunc	 KSToUpper;
-} XkbConverters;
-
-extern	XkbInternAtomFunc	_XkbInternAtomFunc;
-extern	XkbGetAtomNameFunc	_XkbGetAtomNameFunc;
-
-typedef struct _XkbInfoRec {
-	unsigned	 flags;
-	unsigned	 xlib_ctrls;
-	XExtCodes	 *codes;
-	int		 srv_major;
-	int		 srv_minor;
-	unsigned	 selected_events;
-	unsigned short	 selected_nkn_details;
-	unsigned short	 selected_map_details;
-	XkbDescRec	*desc;
-	XkbMapChangesRec changes;
-	Atom		 composeLED;
-	XkbConverters	 cvt;
-	XkbConverters	 latin1cvt;
-} XkbInfoRec, *XkbInfoPtr;
-
-
-#define	_XkbUnavailable(d) \
-	(((d)->flags&XlibDisplayNoXkb) ||\
-	 ((!(d)->xkb_info || (!(d)->xkb_info->desc)) && !_XkbLoadDpy(d)))
-
-#define	_XkbCheckPendingRefresh(d,xi) {\
-    if ((xi)->flags&XkbXlibNewKeyboard)\
-	_XkbReloadDpy((d));\
-    else if ((xi)->flags&XkbMapPending) {\
-	if (XkbGetMapChanges((d),(xi)->desc, &(xi)->changes)==Success) {\
-	    LockDisplay((d));\
-	    (xi)->changes.changed= 0;\
-	    UnlockDisplay((d));\
-	}\
-    }\
-}
-
-#define	_XkbNeedModmap(i)    ((!(i)->desc->map)||(!(i)->desc->map->modmap))
-
-	/*
-	 * mask of the events that the "invisible" XKB support in Xlib needs
-	 */
-#define XKB_XLIB_MAP_MASK (XkbAllClientInfoMask)
-
-	/*
-	 * Handy helper macros 
-	 */
-#define	XKB_INSURE_SIZE(f,t,nNum,oNum)	{\
-	if ((f)==NULL)	\
-	     (f)=(t *)Xmalloc(sizeof(t)*(nNum));\
-	else if ((nNum)<(oNum))\
-	     (f)=(t *)Xrealloc((f),sizeof(t)*(nNum));\
-	}
-
-typedef struct _XkbReadBuffer {
-	int	 error;
-	int	 size;
-	char	*start;
-	char	*data;
-} XkbReadBufferRec,*XkbReadBufferPtr;
-
-#define	_XkbAlloc(s)		Xmalloc((s))
-#define	_XkbCalloc(n,s)		Xcalloc((n),(s))
-#define	_XkbRealloc(o,s)	Xrealloc((o),(s))
-#define	_XkbTypedAlloc(t)	((t *)Xmalloc(sizeof(t)))
-#define	_XkbTypedCalloc(n,t)	((t *)Xcalloc((n),sizeof(t)))
-#define	_XkbTypedRealloc(o,n,t) \
-	((o)?(t *)Xrealloc((o),(n)*sizeof(t)):_XkbTypedCalloc(n,t))
-#define	_XkbClearElems(a,f,l,t)	bzero(&(a)[f],((l)-(f)+1)*sizeof(t))
-#define	_XkbFree(p)		Xfree(p)
-
-_XFUNCPROTOBEGIN
-
-extern	void _XkbReloadDpy(
-#if NeedFunctionPrototypes
-    Display *		/* dpy */
-#endif
-);
-
-extern KeySym _XKeycodeToKeysym(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    KeyCode		/* keycode */,
-    int			/* index */
-#endif
-);
-
-extern KeyCode _XKeysymToKeycode(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    KeySym		/* keysym */
-#endif
-);
-
-extern KeySym _XLookupKeysym(
-#if NeedFunctionPrototypes
-    XKeyEvent*		/* key_event */,
-    int			/* index */
-#endif
-);
-
-extern int _XRefreshKeyboardMapping(
-#if NeedFunctionPrototypes
-    XMappingEvent*	/* event_map */    
-#endif
-);
-
-extern unsigned	_XKeysymToModifiers(
-#if NeedFunctionPrototypes
-    Display *		/* dpy */,
-    KeySym 		/* ks */
-#endif
-);
-
-extern int _XTranslateKey(	
-#if NeedFunctionPrototypes
-    register Display *	/* dpy */,
-    KeyCode 		/* keycode */,
-    register unsigned int /* modifiers */,
-    unsigned int *	/* modifiers_return */,
-    KeySym *		/* keysym_return */
-#endif
-);
-
-extern int	_XTranslateKeySym(
-#if NeedFunctionPrototypes
-    Display *		/* dpy */,
-    register KeySym 	/* symbol */,
-    unsigned int 	/* modifiers */,
-    char *		/* buffer */,
-    int 		/* nbytes */
-#endif
-);
-
-extern	int _XLookupString(
-#if NeedFunctionPrototypes
-    register XKeyEvent *	/* event */,
-    char *			/* buffer */,
-    int 			/* nbytes */,
-    KeySym *			/* keysym */,
-    XComposeStatus *		/* status */
-#endif
-);
-
-extern void _XkbNoteCoreMapChanges(
-#if NeedFunctionPrototypes
-    XkbMapChangesRec * 		/* old */,
-    XMappingEvent * 		/* new */,
-    unsigned int 		/* wanted */
-#endif
-);
-
-extern	int _XkbInitReadBuffer(
-#if NeedFunctionPrototypes
-    Display *		/* dpy */,
-    XkbReadBufferPtr	/* buf */,
-    int			/* size */
-#endif
-);
-
-extern int _XkbSkipReadBufferData(
-#if NeedFunctionPrototypes
-    XkbReadBufferPtr	/* from */,
-    int			/* size */
-#endif
-);
-
-extern int _XkbCopyFromReadBuffer(
-#if NeedFunctionPrototypes
-    XkbReadBufferPtr	/* from */,
-    char *		/* to */,
-    int			/* size */
-#endif
-);
-
-
-#if defined(WORD64) || defined(LONG64)
-extern	int _XkbReadCopyData32(
-#if NeedFunctionPrototypes
-    int *		/* from */,
-    long *		/* to */,
-    int			/* num_words */
-#endif
-);
-
-extern	int _XkbWriteCopyData32(
-#if NeedFunctionPrototypes
-    unsigned long *	/* from */,
-    CARD32 *		/* to */,
-    int			/* num_words */
-#endif
-);
-
-extern int _XkbReadBufferCopy32(
-#if NeedFunctionPrototypes
-    XkbReadBufferPtr	/* from */,
-    long *		/* to */,
-    int			/* size */
-#endif
-);
-#else
-#define	_XkbReadCopyData32(f,t,s)    memcpy((char *)(t),(char *)(f),(s)*4)
-#define	_XkbWriteCopyData32(f,t,s)   memcpy((char *)(t),(char *)(f),(s)*4)
-#define	_XkbReadBufferCopy32(f,t,s) _XkbCopyFromReadBuffer(f,(char *)t,(s)*4)
-#endif
-
-#ifndef NO_DEC_BINARY_COMPATIBILITY
-#define XKB_FORCE_INT_KEYSYM 1
-#endif
-
-#ifdef XKB_FORCE_INT_KEYSYM
-extern int _XkbReadCopyKeySyms(
-#if NeedFunctionPrototypes
-    int *		/* from */,
-    KeySym *		/* to */,
-    int			/* num_words */
-#endif
-);
-
-extern	int _XkbWriteCopyKeySyms(
-#if NeedFunctionPrototypes
-    KeySym *		/* from */,
-    CARD32 *		/* to */,
-    int			/* num_words */
-#endif
-);
-
-extern int _XkbReadBufferCopyKeySyms(
-#if NeedFunctionPrototypes
-    XkbReadBufferPtr	/* from */,
-#ifndef NO_DEC_BUG_FIX
-    KeySym *		/* to */,
-#else
-    long *		/* to */,
-#endif
-    int			/* size */
-#endif
-);
-#else
-#define	_XkbReadCopyKeySyms(f,t,n)		_XkbReadCopyData32(f,t,n)
-#define	_XkbWriteCopyKeySyms(f,t,n)		_XkbWriteCopyData32(f,t,n)
-#define	_XkbReadBufferCopyKeySyms(f,t,s)	_XkbReadBufferCopy32(f,t,s)
-#endif
-
-extern char *_XkbPeekAtReadBuffer(
-#if NeedFunctionPrototypes
-    XkbReadBufferPtr	/* from */,
-    int			/*  size */
-#endif
-);
-
-extern char *_XkbGetReadBufferPtr(
-#if NeedFunctionPrototypes
-    XkbReadBufferPtr	/* from */,
-    int			/* size */
-#endif
-);
-#define	_XkbGetTypedRdBufPtr(b,n,t) ((t *)_XkbGetReadBufferPtr(b,(n)*SIZEOF(t)))
-
-extern int _XkbFreeReadBuffer(
-#if NeedFunctionPrototypes
-    XkbReadBufferPtr	/* buf */
-#endif
-);
-
-extern Bool
-_XkbGetReadBufferCountedString(
-#if NeedFunctionPrototypes
-    XkbReadBufferPtr	/* buf */,
-    char **		/* rtrn */
-#endif
-);
-
-extern char	*_XkbGetCharset(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern int	 _XkbGetConverters(
-#if NeedFunctionPrototypes
-    char *		/* encoding_name */,
-    XkbConverters *	/* cvt_rtrn */
-#endif
-);
-
-#ifdef	NEED_MAP_READERS
-
-extern	Status	_XkbReadGetMapReply(
-#if NeedFunctionPrototypes
-    Display *		/* dpy */,
-    xkbGetMapReply * 	/* rep */,
-    XkbDescRec *	/* xkb */,
-    int *		/* nread_rtrn */
-#endif
-);
-
-extern	Status	_XkbReadGetCompatMapReply(
-#if NeedFunctionPrototypes
-    Display *			/* dpy */,
-    xkbGetCompatMapReply *	/* rep */,
-    XkbDescPtr			/* xkb */,
-    int	*			/* nread_rtrn */
-#endif
-);
-
-extern	Status	_XkbReadGetIndicatorMapReply(
-#if NeedFunctionPrototypes
-    Display *			/* dpy */,
-    xkbGetIndicatorMapReply *	/* rep */,
-    XkbDescPtr			/* xkb */,
-    int	*			/* nread_rtrn */
-#endif
-);
-
-extern	Status	_XkbReadGetNamesReply(
-#if NeedFunctionPrototypes
-    Display *			/* dpy */,
-    xkbGetNamesReply *		/* rep */,
-    XkbDescPtr 			/* xkb */,
-    int *			/* nread_rtrn */
-#endif
-);
-
-extern	Status	_XkbReadGetGeometryReply(
-#if NeedFunctionPrototypes
-    Display *			/* dpy */,
-    xkbGetGeometryReply *	/* rep */,
-    XkbDescPtr 			/* xkb */,
-    int *			/* nread_rtrn */
-#endif
-);
-
-#endif
-
-_XFUNCPROTOEND
-
-#endif /* _XKBLIBINT_H_ */
diff --git a/xc/lib/X11/XKeysymDB b/xc/lib/X11/XKeysymDB
deleted file mode 100644
index e88f62576..000000000
--- a/xc/lib/X11/XKeysymDB
+++ /dev/null
@@ -1,207 +0,0 @@
-! $XConsortium: XKeysymDB,v 1.14 94/07/07 09:35:29 rws Exp $
-! $XFree86: xc/lib/X11/XKeysymDB,v 3.1 1996/01/05 13:11:08 dawes Exp $
-! Copyright 1993 Massachusetts Institute of Technology
-!
-! Permission to use, copy, modify, distribute, and sell this software and
-! its documentation for any purpose is hereby granted without fee, provided
-! that the above copyright notice appear in all copies and that both that
-! copyright notice and this permission notice appear in supporting
-! documentation, and that the name of M.I.T. not be used in advertising or
-! publicity pertaining to distribution of the software without specific,
-! written prior permission.  M.I.T. makes no representations about the
-! suitability of this software for any purpose.  It is provided "as is"
-! without express or implied warranty.
-
-hpmute_acute		:100000A8
-hpmute_grave		:100000A9
-hpmute_asciicircum	:100000AA
-hpmute_diaeresis	:100000AB
-hpmute_asciitilde	:100000AC
-hplira			:100000AF
-hpguilder		:100000BE
-hpYdiaeresis		:100000EE
-hpIO			:100000EE
-hplongminus		:100000F6
-hpblock			:100000FC
-apLineDel		:1000FF00
-apCharDel		:1000FF01
-apCopy			:1000FF02
-apCut			:1000FF03
-apPaste			:1000FF04
-apMove			:1000FF05
-apGrow			:1000FF06
-apCmd			:1000FF07
-apShell			:1000FF08
-apLeftBar		:1000FF09
-apRightBar		:1000FF0A
-apLeftBox		:1000FF0B
-apRightBox		:1000FF0C
-apUpBox			:1000FF0D
-apDownBox		:1000FF0E
-apPop			:1000FF0F
-apRead			:1000FF10
-apEdit			:1000FF11
-apSave			:1000FF12
-apExit			:1000FF13
-apRepeat		:1000FF14
-hpModelock1		:1000FF48
-hpModelock2		:1000FF49
-hpReset			:1000FF6C
-hpSystem		:1000FF6D
-hpUser			:1000FF6E
-hpClearLine		:1000FF6F
-hpInsertLine		:1000FF70
-hpDeleteLine		:1000FF71
-hpInsertChar		:1000FF72
-hpDeleteChar		:1000FF73
-hpBackTab		:1000FF74
-hpKP_BackTab		:1000FF75
-apKP_parenleft		:1000FFA8
-apKP_parenright		:1000FFA9
-
-I2ND_FUNC_L		:10004001
-I2ND_FUNC_R		:10004002
-IREMOVE			:10004003
-IREPEAT			:10004004
-IA1			:10004101
-IA2			:10004102
-IA3			:10004103
-IA4			:10004104
-IA5			:10004105
-IA6			:10004106
-IA7			:10004107
-IA8			:10004108
-IA9			:10004109
-IA10			:1000410A
-IA11			:1000410B
-IA12			:1000410C
-IA13			:1000410D
-IA14			:1000410E
-IA15			:1000410F
-IB1			:10004201
-IB2			:10004202
-IB3			:10004203
-IB4			:10004204
-IB5			:10004205
-IB6			:10004206
-IB7			:10004207
-IB8			:10004208
-IB9			:10004209
-IB10			:1000420A
-IB11			:1000420B
-IB12			:1000420C
-IB13			:1000420D
-IB14			:1000420E
-IB15			:1000420F
-IB16			:10004210
-
-DRemove			:1000FF00
-Dring_accent		:1000FEB0
-Dcircumflex_accent	:1000FE5E
-Dcedilla_accent		:1000FE2C
-Dacute_accent		:1000FE27
-Dgrave_accent		:1000FE60
-Dtilde			:1000FE7E
-Ddiaeresis		:1000FE22
-
-osfCopy			:1004FF02
-osfCut			:1004FF03
-osfPaste		:1004FF04
-osfBackTab		:1004FF07
-osfBackSpace		:1004FF08
-osfClear		:1004FF0B
-osfEscape		:1004FF1B
-osfAddMode		:1004FF31
-osfPrimaryPaste		:1004FF32
-osfQuickPaste		:1004FF33
-osfPageLeft		:1004FF40
-osfPageUp		:1004FF41
-osfPageDown		:1004FF42
-osfPageRight		:1004FF43
-osfActivate		:1004FF44
-osfMenuBar		:1004FF45
-osfLeft			:1004FF51
-osfUp			:1004FF52
-osfRight		:1004FF53
-osfDown			:1004FF54
-osfPrior		:1004FF55
-osfNext			:1004FF56
-osfEndLine		:1004FF57
-osfBeginLine		:1004FF58
-osfEndData		:1004FF59
-osfBeginData		:1004FF5A
-osfPrevMenu		:1004FF5B
-osfNextMenu		:1004FF5C
-osfPrevField		:1004FF5D
-osfNextField		:1004FF5E
-osfSelect		:1004FF60
-osfInsert		:1004FF63
-osfUndo			:1004FF65
-osfMenu			:1004FF67
-osfCancel		:1004FF69
-osfHelp			:1004FF6A
-osfSelectAll		:1004FF71
-osfDeselectAll		:1004FF72
-osfReselect		:1004FF73
-osfExtend		:1004FF74
-osfRestore		:1004FF78
-osfSwitchDirection	:1004FF7E
-osfPriorMinor		:1004FFF5
-osfNextMinor		:1004FFF6
-osfRightLine		:1004FFF7
-osfLeftLine		:1004FFF8
-osfDelete		:1004FFFF
-
-SunFA_Grave		:1005FF00
-SunFA_Circum		:1005FF01
-SunFA_Tilde		:1005FF02
-SunFA_Acute		:1005FF03
-SunFA_Diaeresis		:1005FF04
-SunFA_Cedilla		:1005FF05
-SunF36			:1005FF10
-SunF37			:1005FF11
-SunSys_Req		:1005FF60
-SunProps		:1005FF70
-SunFront		:1005FF71
-SunCopy			:1005FF72
-SunOpen			:1005FF73
-SunPaste		:1005FF74
-SunCut			:1005FF75
-SunPowerSwitch		:1005FF76
-SunAudioLowerVolume	:1005FF77
-SunAudioMute		:1005FF78
-SunAudioRaiseVolume	:1005FF79
-SunVideoDegauss		:1005FF7A
-SunVideoLowerBrightness	:1005FF7B
-SunVideoRaiseBrightness	:1005FF7C
-SunPowerSwitchShift	:1005FF7D
-
-SunCompose		:FF20
-SunPageUp		:FF55
-SunPageDown		:FF56
-SunPrint_Screen		:FF61
-SunUndo			:FF65
-SunAgain		:FF66
-SunFind			:FF68
-SunStop			:FF69
-SunAltGraph		:FF7E
-
-WYSetup			:1006FF00
-
-ncdSetup		:1006FF00
-
-XeroxPointerButton1	:10070001
-XeroxPointerButton2	:10070002
-XeroxPointerButton3	:10070003
-XeroxPointerButton4	:10070004
-XeroxPointerButton5	:10070005
-
-XF86ModeLock		:1008FF01
-
-usldead_acute		:100000A8
-usldead_grave		:100000A9
-usldead_diaeresis	:100000AB
-usldead_asciicircum	:100000AA
-usldead_asciitilde	:100000AC
-usldead_cedilla		:1000FE2C
-usldead_ring		:1000FEB0
diff --git a/xc/lib/X11/XRGB.c b/xc/lib/X11/XRGB.c
deleted file mode 100644
index 46b9aafca..000000000
--- a/xc/lib/X11/XRGB.c
+++ /dev/null
@@ -1,245 +0,0 @@
-/* $XConsortium: XRGB.c,v 1.6 95/06/08 23:20:39 gildea Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		XcmsRtoX.c
- *
- *	DESCRIPTION
- *		Convert color specifications in XcmsRGB format in one array of
- *		XcmsColor structures to RGB in an array of XColor structures.
- *
- *
- */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-#ifdef __STDC__
-#define Const const
-#else
-#define Const /**/
-#endif
-
-/*
- *      LOCAL VARIABLES
- */
-
-static unsigned short Const MASK[17] = {
-    0x0000,	/*  0 bitsPerRGB */
-    0x8000,	/*  1 bitsPerRGB */
-    0xc000,	/*  2 bitsPerRGB */
-    0xe000,	/*  3 bitsPerRGB */
-    0xf000,	/*  4 bitsPerRGB */
-    0xf800,	/*  5 bitsPerRGB */
-    0xfc00,	/*  6 bitsPerRGB */
-    0xfe00,	/*  7 bitsPerRGB */
-    0xff00,	/*  8 bitsPerRGB */
-    0xff80,	/*  9 bitsPerRGB */
-    0xffc0,	/* 10 bitsPerRGB */
-    0xffe0,	/* 11 bitsPerRGB */
-    0xfff0,	/* 12 bitsPerRGB */
-    0xfff8,	/* 13 bitsPerRGB */
-    0xfffc,	/* 14 bitsPerRGB */
-    0xfffe,	/* 15 bitsPerRGB */
-    0xffff	/* 16 bitsPerRGB */
-};
-
-
-
-/************************************************************************
- *									*
- *			API PRIVATE ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		_XcmsRGB_to_XColor - 
- *
- *	SYNOPSIS
- */
-void
-_XcmsRGB_to_XColor(pColors, pXColors, nColors)
-    XcmsColor *pColors;
-    XColor *pXColors;
-    unsigned int nColors;
-/*
- *	DESCRIPTION
- *	    Translates a color specification in XcmsRGBFormat in a XcmsColor
- * 	    structure to an XColor structure.
- *
- *	RETURNS
- *		void.
- */
-{
-    for (; nColors--; pXColors++, pColors++) {
-	pXColors->pixel = pColors->pixel;
-	pXColors->red = pColors->spec.RGB.red;
-	pXColors->green = pColors->spec.RGB.green;
-	pXColors->blue  = pColors->spec.RGB.blue;
-	pXColors->flags = (DoRed | DoGreen | DoBlue);
-    }
-}
-
-
-/*
- *	NAME
- *		_XColor_to_XcmsRGB
- *
- *	SYNOPSIS
- */
-void
-_XColor_to_XcmsRGB(ccc, pXColors, pColors, nColors)
-    XcmsCCC ccc;
-    XColor *pXColors;
-    XcmsColor *pColors;
-    unsigned int nColors;
-/*
- *	DESCRIPTION
- *		Translates an RGB color specification in an XColor
- *		structure to an XcmsRGB structure.
- *
- *		IMPORTANT NOTE:  Bit replication that may have been caused
- *		with ResolveColor() routine in the X Server is undone
- *		here if requested!  For example, if red = 0xcaca and the
- *		bits_per_rgb is 8, then spec.RGB.red will be 0xca00.
- *
- *	RETURNS
- *		void
- */
-{
-    int bits_per_rgb = ccc->visual->bits_per_rgb;
-
-    for (; nColors--; pXColors++, pColors++) {
-	pColors->spec.RGB.red = (pXColors->red & MASK[bits_per_rgb]);
-	pColors->spec.RGB.green = (pXColors->green & MASK[bits_per_rgb]);
-	pColors->spec.RGB.blue = (pXColors->blue & MASK[bits_per_rgb]);
-	pColors->format = XcmsRGBFormat;
-	pColors->pixel = pXColors->pixel;
-    }
-}
-
-
-/*
- *	NAME
- *		_XcmsResolveColor
- *
- *	SYNOPSIS
- */
-void
-_XcmsResolveColor(ccc, pXcmsColor)
-    XcmsCCC ccc;
-    XcmsColor *pXcmsColor;
-/*
- *	DESCRIPTION
- *	    Uses the X Server ResolveColor() algorithm to
- *	    modify values to closest values supported by hardware.
- *	    Old algorithm simply masked low-order bits.  The new algorithm
- *	    has the effect of replicating significant bits into lower order
- *	    bits in order to stretch the hardware value into all 16 bits.
- *
- *	    On a display with N-bit DACs, the "hardware" color is computed as:
- *
- *	    ((unsignedlong)(ClientValue >> (16-N)) * 0xFFFF) / ((1 << N) - 1)
- *		
- *
- *	RETURNS
- *		void.
- */
-{
-    int shift;
-    int max_color;
-
-    shift = 16 - ccc->visual->bits_per_rgb;
-    max_color = (1 << ccc->visual->bits_per_rgb) - 1;
-
-
-    pXcmsColor->spec.RGB.red =
-	    ((unsigned long)(pXcmsColor->spec.RGB.red >> shift) * 0xFFFF)
-	    / max_color;
-    pXcmsColor->spec.RGB.green =
-	    ((unsigned long)(pXcmsColor->spec.RGB.green >> shift) * 0xFFFF)
-	    / max_color;
-    pXcmsColor->spec.RGB.blue =
-	    ((unsigned long)(pXcmsColor->spec.RGB.blue  >> shift) * 0xFFFF)
-	    / max_color;
-}
-
-
-/*
- *	NAME
- *		_XcmsUnresolveColor
- *
- *	SYNOPSIS
- */
-void
-_XcmsUnresolveColor(ccc, pColor)
-    XcmsCCC ccc;
-    XcmsColor *pColor;
-/*
- *	DESCRIPTION
- *		Masks out insignificant bits.
- *
- *	RETURNS
- *		void.
- *
- *	ASSUMPTIONS
- *		format == XcmsRGBFormat
- */
-{
-    int bits_per_rgb = ccc->visual->bits_per_rgb;
-
-    pColor->spec.RGB.red &= MASK[bits_per_rgb];
-    pColor->spec.RGB.green &= MASK[bits_per_rgb];
-    pColor->spec.RGB.blue &= MASK[bits_per_rgb];
-}
-
-
-/*
- *	NAME
- *		_XUnresolveColor
- *
- *	SYNOPSIS
- */
-void
-_XUnresolveColor(ccc, pXColor)
-    XcmsCCC ccc;
-    XColor *pXColor;
-/*
- *	DESCRIPTION
- *		Masks out insignificant bits.
- *
- *	RETURNS
- *		void.
- */
-{
-    int bits_per_rgb = ccc->visual->bits_per_rgb;
-
-    pXColor->red &= MASK[bits_per_rgb];
-    pXColor->green &= MASK[bits_per_rgb];
-    pXColor->blue &= MASK[bits_per_rgb];
-}
-
diff --git a/xc/lib/X11/XYZ.c b/xc/lib/X11/XYZ.c
deleted file mode 100644
index 65e5e566f..000000000
--- a/xc/lib/X11/XYZ.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/* $XConsortium: XYZ.c,v 1.8 92/06/11 16:26:24 converse Exp $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of XCMS based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *
- *	NAME
- *		CIEXYZ.c
- *
- *	DESCRIPTION
- *		CIE XYZ Color Space
- *
- *
- */
-/* $XFree86: xc/lib/X11/XYZ.c,v 1.2 1999/05/09 10:50:25 dawes Exp $ */
-
-#include <X11/Xos.h>
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-#include <stdio.h> /* sscanf */
-
-
-/*
- *      EXTERNS
- *              External declarations required locally to this package
- *              that are not already declared in any of the included header
- *		files (external includes or internal includes).
- */
-extern char _XcmsCIEXYZ_prefix[];
-
-/*
- *	DEFINES
- *		Internal definitions that need NOT be exported to any package
- *		or program using this package.
- */
-#ifdef DBL_EPSILON
-#  define XMY_DBL_EPSILON DBL_EPSILON
-#else
-#  define XMY_DBL_EPSILON 0.00001
-#endif
-
-/*
- *      FORWARD DECLARATIONS
- */
-static int CIEXYZ_ParseString();
-Status _XcmsCIEXYZ_ValidSpec();
-
-
-/*
- *      LOCALS VARIABLES
- */
-
-static XcmsConversionProc Fl_CIEXYZ_to_CIEXYZ[] = {
-    NULL
-};
-
-
-
-/*
- *      GLOBALS
- *              Variables declared in this package that are allowed
- *		to be used globally.
- */
-    /*
-     * CIE XYZ Color Space
-     */
-XcmsColorSpace	XcmsCIEXYZColorSpace =
-    {
-	_XcmsCIEXYZ_prefix,		/* prefix */
-	XcmsCIEXYZFormat,		/* id */
-	CIEXYZ_ParseString,	/* parseString */
-	Fl_CIEXYZ_to_CIEXYZ,	/* to_CIEXYZ */
-	Fl_CIEXYZ_to_CIEXYZ,	/* from_CIEXYZ */
-	1
-    };
-
-
-/************************************************************************
- *									*
- *			PRIVATE ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		CIEXYZ_ParseString
- *
- *	SYNOPSIS
- */
-static int
-CIEXYZ_ParseString(spec, pColor)
-    register char *spec;
-    XcmsColor *pColor;
-/*
- *	DESCRIPTION
- *		This routines takes a string and attempts to convert
- *		it into a XcmsColor structure with XcmsCIEXYZFormat.
- *		The assumed CIEXYZ string syntax is:
- *		    CIEXYZ:<X>/<Y>/<Z>
- *		Where X, Y, and Z are in string input format for floats
- *		consisting of:
- *		    a. an optional sign
- *		    b. a string of numbers possibly containing a decimal point,
- *		    c. an optional exponent field containing an 'E' or 'e'
- *			followed by a possibly signed integer string.
- *
- *	RETURNS
- */
-{
-    int n;
-    char *pchar;
-
-    if ((pchar = strchr(spec, ':')) == NULL) {
-	return(XcmsFailure);
-    }
-    n = (int)(pchar - spec);
-
-    /*
-     * Check for proper prefix.
-     */
-    if (strncmp(spec, _XcmsCIEXYZ_prefix, n) != 0) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Attempt to parse the value portion.
-     */
-    if (sscanf(spec + n + 1, "%lf/%lf/%lf",
-	    &pColor->spec.CIEXYZ.X,
-	    &pColor->spec.CIEXYZ.Y,
-	    &pColor->spec.CIEXYZ.Z) != 3) {
-	return(XcmsFailure);
-    }
-    pColor->format = XcmsCIEXYZFormat;
-    pColor->pixel = 0;
-    return(_XcmsCIEXYZ_ValidSpec(pColor));
-}
-
-
-/************************************************************************
- *									*
- *			PUBLIC ROUTINES 				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsCIELab_ValidSpec
- *
- *	SYNOPSIS
- */
-Status
-_XcmsCIEXYZ_ValidSpec(pColor)
-    XcmsColor *pColor;
-/*
- *	DESCRIPTION
- *		Checks if color specification valid for CIE XYZ
- *
- *	RETURNS
- *		XcmsFailure if invalid,
- *		XcmsSuccess if valid.
- *
- */
-{
-    if (pColor->format != XcmsCIEXYZFormat
-	    ||
-	    (pColor->spec.CIEXYZ.Y < 0.0 - XMY_DBL_EPSILON)
-	    ||
-	    (pColor->spec.CIEXYZ.Y > 1.0 + XMY_DBL_EPSILON)) {
-	return(XcmsFailure);
-    }
-    return(XcmsSuccess);
-}
diff --git a/xc/lib/X11/Xaixlcint.h b/xc/lib/X11/Xaixlcint.h
deleted file mode 100644
index 213a125d1..000000000
--- a/xc/lib/X11/Xaixlcint.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* $XConsortium: Xaixlcint.h,v 1.3 95/04/07 19:22:34 kaleb Exp $ */
-/*
- *
- * Copyright IBM Corporation 1993
- *
- * All Rights Reserved
- *
- * License to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appear in all copies and that
- * both that copyright notice and this permission notice appear in
- * supporting documentation, and that the name of IBM not be
- * used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.
- *
- * IBM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS, AND 
- * NONINFRINGEMENT OF THIRD PARTY RIGHTS, IN NO EVENT SHALL
- * IBM BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
-*/
-/************************************************************************/
-/*	Xaixlcint.h							*/
-/*----------------------------------------------------------------------*/
-/*	This file contains Xlcint.h extension for AIX.			*/
-/************************************************************************/
-#ifndef	_Xaixlcint_h
-#define	_Xaixlcint_h
-
-#include "Xlcint.h"
-#include <sys/lc_core.h>
-
-#define	_LC_LDX		11
-#define	_LC_LDX_R6	(_LC_LDX+1)
-#define	_LC_VERSION_R5	5
-#define	_LC_VERSION_R6	6
-
-typedef	struct	_LC_core_ldx_t	{
-    _LC_object_t	lc_object_header;
-    XLCd		(*default_loader)();
-    Bool		sticky;
-} _XlcCoreObjRec, *_XlcCoreObj;
-
-#if _LC_VERSION < 0x40000000
-#define __type_id type_id
-#define __magic magic
-#define __version version
-#endif
-
-#endif	/*_Xaixlcint_h*/
diff --git a/xc/lib/X11/Xatomtype.h b/xc/lib/X11/Xatomtype.h
deleted file mode 100644
index 8bdfcded0..000000000
--- a/xc/lib/X11/Xatomtype.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* $TOG: Xatomtype.h /main/10 1998/02/06 17:57:49 kaleb $ */
-
-/***********************************************************
-
-Copyright 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef _XATOMTYPE_H_
-#define _XATOMTYPE_H_
-
-/*
- * This files defines crock C structures for calling XGetWindowProperty and
- * XChangeProperty.  All fields must be longs as the semantics of property
- * routines will handle conversion to and from actual 32 bit objects.  If your
- * compiler doesn't treat &structoflongs the same as &arrayoflongs[0], you
- * will have some work to do.
- */
-
-#define BOOL long
-#define SIGNEDINT long
-#define UNSIGNEDINT unsigned long
-#define RESOURCEID unsigned long
-
-
-/* this structure may be extended, but do not change the order */
-typedef struct {
-    UNSIGNEDINT flags;
-    SIGNEDINT x, y, width, height;	/* need to cvt; only for pre-ICCCM */
-    SIGNEDINT minWidth, minHeight;	/* need to cvt */
-    SIGNEDINT maxWidth, maxHeight;	/* need to cvt */
-    SIGNEDINT widthInc, heightInc;	/* need to cvt */
-    SIGNEDINT minAspectX, minAspectY;	/* need to cvt */
-    SIGNEDINT maxAspectX, maxAspectY;	/* need to cvt */
-    SIGNEDINT baseWidth,baseHeight;	/* need to cvt; ICCCM version 1 */
-    SIGNEDINT winGravity;		/* need to cvt; ICCCM version 1 */
-} xPropSizeHints;
-#define OldNumPropSizeElements 15	/* pre-ICCCM */
-#define NumPropSizeElements 18		/* ICCCM version 1 */
-
-/* this structure may be extended, but do not change the order */
-/* RGB properties */
-typedef struct {
-	RESOURCEID colormap;
-	UNSIGNEDINT red_max;
-	UNSIGNEDINT red_mult;
-	UNSIGNEDINT green_max;
-	UNSIGNEDINT green_mult;
-	UNSIGNEDINT blue_max;
-	UNSIGNEDINT blue_mult;
-	UNSIGNEDINT base_pixel;
-	RESOURCEID visualid;		/* ICCCM version 1 */
-	RESOURCEID killid;		/* ICCCM version 1 */
-} xPropStandardColormap;
-#define OldNumPropStandardColormapElements 8  /* pre-ICCCM */
-#define NumPropStandardColormapElements 10  /* ICCCM version 1 */
-
-
-/* this structure may be extended, but do not change the order */
-typedef struct {
-    UNSIGNEDINT flags;
-    BOOL input;				/* need to convert */
-    SIGNEDINT initialState;		/* need to cvt */
-    RESOURCEID iconPixmap;
-    RESOURCEID iconWindow;
-    SIGNEDINT  iconX;			/* need to cvt */
-    SIGNEDINT  iconY;			/* need to cvt */
-    RESOURCEID iconMask;
-    UNSIGNEDINT windowGroup;
-  } xPropWMHints;
-#define NumPropWMHintsElements 9 /* number of elements in this structure */
-
-/* this structure defines the icon size hints information */
-typedef struct {
-    SIGNEDINT minWidth, minHeight;	/* need to cvt */
-    SIGNEDINT maxWidth, maxHeight;	/* need to cvt */
-    SIGNEDINT widthInc, heightInc;	/* need to cvt */
-  } xPropIconSize;
-#define NumPropIconSizeElements 6 /* number of elements in this structure */
-
-/* this structure defines the window manager state information */
-typedef struct {
-    SIGNEDINT state;			/* need to cvt */
-    RESOURCEID iconWindow;
-} xPropWMState;
-#define NumPropWMStateElements 2	/* number of elements in struct */
-
-#undef BOOL
-#undef SIGNEDINT
-#undef UNSIGNEDINT
-#undef RESOURCEID
-
-#endif /* _XATOMTYPE_H_ */
diff --git a/xc/lib/X11/Xcms.h b/xc/lib/X11/Xcms.h
deleted file mode 100644
index 3ce1733ff..000000000
--- a/xc/lib/X11/Xcms.h
+++ /dev/null
@@ -1,937 +0,0 @@
-/* $XConsortium: Xcms.h,v 1.15 92/11/19 16:43:04 rws Exp $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	DESCRIPTION
- *		Public include file for X Color Management System
- */
-/* $XFree86: xc/lib/X11/Xcms.h,v 1.4 1999/03/14 03:21:04 dawes Exp $ */
-#ifndef _XCMS_H_
-#define _XCMS_H_
-
-    /*
-     * XCMS Status Values
-     */
-#define XcmsFailure			0
-#define XcmsSuccess			1
-#define XcmsSuccessWithCompression	2
-
-    /*
-     * Color Space Format ID's
-     *    Color Space ID's are of XcmsColorFormat type.
-     *
-     *    bit 31
-     *	    0 == Device-Independent
-     *	    1 == Device-Dependent
-     *
-     *    bit 30:
-     *	    0 == Registered with X Consortium
-     *	    1 == Unregistered
-     */
-#define XcmsUndefinedFormat	(XcmsColorFormat)0x00000000
-#define XcmsCIEXYZFormat	(XcmsColorFormat)0x00000001
-#define XcmsCIEuvYFormat	(XcmsColorFormat)0x00000002
-#define XcmsCIExyYFormat	(XcmsColorFormat)0x00000003
-#define XcmsCIELabFormat	(XcmsColorFormat)0x00000004
-#define XcmsCIELuvFormat	(XcmsColorFormat)0x00000005
-#define XcmsTekHVCFormat	(XcmsColorFormat)0x00000006
-#define XcmsRGBFormat		(XcmsColorFormat)0x80000000
-#define XcmsRGBiFormat		(XcmsColorFormat)0x80000001
-
-    /*
-     * State of XcmsPerScrnInfo
-     */
-#define XcmsInitNone		0x00	/* no initialization attempted */
-#define XcmsInitSuccess		0x01	/* initialization successful */
-#define XcmsInitFailure		0xff	/* failure, use defaults */
-
-#define DisplayOfCCC(ccc)		((ccc)->dpy)
-#define ScreenNumberOfCCC(ccc)		((ccc)->screenNumber)
-#define VisualOfCCC(ccc)		((ccc)->visual)
-#define ClientWhitePointOfCCC(ccc)	(&(ccc)->clientWhitePt)
-#define ScreenWhitePointOfCCC(ccc)	(&(ccc)->pPerScrnInfo->screenWhitePt)
-#define FunctionSetOfCCC(ccc)		((ccc)->pPerScrnInfo->functionSet)
-
-typedef unsigned long XcmsColorFormat;	/* Color Space Format ID */
-
-typedef double XcmsFloat;
-
-    /*
-     * Device RGB
-     */
-typedef struct {
-    unsigned short red;		/* scaled from 0x0000 to 0xffff */
-    unsigned short green;	/* scaled from 0x0000 to 0xffff */
-    unsigned short blue;	/* scaled from 0x0000 to 0xffff */
-} XcmsRGB;
-
-    /*
-     * RGB Intensity
-     */
-typedef struct {
-    XcmsFloat red;	/* 0.0 - 1.0 */
-    XcmsFloat green;	/* 0.0 - 1.0 */
-    XcmsFloat blue;	/* 0.0 - 1.0 */
-} XcmsRGBi;
-
-    /*
-     * CIE XYZ
-     */
-typedef struct {
-    XcmsFloat X;
-    XcmsFloat Y;
-    XcmsFloat Z;
-} XcmsCIEXYZ;
-
-    /*
-     * CIE u'v'Y
-     */
-typedef struct {
-    XcmsFloat u_prime;		/* 0.0 - 1.0 */
-    XcmsFloat v_prime;		/* 0.0 - 1.0 */
-    XcmsFloat Y;		/* 0.0 - 1.0 */
-} XcmsCIEuvY;
-
-    /*
-     * CIE xyY
-     */
-typedef struct {
-    XcmsFloat x;		/* 0.0 - 1.0 */
-    XcmsFloat y;		/* 0.0 - 1.0 */
-    XcmsFloat Y;		/* 0.0 - 1.0 */
-} XcmsCIExyY;
-
-    /*
-     * CIE L*a*b*
-     */
-typedef struct {
-    XcmsFloat L_star;		/* 0.0 - 100.0 */
-    XcmsFloat a_star;
-    XcmsFloat b_star;
-} XcmsCIELab;
-
-    /*
-     * CIE L*u*v*
-     */
-typedef struct {
-    XcmsFloat L_star;		/* 0.0 - 100.0 */
-    XcmsFloat u_star;
-    XcmsFloat v_star;
-} XcmsCIELuv;
-
-    /*
-     * TekHVC
-     */
-typedef struct {
-    XcmsFloat H;		/* 0.0 - 360.0 */
-    XcmsFloat V;		/* 0.0 - 100.0 */
-    XcmsFloat C;		/* 0.0 - 100.0 */
-} XcmsTekHVC;
-
-    /*
-     * PAD
-     */
-typedef struct {
-    XcmsFloat pad0;
-    XcmsFloat pad1;
-    XcmsFloat pad2;
-    XcmsFloat pad3;
-} XcmsPad;
-
-
-    /*
-     * XCMS Color Structure
-     */
-typedef struct {
-    union {
-	XcmsRGB RGB;
-	XcmsRGBi RGBi;
-	XcmsCIEXYZ CIEXYZ;
-	XcmsCIEuvY CIEuvY;
-	XcmsCIExyY CIExyY;
-	XcmsCIELab CIELab;
-	XcmsCIELuv CIELuv;
-	XcmsTekHVC TekHVC;
-	XcmsPad Pad;
-    } spec;			/* the color specification	*/
-    unsigned long pixel;	/* pixel value (as needed)	*/
-    XcmsColorFormat	format;		/* the specification format	*/
-} XcmsColor;
-
-
-    /*
-     * XCMS Per Screen related data
-     */
-
-typedef struct _XcmsPerScrnInfo {
-    XcmsColor	screenWhitePt;	/* Screen White point */
-    XPointer	functionSet;	/* pointer to Screen Color Characterization */
-				/*      Function Set structure		*/
-    XPointer	screenData;	/* pointer to corresponding Screen Color*/
-				/*	Characterization Data		*/
-    unsigned char state;   /* XcmsInitNone, XcmsInitSuccess, XcmsInitFailure */
-    char	pad[3];
-} XcmsPerScrnInfo;
-
-typedef struct _XcmsCCC *XcmsCCC;
-
-typedef Status (*XcmsCompressionProc)(		/* Gamut Compression Proc */
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colors_in_out */,
-    unsigned int	/* ncolors */,
-    unsigned int	/* index */,
-    Bool*		/* compression_flags_return */
-#endif
-);
-
-typedef Status (*XcmsWhiteAdjustProc)(	 	/* White Point Adjust Proc */
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* initial_white_point*/,
-    XcmsColor*		/* target_white_point*/,
-    XcmsColorFormat	/* target_format */,
-    XcmsColor*		/* colors_in_out */,
-    unsigned int	/* ncolors */,
-    Bool*		/* compression_flags_return */
-#endif
-);
-
-    /*
-     * XCMS Color Conversion Context
-     */
-typedef struct _XcmsCCC {
-    Display	*dpy;			/* X Display */
-    int		screenNumber;		/* X screen number */
-    Visual	*visual;		/* X Visual */
-    XcmsColor	clientWhitePt;		/* Client White Point */
-    XcmsCompressionProc	gamutCompProc;	/* Gamut Compression Function */
-    XPointer	gamutCompClientData;	/* Gamut Comp Func Client Data */
-    XcmsWhiteAdjustProc	whitePtAdjProc;	/* White Point Adjustment Function */
-    XPointer	whitePtAdjClientData;	/* White Pt Adj Func Client Data */
-    XcmsPerScrnInfo *pPerScrnInfo;	/* pointer to per screen information */
-					/*  associated with the above display */
-					/*  screenNumber */
-} XcmsCCCRec;
-
-typedef Status (*XcmsScreenInitProc)(	/* Screen Initialization Proc */
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    int			/* screen_number */,
-    XcmsPerScrnInfo*	/* screen_info */
-#endif
-);
-
-typedef void (*XcmsScreenFreeProc)(
-#if NeedFunctionPrototypes
-    XPointer		/* screenData */
-#endif
-);
-
-    /*
-     * Function List Pointer -- pointer to an array of function pointers.
-     *    The end of list is indicated by a NULL pointer.
-     */
-/*
- * XXX:  The use of the XcmsConversionProc type is broken.  The
- *       device-independent colour conversion code uses it as:
-
-typedef Status (*XcmsConversionProc)(XcmsCCC, XcmsColor *, XcmsColor *, 
-				     unsigned int);
-
- *       while the device-dependent code uses it as:
-
-typedef Status (*XcmsConversionProc)(XcmsCCC, XcmsColor *, unsigned int,
-				     Bool *);
-
- *       Until this is reworked, it's probably best to leave it unprotoized.
- *       The code works regardless.
- */
-typedef Status (*XcmsConversionProc)();
-typedef XcmsConversionProc *XcmsFuncListPtr;
-
-typedef int (*XcmsParseStringProc)(	/* Color String Parsing Proc */
-#if NeedFunctionPrototypes
-    char*		/* color_string */,
-    XcmsColor*		/* color_return */
-#endif
-);
-
-    /*
-     * Color Space -- per Color Space related data (Device-Independent
-     *    or Device-Dependent)
-     */
-typedef struct _XcmsColorSpace {
-    char *prefix;		/* Prefix of string format.		*/
-    XcmsColorFormat id;		/* Format ID number.			*/
-    XcmsParseStringProc parseString;
-				/* String format parsing function	*/
-    XcmsFuncListPtr to_CIEXYZ;	/* Pointer to an array of function 	*/
-				/*   pointers such that when the	*/
-				/*   functions are executed in sequence	*/
-				/*   will convert a XcmsColor structure	*/
-				/*   from this color space to CIEXYZ	*/
-				/*   space.				*/
-    XcmsFuncListPtr from_CIEXYZ;/* Pointer to an array of function 	*/
-				/*   pointers such that when the	*/
-				/*   functions are executed in sequence	*/
-				/*   will convert a XcmsColor structure	*/
-				/*   from CIEXYZ space to this color	*/
-				/*   space.				*/
-    int inverse_flag;		/* If 1, indicates that for 0 <= i < n	*/
-				/*   where n is the number of function	*/
-				/*   pointers in the lists to_CIEXYZ	*/
-				/*   and from_CIEXYZ; for each function */
-				/*   to_CIEXYZ[i] its inverse function	*/
-				/*   is from_CIEXYZ[n - i].		*/
-
-} XcmsColorSpace;
-
-    /*
-     * Screen Color Characterization Function Set -- per device class
-     *    color space conversion functions.
-     */
-typedef struct _XcmsFunctionSet {
-    XcmsColorSpace **DDColorSpaces;
-				/* Pointer to an array of pointers to	*/
-				/*   Device-DEPENDENT color spaces	*/
-				/*   understood by this SCCFuncSet.	*/
-    XcmsScreenInitProc screenInitProc;
-				/* Screen initialization function that	*/
-				/*   reads Screen Color Characterization*/
-				/*   Data off properties on the screen's*/
-				/*   root window.			*/
-    XcmsScreenFreeProc screenFreeProc;
-				/* Function that frees the SCCData	*/
-				/*   structures.			*/
-} XcmsFunctionSet;
-
-_XFUNCPROTOBEGIN
-
-extern Status XcmsAddColorSpace (
-#if NeedFunctionPrototypes
-    XcmsColorSpace*	/* pColorSpace */
-#endif
-);
-
-extern Status XcmsAddFunctionSet (
-#if NeedFunctionPrototypes
-    XcmsFunctionSet*	/* functionSet */
-#endif
-);
-
-extern Status XcmsAllocColor (
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    Colormap		/* colormap */,
-    XcmsColor*		/* color_in_out */,
-    XcmsColorFormat		/* result_format */
-#endif
-);
-
-extern Status XcmsAllocNamedColor (
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    Colormap		/* colormap */,
-    _Xconst char*	/* color_string */,
-    XcmsColor*		/* color_scrn_return */,
-    XcmsColor*		/* color_exact_return */,
-    XcmsColorFormat		/* result_format */
-#endif
-);
-
-extern XcmsCCC XcmsCCCOfColormap (
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    Colormap		/* colormap */
-#endif
-);
-
-extern Status XcmsCIELabClipab(
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colors_in_out */,
-    unsigned int	/* ncolors */,
-    unsigned int	/* index */,
-    Bool*		/* compression_flags_return */
-#endif
-);
-
-extern Status XcmsCIELabClipL(
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colors_in_out */,
-    unsigned int	/* ncolors */,
-    unsigned int	/* index */,
-    Bool*		/* compression_flags_return */
-#endif
-);
-
-extern Status XcmsCIELabClipLab(
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colors_in_out */,
-    unsigned int	/* ncolors */,
-    unsigned int	/* index */,
-    Bool*		/* compression_flags_return */
-#endif
-);
-
-extern Status XcmsCIELabQueryMaxC (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsFloat		/* hue_angle */,
-    XcmsFloat		/* L_star */,
-    XcmsColor*		/* color_return */
-#endif
-);
-
-extern Status XcmsCIELabQueryMaxL (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsFloat		/* hue_angle */,
-    XcmsFloat		/* chroma */,
-    XcmsColor*		/* color_return */
-#endif
-);
-
-extern Status XcmsCIELabQueryMaxLC (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsFloat		/* hue_angle */,
-    XcmsColor*		/* color_return */
-#endif
-);
-
-extern Status XcmsCIELabQueryMinL (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsFloat		/* hue_angle */,
-    XcmsFloat		/* chroma */,
-    XcmsColor*		/* color_return */
-#endif
-);
-
-extern Status XcmsCIELabToCIEXYZ (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* white_point */,
-    XcmsColor*		/* colors */,
-    unsigned int	/* ncolors */
-#endif
-);
-
-extern Status XcmsCIELabWhiteShiftColors(
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* initial_white_point*/,
-    XcmsColor*		/* target_white_point*/,
-    XcmsColorFormat	/* target_format */,
-    XcmsColor*		/* colors_in_out */,
-    unsigned int	/* ncolors */,
-    Bool*		/* compression_flags_return */
-#endif
-);
-
-extern Status XcmsCIELuvClipL(
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colors_in_out */,
-    unsigned int	/* ncolors */,
-    unsigned int	/* index */,
-    Bool*		/* compression_flags_return */
-#endif
-);
-
-extern Status XcmsCIELuvClipLuv(
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colors_in_out */,
-    unsigned int	/* ncolors */,
-    unsigned int	/* index */,
-    Bool*		/* compression_flags_return */
-#endif
-);
-
-extern Status XcmsCIELuvClipuv(
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colors_in_out */,
-    unsigned int	/* ncolors */,
-    unsigned int	/* index */,
-    Bool*		/* compression_flags_return */
-#endif
-);
-
-extern Status XcmsCIELuvQueryMaxC (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsFloat		/* hue_angle */,
-    XcmsFloat		/* L_star */,
-    XcmsColor*		/* color_return */
-#endif
-);
-
-extern Status XcmsCIELuvQueryMaxL (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsFloat		/* hue_angle */,
-    XcmsFloat		/* chroma */,
-    XcmsColor*		/* color_return */
-#endif
-);
-
-extern Status XcmsCIELuvQueryMaxLC (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsFloat		/* hue_angle */,
-    XcmsColor*		/* color_return */
-#endif
-);
-
-extern Status XcmsCIELuvQueryMinL (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsFloat		/* hue_angle */,
-    XcmsFloat		/* chroma */,
-    XcmsColor*		/* color_return */
-#endif
-);
-
-extern Status XcmsCIELuvToCIEuvY (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* white_point */,
-    XcmsColor*		/* colors */,
-    unsigned int	/* ncolors */
-#endif
-);
-
-extern Status XcmsCIELuvWhiteShiftColors(
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* initial_white_point*/,
-    XcmsColor*		/* target_white_point*/,
-    XcmsColorFormat	/* target_format */,
-    XcmsColor*		/* colors_in_out */,
-    unsigned int	/* ncolors */,
-    Bool*		/* compression_flags_return */
-#endif
-);
-
-extern Status XcmsCIEXYZToCIELab (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* white_point */,
-    XcmsColor*		/* colors */,
-    unsigned int	/* ncolors */
-#endif
-);
-
-extern Status XcmsCIEXYZToCIEuvY (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* white_point */,
-    XcmsColor*		/* colors */,
-    unsigned int	/* ncolors */
-#endif
-);
-
-extern Status XcmsCIEXYZToCIExyY (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* white_point */,
-    XcmsColor*		/* colors */,
-    unsigned int	/* ncolors */
-#endif
-);
-
-extern Status XcmsCIEXYZToRGBi (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colors */,
-    unsigned int	/* ncolors */,
-    Bool*		/* compression_flags_return */
-#endif
-);
-
-extern Status XcmsCIEuvYToCIELuv (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* white_point */,
-    XcmsColor*		/* colors */,
-    unsigned int	/* ncolors */
-#endif
-);
-
-extern Status XcmsCIEuvYToCIEXYZ (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* white_point */,
-    XcmsColor*		/* colors */,
-    unsigned int	/* ncolors */
-#endif
-);
-
-extern Status XcmsCIEuvYToTekHVC (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* white_point */,
-    XcmsColor*		/* colors */,
-    unsigned int	/* ncolors */
-#endif
-);
-
-extern Status XcmsCIExyYToCIEXYZ (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* white_point */,
-    XcmsColor*		/* colors */,
-    unsigned int	/* ncolors */
-#endif
-);
-
-extern XcmsColor *XcmsClientWhitePointOfCCC (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */
-#endif
-);
-
-extern Status XcmsConvertColors (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colorArry_in_out */,
-    unsigned int	/* nColors */,
-    XcmsColorFormat		/* targetFormat */,
-    Bool*		/* compArry_return */
-#endif
-);
-
-extern XcmsCCC XcmsCreateCCC (
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    int			/* screenNumber */,
-    Visual*		/* visual */,
-    XcmsColor*		/* clientWhitePt */,
-    XcmsCompressionProc /* gamutCompProc */,
-    XPointer		/* gamutCompClientData */,
-    XcmsWhiteAdjustProc	/* whitePtAdjProc */,
-    XPointer		/* whitePtAdjClientData */
-#endif
-);
-
-extern XcmsCCC XcmsDefaultCCC (
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    int			/* screenNumber */
-#endif
-);
-
-extern Display *XcmsDisplayOfCCC (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */
-#endif
-);
-
-extern XcmsColorFormat XcmsFormatOfPrefix (
-#if NeedFunctionPrototypes
-    char*		/* prefix */
-#endif
-);
-
-extern void XcmsFreeCCC (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */
-#endif
-);
-
-extern Status XcmsLookupColor (
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    Colormap		/* colormap */,
-    _Xconst char*	/* color_string */,
-    XcmsColor*		/* pColor_exact_in_out */,
-    XcmsColor*		/* pColor_scrn_in_out */,
-    XcmsColorFormat		/* result_format */
-#endif
-);
-
-extern char *XcmsPrefixOfFormat (
-#if NeedFunctionPrototypes
-    XcmsColorFormat		/* id */
-#endif
-);
-
-extern Status XcmsQueryBlack (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColorFormat	/* target_format */,
-    XcmsColor*		/* color_return */
-#endif
-);
-
-extern Status XcmsQueryBlue (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColorFormat	/* target_format */,
-    XcmsColor*		/* color_return */
-#endif
-);
-
-extern Status XcmsQueryColor (
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    Colormap		/* colormap */,
-    XcmsColor*		/* pColor_in_out */,
-    XcmsColorFormat		/* result_format */
-#endif
-);
-
-extern Status XcmsQueryColors (
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    Colormap		/* colormap */,
-    XcmsColor*		/* colorArry_in_out */,
-    unsigned int	/* nColors */,
-    XcmsColorFormat	/* result_format */
-#endif
-);
-
-extern Status XcmsQueryGreen (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColorFormat	/* target_format */,
-    XcmsColor*		/* color_return */
-#endif
-);
-
-extern Status XcmsQueryRed (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColorFormat	/* target_format */,
-    XcmsColor*		/* color_return */
-#endif
-);
-
-extern Status XcmsQueryWhite (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColorFormat	/* target_format */,
-    XcmsColor*		/* color_return */
-#endif
-);
-
-extern Status XcmsRGBiToCIEXYZ (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colors */,
-    unsigned int	/* ncolors */,
-    Bool*		/* compression_flags_return */
-#endif
-);
-
-extern Status XcmsRGBiToRGB (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colors */,
-    unsigned int	/* ncolors */,
-    Bool*		/* compression_flags_return */
-#endif
-);
-
-extern Status XcmsRGBToRGBi (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colors */,
-    unsigned int	/* ncolors */,
-    Bool*		/* compression_flags_return */
-#endif
-);
-
-extern int XcmsScreenNumberOfCCC (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */
-#endif
-);
-
-extern XcmsColor *XcmsScreenWhitePointOfCCC (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */
-#endif
-);
-
-extern XcmsCCC XcmsSetCCCOfColormap(
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    Colormap		/* colormap */,
-    XcmsCCC		/* ccc */
-#endif
-);
-
-extern XcmsCompressionProc XcmsSetCompressionProc (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsCompressionProc	/* compression_proc */,
-    XPointer		/* client_data */
-#endif
-);
-
-extern XcmsWhiteAdjustProc XcmsSetWhiteAdjustProc (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsWhiteAdjustProc	/* white_adjust_proc */,
-    XPointer		/* client_data */
-#endif
-);
-
-extern Status XcmsSetWhitePoint (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* color */
-#endif
-);
-
-extern Status XcmsStoreColor (
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    Colormap		/* colormap */,
-    XcmsColor*		/* pColor_in */
-#endif
-);
-
-extern Status XcmsStoreColors (
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    Colormap		/* colormap */,
-    XcmsColor*		/* colorArry_in */,
-    unsigned int	/* nColors */,
-    Bool*		/* compArry_return */
-#endif
-);
-
-extern Status XcmsTekHVCClipC(
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colors_in_out */,
-    unsigned int	/* ncolors */,
-    unsigned int	/* index */,
-    Bool*		/* compression_flags_return */
-#endif
-);
-
-extern Status XcmsTekHVCClipV(
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colors_in_out */,
-    unsigned int	/* ncolors */,
-    unsigned int	/* index */,
-    Bool*		/* compression_flags_return */
-#endif
-);
-
-extern Status XcmsTekHVCClipVC(
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colors_in_out */,
-    unsigned int	/* ncolors */,
-    unsigned int	/* index */,
-    Bool*		/* compression_flags_return */
-#endif
-);
-
-extern Status XcmsTekHVCQueryMaxC (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsFloat		/* hue */,
-    XcmsFloat		/* value */,
-    XcmsColor*		/* color_return */
-#endif
-);
-
-extern Status XcmsTekHVCQueryMaxV (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsFloat		/* hue */,
-    XcmsFloat		/* chroma */,
-    XcmsColor*		/* color_return */
-#endif
-);
-
-extern Status XcmsTekHVCQueryMaxVC (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsFloat		/* hue */,
-    XcmsColor*		/* color_return */
-#endif
-);
-
-extern Status XcmsTekHVCQueryMaxVSamples (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsFloat		/* hue */,
-    XcmsColor*		/* colors_return */,
-    unsigned int	/* nsamples */
-#endif
-);
-
-extern Status XcmsTekHVCQueryMinV (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsFloat		/* hue */,
-    XcmsFloat		/* chroma */,
-    XcmsColor*		/* color_return */
-#endif
-);
-
-extern Status XcmsTekHVCToCIEuvY (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* white_point */,
-    XcmsColor*		/* colors */,
-    unsigned int	/* ncolors */
-#endif
-);
-
-extern Status XcmsTekHVCWhiteShiftColors(
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* initial_white_point*/,
-    XcmsColor*		/* target_white_point*/,
-    XcmsColorFormat	/* target_format */,
-    XcmsColor*		/* colors_in_out */,
-    unsigned int	/* ncolors */,
-    Bool*		/* compression_flags_return */
-#endif
-);
-
-extern Visual *XcmsVisualOfCCC (
-#if NeedFunctionPrototypes
-    XcmsCCC		/* ccc */
-#endif
-);
-
-_XFUNCPROTOEND
-
-#endif /* _XCMS_H_ */
diff --git a/xc/lib/X11/Xcms.txt b/xc/lib/X11/Xcms.txt
deleted file mode 100644
index a839043ba..000000000
--- a/xc/lib/X11/Xcms.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * (c) Copyright 1990 1991 Tektronix Inc.
- * 	All Rights Reserved
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appear in all copies and that
- * both that copyright notice and this permission notice appear in
- * supporting documentation, and that the name of Tektronix not be used
- * in advertising or publicity pertaining to distribution of the software
- * without specific, written prior permission.
- *
- * Tektronix disclaims all warranties with regard to this software, including
- * all implied warranties of merchantability and fitness, in no event shall
- * Tektronix be liable for any special, indirect or consequential damages or
- * any damages whatsoever resulting from loss of use, data or profits,
- * whether in an action of contract, negligence or other tortious action,
- * arising out of or in connection with the use or performance of this
- * software.
- *
- *
- *	NAME
- *		Xcms.txt
- *
- *	DESCRIPTION
- *		Sample Color Name Database
- *
- */
-
-
-This device-independent color name database is provided just as an example.
-There are no claims that these color specifications are or should be bound
-to the corresponding color name.
-
-As you can see, the start of the database is indicated by "XCMS_COLORDB_START".
-Anything before this is assumed to be comments.  The "0.1" indicates the
-version number of the format/syntax used in this file.  The color name is
-delimited from the color specification by one or more tabs.
-
-XCMS_COLORDB_START 0.1
-red			CIEXYZ:0.3811/0.2073/0.0213
-green			CIEXYZ:0.3203/0.6805/0.1430
-blue			CIEXYZ:0.2483/0.1122/1.2417
-aquamarine		CIEXYZ:0.5512/0.7909/0.9759
-cadet blue		CIEXYZ:0.2218/0.2815/0.4708
-cornflower blue		CIEXYZ:0.3400/0.3109/1.1067
-navy blue		CIEXYZ:0.0478/0.0216/0.2392
-navy			CIEXYZ:0.0478/0.0216/0.2392
-brown			CIEXYZ:0.1333/0.0772/0.0217
-gray0			TekHVC:0.0/0.0/0.0
-gray10			TekHVC:0.0/10.0/0.0
-gray20			TekHVC:0.0/20.0/0.0
-gray30			TekHVC:0.0/30.0/0.0
-gray40			TekHVC:0.0/40.0/0.0
-gray50			TekHVC:0.0/50.0/0.0
-gray60			TekHVC:0.0/60.0/0.0
-gray70			TekHVC:0.0/70.0/0.0
-gray80			TekHVC:0.0/80.0/0.0
-gray90			TekHVC:0.0/90.0/0.0
-gray100			TekHVC:0.0/100.0/0.0
-XCMS_COLORDB_END
diff --git a/xc/lib/X11/Xcmsint.h b/xc/lib/X11/Xcmsint.h
deleted file mode 100644
index 4866a9ba7..000000000
--- a/xc/lib/X11/Xcmsint.h
+++ /dev/null
@@ -1,246 +0,0 @@
-/* $XConsortium: Xcmsint.h,v 1.19 95/06/08 23:20:39 gildea Exp $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	DESCRIPTION
- *		Private include file for Color Management System.
- *		(i.e., for API internal use only)
- *
- */
-#ifndef _XCMSINT_H_
-#define _XCMSINT_H_
-
-#include <X11/Xcms.h>
-
-/*
- *	DEFINES
- */
-
-	/*
-	 * Private Status Value
-	 */
-#define	_XCMS_NEWNAME	-1
-
-	/*
-	 * Color Space ID's are of XcmsColorFormat type.
-	 *
-	 *	bit 31
-	 *	    0 == Device-Independent
-	 *	    1 == Device-Dependent
-	 *
-	 *	bit 30:
-         *          0 == Registered with X Consortium
-         *          1 == Unregistered
-         */
-#define       XCMS_DD_ID(id)          ((id) & (XcmsColorFormat)0x80000000)
-#define       XCMS_DI_ID(id)          (!((id) & (XcmsColorFormat)0x80000000))
-#define       XCMS_UNREG_ID(id)       ((id) & (XcmsColorFormat)0x40000000)
-#define       XCMS_REG_ID(id)         (!((id) & (XcmsColorFormat)0x40000000))
-#define       XCMS_FIRST_REG_DI_ID    (XcmsColorFormat)0x00000001
-#define       XCMS_FIRST_UNREG_DI_ID  (XcmsColorFormat)0x40000000
-#define       XCMS_FIRST_REG_DD_ID    (XcmsColorFormat)0x80000000
-#define       XCMS_FIRST_UNREG_DD_ID  (XcmsColorFormat)0xc0000000
-
-/*
- *	TYPEDEFS
- */
-
-    /*
-     * Structure for caching Colormap info.
-     *    This is provided for the Xlib modifications to:
-     *		XAllocNamedColor()
-     *		XLookupColor()
-     *		XParseColor()
-     *		XStoreNamedColor()
-     */
-typedef struct _XcmsCmapRec {
-    Colormap cmapID;
-    Display *dpy;
-    Window windowID;
-    Visual *visual;
-    struct _XcmsCCC *ccc;
-    struct _XcmsCmapRec *pNext;
-} XcmsCmapRec;
-
-    /*
-     * Intensity Record (i.e., value / intensity tuple)
-     */
-typedef struct _IntensityRec {
-    unsigned short value;
-    XcmsFloat intensity;
-} IntensityRec;
-
-    /*
-     * Intensity Table
-     */
-typedef struct _IntensityTbl {
-    IntensityRec *pBase;
-    unsigned int nEntries;
-} IntensityTbl;
-
-    /*
-     * Structure for storing per-Visual Intensity Tables (aka gamma maps).
-     */
-typedef struct _XcmsIntensityMap {
-    VisualID visualID;
-    XPointer	screenData;	/* pointer to corresponding Screen Color*/
-				/*	Characterization Data		*/
-    void (*pFreeScreenData)();	/* Function that frees a Screen		*/
-				/*   structure.				*/
-    struct _XcmsIntensityMap *pNext;
-} XcmsIntensityMap;
-
-
-    /*
-     * Structure for storing "registered" color space prefix/ID
-     */
-typedef struct _XcmsRegColorSpaceEntry {
-    char *prefix;	/* Color Space prefix (e.g., "CIEXYZ:") */
-    XcmsColorFormat id;	/* Color Space ID (e.g., XcmsCIEXYZFormat) */
-} XcmsRegColorSpaceEntry;
-
-
-    /*
-     * Xcms Per Display (i.e. connection) related data
-     */
-typedef struct _XcmsPerDpyInfo {
-
-    XcmsCCC paDefaultCCC; /* based on default visual of screen */
-	    /*
-	     * Pointer to an array of XcmsCCC structures, one for
-	     * each screen.
-	     */
-    XcmsCmapRec *pClientCmaps;	/* Pointer to linked list of XcmsCmapRec's */
-
-} XcmsPerDpyInfo, *XcmsPerDpyInfoPtr;
-
-/*
- *	DEFINES
- */
-
-#define XDCCC_NUMBER	0x8000000L	/* 2**27 per XDCCC */
-
-#ifdef GRAY
-#define XDCCC_SCREENWHITEPT_ATOM_NAME	"XDCCC_GRAY_SCREENWHITEPOINT"
-#define XDCCC_GRAY_CORRECT_ATOM_NAME	"XDCCC_GRAY_CORRECTION"
-#endif /* GRAY */
-
-#ifndef _ConversionValues
-typedef struct _ConversionValues {
-    IntensityTbl IntensityTbl;
-} ConversionValues;
-#endif
-
-#ifdef GRAY
-typedef struct {
-    IntensityTbl *IntensityTbl;
-} GRAY_SCCData;
-#endif /* GRAY */
-
-/*
- *	DEFINES
- */
-
-#define XDCCC_MATRIX_ATOM_NAME	"XDCCC_LINEAR_RGB_MATRICES"
-#define XDCCC_CORRECT_ATOM_NAME "XDCCC_LINEAR_RGB_CORRECTION"
-
-typedef struct {
-    XcmsFloat XYZtoRGBmatrix[3][3];
-    XcmsFloat RGBtoXYZmatrix[3][3];
-    IntensityTbl *pRedTbl;
-    IntensityTbl *pGreenTbl;
-    IntensityTbl *pBlueTbl;
-} LINEAR_RGB_SCCData;
-
-/*
- *	DESCRIPTION
- *		Include file for defining the math macros used in the
- *		XCMS source.  Instead of using math library routines
- *		directly, XCMS uses macros so that based on the
- *		definitions here, vendors and sites can specify exactly
- *		what routine will be called (those from libm.a or their
- *		custom routines).  If not defined to math library routines
- *		(e.g., sqrt in libm.a), then the client is not forced to
- *		be linked with -lm.
- */
-
-#define XCMS_ATAN(x)		_XcmsArcTangent(x)
-#define XCMS_COS(x)		_XcmsCosine(x)
-#define XCMS_CUBEROOT(x)	_XcmsCubeRoot(x)
-#define XCMS_FABS(x)		((x) < 0.0 ? -(x) : (x))
-#define XCMS_SIN(x)		_XcmsSine(x)
-#define XCMS_SQRT(x)		_XcmsSquareRoot(x)
-#define XCMS_TAN(x)		(XCMS_SIN(x) / XCMS_COS(x))
-
-#ifdef __STDC__
-double _XcmsArcTangent(double a);
-double _XcmsCosine(double a);
-double _XcmsCubeRoot(double a);
-double _XcmsSine(double a);
-double _XcmsSquareRoot(double a);
-#else
-double _XcmsArcTangent();
-double _XcmsCosine();
-double _XcmsCubeRoot();
-double _XcmsSine();
-double _XcmsSquareRoot();
-#endif
-
-/*
- *  DEFINES FOR GAMUT COMPRESSION AND QUERY ROUTINES
- */
-#ifndef PI
-#  ifdef M_PI
-#    define PI M_PI
-#  else
-#    define PI 3.14159265358979323846264338327950
-#  endif /* M_PI */
-#endif /* PI */
-#ifndef degrees
-#  define degrees(r) ((XcmsFloat)(r) * 180.0 / PI)
-#endif /* degrees */
-#ifndef radians
-#  define radians(d) ((XcmsFloat)(d) * PI / 180.0)
-#endif /* radians */
-
-#define XCMS_CIEUSTAROFHUE(h,c)	\
-((XCMS_COS((h)) == 0.0) ? (XcmsFloat)0.0 : (XcmsFloat) \
-((XcmsFloat)(c) / (XcmsFloat)XCMS_SQRT((XCMS_TAN(h) * XCMS_TAN(h)) + \
-(XcmsFloat)1.0)))
-#define XCMS_CIEVSTAROFHUE(h,c)	\
-((XCMS_COS((h)) == 0.0) ? (XcmsFloat)0.0 : (XcmsFloat) \
-((XcmsFloat)(c) / (XcmsFloat)XCMS_SQRT(((XcmsFloat)1.0 / \
-(XcmsFloat)(XCMS_TAN(h) * XCMS_TAN(h))) + (XcmsFloat)1.0)))
-/* this hue is returned in radians */
-#define XCMS_CIELUV_PMETRIC_HUE(u,v)	\
-(((u) != 0.0) ? XCMS_ATAN( (v) / (u)) : ((v >= 0.0) ? PI / 2 : -(PI / 2)))
-#define XCMS_CIELUV_PMETRIC_CHROMA(u,v)	XCMS_SQRT(((u)*(u)) + ((v)*(v)))
-
-#define XCMS_CIEASTAROFHUE(h,c)		XCMS_CIEUSTAROFHUE((h), (c))
-#define XCMS_CIEBSTAROFHUE(h,c)		XCMS_CIEVSTAROFHUE((h), (c))
-#define XCMS_CIELAB_PMETRIC_HUE(a,b)	XCMS_CIELUV_PMETRIC_HUE((a), (b))
-#define XCMS_CIELAB_PMETRIC_CHROMA(a,b)	XCMS_CIELUV_PMETRIC_CHROMA((a), (b))
-
-#endif /* _XCMSINT_H_ */
diff --git a/xc/lib/X11/XimImSw.h b/xc/lib/X11/XimImSw.h
deleted file mode 100644
index 4307d6fdc..000000000
--- a/xc/lib/X11/XimImSw.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* $XConsortium: XimImSw.h,v 1.3 94/03/31 22:01:03 rws Exp $ */
-/******************************************************************
-
-                Copyright 1992, 1993 by FUJITSU LIMITED
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of FUJITSU LIMITED
-not be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-FUJITSU LIMITED makes no representations about the suitability of
-this software for any purpose. 
-It is provided "as is" without express or implied warranty.
-
-FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-  Author: Takashi Fujiwara     FUJITSU LIMITED 
-                               fujiwara@a80.tech.yk.fujitsu.co.jp
-
-******************************************************************/
-
-#ifndef _XIMIMSW_H
-#define _XIMIMSW_H
-
-typedef struct {
-    Bool	(*checkprocessing)(
-#if NeedNestedPrototypes
-	Xim   im
-#endif
-		);
-    Bool	(*im_open)(
-#if NeedNestedPrototypes
-	Xim   im
-#endif
-		);
-    void	(*im_free)(
-#if NeedNestedPrototypes
-	Xim   im
-#endif
-		);
-} XimImsportSW;
-
-extern XimImsportSW _XimImSportRec[];
-
-#endif /* _XIMIMSW_H */
diff --git a/xc/lib/X11/XimProto.h b/xc/lib/X11/XimProto.h
deleted file mode 100644
index 08b8d00a1..000000000
--- a/xc/lib/X11/XimProto.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/* $XConsortium: XimProto.h,v 1.4 94/09/01 18:44:49 kaleb Exp $ */
-/******************************************************************
-
-           Copyright 1992, 1993 by FUJITSU LIMITED
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of FUJITSU LIMITED
-not be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-FUJITSU LIMITED makes no representations about the suitability of
-this software for any purpose. 
-It is provided "as is" without express or implied warranty.
-
-FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-  Author: Takashi Fujiwara     FUJITSU LIMITED 
-                               fujiwara@a80.tech.yk.fujitsu.co.jp
-
-******************************************************************/
-
-#ifndef _XIMPROTO_H
-#define _XIMPROTO_H
-
-/*
- * Default Preconnection selection target
- */
-#define XIM_SERVERS		"XIM_SERVERS"
-#define XIM_LOCALES		"LOCALES"
-#define XIM_TRANSPORT		"TRANSPORT"
-
-/*
- * categories in XIM_SERVERS
- */
-#define XIM_SERVER_CATEGORY	"@server="
-#define XIM_LOCAL_CATEGORY	"@locale="
-#define XIM_TRANSPORT_CATEGORY	"@transport="
-
-/*
- * Xim implementation revision
- */
-#define PROTOCOLMAJORVERSION		1
-#define PROTOCOLMINORVERSION		0
-
-/*
- * Major Protocol number
- */
-#define	XIM_CONNECT			  1
-#define	XIM_CONNECT_REPLY		  2
-#define	XIM_DISCONNECT			  3
-#define	XIM_DISCONNECT_REPLY		  4
-
-#define XIM_AUTH_REQUIRED		 10
-#define XIM_AUTH_REPLY			 11
-#define XIM_AUTH_NEXT			 12
-#define XIM_AUTH_SETUP			 13
-#define XIM_AUTH_NG			 14
-
-#define	XIM_ERROR			 20
-
-#define	XIM_OPEN			 30
-#define	XIM_OPEN_REPLY			 31
-#define	XIM_CLOSE			 32
-#define	XIM_CLOSE_REPLY			 33
-#define	XIM_REGISTER_TRIGGERKEYS	 34
-#define	XIM_TRIGGER_NOTIFY		 35
-#define	XIM_TRIGGER_NOTIFY_REPLY	 36
-#define	XIM_SET_EVENT_MASK		 37
-#define	XIM_ENCODING_NEGOTIATION	 38
-#define	XIM_ENCODING_NEGOTIATION_REPLY	 39
-#define	XIM_QUERY_EXTENSION		 40
-#define	XIM_QUERY_EXTENSION_REPLY	 41
-#define	XIM_SET_IM_VALUES		 42
-#define	XIM_SET_IM_VALUES_REPLY		 43
-#define	XIM_GET_IM_VALUES		 44
-#define	XIM_GET_IM_VALUES_REPLY		 45
-
-#define XIM_CREATE_IC			 50
-#define	XIM_CREATE_IC_REPLY		 51
-#define	XIM_DESTROY_IC			 52
-#define	XIM_DESTROY_IC_REPLY		 53
-#define XIM_SET_IC_VALUES		 54
-#define	XIM_SET_IC_VALUES_REPLY		 55
-#define XIM_GET_IC_VALUES		 56
-#define XIM_GET_IC_VALUES_REPLY		 57
-#define	XIM_SET_IC_FOCUS		 58
-#define	XIM_UNSET_IC_FOCUS		 59
-#define	XIM_FORWARD_EVENT		 60
-#define	XIM_SYNC			 61
-#define	XIM_SYNC_REPLY			 62
-#define	XIM_COMMIT			 63
-#define	XIM_RESET_IC			 64
-#define	XIM_RESET_IC_REPLY		 65
-
-#define	XIM_GEOMETRY			 70
-#define	XIM_STR_CONVERSION		 71
-#define	XIM_STR_CONVERSION_REPLY	 72
-#define	XIM_PREEDIT_START		 73
-#define	XIM_PREEDIT_START_REPLY		 74
-#define	XIM_PREEDIT_DRAW		 75
-#define	XIM_PREEDIT_CARET		 76
-#define XIM_PREEDIT_CARET_REPLY		 77
-#define	XIM_PREEDIT_DONE		 78
-#define	XIM_STATUS_START		 79
-#define	XIM_STATUS_DRAW			 80
-#define	XIM_STATUS_DONE			 81
-#define	XIM_PREEDITSTATE		 82
-
-/*
- * values for the flag of XIM_ERROR
- */
-#define	XIM_IMID_VALID			0x0001
-#define	XIM_ICID_VALID			0x0002
-
-/*
- * XIM Error Code
- */
-#define XIM_BadAlloc			1
-#define XIM_BadStyle			2
-#define XIM_BadClientWindow		3
-#define XIM_BadFocusWindow		4
-#define XIM_BadArea			5
-#define XIM_BadSpotLocation		6
-#define XIM_BadColormap			7
-#define XIM_BadAtom			8
-#define XIM_BadPixel			9
-#define XIM_BadPixmap			10
-#define XIM_BadName			11
-#define XIM_BadCursor			12
-#define XIM_BadProtocol			13
-#define XIM_BadForeground		14
-#define XIM_BadBackground		15
-#define XIM_LocaleNotSupported		16
-#define XIM_BadSomething		999
-
-/*
- * byte order
- */
-#define BIGENDIAN	(CARD8)0x42	/* MSB first */
-#define LITTLEENDIAN	(CARD8)0x6c	/* LSB first */
-
-/*
- * values for the type of XIMATTR & XICATTR
- */
-#define	XimType_SeparatorOfNestedList	0
-#define	XimType_CARD8			1
-#define	XimType_CARD16			2
-#define	XimType_CARD32			3
-#define	XimType_STRING8			4
-#define	XimType_Window			5
-#define	XimType_XIMStyles		10
-#define	XimType_XRectangle		11
-#define	XimType_XPoint			12
-#define XimType_XFontSet		13
-#define XimType_XIMOptions		14
-#define XimType_XIMHotKeyTriggers	15
-#define XimType_XIMHotKeyState		16
-#define XimType_XIMStringConversion	17
-#define	XimType_NEST			0x7fff
-
-/*
- * values for the category of XIM_ENCODING_NEGITIATON_REPLY
- */
-#define	XIM_Encoding_NameCategory	0
-#define	XIM_Encoding_DetailCategory	1
-
-/*
- * value for the index of XIM_ENCODING_NEGITIATON_REPLY
- */
-#define	XIM_Default_Encoding_IDX	-1
-
-/*
- * value for the flag of XIM_FORWARD_EVENT, XIM_COMMIT
- */
-#define XimSYNCHRONUS		  0x0001
-#define XimLookupChars		  0x0002
-#define XimLookupKeySym		  0x0004
-#define XimLookupBoth		  0x0006
-
-/*
- * request packet header size
- */
-#define XIM_HEADER_SIZE						\
-	  sizeof(CARD8)		/* sizeof mejor-opcode */	\
-	+ sizeof(CARD8)		/* sizeof minor-opcode */	\
-	+ sizeof(INT16)		/* sizeof length */
-
-/*
- * Client Message data size
- */
-#define	XIM_CM_DATA_SIZE	20
-
-/*
- * XIM data structure
- */
-typedef CARD16	BITMASK16;
-typedef CARD32	BITMASK32;
-typedef CARD32	EVENTMASK;
-
-typedef CARD16	XIMID;		/* Input Method ID */
-typedef CARD16	XICID;		/* Input Context ID */
-
-/*
- * Padding macro
- */
-#define	XIM_PAD(length) ((4 - ((length) % 4)) % 4)
-
-#define XIM_SET_PAD(ptr, length)					\
-    {									\
-	register int	 Counter = XIM_PAD((int)length);		\
-	if (Counter) {							\
-	    register char	*Ptr = (char *)(ptr) + (length);	\
-	    length += Counter;						\
-	    for (; Counter; --Counter, ++Ptr)				\
-		*Ptr = '\0';						\
-	}								\
-    }
-
-#endif /* _XIMPROTO_H */
diff --git a/xc/lib/X11/XimThai.h b/xc/lib/X11/XimThai.h
deleted file mode 100644
index ccbb6e4b7..000000000
--- a/xc/lib/X11/XimThai.h
+++ /dev/null
@@ -1,197 +0,0 @@
-/* $TOG: XimThai.h /main/5 1998/02/06 17:58:47 kaleb $ */
-/***********************************************************
-
-Copyright 1993, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1993 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-/*
-**++ 
-**  FACILITY: 
-** 
-**      Xlib 
-** 
-**  ABSTRACT: 
-** 
-**      Definition file for Thai specific functions.  
-** 
-**  MODIFICATION HISTORY: 
-** 
-**/
-
-#ifndef _XIMTHAI_H_
-#define _XIMTHAI_H_
-
-#include <X11/Xlib.h>
-
-/* Classification of characters in TACTIS according to WTT */
-
-#define CTRL    0   /* control chars */
-#define NON     1   /* non composibles */
-#define CONS    2   /* consonants */
-#define LV      3   /* leading vowels */
-#define FV1     4   /* following vowels */
-#define FV2     5
-#define FV3     6
-#define BV1     7   /* below vowels */
-#define BV2     8
-#define BD      9   /* below diacritics */
-#define TONE    10  /* tonemarks */
-#define AD1     11  /* above diacritics */
-#define AD2     12
-#define AD3     13
-#define AV1     14  /* above vowels */
-#define AV2     15
-#define AV3     16
-
-
-/* extended classification */
-
-#define DEAD    17  /* group of non-spacing characters */
-
-
-/* display levels in display cell */
-
-#define NONDISP 0   /* non displayable */
-#define TOP     1
-#define ABOVE   2
-#define BASE    3
-#define BELOW   4
-
-
-/* Input Sequence Check modes */
-
-#define WTT_ISC1        1   /* WTT default ISC mode */
-#define WTT_ISC2        2   /* WTT strict ISC mode */
-#define THAICAT_ISC     3   /* THAICAT ISC mode */
-#define NOISC	      255   /* No ISC */
-
-
-/* Function prototypes (thaisub.c) */
-
-Private
-int THAI_chtype (  		/* returns classification of a char */
-#if NeedFunctionPrototypes
-	unsigned char ch
-#endif
-);
-
-Private
-int THAI_chlevel (		/* returns the display level */
-#if NeedFunctionPrototypes
-	unsigned char ch
-#endif
-);
-
-Private
-Bool THAI_isdead ( 		/* return True if char is non-spacing */
-#if NeedFunctionPrototypes
-	unsigned char ch
-#endif
-);
-
-Private
-Bool THAI_iscons (		/* return True if char is consonant */
-#if NeedFunctionPrototypes
-	unsigned char ch
-#endif
-); 
-
-Private
-Bool THAI_isvowel ( 		/* return True if char is vowel */
-#if NeedFunctionPrototypes
-	unsigned char ch
-#endif
-);
-
-Private
-Bool THAI_istone ( 		/* return True if char is tonemark */
-#if NeedFunctionPrototypes
-	unsigned char ch
-#endif
-);
-
-Private
-Bool THAI_iscomposible (
-#if NeedFunctionPrototypes
-	unsigned char follow_ch, 
-	unsigned char lead_ch
-#endif
-);
-
-Private
-Bool THAI_isaccepted (
-#if NeedFunctionPrototypes
-	unsigned char follow_ch, 
-	unsigned char lead_ch, 
-	unsigned char isc_mode
-#endif
-);
-
-Private
-void THAI_apply_write_rules (
-#if NeedFunctionPrototypes
-	unsigned char  *instr, 
-	unsigned char  *outstr, 
-	unsigned char  insert_ch, 
-	int	       *num_insert_ch
-#endif
-);
-
-Private
-int THAI_find_chtype (
-#if NeedFunctionPrototypes
-	unsigned char  *instr, 
-	int	       chtype
-#endif
-);
-
-Private
-int THAI_apply_scm (
-#if NeedFunctionPrototypes
-	unsigned char  	*instr, 
-	unsigned char	*outstr, 
-	unsigned char	spec_ch, 
-	int		num_sp, 
-	unsigned char	insert_ch
-#endif
-);
-
-#endif /* _XIMTHAI_H_ */
diff --git a/xc/lib/X11/XimTrInt.h b/xc/lib/X11/XimTrInt.h
deleted file mode 100644
index e3aa4e5ed..000000000
--- a/xc/lib/X11/XimTrInt.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* $XConsortium: XimTrInt.h,v 1.4 94/03/26 16:57:07 rws Exp $ */
-/******************************************************************
-
-              Copyright 1992 by Sun Microsystems, Inc.
-	      Copyright 1993, 1994 by FUJITSU LIMITED
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of Sun Microsystems, Inc.
-not be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-Sun Microsystems, Inc. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without
-express or implied warranty.
-
-Sun Microsystems Inc. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
-IN NO EVENT SHALL Sun Microsystems, Inc. BE LIABLE FOR ANY SPECIAL, INDIRECT
-OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
-OR PERFORMANCE OF THIS SOFTWARE.
-
-  Author: Hideki Hiura (hhiura@Sun.COM) Sun Microsystems, Inc.
-	  Takashi Fujiwara     FUJITSU LIMITED
-			       fujiwara@a80.tech.yk.fujitsu.co.jp
-
-******************************************************************/
-
-#ifndef _XIMTRINT_H
-#define _XIMTRINT_H
-
-#if NeedFunctionPrototypes
-#include "Ximint.h"
-#endif
-
-typedef struct {
-    char	*transportname;
-    Bool	 (*config)(
-#if NeedFunctionPrototypes
-			Xim,
-			char *
-#endif
-    );
-} TransportSW;
-
-extern TransportSW _XimTransportRec[];
-
-/*
- * Global symbols
- */
-
-extern Bool	_XimXConf(
-#if NeedFunctionPrototypes
-    Xim		 im,
-    char	*address
-#endif
-);
-
-#if defined(TCPCONN) || defined(UNIXCONN) || defined(DNETCONN) || defined(STREAMSCONN)
-
-extern Bool	_XimTransConf(
-#if NeedFunctionPrototypes
-    Xim		 im,
-    char	*address
-#endif
-);
-
-#endif
-
-#endif /* _XIMTRINT_H */
diff --git a/xc/lib/X11/XimTrX.h b/xc/lib/X11/XimTrX.h
deleted file mode 100644
index 7206e4ff2..000000000
--- a/xc/lib/X11/XimTrX.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* $XConsortium: XimTrX.h,v 1.4 94/03/31 22:01:43 rws Exp $ */
-/******************************************************************
-
-           Copyright 1992 by Sun Microsystems, Inc.
-           Copyright 1992, 1993, 1994 by FUJITSU LIMITED
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of Sun Microsystems, Inc.
-and FUJITSU LIMITED not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior permission.
-Sun Microsystems, Inc. and FUJITSU LIMITED makes no representations about
-the suitability of this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-Sun Microsystems Inc. AND FUJITSU LIMITED DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL Sun Microsystems, Inc. AND FUJITSU LIMITED
-BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-  Author: Hideki Hiura (hhiura@Sun.COM) Sun Microsystems, Inc.
-          Takashi Fujiwara     FUJITSU LIMITED 
-                               fujiwara@a80.tech.yk.fujitsu.co.jp
-
-******************************************************************/
-
-#ifndef _XIMTRX_H
-#define _XIMTRX_H
-
-typedef struct _XIntrCallbackRec	*XIntrCallbackPtr;
-
-typedef struct _XIntrCallbackRec {
-    Bool		 (*func)(
-#if NeedNestedPrototypes
-				 Xim, INT16, XPointer, XPointer
-#endif
-);
-    XPointer		 call_data;
-    XIntrCallbackPtr	 next;
-} XIntrCallbackRec ;
-
-typedef struct _XSpecRec {
-    XIntrCallbackPtr	 intr_cb;
-    Atom		 imconnectid;
-    Atom		 improtocolid;
-    Atom		 immoredataid;
-    Window		 lib_connect_wid;
-    Window		 ims_connect_wid;
-    XPointer		 ev;
-    CARD32		 major_code;
-    CARD32		 minor_code;
-    CARD32		 BoundarySize;
-} XSpecRec;
-
-#define _XIM_PROTOCOL		"_XIM_PROTOCOL"
-#define _XIM_XCONNECT		"_XIM_XCONNECT"
-#define _XIM_MOREDATA		"_XIM_MOREDATA"
-
-#define MAJOR_TRANSPORT_VERSION         0
-#define MINOR_TRANSPORT_VERSION         0
-
-#endif /* _XIMTRX_H */
diff --git a/xc/lib/X11/XimTrans.h b/xc/lib/X11/XimTrans.h
deleted file mode 100644
index 282c0e334..000000000
--- a/xc/lib/X11/XimTrans.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* $XConsortium: XimTrans.h,v 1.3 94/03/26 16:57:12 rws Exp $ */
-/******************************************************************
-
-           Copyright 1992 by Sun Microsystems, Inc.
-           Copyright 1992, 1993, 1994 by FUJITSU LIMITED
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of Sun Microsystems, Inc.
-and FUJITSU LIMITED not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior permission.
-Sun Microsystems, Inc. and FUJITSU LIMITED makes no representations about
-the suitability of this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-Sun Microsystems Inc. AND FUJITSU LIMITED DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL Sun Microsystems, Inc. AND FUJITSU LIMITED
-BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-  Author: Hideki Hiura (hhiura@Sun.COM) Sun Microsystems, Inc.
-          Takashi Fujiwara     FUJITSU LIMITED 
-                               fujiwara@a80.tech.yk.fujitsu.co.jp
-
-******************************************************************/
-
-#ifndef _XIMTRANS_H
-#define _XIMTRANS_H
-
-typedef struct _TransIntrCallbackRec	*TransIntrCallbackPtr;
-
-typedef struct _TransIntrCallbackRec {
-    Bool			(*func)(
-#if NeedNestedPrototypes
-					Xim, INT16, XPointer, XPointer
-#endif
-					);
-    XPointer			 call_data;
-    TransIntrCallbackPtr	 next;
-} TransIntrCallbackRec ;
-
-typedef struct {
-    TransIntrCallbackPtr	 intr_cb;
-    struct _XtransConnInfo 	*trans_conn; /* transport connection object */
-    int				 fd;
-    char			*address;
-    Window			 window;
-    Bool			 is_putback;
-} TransSpecRec;
-
-
-/*
- * Prototypes
- */
-
-extern Bool _XimTransIntrCallback(
-#if NeedFunctionPrototypes
-    Xim		 im,
-    Bool	 (*callback)(
-#if NeedNestedPrototypes
-			     Xim, INT16, XPointer, XPointer
-#endif
-			     ),
-    XPointer	 call_data
-#endif
-);
-
-extern void _XimFreeTransIntrCallback(
-#if NeedFunctionPrototypes
-    Xim		 im
-#endif
-);
-
-extern Bool _XimTransIntrCallbackCheck(
-#if NeedFunctionPrototypes
-    Xim		 im,
-    INT16	 len,
-    XPointer	 data
-#endif
-);
-
-extern Bool _XimTransFilterWaitEvent(
-#if NeedFunctionPrototypes
-    Display	*d,
-    Window	 w,
-    XEvent	*ev,
-    XPointer	 arg
-#endif
-);
-
-extern void _XimTransInternalConnection(
-#if NeedFunctionPrototypes
-    Display	*d,
-    int		 fd,
-    XPointer	 arg
-#endif
-);
-
-extern Bool _XimTransWrite(
-#if NeedFunctionPrototypes
-    Xim		 im,
-    INT16	 len,
-    XPointer	 data
-#endif
-);
-
-extern Bool _XimTransRead(
-#if NeedFunctionPrototypes
-    Xim		 im,
-    XPointer	 recv_buf,
-    int		 buf_len,
-    int		*ret_len
-#endif
-);
-
-extern void _XimTransFlush(
-#if NeedFunctionPrototypes
-    Xim		 im
-#endif
-);
-
-#endif /* _XIMTRANS__H */
diff --git a/xc/lib/X11/Ximint.h b/xc/lib/X11/Ximint.h
deleted file mode 100644
index 5edf9ce63..000000000
--- a/xc/lib/X11/Ximint.h
+++ /dev/null
@@ -1,1148 +0,0 @@
-/* $TOG: Ximint.h /main/12 1998/06/16 16:05:08 kaleb $ */
-/******************************************************************
-
-                Copyright 1992, 1993, 1994 by FUJITSU LIMITED
-                Copyright 1993, 1994 by Sony Corporation
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of FUJITSU LIMITED and
-Sony Corporation not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.  FUJITSU LIMITED and Sony Corporation makes no
-representations about the suitability of this software for any
-purpose.  It is provided "as is" without express or implied warranty. 
-
-FUJITSU LIMITED AND SONY CORPORATION DISCLAIM ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL FUJITSU LIMITED AND
-SONY CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE. 
-
-  Author:   Takashi Fujiwara   FUJITSU LIMITED 
-                               fujiwara@a80.tech.yk.fujitsu.co.jp
-  Motifier: Makoto Wakamatsu   Sony Corporation
-			       makoto@sm.sony.co.jp
-
-******************************************************************/
-/* $XFree86: xc/lib/X11/Ximint.h,v 3.4 1998/10/03 08:41:27 dawes Exp $ */
-
-#ifndef _XIMINT_H
-#define _XIMINT_H
-
-#include <stdio.h>
-#include <X11/Xutil.h>
-
-#define Public /**/
-#define Private static
-
-typedef struct _Xim	*Xim;
-typedef struct _Xic	*Xic;
-
-/*
- * Input Method data
- */
-#include "XimintP.h"
-#include "XimintL.h"
-
-/*
- * XIM dependent data
- */
-typedef union _XIMPrivateRec {
-    XimLocalPrivateRec   local;
-    XimProtoPrivateRec   proto;
-} XIMPrivateRec;
-
-/*
- * IM struct
- */
-typedef struct _Xim {
-    XIMMethods		methods;
-    XIMCoreRec		core;
-    XIMPrivateRec	private;
-} XimRec;
-
-/*
- * IC deprndent data
- */
-typedef union _XICPrivateRec {
-    XicLocalPrivateRec   local;
-    XicProtoPrivateRec   proto;
-} XICPrivateRec;
-
-/*
- * IC struct
- */
-typedef struct _Xic {
-	XICMethods	methods;
-	XICCoreRec	core;
-	XICPrivateRec	private;
-} XicRec;
-
-typedef struct _XimDefIMValues {
-	XIMValuesList		*im_values_list;
-	XIMValuesList		*ic_values_list;
-	XIMStyles		*styles;
-	XIMCallback		 destroy_callback;
-	char			*res_name;
-	char			*res_class;
-	Bool			 visible_position;
-} XimDefIMValues;
-
-typedef struct _XimDefICValues {
-    XIMStyle			 input_style;
-    Window			 client_window;
-    Window			 focus_window;
-    unsigned long		 filter_events;
-    XICCallback			 geometry_callback;
-    char			*res_name;
-    char			*res_class;
-    XICCallback			 destroy_callback;
-    XICCallback			 preedit_state_notify_callback;
-    XICCallback			 string_conversion_callback;
-    XIMStringConversionText	 string_conversion;
-    XIMResetState		 reset_state;
-    XIMHotKeyTriggers		*hotkey;
-    XIMHotKeyState		 hotkey_state;
-    ICPreeditAttributes		 preedit_attr;
-    ICStatusAttributes		 status_attr;
-} XimDefICValues;
-
-#define XIM_MODE_IM_GET		(1 << 0)
-#define XIM_MODE_IM_SET		(1 << 1)
-#define XIM_MODE_IM_DEFAULT	(1 << 2)
-
-#define XIM_MODE_PRE_GET	(1 << 0)
-#define XIM_MODE_PRE_SET	(1 << 1)
-#define XIM_MODE_PRE_CREATE	(1 << 2)
-#define XIM_MODE_PRE_ONCE	(1 << 3)
-#define XIM_MODE_PRE_DEFAULT	(1 << 4)
-
-#define XIM_MODE_STS_GET	(1 << 5)
-#define XIM_MODE_STS_SET	(1 << 6)
-#define XIM_MODE_STS_CREATE	(1 << 7)
-#define XIM_MODE_STS_ONCE	(1 << 8)
-#define XIM_MODE_STS_DEFAULT	(1 << 9)
-
-#define XIM_MODE_IC_GET		(XIM_MODE_PRE_GET      | XIM_MODE_STS_GET)
-#define XIM_MODE_IC_SET		(XIM_MODE_PRE_SET      | XIM_MODE_STS_SET)
-#define XIM_MODE_IC_CREATE	(XIM_MODE_PRE_CREATE   | XIM_MODE_STS_CREATE)
-#define XIM_MODE_IC_ONCE	(XIM_MODE_PRE_ONCE     | XIM_MODE_STS_ONCE)
-#define XIM_MODE_IC_DEFAULT	(XIM_MODE_PRE_DEFAULT  | XIM_MODE_STS_DEFAULT)
-
-#define XIM_MODE_PRE_MASK	(XIM_MODE_PRE_GET    | XIM_MODE_PRE_SET    | \
-				 XIM_MODE_PRE_CREATE | XIM_MODE_PRE_ONCE   | \
-				 XIM_MODE_PRE_DEFAULT)
-#define XIM_MODE_STS_MASK	(XIM_MODE_STS_GET    | XIM_MODE_STS_SET    | \
-				 XIM_MODE_STS_CREATE | XIM_MODE_STS_ONCE   | \
-				 XIM_MODE_STS_DEFAULT)
-
-#define XIM_SETIMDEFAULTS	(1L << 0)
-#define XIM_SETIMVALUES		(1L << 1)
-#define XIM_GETIMVALUES		(1L << 2)
-
-#define XIM_SETICDEFAULTS	(1L << 0)
-#define XIM_CREATEIC		(1L << 1)
-#define XIM_SETICVALUES		(1L << 2)
-#define XIM_GETICVALUES		(1L << 3)
-#define XIM_PREEDIT_ATTR	(1L << 4)
-#define XIM_STATUS_ATTR		(1L << 5)
-
-#define XIM_CHECK_VALID		0
-#define XIM_CHECK_INVALID	1
-#define XIM_CHECK_ERROR		2
-
-#define FILTERD         True
-#define NOTFILTERD      False
-
-#define XIMMODIFIER		"@im="
-
-#define	XIM_TRUE	True
-#define	XIM_FALSE	False
-#define	XIM_OVERFLOW	(-1)
-
-/*
- * Global symbols
- */
-
-extern Bool _XimSetIMResourceList(
-#if NeedFunctionPrototypes
-    XIMResourceList	*res_list,
-    unsigned int	*list_num
-#endif
-);
-
-extern Bool _XimSetICResourceList(
-#if NeedFunctionPrototypes
-    XIMResourceList	*res_list,
-    unsigned int	*list_num
-#endif
-);
-
-extern Bool _XimSetInnerIMResourceList(
-#if NeedFunctionPrototypes
-    XIMResourceList	*res_list,
-    unsigned int	*list_num
-#endif
-);
-
-extern Bool _XimSetInnerICResourceList(
-#if NeedFunctionPrototypes
-    XIMResourceList	*res_list,
-    unsigned int	*list_num
-#endif
-);
-
-extern Bool cw_XimCheckCreateICValues(
-#if NeedFunctionPrototypes
-    XIMResourceList	 res_list,
-    unsigned int	 list_num
-#endif
-);
-
-extern XIMResourceList _XimGetResourceListRec(
-#if NeedFunctionPrototypes
-    XIMResourceList	 res_list,
-    unsigned int	 list_num,
-    char		*name
-#endif
-);
-
-extern void _XimSetIMMode(
-#if NeedFunctionPrototypes
-    XIMResourceList	 res_list,
-    unsigned int	 list_num
-#endif
-);
-
-extern void _XimSetICMode(
-#if NeedFunctionPrototypes
-    XIMResourceList	 res_list,
-    unsigned int	 list_num,
-    XIMStyle		 style
-#endif
-);
-
-extern int _XimCheckIMMode(
-#if NeedFunctionPrototypes
-    XIMResourceList	 res_list,
-    unsigned long	 mode
-#endif
-);
-
-extern int _XimCheckICMode(
-#if NeedFunctionPrototypes
-    XIMResourceList	 res_list,
-    unsigned long	 mode
-#endif
-);
-
-extern Bool _XimSetLocalIMDefaults(
-#if NeedFunctionPrototypes
-    Xim			 im,
-    XPointer		 top,
-    XIMResourceList	 res_list,
-    unsigned int	 list_num
-#endif
-);
-
-extern Bool _XimSetICDefaults(
-#if NeedFunctionPrototypes
-    Xic			 ic,
-    XPointer		 top,
-    unsigned long	 mode,
-    XIMResourceList	 res_list,
-    unsigned int	 list_num
-#endif
-);
-
-extern Bool _XimEncodeLocalIMAttr(
-#if NeedFunctionPrototypes
-    XIMResourceList	 res,
-    XPointer		 top,
-    XPointer		 val
-#endif
-);
-
-extern Bool _XimEncodeLocalICAttr(
-#if NeedFunctionPrototypes
-    Xic			 ic,
-    XIMResourceList	 res,
-    XPointer		 top,
-    XIMArg		*arg,
-    unsigned long	 mode
-#endif
-);
-
-extern Bool _XimCheckLocalInputStyle(
-#if NeedFunctionPrototypes
-    Xic			 ic,
-    XPointer		 top,
-    XIMArg		*values,
-    XIMStyles           *styles,
-    XIMResourceList	 res_list,
-    unsigned int	 list_num
-#endif
-);
-
-extern Bool _XimDecodeLocalIMAttr(
-#if NeedFunctionPrototypes
-    XIMResourceList	 res,
-    XPointer		 top,
-    XPointer		 val
-#endif
-);
-
-extern Bool _XimDecodeLocalICAttr(
-#if NeedFunctionPrototypes
-    XIMResourceList	 res,
-    XPointer		 top,
-    XPointer		 val,
-    unsigned long	mode
-#endif
-);
-
-extern void _XimGetCurrentIMValues(
-#if NeedFunctionPrototypes
-    Xim			 im,
-    XimDefIMValues	*im_values
-#endif
-);
-
-extern void _XimSetCurrentIMValues(
-#if NeedFunctionPrototypes
-    Xim			 im,
-    XimDefIMValues	*im_values
-#endif
-);
-
-extern void _XimGetCurrentICValues(
-#if NeedFunctionPrototypes
-    Xic			 ic,
-    XimDefICValues	*ic_values
-#endif
-);
-
-extern void _XimSetCurrentICValues(
-#if NeedFunctionPrototypes
-    Xic			 ic,
-    XimDefICValues	*ic_values
-#endif
-);
-
-extern void _XimInitialResourceInfo(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void	 _XimParseStringFile(
-#if NeedFunctionPrototypes
-    FILE        *fp,
-    DefTree     **ptop
-#endif
-);
-
-extern Bool	 _XimCheckIfLocalProcessing(
-#if NeedFunctionPrototypes
-    Xim		 im
-#endif
-);
-
-extern Bool	 _XimCheckIfThaiProcessing(
-#if NeedFunctionPrototypes
-    Xim		 im
-#endif
-);
-
-extern Bool	 _XimLocalOpenIM(
-#if NeedFunctionPrototypes
-    Xim		 im
-#endif
-);
-
-extern Bool	 _XimThaiOpenIM(
-#if NeedFunctionPrototypes
-    Xim		 im
-#endif
-);
-
-extern Bool	 _XimProtoOpenIM(
-#if NeedFunctionPrototypes
-    Xim		 im
-#endif
-);
-
-extern void	 _XimLocalIMFree(
-#if NeedFunctionPrototypes
-    Xim		 im
-#endif
-);
-
-extern void	 _XimThaiIMFree(
-#if NeedFunctionPrototypes
-    Xim	         im
-#endif
-);
-
-extern void	 _XimProtoIMFree(
-#if NeedFunctionPrototypes
-    Xim		 im
-#endif
-);
-
-extern char *	 _XimSetIMValueData(
-#if NeedFunctionPrototypes
-    Xim			 im,
-    XPointer		 top,
-    XIMArg		*arg,
-    XIMResourceList	 res_list,
-    unsigned int	 list_num
-#endif
-);
-
-extern char *	 _XimGetIMValueData(
-#if NeedFunctionPrototypes
-    Xim			 im,
-    XPointer		 top,
-    XIMArg		*arg,
-    XIMResourceList	 res_list,
-    unsigned int	 list_num
-#endif
-);
-
-extern char *	 _XimSetICValueData(
-#if NeedFunctionPrototypes
-    Xic			 ic,
-    XPointer		 top,
-    XIMResourceList	 res_list,
-    unsigned int	 list_num,
-    XIMArg		*arg,
-    unsigned long	 mode,
-    Bool		 flag
-#endif
-);
-
-extern char *	 _XimGetICValueData(
-#if NeedFunctionPrototypes
-    Xic			 ic,
-    XPointer		 top,
-    XIMResourceList	 res_list,
-    unsigned int	 list_num,
-    XIMArg		*arg,
-    unsigned long	 mode
-#endif
-);
-
-extern char *	 _XimLocalSetIMValues(
-#if NeedFunctionPrototypes
-    XIM		 im,
-    XIMArg	*arg
-#endif
-);
-
-extern char *	 _XimLocalGetIMValues(
-#if NeedFunctionPrototypes
-    XIM		 im,
-    XIMArg	*arg
-#endif
-);
-
-extern XIC	 _XimLocalCreateIC(
-#if NeedFunctionPrototypes
-    XIM		 im,
-    XIMArg	*arg
-#endif
-);
-
-extern Bool	_XimDispatchInit(
-#if NeedFunctionPrototypes
-    Xim		 im
-#endif
-);
-
-extern Bool	 _XimGetAttributeID(
-#if NeedFunctionPrototypes
-    Xim		 im,
-    CARD16	*buf
-#endif
-);
-
-extern Bool	 _XimExtension(
-#if NeedFunctionPrototypes
-    Xim		 im
-#endif
-);
-
-extern void	_XimDestroyIMStructureList(
-#if NeedFunctionPrototypes
-    Xim		 im
-#endif
-);
-
-extern char *	_XimMakeIMAttrIDList(
-#if NeedFunctionPrototypes
-    Xim			 im,
-    XIMResourceList	 res_list,
-    unsigned int	 res_num,
-    XIMArg		*arg,
-    CARD16		*buf,
-    INT16		*len,
-    unsigned long        mode
-#endif
-);
-
-extern char *	_XimMakeICAttrIDList(
-#if NeedFunctionPrototypes
-    Xic                  ic,
-    XIMResourceList	 res_list,
-    unsigned int	 res_num,
-    XIMArg		*arg,
-    CARD16		*idList,
-    INT16		*num,
-    unsigned long	 mode
-#endif
-);
-
-extern char *	_XimDecodeIMATTRIBUTE(
-#if NeedFunctionPrototypes
-    Xim			 im,
-    XIMResourceList	 res_list,
-    unsigned int	 res_num,
-    CARD16		*buf,
-    INT16		 buf_len,
-    XIMArg		*arg,
-    BITMASK32		 mode
-#endif
-);
-
-extern char *	_XimDecodeICATTRIBUTE(
-#if NeedFunctionPrototypes
-    Xic			 ic,
-    XIMResourceList	 res_list,
-    unsigned int	 res_num,
-    CARD16		*buf,
-    INT16		 buf_len,
-    XIMArg		*arg,
-    BITMASK32		 mode
-#endif
-);
-
-extern Bool	_XimRegProtoIntrCallback(
-#if NeedFunctionPrototypes
-    Xim		 im,
-    CARD16	 major_code,
-    CARD16	 minor_code,
-    Bool	 (*proc)(
-#if NeedNestedPrototypes
-			Xim, INT16, XPointer, XPointer
-#endif
-			),
-    XPointer	 call_data
-#endif
-);
-
-extern Bool	_XimErrorCallback(
-#if NeedFunctionPrototypes
-    Xim		 im,
-    INT16	 len,
-    XPointer	 data,
-    XPointer	 call_data
-#endif
-);
-
-extern Bool	_XimError(
-#if NeedFunctionPrototypes
-    Xim		 im,
-    Xic		 ic,
-    CARD16	 error_code,
-    INT16	 detail_length,
-    CARD16	 type,
-    char	*detail
-#endif
-);
-
-extern Bool	_XimRegisterTriggerKeysCallback(
-#if NeedFunctionPrototypes
-    Xim		 im,
-    INT16	 len,
-    XPointer	 data,
-    XPointer	 call_data
-#endif
-);
-
-extern Bool	_XimSetEventMaskCallback(
-#if NeedFunctionPrototypes
-    Xim		 im,
-    INT16	 len,
-    XPointer	 data,
-    XPointer	 call_data
-#endif
-);
-
-extern Bool	_XimForwardEventCallback(
-#if NeedFunctionPrototypes
-    Xim		 im,
-    INT16	 len,
-    XPointer	 data,
-    XPointer	 call_data
-#endif
-);
-
-extern Bool	_XimCommitCallback(
-#if NeedFunctionPrototypes
-    Xim		 im,
-    INT16	 len,
-    XPointer	 data,
-    XPointer	 call_data
-#endif
-);
-
-extern Bool	_XimSyncCallback(
-#if NeedFunctionPrototypes
-    Xim		 im,
-    INT16	 len,
-    XPointer	 data,
-    XPointer	 call_data
-#endif
-);
-
-extern void	_XimFreeProtoIntrCallback(
-#if NeedFunctionPrototypes
-    Xim		 im
-#endif
-);
-
-extern XIC	 _XimProtoCreateIC(
-#if NeedFunctionPrototypes
-    XIM		 im,
-    XIMArg	*arg
-#endif
-);
-
-extern void	_XimRegisterServerFilter(
-#if NeedFunctionPrototypes
-    Xim		 im
-#endif
-);
-
-extern void	_XimUnregisterServerFilter(
-#if NeedFunctionPrototypes
-    Xim		 im
-#endif
-);
-
-extern Bool	_XimTriggerNotify(
-#if NeedFunctionPrototypes
-    Xim		 im,
-    Xic		 ic,
-    int		 mode,
-    CARD32	 idx
-#endif
-);
-
-extern Bool	_XimProcSyncReply(
-#if NeedFunctionPrototypes
-    Xim		 im,
-    Xic		 ic
-#endif
-);
-
-extern void	_XimSendSetFocus(
-#if NeedFunctionPrototypes
-    Xim		 im,
-    Xic		 ic
-#endif
-);
-
-extern Bool	_XimForwardEvent(
-#if NeedFunctionPrototypes
-    Xic		 ic,
-    XEvent	*ev,
-    Bool	 sync
-#endif
-);
-
-extern void	_XimFreeRemakeArg(
-#if NeedFunctionPrototypes
-    XIMArg	*arg
-#endif
-);
-
-extern void	_XimServerDestroy(
-#if NeedFunctionPrototypes
-    Xim			im
-#endif
-);
-
-extern char *	_XimEncodeIMATTRIBUTE(
-#if NeedFunctionPrototypes
-    Xim			  im,
-    XIMResourceList	  res_list,
-    unsigned int	  res_num,
-    XIMArg               *arg, 
-    XIMArg		**arg_ret,
-    char		 *buf,
-    int			  size,
-    int			 *ret_len,
-    XPointer		  top,
-    unsigned long	  mode
-#endif
-);
-
-extern char *	_XimEncodeICATTRIBUTE(
-#if NeedFunctionPrototypes
-    Xic			  ic,
-    XIMResourceList	  res_list,
-    unsigned int	  res_num,
-    XIMArg               *arg, 
-    XIMArg		**arg_ret,
-    char		 *buf,
-    int			  size,
-    int			 *ret_len,
-    XPointer		  top,
-    BITMASK32		 *flag,
-    unsigned long	  mode
-#endif
-);
-
-#ifdef EXT_MOVE
-extern Bool	_XimExtenMove(
-#if NeedFunctionPrototypes
-    Xim		 im,
-    Xic		 ic,
-    CARD32	 flag,
-    CARD16	*buf,
-    INT16	 length
-#endif
-);
-#endif
-
-extern int	_Ximctstombs(
-#if NeedFunctionPrototypes
-    XIM		 im,
-    char	*from,
-    int		from_len,
-    char	*to,
-    int		to_len,
-    Status	*state
-#endif
-);
-
-extern int	_Ximctstowcs(
-#if NeedFunctionPrototypes
-    XIM		 im,
-    char	*from,
-    int		 from_len,
-    wchar_t	*to,
-    int		 to_len,
-    Status	*state
-#endif
-);
-
-extern int	_XimLcctstombs(
-#if NeedFunctionPrototypes
-    XIM		 im,
-    char	*from,
-    int		from_len,
-    char	*to,
-    int		to_len,
-    Status	*state
-#endif
-);
-
-extern int	_XimLcctstowcs(
-#if NeedFunctionPrototypes
-    XIM		 im,
-    char	*from,
-    int		 from_len,
-    wchar_t	*to,
-    int		 to_len,
-    Status	*state
-#endif
-);
-
-extern void	_XimSetHeader(
-#if NeedFunctionPrototypes
-    XPointer	 buf,
-    CARD8	 major_opcode,
-    CARD8	 minor_opcode,
-    INT16	*len
-#endif
-);
-
-extern Bool	_XimSync(
-#if NeedFunctionPrototypes
-    Xim		 im,
-    Xic		 ic
-#endif
-);
-
-extern int	_XimProtoMbLookupString(
-#if NeedFunctionPrototypes
-    XIC		 xic,
-    XKeyEvent	*ev,
-    char	*buffer,
-    int		 bytes,
-    KeySym	*keysym,
-    Status	*state
-#endif
-);
-
-extern int	_XimProtoWcLookupString(
-#if NeedFunctionPrototypes
-    XIC		 xic,
-    XKeyEvent	*ev,
-    wchar_t	*buffer,
-    int		 bytes,
-    KeySym	*keysym,
-    Status	*state
-#endif
-);
-
-extern void	_XimRegisterFilter(
-#if NeedFunctionPrototypes
-    Xic		 ic
-#endif
-);
-
-extern void	_XimUnregisterFilter(
-#if NeedFunctionPrototypes
-    Xic		 ic
-#endif
-);
-
-extern void	_XimReregisterFilter(
-#if NeedFunctionPrototypes
-    Xic		 ic
-#endif
-);
-
-extern Status	_XimProtoEventToWire(
-#if NeedFunctionPrototypes
-    XEvent	*re,
-    xEvent	*event,
-    Bool	sw
-#endif
-);
-
-extern Bool	_XimProtoWireToEvent(
-#if NeedFunctionPrototypes
-    XEvent	*re,
-    xEvent	*event,
-    Bool	 sw
-#endif
-);
-
-#ifdef EXT_FORWARD
-extern Bool	_XimExtForwardKeyEvent(
-#if NeedFunctionPrototypes
-    Xic		 ic,
-    XKeyEvent	*ev,
-    Bool	 sync
-#endif
-);
-#endif
-
-extern int	_XimLookupMBText(
-#if NeedFunctionPrototypes
-    Xic			 ic,
-    XKeyEvent		*event,
-    char		*buffer,
-    int			 nbytes,
-    KeySym		*keysym,
-    XComposeStatus	*status
-#endif
-);
-
-extern int	_XimLookupWCText(
-#if NeedFunctionPrototypes
-    Xic			 ic,
-    XKeyEvent		*event,
-    wchar_t		*buffer,
-    int			 nbytes,
-    KeySym		*keysym,
-    XComposeStatus	*status
-#endif
-);
-
-extern EVENTMASK	_XimGetWindowEventmask(
-#if NeedFunctionPrototypes
-    Xic		 ic
-#endif
-);
-
-extern Xic	_XimICOfXICID(
-#if NeedFunctionPrototypes
-    Xim		im,
-    XICID	icid
-#endif
-);
-
-extern void	_XimResetIMInstantiateCallback(
-#if NeedFunctionPrototypes
-    Xim         xim
-#endif
-);
-
-extern Bool	_XimRegisterIMInstantiateCallback(
-#if NeedFunctionPrototypes
-    XLCd	 lcd,
-    Display	*display,
-    XrmDatabase	 rdb,
-    char	*res_name,
-    char	*res_class,
-    XIDProc	 callback,
-    XPointer	 client_data
-#endif
-);
-
-extern Bool	_XimUnRegisterIMInstantiateCallback(
-#if NeedFunctionPrototypes
-    XLCd	 lcd,
-    Display	*display,
-    XrmDatabase	 rdb,
-    char	*res_name,
-    char	*res_class,
-    XIDProc	 callback,
-    XPointer	 client_data
-#endif
-);
-
-extern void	_XimFreeCommitInfo(
-#if NeedFunctionPrototypes
-    Xic		 ic
-#endif
-);
-
-extern Bool	_XimConnect(
-#if NeedFunctionPrototypes
-    Xim		 im
-#endif
-);
-
-extern Bool	_XimShutdown(
-#if NeedFunctionPrototypes
-    Xim		 im
-#endif
-);
-
-extern Bool	_XimWrite(
-#if NeedFunctionPrototypes
-    Xim		 im,
-    INT16	 len,
-    XPointer	 data
-#endif
-);
-
-extern Bool	_XimRead(
-#if NeedFunctionPrototypes
-    Xim		 im,
-    INT16	*len,
-    XPointer	 data,
-    int		 data_len,
-    Bool	 (*predicate)(
-#if NeedNestedPrototypes
-			      Xim, INT16, XPointer, XPointer
-#endif
-			      ),
-    XPointer	 arg
-#endif
-);
-
-extern Bool	_XimIntrCallback(
-#if NeedFunctionPrototypes
-    Xim		 im,
-    Bool	 (*callback)(
-#if NeedNestedPrototypes
-			     Xim, INT16, XPointer, XPointer
-#endif
-			     ),
-    XPointer	 call_data
-#endif
-);
-
-extern void	_XimFlush(
-#if NeedFunctionPrototypes
-    Xim		 im
-#endif
-);
-
-extern Bool	_XimFilterWaitEvent(
-#if NeedFunctionPrototypes
-    Xim		 im
-#endif
-);
-
-extern void   _XimProcError(
-#if NeedFunctionPrototypes
-    Xim		im,
-    Xic		ic,
-    XPointer	data
-#endif
-);
-
-#ifdef EXT_MOVE
-extern CARD32	_XimExtenArgCheck(
-#if NeedFunctionProtoTypes
-    XIMArg	*arg
-#endif
-);
-#endif
-
-extern Bool _XimCbDispatch(
-#if NeedFunctionPrototypes
-    Xim im, 
-    INT16 len, 
-    XPointer data, 
-    XPointer call_data
-#endif
-);
-
-extern Bool _XimLocalFilter(
-#if NeedFunctionPrototypes
-    Display		*d,
-    Window		 w,
-    XEvent		*ev,
-    XPointer		 client_data
-#endif
-);
-
-extern XIMResourceList _XimGetResourceListRecByQuark(
-#if NeedFunctionPrototypes
-    XIMResourceList	 res_list,
-    unsigned int	 list_num,
-    XrmQuark		 quark
-#endif
-);
-
-extern Bool _XimReconnectModeCreateIC(
-#if NeedFunctionPrototypes
-    Xic			 ic
-#endif
-);
-
-extern char *_XimLocalSetICValues(
-#if NeedFunctionPrototypes
-    XIC			 ic,
-    XIMArg		*values
-#endif
-);
-
-extern char * _XimLocalGetICValues(
-#if NeedFunctionPrototypes
-    XIC			 ic,
-    XIMArg		*values
-#endif
-);
-
-extern int _XimLocalMbLookupString(
-#if NeedFunctionPrototypes
-    XIC			 ic,
-    XKeyEvent		*ev,
-    char		*buffer,
-    int			 bytes,
-    KeySym		*keysym,
-    Status		*status
-#endif
-);
-
-extern int _XimLocalWcLookupString(
-#if NeedFunctionPrototypes
-    XIC			 ic,
-    XKeyEvent		*ev,
-    wchar_t		*buffer,
-    int			 bytes,
-    KeySym		*keysym,
-    Status		*status
-#endif
-);
-
-extern Bool _XimThaiFilter(
-#if NeedFunctionPrototypes
-    Display		*d,
-    Window		 w,
-    XEvent		*ev,
-    XPointer		 client_data
-#endif
-);
-
-extern XIC _XimThaiCreateIC(
-#if NeedFunctionPrototypes
-    XIM			 im,
-    XIMArg		*values
-#endif
-);
-
-extern Status _XimThaiCloseIM(
-#if NeedFunctionPrototypes
-    XIM			 xim
-#endif
-);
-
-#ifdef XIM_CONNECTABLE
-extern void _XimSetProtoResource(
-#if NeedFunctionPrototypes
-    Xim im
-#endif
-);
-
-extern Bool _XimConnectServer(
-#if NeedFunctionPrototypes
-    Xim im
-#endif
-);
-
-extern Bool _XimDelayModeSetAttr(
-#if NeedFunctionPrototypes
-    Xim			 im
-#endif
-);
-
-extern void	_XimServerReconectableDestroy(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern Bool _XimReCreateIC(
-#if NeedFunctionPrototypes
-    Xic			ic
-#endif
-);
-
-extern Bool _XimEncodeSavedIMATTRIBUTE(
-#if NeedFunctionPrototypes
-    Xim			 im,
-    XIMResourceList	 res_list,
-    unsigned int	 res_num,
-    int			*idx,
-    char		*buf,
-    int			 size,
-    int			*ret_len,
-    XPointer		 top,
-    unsigned long	 mode
-#endif
-);
-
-extern Bool _XimEncodeSavedICATTRIBUTE(
-#if NeedFunctionPrototypes
-    Xic			 ic,
-    XIMResourceList	 res_list,
-    unsigned int	 res_num,
-    int			*idx,
-    char		*buf,
-    int			 size,
-    int			*ret_len,
-    XPointer		 top,
-    unsigned long	 mode
-#endif
-);
-#endif
-
-#endif /* _XIMINT_H */
diff --git a/xc/lib/X11/XimintL.h b/xc/lib/X11/XimintL.h
deleted file mode 100644
index 4eae4d64e..000000000
--- a/xc/lib/X11/XimintL.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* $XConsortium: XimintL.h,v 1.6 94/07/06 14:46:45 kaleb Exp $ */
-/******************************************************************
-
-          Copyright 1991, 1992, 1993, 1994 by FUJITSU LIMITED
-          Copyright 1993 by Digital Equipment Corporation
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of FUJITSU LIMITED and
-Digital Equipment Corporation not be used in advertising or publicity
-pertaining to distribution of the software without specific, written
-prior permission.  FUJITSU LIMITED and Digital Equipment Corporation
-makes no representations about the suitability of this software for
-any purpose.  It is provided "as is" without express or implied
-warranty.
-
-FUJITSU LIMITED AND DIGITAL EQUIPMENT CORPORATION DISCLAIM ALL 
-WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
-FUJITSU LIMITED AND DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR 
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER 
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, 
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF 
-THIS SOFTWARE.
-
-  Author:    Takashi Fujiwara     FUJITSU LIMITED 
-                               	  fujiwara@a80.tech.yk.fujitsu.co.jp
-  Modifier:  Franky Ling          Digital Equipment Corporation
-	                          frankyling@hgrd01.enet.dec.com
-
-******************************************************************/
-
-#ifndef _XIMINTL_H
-#define _XIMINTL_H
-
-#define	COMPOSE_FILE	"Compose"
-
-/*
- * Data Structure for Local Processing
- */
-typedef struct _DefTree {
-    struct _DefTree *next; 		/* another Key definition */
-    struct _DefTree *succession;	/* successive Key Sequence */
-					/* Key definitions */
-    unsigned         modifier_mask;
-    unsigned         modifier;
-    KeySym           keysym;		/* leaf only */
-    char            *mb;
-    wchar_t         *wc;		/* make from mb */
-    KeySym           ks;
-} DefTree;
-
-typedef struct _XimLocalPrivateRec {
-	XIC			 current_ic;
-	DefTree			*top;
-	XlcConv			 ctom_conv;
-	XlcConv			 ctow_conv;
-} XimLocalPrivateRec;
-
-typedef struct _XicThaiPart {
-	int		comp_state;
-	KeySym		keysym;
-	int		input_mode;
-} XicThaiPart;
-
-typedef struct _XicLocalPrivateRec {
-	long			 value_mask;
-	DefTree			*context;
-	DefTree			*composed;
-	XicThaiPart		 thai;
-
-	XIMResourceList		 ic_resources;
-	unsigned int		 ic_num_resources;
-} XicLocalPrivateRec;
-#endif /* _XIMINTL_H */
diff --git a/xc/lib/X11/XimintP.h b/xc/lib/X11/XimintP.h
deleted file mode 100644
index 8f9401fa4..000000000
--- a/xc/lib/X11/XimintP.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/* $XConsortium: XimintP.h,v 1.6 94/03/26 16:57:21 rws Exp $ */
-/******************************************************************
-
-           Copyright 1991, 1992 by Sun Microsystems, Inc.
-           Copyright 1992, 1993, 1994 by FUJITSU LIMITED
-           Copyright 1993, 1994       by Sony Corporation
-
-Permission to use, copy, modify, distribute, and sell this software and
-its documentation for any purpose is hereby granted without fee, provided
-that the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Sun Microsystems, Inc., FUJITSU
-LIMITED and Sony Corporation not be used in advertising or publicity
-pertaining to distribution of the software without specific, written
-prior permission.  Sun Microsystems, Inc., FUJITSU LIMITED and Sony
-Corporation makes no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty. 
-
-Sun Microsystems Inc. ,FUJITSU LIMITED AND SONY CORPORATION DISCLAIMS ALL
-WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL Sun Microsystems, Inc.,
-FUJITSU LIMITED, SONY CORPORATIN BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-  Author: Hideki Hiura (hhiura@Sun.COM) Sun Microsystems, Inc.
-          Takashi Fujiwara     FUJITSU LIMITED 
-                                 fujiwara@a80.tech.yk.fujitsu.co.jp
-	  Makoto Wakamatsu     Sony Corporation
-                                 makoto@sm.sony.co.jp
-	  Hiroyuki Miyamoto    Digital Equipment Corporation
-                                 miyamoto@jrd.dec.com
-
-******************************************************************/
-
-#ifndef _XIMINTP_H
-#define _XIMINTP_H
-
-#include "XimProto.h"
-#include "XlcPublic.h"
-
-/*
- * for protocol layer callback function
- */
-typedef Bool (*XimProtoIntrProc)(
-#if NeedFunctionPrototypes
-	Xim, INT16, XPointer, XPointer
-#endif
-);
-typedef struct _XimProtoIntrRec {
-    XimProtoIntrProc		 func;
-    CARD16			 major_code;
-    CARD16			 minor_code;
-    XPointer			 call_data;
-    struct _XimProtoIntrRec	*next;
-} XimProtoIntrRec;
-
-/*
- * for transport layer methods
- */
-typedef Bool (*XimTransConnectProc)(
-#if NeedFunctionPrototypes
-	 Xim
-#endif
-);
-typedef Bool (*XimTransShutdownProc)(
-#if NeedFunctionPrototypes
-	 Xim
-#endif
-);
-typedef Bool (*XimTransWriteProc)(
-#if NeedFunctionPrototypes
-	 Xim, INT16, XPointer
-#endif
-);
-typedef Bool (*XimTransReadProc)(
-#if NeedFunctionPrototypes
-	 Xim, XPointer, int, int *
-#endif
-);
-typedef void (*XimTransFlushProc)(
-#if NeedFunctionPrototypes
-	 Xim
-#endif
-);
-typedef Bool (*XimTransRegDispatcher)(
-#if NeedNestedPrototypes
-	 Xim, Bool (*)(Xim, INT16, XPointer, XPointer), XPointer
-#endif
-);
-typedef Bool (*XimTransCallDispatcher)(
-#if NeedFunctionPrototypes
-	 Xim, INT16, XPointer
-#endif
-);
-
-/*
- * private part of IM
- */
-typedef struct _XimProtoPrivateRec {
-    Window			 im_window;
-    XIMID			 imid;
-    CARD16			 unused;
-    XIMStyles			*default_styles;
-    CARD32			*im_onkeylist;
-    CARD32			*im_offkeylist;
-    BITMASK32			 flag;
-
-    BITMASK32			 registed_filter_event;
-    EVENTMASK			 forward_event_mask;
-    EVENTMASK			 synchronous_event_mask;
-
-    XimProtoIntrRec		*intrproto;
-    XIMResourceList		 im_inner_resources;
-    unsigned int		 im_num_inner_resources;
-    XIMResourceList		 ic_inner_resources;
-    unsigned int		 ic_num_inner_resources;
-    char			*hold_data;
-    int				 hold_data_len;
-    char			*locale_name;
-    CARD16			 protocol_major_version;
-    CARD16			 protocol_minor_version;
-    XrmQuark			*saved_imvalues;
-    int				 num_saved_imvalues;
-
-    XlcConv			 ctom_conv;
-    XlcConv			 ctow_conv;
-
-    /*
-     * transport specific
-     */
-    XimTransConnectProc		 connect;
-    XimTransShutdownProc	 shutdown;
-    XimTransWriteProc		 write;
-    XimTransReadProc		 read;
-    XimTransFlushProc		 flush;
-    XimTransRegDispatcher	 register_dispatcher;
-    XimTransCallDispatcher	 call_dispatcher;
-    XPointer			 spec;
-} XimProtoPrivateRec;
-
-/*
- * bit mask for the flag of XIMPrivateRec
- */
-#define SERVER_CONNECTED	(1L)
-#define	DYNAMIC_EVENT_FLOW	(1L << 1)
-#define	USE_AUTHORIZATION_FUNC	(1L << 2)
-#ifdef XIM_CONNECTABLE
-#define DELAYBINDABLE		(1L << 3)
-#define RECONNECTABLE		(1L << 4)
-#endif /* XIM_CONNECTABLE */
-
-/*
- * macro for the flag of XIMPrivateRec
- */
-#define IS_SERVER_CONNECTED(im) \
-		((((Xim)im))->private.proto.flag & SERVER_CONNECTED)
-#define MARK_SERVER_CONNECTED(im) \
-		((((Xim)im))->private.proto.flag |= SERVER_CONNECTED)
-#define UNMARK_SERVER_CONNECTED(im) \
-		((((Xim)im))->private.proto.flag &= ~SERVER_CONNECTED)
-
-#define	IS_DYNAMIC_EVENT_FLOW(im) \
-		(((Xim)im)->private.proto.flag & DYNAMIC_EVENT_FLOW)
-#define	MARK_DYNAMIC_EVENT_FLOW(im) \
-		(((Xim)im)->private.proto.flag |= DYNAMIC_EVENT_FLOW)
-
-#define	IS_USE_AUTHORIZATION_FUNC(im) \
-		(((Xim)im)->private.proto.flag & USE_AUTHORIZATION_FUNC)
-#define	MARK_USE_AUTHORIZATION_FUNC(im) \
-		(((Xim)im)->private.proto.flag |= USE_AUTHORIZATION_FUNC)
-
-#ifdef XIM_CONNECTABLE
-#define IS_DELAYBINDABLE(im) \
-		(((Xim)im)->private.proto.flag & DELAYBINDABLE)
-#define MARK_DELAYBINDABLE(im) \
-		(((Xim)im)->private.proto.flag |= DELAYBINDABLE)
-
-#define IS_RECONNECTABLE(im) \
-		(((Xim)im)->private.proto.flag & RECONNECTABLE)
-#define MARK_RECONNECTABLE(im) \
-		(((Xim)im)->private.proto.flag |= RECONNECTABLE)
-
-#define IS_CONNECTABLE(im) \
-    (((Xim)im)->private.proto.flag & (DELAYBINDABLE|RECONNECTABLE))
-#define UNMAKE_CONNECTABLE(im) \
-    (((Xim)im)->private.proto.flag &= ~(DELAYBINDABLE|RECONNECTABLE))
-#endif /* XIM_CONNECTABLE */
-
-/*
- * bit mask for the register_filter_event of XIMPrivateRec/XICPrivateRec
- */
-#define KEYPRESS_MASK		(1L)
-#define KEYRELEASE_MASK		(1L << 1)
-#define DESTROYNOTIFY_MASK	(1L << 2)
-
-typedef struct _XimCommitInfoRec {
-    struct _XimCommitInfoRec	*next;
-    char			*string;
-    int				 string_len;
-    KeySym			*keysym;
-    int				 keysym_len;
-} XimCommitInfoRec, *XimCommitInfo;
-
-typedef struct _XimPendingCallback {
-    int				 major_opcode;
-    Xim				 im;
-    Xic				 ic;
-    char			*proto;
-    int				 proto_len;
-    struct _XimPendingCallback	*next;
-} XimPendingCallbackRec, *XimPendingCallback;
-
-
-/*
- * private part of IC
- */
-typedef struct _XicProtoPrivateRec {
-    XICID	         icid;			/* ICID		*/
-    CARD16		 dmy;
-    BITMASK32		 flag;			/* Input Mode	*/
-
-    BITMASK32		 registed_filter_event; /* registed filter mask */
-    EVENTMASK		 forward_event_mask;	/* forward event mask */
-    EVENTMASK		 synchronous_event_mask;/* sync event mask */
-    EVENTMASK		 filter_event_mask;	/* negrect event mask */
-    EVENTMASK		 intercept_event_mask;	/* deselect event mask */
-    EVENTMASK		 select_event_mask;	/* select event mask */
-
-    char		*preedit_font;		/* Base font name list */
-    int			 preedit_font_length;	/* length of base font name */
-    char		*status_font;		/* Base font name list */
-    int			 status_font_length;	/* length of base font name */
-
-    XimCommitInfo	 commit_info;
-    XIMResourceList	 ic_resources;
-    unsigned int	 ic_num_resources;
-    XIMResourceList	 ic_inner_resources;
-    unsigned int	 ic_num_inner_resources;
-    XrmQuark		*saved_icvalues;
-    int			 num_saved_icvalues;
-    XimPendingCallback	 pend_cb_que;
-    Bool		 waitCallback;
-} XicProtoPrivateRec ;
-
-/*
- * bit mask for the flag of XICPrivateRec
- */
-#define IC_CONNECTED		(1L)
-#define FABLICATED		(1L << 1)
-#define	NEED_SYNC_REPLY		(1L << 2)
-
-/*
- * macro for the flag of XICPrivateRec
- */
-#define	IS_IC_CONNECTED(ic) \
-		(((Xic)ic)->private.proto.flag & IC_CONNECTED)
-#define	MARK_IC_CONNECTED(ic) \
-		(((Xic)ic)->private.proto.flag |= IC_CONNECTED)
-#define	UNMARK_IC_CONNECTED(ic) \
-		(((Xic)ic)->private.proto.flag &= ~IC_CONNECTED)
-
-#define IS_FABLICATED(ic) \
-		(((Xic)ic)->private.proto.flag & FABLICATED)
-#define MARK_FABLICATED(ic) \
-		(((Xic)ic)->private.proto.flag |= FABLICATED)
-#define UNMARK_FABLICATED(ic) \
-		(((Xic)ic)->private.proto.flag &= ~FABLICATED)
-
-#define	IS_NEED_SYNC_REPLY(ic) \
-		(((Xic)ic)->private.proto.flag & NEED_SYNC_REPLY)
-#define	MARK_NEED_SYNC_REPLY(ic) \
-		(((Xic)ic)->private.proto.flag |= NEED_SYNC_REPLY)
-#define	UNMARK_NEED_SYNC_REPLY(ic) \
-		(((Xic)ic)->private.proto.flag &= ~NEED_SYNC_REPLY)
-
-/*
- * macro for the filter_event_mask of XICPrivateRec
- */
-#define	IS_NEGLECT_EVENT(ic, mask) \
-		(((Xic)ic)->private.proto.filter_event_mask & (mask))
-
-/*
- * macro for the forward_event_mask of XICPrivateRec
- */
-#define	IS_FORWARD_EVENT(ic, mask) \
-		(((Xic)ic)->private.proto.forward_event_mask & (mask))
-
-/*
- * macro for the synchronous_event_mask of XICPrivateRec
- */
-#define	IS_SYNCHRONOUS_EVENT(ic, mask) \
-   ((((Xic)ic)->private.proto.synchronous_event_mask & (mask)) ? True: False)
-
-#define XIM_MAXIMNAMELEN 64
-#define XIM_MAXLCNAMELEN 64
-
-#endif /* _XIMINTP_H */
diff --git a/xc/lib/X11/Xintatom.h b/xc/lib/X11/Xintatom.h
deleted file mode 100644
index 910c0fa21..000000000
--- a/xc/lib/X11/Xintatom.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* $XFree86: xc/lib/X11/Xintatom.h,v 1.1 2001/08/18 02:41:28 dawes Exp $ */
-
-#ifndef _XINTATOM_H_
-#define _XINTATOM_H_ 1
-
-#include <X11/Xfuncproto.h>
-
-/* IntAtom.c */
-
-#define TABLESIZE 64
-
-typedef struct _Entry {
-    unsigned long sig;
-    Atom atom;
-} EntryRec, *Entry;
-
-#define RESERVED ((Entry) 1)
-
-#define EntryName(e) ((char *)(e+1))
-
-typedef struct _XDisplayAtoms {
-    Entry table[TABLESIZE];
-} AtomTable;
-
-_XFUNCPROTOBEGIN
-
-extern void _XUpdateAtomCache(Display *dpy, const char *name, Atom atom,
-				unsigned long sig, int idx, int n);
-extern void _XFreeAtomTable(Display *dpy);
-
-_XFUNCPROTOEND
-
-#endif /* _XINTATOM_H_ */
diff --git a/xc/lib/X11/Xintconn.h b/xc/lib/X11/Xintconn.h
deleted file mode 100644
index 3010da4f0..000000000
--- a/xc/lib/X11/Xintconn.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* $XFree86: xc/lib/X11/Xintconn.h,v 1.1 2001/08/18 02:41:28 dawes Exp $ */
-
-#ifndef _XINTCONN_H_
-#define _XINTCONN_H_ 1
-
-#include <X11/Xfuncproto.h>
-
-_XFUNCPROTOBEGIN
-
-/* ConnDis.c */
-
-extern int _XDisconnectDisplay(XtransConnInfo trans_conn);
-extern Bool _XSendClientPrefix(Display *dpy, xConnClientPrefix *client,
-				char *auth_proto, char *auth_string,
-				xConnSetupPrefix *prefix);
-extern XtransConnInfo _X11TransConnectDisplay(char *display_name,
-				char **fullnamep, int *dpynump,
-				int *screenp, char **auth_namep,
-				int *auth_namelenp, char **auth_datap,
-				int *auth_datalenp);
-
-/* OpenDis.c */
-extern void _XFreeDisplayStructure(Display *dpy);
-
-_XFUNCPROTOEND
-
-#endif /* _XINTCONN_H_ */
diff --git a/xc/lib/X11/XlcGeneric.h b/xc/lib/X11/XlcGeneric.h
deleted file mode 100644
index dbc874298..000000000
--- a/xc/lib/X11/XlcGeneric.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/* $XConsortium: XlcGeneric.h /main/7 1996/12/05 10:38:44 swick $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-/*
- * Copyright 1995 by FUJITSU LIMITED
- * This is source code modified by FUJITSU LIMITED under the Joint
- * Development Agreement for the CDE/Motif PST.
- *
- * Modifier: Takanori Tateno   FUJITSU LIMITED
- *
- */
-
-#ifndef _XLCGENERIC_H_
-#define _XLCGENERIC_H_
-
-#include "XlcPubI.h"
-
-typedef struct _ByteInfo {
-     unsigned char start,end;
-} ByteInfoRec, *ByteInfo;
-
-typedef struct _ByteInfoList {
-    int 	M;                          /* 1 <= M <= length */
-    int 	byteinfo_num;
-    ByteInfo 	byteinfo;
-} ByteInfoListRec, *ByteInfoList;
-
-/* conversion_type values */
-#define LOCALCONV      1
-#define FILECONV       2
-#define FUNCTIONCONV   4
-
-typedef struct _Conversion {
-    unsigned long 	conversion_type;
-    int       		conv_num;
-    FontScope 		convlist;
-    char      		*cnv_file;
-    XlcConv    		cnvfunc;
-} ConversionRec, *Conversion;
-
-typedef struct _ExtdSegment {
-    char    	*name;
-    XlcSide 	side;
-    FontScope 	area;
-    int 	area_num;
-    XlcCharSet  charset;
-} ExtdSegmentRec, *ExtdSegment;
-
-typedef struct _SegConvRec {
-    int         	length;
-    char        	*source_encoding;
-    XlcCharSet		source;
-    char        	*destination_encoding;
-    XlcCharSet		dest;
-    FontScopeRec   	range;
-    int         	conv_num;
-    FontScope   	conv;
-} SegConvRec, *SegConv;
-
-typedef struct _ParseInfoRec *ParseInfo;
-
-typedef struct _CodeSetRec {
-    XlcCharSet 		*charset_list;
-    int 		num_charsets;
-    int 		cs_num;
-    XlcSide 		side;
-    int 		length;
-    ByteInfoList 	byteM;
-    Conversion 		mbconv;
-    Conversion 		ctconv;
-    ExtdSegment 	ctextseg;
-    ParseInfo 		parse_info;
-    unsigned long 	wc_encoding;
-} CodeSetRec, *CodeSet;
-
-typedef enum {
-    E_GL,			/* GL encoding */
-    E_GR,			/* GR encoding */
-    E_SS,			/* single shift */
-    E_LSL,			/* locking shift left */
-    E_LSR,			/* locking shift right */
-    E_LAST
-} EncodingType;
-
-typedef struct _ParseInfoRec {
-    EncodingType 	type;
-    char 		*encoding;
-    CodeSet 		codeset;
-} ParseInfoRec;
-
-/*
- * XLCd private data
- */
-
-#define XLC_GENERIC(lcd, x)	(((XLCdGeneric) lcd->core)->gen.x)
-#define XLC_GENERIC_PART(lcd)	(&(((XLCdGeneric) lcd->core)->gen))
-
-typedef struct _XLCdGenericPart {
-    int 		codeset_num;
-    CodeSet 		*codeset_list;
-    unsigned char 	*mb_parse_table;
-    int 		mb_parse_list_num;
-    ParseInfo 		*mb_parse_list;
-    unsigned long 	wc_encode_mask;
-    unsigned long 	wc_shift_bits;
-    CodeSet 		initial_state_GL;
-    CodeSet 		initial_state_GR;
-    int  		segment_conv_num;  /* UDC */
-    SegConv 		segment_conv;      /* UDC */
-#ifndef X_NOT_STDC_ENV
-    Bool 		use_stdc_env;
-    Bool 		force_convert_to_mb;
-#endif
-} XLCdGenericPart;
-
-typedef struct _XLCdGenericRec {
-    XLCdCoreRec 	core;	
-    XLCdPublicPart 	pub;
-    XLCdGenericPart 	gen;	
-} XLCdGenericRec, *XLCdGeneric;
-
-extern XLCdMethods _XlcGenericMethods;
-
-#endif  /* _XLCGENERIC_H_ */
diff --git a/xc/lib/X11/XlcPubI.h b/xc/lib/X11/XlcPubI.h
deleted file mode 100644
index 16a456906..000000000
--- a/xc/lib/X11/XlcPubI.h
+++ /dev/null
@@ -1,246 +0,0 @@
-/* $TOG: XlcPubI.h /main/8 1997/06/03 15:52:40 kaleb $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-/* $XFree86: xc/lib/X11/XlcPubI.h,v 3.4 1997/11/22 12:50:07 dawes Exp $ */
-
-#ifndef _XLCPUBLICI_H_
-#define _XLCPUBLICI_H_
-
-#include "XlcPublic.h"
-
-#define XLC_PUBLIC(lcd, x)	(((XLCdPublic) lcd->core)->pub.x)
-#define XLC_PUBLIC_PART(lcd)	(&(((XLCdPublic) lcd->core)->pub))
-#define XLC_PUBLIC_METHODS(lcd)	(&(((XLCdPublicMethods) lcd->methods)->pub))
-
-/*
- * XLCd public methods
- */
-
-typedef struct _XLCdPublicMethodsRec *XLCdPublicMethods;
-
-typedef XLCd (*XlcPubCreateProc)(
-#if NeedFunctionPrototypes
-    _Xconst char*	/* name */,
-    XLCdMethods		/* methods */
-#endif
-);
-
-typedef Bool (*XlcPubInitializeProc)(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */
-#endif
-);
-
-typedef void (*XlcPubDestroyProc)(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */
-#endif
-);
-
-typedef char* (*XlcPubGetValuesProc)(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */,
-    XlcArgList		/* args */,
-    int			/* num_args */
-#endif
-);
-
-typedef void (*XlcPubGetResourceProc)(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */,
-    char*		/* category */,
-    char*		/* class */,
-    char***		/* value */,
-    int*		/* count */
-#endif
-);
-
-typedef struct _XLCdPublicMethodsPart {
-    XLCdPublicMethods superclass;
-    XlcPubCreateProc create;
-    XlcPubInitializeProc initialize;
-    XlcPubDestroyProc destroy;
-    XlcPubGetValuesProc get_values;
-    XlcPubGetResourceProc get_resource;
-} XLCdPublicMethodsPart;
-
-typedef struct _XLCdPublicMethodsRec {
-    XLCdMethodsRec core;
-    XLCdPublicMethodsPart pub;
-} XLCdPublicMethodsRec;
-
-/*
- * XLCd public data
- */
-
-typedef struct _XLCdPublicPart {
-    char *siname;			/* for _XlcMapOSLocaleName() */
-    char *language;			/* language part of locale name */
-    char *territory;			/* territory part of locale name */
-    char *codeset;			/* codeset part of locale name */
-    char *encoding_name;		/* encoding name */
-    int mb_cur_max;			/* ANSI C MB_CUR_MAX */
-    Bool is_state_depend;		/* state-depend encoding */
-    char *default_string;		/* for XDefaultString() */
-    XPointer xlocale_db;
-} XLCdPublicPart;
-
-typedef struct _XLCdPublicRec {
-    XLCdCoreRec core;	
-    XLCdPublicPart pub;
-} XLCdPublicRec, *XLCdPublic;
-
-extern XLCdMethods _XlcPublicMethods;
-
-_XFUNCPROTOBEGIN
-
-extern XLCd _XlcCreateLC(
-#if NeedFunctionPrototypes
-    _Xconst char*	/* name */,
-    XLCdMethods		/* methods */
-#endif
-);
-
-extern void _XlcDestroyLC(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */
-#endif
-);
-
-extern Bool _XlcParseCharSet(
-#if NeedFunctionPrototypes
-    XlcCharSet		/* charset */
-#endif
-);
-
-extern XlcCharSet _XlcCreateDefaultCharSet(
-#if NeedFunctionPrototypes
-    _Xconst char*	/* name */,
-    char*		/* control_sequence */
-#endif
-);
-
-extern XlcCharSet _XlcAddCT(
-#if NeedFunctionPrototypes
-    _Xconst char*	/* name */,
-    char*		/* control_sequence */
-#endif
-);
-
-extern XrmMethods _XrmDefaultInitParseInfo(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */,
-    XPointer*		/* state */
-#endif
-);
-
-extern int _XmbTextPropertyToTextList(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */,
-    Display*		/* dpy */,
-    XTextProperty*	/* text_prop */,
-    char***		/* list_ret */,
-    int*		/* count_ret */
-#endif
-);
-
-extern int _XwcTextPropertyToTextList(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */,
-    Display*		/* dpy */,
-    XTextProperty*	/* text_prop */,
-    wchar_t***		/* list_ret */,
-    int*		/* count_ret */
-#endif
-);
-
-extern int _XmbTextListToTextProperty(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */,
-    Display*		/* dpy */,
-    char**		/* list */,
-    int			/* count */,
-    XICCEncodingStyle	/* style */,
-    XTextProperty*	/* text_prop */
-#endif
-);
-
-extern int _XwcTextListToTextProperty(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */,
-    Display*		/* dpy */,
-    wchar_t**		/* list */,
-    int			/* count */,
-    XICCEncodingStyle	/* style */,
-    XTextProperty*	/* text_prop */
-#endif
-);
-
-extern void _XwcFreeStringList(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */,
-    wchar_t**		/* list */
-#endif
-);
-
-extern int _XlcResolveLocaleName(
-#if NeedFunctionPrototypes
-    char*		/* lc_name */,
-    XLCdPublicPart*	/* pub */
-#endif
-);
-
-extern int _XlcResolveI18NPath(
-#if NeedFunctionPrototypes
-    char*		/* buf */,
-    int			/* buf_len */
-#endif
-);
-
-extern XPointer _XlcCreateLocaleDataBase(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */
-#endif
-);
-
-extern void _XlcDestroyLocaleDataBase(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */
-#endif
-);
-
-extern void _XlcGetLocaleDataBase(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */,
-    char*		/* category */,
-    char*		/* name */,
-    char***		/* value */,
-    int*		/* count */
-#endif
-);
-
-_XFUNCPROTOEND
-
-#endif  /* _XLCPUBLICI_H_ */
diff --git a/xc/lib/X11/XlcPublic.h b/xc/lib/X11/XlcPublic.h
deleted file mode 100644
index 11a170efb..000000000
--- a/xc/lib/X11/XlcPublic.h
+++ /dev/null
@@ -1,287 +0,0 @@
-/* $TOG: XlcPublic.h /main/6 1997/06/22 07:38:55 kaleb $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-/*
- * Copyright 1995 by FUJITSU LIMITED
- * This is source code modified by FUJITSU LIMITED under the Joint
- * Development Agreement for the CDE/Motif PST.
- *
- * Modifier: Takanori Tateno   FUJITSU LIMITED
- *
- */
-
-#ifndef _XLCPUBLIC_H_
-#define _XLCPUBLIC_H_
-
-#include "Xlcint.h"
-
-#define XlcNCharSize 		"charSize"
-#define XlcNCodeset 		"codeset"
-#define XlcNControlSequence 	"controlSequence"
-#define XlcNDefaultString 	"defaultString"
-#define XlcNEncodingName 	"encodingName"
-#define XlcNLanguage 		"language"
-#define XlcNMbCurMax 		"mbCurMax"
-#define XlcNName 		"name"
-#define XlcNSetSize 		"setSize"
-#define XlcNSide 		"side"
-#define XlcNStateDependentEncoding "stateDependentEncoding"
-#define XlcNTerritory 		"territory"
-
-typedef enum {
-    XlcUnknown, XlcC0, XlcGL, XlcC1, XlcGR, XlcGLGR, XlcOther, XlcNONE
-} XlcSide;
-
-typedef struct _FontScope {
-        unsigned long   start;
-        unsigned long   end;
-        unsigned long   shift;
-        unsigned long   shift_direction;
-} FontScopeRec, *FontScope;
-
-typedef struct _UDCArea {
-        unsigned long 	start,end;
-} UDCAreaRec, *UDCArea;
-
-typedef struct _XlcCharSetRec *XlcCharSet;
-
-typedef char* (*XlcGetCSValuesProc)(
-#if NeedFunctionPrototypes
-    XlcCharSet		/* charset */,
-    XlcArgList		/* args */,
-    int			/* num_args */
-#endif
-);
-
-typedef struct _XlcCharSetRec {
-    char 		*name;		/* character set name */
-    XrmQuark 		xrm_name;
-    char 		*encoding_name;	/* XLFD encoding name */
-    XrmQuark 		xrm_encoding_name;
-    XlcSide 		side;		/* GL, GR or others */
-    int 		char_size;	/* number of bytes per character */
-    int 		set_size;	/* graphic character sets */
-    char 		*ct_sequence;	/* control sequence of CT */
-    XlcGetCSValuesProc 	get_values;
-    /* UDC */
-    Bool        	string_encoding;
-    UDCArea 		udc_area;
-    int     		udc_area_num;
-} XlcCharSetRec;
-
-/*
- * conversion methods
- */
-
-typedef struct _XlcConvRec *XlcConv;
-
-typedef XlcConv (*XlcOpenConverterProc)(
-#if NeedFunctionPrototypes
-    XLCd		/* from_lcd */,
-    char*		/* from_type */,
-    XLCd		/* to_lcd */,
-    char*		/* to_type */
-#endif
-);
-
-typedef void (*XlcCloseConverterProc)(
-#if NeedFunctionPrototypes
-    XlcConv		/* conv */
-#endif
-);
-
-typedef int (*XlcConvertProc)(
-#if NeedFunctionPrototypes
-    XlcConv		/* conv */,
-    XPointer*		/* from */,
-    int*		/* from_left */,
-    XPointer*		/* to */,
-    int*		/* to_left */,
-    XPointer*		/* args */,
-    int			/* num_args */
-#endif
-);
-
-typedef void (*XlcResetConverterProc)(
-#if NeedFunctionPrototypes
-    XlcConv		/* conv */
-#endif
-);
-
-typedef struct _XlcConvMethodsRec{
-    XlcCloseConverterProc 	close;
-    XlcConvertProc 		convert;
-    XlcResetConverterProc 	reset;
-} XlcConvMethodsRec, *XlcConvMethods;
-
-/*
- * conversion data
- */
-
-#define XlcNMultiByte 		"multiByte"
-#define XlcNWideChar 		"wideChar"
-#define XlcNCompoundText 	"compoundText"
-#define XlcNString 		"string"
-#define XlcNCharSet 		"charSet"
-#define XlcNCTCharSet 		"CTcharSet"
-#define XlcNChar 		"char"
-
-typedef struct _XlcConvRec {
-    XlcConvMethods 		methods;
-    XPointer 			state;
-} XlcConvRec;
-
-
-_XFUNCPROTOBEGIN
-
-extern Bool _XInitOM(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */
-#endif
-);
-
-extern Bool _XInitIM(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */
-#endif
-);
-
-extern char *_XGetLCValues(
-#if NeedVarargsPrototypes
-    XLCd		/* lcd */,
-    ...
-#endif
-);
-
-extern XlcCharSet _XlcGetCharSet(
-#if NeedFunctionPrototypes
-    char*		/* name */
-#endif
-);
-
-extern Bool _XlcAddCharSet(
-#if NeedFunctionPrototypes
-    XlcCharSet		/* charset */
-#endif
-);
-
-extern char *_XlcGetCSValues(
-#if NeedVarargsPrototypes
-    XlcCharSet		/* charset */,
-    ...
-#endif
-);
-
-extern XlcConv _XlcOpenConverter(
-#if NeedFunctionPrototypes
-    XLCd		/* from_lcd */,
-    char*		/* from_type */,
-    XLCd		/* to_lcd */,
-    char*		/* to_type */
-#endif
-);
-
-extern void _XlcCloseConverter(
-#if NeedFunctionPrototypes
-    XlcConv		/* conv */
-#endif
-);
-
-extern int _XlcConvert(
-#if NeedFunctionPrototypes
-    XlcConv		/* conv */,
-    XPointer*		/* from */,
-    int*		/* from_left */,
-    XPointer*		/* to */,
-    int*		/* to_left */,
-    XPointer*		/* args */,
-    int			/* num_args */
-#endif
-);
-
-extern void _XlcResetConverter(
-#if NeedFunctionPrototypes
-    XlcConv		/* conv */
-#endif
-);
-
-extern Bool _XlcSetConverter(
-#if NeedFunctionPrototypes
-    XLCd			/* from_lcd */,
-    char*			/* from_type */,
-    XLCd			/* to_lcd */,
-    char*			/* to_type */,
-    XlcOpenConverterProc	/* open_converter */
-#endif
-);
-
-extern void _XlcGetResource(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */,
-    char*		/* category */,
-    char*		/* class */,
-    char***		/* value */,
-    int*		/* count */
-#endif
-);
-
-extern char *_XlcFileName(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */,
-    char*		/* category */
-#endif
-);
-
-extern int _Xwcslen(
-#if NeedFunctionPrototypes
-    wchar_t*		/* wstr */
-#endif
-);
-
-extern wchar_t *_Xwcscpy(
-#if NeedFunctionPrototypes
-    wchar_t*		/* wstr1 */,
-    wchar_t*		/* wstr2 */
-#endif
-);
-
-extern int _XlcCompareISOLatin1(
-#if NeedFunctionPrototypes
-    char*		/* str1 */,
-    char*		/* str2 */
-#endif
-);
-
-extern int _XlcNCompareISOLatin1(
-#if NeedFunctionPrototypes
-    char*		/* str1 */,
-    char*		/* str2 */,
-    int			/* len */
-#endif
-);
-
-_XFUNCPROTOEND
-
-#endif  /* _XLCPUBLIC_H_ */
diff --git a/xc/lib/X11/Xlcint.h b/xc/lib/X11/Xlcint.h
deleted file mode 100644
index 53f0ed6b5..000000000
--- a/xc/lib/X11/Xlcint.h
+++ /dev/null
@@ -1,1000 +0,0 @@
-/* $TOG: Xlcint.h /main/26 1998/02/06 18:01:56 kaleb $ */
-/*
-
-Copyright 1991, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/Xlcint.h,v 3.4 1998/10/03 08:41:28 dawes Exp $ */
-
-/*
- * Copyright 1990, 1991 by OMRON Corporation, NTT Software Corporation,
- *                      and Nippon Telegraph and Telephone Corporation
- * Copyright 1991 by the Open Software Foundation
- * Copyright 1993 by the TOSHIBA Corp.
- * Copyright 1993, 1994 by Sony Corporation
- * Copyright 1993, 1994 by the FUJITSU LIMITED
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the names of OMRON, NTT Software, NTT, Open
- * Software Foundation, and Sony Corporation not be used in advertising
- * or publicity pertaining to distribution of the software without specific, 
- * written prior permission. OMRON, NTT Software, NTT, Open Software
- * Foundation, and Sony Corporation  make no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- *
- * OMRON, NTT SOFTWARE, NTT, OPEN SOFTWARE FOUNDATION, AND SONY 
- * CORPORATION DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT 
- * SHALL OMRON, NTT SOFTWARE, NTT, OPEN SOFTWARE FOUNDATION, OR SONY 
- * CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT 
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- * 
- *	Authors: Li Yuhong		OMRON Corporation
- *		 Tatsuya Kato		NTT Software Corporation
- *		 Hiroshi Kuribayashi	OMRON Coproration
- *		 Muneiyoshi Suzuki	Nippon Telegraph and Telephone Co.
- * 
- *		 M. Collins		OSF  
- *		 Katsuhisa Yano		TOSHIBA Corp.
- *               Makoto Wakamatsu       Sony Corporation
- *               Takashi Fujiwara	FUJITSU LIMITED
- */				
-
-
-#ifndef	_XLCINT_H_
-#define	_XLCINT_H_
-
-#include <X11/Xresource.h>
-#include <X11/Xutil.h>
-#include "Xvarargs.h"
-
-typedef Bool (*XFilterEventProc)(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* window */,
-    XEvent*		/* event */,
-    XPointer		/* client_data */
-#endif
-);
-
-typedef struct _XIMFilter {
-    struct _XIMFilter *next;
-    Window window;
-    unsigned long event_mask;
-    int start_type, end_type;
-    XFilterEventProc filter;
-    XPointer client_data;
-} XFilterEventRec, *XFilterEventList;
-
-typedef struct {
-    char    *name;
-    XPointer value;
-} XIMArg;
-
-#ifdef offsetof
-#define XOffsetOf(s_type,field) offsetof(s_type,field)
-#else
-#define XOffsetOf(s_type,field) ((unsigned int)&(((s_type*)NULL)->field))
-#endif
-
-#define XIMNumber(arr) ((unsigned int) (sizeof(arr) / sizeof(arr[0])))
-
-/*
- * define secondary data structs which are part of Input Methods
- * and Input Context
- */
-typedef struct {
-    char		*resource_name;		/* Resource string */
-    XrmQuark		xrm_name;		/* Resource name quark */
-    int			resource_size;		/* Size in bytes of data */
-    long		resource_offset;	/* Offset from base */
-    unsigned short 	mode;			/* Read Write Permission */
-    unsigned short 	id;			/* Input Method Protocol */
-} XIMResource, *XIMResourceList;
-
-/*
- * data block describing the visual attributes associated with
- * an input context
- */
-typedef struct {
-    XRectangle		area;
-    XRectangle		area_needed;
-    XPoint		spot_location;
-    Colormap		colormap;
-    Atom		std_colormap;
-    unsigned long	foreground;
-    unsigned long	background;
-    Pixmap		background_pixmap;
-    XFontSet            fontset;
-    int	       		line_spacing;
-    Cursor		cursor;
-    XICCallback		start_callback;
-    XICCallback		done_callback;
-    XICCallback		draw_callback;
-    XICCallback		caret_callback;
-    XIMPreeditState	preedit_state;
-    XICCallback		state_notify_callback;
-} ICPreeditAttributes, *ICPreeditAttributesPtr;
-
-typedef struct {
-    XRectangle		area;
-    XRectangle		area_needed;
-    Colormap		colormap;
-    Atom		std_colormap;
-    unsigned long	foreground;
-    unsigned long	background;
-    Pixmap		background_pixmap;
-    XFontSet            fontset;
-    int	       		line_spacing;
-    Cursor		cursor;
-    XICCallback		start_callback;
-    XICCallback		done_callback;
-    XICCallback		draw_callback;
-} ICStatusAttributes, *ICStatusAttributesPtr;
-
-/*
- * Methods for Xrm parsing
- */
-
-typedef void (*XmbInitProc)(
-#if NeedFunctionPrototypes
-    XPointer		/* state */
-#endif
-);
-
-typedef char (*XmbCharProc)(
-#if NeedFunctionPrototypes
-    XPointer		/* state */,
-    char*		/* str */,
-    int*		/* lenp */
-#endif
-);
-
-typedef void (*XmbFinishProc)(
-#if NeedFunctionPrototypes
-    XPointer		/* state */
-#endif
-);
-
-typedef char* (*XlcNameProc)(
-#if NeedFunctionPrototypes
-    XPointer		/* state */
-#endif
-);
-
-typedef void (*XrmDestroyProc)(
-#if NeedFunctionPrototypes
-    XPointer		/* state */
-#endif
-);
-
-typedef struct {
-    XmbInitProc		mbinit;
-    XmbCharProc		mbchar;
-    XmbFinishProc	mbfinish;
-    XlcNameProc		lcname;
-    XrmDestroyProc	destroy;
-} XrmMethodsRec, *XrmMethods;
-
-typedef struct _XLCd *XLCd; /* need forward reference */
-
-/*
- * define an LC, it's methods, and data.
- */
-
-typedef void (*XCloseLCProc)(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */
-#endif
-);
-
-typedef char* (*XlcMapModifiersProc)(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */,
-    char*		/* user_mods */,
-    char*		/* prog_mods */
-#endif
-);
-
-typedef XOM (*XOpenOMProc)(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */,
-    Display*		/* display */,
-    XrmDatabase		/* rdb */,
-    _Xconst char*	/* res_name */,
-    _Xconst char*	/* res_class */
-#endif
-);
-
-typedef XIM (*XOpenIMProc)(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */,
-    Display*		/* display */,
-    XrmDatabase		/* rdb */,
-    char*		/* res_name */,
-    char*		/* res_class */
-#endif
-);
-
-typedef Bool (*XRegisterIMInstantiateCBProc)(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */,
-    Display*		/* display */,
-    XrmDatabase		/* rdb */,
-    char*		/* res_name */,
-    char*		/* res_class */,
-    XIDProc		/* callback */,
-    XPointer		/* client_data */
-#endif
-);
-
-typedef Bool (*XUnregisterIMInstantiateCBProc)(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */,
-    Display*		/* display */,
-    XrmDatabase		/* rdb */,
-    char*		/* res_name */,
-    char*		/* res_class */,
-    XIDProc		/* callback */,
-    XPointer		/* client_data */
-#endif
-);
-
-typedef XrmMethods (*XrmInitParseInfoProc)(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */,
-    XPointer*		/* state */
-#endif
-);
-
-typedef int (*XmbTextPropertyToTextListProc)(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */,
-    Display*		/* display */,
-    XTextProperty*	/* text_prop */,
-    char***		/* list_return */,
-    int*		/* count_return */
-#endif
-);
-
-typedef int (*XwcTextPropertyToTextListProc)(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */,
-    Display*		/* display */,
-    XTextProperty*	/* text_prop */,
-    wchar_t***		/* list_return */,
-    int*		/* count_return */
-#endif
-);
-
-typedef int (*XmbTextListToTextPropertyProc)(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */,
-    Display*		/* display */,
-    char**		/* list */,
-    int			/* count */,
-    XICCEncodingStyle	/* style */,
-    XTextProperty*	/* text_prop_return */
-#endif
-);
-
-typedef int (*XwcTextListToTextPropertyProc)(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */,
-    Display*		/* display */,
-    wchar_t**		/* list */,
-    int			/* count */,
-    XICCEncodingStyle	/* style */,
-    XTextProperty*	/* text_prop_return */
-#endif
-);
-
-typedef void (*XwcFreeStringListProc)(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */,
-    wchar_t**		/* list */
-#endif
-);
-
-typedef char* (*XDefaultStringProc)(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */
-#endif
-);
-
-typedef struct {
-    XCloseLCProc			close;
-    XlcMapModifiersProc			map_modifiers;
-    XOpenOMProc				open_om;
-    XOpenIMProc				open_im;
-    XrmInitParseInfoProc		init_parse_info;
-    XmbTextPropertyToTextListProc	mb_text_prop_to_list;
-    XwcTextPropertyToTextListProc	wc_text_prop_to_list;
-    XmbTextListToTextPropertyProc	mb_text_list_to_prop;
-    XwcTextListToTextPropertyProc	wc_text_list_to_prop;
-    XwcFreeStringListProc		wc_free_string_list;
-    XDefaultStringProc			default_string;
-    XRegisterIMInstantiateCBProc	register_callback;
-    XUnregisterIMInstantiateCBProc	unregister_callback;
-} XLCdMethodsRec, *XLCdMethods;
-
-
-typedef struct {
-    char*		name;			/* name of this LC */
-    char*		modifiers;		/* modifiers of locale */
-} XLCdCoreRec, *XLCdCore;
-
-
-typedef struct _XLCd {
-    XLCdMethods		methods;		/* methods of this LC */
-    XLCdCore		core;			/* data of this LC */
-    XPointer		opaque;			/* LDX specific data */
-} XLCdRec;
-
-typedef int XlcPosition;
-
-#define XlcHead		0
-#define XlcTail		-1
-
-typedef struct {
-    char *name;
-    XPointer value;
-} XlcArg, *XlcArgList;
-
-typedef struct _XlcResource {
-    char *name;
-    XrmQuark xrm_name;
-    int size;
-    int offset;
-    unsigned long mask;
-} XlcResource, *XlcResourceList;
-
-#define XlcCreateMask	(1L<<0)
-#define XlcDefaultMask	(1L<<1)
-#define XlcGetMask	(1L<<2)
-#define XlcSetMask	(1L<<3)
-#define XlcIgnoreMask	(1L<<4)
-
-#define XlcNumber(arr)	(sizeof(arr) / sizeof(arr[0]))
-
-typedef Status (*XCloseOMProc)(
-#if NeedFunctionPrototypes
-    XOM			/* om */
-#endif
-);
-
-typedef char* (*XSetOMValuesProc)(
-#if NeedFunctionPrototypes
-    XOM			/* om */,
-    XlcArgList		/* args */,
-    int			/* num_args */
-#endif
-);
-
-typedef char* (*XGetOMValuesProc)(
-#if NeedFunctionPrototypes
-    XOM			/* om */,
-    XlcArgList		/* args */,
-    int			/* num_args */
-#endif
-);
-
-typedef XOC (*XCreateOCProc)(
-#if NeedFunctionPrototypes
-    XOM			/* om */,
-    XlcArgList		/* args */,
-    int			/* num_args */
-#endif
-);
-
-typedef struct _XOMMethodsRec {
-    XCloseOMProc	close;
-    XSetOMValuesProc	set_values;
-    XGetOMValuesProc	get_values;
-    XCreateOCProc	create_oc;
-} XOMMethodsRec, *XOMMethods;
-
-typedef struct _XOMCoreRec {
-    XLCd lcd;				/* lcd */
-    Display *display;			/* display */
-    XrmDatabase rdb;			/* database */
-    char *res_name;			/* resource name */
-    char *res_class;			/* resource class */
-    XOC oc_list;			/* xoc list */
-    XlcResourceList resources;		/* xom resources */
-    int num_resources;			/* number of xom resources */
-    XOMCharSetList required_charset;	/* required charset list */
-    XOMOrientation orientation_list;	/* orientation list */
-    Bool directional_dependent;		/* directional-dependent */
-    Bool contextual_drawing;		/* contextual drawing */
-    Bool context_dependent;		/* context-dependent drawing */
-} XOMCoreRec, *XOMCore;
-
-typedef struct _XOM {
-    XOMMethods methods;
-    XOMCoreRec core;
-} XOMRec;
-
-typedef void (*XDestroyOCProc)(
-#if NeedFunctionPrototypes
-    XOC			/* oc */
-#endif
-);
-
-typedef char* (*XSetOCValuesProc)(
-#if NeedFunctionPrototypes
-    XOC			/* oc */,
-    XlcArgList		/* args */,
-    int			/* num_args */
-#endif
-);
-
-typedef char* (*XGetOCValuesProc)(
-#if NeedFunctionPrototypes
-    XOC			/* oc */,
-    XlcArgList		/* args */,
-    int			/* num_args */
-#endif
-);
-
-/*
- * X Font Sets are an instantiable object, so we define it, the 
- * object itself, a method list and data
- */
-
-/* 
- * XFontSet object method list
- */
-
-typedef int (*XmbTextEscapementProc)(
-#if NeedFunctionPrototypes
-    XFontSet		/* font_set */,
-    _Xconst char*	/* text */,
-    int			/* text_len */
-#endif
-);
-
-typedef int (*XmbTextExtentsProc)(
-#if NeedFunctionPrototypes
-    XFontSet		/* font_set */,
-    _Xconst char*	/* text */,
-    int			/* text_len */,
-    XRectangle*		/* overall_ink_extents */,
-    XRectangle*		/* overall_logical_extents */
-#endif
-);
-
-typedef Status (*XmbTextPerCharExtentsProc)(
-#if NeedFunctionPrototypes
-    XFontSet		/* font_set */,
-    _Xconst char*	/* text */,
-    int			/* text_len */,
-    XRectangle*		/* ink_extents_buffer */,
-    XRectangle*		/* logical_extents_buffer */,
-    int			/* buffer_size */,
-    int*		/* num_chars */,
-    XRectangle*		/* max_ink_extents */,
-    XRectangle*		/* max_logical_extents */
-#endif
-);
-
-typedef int (*XmbDrawStringProc)(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* drawable */,
-    XFontSet		/* font_set */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    _Xconst char*	/* text */,
-    int			/* text_len */
-#endif
-);
-
-typedef void (*XmbDrawImageStringProc)(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* drawable */,
-    XFontSet		/* font_set */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    _Xconst char*	/* text */,
-    int			/* text_len */
-#endif
-);
-
-typedef int (*XwcTextEscapementProc)(
-#if NeedFunctionPrototypes
-    XFontSet		/* font_set */,
-    _Xconst wchar_t*	/* text */,
-    int			/* text_len */
-#endif
-);
-
-typedef int (*XwcTextExtentsProc)(
-#if NeedFunctionPrototypes
-    XFontSet		/* font_set */,
-    _Xconst wchar_t*	/* text */,
-    int			/* text_len */,
-    XRectangle*		/* overall_ink_extents */,
-    XRectangle*		/* overall_logical_extents */
-#endif
-);
-
-typedef Status (*XwcTextPerCharExtentsProc)(
-#if NeedFunctionPrototypes
-    XFontSet		/* font_set */,
-    _Xconst wchar_t*	/* text */,
-    int			/* text_len */,
-    XRectangle*		/* ink_extents_buffer */,
-    XRectangle*		/* logical_extents_buffer */,
-    int			/* buffer_size */,
-    int*		/* num_chars */,
-    XRectangle*		/* max_ink_extents */,
-    XRectangle*		/* max_logical_extents */
-#endif
-);
-
-typedef int (*XwcDrawStringProc)(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* drawable */,
-    XFontSet		/* font_set */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    _Xconst wchar_t*	/* text */,
-    int			/* text_len */
-#endif
-);
-
-typedef void (*XwcDrawImageStringProc)(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* drawable */,
-    XFontSet		/* font_set */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    _Xconst wchar_t*	/* text */,
-    int			/* text_len */
-#endif
-);
-
-typedef struct {
-    XDestroyOCProc 		destroy;
-    XSetOCValuesProc 		set_values;
-    XGetOCValuesProc 		get_values;
-
-    /* multi-byte text drawing methods */
-
-    XmbTextEscapementProc	mb_escapement;
-    XmbTextExtentsProc		mb_extents;
-    XmbTextPerCharExtentsProc	mb_extents_per_char;
-    XmbDrawStringProc		mb_draw_string;
-    XmbDrawImageStringProc	mb_draw_image_string;
-
-    /* wide character text drawing methods */
-
-    XwcTextEscapementProc	wc_escapement;
-    XwcTextExtentsProc		wc_extents;
-    XwcTextPerCharExtentsProc	wc_extents_per_char;
-    XwcDrawStringProc		wc_draw_string;
-    XwcDrawImageStringProc	wc_draw_image_string;
-} XOCMethodsRec, *XOCMethods;
-
-
-/*
- * XOC independent data
- */
-
-typedef struct {
-    XOM om;				/* XOM */
-    XOC next;				/* next XOC */
-    XlcResourceList resources;		/* xoc resources */
-    int num_resources;			/* number of xoc resources */
-    char *base_name_list;     		/* base font name list */
-    Bool om_automatic;			/* OM Automatic */
-    XOMFontInfo font_info;		/* font info */
-    XFontSetExtents font_set_extents;  	/* font set extents */
-    char *default_string;     		/* default string */
-    XOMCharSetList missing_list;	/* missing charset list */
-    XOrientation orientation;		/* orientation */
-    char *res_name;			/* resource name */
-    char *res_class;			/* resource class */
-} XOCCoreRec, *XOCCore;
-
-typedef struct _XOC {
-    XOCMethods methods;
-    XOCCoreRec core;
-} XOCRec;
-
-
-/* current Ultrix compiler gets horribly confused */
-#if defined(FUNCPROTO) && defined(ultrix)
-#undef NeedFunctionPrototypes
-#endif
-
-
-/*
- * X Input Managers are an instantiable object, so we define it, the 
- * object itself, a method list and data.
- */
-
-/*
- * an Input Manager object method list
- */
-typedef struct {
-    Status (*close)(
-#if NeedFunctionPrototypes
-	XIM
-#endif
-	);
-    char* (*set_values)(
-#if NeedFunctionPrototypes
-	XIM, XIMArg*
-#endif
-	);
-    char* (*get_values)(
-#if NeedFunctionPrototypes
-	XIM, XIMArg*
-#endif
-	);
-    XIC (*create_ic)(
-#if NeedFunctionPrototypes
-	XIM, XIMArg*
-#endif
-	);
-    int (*ctstombs)(
-#if NeedFunctionPrototypes
-	XIM, char*, int, char*, int, Status *
-#endif
-	);
-    int (*ctstowcs)(
-#if NeedFunctionPrototypes
-	XIM, char*, int, wchar_t*, int, Status *
-#endif
-	);
-} XIMMethodsRec, *XIMMethods;
-
-/*
- * Input Manager LC independent data
- */
-typedef struct {
-    XLCd		lcd;			/* LC of this input method */
-    XIC			ic_chain;		/* list of ICs for this IM */
-
-    Display *		display;               	/* display */
-    XrmDatabase 	rdb;
-    char *		res_name;
-    char *		res_class;
-
-    XIMValuesList	*im_values_list;
-    XIMValuesList	*ic_values_list;
-    XIMStyles		*styles;
-    XIMCallback		 destroy_callback;
-    char *		im_name;		/* XIMMODIFIER name */
-    XIMResourceList	im_resources;		/* compiled IM resource list */
-    unsigned int	im_num_resources;
-    XIMResourceList	ic_resources;		/* compiled IC resource list */
-    unsigned int	ic_num_resources;
-    Bool		visible_position;
-} XIMCoreRec, *XIMCore;
-
-
-
-/*
- * An X Input Manager (IM).  Implementations may need to extend this data 
- * structure to accomodate additional data, state information etc.
- */
-typedef struct _XIM {
-    XIMMethods		methods;		/* method list of this IM */
-    XIMCoreRec		core;			/* data of this IM */
-} XIMRec;
-
-
-
-/*
- * X Input Contexts (IC) are an instantiable object, so we define it, the 
- * object itself, a method list and data for this object
- */
-
-/*
- * Input Context method list
- */ 
-typedef struct {
-    void (*destroy)(
-#if NeedFunctionPrototypes
-	XIC
-#endif
-	);
-    void (*set_focus)(
-#if NeedFunctionPrototypes
-	XIC
-#endif
-	);
-    void (*unset_focus)(
-#if NeedFunctionPrototypes
-	XIC
-#endif
-	);
-    char* (*set_values)(
-#if NeedFunctionPrototypes
-	XIC, XIMArg*
-#endif
-	);
-    char* (*get_values)(
-#if NeedFunctionPrototypes
-	XIC, XIMArg*
-#endif
-	);
-    char* (*mb_reset)(
-#if NeedFunctionPrototypes
-	XIC
-#endif
-	);
-    wchar_t* (*wc_reset)(
-#if NeedFunctionPrototypes
-	XIC
-#endif
-	);
-    int (*mb_lookup_string)(
-#if NeedFunctionPrototypes
-	XIC, XKeyEvent*, char*, int, KeySym*, Status*
-#endif
-	);
-    int (*wc_lookup_string)(
-#if NeedFunctionPrototypes
-	XIC, XKeyEvent*, wchar_t*, int, KeySym*, Status*
-#endif
-	);
-} XICMethodsRec, *XICMethods;
-
-
-/*
- * Input Context LC independent data
- */
-typedef struct {
-    XIM			im;			/* XIM this IC belongs too */
-    XIC			next;			/* linked list of ICs for IM */
-
-    Window		client_window;		/* window IM can use for */
-						/* display or subwindows */
-    XIMStyle		input_style;		/* IM's input style */
-    Window		focus_window;		/* where key events go */
-    unsigned long	filter_events;		/* event mask from IM */
-    XICCallback		geometry_callback;	/* client callback */
-    char *		res_name;
-    char *		res_class;
-
-    XICCallback		destroy_callback;
-    XICCallback		string_conversion_callback;
-    XIMStringConversionText	 string_conversion;
-    XIMResetState	reset_state;
-    XIMHotKeyTriggers  *hotkey;
-    XIMHotKeyState	hotkey_state;
-
-    ICPreeditAttributes	preedit_attr;		/* visuals of preedit area */
-    ICStatusAttributes	status_attr;		/* visuals of status area */
-} XICCoreRec, *XICCore;
-
-
-/*
- * an Input Context.  Implementations may need to extend this data 
- * structure to accomodate additional data, state information etc.
- */
-typedef struct _XIC {
-    XICMethods		methods;		/* method list of this IC */
-    XICCoreRec		core;			/* data of this IC */
-} XICRec;
-
-/* current Ultrix compiler gets horribly confused */
-#if !defined(NeedFunctionPrototypes) && defined(FUNCPROTO)
-#define NeedFunctionPrototypes 1
-#endif
-
-typedef XLCd (*XLCdLoadProc)(
-#if NeedFunctionPrototypes
-    _Xconst char*
-#endif
-);
-
-_XFUNCPROTOBEGIN
-
-extern XLCd _XOpenLC(
-#if NeedFunctionPrototypes
-    _Xconst char*	/* name */
-#endif
-);
-
-extern void _XCloseLC(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */
-#endif
-);
-
-extern XLCd _XlcCurrentLC(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern Bool _XlcValidModSyntax(
-#if NeedFunctionPrototypes
-    char*	/* mods */,
-    char**	/* valid */
-#endif
-);
-
-extern char *_XlcDefaultMapModifiers(
-#if NeedFunctionPrototypes
-    XLCd	/* lcd */,
-    char*	/* user_mods */,
-    char*	/* prog_mods */
-#endif
-);
-
-extern void _XIMCompileResourceList(
-#if NeedFunctionPrototypes
-    XIMResourceList	/* res */,
-    unsigned int	/* num_res */
-#endif
-);
-
-extern void _XCopyToArg(
-#if NeedFunctionPrototypes
-    XPointer		/* src */,
-    XPointer*		/* dst */,
-    unsigned int	/* size */
-#endif
-);
-
-extern char ** _XParseBaseFontNameList(
-#if NeedFunctionPrototypes
-    char*		/* str */,
-    int*		/* num */
-#endif
-);
-
-extern XrmMethods _XrmInitParseInfo(
-#if NeedFunctionPrototypes
-	XPointer*	/* statep */
-#endif
-);
-
-extern void _XRegisterFilterByMask(
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    Window		/* window */,
-    unsigned long	/* event_mask */,
-    Bool (*)(
-#if NeedNestedPrototypes
-	     Display*	/* display */,
-	     Window	/* window */,
-	     XEvent*	/* event */,
-	     XPointer	/* client_data */
-#endif
-	     )		/* filter */,
-    XPointer		/* client_data */
-#endif
-);
-
-extern void _XRegisterFilterByType(
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    Window		/* window */,
-    int			/* start_type */,
-    int			/* end_type */,
-    Bool (*)(
-#if NeedNestedPrototypes
-	     Display*	/* display */,
-	     Window	/* window */,
-	     XEvent*	/* event */,
-	     XPointer	/* client_data */
-#endif
-	     )		/* filter */,
-    XPointer		/* client_data */
-#endif
-);
-
-extern void _XUnregisterFilter(
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    Window		/* window */,
-    Bool (*)(
-#if NeedNestedPrototypes
-	     Display*	/* display */,
-	     Window	/* window */,
-	     XEvent*	/* event */,
-	     XPointer	/* client_data */
-#endif
-	     )		/* filter */,
-    XPointer		/* client_data */
-#endif
-);
-
-extern void _XlcCountVaList(
-#if NeedFunctionPrototypes
-    va_list		/* var */,
-    int*		/* count_return */
-#endif
-);
-
-extern void _XlcVaToArgList(
-#if NeedFunctionPrototypes
-    va_list		/* var */,
-    int			/* count */,
-    XlcArgList*		/* args_return */
-#endif
-);
-
-extern void _XlcCompileResourceList(
-#if NeedFunctionPrototypes
-    XlcResourceList	/* resources */,
-    int			/* num_resources */
-#endif
-);
-
-extern char *_XlcGetValues(
-#if NeedFunctionPrototypes
-    XPointer		/* base */,
-    XlcResourceList	/* resources */,
-    int			/* num_resources */,
-    XlcArgList		/* args */,
-    int			/* num_args */,
-    unsigned long	/* mask */
-#endif
-);
-
-extern char *_XlcSetValues(
-#if NeedFunctionPrototypes
-    XPointer		/* base */,
-    XlcResourceList	/* resources */,
-    int			/* num_resources */,
-    XlcArgList		/* args */,
-    int			/* num_args */,
-    unsigned long	/* mask */
-#endif
-);
-
-extern Bool _XlcAddLoader(
-#if NeedFunctionPrototypes
-    XLCdLoadProc	/* proc */,
-    XlcPosition		/* position */
-#endif
-);
-
-extern void _XlcRemoveLoader(
-#if NeedFunctionPrototypes
-    XLCdLoadProc	/* proc */
-#endif
-);
-
-_XFUNCPROTOEND
-
-#endif	/* _XLCINT_H_ */
diff --git a/xc/lib/X11/Xlib.h b/xc/lib/X11/Xlib.h
deleted file mode 100644
index 9f5547297..000000000
--- a/xc/lib/X11/Xlib.h
+++ /dev/null
@@ -1,4728 +0,0 @@
-/* $TOG: Xlib.h /main/122 1998/03/22 18:22:09 barstow $ */
-/* 
-
-Copyright 1985, 1986, 1987, 1991, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/Xlib.h,v 3.15 1999/05/15 06:24:47 dawes Exp $ */
-
-
-/*
- *	Xlib.h - Header definition and support file for the C subroutine
- *	interface library (Xlib) to the X Window System Protocol (V11).
- *	Structures and symbols starting with "_" are private to the library.
- */
-#ifndef _XLIB_H_
-#define _XLIB_H_
-
-#define XlibSpecificationRelease 6
-
-#ifdef USG
-#ifndef __TYPES__
-#include <sys/types.h>			/* forgot to protect it... */
-#define __TYPES__
-#endif /* __TYPES__ */
-#else
-#if defined(_POSIX_SOURCE) && defined(MOTOROLA)
-#undef _POSIX_SOURCE
-#include <sys/types.h>
-#define _POSIX_SOURCE
-#else
-#include <sys/types.h>
-#endif
-#endif /* USG */
-
-#include <X11/X.h>
-
-/* applications should not depend on these two headers being included! */
-#include <X11/Xfuncproto.h>
-#include <X11/Xosdefs.h>
-
-#ifndef X_WCHAR
-#ifdef X_NOT_STDC_ENV
-#ifndef SCO324
-#ifndef ISC
-#define X_WCHAR
-#endif
-#endif
-#endif
-#endif
-
-#ifndef X_WCHAR
-#include <stddef.h>
-#else
-#ifdef __EMX__
-#include <stdlib.h>
-#else
-/* replace this with #include or typedef appropriate for your system */
-typedef unsigned long wchar_t;
-#endif
-#endif
-
-#if defined(ISC) && defined(USE_XMBTOWC)
-#define wctomb(a,b)	_Xwctomb(a,b)
-#define mblen(a,b)	_Xmblen(a,b) 
-#ifndef USE_XWCHAR_STRING
-#define mbtowc(a,b,c)	_Xmbtowc(a,b,c)
-#endif
-#endif
-
-typedef char *XPointer;
-
-#define Bool int
-#define Status int
-#define True 1
-#define False 0
-
-#define QueuedAlready 0
-#define QueuedAfterReading 1
-#define QueuedAfterFlush 2
-
-#define ConnectionNumber(dpy) 	(((_XPrivDisplay)dpy)->fd)
-#define RootWindow(dpy, scr) 	(ScreenOfDisplay(dpy,scr)->root)
-#define DefaultScreen(dpy) 	(((_XPrivDisplay)dpy)->default_screen)
-#define DefaultRootWindow(dpy) 	(ScreenOfDisplay(dpy,DefaultScreen(dpy))->root)
-#define DefaultVisual(dpy, scr) (ScreenOfDisplay(dpy,scr)->root_visual)
-#define DefaultGC(dpy, scr) 	(ScreenOfDisplay(dpy,scr)->default_gc)
-#define BlackPixel(dpy, scr) 	(ScreenOfDisplay(dpy,scr)->black_pixel)
-#define WhitePixel(dpy, scr) 	(ScreenOfDisplay(dpy,scr)->white_pixel)
-#define AllPlanes 		((unsigned long)~0L)
-#define QLength(dpy) 		(((_XPrivDisplay)dpy)->qlen)
-#define DisplayWidth(dpy, scr) 	(ScreenOfDisplay(dpy,scr)->width)
-#define DisplayHeight(dpy, scr) (ScreenOfDisplay(dpy,scr)->height)
-#define DisplayWidthMM(dpy, scr)(ScreenOfDisplay(dpy,scr)->mwidth)
-#define DisplayHeightMM(dpy, scr)(ScreenOfDisplay(dpy,scr)->mheight)
-#define DisplayPlanes(dpy, scr) (ScreenOfDisplay(dpy,scr)->root_depth)
-#define DisplayCells(dpy, scr) 	(DefaultVisual(dpy,scr)->map_entries)
-#define ScreenCount(dpy) 	(((_XPrivDisplay)dpy)->nscreens)
-#define ServerVendor(dpy) 	(((_XPrivDisplay)dpy)->vendor)
-#define ProtocolVersion(dpy) 	(((_XPrivDisplay)dpy)->proto_major_version)
-#define ProtocolRevision(dpy) 	(((_XPrivDisplay)dpy)->proto_minor_version)
-#define VendorRelease(dpy) 	(((_XPrivDisplay)dpy)->release)
-#define DisplayString(dpy) 	(((_XPrivDisplay)dpy)->display_name)
-#define DefaultDepth(dpy, scr) 	(ScreenOfDisplay(dpy,scr)->root_depth)
-#define DefaultColormap(dpy, scr)(ScreenOfDisplay(dpy,scr)->cmap)
-#define BitmapUnit(dpy) 	(((_XPrivDisplay)dpy)->bitmap_unit)
-#define BitmapBitOrder(dpy) 	(((_XPrivDisplay)dpy)->bitmap_bit_order)
-#define BitmapPad(dpy) 		(((_XPrivDisplay)dpy)->bitmap_pad)
-#define ImageByteOrder(dpy) 	(((_XPrivDisplay)dpy)->byte_order)
-#ifdef CRAY /* unable to get WORD64 without pulling in other symbols */
-#define NextRequest(dpy)	XNextRequest(dpy)
-#else
-#define NextRequest(dpy)	(((_XPrivDisplay)dpy)->request + 1)
-#endif
-#define LastKnownRequestProcessed(dpy)	(((_XPrivDisplay)dpy)->last_request_read)
-
-/* macros for screen oriented applications (toolkit) */
-#define ScreenOfDisplay(dpy, scr)(&((_XPrivDisplay)dpy)->screens[scr])
-#define DefaultScreenOfDisplay(dpy) ScreenOfDisplay(dpy,DefaultScreen(dpy))
-#define DisplayOfScreen(s)	((s)->display)
-#define RootWindowOfScreen(s)	((s)->root)
-#define BlackPixelOfScreen(s)	((s)->black_pixel)
-#define WhitePixelOfScreen(s)	((s)->white_pixel)
-#define DefaultColormapOfScreen(s)((s)->cmap)
-#define DefaultDepthOfScreen(s)	((s)->root_depth)
-#define DefaultGCOfScreen(s)	((s)->default_gc)
-#define DefaultVisualOfScreen(s)((s)->root_visual)
-#define WidthOfScreen(s)	((s)->width)
-#define HeightOfScreen(s)	((s)->height)
-#define WidthMMOfScreen(s)	((s)->mwidth)
-#define HeightMMOfScreen(s)	((s)->mheight)
-#define PlanesOfScreen(s)	((s)->root_depth)
-#define CellsOfScreen(s)	(DefaultVisualOfScreen((s))->map_entries)
-#define MinCmapsOfScreen(s)	((s)->min_maps)
-#define MaxCmapsOfScreen(s)	((s)->max_maps)
-#define DoesSaveUnders(s)	((s)->save_unders)
-#define DoesBackingStore(s)	((s)->backing_store)
-#define EventMaskOfScreen(s)	((s)->root_input_mask)
-
-/*
- * Extensions need a way to hang private data on some structures.
- */
-typedef struct _XExtData {
-	int number;		/* number returned by XRegisterExtension */
-	struct _XExtData *next;	/* next item on list of data for structure */
-	int (*free_private)(	/* called to free private storage */
-#if NeedFunctionPrototypes
-	struct _XExtData *extension
-#endif
-	);
-	XPointer private_data;	/* data private to this extension. */
-} XExtData;
-
-/*
- * This file contains structures used by the extension mechanism.
- */
-typedef struct {		/* public to extension, cannot be changed */
-	int extension;		/* extension number */
-	int major_opcode;	/* major op-code assigned by server */
-	int first_event;	/* first event number for the extension */
-	int first_error;	/* first error number for the extension */
-} XExtCodes;
-
-/*
- * Data structure for retrieving info about pixmap formats.
- */
-
-typedef struct {
-    int depth;
-    int bits_per_pixel;
-    int scanline_pad;
-} XPixmapFormatValues;
-
-
-/*
- * Data structure for setting graphics context.
- */
-typedef struct {
-	int function;		/* logical operation */
-	unsigned long plane_mask;/* plane mask */
-	unsigned long foreground;/* foreground pixel */
-	unsigned long background;/* background pixel */
-	int line_width;		/* line width */
-	int line_style;	 	/* LineSolid, LineOnOffDash, LineDoubleDash */
-	int cap_style;	  	/* CapNotLast, CapButt, 
-				   CapRound, CapProjecting */
-	int join_style;	 	/* JoinMiter, JoinRound, JoinBevel */
-	int fill_style;	 	/* FillSolid, FillTiled, 
-				   FillStippled, FillOpaeueStippled */
-	int fill_rule;	  	/* EvenOddRule, WindingRule */
-	int arc_mode;		/* ArcChord, ArcPieSlice */
-	Pixmap tile;		/* tile pixmap for tiling operations */
-	Pixmap stipple;		/* stipple 1 plane pixmap for stipping */
-	int ts_x_origin;	/* offset for tile or stipple operations */
-	int ts_y_origin;
-        Font font;	        /* default text font for text operations */
-	int subwindow_mode;     /* ClipByChildren, IncludeInferiors */
-	Bool graphics_exposures;/* boolean, should exposures be generated */
-	int clip_x_origin;	/* origin for clipping */
-	int clip_y_origin;
-	Pixmap clip_mask;	/* bitmap clipping; other calls for rects */
-	int dash_offset;	/* patterned/dashed line information */
-	char dashes;
-} XGCValues;
-
-/*
- * Graphics context.  The contents of this structure are implementation
- * dependent.  A GC should be treated as opaque by application code.
- */
-
-typedef struct _XGC
-#ifdef XLIB_ILLEGAL_ACCESS
-{
-    XExtData *ext_data;	/* hook for extension to hang data */
-    GContext gid;	/* protocol ID for graphics context */
-    /* there is more to this structure, but it is private to Xlib */
-}
-#endif
-*GC;
-
-/*
- * Visual structure; contains information about colormapping possible.
- */
-typedef struct {
-	XExtData *ext_data;	/* hook for extension to hang data */
-	VisualID visualid;	/* visual id of this visual */
-#if defined(__cplusplus) || defined(c_plusplus)
-	int c_class;		/* C++ class of screen (monochrome, etc.) */
-#else
-	int class;		/* class of screen (monochrome, etc.) */
-#endif
-	unsigned long red_mask, green_mask, blue_mask;	/* mask values */
-	int bits_per_rgb;	/* log base 2 of distinct color values */
-	int map_entries;	/* color map entries */
-} Visual;
-
-/*
- * Depth structure; contains information for each possible depth.
- */	
-typedef struct {
-	int depth;		/* this depth (Z) of the depth */
-	int nvisuals;		/* number of Visual types at this depth */
-	Visual *visuals;	/* list of visuals possible at this depth */
-} Depth;
-
-/*
- * Information about the screen.  The contents of this structure are
- * implementation dependent.  A Screen should be treated as opaque
- * by application code.
- */
-
-struct _XDisplay;		/* Forward declare before use for C++ */
-
-typedef struct {
-	XExtData *ext_data;	/* hook for extension to hang data */
-	struct _XDisplay *display;/* back pointer to display structure */
-	Window root;		/* Root window id. */
-	int width, height;	/* width and height of screen */
-	int mwidth, mheight;	/* width and height of  in millimeters */
-	int ndepths;		/* number of depths possible */
-	Depth *depths;		/* list of allowable depths on the screen */
-	int root_depth;		/* bits per pixel */
-	Visual *root_visual;	/* root visual */
-	GC default_gc;		/* GC for the root root visual */
-	Colormap cmap;		/* default color map */
-	unsigned long white_pixel;
-	unsigned long black_pixel;	/* White and Black pixel values */
-	int max_maps, min_maps;	/* max and min color maps */
-	int backing_store;	/* Never, WhenMapped, Always */
-	Bool save_unders;	
-	long root_input_mask;	/* initial root input mask */
-} Screen;
-
-/*
- * Format structure; describes ZFormat data the screen will understand.
- */
-typedef struct {
-	XExtData *ext_data;	/* hook for extension to hang data */
-	int depth;		/* depth of this image format */
-	int bits_per_pixel;	/* bits/pixel at this depth */
-	int scanline_pad;	/* scanline must padded to this multiple */
-} ScreenFormat;
-
-/*
- * Data structure for setting window attributes.
- */
-typedef struct {
-    Pixmap background_pixmap;	/* background or None or ParentRelative */
-    unsigned long background_pixel;	/* background pixel */
-    Pixmap border_pixmap;	/* border of the window */
-    unsigned long border_pixel;	/* border pixel value */
-    int bit_gravity;		/* one of bit gravity values */
-    int win_gravity;		/* one of the window gravity values */
-    int backing_store;		/* NotUseful, WhenMapped, Always */
-    unsigned long backing_planes;/* planes to be preseved if possible */
-    unsigned long backing_pixel;/* value to use in restoring planes */
-    Bool save_under;		/* should bits under be saved? (popups) */
-    long event_mask;		/* set of events that should be saved */
-    long do_not_propagate_mask;	/* set of events that should not propagate */
-    Bool override_redirect;	/* boolean value for override-redirect */
-    Colormap colormap;		/* color map to be associated with window */
-    Cursor cursor;		/* cursor to be displayed (or None) */
-} XSetWindowAttributes;
-
-typedef struct {
-    int x, y;			/* location of window */
-    int width, height;		/* width and height of window */
-    int border_width;		/* border width of window */
-    int depth;          	/* depth of window */
-    Visual *visual;		/* the associated visual structure */
-    Window root;        	/* root of screen containing window */
-#if defined(__cplusplus) || defined(c_plusplus)
-    int c_class;		/* C++ InputOutput, InputOnly*/
-#else
-    int class;			/* InputOutput, InputOnly*/
-#endif
-    int bit_gravity;		/* one of bit gravity values */
-    int win_gravity;		/* one of the window gravity values */
-    int backing_store;		/* NotUseful, WhenMapped, Always */
-    unsigned long backing_planes;/* planes to be preserved if possible */
-    unsigned long backing_pixel;/* value to be used when restoring planes */
-    Bool save_under;		/* boolean, should bits under be saved? */
-    Colormap colormap;		/* color map to be associated with window */
-    Bool map_installed;		/* boolean, is color map currently installed*/
-    int map_state;		/* IsUnmapped, IsUnviewable, IsViewable */
-    long all_event_masks;	/* set of events all people have interest in*/
-    long your_event_mask;	/* my event mask */
-    long do_not_propagate_mask; /* set of events that should not propagate */
-    Bool override_redirect;	/* boolean value for override-redirect */
-    Screen *screen;		/* back pointer to correct screen */
-} XWindowAttributes;
-
-/*
- * Data structure for host setting; getting routines.
- *
- */
-
-typedef struct {
-	int family;		/* for example FamilyInternet */
-	int length;		/* length of address, in bytes */
-	char *address;		/* pointer to where to find the bytes */
-} XHostAddress;
-
-/*
- * Data structure for "image" data, used by image manipulation routines.
- */
-typedef struct _XImage {
-    int width, height;		/* size of image */
-    int xoffset;		/* number of pixels offset in X direction */
-    int format;			/* XYBitmap, XYPixmap, ZPixmap */
-    char *data;			/* pointer to image data */
-    int byte_order;		/* data byte order, LSBFirst, MSBFirst */
-    int bitmap_unit;		/* quant. of scanline 8, 16, 32 */
-    int bitmap_bit_order;	/* LSBFirst, MSBFirst */
-    int bitmap_pad;		/* 8, 16, 32 either XY or ZPixmap */
-    int depth;			/* depth of image */
-    int bytes_per_line;		/* accelarator to next line */
-    int bits_per_pixel;		/* bits per pixel (ZPixmap) */
-    unsigned long red_mask;	/* bits in z arrangment */
-    unsigned long green_mask;
-    unsigned long blue_mask;
-    XPointer obdata;		/* hook for the object routines to hang on */
-    struct funcs {		/* image manipulation routines */
-#if NeedFunctionPrototypes
-	struct _XImage *(*create_image)(
-		struct _XDisplay* /* display */,
-		Visual*		/* visual */,
-		unsigned int	/* depth */,
-		int		/* format */,
-		int		/* offset */,
-		char*		/* data */,
-		unsigned int	/* width */,
-		unsigned int	/* height */,
-		int		/* bitmap_pad */,
-		int		/* bytes_per_line */);
-	int (*destroy_image)        (struct _XImage *);
-	unsigned long (*get_pixel)  (struct _XImage *, int, int);
-	int (*put_pixel)            (struct _XImage *, int, int, unsigned long);
-	struct _XImage *(*sub_image)(struct _XImage *, int, int, unsigned int, unsigned int);
-	int (*add_pixel)            (struct _XImage *, long);
-#else
-	struct _XImage *(*create_image)();
-	int (*destroy_image)();
-	unsigned long (*get_pixel)();
-	int (*put_pixel)();
-	struct _XImage *(*sub_image)();
-	int (*add_pixel)();
-#endif
-	} f;
-} XImage;
-
-/* 
- * Data structure for XReconfigureWindow
- */
-typedef struct {
-    int x, y;
-    int width, height;
-    int border_width;
-    Window sibling;
-    int stack_mode;
-} XWindowChanges;
-
-/*
- * Data structure used by color operations
- */
-typedef struct {
-	unsigned long pixel;
-	unsigned short red, green, blue;
-	char flags;  /* do_red, do_green, do_blue */
-	char pad;
-} XColor;
-
-/* 
- * Data structures for graphics operations.  On most machines, these are
- * congruent with the wire protocol structures, so reformatting the data
- * can be avoided on these architectures.
- */
-typedef struct {
-    short x1, y1, x2, y2;
-} XSegment;
-
-typedef struct {
-    short x, y;
-} XPoint;
-    
-typedef struct {
-    short x, y;
-    unsigned short width, height;
-} XRectangle;
-    
-typedef struct {
-    short x, y;
-    unsigned short width, height;
-    short angle1, angle2;
-} XArc;
-
-
-/* Data structure for XChangeKeyboardControl */
-
-typedef struct {
-        int key_click_percent;
-        int bell_percent;
-        int bell_pitch;
-        int bell_duration;
-        int led;
-        int led_mode;
-        int key;
-        int auto_repeat_mode;   /* On, Off, Default */
-} XKeyboardControl;
-
-/* Data structure for XGetKeyboardControl */
-
-typedef struct {
-        int key_click_percent;
-	int bell_percent;
-	unsigned int bell_pitch, bell_duration;
-	unsigned long led_mask;
-	int global_auto_repeat;
-	char auto_repeats[32];
-} XKeyboardState;
-
-/* Data structure for XGetMotionEvents.  */
-
-typedef struct {
-        Time time;
-	short x, y;
-} XTimeCoord;
-
-/* Data structure for X{Set,Get}ModifierMapping */
-
-typedef struct {
- 	int max_keypermod;	/* The server's max # of keys per modifier */
- 	KeyCode *modifiermap;	/* An 8 by max_keypermod array of modifiers */
-} XModifierKeymap;
-
-
-/*
- * Display datatype maintaining display specific data.
- * The contents of this structure are implementation dependent.
- * A Display should be treated as opaque by application code.
- */
-#ifndef XLIB_ILLEGAL_ACCESS
-typedef struct _XDisplay Display;
-#endif
-
-struct _XPrivate;		/* Forward declare before use for C++ */
-struct _XrmHashBucketRec;
-
-typedef struct 
-#ifdef XLIB_ILLEGAL_ACCESS
-_XDisplay
-#endif
-{
-	XExtData *ext_data;	/* hook for extension to hang data */
-	struct _XPrivate *private1;
-	int fd;			/* Network socket. */
-	int private2;
-	int proto_major_version;/* major version of server's X protocol */
-	int proto_minor_version;/* minor version of servers X protocol */
-	char *vendor;		/* vendor of the server hardware */
-        XID private3;
-	XID private4;
-	XID private5;
-	int private6;
-	XID (*resource_alloc)(	/* allocator function */
-#if NeedFunctionPrototypes
-		struct _XDisplay*
-#endif
-	);
-	int byte_order;		/* screen byte order, LSBFirst, MSBFirst */
-	int bitmap_unit;	/* padding and data requirements */
-	int bitmap_pad;		/* padding requirements on bitmaps */
-	int bitmap_bit_order;	/* LeastSignificant or MostSignificant */
-	int nformats;		/* number of pixmap formats in list */
-	ScreenFormat *pixmap_format;	/* pixmap format list */
-	int private8;
-	int release;		/* release of the server */
-	struct _XPrivate *private9, *private10;
-	int qlen;		/* Length of input event queue */
-	unsigned long last_request_read; /* seq number of last event read */
-	unsigned long request;	/* sequence number of last request. */
-	XPointer private11;
-	XPointer private12;
-	XPointer private13;
-	XPointer private14;
-	unsigned max_request_size; /* maximum number 32 bit words in request*/
-	struct _XrmHashBucketRec *db;
-	int (*private15)(
-#if NeedFunctionPrototypes
-		struct _XDisplay*
-#endif
-		);
-	char *display_name;	/* "host:display" string used on this connect*/
-	int default_screen;	/* default screen for operations */
-	int nscreens;		/* number of screens on this server*/
-	Screen *screens;	/* pointer to list of screens */
-	unsigned long motion_buffer;	/* size of motion buffer */
-	unsigned long private16;
-	int min_keycode;	/* minimum defined keycode */
-	int max_keycode;	/* maximum defined keycode */
-	XPointer private17;
-	XPointer private18;
-	int private19;
-	char *xdefaults;	/* contents of defaults from server */
-	/* there is more to this structure, but it is private to Xlib */
-}
-#ifdef XLIB_ILLEGAL_ACCESS
-Display, 
-#endif
-*_XPrivDisplay;
-
-#if NeedFunctionPrototypes	/* prototypes require event type definitions */
-#undef _XEVENT_
-#endif
-#ifndef _XEVENT_
-/*
- * Definitions of specific events.
- */
-typedef struct {
-	int type;		/* of event */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;	        /* "event" window it is reported relative to */
-	Window root;	        /* root window that the event occurred on */
-	Window subwindow;	/* child window */
-	Time time;		/* milliseconds */
-	int x, y;		/* pointer x, y coordinates in event window */
-	int x_root, y_root;	/* coordinates relative to root */
-	unsigned int state;	/* key or button mask */
-	unsigned int keycode;	/* detail */
-	Bool same_screen;	/* same screen flag */
-} XKeyEvent;
-typedef XKeyEvent XKeyPressedEvent;
-typedef XKeyEvent XKeyReleasedEvent;
-
-typedef struct {
-	int type;		/* of event */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;	        /* "event" window it is reported relative to */
-	Window root;	        /* root window that the event occurred on */
-	Window subwindow;	/* child window */
-	Time time;		/* milliseconds */
-	int x, y;		/* pointer x, y coordinates in event window */
-	int x_root, y_root;	/* coordinates relative to root */
-	unsigned int state;	/* key or button mask */
-	unsigned int button;	/* detail */
-	Bool same_screen;	/* same screen flag */
-} XButtonEvent;
-typedef XButtonEvent XButtonPressedEvent;
-typedef XButtonEvent XButtonReleasedEvent;
-
-typedef struct {
-	int type;		/* of event */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;	        /* "event" window reported relative to */
-	Window root;	        /* root window that the event occurred on */
-	Window subwindow;	/* child window */
-	Time time;		/* milliseconds */
-	int x, y;		/* pointer x, y coordinates in event window */
-	int x_root, y_root;	/* coordinates relative to root */
-	unsigned int state;	/* key or button mask */
-	char is_hint;		/* detail */
-	Bool same_screen;	/* same screen flag */
-} XMotionEvent;
-typedef XMotionEvent XPointerMovedEvent;
-
-typedef struct {
-	int type;		/* of event */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;	        /* "event" window reported relative to */
-	Window root;	        /* root window that the event occurred on */
-	Window subwindow;	/* child window */
-	Time time;		/* milliseconds */
-	int x, y;		/* pointer x, y coordinates in event window */
-	int x_root, y_root;	/* coordinates relative to root */
-	int mode;		/* NotifyNormal, NotifyGrab, NotifyUngrab */
-	int detail;
-	/*
-	 * NotifyAncestor, NotifyVirtual, NotifyInferior, 
-	 * NotifyNonlinear,NotifyNonlinearVirtual
-	 */
-	Bool same_screen;	/* same screen flag */
-	Bool focus;		/* boolean focus */
-	unsigned int state;	/* key or button mask */
-} XCrossingEvent;
-typedef XCrossingEvent XEnterWindowEvent;
-typedef XCrossingEvent XLeaveWindowEvent;
-
-typedef struct {
-	int type;		/* FocusIn or FocusOut */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;		/* window of event */
-	int mode;		/* NotifyNormal, NotifyGrab, NotifyUngrab */
-	int detail;
-	/*
-	 * NotifyAncestor, NotifyVirtual, NotifyInferior, 
-	 * NotifyNonlinear,NotifyNonlinearVirtual, NotifyPointer,
-	 * NotifyPointerRoot, NotifyDetailNone 
-	 */
-} XFocusChangeEvent;
-typedef XFocusChangeEvent XFocusInEvent;
-typedef XFocusChangeEvent XFocusOutEvent;
-
-/* generated on EnterWindow and FocusIn  when KeyMapState selected */
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;
-	char key_vector[32];
-} XKeymapEvent;	
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;
-	int x, y;
-	int width, height;
-	int count;		/* if non-zero, at least this many more */
-} XExposeEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Drawable drawable;
-	int x, y;
-	int width, height;
-	int count;		/* if non-zero, at least this many more */
-	int major_code;		/* core is CopyArea or CopyPlane */
-	int minor_code;		/* not defined in the core */
-} XGraphicsExposeEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Drawable drawable;
-	int major_code;		/* core is CopyArea or CopyPlane */
-	int minor_code;		/* not defined in the core */
-} XNoExposeEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;
-	int state;		/* Visibility state */
-} XVisibilityEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window parent;		/* parent of the window */
-	Window window;		/* window id of window created */
-	int x, y;		/* window location */
-	int width, height;	/* size of window */
-	int border_width;	/* border width */
-	Bool override_redirect;	/* creation should be overridden */
-} XCreateWindowEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window event;
-	Window window;
-} XDestroyWindowEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window event;
-	Window window;
-	Bool from_configure;
-} XUnmapEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window event;
-	Window window;
-	Bool override_redirect;	/* boolean, is override set... */
-} XMapEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window parent;
-	Window window;
-} XMapRequestEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window event;
-	Window window;
-	Window parent;
-	int x, y;
-	Bool override_redirect;
-} XReparentEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window event;
-	Window window;
-	int x, y;
-	int width, height;
-	int border_width;
-	Window above;
-	Bool override_redirect;
-} XConfigureEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window event;
-	Window window;
-	int x, y;
-} XGravityEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;
-	int width, height;
-} XResizeRequestEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window parent;
-	Window window;
-	int x, y;
-	int width, height;
-	int border_width;
-	Window above;
-	int detail;		/* Above, Below, TopIf, BottomIf, Opposite */
-	unsigned long value_mask;
-} XConfigureRequestEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window event;
-	Window window;
-	int place;		/* PlaceOnTop, PlaceOnBottom */
-} XCirculateEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window parent;
-	Window window;
-	int place;		/* PlaceOnTop, PlaceOnBottom */
-} XCirculateRequestEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;
-	Atom atom;
-	Time time;
-	int state;		/* NewValue, Deleted */
-} XPropertyEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;
-	Atom selection;
-	Time time;
-} XSelectionClearEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window owner;
-	Window requestor;
-	Atom selection;
-	Atom target;
-	Atom property;
-	Time time;
-} XSelectionRequestEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window requestor;
-	Atom selection;
-	Atom target;
-	Atom property;		/* ATOM or None */
-	Time time;
-} XSelectionEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;
-	Colormap colormap;	/* COLORMAP or None */
-#if defined(__cplusplus) || defined(c_plusplus)
-	Bool c_new;		/* C++ */
-#else
-	Bool new;
-#endif
-	int state;		/* ColormapInstalled, ColormapUninstalled */
-} XColormapEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;
-	Atom message_type;
-	int format;
-	union {
-		char b[20];
-		short s[10];
-		long l[5];
-		} data;
-} XClientMessageEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;		/* unused */
-	int request;		/* one of MappingModifier, MappingKeyboard,
-				   MappingPointer */
-	int first_keycode;	/* first keycode */
-	int count;		/* defines range of change w. first_keycode*/
-} XMappingEvent;
-
-typedef struct {
-	int type;
-	Display *display;	/* Display the event was read from */
-	XID resourceid;		/* resource id */
-	unsigned long serial;	/* serial number of failed request */
-	unsigned char error_code;	/* error code of failed request */
-	unsigned char request_code;	/* Major op-code of failed request */
-	unsigned char minor_code;	/* Minor op-code of failed request */
-} XErrorEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;/* Display the event was read from */
-	Window window;	/* window on which event was requested in event mask */
-} XAnyEvent;
-
-/*
- * this union is defined so Xlib can always use the same sized
- * event structure internally, to avoid memory fragmentation.
- */
-typedef union _XEvent {
-        int type;		/* must not be changed; first element */
-	XAnyEvent xany;
-	XKeyEvent xkey;
-	XButtonEvent xbutton;
-	XMotionEvent xmotion;
-	XCrossingEvent xcrossing;
-	XFocusChangeEvent xfocus;
-	XExposeEvent xexpose;
-	XGraphicsExposeEvent xgraphicsexpose;
-	XNoExposeEvent xnoexpose;
-	XVisibilityEvent xvisibility;
-	XCreateWindowEvent xcreatewindow;
-	XDestroyWindowEvent xdestroywindow;
-	XUnmapEvent xunmap;
-	XMapEvent xmap;
-	XMapRequestEvent xmaprequest;
-	XReparentEvent xreparent;
-	XConfigureEvent xconfigure;
-	XGravityEvent xgravity;
-	XResizeRequestEvent xresizerequest;
-	XConfigureRequestEvent xconfigurerequest;
-	XCirculateEvent xcirculate;
-	XCirculateRequestEvent xcirculaterequest;
-	XPropertyEvent xproperty;
-	XSelectionClearEvent xselectionclear;
-	XSelectionRequestEvent xselectionrequest;
-	XSelectionEvent xselection;
-	XColormapEvent xcolormap;
-	XClientMessageEvent xclient;
-	XMappingEvent xmapping;
-	XErrorEvent xerror;
-	XKeymapEvent xkeymap;
-	long pad[24];
-} XEvent;
-#endif
-
-#define XAllocID(dpy) ((*((_XPrivDisplay)dpy)->resource_alloc)((dpy)))
-
-/*
- * per character font metric information.
- */
-typedef struct {
-    short	lbearing;	/* origin to left edge of raster */
-    short	rbearing;	/* origin to right edge of raster */
-    short	width;		/* advance to next char's origin */
-    short	ascent;		/* baseline to top edge of raster */
-    short	descent;	/* baseline to bottom edge of raster */
-    unsigned short attributes;	/* per char flags (not predefined) */
-} XCharStruct;
-
-/*
- * To allow arbitrary information with fonts, there are additional properties
- * returned.
- */
-typedef struct {
-    Atom name;
-    unsigned long card32;
-} XFontProp;
-
-typedef struct {
-    XExtData	*ext_data;	/* hook for extension to hang data */
-    Font        fid;            /* Font id for this font */
-    unsigned	direction;	/* hint about direction the font is painted */
-    unsigned	min_char_or_byte2;/* first character */
-    unsigned	max_char_or_byte2;/* last character */
-    unsigned	min_byte1;	/* first row that exists */
-    unsigned	max_byte1;	/* last row that exists */
-    Bool	all_chars_exist;/* flag if all characters have non-zero size*/
-    unsigned	default_char;	/* char to print for undefined character */
-    int         n_properties;   /* how many properties there are */
-    XFontProp	*properties;	/* pointer to array of additional properties*/
-    XCharStruct	min_bounds;	/* minimum bounds over all existing char*/
-    XCharStruct	max_bounds;	/* maximum bounds over all existing char*/
-    XCharStruct	*per_char;	/* first_char to last_char information */
-    int		ascent;		/* log. extent above baseline for spacing */
-    int		descent;	/* log. descent below baseline for spacing */
-} XFontStruct;
-
-/*
- * PolyText routines take these as arguments.
- */
-typedef struct {
-    char *chars;		/* pointer to string */
-    int nchars;			/* number of characters */
-    int delta;			/* delta between strings */
-    Font font;			/* font to print it in, None don't change */
-} XTextItem;
-
-typedef struct {		/* normal 16 bit characters are two bytes */
-    unsigned char byte1;
-    unsigned char byte2;
-} XChar2b;
-
-typedef struct {
-    XChar2b *chars;		/* two byte characters */
-    int nchars;			/* number of characters */
-    int delta;			/* delta between strings */
-    Font font;			/* font to print it in, None don't change */
-} XTextItem16;
-
-
-typedef union { Display *display;
-		GC gc;
-		Visual *visual;
-		Screen *screen;
-		ScreenFormat *pixmap_format;
-		XFontStruct *font; } XEDataObject;
-
-typedef struct {
-    XRectangle      max_ink_extent;
-    XRectangle      max_logical_extent;
-} XFontSetExtents;
-
-/* unused:
-typedef void (*XOMProc)();
- */
-
-typedef struct _XOM *XOM;
-typedef struct _XOC *XOC, *XFontSet;
-
-typedef struct {
-    char           *chars;
-    int             nchars;
-    int             delta;
-    XFontSet        font_set;
-} XmbTextItem;
-
-typedef struct {
-    wchar_t        *chars;
-    int             nchars;
-    int             delta;
-    XFontSet        font_set;
-} XwcTextItem;
-
-#define XNRequiredCharSet "requiredCharSet"
-#define XNQueryOrientation "queryOrientation"
-#define XNBaseFontName "baseFontName"
-#define XNOMAutomatic "omAutomatic"
-#define XNMissingCharSet "missingCharSet"
-#define XNDefaultString "defaultString"
-#define XNOrientation "orientation"
-#define XNDirectionalDependentDrawing "directionalDependentDrawing"
-#define XNContextualDrawing "contextualDrawing"
-#define XNFontInfo "fontInfo"
-
-typedef struct {
-    int charset_count;
-    char **charset_list;
-} XOMCharSetList;
-
-typedef enum {
-    XOMOrientation_LTR_TTB,
-    XOMOrientation_RTL_TTB,
-    XOMOrientation_TTB_LTR,
-    XOMOrientation_TTB_RTL,
-    XOMOrientation_Context
-} XOrientation;
-
-typedef struct {
-    int num_orientation;
-    XOrientation *orientation;	/* Input Text description */
-} XOMOrientation;
-
-typedef struct {
-    int num_font;
-    XFontStruct **font_struct_list;
-    char **font_name_list;
-} XOMFontInfo;
-
-typedef struct _XIM *XIM;
-typedef struct _XIC *XIC;
-
-typedef void (*XIMProc)(
-#if NeedFunctionPrototypes
-    XIM,
-    XPointer,
-    XPointer
-#endif
-);
-
-typedef Bool (*XICProc)(
-#if NeedFunctionPrototypes
-    XIC,
-    XPointer,
-    XPointer
-#endif
-);
-
-typedef void (*XIDProc)(
-#if NeedFunctionPrototypes
-    Display*,
-    XPointer,
-    XPointer
-#endif
-);
-
-typedef unsigned long XIMStyle;
-
-typedef struct {
-    unsigned short count_styles;
-    XIMStyle *supported_styles;
-} XIMStyles;
-
-#define XIMPreeditArea		0x0001L
-#define XIMPreeditCallbacks	0x0002L
-#define XIMPreeditPosition	0x0004L
-#define XIMPreeditNothing	0x0008L
-#define XIMPreeditNone		0x0010L
-#define XIMStatusArea		0x0100L
-#define XIMStatusCallbacks	0x0200L
-#define XIMStatusNothing	0x0400L
-#define XIMStatusNone		0x0800L
-
-#define XNVaNestedList "XNVaNestedList"
-#define XNQueryInputStyle "queryInputStyle"
-#define XNClientWindow "clientWindow"
-#define XNInputStyle "inputStyle"
-#define XNFocusWindow "focusWindow"
-#define XNResourceName "resourceName"
-#define XNResourceClass "resourceClass"
-#define XNGeometryCallback "geometryCallback"
-#define XNDestroyCallback "destroyCallback"
-#define XNFilterEvents "filterEvents"
-#define XNPreeditStartCallback "preeditStartCallback"
-#define XNPreeditDoneCallback "preeditDoneCallback"
-#define XNPreeditDrawCallback "preeditDrawCallback"
-#define XNPreeditCaretCallback "preeditCaretCallback"
-#define XNPreeditStateNotifyCallback "preeditStateNotifyCallback"
-#define XNPreeditAttributes "preeditAttributes"
-#define XNStatusStartCallback "statusStartCallback"
-#define XNStatusDoneCallback "statusDoneCallback"
-#define XNStatusDrawCallback "statusDrawCallback"
-#define XNStatusAttributes "statusAttributes"
-#define XNArea "area"
-#define XNAreaNeeded "areaNeeded"
-#define XNSpotLocation "spotLocation"
-#define XNColormap "colorMap"
-#define XNStdColormap "stdColorMap"
-#define XNForeground "foreground"
-#define XNBackground "background"
-#define XNBackgroundPixmap "backgroundPixmap"
-#define XNFontSet "fontSet"
-#define XNLineSpace "lineSpace"
-#define XNCursor "cursor"
-
-#define XNQueryIMValuesList "queryIMValuesList"
-#define XNQueryICValuesList "queryICValuesList"
-#define XNVisiblePosition "visiblePosition"
-#define XNR6PreeditCallback "r6PreeditCallback"
-#define XNStringConversionCallback "stringConversionCallback"
-#define XNStringConversion "stringConversion"
-#define XNResetState "resetState"
-#define XNHotKey "hotKey"
-#define XNHotKeyState "hotKeyState"
-#define XNPreeditState "preeditState"
-#define XNSeparatorofNestedList "separatorofNestedList"
-
-#define XBufferOverflow		-1
-#define XLookupNone		1
-#define XLookupChars		2
-#define XLookupKeySym		3
-#define XLookupBoth		4
-
-#if NeedFunctionPrototypes
-typedef void *XVaNestedList;
-#else
-typedef XPointer XVaNestedList;
-#endif
-
-typedef struct {
-    XPointer client_data;
-    XIMProc callback;
-} XIMCallback;
-
-typedef struct {
-    XPointer client_data;
-    XICProc callback;
-} XICCallback;
-
-typedef unsigned long XIMFeedback;
-
-#define XIMReverse		1L
-#define XIMUnderline		(1L<<1) 
-#define XIMHighlight		(1L<<2)
-#define XIMPrimary	 	(1L<<5)
-#define XIMSecondary		(1L<<6)
-#define XIMTertiary	 	(1L<<7)
-#define XIMVisibleToForward 	(1L<<8)
-#define XIMVisibleToBackword 	(1L<<9)
-#define XIMVisibleToCenter 	(1L<<10)
-
-typedef struct _XIMText {
-    unsigned short length;
-    XIMFeedback *feedback;
-    Bool encoding_is_wchar; 
-    union {
-	char *multi_byte;
-	wchar_t *wide_char;
-    } string; 
-} XIMText;
-
-typedef	unsigned long	 XIMPreeditState;
-
-#define	XIMPreeditUnKnown	0L
-#define	XIMPreeditEnable	1L
-#define	XIMPreeditDisable	(1L<<1)
-
-typedef	struct	_XIMPreeditStateNotifyCallbackStruct {
-    XIMPreeditState state;
-} XIMPreeditStateNotifyCallbackStruct;
-
-typedef	unsigned long	 XIMResetState;
-
-#define	XIMInitialState		1L
-#define	XIMPreserveState	(1L<<1)
-
-typedef unsigned long XIMStringConversionFeedback;
-
-#define	XIMStringConversionLeftEdge	(0x00000001)
-#define	XIMStringConversionRightEdge	(0x00000002)
-#define	XIMStringConversionTopEdge	(0x00000004)
-#define	XIMStringConversionBottomEdge	(0x00000008)
-#define	XIMStringConversionConcealed	(0x00000010)
-#define	XIMStringConversionWrapped	(0x00000020)
-
-typedef struct _XIMStringConversionText {
-    unsigned short length;
-    XIMStringConversionFeedback *feedback;
-    Bool encoding_is_wchar; 
-    union {
-	char *mbs;
-	wchar_t *wcs;
-    } string; 
-} XIMStringConversionText;
-
-typedef	unsigned short	XIMStringConversionPosition;
-
-typedef	unsigned short	XIMStringConversionType;
-
-#define	XIMStringConversionBuffer	(0x0001)
-#define	XIMStringConversionLine		(0x0002)
-#define	XIMStringConversionWord		(0x0003)
-#define	XIMStringConversionChar		(0x0004)
-
-typedef	unsigned short	XIMStringConversionOperation;
-
-#define	XIMStringConversionSubstitution	(0x0001)
-#define	XIMStringConversionRetrieval	(0x0002)
-
-typedef enum {
-    XIMForwardChar, XIMBackwardChar,
-    XIMForwardWord, XIMBackwardWord,
-    XIMCaretUp, XIMCaretDown,
-    XIMNextLine, XIMPreviousLine,
-    XIMLineStart, XIMLineEnd, 
-    XIMAbsolutePosition,
-    XIMDontChange
-} XIMCaretDirection;
-
-typedef struct _XIMStringConversionCallbackStruct {
-    XIMStringConversionPosition position;
-    XIMCaretDirection direction;
-    XIMStringConversionOperation operation;
-    unsigned short factor;
-    XIMStringConversionText *text;
-} XIMStringConversionCallbackStruct;
-
-typedef struct _XIMPreeditDrawCallbackStruct {
-    int caret;		/* Cursor offset within pre-edit string */
-    int chg_first;	/* Starting change position */
-    int chg_length;	/* Length of the change in character count */
-    XIMText *text;
-} XIMPreeditDrawCallbackStruct;
-
-typedef enum {
-    XIMIsInvisible,	/* Disable caret feedback */ 
-    XIMIsPrimary,	/* UI defined caret feedback */
-    XIMIsSecondary	/* UI defined caret feedback */
-} XIMCaretStyle;
-
-typedef struct _XIMPreeditCaretCallbackStruct {
-    int position;		 /* Caret offset within pre-edit string */
-    XIMCaretDirection direction; /* Caret moves direction */
-    XIMCaretStyle style;	 /* Feedback of the caret */
-} XIMPreeditCaretCallbackStruct;
-
-typedef enum {
-    XIMTextType,
-    XIMBitmapType
-} XIMStatusDataType;
-	
-typedef struct _XIMStatusDrawCallbackStruct {
-    XIMStatusDataType type;
-    union {
-	XIMText *text;
-	Pixmap  bitmap;
-    } data;
-} XIMStatusDrawCallbackStruct;
-
-typedef struct _XIMHotKeyTrigger {
-    KeySym	 keysym;
-    int		 modifier;
-    int		 modifier_mask;
-} XIMHotKeyTrigger;
-
-typedef struct _XIMHotKeyTriggers {
-    int			 num_hot_key;
-    XIMHotKeyTrigger	*key;
-} XIMHotKeyTriggers;
-
-typedef	unsigned long	 XIMHotKeyState;
-
-#define	XIMHotKeyStateON	(0x0001L)
-#define	XIMHotKeyStateOFF	(0x0002L)
-
-typedef struct {
-    unsigned short count_values;
-    char **supported_values;
-} XIMValuesList;
-
-_XFUNCPROTOBEGIN
-
-#if defined(WIN32) && !defined(_XLIBINT_)
-#define _Xdebug (*_Xdebug_p)
-#endif
-
-extern int _Xdebug;
-
-extern XFontStruct *XLoadQueryFont(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    _Xconst char*	/* name */
-#endif
-);
-
-extern XFontStruct *XQueryFont(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    XID			/* font_ID */
-#endif
-);
-
-
-extern XTimeCoord *XGetMotionEvents(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    Time		/* start */,
-    Time		/* stop */,
-    int*		/* nevents_return */
-#endif
-);
-
-extern XModifierKeymap *XDeleteModifiermapEntry(
-#if NeedFunctionPrototypes
-    XModifierKeymap*	/* modmap */,
-#if NeedWidePrototypes
-    unsigned int	/* keycode_entry */,
-#else
-    KeyCode		/* keycode_entry */,
-#endif
-    int			/* modifier */
-#endif
-);
-
-extern XModifierKeymap	*XGetModifierMapping(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-
-extern XModifierKeymap	*XInsertModifiermapEntry(
-#if NeedFunctionPrototypes
-    XModifierKeymap*	/* modmap */,
-#if NeedWidePrototypes
-    unsigned int	/* keycode_entry */,
-#else
-    KeyCode		/* keycode_entry */,
-#endif
-    int			/* modifier */    
-#endif
-);
-
-extern XModifierKeymap *XNewModifiermap(
-#if NeedFunctionPrototypes
-    int			/* max_keys_per_mod */
-#endif
-);
-
-extern XImage *XCreateImage(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Visual*		/* visual */,
-    unsigned int	/* depth */,
-    int			/* format */,
-    int			/* offset */,
-    char*		/* data */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    int			/* bitmap_pad */,
-    int			/* bytes_per_line */
-#endif
-);
-extern Status XInitImage(
-#if NeedFunctionPrototypes
-    XImage*		/* image */
-#endif
-);
-extern XImage *XGetImage(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    int			/* x */,
-    int			/* y */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    unsigned long	/* plane_mask */,
-    int			/* format */
-#endif
-);
-extern XImage *XGetSubImage(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    int			/* x */,
-    int			/* y */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    unsigned long	/* plane_mask */,
-    int			/* format */,
-    XImage*		/* dest_image */,
-    int			/* dest_x */,
-    int			/* dest_y */
-#endif
-);
-
-/* 
- * X function declarations.
- */
-extern Display *XOpenDisplay(
-#if NeedFunctionPrototypes
-    _Xconst char*	/* display_name */
-#endif
-);
-
-extern void XrmInitialize(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern char *XFetchBytes(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int*		/* nbytes_return */
-#endif
-);
-extern char *XFetchBuffer(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int*		/* nbytes_return */,
-    int			/* buffer */
-#endif
-);
-extern char *XGetAtomName(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Atom		/* atom */
-#endif
-);
-extern Status XGetAtomNames(
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    Atom*		/* atoms */,
-    int			/* count */,
-    char**		/* names_return */
-#endif
-);
-extern char *XGetDefault(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    _Xconst char*	/* program */,
-    _Xconst char*	/* option */		  
-#endif
-);
-extern char *XDisplayName(
-#if NeedFunctionPrototypes
-    _Xconst char*	/* string */
-#endif
-);
-extern char *XKeysymToString(
-#if NeedFunctionPrototypes
-    KeySym		/* keysym */
-#endif
-);
-
-extern int (*XSynchronize(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Bool		/* onoff */
-#endif
-))(
-#if NeedNestedPrototypes
-    Display*		/* display */
-#endif
-);
-extern int (*XSetAfterFunction(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int (*) (
-#if NeedNestedPrototypes
-	     Display*	/* display */
-#endif
-            )		/* procedure */
-#endif
-))(
-#if NeedNestedPrototypes
-    Display*		/* display */
-#endif
-);
-extern Atom XInternAtom(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    _Xconst char*	/* atom_name */,
-    Bool		/* only_if_exists */		 
-#endif
-);
-extern Status XInternAtoms(
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    char**		/* names */,
-    int			/* count */,
-    Bool		/* onlyIfExists */,
-    Atom*		/* atoms_return */
-#endif
-);
-extern Colormap XCopyColormapAndFree(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Colormap		/* colormap */
-#endif
-);
-extern Colormap XCreateColormap(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    Visual*		/* visual */,
-    int			/* alloc */			 
-#endif
-);
-extern Cursor XCreatePixmapCursor(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Pixmap		/* source */,
-    Pixmap		/* mask */,
-    XColor*		/* foreground_color */,
-    XColor*		/* background_color */,
-    unsigned int	/* x */,
-    unsigned int	/* y */			   
-#endif
-);
-extern Cursor XCreateGlyphCursor(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Font		/* source_font */,
-    Font		/* mask_font */,
-    unsigned int	/* source_char */,
-    unsigned int	/* mask_char */,
-    XColor*		/* foreground_color */,
-    XColor*		/* background_color */
-#endif
-);
-extern Cursor XCreateFontCursor(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    unsigned int	/* shape */
-#endif
-);
-extern Font XLoadFont(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    _Xconst char*	/* name */
-#endif
-);
-extern GC XCreateGC(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    unsigned long	/* valuemask */,
-    XGCValues*		/* values */
-#endif
-);
-extern GContext XGContextFromGC(
-#if NeedFunctionPrototypes
-    GC			/* gc */
-#endif
-);
-extern void XFlushGC(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */
-#endif
-);
-extern Pixmap XCreatePixmap(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    unsigned int	/* depth */		        
-#endif
-);
-extern Pixmap XCreateBitmapFromData(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    _Xconst char*	/* data */,
-    unsigned int	/* width */,
-    unsigned int	/* height */
-#endif
-);
-extern Pixmap XCreatePixmapFromBitmapData(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    char*		/* data */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    unsigned long	/* fg */,
-    unsigned long	/* bg */,
-    unsigned int	/* depth */
-#endif
-);
-extern Window XCreateSimpleWindow(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* parent */,
-    int			/* x */,
-    int			/* y */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    unsigned int	/* border_width */,
-    unsigned long	/* border */,
-    unsigned long	/* background */
-#endif
-);
-extern Window XGetSelectionOwner(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Atom		/* selection */
-#endif
-);
-extern Window XCreateWindow(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* parent */,
-    int			/* x */,
-    int			/* y */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    unsigned int	/* border_width */,
-    int			/* depth */,
-    unsigned int	/* class */,
-    Visual*		/* visual */,
-    unsigned long	/* valuemask */,
-    XSetWindowAttributes*	/* attributes */
-#endif
-); 
-extern Colormap *XListInstalledColormaps(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    int*		/* num_return */
-#endif
-);
-extern char **XListFonts(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    _Xconst char*	/* pattern */,
-    int			/* maxnames */,
-    int*		/* actual_count_return */
-#endif
-);
-extern char **XListFontsWithInfo(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    _Xconst char*	/* pattern */,
-    int			/* maxnames */,
-    int*		/* count_return */,
-    XFontStruct**	/* info_return */
-#endif
-);
-extern char **XGetFontPath(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int*		/* npaths_return */
-#endif
-);
-extern char **XListExtensions(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int*		/* nextensions_return */
-#endif
-);
-extern Atom *XListProperties(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    int*		/* num_prop_return */
-#endif
-);
-extern XHostAddress *XListHosts(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int*		/* nhosts_return */,
-    Bool*		/* state_return */
-#endif
-);
-extern KeySym XKeycodeToKeysym(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-#if NeedWidePrototypes
-    unsigned int	/* keycode */,
-#else
-    KeyCode		/* keycode */,
-#endif
-    int			/* index */
-#endif
-);
-extern KeySym XLookupKeysym(
-#if NeedFunctionPrototypes
-    XKeyEvent*		/* key_event */,
-    int			/* index */
-#endif
-);
-extern KeySym *XGetKeyboardMapping(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-#if NeedWidePrototypes
-    unsigned int	/* first_keycode */,
-#else
-    KeyCode		/* first_keycode */,
-#endif
-    int			/* keycode_count */,
-    int*		/* keysyms_per_keycode_return */
-#endif
-);
-extern KeySym XStringToKeysym(
-#if NeedFunctionPrototypes
-    _Xconst char*	/* string */
-#endif
-);
-extern long XMaxRequestSize(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-extern long XExtendedMaxRequestSize(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-extern char *XResourceManagerString(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-extern char *XScreenResourceString(
-#if NeedFunctionPrototypes
-	Screen*		/* screen */
-#endif
-);
-extern unsigned long XDisplayMotionBufferSize(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-extern VisualID XVisualIDFromVisual(
-#if NeedFunctionPrototypes
-    Visual*		/* visual */
-#endif
-);
-
-/* multithread routines */
-
-extern Status XInitThreads(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void XLockDisplay(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-
-extern void XUnlockDisplay(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-
-/* routines for dealing with extensions */
-
-extern XExtCodes *XInitExtension(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    _Xconst char*	/* name */
-#endif
-);
-
-extern XExtCodes *XAddExtension(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-extern XExtData *XFindOnExtensionList(
-#if NeedFunctionPrototypes
-    XExtData**		/* structure */,
-    int			/* number */
-#endif
-);
-extern XExtData **XEHeadOfExtensionList(
-#if NeedFunctionPrototypes
-    XEDataObject	/* object */
-#endif
-);
-
-/* these are routines for which there are also macros */
-extern Window XRootWindow(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* screen_number */
-#endif
-);
-extern Window XDefaultRootWindow(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-extern Window XRootWindowOfScreen(
-#if NeedFunctionPrototypes
-    Screen*		/* screen */
-#endif
-);
-extern Visual *XDefaultVisual(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* screen_number */
-#endif
-);
-extern Visual *XDefaultVisualOfScreen(
-#if NeedFunctionPrototypes
-    Screen*		/* screen */
-#endif
-);
-extern GC XDefaultGC(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* screen_number */
-#endif
-);
-extern GC XDefaultGCOfScreen(
-#if NeedFunctionPrototypes
-    Screen*		/* screen */
-#endif
-);
-extern unsigned long XBlackPixel(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* screen_number */
-#endif
-);
-extern unsigned long XWhitePixel(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* screen_number */
-#endif
-);
-extern unsigned long XAllPlanes(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-extern unsigned long XBlackPixelOfScreen(
-#if NeedFunctionPrototypes
-    Screen*		/* screen */
-#endif
-);
-extern unsigned long XWhitePixelOfScreen(
-#if NeedFunctionPrototypes
-    Screen*		/* screen */
-#endif
-);
-extern unsigned long XNextRequest(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-extern unsigned long XLastKnownRequestProcessed(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-extern char *XServerVendor(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-extern char *XDisplayString(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-extern Colormap XDefaultColormap(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* screen_number */
-#endif
-);
-extern Colormap XDefaultColormapOfScreen(
-#if NeedFunctionPrototypes
-    Screen*		/* screen */
-#endif
-);
-extern Display *XDisplayOfScreen(
-#if NeedFunctionPrototypes
-    Screen*		/* screen */
-#endif
-);
-extern Screen *XScreenOfDisplay(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* screen_number */
-#endif
-);
-extern Screen *XDefaultScreenOfDisplay(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-extern long XEventMaskOfScreen(
-#if NeedFunctionPrototypes
-    Screen*		/* screen */
-#endif
-);
-
-extern int XScreenNumberOfScreen(
-#if NeedFunctionPrototypes
-    Screen*		/* screen */
-#endif
-);
-
-typedef int (*XErrorHandler) (	    /* WARNING, this type not in Xlib spec */
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    XErrorEvent*	/* error_event */
-#endif
-);
-
-extern XErrorHandler XSetErrorHandler (
-#if NeedFunctionPrototypes
-    XErrorHandler	/* handler */
-#endif
-);
-
-
-typedef int (*XIOErrorHandler) (    /* WARNING, this type not in Xlib spec */
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-
-extern XIOErrorHandler XSetIOErrorHandler (
-#if NeedFunctionPrototypes
-    XIOErrorHandler	/* handler */
-#endif
-);
-
-
-extern XPixmapFormatValues *XListPixmapFormats(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int*		/* count_return */
-#endif
-);
-extern int *XListDepths(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* screen_number */,
-    int*		/* count_return */
-#endif
-);
-
-/* ICCCM routines for things that don't require special include files; */
-/* other declarations are given in Xutil.h                             */
-extern Status XReconfigureWMWindow(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    int			/* screen_number */,
-    unsigned int	/* mask */,
-    XWindowChanges*	/* changes */
-#endif
-);
-
-extern Status XGetWMProtocols(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    Atom**		/* protocols_return */,
-    int*		/* count_return */
-#endif
-);
-extern Status XSetWMProtocols(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    Atom*		/* protocols */,
-    int			/* count */
-#endif
-);
-extern Status XIconifyWindow(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    int			/* screen_number */
-#endif
-);
-extern Status XWithdrawWindow(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    int			/* screen_number */
-#endif
-);
-extern Status XGetCommand(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    char***		/* argv_return */,
-    int*		/* argc_return */
-#endif
-);
-extern Status XGetWMColormapWindows(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    Window**		/* windows_return */,
-    int*		/* count_return */
-#endif
-);
-extern Status XSetWMColormapWindows(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    Window*		/* colormap_windows */,
-    int			/* count */
-#endif
-);
-extern void XFreeStringList(
-#if NeedFunctionPrototypes
-    char**		/* list */
-#endif
-);
-extern int XSetTransientForHint(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    Window		/* prop_window */
-#endif
-);
-
-/* The following are given in alphabetical order */
-
-extern int XActivateScreenSaver(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-
-extern int XAddHost(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    XHostAddress*	/* host */
-#endif
-);
-
-extern int XAddHosts(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    XHostAddress*	/* hosts */,
-    int			/* num_hosts */    
-#endif
-);
-
-extern int XAddToExtensionList(
-#if NeedFunctionPrototypes
-    struct _XExtData**	/* structure */,
-    XExtData*		/* ext_data */
-#endif
-);
-
-extern int XAddToSaveSet(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */
-#endif
-);
-
-extern Status XAllocColor(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Colormap		/* colormap */,
-    XColor*		/* screen_in_out */
-#endif
-);
-
-extern Status XAllocColorCells(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Colormap		/* colormap */,
-    Bool	        /* contig */,
-    unsigned long*	/* plane_masks_return */,
-    unsigned int	/* nplanes */,
-    unsigned long*	/* pixels_return */,
-    unsigned int 	/* npixels */
-#endif
-);
-
-extern Status XAllocColorPlanes(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Colormap		/* colormap */,
-    Bool		/* contig */,
-    unsigned long*	/* pixels_return */,
-    int			/* ncolors */,
-    int			/* nreds */,
-    int			/* ngreens */,
-    int			/* nblues */,
-    unsigned long*	/* rmask_return */,
-    unsigned long*	/* gmask_return */,
-    unsigned long*	/* bmask_return */
-#endif
-);
-
-extern Status XAllocNamedColor(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Colormap		/* colormap */,
-    _Xconst char*	/* color_name */,
-    XColor*		/* screen_def_return */,
-    XColor*		/* exact_def_return */
-#endif
-);
-
-extern int XAllowEvents(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* event_mode */,
-    Time		/* time */
-#endif
-);
-
-extern int XAutoRepeatOff(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-
-extern int XAutoRepeatOn(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-
-extern int XBell(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* percent */
-#endif
-);
-
-extern int XBitmapBitOrder(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-
-extern int XBitmapPad(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-
-extern int XBitmapUnit(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-
-extern int XCellsOfScreen(
-#if NeedFunctionPrototypes
-    Screen*		/* screen */
-#endif
-);
-
-extern int XChangeActivePointerGrab(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    unsigned int	/* event_mask */,
-    Cursor		/* cursor */,
-    Time		/* time */
-#endif
-);
-
-extern int XChangeGC(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */,
-    unsigned long	/* valuemask */,
-    XGCValues*		/* values */
-#endif
-);
-
-extern int XChangeKeyboardControl(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    unsigned long	/* value_mask */,
-    XKeyboardControl*	/* values */
-#endif
-);
-
-extern int XChangeKeyboardMapping(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* first_keycode */,
-    int			/* keysyms_per_keycode */,
-    KeySym*		/* keysyms */,
-    int			/* num_codes */
-#endif
-);
-
-extern int XChangePointerControl(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Bool		/* do_accel */,
-    Bool		/* do_threshold */,
-    int			/* accel_numerator */,
-    int			/* accel_denominator */,
-    int			/* threshold */
-#endif
-);
-
-extern int XChangeProperty(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    Atom		/* property */,
-    Atom		/* type */,
-    int			/* format */,
-    int			/* mode */,
-    _Xconst unsigned char*	/* data */,
-    int			/* nelements */
-#endif
-);
-
-extern int XChangeSaveSet(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    int			/* change_mode */
-#endif
-);
-
-extern int XChangeWindowAttributes(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    unsigned long	/* valuemask */,
-    XSetWindowAttributes* /* attributes */
-#endif
-);
-
-extern Bool XCheckIfEvent(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    XEvent*		/* event_return */,
-    Bool (*) (
-#if NeedNestedPrototypes
-	       Display*			/* display */,
-               XEvent*			/* event */,
-               XPointer			/* arg */
-#endif
-             )		/* predicate */,
-    XPointer		/* arg */
-#endif
-);
-
-extern Bool XCheckMaskEvent(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    long		/* event_mask */,
-    XEvent*		/* event_return */
-#endif
-);
-
-extern Bool XCheckTypedEvent(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* event_type */,
-    XEvent*		/* event_return */
-#endif
-);
-
-extern Bool XCheckTypedWindowEvent(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    int			/* event_type */,
-    XEvent*		/* event_return */
-#endif
-);
-
-extern Bool XCheckWindowEvent(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    long		/* event_mask */,
-    XEvent*		/* event_return */
-#endif
-);
-
-extern int XCirculateSubwindows(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    int			/* direction */
-#endif
-);
-
-extern int XCirculateSubwindowsDown(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */
-#endif
-);
-
-extern int XCirculateSubwindowsUp(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */
-#endif
-);
-
-extern int XClearArea(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    int			/* x */,
-    int			/* y */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    Bool		/* exposures */
-#endif
-);
-
-extern int XClearWindow(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */
-#endif
-);
-
-extern int XCloseDisplay(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-
-extern int XConfigureWindow(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    unsigned int	/* value_mask */,
-    XWindowChanges*	/* values */		 
-#endif
-);
-
-extern int XConnectionNumber(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-
-extern int XConvertSelection(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Atom		/* selection */,
-    Atom 		/* target */,
-    Atom		/* property */,
-    Window		/* requestor */,
-    Time		/* time */
-#endif
-);
-
-extern int XCopyArea(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* src */,
-    Drawable		/* dest */,
-    GC			/* gc */,
-    int			/* src_x */,
-    int			/* src_y */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    int			/* dest_x */,
-    int			/* dest_y */
-#endif
-);
-
-extern int XCopyGC(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* src */,
-    unsigned long	/* valuemask */,
-    GC			/* dest */
-#endif
-);
-
-extern int XCopyPlane(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* src */,
-    Drawable		/* dest */,
-    GC			/* gc */,
-    int			/* src_x */,
-    int			/* src_y */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    int			/* dest_x */,
-    int			/* dest_y */,
-    unsigned long	/* plane */
-#endif
-);
-
-extern int XDefaultDepth(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* screen_number */
-#endif
-);
-
-extern int XDefaultDepthOfScreen(
-#if NeedFunctionPrototypes
-    Screen*		/* screen */
-#endif
-);
-
-extern int XDefaultScreen(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-
-extern int XDefineCursor(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    Cursor		/* cursor */
-#endif
-);
-
-extern int XDeleteProperty(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    Atom		/* property */
-#endif
-);
-
-extern int XDestroyWindow(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */
-#endif
-);
-
-extern int XDestroySubwindows(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */
-#endif
-);
-
-extern int XDoesBackingStore(
-#if NeedFunctionPrototypes
-    Screen*		/* screen */    
-#endif
-);
-
-extern Bool XDoesSaveUnders(
-#if NeedFunctionPrototypes
-    Screen*		/* screen */
-#endif
-);
-
-extern int XDisableAccessControl(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-
-
-extern int XDisplayCells(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* screen_number */
-#endif
-);
-
-extern int XDisplayHeight(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* screen_number */
-#endif
-);
-
-extern int XDisplayHeightMM(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* screen_number */
-#endif
-);
-
-extern int XDisplayKeycodes(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int*		/* min_keycodes_return */,
-    int*		/* max_keycodes_return */
-#endif
-);
-
-extern int XDisplayPlanes(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* screen_number */
-#endif
-);
-
-extern int XDisplayWidth(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* screen_number */
-#endif
-);
-
-extern int XDisplayWidthMM(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* screen_number */
-#endif
-);
-
-extern int XDrawArc(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    int			/* angle1 */,
-    int			/* angle2 */
-#endif
-);
-
-extern int XDrawArcs(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    XArc*		/* arcs */,
-    int			/* narcs */
-#endif
-);
-
-extern int XDrawImageString(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    _Xconst char*	/* string */,
-    int			/* length */
-#endif
-);
-
-extern int XDrawImageString16(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    _Xconst XChar2b*	/* string */,
-    int			/* length */
-#endif
-);
-
-extern int XDrawLine(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x1 */,
-    int			/* y1 */,
-    int			/* x2 */,
-    int			/* y2 */
-#endif
-);
-
-extern int XDrawLines(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    XPoint*		/* points */,
-    int			/* npoints */,
-    int			/* mode */
-#endif
-);
-
-extern int XDrawPoint(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */
-#endif
-);
-
-extern int XDrawPoints(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    XPoint*		/* points */,
-    int			/* npoints */,
-    int			/* mode */
-#endif
-);
-
-extern int XDrawRectangle(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    unsigned int	/* width */,
-    unsigned int	/* height */
-#endif
-);
-
-extern int XDrawRectangles(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    XRectangle*		/* rectangles */,
-    int			/* nrectangles */
-#endif
-);
-
-extern int XDrawSegments(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    XSegment*		/* segments */,
-    int			/* nsegments */
-#endif
-);
-
-extern int XDrawString(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    _Xconst char*	/* string */,
-    int			/* length */
-#endif
-);
-
-extern int XDrawString16(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    _Xconst XChar2b*	/* string */,
-    int			/* length */
-#endif
-);
-
-extern int XDrawText(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    XTextItem*		/* items */,
-    int			/* nitems */
-#endif
-);
-
-extern int XDrawText16(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    XTextItem16*	/* items */,
-    int			/* nitems */
-#endif
-);
-
-extern int XEnableAccessControl(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-
-extern int XEventsQueued(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* mode */
-#endif
-);
-
-extern Status XFetchName(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    char**		/* window_name_return */
-#endif
-);
-
-extern int XFillArc(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    int			/* angle1 */,
-    int			/* angle2 */
-#endif
-);
-
-extern int XFillArcs(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    XArc*		/* arcs */,
-    int			/* narcs */
-#endif
-);
-
-extern int XFillPolygon(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    XPoint*		/* points */,
-    int			/* npoints */,
-    int			/* shape */,
-    int			/* mode */
-#endif
-);
-
-extern int XFillRectangle(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    unsigned int	/* width */,
-    unsigned int	/* height */
-#endif
-);
-
-extern int XFillRectangles(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    XRectangle*		/* rectangles */,
-    int			/* nrectangles */
-#endif
-);
-
-extern int XFlush(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-
-extern int XForceScreenSaver(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* mode */
-#endif
-);
-
-extern int XFree(
-#if NeedFunctionPrototypes
-    void*		/* data */
-#endif
-);
-
-extern int XFreeColormap(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Colormap		/* colormap */
-#endif
-);
-
-extern int XFreeColors(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Colormap		/* colormap */,
-    unsigned long*	/* pixels */,
-    int			/* npixels */,
-    unsigned long	/* planes */
-#endif
-);
-
-extern int XFreeCursor(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Cursor		/* cursor */
-#endif
-);
-
-extern int XFreeExtensionList(
-#if NeedFunctionPrototypes
-    char**		/* list */    
-#endif
-);
-
-extern int XFreeFont(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    XFontStruct*	/* font_struct */
-#endif
-);
-
-extern int XFreeFontInfo(
-#if NeedFunctionPrototypes
-    char**		/* names */,
-    XFontStruct*	/* free_info */,
-    int			/* actual_count */
-#endif
-);
-
-extern int XFreeFontNames(
-#if NeedFunctionPrototypes
-    char**		/* list */
-#endif
-);
-
-extern int XFreeFontPath(
-#if NeedFunctionPrototypes
-    char**		/* list */
-#endif
-);
-
-extern int XFreeGC(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */
-#endif
-);
-
-extern int XFreeModifiermap(
-#if NeedFunctionPrototypes
-    XModifierKeymap*	/* modmap */
-#endif
-);
-
-extern int XFreePixmap(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Pixmap		/* pixmap */
-#endif
-);
-
-extern int XGeometry(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* screen */,
-    _Xconst char*	/* position */,
-    _Xconst char*	/* default_position */,
-    unsigned int	/* bwidth */,
-    unsigned int	/* fwidth */,
-    unsigned int	/* fheight */,
-    int			/* xadder */,
-    int			/* yadder */,
-    int*		/* x_return */,
-    int*		/* y_return */,
-    int*		/* width_return */,
-    int*		/* height_return */
-#endif
-);
-
-extern int XGetErrorDatabaseText(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    _Xconst char*	/* name */,
-    _Xconst char*	/* message */,
-    _Xconst char*	/* default_string */,
-    char*		/* buffer_return */,
-    int			/* length */
-#endif
-);
-
-extern int XGetErrorText(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* code */,
-    char*		/* buffer_return */,
-    int			/* length */
-#endif
-);
-
-extern Bool XGetFontProperty(
-#if NeedFunctionPrototypes
-    XFontStruct*	/* font_struct */,
-    Atom		/* atom */,
-    unsigned long*	/* value_return */
-#endif
-);
-
-extern Status XGetGCValues(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */,
-    unsigned long	/* valuemask */,
-    XGCValues*		/* values_return */
-#endif
-);
-
-extern Status XGetGeometry(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    Window*		/* root_return */,
-    int*		/* x_return */,
-    int*		/* y_return */,
-    unsigned int*	/* width_return */,
-    unsigned int*	/* height_return */,
-    unsigned int*	/* border_width_return */,
-    unsigned int*	/* depth_return */
-#endif
-);
-
-extern Status XGetIconName(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    char**		/* icon_name_return */
-#endif
-);
-
-extern int XGetInputFocus(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window*		/* focus_return */,
-    int*		/* revert_to_return */
-#endif
-);
-
-extern int XGetKeyboardControl(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    XKeyboardState*	/* values_return */
-#endif
-);
-
-extern int XGetPointerControl(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int*		/* accel_numerator_return */,
-    int*		/* accel_denominator_return */,
-    int*		/* threshold_return */
-#endif
-);
-
-extern int XGetPointerMapping(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    unsigned char*	/* map_return */,
-    int			/* nmap */
-#endif
-);
-
-extern int XGetScreenSaver(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int*		/* timeout_return */,
-    int*		/* interval_return */,
-    int*		/* prefer_blanking_return */,
-    int*		/* allow_exposures_return */
-#endif
-);
-
-extern Status XGetTransientForHint(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    Window*		/* prop_window_return */
-#endif
-);
-
-extern int XGetWindowProperty(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    Atom		/* property */,
-    long		/* long_offset */,
-    long		/* long_length */,
-    Bool		/* delete */,
-    Atom		/* req_type */,
-    Atom*		/* actual_type_return */,
-    int*		/* actual_format_return */,
-    unsigned long*	/* nitems_return */,
-    unsigned long*	/* bytes_after_return */,
-    unsigned char**	/* prop_return */
-#endif
-);
-
-extern Status XGetWindowAttributes(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XWindowAttributes*	/* window_attributes_return */
-#endif
-);
-
-extern int XGrabButton(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    unsigned int	/* button */,
-    unsigned int	/* modifiers */,
-    Window		/* grab_window */,
-    Bool		/* owner_events */,
-    unsigned int	/* event_mask */,
-    int			/* pointer_mode */,
-    int			/* keyboard_mode */,
-    Window		/* confine_to */,
-    Cursor		/* cursor */
-#endif
-);
-
-extern int XGrabKey(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* keycode */,
-    unsigned int	/* modifiers */,
-    Window		/* grab_window */,
-    Bool		/* owner_events */,
-    int			/* pointer_mode */,
-    int			/* keyboard_mode */
-#endif
-);
-
-extern int XGrabKeyboard(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* grab_window */,
-    Bool		/* owner_events */,
-    int			/* pointer_mode */,
-    int			/* keyboard_mode */,
-    Time		/* time */
-#endif
-);
-
-extern int XGrabPointer(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* grab_window */,
-    Bool		/* owner_events */,
-    unsigned int	/* event_mask */,
-    int			/* pointer_mode */,
-    int			/* keyboard_mode */,
-    Window		/* confine_to */,
-    Cursor		/* cursor */,
-    Time		/* time */
-#endif
-);
-
-extern int XGrabServer(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-
-extern int XHeightMMOfScreen(
-#if NeedFunctionPrototypes
-    Screen*		/* screen */
-#endif
-);
-
-extern int XHeightOfScreen(
-#if NeedFunctionPrototypes
-    Screen*		/* screen */
-#endif
-);
-
-extern int XIfEvent(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    XEvent*		/* event_return */,
-    Bool (*) (
-#if NeedNestedPrototypes
-	       Display*			/* display */,
-               XEvent*			/* event */,
-               XPointer			/* arg */
-#endif
-             )		/* predicate */,
-    XPointer		/* arg */
-#endif
-);
-
-extern int XImageByteOrder(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-
-extern int XInstallColormap(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Colormap		/* colormap */
-#endif
-);
-
-extern KeyCode XKeysymToKeycode(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    KeySym		/* keysym */
-#endif
-);
-
-extern int XKillClient(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    XID			/* resource */
-#endif
-);
-
-extern Status XLookupColor(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Colormap		/* colormap */,
-    _Xconst char*	/* color_name */,
-    XColor*		/* exact_def_return */,
-    XColor*		/* screen_def_return */
-#endif
-);
-
-extern int XLowerWindow(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */
-#endif
-);
-
-extern int XMapRaised(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */
-#endif
-);
-
-extern int XMapSubwindows(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */
-#endif
-);
-
-extern int XMapWindow(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */
-#endif
-);
-
-extern int XMaskEvent(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    long		/* event_mask */,
-    XEvent*		/* event_return */
-#endif
-);
-
-extern int XMaxCmapsOfScreen(
-#if NeedFunctionPrototypes
-    Screen*		/* screen */
-#endif
-);
-
-extern int XMinCmapsOfScreen(
-#if NeedFunctionPrototypes
-    Screen*		/* screen */
-#endif
-);
-
-extern int XMoveResizeWindow(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    int			/* x */,
-    int			/* y */,
-    unsigned int	/* width */,
-    unsigned int	/* height */
-#endif
-);
-
-extern int XMoveWindow(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    int			/* x */,
-    int			/* y */
-#endif
-);
-
-extern int XNextEvent(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    XEvent*		/* event_return */
-#endif
-);
-
-extern int XNoOp(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-
-extern Status XParseColor(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Colormap		/* colormap */,
-    _Xconst char*	/* spec */,
-    XColor*		/* exact_def_return */
-#endif
-);
-
-extern int XParseGeometry(
-#if NeedFunctionPrototypes
-    _Xconst char*	/* parsestring */,
-    int*		/* x_return */,
-    int*		/* y_return */,
-    unsigned int*	/* width_return */,
-    unsigned int*	/* height_return */
-#endif
-);
-
-extern int XPeekEvent(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    XEvent*		/* event_return */
-#endif
-);
-
-extern int XPeekIfEvent(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    XEvent*		/* event_return */,
-    Bool (*) (
-#if NeedNestedPrototypes
-	       Display*		/* display */,
-               XEvent*		/* event */,
-               XPointer		/* arg */
-#endif
-             )		/* predicate */,
-    XPointer		/* arg */
-#endif
-);
-
-extern int XPending(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-
-extern int XPlanesOfScreen(
-#if NeedFunctionPrototypes
-    Screen*		/* screen */
-    
-#endif
-);
-
-extern int XProtocolRevision(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-
-extern int XProtocolVersion(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-
-
-extern int XPutBackEvent(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    XEvent*		/* event */
-#endif
-);
-
-extern int XPutImage(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    XImage*		/* image */,
-    int			/* src_x */,
-    int			/* src_y */,
-    int			/* dest_x */,
-    int			/* dest_y */,
-    unsigned int	/* width */,
-    unsigned int	/* height */	  
-#endif
-);
-
-extern int XQLength(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-
-extern Status XQueryBestCursor(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    unsigned int        /* width */,
-    unsigned int	/* height */,
-    unsigned int*	/* width_return */,
-    unsigned int*	/* height_return */
-#endif
-);
-
-extern Status XQueryBestSize(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* class */,
-    Drawable		/* which_screen */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    unsigned int*	/* width_return */,
-    unsigned int*	/* height_return */
-#endif
-);
-
-extern Status XQueryBestStipple(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* which_screen */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    unsigned int*	/* width_return */,
-    unsigned int*	/* height_return */
-#endif
-);
-
-extern Status XQueryBestTile(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* which_screen */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    unsigned int*	/* width_return */,
-    unsigned int*	/* height_return */
-#endif
-);
-
-extern int XQueryColor(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Colormap		/* colormap */,
-    XColor*		/* def_in_out */
-#endif
-);
-
-extern int XQueryColors(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Colormap		/* colormap */,
-    XColor*		/* defs_in_out */,
-    int			/* ncolors */
-#endif
-);
-
-extern Bool XQueryExtension(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    _Xconst char*	/* name */,
-    int*		/* major_opcode_return */,
-    int*		/* first_event_return */,
-    int*		/* first_error_return */
-#endif
-);
-
-extern int XQueryKeymap(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    char [32]		/* keys_return */
-#endif
-);
-
-extern Bool XQueryPointer(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    Window*		/* root_return */,
-    Window*		/* child_return */,
-    int*		/* root_x_return */,
-    int*		/* root_y_return */,
-    int*		/* win_x_return */,
-    int*		/* win_y_return */,
-    unsigned int*       /* mask_return */
-#endif
-);
-
-extern int XQueryTextExtents(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    XID			/* font_ID */,
-    _Xconst char*	/* string */,
-    int			/* nchars */,
-    int*		/* direction_return */,
-    int*		/* font_ascent_return */,
-    int*		/* font_descent_return */,
-    XCharStruct*	/* overall_return */    
-#endif
-);
-
-extern int XQueryTextExtents16(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    XID			/* font_ID */,
-    _Xconst XChar2b*	/* string */,
-    int			/* nchars */,
-    int*		/* direction_return */,
-    int*		/* font_ascent_return */,
-    int*		/* font_descent_return */,
-    XCharStruct*	/* overall_return */
-#endif
-);
-
-extern Status XQueryTree(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    Window*		/* root_return */,
-    Window*		/* parent_return */,
-    Window**		/* children_return */,
-    unsigned int*	/* nchildren_return */
-#endif
-);
-
-extern int XRaiseWindow(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */
-#endif
-);
-
-extern int XReadBitmapFile(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable 		/* d */,
-    _Xconst char*	/* filename */,
-    unsigned int*	/* width_return */,
-    unsigned int*	/* height_return */,
-    Pixmap*		/* bitmap_return */,
-    int*		/* x_hot_return */,
-    int*		/* y_hot_return */
-#endif
-);
-
-extern int XReadBitmapFileData(
-#if NeedFunctionPrototypes
-    _Xconst char*	/* filename */,
-    unsigned int*	/* width_return */,
-    unsigned int*	/* height_return */,
-    unsigned char**	/* data_return */,
-    int*		/* x_hot_return */,
-    int*		/* y_hot_return */
-#endif
-);
-
-extern int XRebindKeysym(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    KeySym		/* keysym */,
-    KeySym*		/* list */,
-    int			/* mod_count */,
-    _Xconst unsigned char*	/* string */,
-    int			/* bytes_string */
-#endif
-);
-
-extern int XRecolorCursor(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Cursor		/* cursor */,
-    XColor*		/* foreground_color */,
-    XColor*		/* background_color */
-#endif
-);
-
-extern int XRefreshKeyboardMapping(
-#if NeedFunctionPrototypes
-    XMappingEvent*	/* event_map */    
-#endif
-);
-
-extern int XRemoveFromSaveSet(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */
-#endif
-);
-
-extern int XRemoveHost(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    XHostAddress*	/* host */
-#endif
-);
-
-extern int XRemoveHosts(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    XHostAddress*	/* hosts */,
-    int			/* num_hosts */
-#endif
-);
-
-extern int XReparentWindow(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    Window		/* parent */,
-    int			/* x */,
-    int			/* y */
-#endif
-);
-
-extern int XResetScreenSaver(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-
-extern int XResizeWindow(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    unsigned int	/* width */,
-    unsigned int	/* height */
-#endif
-);
-
-extern int XRestackWindows(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window*		/* windows */,
-    int			/* nwindows */
-#endif
-);
-
-extern int XRotateBuffers(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* rotate */
-#endif
-);
-
-extern int XRotateWindowProperties(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    Atom*		/* properties */,
-    int			/* num_prop */,
-    int			/* npositions */
-#endif
-);
-
-extern int XScreenCount(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-
-extern int XSelectInput(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    long		/* event_mask */
-#endif
-);
-
-extern Status XSendEvent(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    Bool		/* propagate */,
-    long		/* event_mask */,
-    XEvent*		/* event_send */
-#endif
-);
-
-extern int XSetAccessControl(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* mode */
-#endif
-);
-
-extern int XSetArcMode(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */,
-    int			/* arc_mode */
-#endif
-);
-
-extern int XSetBackground(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */,
-    unsigned long	/* background */
-#endif
-);
-
-extern int XSetClipMask(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */,
-    Pixmap		/* pixmap */
-#endif
-);
-
-extern int XSetClipOrigin(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */,
-    int			/* clip_x_origin */,
-    int			/* clip_y_origin */
-#endif
-);
-
-extern int XSetClipRectangles(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */,
-    int			/* clip_x_origin */,
-    int			/* clip_y_origin */,
-    XRectangle*		/* rectangles */,
-    int			/* n */,
-    int			/* ordering */
-#endif
-);
-
-extern int XSetCloseDownMode(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* close_mode */
-#endif
-);
-
-extern int XSetCommand(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    char**		/* argv */,
-    int			/* argc */
-#endif
-);
-
-extern int XSetDashes(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */,
-    int			/* dash_offset */,
-    _Xconst char*	/* dash_list */,
-    int			/* n */
-#endif
-);
-
-extern int XSetFillRule(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */,
-    int			/* fill_rule */
-#endif
-);
-
-extern int XSetFillStyle(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */,
-    int			/* fill_style */
-#endif
-);
-
-extern int XSetFont(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */,
-    Font		/* font */
-#endif
-);
-
-extern int XSetFontPath(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    char**		/* directories */,
-    int			/* ndirs */	     
-#endif
-);
-
-extern int XSetForeground(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */,
-    unsigned long	/* foreground */
-#endif
-);
-
-extern int XSetFunction(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */,
-    int			/* function */
-#endif
-);
-
-extern int XSetGraphicsExposures(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */,
-    Bool		/* graphics_exposures */
-#endif
-);
-
-extern int XSetIconName(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    _Xconst char*	/* icon_name */
-#endif
-);
-
-extern int XSetInputFocus(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* focus */,
-    int			/* revert_to */,
-    Time		/* time */
-#endif
-);
-
-extern int XSetLineAttributes(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */,
-    unsigned int	/* line_width */,
-    int			/* line_style */,
-    int			/* cap_style */,
-    int			/* join_style */
-#endif
-);
-
-extern int XSetModifierMapping(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    XModifierKeymap*	/* modmap */
-#endif
-);
-
-extern int XSetPlaneMask(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */,
-    unsigned long	/* plane_mask */
-#endif
-);
-
-extern int XSetPointerMapping(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    _Xconst unsigned char*	/* map */,
-    int			/* nmap */
-#endif
-);
-
-extern int XSetScreenSaver(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* timeout */,
-    int			/* interval */,
-    int			/* prefer_blanking */,
-    int			/* allow_exposures */
-#endif
-);
-
-extern int XSetSelectionOwner(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Atom	        /* selection */,
-    Window		/* owner */,
-    Time		/* time */
-#endif
-);
-
-extern int XSetState(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */,
-    unsigned long 	/* foreground */,
-    unsigned long	/* background */,
-    int			/* function */,
-    unsigned long	/* plane_mask */
-#endif
-);
-
-extern int XSetStipple(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */,
-    Pixmap		/* stipple */
-#endif
-);
-
-extern int XSetSubwindowMode(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */,
-    int			/* subwindow_mode */
-#endif
-);
-
-extern int XSetTSOrigin(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */,
-    int			/* ts_x_origin */,
-    int			/* ts_y_origin */
-#endif
-);
-
-extern int XSetTile(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */,
-    Pixmap		/* tile */
-#endif
-);
-
-extern int XSetWindowBackground(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    unsigned long	/* background_pixel */
-#endif
-);
-
-extern int XSetWindowBackgroundPixmap(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    Pixmap		/* background_pixmap */
-#endif
-);
-
-extern int XSetWindowBorder(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    unsigned long	/* border_pixel */
-#endif
-);
-
-extern int XSetWindowBorderPixmap(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    Pixmap		/* border_pixmap */
-#endif
-);
-
-extern int XSetWindowBorderWidth(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    unsigned int	/* width */
-#endif
-);
-
-extern int XSetWindowColormap(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    Colormap		/* colormap */
-#endif
-);
-
-extern int XStoreBuffer(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    _Xconst char*	/* bytes */,
-    int			/* nbytes */,
-    int			/* buffer */
-#endif
-);
-
-extern int XStoreBytes(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    _Xconst char*	/* bytes */,
-    int			/* nbytes */
-#endif
-);
-
-extern int XStoreColor(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Colormap		/* colormap */,
-    XColor*		/* color */
-#endif
-);
-
-extern int XStoreColors(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Colormap		/* colormap */,
-    XColor*		/* color */,
-    int			/* ncolors */
-#endif
-);
-
-extern int XStoreName(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    _Xconst char*	/* window_name */
-#endif
-);
-
-extern int XStoreNamedColor(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Colormap		/* colormap */,
-    _Xconst char*	/* color */,
-    unsigned long	/* pixel */,
-    int			/* flags */
-#endif
-);
-
-extern int XSync(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Bool		/* discard */
-#endif
-);
-
-extern int XTextExtents(
-#if NeedFunctionPrototypes
-    XFontStruct*	/* font_struct */,
-    _Xconst char*	/* string */,
-    int			/* nchars */,
-    int*		/* direction_return */,
-    int*		/* font_ascent_return */,
-    int*		/* font_descent_return */,
-    XCharStruct*	/* overall_return */
-#endif
-);
-
-extern int XTextExtents16(
-#if NeedFunctionPrototypes
-    XFontStruct*	/* font_struct */,
-    _Xconst XChar2b*	/* string */,
-    int			/* nchars */,
-    int*		/* direction_return */,
-    int*		/* font_ascent_return */,
-    int*		/* font_descent_return */,
-    XCharStruct*	/* overall_return */
-#endif
-);
-
-extern int XTextWidth(
-#if NeedFunctionPrototypes
-    XFontStruct*	/* font_struct */,
-    _Xconst char*	/* string */,
-    int			/* count */
-#endif
-);
-
-extern int XTextWidth16(
-#if NeedFunctionPrototypes
-    XFontStruct*	/* font_struct */,
-    _Xconst XChar2b*	/* string */,
-    int			/* count */
-#endif
-);
-
-extern Bool XTranslateCoordinates(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* src_w */,
-    Window		/* dest_w */,
-    int			/* src_x */,
-    int			/* src_y */,
-    int*		/* dest_x_return */,
-    int*		/* dest_y_return */,
-    Window*		/* child_return */
-#endif
-);
-
-extern int XUndefineCursor(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */
-#endif
-);
-
-extern int XUngrabButton(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    unsigned int	/* button */,
-    unsigned int	/* modifiers */,
-    Window		/* grab_window */
-#endif
-);
-
-extern int XUngrabKey(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* keycode */,
-    unsigned int	/* modifiers */,
-    Window		/* grab_window */
-#endif
-);
-
-extern int XUngrabKeyboard(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Time		/* time */
-#endif
-);
-
-extern int XUngrabPointer(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Time		/* time */
-#endif
-);
-
-extern int XUngrabServer(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-
-extern int XUninstallColormap(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Colormap		/* colormap */
-#endif
-);
-
-extern int XUnloadFont(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Font		/* font */
-#endif
-);
-
-extern int XUnmapSubwindows(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */
-#endif
-);
-
-extern int XUnmapWindow(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */
-#endif
-);
-
-extern int XVendorRelease(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-
-extern int XWarpPointer(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* src_w */,
-    Window		/* dest_w */,
-    int			/* src_x */,
-    int			/* src_y */,
-    unsigned int	/* src_width */,
-    unsigned int	/* src_height */,
-    int			/* dest_x */,
-    int			/* dest_y */	     
-#endif
-);
-
-extern int XWidthMMOfScreen(
-#if NeedFunctionPrototypes
-    Screen*		/* screen */
-#endif
-);
-
-extern int XWidthOfScreen(
-#if NeedFunctionPrototypes
-    Screen*		/* screen */
-#endif
-);
-
-extern int XWindowEvent(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    long		/* event_mask */,
-    XEvent*		/* event_return */
-#endif
-);
-
-extern int XWriteBitmapFile(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    _Xconst char*	/* filename */,
-    Pixmap		/* bitmap */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    int			/* x_hot */,
-    int			/* y_hot */		     
-#endif
-);
-
-extern Bool XSupportsLocale(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern char *XSetLocaleModifiers(
-#if NeedFunctionPrototypes
-    _Xconst char*	/* modifier_list */
-#endif
-);
-
-extern XOM XOpenOM(
-#if NeedFunctionPrototypes
-    Display*			/* display */,
-    struct _XrmHashBucketRec*	/* rdb */,
-    _Xconst char*		/* res_name */,
-    _Xconst char*		/* res_class */
-#endif
-);
-
-extern Status XCloseOM(
-#if NeedFunctionPrototypes
-    XOM			/* om */
-#endif
-);
-
-extern char *XSetOMValues(
-#if NeedVarargsPrototypes
-    XOM			/* om */,
-    ...
-#endif
-);
-
-extern char *XGetOMValues(
-#if NeedVarargsPrototypes
-    XOM			/* om */,
-    ...
-#endif
-);
-
-extern Display *XDisplayOfOM(
-#if NeedFunctionPrototypes
-    XOM			/* om */
-#endif
-);
-
-extern char *XLocaleOfOM(
-#if NeedFunctionPrototypes
-    XOM			/* om */
-#endif
-);
-
-extern XOC XCreateOC(
-#if NeedVarargsPrototypes
-    XOM			/* om */,
-    ...
-#endif
-);
-
-extern void XDestroyOC(
-#if NeedFunctionPrototypes
-    XOC			/* oc */
-#endif
-);
-
-extern XOM XOMOfOC(
-#if NeedFunctionPrototypes
-    XOC			/* oc */
-#endif
-);
-
-extern char *XSetOCValues(
-#if NeedVarargsPrototypes
-    XOC			/* oc */,
-    ...
-#endif
-);
-
-extern char *XGetOCValues(
-#if NeedVarargsPrototypes
-    XOC			/* oc */,
-    ...
-#endif
-);
-
-extern XFontSet XCreateFontSet(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    _Xconst char*	/* base_font_name_list */,
-    char***		/* missing_charset_list */,
-    int*		/* missing_charset_count */,
-    char**		/* def_string */
-#endif
-);
-
-extern void XFreeFontSet(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    XFontSet		/* font_set */
-#endif
-);
-
-extern int XFontsOfFontSet(
-#if NeedFunctionPrototypes
-    XFontSet		/* font_set */,
-    XFontStruct***	/* font_struct_list */,
-    char***		/* font_name_list */
-#endif
-);
-
-extern char *XBaseFontNameListOfFontSet(
-#if NeedFunctionPrototypes
-    XFontSet		/* font_set */
-#endif
-);
-
-extern char *XLocaleOfFontSet(
-#if NeedFunctionPrototypes
-    XFontSet		/* font_set */
-#endif
-);
-
-extern Bool XContextDependentDrawing(
-#if NeedFunctionPrototypes
-    XFontSet		/* font_set */
-#endif
-);
-
-extern Bool XDirectionalDependentDrawing(
-#if NeedFunctionPrototypes
-    XFontSet		/* font_set */
-#endif
-);
-
-extern Bool XContextualDrawing(
-#if NeedFunctionPrototypes
-    XFontSet		/* font_set */
-#endif
-);
-
-extern XFontSetExtents *XExtentsOfFontSet(
-#if NeedFunctionPrototypes
-    XFontSet		/* font_set */
-#endif
-);
-
-extern int XmbTextEscapement(
-#if NeedFunctionPrototypes
-    XFontSet		/* font_set */,
-    _Xconst char*	/* text */,
-    int			/* bytes_text */
-#endif
-);
-
-extern int XwcTextEscapement(
-#if NeedFunctionPrototypes
-    XFontSet		/* font_set */,
-    _Xconst wchar_t*	/* text */,
-    int			/* num_wchars */
-#endif
-);
-
-extern int XmbTextExtents(
-#if NeedFunctionPrototypes
-    XFontSet		/* font_set */,
-    _Xconst char*	/* text */,
-    int			/* bytes_text */,
-    XRectangle*		/* overall_ink_return */,
-    XRectangle*		/* overall_logical_return */
-#endif
-);
-
-extern int XwcTextExtents(
-#if NeedFunctionPrototypes
-    XFontSet		/* font_set */,
-    _Xconst wchar_t*	/* text */,
-    int			/* num_wchars */,
-    XRectangle*		/* overall_ink_return */,
-    XRectangle*		/* overall_logical_return */
-#endif
-);
-
-extern Status XmbTextPerCharExtents(
-#if NeedFunctionPrototypes
-    XFontSet		/* font_set */,
-    _Xconst char*	/* text */,
-    int			/* bytes_text */,
-    XRectangle*		/* ink_extents_buffer */,
-    XRectangle*		/* logical_extents_buffer */,
-    int			/* buffer_size */,
-    int*		/* num_chars */,
-    XRectangle*		/* overall_ink_return */,
-    XRectangle*		/* overall_logical_return */
-#endif
-);
-
-extern Status XwcTextPerCharExtents(
-#if NeedFunctionPrototypes
-    XFontSet		/* font_set */,
-    _Xconst wchar_t*	/* text */,
-    int			/* num_wchars */,
-    XRectangle*		/* ink_extents_buffer */,
-    XRectangle*		/* logical_extents_buffer */,
-    int			/* buffer_size */,
-    int*		/* num_chars */,
-    XRectangle*		/* overall_ink_return */,
-    XRectangle*		/* overall_logical_return */
-#endif
-);
-
-extern void XmbDrawText(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    XmbTextItem*	/* text_items */,
-    int			/* nitems */
-#endif
-);
-
-extern void XwcDrawText(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    XwcTextItem*	/* text_items */,
-    int			/* nitems */
-#endif
-);
-
-extern void XmbDrawString(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    XFontSet		/* font_set */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    _Xconst char*	/* text */,
-    int			/* bytes_text */
-#endif
-);
-
-extern void XwcDrawString(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    XFontSet		/* font_set */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    _Xconst wchar_t*	/* text */,
-    int			/* num_wchars */
-#endif
-);
-
-extern void XmbDrawImageString(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    XFontSet		/* font_set */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    _Xconst char*	/* text */,
-    int			/* bytes_text */
-#endif
-);
-
-extern void XwcDrawImageString(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    XFontSet		/* font_set */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    _Xconst wchar_t*	/* text */,
-    int			/* num_wchars */
-#endif
-);
-
-extern XIM XOpenIM(
-#if NeedFunctionPrototypes
-    Display*			/* dpy */,
-    struct _XrmHashBucketRec*	/* rdb */,
-    char*			/* res_name */,
-    char*			/* res_class */
-#endif
-);
-
-extern Status XCloseIM(
-#if NeedFunctionPrototypes
-    XIM /* im */
-#endif
-);
-
-extern char *XGetIMValues(
-#if NeedVarargsPrototypes
-    XIM /* im */, ...
-#endif
-);
-
-extern Display *XDisplayOfIM(
-#if NeedFunctionPrototypes
-    XIM /* im */
-#endif
-);
-
-extern char *XLocaleOfIM(
-#if NeedFunctionPrototypes
-    XIM /* im*/
-#endif
-);
-
-extern XIC XCreateIC(
-#if NeedVarargsPrototypes
-    XIM /* im */, ...
-#endif
-);
-
-extern void XDestroyIC(
-#if NeedFunctionPrototypes
-    XIC /* ic */
-#endif
-);
-
-extern void XSetICFocus(
-#if NeedFunctionPrototypes
-    XIC /* ic */
-#endif
-);
-
-extern void XUnsetICFocus(
-#if NeedFunctionPrototypes
-    XIC /* ic */
-#endif
-);
-
-extern wchar_t *XwcResetIC(
-#if NeedFunctionPrototypes
-    XIC /* ic */
-#endif
-);
-
-extern char *XmbResetIC(
-#if NeedFunctionPrototypes
-    XIC /* ic */
-#endif
-);
-
-extern char *XSetICValues(
-#if NeedVarargsPrototypes
-    XIC /* ic */, ...
-#endif
-);
-
-extern char *XGetICValues(
-#if NeedVarargsPrototypes
-    XIC /* ic */, ...
-#endif
-);
-
-extern XIM XIMOfIC(
-#if NeedFunctionPrototypes
-    XIC /* ic */
-#endif
-);
-
-extern Bool XFilterEvent(
-#if NeedFunctionPrototypes
-    XEvent*	/* event */,
-    Window	/* window */
-#endif
-);
-
-extern int XmbLookupString(
-#if NeedFunctionPrototypes
-    XIC			/* ic */,
-    XKeyPressedEvent*	/* event */,
-    char*		/* buffer_return */,
-    int			/* bytes_buffer */,
-    KeySym*		/* keysym_return */,
-    Status*		/* status_return */
-#endif
-);
-
-extern int XwcLookupString(
-#if NeedFunctionPrototypes
-    XIC			/* ic */,
-    XKeyPressedEvent*	/* event */,
-    wchar_t*		/* buffer_return */,
-    int			/* wchars_buffer */,
-    KeySym*		/* keysym_return */,
-    Status*		/* status_return */
-#endif
-);
-
-extern XVaNestedList XVaCreateNestedList(
-#if NeedVarargsPrototypes
-    int /*unused*/, ...
-#endif
-);
-
-/* internal connections for IMs */
-
-extern Bool XRegisterIMInstantiateCallback(
-#if NeedFunctionPrototypes
-    Display*			/* dpy */,
-    struct _XrmHashBucketRec*	/* rdb */,
-    char*			/* res_name */,
-    char*			/* res_class */,
-    XIDProc			/* callback */,
-    XPointer			/* client_data */
-#endif
-);
-
-extern Bool XUnregisterIMInstantiateCallback(
-#if NeedFunctionPrototypes
-    Display*			/* dpy */,
-    struct _XrmHashBucketRec*	/* rdb */,
-    char*			/* res_name */,
-    char*			/* res_class */,
-    XIDProc			/* callback */,
-    XPointer			/* client_data */
-#endif
-);
-
-typedef void (*XConnectionWatchProc)(
-#if NeedFunctionPrototypes
-    Display*			/* dpy */,
-    XPointer			/* client_data */,
-    int				/* fd */,
-    Bool			/* opening */,	 /* open or close flag */
-    XPointer*			/* watch_data */ /* open sets, close uses */
-#endif
-);
-    
-
-extern Status XInternalConnectionNumbers(
-#if NeedFunctionPrototypes
-    Display*			/* dpy */,
-    int**			/* fd_return */,
-    int*			/* count_return */
-#endif
-);
-
-extern void XProcessInternalConnection(
-#if NeedFunctionPrototypes
-    Display*			/* dpy */,
-    int				/* fd */
-#endif
-);
-
-extern Status XAddConnectionWatch(
-#if NeedFunctionPrototypes
-    Display*			/* dpy */,
-    XConnectionWatchProc	/* callback */,
-    XPointer			/* client_data */
-#endif
-);
-
-extern void XRemoveConnectionWatch(
-#if NeedFunctionPrototypes
-    Display*			/* dpy */,
-    XConnectionWatchProc	/* callback */,
-    XPointer			/* client_data */
-#endif
-);
-
-extern void XSetAuthorization(
-#if NeedFunctionPrototypes
-    char *			/* name */,
-    int				/* namelen */, 
-    char *			/* data */,
-    int				/* datalen */
-#endif
-);
-
-_XFUNCPROTOEND
-
-#endif /* _XLIB_H_ */
diff --git a/xc/lib/X11/XlibAsync.c b/xc/lib/X11/XlibAsync.c
deleted file mode 100644
index d7f2d029b..000000000
--- a/xc/lib/X11/XlibAsync.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/* $TOG: XlibAsync.c /main/10 1998/02/06 18:02:17 kaleb $ */
-/*
-
-Copyright 1992, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-#define NEED_REPLIES
-#include <X11/Xlibint.h>
-#include <X11/Xos.h>
-
-/*ARGSUSED*/
-Bool
-_XAsyncErrorHandler(dpy, rep, buf, len, data)
-    register Display *dpy;
-    register xReply *rep;
-    char *buf;
-    int len;
-    XPointer data;
-{
-    register _XAsyncErrorState *state;
-
-    state = (_XAsyncErrorState *)data;
-    if (rep->generic.type == X_Error &&
-	(!state->error_code ||
-	 rep->error.errorCode == state->error_code) &&
-	(!state->major_opcode ||
-	 rep->error.majorCode == state->major_opcode) &&
-	(!state->minor_opcode ||
-	 rep->error.minorCode == state->minor_opcode) &&
-	(!state->min_sequence_number ||
-	 (state->min_sequence_number <= dpy->last_request_read)) &&
-	(!state->max_sequence_number ||
-	 (state->max_sequence_number >= dpy->last_request_read))) {
-	state->last_error_received = rep->error.errorCode;
-	state->error_count++;
-	return True;
-    }
-    return False;
-}
-
-void _XDeqAsyncHandler(dpy, handler)
-    Display *dpy;
-    register _XAsyncHandler *handler;
-{
-    register _XAsyncHandler **prev;
-    register _XAsyncHandler *async;
-
-    for (prev = &dpy->async_handlers;
-	 (async = *prev) && (async != handler);
-	 prev = &async->next)
-	;
-    if (async)
-	*prev = async->next;
-}
-
-char *
-_XGetAsyncReply(dpy, replbuf, rep, buf, len, extra, discard)
-    register Display *dpy;
-    register char *replbuf;	/* data is read into this buffer */
-    register xReply *rep;	/* value passed to calling handler */
-    char *buf;			/* value passed to calling handler */
-    int len;			/* value passed to calling handler */
-    int extra;			/* extra words to read, ala _XReply */
-    Bool discard;		/* discard after extra?, ala _XReply */
-{
-    if (extra == 0) {
-	if (discard && (rep->generic.length << 2) > len)
-	    _XEatData (dpy, (rep->generic.length << 2) - len);
-	return (char *)rep;
-    }
-
-    if (extra <= rep->generic.length) {
-	int size = SIZEOF(xReply) + (extra << 2);
-	if (size > len) {
-	    memcpy(replbuf, buf, len);
-	    _XRead(dpy, replbuf + len, size - len);
-	    buf = replbuf;
-	    len = size;
-#ifdef MUSTCOPY
-	} else {
-	    memcpy(replbuf, buf, size);
-	    buf = replbuf;
-#endif
-	}
-
-	if (discard && rep->generic.length > extra &&
-	    (rep->generic.length << 2) > len)
-	    _XEatData (dpy, (rep->generic.length << 2) - len);
-
-	return buf;
-    }
-    /* 
-     *if we get here, then extra > rep->generic.length--meaning we
-     * read a reply that's shorter than we expected.  This is an 
-     * error,  but we still need to figure out how to handle it...
-     */
-    if ((rep->generic.length << 2) > len)
-	_XEatData (dpy, (rep->generic.length << 2) - len);
-    _XIOError (dpy);
-    return (char *)rep;
-}
-
-void
-_XGetAsyncData(dpy, data, buf, len, skip, datalen, discardtotal)
-    Display *dpy;
-    char *data;			/* data is read into this buffer */
-    char *buf;			/* value passed to calling handler */
-    int len;			/* value passed to calling handler */
-    int skip;			/* number of bytes already read in previous
-				   _XGetAsyncReply or _XGetAsyncData calls */
-    int datalen;		/* size of data buffer in bytes */
-    int discardtotal;		/* min. bytes to consume (after skip) */
-{
-    buf += skip;
-    len -= skip;
-    if (!data) {
-	if (datalen > len)
-	    _XEatData(dpy, datalen - len);
-    } else if (datalen <= len) {
-	memcpy(data, buf, datalen);
-    } else {
-	memcpy(data, buf, len);
-	_XRead(dpy, data + len, datalen - len);
-    }
-    if (discardtotal > len) {
-	if (datalen > len)
-	    len = datalen;
-	_XEatData(dpy, discardtotal - len);
-    }
-}
diff --git a/xc/lib/X11/XlibInt.c b/xc/lib/X11/XlibInt.c
deleted file mode 100644
index 11764f376..000000000
--- a/xc/lib/X11/XlibInt.c
+++ /dev/null
@@ -1,3396 +0,0 @@
-/* $TOG: XlibInt.c /main/186 1998/02/06 18:02:22 kaleb $ */
-/*
-
-Copyright 1985, 1986, 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/XlibInt.c,v 3.17 1999/05/09 10:50:26 dawes Exp $ */
-
-/*
- *	XlibInt.c - Internal support routines for the C subroutine
- *	interface library (Xlib) to the X Window System Protocol V11.0.
- */
-#define NEED_EVENTS
-#define NEED_REPLIES
-
-#include "Xlibint.h"
-#include <X11/Xpoll.h>
-#include <X11/Xtrans.h>
-#include "xcmiscstr.h"
-#include <stdio.h>
-
-#ifdef XTHREADS
-#include "locking.h"
-
-/* these pointers get initialized by XInitThreads */
-LockInfoPtr _Xglobal_lock = NULL;
-void (*_XCreateMutex_fn)() = NULL;
-struct _XCVList *(*_XCreateCVL_fn)() = NULL;
-void (*_XFreeMutex_fn)() = NULL;
-void (*_XLockMutex_fn)() = NULL;
-void (*_XUnlockMutex_fn)() = NULL;
-xthread_t (*_Xthread_self_fn)() = NULL;
-
-#define XThread_Self()	((*_Xthread_self_fn)())
-
-#define UnlockNextReplyReader(d) if ((d)->lock) \
-    (*(d)->lock->pop_reader)((d),&(d)->lock->reply_awaiters,&(d)->lock->reply_awaiters_tail)
-
-#define QueueReplyReaderLock(d) ((d)->lock ? \
-    (*(d)->lock->push_reader)(d,&(d)->lock->reply_awaiters_tail) : NULL)
-#define QueueEventReaderLock(d) ((d)->lock ? \
-    (*(d)->lock->push_reader)(d,&(d)->lock->event_awaiters_tail) : NULL)
-
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-#define InternalLockDisplay(d,wskip) if ((d)->lock) \
-    (*(d)->lock->internal_lock_display)(d,wskip,__FILE__,__LINE__)
-#else
-#define InternalLockDisplay(d,wskip) if ((d)->lock) \
-    (*(d)->lock->internal_lock_display)(d,wskip)
-#endif
-
-#else /* XTHREADS else */
-
-#define UnlockNextReplyReader(d)   
-#define UnlockNextEventReader(d)
-#define InternalLockDisplay(d,wskip)
-
-#endif /* XTHREADS else */ 
-
-/* check for both EAGAIN and EWOULDBLOCK, because some supposedly POSIX
- * systems are broken and return EWOULDBLOCK when they should return EAGAIN
- */
-#ifdef WIN32
-#define ETEST() (WSAGetLastError() == WSAEWOULDBLOCK)
-#else
-#if defined(EAGAIN) && defined(EWOULDBLOCK)
-#define ETEST() (errno == EAGAIN || errno == EWOULDBLOCK)
-#else
-#ifdef EAGAIN
-#define ETEST() (errno == EAGAIN)
-#else
-#define ETEST() (errno == EWOULDBLOCK)
-#endif
-#endif
-#endif
-#ifdef WIN32
-#define ECHECK(err) (WSAGetLastError() == err)
-#define ESET(val) WSASetLastError(val)
-#else
-#ifdef __EMX__
-#define ECHECK(err) (errno == err)
-#define ESET(val)
-#else
-#ifdef ISC
-#define ECHECK(err) ((errno == err) || ETEST())
-#else
-#define ECHECK(err) (errno == err)
-#endif
-#define ESET(val) errno = val
-#endif
-#endif
-
-#if defined(LOCALCONN) || defined(LACHMAN)
-#ifdef EMSGSIZE
-#define ESZTEST() (ECHECK(EMSGSIZE) || ECHECK(ERANGE))
-#else
-#define ESZTEST() ECHECK(ERANGE)
-#endif
-#else
-#ifdef EMSGSIZE
-#define ESZTEST() ECHECK(EMSGSIZE)
-#endif
-#endif
-
-#ifdef __EMX__
-#define select(n,r,w,x,t) os2ClientSelect(n,r,w,x,t)
-#include <limits.h>
-#define MAX_PATH _POSIX_PATH_MAX
-#endif
-
-#ifdef MUSTCOPY
-
-#define STARTITERATE(tpvar,type,start,endcond) \
-  { register char *cpvar; \
-  for (cpvar = (char *) (start); endcond; ) { \
-    type dummy; memcpy ((char *) &dummy, cpvar, SIZEOF(type)); \
-    tpvar = &dummy;
-#define ITERPTR(tpvar) cpvar
-#define RESETITERPTR(tpvar,type,start) cpvar = start
-#define INCITERPTR(tpvar,type) cpvar += SIZEOF(type)
-#define ENDITERATE }}
-
-#else
-
-#define STARTITERATE(tpvar,type,start,endcond) \
-  for (tpvar = (type *) (start); endcond; )
-#define ITERPTR(tpvar) (char *)tpvar
-#define RESETITERPTR(tpvar,type,start) tpvar = (type *) (start)
-#define INCITERPTR(tpvar,type) tpvar++
-#define ENDITERATE
-
-#endif /* MUSTCOPY */
-
-typedef union {
-    xReply rep;
-    char buf[BUFSIZE];
-} _XAlignedBuffer;
-
-static char *_XAsyncReply();
-static void _XProcessInternalConnection();
-#define SEQLIMIT (65535 - (BUFSIZE / SIZEOF(xReq)) - 10)
-
-/*
- * The following routines are internal routines used by Xlib for protocol
- * packet transmission and reception.
- *
- * _XIOError(Display *) will be called if any sort of system call error occurs.
- * This is assumed to be a fatal condition, i.e., XIOError should not return.
- *
- * _XError(Display *, xError *) will be called whenever an X_Error event is
- * received.  This is not assumed to be a fatal condition, i.e., it is
- * acceptable for this procedure to return.  However, XError should NOT
- * perform any operations (directly or indirectly) on the DISPLAY.
- *
- * Routines declared with a return type of 'Status' return 0 on failure,
- * and non 0 on success.  Routines with no declared return type don't 
- * return anything.  Whenever possible routines that create objects return
- * the object they have created.
- */
-
-static int padlength[4] = {0, 3, 2, 1};
-    /* lookup table for adding padding bytes to data that is read from
-    	or written to the X socket.  */
-
-static xReq _dummy_request = {
-	0, 0, 0
-};
-
-/*
- * This is an OS dependent routine which:
- * 1) returns as soon as the connection can be written on....
- * 2) if the connection can be read, must enqueue events and handle errors,
- * until the connection is writable.
- */
-static void
-_XWaitForWritable(dpy
-#ifdef XTHREADS
-		  , cv
-#endif
-		  )
-    Display *dpy;
-#ifdef XTHREADS
-    xcondition_t cv;		/* our reading condition variable */
-#endif
-{
-#if !defined(AMOEBA)
-
-#ifdef USE_POLL
-    struct pollfd filedes;
-#else
-    fd_set r_mask;
-    fd_set w_mask;
-#endif
-    int nfound;
-
-#ifdef USE_POLL
-    filedes.fd = dpy->fd;
-    filedes.events = 0;
-#else
-    FD_ZERO(&r_mask);
-    FD_ZERO(&w_mask);
-#endif
-
-    for (;;) {
-#ifdef XTHREADS
-	/* We allow only one thread at a time to read, to minimize
-	   passing of read data between threads.
-	   Now, who is it?  If there is a non-NULL reply_awaiters and
-	   we (i.e., our cv) are not at the head of it, then whoever
-	   is at the head is the reader, and we don't read.
-	   Otherwise there is no reply_awaiters or we are at the
-	   head, having just appended ourselves.
-	   In this case, if there is a event_awaiters, then whoever
-	   is at the head of it got there before we did, and they are the
-	   reader.
-
-	   Last cases: no event_awaiters and we are at the head of
-	   reply_awaiters or reply_awaiters is NULL: we are the reader,
-	   since there is obviously no one else involved.
-
-	   XXX - what if cv is NULL and someone else comes along after
-	   us while we are waiting?
-	   */
-	   
-	if (!dpy->lock ||
-	    (!dpy->lock->event_awaiters &&
-	     (!dpy->lock->reply_awaiters ||
-	      dpy->lock->reply_awaiters->cv == cv)))
-#endif
-#ifdef USE_POLL
-	    filedes.events = POLLIN;
-	filedes.events |= POLLOUT;
-#else
-	FD_SET(dpy->fd, &r_mask);
-        FD_SET(dpy->fd, &w_mask);
-#endif
-
-	do {
-	    UnlockDisplay(dpy);
-#ifdef USE_POLL
-	    nfound = poll (&filedes, 1, -1);
-#else
-	    nfound = Select (dpy->fd + 1, &r_mask, &w_mask, NULL, NULL);
-#endif
-	    InternalLockDisplay(dpy, cv != NULL);
-	    if (nfound < 0 && !ECHECK(EINTR))
-		_XIOError(dpy);
-	} while (nfound <= 0);
-
-	if (
-#ifdef USE_POLL
-	    filedes.revents & POLLIN
-#else
-	    FD_ISSET(dpy->fd, &r_mask)
-#endif
-	    )
-	{
-	    _XAlignedBuffer buf;
-	    BytesReadable_t pend;
-	    register BytesReadable_t len;
-	    register xReply *rep;
-
-	    /* find out how much data can be read */
-	    if (_X11TransBytesReadable(dpy->trans_conn, &pend) < 0)
-		_XIOError(dpy);
-	    len = pend;
-
-	    /* must read at least one xEvent; if none is pending, then
-	       we'll just block waiting for it */
-	    if (len < SIZEOF(xReply)
-#ifdef XTHREADS
-		|| dpy->async_handlers
-#endif
-		)
-		len = SIZEOF(xReply);
-		
-	    /* but we won't read more than the max buffer size */
-	    if (len > BUFSIZE) len = BUFSIZE;
-
-	    /* round down to an integral number of XReps */
-	    len = (len / SIZEOF(xReply)) * SIZEOF(xReply);
-
-	    (void) _XRead (dpy, buf.buf, (long) len);
-
-	    STARTITERATE(rep,xReply,buf.buf,len > 0) {
-		if (rep->generic.type == X_Reply) {
-		    pend = len;
-		    RESETITERPTR(rep,xReply,
-				 _XAsyncReply (dpy, rep,
-					       ITERPTR(rep), &pend, True));
-		    len = pend;
-		} else {
-		    if (rep->generic.type == X_Error)
-			_XError (dpy, (xError *)rep);
-		    else	/* must be an event packet */
-			_XEnq (dpy, (xEvent *)rep);
-		    INCITERPTR(rep,xReply);
-		    len -= SIZEOF(xReply);
-		}
-	    } ENDITERATE
-#ifdef XTHREADS
-	    if (dpy->lock && dpy->lock->event_awaiters)
-		ConditionSignal(dpy, dpy->lock->event_awaiters->cv);
-#endif
-	}
-#ifdef USE_POLL
-	if (filedes.revents & (POLLOUT|POLLHUP|POLLERR))
-#else
-	if (FD_ISSET(dpy->fd, &w_mask))
-#endif
-	{
-#ifdef XTHREADS
-	    if (dpy->lock) {
-		ConditionBroadcast(dpy, dpy->lock->writers);
-	    }
-#endif
-	    return;
-	}
-    }
-#else  /* AMOEBA */
-    /* Should not happen under Amoeba */
-    printf("_XWaitForWritable called unexpectedly\n");
-    _XIOError(dpy);
-#endif /* AMOEBA */
-}
-
-
-#define POLLFD_CACHE_SIZE 5
-
-/* initialize the struct array passed to poll() below */
-Bool _XPollfdCacheInit(dpy)
-    Display *dpy;
-{
-#ifdef USE_POLL
-    struct pollfd *pfp;
-
-    pfp = (struct pollfd *)Xmalloc(POLLFD_CACHE_SIZE * sizeof(struct pollfd));
-    if (!pfp)
-	return False;
-    pfp[0].fd = dpy->fd;
-    pfp[0].events = POLLIN;
-
-    dpy->filedes = (XPointer)pfp;
-#endif
-    return True;
-}
-
-void _XPollfdCacheAdd(dpy, fd)
-    Display *dpy;
-    int fd;
-{
-#ifdef USE_POLL
-    struct pollfd *pfp = (struct pollfd *)dpy->filedes;
-
-    if (dpy->im_fd_length <= POLLFD_CACHE_SIZE) {
-	pfp[dpy->im_fd_length].fd = fd;
-	pfp[dpy->im_fd_length].events = POLLIN;
-    }
-#endif
-}
-
-/* ARGSUSED */
-void _XPollfdCacheDel(dpy, fd)
-    Display *dpy;
-    int fd;			/* not used */
-{
-#ifdef USE_POLL
-    struct pollfd *pfp = (struct pollfd *)dpy->filedes;
-    struct _XConnectionInfo *conni;
-
-    /* just recalculate whole list */
-    if (dpy->im_fd_length <= POLLFD_CACHE_SIZE) {
-	int loc = 1;
-	for (conni = dpy->im_fd_info; conni; conni=conni->next) {
-	    pfp[loc].fd = conni->fd;
-	    pfp[loc].events = POLLIN;
-	    loc++;
-	}
-    }
-#endif
-}
-
-/* returns True iff there is an event in the queue newer than serial_num */
-
-static Bool
-_XNewerQueuedEvent(dpy, serial_num)
-    Display *dpy;
-    int serial_num;
-{
-    _XQEvent *qev;
-
-    if (dpy->next_event_serial_num == serial_num)
-	return False;
-
-    qev = dpy->head;
-    while (qev) {
-	if (qev->qserial_num >= serial_num) {
-	    return True;
-	}
-	qev = qev->next;
-    }
-    return False;
-}
-
-static int
-_XWaitForReadable(dpy)
-  Display *dpy;
-{
-#if !defined(AMOEBA)
-    int result;
-    int fd = dpy->fd;
-    struct _XConnectionInfo *ilist;  
-    register int saved_event_serial;
-    int in_read_events;
-    register Bool did_proc_conni = False;
-#ifdef USE_POLL
-    struct pollfd *filedes;
-#else
-    fd_set r_mask;
-    int highest_fd = fd;
-#endif
-
-#ifdef USE_POLL
-    if (dpy->im_fd_length + 1 > POLLFD_CACHE_SIZE
-	&& !(dpy->flags & XlibDisplayProcConni)) {
-	/* XXX - this fallback is gross */
-	int i;
-
-	filedes = (struct pollfd *)Xmalloc(dpy->im_fd_length * sizeof(struct pollfd));
-	filedes[0].fd = fd;
-	filedes[0].events = POLLIN;
-	for (ilist=dpy->im_fd_info, i=1; ilist; ilist=ilist->next, i++) {
-	    filedes[i].fd = ilist->fd;
-	    filedes[i].events = POLLIN;
-	}
-    } else {
-	filedes = (struct pollfd *)dpy->filedes;
-    }
-#else
-    FD_ZERO(&r_mask);
-#endif
-    for (;;) {
-#ifndef USE_POLL
-	FD_SET(fd, &r_mask);
-	if (!(dpy->flags & XlibDisplayProcConni))
-	    for (ilist=dpy->im_fd_info; ilist; ilist=ilist->next) {
-		FD_SET(ilist->fd, &r_mask);
-		if (ilist->fd > highest_fd)
-		    highest_fd = ilist->fd;
-	    }
-#endif
-	UnlockDisplay(dpy);
-#ifdef USE_POLL
-	result = poll(filedes,
-		      (dpy->flags & XlibDisplayProcConni) ? 1 : 1+dpy->im_fd_length,
-		      -1);
-#else
-	result = Select(highest_fd + 1, &r_mask, NULL, NULL, NULL);
-#endif
-	InternalLockDisplay(dpy, dpy->flags & XlibDisplayReply);
-	if (result == -1 && !ECHECK(EINTR)) _XIOError(dpy);
-	if (result <= 0)
-	    continue;
-#ifdef USE_POLL
-	if (filedes[0].revents & (POLLIN|POLLHUP|POLLERR))
-#else
-	if (FD_ISSET(fd, &r_mask))
-#endif
-	    break;
-	if (!(dpy->flags & XlibDisplayProcConni)) {
-	    int i;
-
-	    saved_event_serial = dpy->next_event_serial_num;
-	    /* dpy flags can be clobbered by internal connection callback */
-	    in_read_events = dpy->flags & XlibDisplayReadEvents;
-	    for (ilist=dpy->im_fd_info, i=1; ilist; ilist=ilist->next, i++) {
-#ifdef USE_POLL
-		if (filedes[i].revents & POLLIN)
-#else
-		if (FD_ISSET(ilist->fd, &r_mask))
-#endif
-		{
-		    _XProcessInternalConnection(dpy, ilist);
-		    did_proc_conni = True;
-		}
-	    }
-#ifdef USE_POLL
-	    if (dpy->im_fd_length + 1 > POLLFD_CACHE_SIZE)
-		Xfree(filedes);
-#endif
-	}
-	if (did_proc_conni) {
-	    /* some internal connection callback might have done an
-	       XPutBackEvent.  We notice it here and if we needed an event,
-	       we can return all the way. */
-	    if (_XNewerQueuedEvent(dpy, saved_event_serial)
-		&& (in_read_events
-#ifdef XTHREADS
-		    || (dpy->lock && dpy->lock->event_awaiters)
-#endif
-		    ))
-		return -2;
-	    did_proc_conni = False;
-	}
-    }
-#ifdef XTHREADS
-#ifdef XTHREADS_DEBUG
-    printf("thread %x _XWaitForReadable returning\n", XThread_Self());
-#endif
-#endif
-    return 0;
-#else  /* AMOEBA */
-    int nbytes;
-
-    /* wait max 100 msec (why?) for data to become available */
-    nbytes = _X11TransAmSelect(ConnectionNumber(dpy), 100);
-    return (nbytes > 0) ? 0 : -1;
-#endif /* AMOEBA */
-}
-
-static
-int _XSeqSyncFunction(dpy)
-    register Display *dpy;
-{
-    xGetInputFocusReply rep;
-    register xReq *req;
-
-    LockDisplay(dpy);
-    if ((dpy->request - dpy->last_request_read) >= (BUFSIZE / SIZEOF(xReq))) {
-	GetEmptyReq(GetInputFocus, req);
-	(void) _XReply (dpy, (xReply *)&rep, 0, xTrue);
-    }
-    /* could get XID handler while waiting for reply in MT env */
-    if (dpy->synchandler == _XSeqSyncFunction) {
-	dpy->synchandler = dpy->savedsynchandler;
-	dpy->flags &= ~XlibDisplayPrivSync;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 0;
-}
-
-#ifdef XTHREADS
-static void _XFlushInt();
-#endif
-
-/*
- * _XFlush - Flush the X request buffer.  If the buffer is empty, no
- * action is taken.  This routine correctly handles incremental writes.
- * This routine may have to be reworked if int < long.
- */
-void _XFlush (dpy)
-	register Display *dpy;
-{
-#ifdef XTHREADS
-    /* With multi-threading we introduce an internal routine to which
-       we can pass a condition variable to do locking correctly. */
-
-    _XFlushInt(dpy, NULL);
-}
-
-/* _XFlushInt - Internal version of _XFlush used to do multi-threaded
- * locking correctly.
- */
-
-static void _XFlushInt (dpy, cv)
-	register Display *dpy;
-        register xcondition_t cv;
-{
-	char *nextindex;
-#endif /* XTHREADS*/
-	register long size, todo;
-	register int write_stat;
-	register char *bufindex;
-	_XExtension *ext;
-
-	if (dpy->flags & XlibDisplayIOError) return;
-#ifdef XTHREADS
-	while (dpy->flags & XlibDisplayWriting) {
-	    ConditionWait(dpy, dpy->lock->writers);
-	}
-#endif
-	size = todo = dpy->bufptr - dpy->buffer;
-	if (!size) return;
-#ifdef XTHREADS
-	dpy->flags |= XlibDisplayWriting;
-	/* make sure no one else can put in data */
-	dpy->bufptr = dpy->bufmax;
-#endif
-	for (ext = dpy->flushes; ext; ext = ext->next_flush)
-	    (*ext->before_flush)(dpy, &ext->codes, dpy->buffer, size);
-	bufindex = dpy->buffer;
-	/*
-	 * While write has not written the entire buffer, keep looping
-	 * until the entire buffer is written.  bufindex will be
-	 * incremented and size decremented as buffer is written out.
-	 */
-	while (size) {
-	    ESET(0);
-	    write_stat = _X11TransWrite(dpy->trans_conn,
-					bufindex, (int) todo);
-	    if (write_stat >= 0) {
-		size -= write_stat;
-		todo = size;
-		bufindex += write_stat;
-	    } else if (ETEST()) {
-		_XWaitForWritable(dpy
-#ifdef XTHREADS
-				  , cv
-#endif
-				  );
-#ifdef SUNSYSV
-	    } else if (ECHECK(0)) {
-		_XWaitForWritable(dpy
-#ifdef XTHREADS
-				  , cv
-#endif
-				  );
-#endif
-#ifdef ESZTEST
-	    } else if (ESZTEST()) {
-		if (todo > 1) 
-		    todo >>= 1;
-		else {
-		    _XWaitForWritable(dpy
-#ifdef XTHREADS
-				      , cv
-#endif
-				      );
-		}
-#endif
-	    } else if (!ECHECK(EINTR)) {
-		/* Write failed! */
-		/* errno set by write system call. */
-		_XIOError(dpy);
-	    }
-	}
-	dpy->last_req = (char *)&_dummy_request;
-	if ((dpy->request - dpy->last_request_read) >= SEQLIMIT &&
-	    !(dpy->flags & XlibDisplayPrivSync)) {
-	    dpy->savedsynchandler = dpy->synchandler;
-	    dpy->synchandler = _XSeqSyncFunction;
-	    dpy->flags |= XlibDisplayPrivSync;
-	}
-	dpy->bufptr = dpy->buffer;
-#ifdef XTHREADS
-	dpy->flags &= ~XlibDisplayWriting;
-#endif
-}
-
-int
-_XEventsQueued (dpy, mode)
-    register Display *dpy;
-    int mode;
-{
-	register BytesReadable_t len;
-	BytesReadable_t pend;
-	_XAlignedBuffer buf;
-	register xReply *rep;
-	char *read_buf;
-#ifdef XTHREADS
-	int entry_event_serial_num;
-	struct _XCVList *cvl = NULL;
-	xthread_t self;
-
-#ifdef XTHREADS_DEBUG
-	printf("_XEventsQueued called in thread %x\n", XThread_Self());
-#endif
-#endif /* XTHREADS*/
-
-	if (mode == QueuedAfterFlush)
-	{
-	    _XFlush(dpy);
-	    if (dpy->qlen)
-		return(dpy->qlen);
-	}
-	if (dpy->flags & XlibDisplayIOError) return(dpy->qlen);
-
-#ifdef XTHREADS
-	/* create our condition variable and append to list,
-	 * unless we were called from within XProcessInternalConnection
-	 * or XLockDisplay
-	 */
-	xthread_clear_id(self);
-	if (dpy->lock && (xthread_have_id (dpy->lock->conni_thread)
-			  || xthread_have_id (dpy->lock->locking_thread)))
-	    /* some thread is in XProcessInternalConnection or XLockDisplay
-	       so we have to see if we are it */
-	    self = XThread_Self();
-	if (!xthread_have_id(self)
-	    || (!xthread_equal(self, dpy->lock->conni_thread)
-		&& !xthread_equal(self, dpy->lock->locking_thread))) {
-	    /* In the multi-threaded case, if there is someone else
-	       reading events, then there aren't any available, so
-	       we just return.  If we waited we would block.
-	       */
-	    if (dpy->lock && dpy->lock->event_awaiters)
-		return dpy->qlen;
-	    /* nobody here but us, so lock out any newcomers */
-	    cvl = QueueEventReaderLock(dpy);
-	}
-
-	while (dpy->lock && cvl && dpy->lock->reply_first) {
-	    /* note which events we have already seen so we'll know
-	       if _XReply (in another thread) reads one */
-	    entry_event_serial_num = dpy->next_event_serial_num;
-	    ConditionWait(dpy, cvl->cv);
-	    /* did _XReply read an event we can return? */
-	    if (_XNewerQueuedEvent(dpy, entry_event_serial_num))
-	    {
-		UnlockNextEventReader(dpy);
-		return 0;
-	    }
-	}
-#endif /* XTHREADS*/
-
-	if (_X11TransBytesReadable(dpy->trans_conn, &pend) < 0)
-	    _XIOError(dpy);
-#ifdef XCONN_CHECK_FREQ
-	/* This is a crock, required because FIONREAD or equivalent is
-	 * not guaranteed to detect a broken connection.
-	 */
-	if (!pend && !dpy->qlen && ++dpy->conn_checker >= XCONN_CHECK_FREQ)
-	{
-#ifdef USE_POLL
-	    struct pollfd filedes;
-#else
-	    fd_set r_mask;
-	    static struct timeval zero_time;
-#endif
-
-	    dpy->conn_checker = 0;
-#ifdef USE_POLL
-	    filedes.fd = dpy->fd;
-	    filedes.events = POLLIN;
-	    if ((pend = poll(&filedes, 1, 0)))
-#else
-	    FD_ZERO(&r_mask);
-	    FD_SET(dpy->fd, &r_mask);
-	    if (pend = Select(dpy->fd + 1, &r_mask, NULL, NULL, &zero_time))
-#endif
-	    {
-		if (pend > 0)
-		{
-		    if (_X11TransBytesReadable(dpy->trans_conn, &pend) < 0)
-			_XIOError(dpy);
-		    /* we should not get zero, if we do, force a read */
-		    if (!pend)
-			pend = SIZEOF(xReply);
-		}
-		else if (pend < 0 && !ECHECK(EINTR))
-		    _XIOError(dpy);
-	    }
-	}
-#endif /* XCONN_CHECK_FREQ */
-	if (!(len = pend)) {
-	    /* _XFlush can enqueue events */
-	    UnlockNextEventReader(dpy);
-	    return(dpy->qlen);
-	}
-      /* Force a read if there is not enough data.  Otherwise,
-       * a select() loop at a higher-level will spin undesirably,
-       * and we've seen at least one OS that appears to not update
-       * the result from FIONREAD once it has returned nonzero.
-       */
-#ifdef XTHREADS
-	if (dpy->lock && dpy->lock->reply_awaiters) {
-	    read_buf = (char *)dpy->lock->reply_awaiters->buf;
-	    len = SIZEOF(xReply);
-	} else
-#endif /* XTHREADS*/
-	{
-	    read_buf = buf.buf;
-	    
-	    if (len < SIZEOF(xReply)
-#ifdef XTHREADS
-		|| dpy->async_handlers
-#endif
-		)
-		len = SIZEOF(xReply);
-	    else if (len > BUFSIZE)
-		len = BUFSIZE;
-	    len = (len / SIZEOF(xReply)) * SIZEOF(xReply);
-	}
-#ifdef XCONN_CHECK_FREQ
-	dpy->conn_checker = 0;
-#endif
-
-	(void) _XRead (dpy, read_buf, (long) len);
-	
-#ifdef XTHREADS
-	/* what did we actually read: reply or event? */
-	if (dpy->lock && dpy->lock->reply_awaiters) {
-	    if (((xReply *)read_buf)->generic.type == X_Reply ||
-		((xReply *)read_buf)->generic.type == X_Error)
-	    {
-		dpy->lock->reply_was_read = True;
-		dpy->lock->reply_first = True;
-		if (read_buf != (char *)dpy->lock->reply_awaiters->buf)
-		    memcpy(dpy->lock->reply_awaiters->buf, read_buf,
-			   len);
-		UnlockNextEventReader(dpy);
-		return(dpy->qlen); /* we read, so we can return */
-	    } else if (read_buf != buf.buf)
-		memcpy(buf.buf, read_buf, len);
-	}
-#endif /* XTHREADS*/
-
-	STARTITERATE(rep,xReply,buf.buf,len > 0) {
-	    if (rep->generic.type == X_Reply) {
-		pend = len;
-		RESETITERPTR(rep,xReply,
-			     _XAsyncReply (dpy, rep,
-					   ITERPTR(rep), &pend, True));
-		len = pend;
-	    } else {
-		if (rep->generic.type == X_Error)
-		    _XError (dpy, (xError *)rep);
-		else   /* must be an event packet */
-		    _XEnq (dpy, (xEvent *)rep);
-		INCITERPTR(rep,xReply);
-		len -= SIZEOF(xReply);
-	    }
-	} ENDITERATE
-
-	UnlockNextEventReader(dpy);
-	return(dpy->qlen);
-}
-
-/* _XReadEvents - Flush the output queue,
- * then read as many events as possible (but at least 1) and enqueue them
- */
-void _XReadEvents(dpy)
-	register Display *dpy;
-{
-	_XAlignedBuffer buf;
-	BytesReadable_t pend;
-	register BytesReadable_t len;
-	register xReply *rep;
-	Bool not_yet_flushed = True;
-	char *read_buf;
-	int i;
-	int entry_event_serial_num = dpy->next_event_serial_num;
-#ifdef XTHREADS
-	struct _XCVList *cvl = NULL;
-	xthread_t self;
-
-#ifdef XTHREADS_DEBUG
-	printf("_XReadEvents called in thread %x\n",
-	       XThread_Self());
-#endif
-	/* create our condition variable and append to list,
-	 * unless we were called from within XProcessInternalConnection
-	 * or XLockDisplay
-	 */
-	xthread_clear_id(self);
-	if (dpy->lock && (xthread_have_id (dpy->lock->conni_thread)
-			  || xthread_have_id (dpy->lock->locking_thread)))
-	    /* some thread is in XProcessInternalConnection or XLockDisplay
-	       so we have to see if we are it */
-	    self = XThread_Self();
-	if (!xthread_have_id(self)
-	    || (!xthread_equal(self, dpy->lock->conni_thread)
-		&& !xthread_equal(self, dpy->lock->locking_thread)))
-	    cvl = QueueEventReaderLock(dpy);
-#endif /* XTHREADS */
-
-	do {
-#ifdef XTHREADS
-	    /* if it is not our turn to read an event off the wire,
-	       wait til we're at head of list */
-	    if (dpy->lock && cvl &&
-		(dpy->lock->event_awaiters != cvl ||
-		 dpy->lock->reply_first)) {
-		ConditionWait(dpy, cvl->cv);
-		continue;
-	    }
-#endif /* XTHREADS */
-	    /* find out how much data can be read */
-	    if (_X11TransBytesReadable(dpy->trans_conn, &pend) < 0)
-	    	_XIOError(dpy);
-	    len = pend;
-
-	    /* must read at least one xEvent; if none is pending, then
-	       we'll just flush and block waiting for it */
-	    if (len < SIZEOF(xEvent)
-#ifdef XTHREADS
-		|| dpy->async_handlers
-#endif
-		) {
-	    	len = SIZEOF(xEvent);
-		/* don't flush until the first time we would block */
-		if (not_yet_flushed) {
-		    _XFlush (dpy);
-		    if (_XNewerQueuedEvent(dpy, entry_event_serial_num)) {
-			/* _XReply has read an event for us */
-			goto got_event;
-		    }
-		    not_yet_flushed = False;
-		}
-	    }
-
-#ifdef XTHREADS
-	    /* If someone is waiting for a reply, gamble that
-	       the reply will be the next thing on the wire
-	       and read it into their buffer. */
-	    if (dpy->lock && dpy->lock->reply_awaiters) {
-		read_buf = (char *)dpy->lock->reply_awaiters->buf;
-		len = SIZEOF(xReply);
-	    } else
-#endif /* XTHREADS*/
-	    {
-		read_buf = buf.buf;
-
-		/* but we won't read more than the max buffer size */
-		if (len > BUFSIZE)
-		    len = BUFSIZE;
-
-		/* round down to an integral number of XReps */
-		len = (len / SIZEOF(xEvent)) * SIZEOF(xEvent);
-	    }
-
-#ifdef XTHREADS
-	    if (xthread_have_id(self))
-		/* save value we may have to stick in conni_thread */
-		dpy->lock->reading_thread = self;
-#endif /* XTHREADS */
-	    dpy->flags |= XlibDisplayReadEvents;
-	    i = _XRead (dpy, read_buf, (long) len);
-	    dpy->flags &= ~XlibDisplayReadEvents;
-	    if (i == -2) {
-		/* special flag from _XRead to say that internal connection has
-		   done XPutBackEvent.  Which we can use so we're done. */
-	      got_event:
-#ifdef XTHREADS
-		if (dpy->lock && dpy->lock->lock_wait) {
-		    if (dpy->lock->event_awaiters != cvl)
-			/* since it is not us, must be user lock thread */
-			ConditionSignal(dpy,
-					dpy->lock->event_awaiters->cv);
-		    (*dpy->lock->lock_wait)(dpy);
-		    continue;
-		}
-#endif
-		break;
-	    }
-#ifdef XTHREADS
-	    if (xthread_have_id(self))
-		xthread_clear_id(dpy->lock->reading_thread);
-
-	    /* what did we actually read: reply or event? */
-	    if (dpy->lock && dpy->lock->reply_awaiters) {
-		if (((xReply *)read_buf)->generic.type == X_Reply ||
-		    ((xReply *)read_buf)->generic.type == X_Error)
-		{
-		    dpy->lock->reply_was_read = True;
-		    dpy->lock->reply_first = True;
-		    if (read_buf != (char *)dpy->lock->reply_awaiters->buf)
-			memcpy(dpy->lock->reply_awaiters->buf,
-			       read_buf, len);
-		    ConditionSignal(dpy, dpy->lock->reply_awaiters->cv);
-		    continue;
-		} else if (read_buf != buf.buf)
-		    memcpy(buf.buf, read_buf, len);
-	    }
-#endif /* XTHREADS */
-
-	    STARTITERATE(rep,xReply,buf.buf,len > 0) {
-		if (rep->generic.type == X_Reply) {
-		    pend = len;
-		    RESETITERPTR(rep,xReply,
-				 _XAsyncReply (dpy, rep,
-					       ITERPTR(rep), &pend, True));
-		    len = pend;
-		} else {
-		    if (rep->generic.type == X_Error)
-			_XError (dpy, (xError *) rep);
-		    else   /* must be an event packet */
-			_XEnq (dpy, (xEvent *)rep);
-		    INCITERPTR(rep,xReply);
-		    len -= SIZEOF(xReply);
-		}
-	    } ENDITERATE;
-	} while (!_XNewerQueuedEvent(dpy, entry_event_serial_num));
-
-	UnlockNextEventReader(dpy);
-}
-
-/* 
- * _XRead - Read bytes from the socket taking into account incomplete
- * reads.  This routine may have to be reworked if int < long.
- */
-int _XRead (dpy, data, size)
-	register Display *dpy;
-	register char *data;
-	register long size;
-{
-	register long bytes_read;
-#ifdef XTHREADS
-	int original_size = size;
-#endif
-
-	if ((dpy->flags & XlibDisplayIOError) || size == 0)
-	    return 0;
-	ESET(0);
-	while ((bytes_read = _X11TransRead(dpy->trans_conn, data, (int)size))
-		!= size) {
-
-	    	if (bytes_read > 0) {
-		    size -= bytes_read;
-		    data += bytes_read;
-		    }
-		else if (ETEST()) {
-		    if (_XWaitForReadable(dpy) == -2)
-			return -2; /* internal connection did XPutBackEvent */
-		    ESET(0);
-		}
-#ifdef SUNSYSV
-		else if (ECHECK(0)) {
-		    if (_XWaitForReadable(dpy) == -2)
-			return -2; /* internal connection did XPutBackEvent */
-		}
-#endif
-		else if (bytes_read == 0) {
-		    /* Read failed because of end of file! */
-		    ESET(EPIPE);
-		    _XIOError(dpy);
-		    }
-
-		else  /* bytes_read is less than 0; presumably -1 */ {
-		    /* If it's a system call interrupt, it's not an error. */
-		    if (!ECHECK(EINTR))
-		    	_XIOError(dpy);
-		    }
-	    	 }
-#ifdef XTHREADS
-       if (dpy->lock && dpy->lock->reply_bytes_left > 0)
-       {
-           dpy->lock->reply_bytes_left -= original_size;
-           if (dpy->lock->reply_bytes_left == 0) {
-	       dpy->flags &= ~XlibDisplayReply;
-               UnlockNextReplyReader(dpy);
-	   }
-       }
-#endif /* XTHREADS*/
-	return 0;
-}
-
-#ifdef LONG64
-void _XRead32 (dpy, data, len)
-    Display *dpy;
-    register long *data;
-    long len;
-{
-    register int *buf;
-    register long i;
-
-    if (len) {
-	(void) _XRead(dpy, (char *)data, len);
-	i = len >> 2;
-	buf = (int *)data + i;
-	data += i;
-	while (--i >= 0)
-	    *--data = *--buf;
-    }
-}
-#endif /* LONG64 */
-
-#ifdef WORD64
-
-/*
- * XXX This is a *really* stupid way of doing this....
- * PACKBUFFERSIZE must be a multiple of 4.
- */
-
-#define PACKBUFFERSIZE 4096
-
-
-/*
- * _XRead32 - Read bytes from the socket unpacking each 32 bits
- *            into a long (64 bits on a CRAY computer).
- * 
- */
-static void _doXRead32 (dpy, data, size, packbuffer)
-        register Display *dpy;
-        register long *data;
-        register long size;
-	register char *packbuffer;
-{
- long *lpack,*lp;
- long mask32 = 0x00000000ffffffff;
- long maskw, nwords, i, bits;
-
-        _XReadPad (dpy, packbuffer, size);
-
-        lp = data;
-        lpack = (long *) packbuffer;
-        nwords = size >> 2;
-        bits = 32;
-
-        for(i=0;i<nwords;i++){
-            maskw = mask32 << bits;
-           *lp++ = ( *lpack & maskw ) >> bits;
-            bits = bits ^32;
-            if(bits){
-               lpack++;
-            }
-        }
-}
-
-void _XRead32 (dpy, data, len)
-    Display *dpy;
-    long *data;
-    long len;
-{
-    char packbuffer[PACKBUFFERSIZE];
-    unsigned nunits = PACKBUFFERSIZE >> 2;
-
-    for (; len > PACKBUFFERSIZE; len -= PACKBUFFERSIZE, data += nunits) {
-	_doXRead32 (dpy, data, PACKBUFFERSIZE, packbuffer);
-    }
-    if (len) _doXRead32 (dpy, data, len, packbuffer);
-}
-
-
-
-/*
- * _XRead16 - Read bytes from the socket unpacking each 16 bits
- *            into a long (64 bits on a CRAY computer).
- *
- */
-static _doXRead16 (dpy, data, size, packbuffer)
-        register Display *dpy;
-        register short *data;
-        register long size;
-	char *packbuffer;
-{
-	long *lpack,*lp;
-	long mask16 = 0x000000000000ffff;
-	long maskw, nwords, i, bits;
-
-        (void) _XRead(dpy,packbuffer,size);	/* don't do a padded read... */
-
-        lp = (long *) data;
-        lpack = (long *) packbuffer;
-        nwords = size >> 1;  /* number of 16 bit words to be unpacked */
-        bits = 48;
-        for(i=0;i<nwords;i++){
-            maskw = mask16 << bits;
-           *lp++ = ( *lpack & maskw ) >> bits;
-            bits -= 16;
-            if(bits < 0){
-               lpack++;
-               bits = 48;
-            }
-        }
-}
-
-void _XRead16 (dpy, data, len)
-    Display *dpy;
-    short *data;
-    long len;
-{
-    char packbuffer[PACKBUFFERSIZE];
-    unsigned nunits = PACKBUFFERSIZE >> 1;
-
-    for (; len > PACKBUFFERSIZE; len -= PACKBUFFERSIZE, data += nunits) {
-	_doXRead16 (dpy, data, PACKBUFFERSIZE, packbuffer);
-    }
-    if (len) _doXRead16 (dpy, data, len, packbuffer);
-}
-
-void _XRead16Pad (dpy, data, size)
-    Display *dpy;
-    short *data;
-    long size;
-{
-    int slop = (size & 3);
-    short slopbuf[3];
-
-    _XRead16 (dpy, data, size);
-    if (slop > 0) {
-	_XRead16 (dpy, slopbuf, 4 - slop);
-    }
-}
-#endif /* WORD64 */
-
-
-/*
- * _XReadPad - Read bytes from the socket taking into account incomplete
- * reads.  If the number of bytes is not 0 mod 4, read additional pad
- * bytes. This routine may have to be reworked if int < long.
- */
-void _XReadPad (dpy, data, size)
-    	register Display *dpy;	
-	register char *data;
-	register long size;
-{
-    	register long bytes_read;
-	struct iovec iov[2];
-	char pad[3];
-#ifdef XTHREADS
-        int original_size;
-#endif
-
-	if ((dpy->flags & XlibDisplayIOError) || size == 0) return;
-	iov[0].iov_len = (int)size;
-	iov[0].iov_base = data;
-	/* 
-	 * The following hack is used to provide 32 bit long-word
-	 * aligned padding.  The [1] vector is of length 0, 1, 2, or 3,
-	 * whatever is needed.
-	 */
-
-	iov[1].iov_len = padlength[size & 3];
-	iov[1].iov_base = pad;
-	size += iov[1].iov_len;
-#ifdef XTHREADS
-	original_size = size;
-#endif
-	ESET(0);
-	while ((bytes_read = _X11TransReadv (dpy->trans_conn, iov, 2)) != size) {
-
-	    if (bytes_read > 0) {
-		size -= bytes_read;
-	    	if ((iov[0].iov_len -= bytes_read) < 0) {
-		    iov[1].iov_len += iov[0].iov_len;
-		    iov[1].iov_base = (char *)iov[1].iov_base - iov[0].iov_len;
-		    iov[0].iov_len = 0;
-		    }
-	    	else
-	    	    iov[0].iov_base = (char *)iov[0].iov_base + bytes_read;
-	    	}
-	    else if (ETEST()) {
-		_XWaitForReadable(dpy);
-		ESET(0);
-	    }
-#ifdef SUNSYSV
-	    else if (ECHECK(0)) {
-		_XWaitForReadable(dpy);
-	    }
-#endif
-	    else if (bytes_read == 0) {
-		/* Read failed because of end of file! */
-		ESET(EPIPE);
-		_XIOError(dpy);
-		}
-	    
-	    else  /* bytes_read is less than 0; presumably -1 */ {
-		/* If it's a system call interrupt, it's not an error. */
-		if (!ECHECK(EINTR))
-		    _XIOError(dpy);
-		}
-	    }
-#ifdef XTHREADS
-       if (dpy->lock && dpy->lock->reply_bytes_left > 0)
-       {
-           dpy->lock->reply_bytes_left -= original_size;
-           if (dpy->lock->reply_bytes_left == 0) {
-	       dpy->flags &= ~XlibDisplayReply;
-               UnlockNextReplyReader(dpy);
-	   }
-       }
-#endif /* XTHREADS*/
-}
-
-/*
- * _XSend - Flush the buffer and send the client data. 32 bit word aligned
- * transmission is used, if size is not 0 mod 4, extra bytes are transmitted.
- * This routine may have to be reworked if int < long;
- */
-void
-#if NeedFunctionPrototypes
-_XSend (
-	register Display *dpy,
-	_Xconst char *data,
-	register long size)
-#else
-_XSend (dpy, data, size)
-	register Display *dpy;
-	char *data;
-	register long size;
-#endif
-{
-	struct iovec iov[3];
-	static char pad[3] = {0, 0, 0};
-           /* XText8 and XText16 require that the padding bytes be zero! */
-
-	long skip, dbufsize, padsize, total, todo;
-	_XExtension *ext;
-
-	if (!size || (dpy->flags & XlibDisplayIOError)) return;
-	dbufsize = dpy->bufptr - dpy->buffer;
-#ifdef XTHREADS
-	dpy->flags |= XlibDisplayWriting;
-	/* make sure no one else can put in data */
-	dpy->bufptr = dpy->bufmax;
-#endif
-	padsize = padlength[size & 3];
-	for (ext = dpy->flushes; ext; ext = ext->next_flush) {
-	    (*ext->before_flush)(dpy, &ext->codes, dpy->buffer, dbufsize);
-	    (*ext->before_flush)(dpy, &ext->codes, (char *)data, size);
-	    if (padsize)
-		(*ext->before_flush)(dpy, &ext->codes, pad, padsize);
-	}
-	skip = 0;
-	todo = total = dbufsize + size + padsize;
-
-	/*
-	 * There are 3 pieces that may need to be written out:
-	 *
-	 *     o  whatever is in the display buffer
-	 *     o  the data passed in by the user
-	 *     o  any padding needed to 32bit align the whole mess
-	 *
-	 * This loop looks at all 3 pieces each time through.  It uses skip
-	 * to figure out whether or not a given piece is needed.
-	 */
-	while (total) {
-	    long before = skip;		/* amount of whole thing written */
-	    long remain = todo;		/* amount to try this time, <= total */
-	    int i = 0;
-	    long len;
-
-	    /* You could be very general here and have "in" and "out" iovecs
-	     * and write a loop without using a macro, but what the heck.  This
-	     * translates to:
-	     *
-	     *     how much of this piece is new?
-	     *     if more new then we are trying this time, clamp
-	     *     if nothing new
-	     *         then bump down amount already written, for next piece
-	     *         else put new stuff in iovec, will need all of next piece
-	     *
-	     * Note that todo had better be at least 1 or else we'll end up
-	     * writing 0 iovecs.
-	     */
-#define InsertIOV(pointer, length) \
-	    len = (length) - before; \
-	    if (len > remain) \
-		len = remain; \
-	    if (len <= 0) { \
-		before = (-len); \
-	    } else { \
-		iov[i].iov_len = len; \
-		iov[i].iov_base = (pointer) + before; \
-		i++; \
-		remain -= len; \
-		before = 0; \
-	    }
-
-	    InsertIOV (dpy->buffer, dbufsize)
-	    InsertIOV ((char *)data, size)
-	    InsertIOV (pad, padsize)
-    
-	    ESET(0);
-	    if ((len = _X11TransWritev(dpy->trans_conn, iov, i)) >= 0) {
-		skip += len;
-		total -= len;
-		todo = total;
-	    } else if (ETEST()) {
-		_XWaitForWritable(dpy
-#ifdef XTHREADS
-				  , NULL
-#endif
-				  );
-#ifdef SUNSYSV
-	    } else if (ECHECK(0)) {
-		_XWaitForWritable(dpy
-#ifdef XTHREADS
-				  , NULL
-#endif
-				  );
-#endif
-#ifdef ESZTEST
-	    } else if (ESZTEST()) {
-		if (todo > 1) 
-		  todo >>= 1;
-		else {
-		    _XWaitForWritable(dpy
-#ifdef XTHREADS
-				      , NULL
-#endif
-				      );
-		}
-#endif
-	    } else if (!ECHECK(EINTR)) {
-		_XIOError(dpy);
-	    }
-	}
-	dpy->last_req = (char *) & _dummy_request;
-	if ((dpy->request - dpy->last_request_read) >= SEQLIMIT &&
-	    !(dpy->flags & XlibDisplayPrivSync)) {
-	    dpy->savedsynchandler = dpy->synchandler;
-	    dpy->synchandler = _XSeqSyncFunction;
-	    dpy->flags |= XlibDisplayPrivSync;
-	}
-	dpy->bufptr = dpy->buffer;
-#ifdef XTHREADS
-	dpy->flags &= ~XlibDisplayWriting;
-#endif
-	return;
-}
-
-static void
-_XGetMiscCode(dpy)
-    register Display *dpy;
-{
-    xQueryExtensionReply qrep;
-    register xQueryExtensionReq *qreq;
-    xXCMiscGetVersionReply vrep;
-    register xXCMiscGetVersionReq *vreq;
-
-    if (dpy->xcmisc_opcode)
-	return;
-    GetReq(QueryExtension, qreq);
-    qreq->nbytes = sizeof(XCMiscExtensionName) - 1;
-    qreq->length += (qreq->nbytes+(unsigned)3)>>2;
-    _XSend(dpy, XCMiscExtensionName, (long)qreq->nbytes);
-    if (!_XReply (dpy, (xReply *)&qrep, 0, xTrue))
-	dpy->xcmisc_opcode = -1;
-    else {
-	GetReq(XCMiscGetVersion, vreq);
-	vreq->reqType = qrep.major_opcode;
-	vreq->miscReqType = X_XCMiscGetVersion;
-	vreq->majorVersion = XCMiscMajorVersion;
-	vreq->minorVersion = XCMiscMinorVersion;
-	if (!_XReply (dpy, (xReply *)&vrep, 0, xTrue))
-	    dpy->xcmisc_opcode = -1;
-	else
-	    dpy->xcmisc_opcode = qrep.major_opcode;
-    }
-}
-
-static int
-_XIDHandler(dpy)
-    register Display *dpy;
-{
-    xXCMiscGetXIDRangeReply grep;
-    register xXCMiscGetXIDRangeReq *greq;
-
-    LockDisplay(dpy);
-    _XGetMiscCode(dpy);
-    if (dpy->xcmisc_opcode > 0) {
-	GetReq(XCMiscGetXIDRange, greq);
-	greq->reqType = dpy->xcmisc_opcode;
-	greq->miscReqType = X_XCMiscGetXIDRange;
-	if (_XReply (dpy, (xReply *)&grep, 0, xTrue) && grep.count) {
-	    dpy->resource_id = ((grep.start_id - dpy->resource_base) >>
-				dpy->resource_shift);
-	    dpy->resource_max = dpy->resource_id;
-	    if (grep.count > 5)
-		dpy->resource_max += grep.count - 6;
-	    dpy->resource_max <<= dpy->resource_shift;
-	}
-    }
-    if (dpy->flags & XlibDisplayPrivSync) {
-	dpy->synchandler = dpy->savedsynchandler;
-	dpy->flags &= ~XlibDisplayPrivSync;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 0;
-}
-
-/*
- * _XAllocID - resource ID allocation routine.
- */
-XID _XAllocID(dpy)
-    register Display *dpy;
-{
-   XID id;
-
-   id = dpy->resource_id << dpy->resource_shift;
-   if (id >= dpy->resource_max) {
-       if (!(dpy->flags & XlibDisplayPrivSync)) {
-	   dpy->savedsynchandler = dpy->synchandler;
-	   dpy->flags |= XlibDisplayPrivSync;
-       }
-       dpy->synchandler = _XIDHandler;
-       dpy->resource_max = dpy->resource_mask + 1;
-   }
-   if (id <= dpy->resource_mask) {
-       dpy->resource_id++;
-       return (dpy->resource_base + id);
-   }
-   if (id != 0x10000000) {
-       (void) fprintf(stderr,
-		      "Xlib: resource ID allocation space exhausted!\n");
-       id = 0x10000000;
-       dpy->resource_id = id >> dpy->resource_shift;
-   }
-   return id;
-}
-
-/*
- * _XAllocIDs - multiple resource ID allocation routine.
- */
-void _XAllocIDs(dpy, ids, count)
-    register Display *dpy;
-    XID *ids;
-    int count;
-{
-    XID id;
-    int i;
-    xXCMiscGetXIDListReply grep;
-    register xXCMiscGetXIDListReq *greq;
-
-    id = dpy->resource_id << dpy->resource_shift;
-    if (dpy->resource_max <= dpy->resource_mask &&
-	id <= dpy->resource_mask &&
-	(dpy->resource_max - id) > ((count - 1) << dpy->resource_shift)) {
-	id += dpy->resource_base;
-	for (i = 0; i < count; i++) {
-	    ids[i] = id;
-	    id += (1 << dpy->resource_shift);
-	    dpy->resource_id++;
-	}
-	return;
-    }
-    grep.count = 0;
-    _XGetMiscCode(dpy);
-    if (dpy->xcmisc_opcode > 0) {
-	GetReq(XCMiscGetXIDList, greq);
-	greq->reqType = dpy->xcmisc_opcode;
-	greq->miscReqType = X_XCMiscGetXIDList;
-	greq->count = count;
-	if (_XReply(dpy, (xReply *)&grep, 0, xFalse) && grep.count) {
-	    _XRead32(dpy, (long *) ids, 4L * (long) (grep.count));
-	    for (i = 0; i < grep.count; i++) {
-		id = (ids[i] - dpy->resource_base) >> dpy->resource_shift;
-		if (id >= dpy->resource_id)
-		    dpy->resource_id = id;
-	    }
-	    if (id >= dpy->resource_max) {
-		if (!(dpy->flags & XlibDisplayPrivSync)) {
-		    dpy->savedsynchandler = dpy->synchandler;
-		    dpy->flags |= XlibDisplayPrivSync;
-		}
-		dpy->synchandler = _XIDHandler;
-		dpy->resource_max = dpy->resource_mask + 1;
-	    }
-	}
-    }
-    for (i = grep.count; i < count; i++)
-	ids[i] = XAllocID(dpy);
-}
-
-/*
- * The hard part about this is that we only get 16 bits from a reply.
- * We have three values that will march along, with the following invariant:
- *	dpy->last_request_read <= rep->sequenceNumber <= dpy->request
- * We have to keep
- *	dpy->request - dpy->last_request_read < 2^16
- * or else we won't know for sure what value to use in events.  We do this
- * by forcing syncs when we get close.
- */
-
-unsigned long
-_XSetLastRequestRead(dpy, rep)
-    register Display *dpy;
-    register xGenericReply *rep;
-{
-    register unsigned long	newseq, lastseq;
-
-    lastseq = dpy->last_request_read;
-    /*
-     * KeymapNotify has no sequence number, but is always guaranteed
-     * to immediately follow another event, except when generated via
-     * SendEvent (hmmm).
-     */
-    if ((rep->type & 0x7f) == KeymapNotify)
-	return(lastseq);
-
-    newseq = (lastseq & ~((unsigned long)0xffff)) | rep->sequenceNumber;
-
-    if (newseq < lastseq) {
-	newseq += 0x10000;
-	if (newseq > dpy->request) {
-	    (void) fprintf (stderr, 
-	    "Xlib: sequence lost (0x%lx > 0x%lx) in reply type 0x%x!\n",
-			    newseq, dpy->request, 
-			    (unsigned int) rep->type);
-	    newseq -= 0x10000;
-	}
-    }
-
-    dpy->last_request_read = newseq;
-    return(newseq);
-}
-
-/*
- * _XReply - Wait for a reply packet and copy its contents into the
- * specified rep.  Meanwhile we must handle error and event packets that
- * we may encounter.
- */
-Status
-_XReply (dpy, rep, extra, discard)
-    register Display *dpy;
-    register xReply *rep;
-    int extra;		/* number of 32-bit words expected after the reply */
-    Bool discard;	/* should I discard data following "extra" words? */
-{
-    /* Pull out the serial number now, so that (currently illegal) requests
-     * generated by an error handler don't confuse us.
-     */
-    unsigned long cur_request = dpy->request;
-#ifdef XTHREADS
-    struct _XCVList *cvl;
-#endif
-
-    if (dpy->flags & XlibDisplayIOError)
-	return 0;
-
-#ifdef XTHREADS
-    /* create our condition variable and append to list */
-    cvl = QueueReplyReaderLock(dpy);
-    if (cvl) {
-	cvl->buf = rep;
-	if (dpy->lock->reply_awaiters == cvl && !dpy->lock->event_awaiters)
-	    dpy->lock->reply_first = True;
-    }
-
-#ifdef XTHREADS_DEBUG
-    printf("_XReply called in thread %x, adding %x to cvl\n",
-	   XThread_Self(), cvl);
-#endif
-
-    _XFlushInt(dpy, cvl ? cvl->cv : NULL);
-    /* if it is not our turn to read a reply off the wire,
-     * wait til we're at head of list.  if there is an event waiter,
-     * and our reply hasn't been read, they'll be in select and will
-     * hand control back to us next.
-     */
-    if(dpy->lock &&
-       (dpy->lock->reply_awaiters != cvl || !dpy->lock->reply_first)) {
-	ConditionWait(dpy, cvl->cv);
-    }
-    dpy->flags |= XlibDisplayReply;
-#else /* XTHREADS else */
-    _XFlush(dpy);
-#endif
-
-    for (;;) {
-#ifdef XTHREADS
-	/* Did another thread's _XReadEvents get our reply by accident? */
-	if (!dpy->lock || !dpy->lock->reply_was_read)
-#endif
-	    (void) _XRead(dpy, (char *)rep, (long)SIZEOF(xReply));
-#ifdef XTHREADS
-	if (dpy->lock)
-	    dpy->lock->reply_was_read = False;
-#endif
-
-	switch ((int)rep->generic.type) {
-
-	    case X_Reply:
-	        /* Reply received.  Fast update for synchronous replies,
-		 * but deal with multiple outstanding replies.
-		 */
-	        if (rep->generic.sequenceNumber == (cur_request & 0xffff))
-		    dpy->last_request_read = cur_request;
-		else {
-		    int pend = SIZEOF(xReply);
-		    if (_XAsyncReply(dpy, rep, (char *)rep, &pend, False)
-			!= (char *)rep)
-			continue;
-		}
-		if (extra <= rep->generic.length) {
-		    if (extra > 0)
-			/* 
-			 * Read the extra data into storage immediately
-			 * following the GenericReply structure. 
-			 */
-			(void) _XRead (dpy, (char *) (NEXTPTR(rep,xReply)),
-				((long)extra) << 2);
-		    if (discard) {
-			if (extra < rep->generic.length)
-			    _XEatData(dpy, (rep->generic.length - extra) << 2);
-		    }
-#ifdef XTHREADS
-		    if (dpy->lock) {
-			if (discard) {
-			    dpy->lock->reply_bytes_left = 0;
-			} else {
-			    dpy->lock->reply_bytes_left =
-				(rep->generic.length - extra) << 2;
-			}
-			if (dpy->lock->reply_bytes_left == 0) {
-			    dpy->flags &= ~XlibDisplayReply;
-			    UnlockNextReplyReader(dpy);
-			}
-		    } else
-			dpy->flags &= ~XlibDisplayReply;
-#endif
-		    return 1;
-		}
-		/* 
-		 *if we get here, then extra > rep->generic.length--meaning we
-		 * read a reply that's shorter than we expected.  This is an 
-		 * error,  but we still need to figure out how to handle it...
-		 */
-		(void) _XRead (dpy, (char *) (NEXTPTR(rep,xReply)),
-			((long) rep->generic.length) << 2);
-		dpy->flags &= ~XlibDisplayReply;
-		UnlockNextReplyReader(dpy);
-		_XIOError (dpy);
-		return (0);
-
-    	    case X_Error:
-	    	{
-	        register _XExtension *ext;
-		register Bool ret = False;
-		int ret_code;
-		xError *err = (xError *) rep;
-		unsigned long serial;
-
-		dpy->flags &= ~XlibDisplayReply;
-		serial = _XSetLastRequestRead(dpy, (xGenericReply *)rep);
-		if (serial == cur_request)
-			/* do not die on "no such font", "can't allocate",
-			   "can't grab" failures */
-			switch ((int)err->errorCode) {
-			case BadName:
-			    switch (err->majorCode) {
-				case X_LookupColor:
-				case X_AllocNamedColor:
-				    UnlockNextReplyReader(dpy);
-				    return(0);
-			    }
-			    break;
-			case BadFont:
-			    if (err->majorCode == X_QueryFont) {
-				UnlockNextReplyReader(dpy);
-				return (0);
-			    }
-			    break;
-			case BadAlloc:
-			case BadAccess:
-			    UnlockNextReplyReader(dpy);
-			    return (0);
-			}
-		/* 
-		 * we better see if there is an extension who may
-		 * want to suppress the error.
-		 */
-		for (ext = dpy->ext_procs; !ret && ext; ext = ext->next) {
-		    if (ext->error) 
-		       ret = (*ext->error)(dpy, err, &ext->codes, &ret_code);
-		}
-		if (!ret) {
-		    _XError(dpy, err);
-		    ret_code = 0;
-		}
-		if (serial == cur_request) {
-		    UnlockNextReplyReader(dpy);
-		    return(ret_code);
-		}
-
-		} /* case X_Error */
-		break;
-	    default:
-		_XEnq(dpy, (xEvent *) rep);
-#ifdef XTHREADS
-		if (dpy->lock && dpy->lock->event_awaiters)
-		    ConditionSignal(dpy, dpy->lock->event_awaiters->cv);
-#endif
-		break;
-	    }
-	}
-}   
-
-static char *
-_XAsyncReply(dpy, rep, buf, lenp, discard)
-    Display *dpy;
-    register xReply *rep;
-    char *buf;
-    register int *lenp;
-    Bool discard;
-{
-    register _XAsyncHandler *async, *next;
-    register int len;
-    register Bool consumed = False;
-    char *nbuf;
-
-    (void) _XSetLastRequestRead(dpy, &rep->generic);
-    len = SIZEOF(xReply) + (rep->generic.length << 2);
-
-    for (async = dpy->async_handlers; async; async = next) {
-	next = async->next;
-	if ((consumed = (*async->handler)(dpy, rep, buf, *lenp, async->data)))
-	    break;
-    }
-    if (!consumed) {
-	if (!discard)
-	    return buf;
-	(void) fprintf(stderr, 
-		       "Xlib: unexpected async reply (sequence 0x%lx)!\n",
-		       dpy->last_request_read);
-#ifdef XTHREADS
-#ifdef XTHREADS_DEBUG
-	printf("thread %x, unexpected async reply\n", XThread_Self());
-#endif
-#endif
-	if (len > *lenp)
-	    _XEatData(dpy, len - *lenp);
-    }
-    if (len >= *lenp) {
-	buf += *lenp;
-	*lenp = 0;
-	return buf;
-    }
-    *lenp -= len;
-    buf += len;
-    len = *lenp;
-    nbuf = buf;
-    while (len > SIZEOF(xReply)) {
-	if (*buf == X_Reply)
-	    return nbuf;
-	buf += SIZEOF(xReply);
-	len -= SIZEOF(xReply);
-    }
-    if (len > 0 && len < SIZEOF(xReply)) {
-	buf = nbuf;
-	len = SIZEOF(xReply) - len;
-	nbuf -= len;
-	memmove(nbuf, buf, *lenp);
-	(void) _XRead(dpy, nbuf + *lenp, (long)len);
-	*lenp += len;
-    }
-    return nbuf;
-}
-
-/*
- * Support for internal connections, such as an IM might use.
- * By Stephen Gildea, X Consortium, September 1993
- */
-
-/* _XRegisterInternalConnection
- * Each IM (or Xlib extension) that opens a file descriptor that Xlib should
- * include in its select/poll mask must call this function to register the
- * fd with Xlib.  Any XConnectionWatchProc registered by XAddConnectionWatch
- * will also be called.
- *
- * Whenever Xlib detects input available on fd, it will call callback
- * with call_data to process it.  If non-Xlib code calls select/poll
- * and detects input available, it must call XProcessInternalConnection,
- * which will call the associated callback.
- *
- * Non-Xlib code can learn about these additional fds by calling
- * XInternalConnectionNumbers or, more typically, by registering
- * a XConnectionWatchProc with XAddConnectionWatch
- * to be called when fds are registered or unregistered.
- *
- * Returns True if registration succeeded, False if not, typically
- * because could not allocate memory.
- * Assumes Display locked when called.
- */
-#if NeedFunctionPrototypes
-Status _XRegisterInternalConnection(
-    Display* dpy,
-    int fd,
-    _XInternalConnectionProc callback,
-    XPointer call_data
-)
-#else
-Status
-_XRegisterInternalConnection(dpy, fd, callback, call_data)
-    Display *dpy;
-    int fd;
-    _XInternalConnectionProc callback;
-    XPointer call_data;
-#endif
-{
-    struct _XConnectionInfo *new_conni, **iptr;
-    struct _XConnWatchInfo *watchers;
-    XPointer *wd;
-
-    new_conni = (struct _XConnectionInfo*)Xmalloc(sizeof(struct _XConnectionInfo));
-    if (!new_conni)
-	return 0;
-    new_conni->watch_data = (XPointer *)Xmalloc(dpy->watcher_count * sizeof(XPointer));
-    if (!new_conni->watch_data) {
-	Xfree(new_conni);
-	return 0;
-    }
-    new_conni->fd = fd;
-    new_conni->read_callback = callback;
-    new_conni->call_data = call_data;
-    new_conni->next = NULL;
-    /* link new structure onto end of list */
-    for (iptr = &dpy->im_fd_info; *iptr; iptr = &(*iptr)->next)
-	;
-    *iptr = new_conni;
-    dpy->im_fd_length++;
-    _XPollfdCacheAdd(dpy, fd);
-
-    for (watchers=dpy->conn_watchers, wd=new_conni->watch_data;
-	 watchers;
-	 watchers=watchers->next, wd++) {
-	*wd = NULL;		/* for cleanliness */
-	(*watchers->fn) (dpy, watchers->client_data, fd, True, wd);
-    }
-
-    return 1;
-}
-
-/* _XUnregisterInternalConnection
- * Each IM (or Xlib extension) that closes a file descriptor previously
- * registered with _XRegisterInternalConnection must call this function.
- * Any XConnectionWatchProc registered by XAddConnectionWatch
- * will also be called.
- *
- * Assumes Display locked when called.
- */
-#if NeedFunctionPrototypes
-void _XUnregisterInternalConnection(
-    Display* dpy,
-    int fd
-)
-#else
-void
-_XUnregisterInternalConnection(dpy, fd)
-    Display *dpy;
-    int fd;
-#endif
-{
-    struct _XConnectionInfo *info_list, **prev;
-    struct _XConnWatchInfo *watch;
-    XPointer *wd;
-
-    for (prev = &dpy->im_fd_info; (info_list = *prev);
-	 prev = &info_list->next) {
-	if (info_list->fd == fd) {
-	    *prev = info_list->next;
-	    dpy->im_fd_length--;
-	    for (watch=dpy->conn_watchers, wd=info_list->watch_data;
-		 watch;
-		 watch=watch->next, wd++) {
-		(*watch->fn) (dpy, watch->client_data, fd, False, wd);
-	    }
-	    if (info_list->watch_data)
-		Xfree (info_list->watch_data);
-	    Xfree (info_list);
-	    break;
-	}
-    }
-    _XPollfdCacheDel(dpy, fd);
-}
-
-/* XInternalConnectionNumbers
- * Returns an array of fds and an array of corresponding call data.
- * Typically a XConnectionWatchProc registered with XAddConnectionWatch
- * will be used instead of this function to discover
- * additional fds to include in the select/poll mask.
- *
- * The list is allocated with Xmalloc and should be freed by the caller
- * with Xfree;
- */
-#if NeedFunctionPrototypes
-Status XInternalConnectionNumbers(
-    Display *dpy,
-    int **fd_return,
-    int *count_return
-)
-#else
-Status
-XInternalConnectionNumbers(dpy, fd_return, count_return)
-    Display *dpy;
-    int **fd_return;
-    int *count_return;
-#endif
-{
-    int count;
-    struct _XConnectionInfo *info_list;
-    int *fd_list;
-
-    LockDisplay(dpy);
-    count = 0;
-    for (info_list=dpy->im_fd_info; info_list; info_list=info_list->next)
-	count++;
-    fd_list = (int*) Xmalloc (count * sizeof(int));
-    if (!fd_list) {
-	UnlockDisplay(dpy);
-	return 0;
-    }
-    count = 0;
-    for (info_list=dpy->im_fd_info; info_list; info_list=info_list->next) {
-	fd_list[count] = info_list->fd;
-	count++;
-    }
-    UnlockDisplay(dpy);
-
-    *fd_return = fd_list;
-    *count_return = count;
-    return 1;
-}
-
-static void _XProcessInternalConnection(dpy, conn_info)
-    Display *dpy;
-    struct _XConnectionInfo *conn_info;
-{
-    dpy->flags |= XlibDisplayProcConni;
-#ifdef XTHREADS
-    if (dpy->lock) {
-	/* check cache to avoid call to thread_self */
-	if (xthread_have_id(dpy->lock->reading_thread))
-	    dpy->lock->conni_thread = dpy->lock->reading_thread;
-	else
-	    dpy->lock->conni_thread = XThread_Self();
-    }
-#endif /* XTHREADS */
-    UnlockDisplay(dpy);
-    (*conn_info->read_callback) (dpy, conn_info->fd, conn_info->call_data);
-    LockDisplay(dpy);
-#ifdef XTHREADS
-    if (dpy->lock)
-	xthread_clear_id(dpy->lock->conni_thread);
-#endif /* XTHREADS */
-    dpy->flags &= ~XlibDisplayProcConni;
-}
-
-/* XProcessInternalConnection
- * Call the _XInternalConnectionProc registered by _XRegisterInternalConnection
- * for this fd.
- * The Display is NOT locked during the call.
- */
-#if NeedFunctionPrototypes
-void XProcessInternalConnection(
-    Display* dpy,
-    int fd
-)
-#else
-void
-XProcessInternalConnection(dpy, fd)
-    Display *dpy;
-    int fd;
-#endif
-{
-    struct _XConnectionInfo *info_list;
-
-    LockDisplay(dpy);
-    for (info_list=dpy->im_fd_info; info_list; info_list=info_list->next) {
-	if (info_list->fd == fd) {
-	    _XProcessInternalConnection(dpy, info_list);
-	    break;
-	}
-    }
-    UnlockDisplay(dpy);
-}
-
-/* XAddConnectionWatch
- * Register a callback to be called whenever _XRegisterInternalConnection
- * or _XUnregisterInternalConnection is called.
- * Callbacks are called with the Display locked.
- * If any connections are already registered, the callback is immediately
- * called for each of them.
- */
-#if NeedFunctionPrototypes
-Status XAddConnectionWatch(
-    Display* dpy,
-    XConnectionWatchProc callback,
-    XPointer client_data
-)
-#else
-Status
-XAddConnectionWatch(dpy, callback, client_data)
-    Display *dpy;
-    XConnectionWatchProc callback;
-    XPointer client_data;
-#endif
-{
-    struct _XConnWatchInfo *new_watcher, **wptr;
-    struct _XConnectionInfo *info_list;
-    XPointer *wd_array;
-
-    LockDisplay(dpy);
-
-    /* allocate new watch data */
-    for (info_list=dpy->im_fd_info; info_list; info_list=info_list->next) {
-	wd_array = (XPointer *)Xrealloc((char *)info_list->watch_data,
-					(dpy->watcher_count + 1) *
-					sizeof(XPointer));
-	if (!wd_array) {
-	    UnlockDisplay(dpy);
-	    return 0;
-	}
-	wd_array[dpy->watcher_count] = NULL;	/* for cleanliness */
-    }
-
-    new_watcher = (struct _XConnWatchInfo*)Xmalloc(sizeof(struct _XConnWatchInfo));
-    if (!new_watcher) {
-	UnlockDisplay(dpy);
-	return 0;
-    }
-    new_watcher->fn = callback;
-    new_watcher->client_data = client_data;
-    new_watcher->next = NULL;
-
-    /* link new structure onto end of list */
-    for (wptr = &dpy->conn_watchers; *wptr; wptr = &(*wptr)->next)
-	;
-    *wptr = new_watcher;
-    dpy->watcher_count++;
-
-    /* call new watcher on all currently registered fds */
-    for (info_list=dpy->im_fd_info; info_list; info_list=info_list->next) {
-	(*callback) (dpy, client_data, info_list->fd, True,
-		     info_list->watch_data + dpy->watcher_count - 1);
-    }
-
-    UnlockDisplay(dpy);
-    return 1;
-}
-
-/* XRemoveConnectionWatch
- * Unregister a callback registered by XAddConnectionWatch.
- * Both callback and client_data must match what was passed to
- * XAddConnectionWatch.
- */ 
-#if NeedFunctionPrototypes
-void XRemoveConnectionWatch(
-    Display* dpy,
-    XConnectionWatchProc callback,
-    XPointer client_data
-)
-#else
-void
-XRemoveConnectionWatch(dpy, callback, client_data)
-    Display *dpy;
-    XConnectionWatchProc callback;
-    XPointer client_data;
-#endif
-{
-    struct _XConnWatchInfo *watch;
-    struct _XConnWatchInfo *previous = NULL;
-    struct _XConnectionInfo *conni;
-    int counter = 0;
-
-    LockDisplay(dpy);
-    for (watch=dpy->conn_watchers; watch; watch=watch->next) {
-	if (watch->fn == callback  &&  watch->client_data == client_data) {
-	    if (previous)
-		previous->next = watch->next;
-	    else
-		dpy->conn_watchers = watch->next;
-	    Xfree (watch);
-	    dpy->watcher_count--;
-	    /* remove our watch_data for each connection */
-	    for (conni=dpy->im_fd_info; conni; conni=conni->next) {
-		/* don't bother realloc'ing; these arrays are small anyway */
-		/* overlapping */
-		memmove(conni->watch_data+counter,
-			conni->watch_data+counter+1,
-			dpy->watcher_count - counter);
-	    }
-	    break;
-	}
-	previous = watch;
-	counter++;
-    }
-    UnlockDisplay(dpy);
-}
-
-/* end of internal connections support */
-
-
-/* Read and discard "n" 8-bit bytes of data */
-
-void _XEatData (dpy, n)
-    Display *dpy;
-    register unsigned long n;
-{
-#define SCRATCHSIZE 2048
-    char buf[SCRATCHSIZE];
-
-    while (n > 0) {
-	register long bytes_read = (n > SCRATCHSIZE) ? SCRATCHSIZE : n;
-	(void) _XRead (dpy, buf, bytes_read);
-	n -= bytes_read;
-    }
-#undef SCRATCHSIZE
-}
-
-
-/*
- * _XEnq - Place event packets on the display's queue.
- * note that no squishing of move events in V11, since there
- * is pointer motion hints....
- */
-void _XEnq (dpy, event)
-	register Display *dpy;
-	register xEvent *event;
-{
-	register _XQEvent *qelt;
-
-	if ((qelt = dpy->qfree)) {
-		/* If dpy->qfree is non-NULL do this, else malloc a new one. */
-		dpy->qfree = qelt->next;
-	}
-	else if ((qelt = 
-	    (_XQEvent *) Xmalloc((unsigned)sizeof(_XQEvent))) == NULL) {
-		/* Malloc call failed! */
-		ESET(ENOMEM);
-		_XIOError(dpy);
-	}
-	qelt->next = NULL;
-	/* go call through display to find proper event reformatter */
-	if ((*dpy->event_vec[event->u.u.type & 0177])(dpy, &qelt->event, event)) {
-	    qelt->qserial_num = dpy->next_event_serial_num++;
-	    if (dpy->tail)	dpy->tail->next = qelt;
-	    else 		dpy->head = qelt;
-    
-	    dpy->tail = qelt;
-	    dpy->qlen++;
-	} else {
-	    /* ignored, or stashed away for many-to-one compression */
-	    qelt->next = dpy->qfree;
-	    dpy->qfree = qelt;
-	}
-}
-
-/*
- * _XDeq - Remove event packet from the display's queue.
- */
-void _XDeq (dpy, prev, qelt)
-    register Display *dpy;
-    register _XQEvent *prev;	/* element before qelt */
-    register _XQEvent *qelt;	/* element to be unlinked */
-{
-    if (prev) {
-	if ((prev->next = qelt->next) == NULL)
-	    dpy->tail = prev;
-    } else {
-	/* no prev, so removing first elt */
-	if ((dpy->head = qelt->next) == NULL)
-	    dpy->tail = NULL;
-    }
-    qelt->qserial_num = 0;
-    qelt->next = dpy->qfree;
-    dpy->qfree = qelt;
-    dpy->qlen--;
-}
-
-/*
- * EventToWire in separate file in that often not needed.
- */
-
-/*ARGSUSED*/
-Bool
-_XUnknownWireEvent(dpy, re, event)
-register Display *dpy;	/* pointer to display structure */
-register XEvent *re;	/* pointer to where event should be reformatted */
-register xEvent *event;	/* wire protocol event */
-{
-#ifdef notdef
-	(void) fprintf(stderr, 
-	    "Xlib: unhandled wire event! event number = %d, display = %x\n.",
-			event->u.u.type, dpy);
-#endif
-	return(False);
-}
-
-/*ARGSUSED*/
-Status
-_XUnknownNativeEvent(dpy, re, event)
-register Display *dpy;	/* pointer to display structure */
-register XEvent *re;	/* pointer to where event should be reformatted */
-register xEvent *event;	/* wire protocol event */
-{
-#ifdef notdef
-	(void) fprintf(stderr, 
- 	   "Xlib: unhandled native event! event number = %d, display = %x\n.",
-			re->type, dpy);
-#endif
-	return(0);
-}
-/*
- * reformat a wire event into an XEvent structure of the right type.
- */
-Bool
-_XWireToEvent(dpy, re, event)
-register Display *dpy;	/* pointer to display structure */
-register XEvent *re;	/* pointer to where event should be reformatted */
-register xEvent *event;	/* wire protocol event */
-{
-
-	re->type = event->u.u.type & 0x7f;
-	((XAnyEvent *)re)->serial = _XSetLastRequestRead(dpy,
-					(xGenericReply *)event);
-	((XAnyEvent *)re)->send_event = ((event->u.u.type & 0x80) != 0);
-	((XAnyEvent *)re)->display = dpy;
-	
-	/* Ignore the leading bit of the event type since it is set when a
-		client sends an event rather than the server. */
-
-	switch (event-> u.u.type & 0177) {
-	      case KeyPress:
-	      case KeyRelease:
-	        {
-			register XKeyEvent *ev = (XKeyEvent*) re;
-			ev->root 	= event->u.keyButtonPointer.root;
-			ev->window 	= event->u.keyButtonPointer.event;
-			ev->subwindow 	= event->u.keyButtonPointer.child;
-			ev->time 	= event->u.keyButtonPointer.time;
-			ev->x 		= cvtINT16toInt(event->u.keyButtonPointer.eventX);
-			ev->y 		= cvtINT16toInt(event->u.keyButtonPointer.eventY);
-			ev->x_root 	= cvtINT16toInt(event->u.keyButtonPointer.rootX);
-			ev->y_root 	= cvtINT16toInt(event->u.keyButtonPointer.rootY);
-			ev->state	= event->u.keyButtonPointer.state;
-			ev->same_screen	= event->u.keyButtonPointer.sameScreen;
-			ev->keycode 	= event->u.u.detail;
-		}
-	      	break;
-	      case ButtonPress:
-	      case ButtonRelease:
-	        {
-			register XButtonEvent *ev =  (XButtonEvent *) re;
-			ev->root 	= event->u.keyButtonPointer.root;
-			ev->window 	= event->u.keyButtonPointer.event;
-			ev->subwindow 	= event->u.keyButtonPointer.child;
-			ev->time 	= event->u.keyButtonPointer.time;
-			ev->x 		= cvtINT16toInt(event->u.keyButtonPointer.eventX);
-			ev->y 		= cvtINT16toInt(event->u.keyButtonPointer.eventY);
-			ev->x_root 	= cvtINT16toInt(event->u.keyButtonPointer.rootX);
-			ev->y_root 	= cvtINT16toInt(event->u.keyButtonPointer.rootY);
-			ev->state	= event->u.keyButtonPointer.state;
-			ev->same_screen	= event->u.keyButtonPointer.sameScreen;
-			ev->button 	= event->u.u.detail;
-		}
-	        break;
-	      case MotionNotify:
-	        {
-			register XMotionEvent *ev =   (XMotionEvent *)re;
-			ev->root 	= event->u.keyButtonPointer.root;
-			ev->window 	= event->u.keyButtonPointer.event;
-			ev->subwindow 	= event->u.keyButtonPointer.child;
-			ev->time 	= event->u.keyButtonPointer.time;
-			ev->x 		= cvtINT16toInt(event->u.keyButtonPointer.eventX);
-			ev->y 		= cvtINT16toInt(event->u.keyButtonPointer.eventY);
-			ev->x_root 	= cvtINT16toInt(event->u.keyButtonPointer.rootX);
-			ev->y_root 	= cvtINT16toInt(event->u.keyButtonPointer.rootY);
-			ev->state	= event->u.keyButtonPointer.state;
-			ev->same_screen	= event->u.keyButtonPointer.sameScreen;
-			ev->is_hint 	= event->u.u.detail;
-		}
-	        break;
-	      case EnterNotify:
-	      case LeaveNotify:
-		{
-			register XCrossingEvent *ev   = (XCrossingEvent *) re;
-			ev->root	= event->u.enterLeave.root;
-			ev->window	= event->u.enterLeave.event;
-			ev->subwindow	= event->u.enterLeave.child;
-			ev->time	= event->u.enterLeave.time;
-			ev->x		= cvtINT16toInt(event->u.enterLeave.eventX);
-			ev->y		= cvtINT16toInt(event->u.enterLeave.eventY);
-			ev->x_root	= cvtINT16toInt(event->u.enterLeave.rootX);
-			ev->y_root	= cvtINT16toInt(event->u.enterLeave.rootY);
-			ev->state	= event->u.enterLeave.state;
-			ev->mode	= event->u.enterLeave.mode;
-			ev->same_screen = (event->u.enterLeave.flags & 
-				ELFlagSameScreen) && True;
-			ev->focus	= (event->u.enterLeave.flags &
-			  	ELFlagFocus) && True;
-			ev->detail	= event->u.u.detail;
-		}
-		  break;
-	      case FocusIn:
-	      case FocusOut:
-		{
-			register XFocusChangeEvent *ev = (XFocusChangeEvent *) re;
-			ev->window 	= event->u.focus.window;
-			ev->mode	= event->u.focus.mode;
-			ev->detail	= event->u.u.detail;
-		}
-		  break;
-	      case KeymapNotify:
-		{
-			register XKeymapEvent *ev = (XKeymapEvent *) re;
-			ev->window	= None;
-			memcpy(&ev->key_vector[1],
-			       (char *)((xKeymapEvent *) event)->map,
-			       sizeof (((xKeymapEvent *) event)->map));
-		}
-		break;
-	      case Expose:
-		{
-			register XExposeEvent *ev = (XExposeEvent *) re;
-			ev->window	= event->u.expose.window;
-			ev->x		= event->u.expose.x;
-			ev->y		= event->u.expose.y;
-			ev->width	= event->u.expose.width;
-			ev->height	= event->u.expose.height;
-			ev->count	= event->u.expose.count;
-		}
-		break;
-	      case GraphicsExpose:
-		{
-		    register XGraphicsExposeEvent *ev =
-			(XGraphicsExposeEvent *) re;
-		    ev->drawable	= event->u.graphicsExposure.drawable;
-		    ev->x		= event->u.graphicsExposure.x;
-		    ev->y		= event->u.graphicsExposure.y;
-		    ev->width		= event->u.graphicsExposure.width;
-		    ev->height		= event->u.graphicsExposure.height;
-		    ev->count		= event->u.graphicsExposure.count;
-		    ev->major_code	= event->u.graphicsExposure.majorEvent;
-		    ev->minor_code	= event->u.graphicsExposure.minorEvent;
-		}
-		break;
-	      case NoExpose:
-		{
-		    register XNoExposeEvent *ev = (XNoExposeEvent *) re;
-		    ev->drawable	= event->u.noExposure.drawable;
-		    ev->major_code	= event->u.noExposure.majorEvent;
-		    ev->minor_code	= event->u.noExposure.minorEvent;
-		}
-		break;
-	      case VisibilityNotify:
-		{
-		    register XVisibilityEvent *ev = (XVisibilityEvent *) re;
-		    ev->window		= event->u.visibility.window;
-		    ev->state		= event->u.visibility.state;
-		}
-		break;
-	      case CreateNotify:
-		{
-		    register XCreateWindowEvent *ev =
-			 (XCreateWindowEvent *) re;
-		    ev->window		= event->u.createNotify.window;
-		    ev->parent		= event->u.createNotify.parent;
-		    ev->x		= cvtINT16toInt(event->u.createNotify.x);
-		    ev->y		= cvtINT16toInt(event->u.createNotify.y);
-		    ev->width		= event->u.createNotify.width;
-		    ev->height		= event->u.createNotify.height;
-		    ev->border_width	= event->u.createNotify.borderWidth;
-		    ev->override_redirect	= event->u.createNotify.override;
-		}
-		break;
-	      case DestroyNotify:
-		{
-		    register XDestroyWindowEvent *ev =
-				(XDestroyWindowEvent *) re;
-		    ev->window		= event->u.destroyNotify.window;
-		    ev->event		= event->u.destroyNotify.event;
-		}
-		break;
-	      case UnmapNotify:
-		{
-		    register XUnmapEvent *ev = (XUnmapEvent *) re;
-		    ev->window		= event->u.unmapNotify.window;
-		    ev->event		= event->u.unmapNotify.event;
-		    ev->from_configure	= event->u.unmapNotify.fromConfigure;
-		}
-		break;
-	      case MapNotify:
-		{
-		    register XMapEvent *ev = (XMapEvent *) re;
-		    ev->window		= event->u.mapNotify.window;
-		    ev->event		= event->u.mapNotify.event;
-		    ev->override_redirect	= event->u.mapNotify.override;
-		}
-		break;
-	      case MapRequest:
-		{
-		    register XMapRequestEvent *ev = (XMapRequestEvent *) re;
-		    ev->window		= event->u.mapRequest.window;
-		    ev->parent		= event->u.mapRequest.parent;
-		}
-		break;
-	      case ReparentNotify:
-		{
-		    register XReparentEvent *ev = (XReparentEvent *) re;
-		    ev->event		= event->u.reparent.event;
-		    ev->window		= event->u.reparent.window;
-		    ev->parent		= event->u.reparent.parent;
-		    ev->x		= cvtINT16toInt(event->u.reparent.x);
-		    ev->y		= cvtINT16toInt(event->u.reparent.y);
-		    ev->override_redirect	= event->u.reparent.override;
-		}
-		break;
-	      case ConfigureNotify:
-		{
-		    register XConfigureEvent *ev = (XConfigureEvent *) re;
-		    ev->event	= event->u.configureNotify.event;
-		    ev->window	= event->u.configureNotify.window;
-		    ev->above	= event->u.configureNotify.aboveSibling;
-		    ev->x	= cvtINT16toInt(event->u.configureNotify.x);
-		    ev->y	= cvtINT16toInt(event->u.configureNotify.y);
-		    ev->width	= event->u.configureNotify.width;
-		    ev->height	= event->u.configureNotify.height;
-		    ev->border_width  = event->u.configureNotify.borderWidth;
-		    ev->override_redirect = event->u.configureNotify.override;
-		}
-		break;
-	      case ConfigureRequest:
-		{
-		    register XConfigureRequestEvent *ev =
-		        (XConfigureRequestEvent *) re;
-		    ev->window		= event->u.configureRequest.window;
-		    ev->parent		= event->u.configureRequest.parent;
-		    ev->above		= event->u.configureRequest.sibling;
-		    ev->x		= cvtINT16toInt(event->u.configureRequest.x);
-		    ev->y		= cvtINT16toInt(event->u.configureRequest.y);
-		    ev->width		= event->u.configureRequest.width;
-		    ev->height		= event->u.configureRequest.height;
-		    ev->border_width	= event->u.configureRequest.borderWidth;
-		    ev->value_mask	= event->u.configureRequest.valueMask;
-		    ev->detail  	= event->u.u.detail;
-		}
-		break;
-	      case GravityNotify:
-		{
-		    register XGravityEvent *ev = (XGravityEvent *) re;
-		    ev->window		= event->u.gravity.window;
-		    ev->event		= event->u.gravity.event;
-		    ev->x		= cvtINT16toInt(event->u.gravity.x);
-		    ev->y		= cvtINT16toInt(event->u.gravity.y);
-		}
-		break;
-	      case ResizeRequest:
-		{
-		    register XResizeRequestEvent *ev =
-			(XResizeRequestEvent *) re;
-		    ev->window		= event->u.resizeRequest.window;
-		    ev->width		= event->u.resizeRequest.width;
-		    ev->height		= event->u.resizeRequest.height;
-		}
-		break;
-	      case CirculateNotify:
-		{
-		    register XCirculateEvent *ev = (XCirculateEvent *) re;
-		    ev->window		= event->u.circulate.window;
-		    ev->event		= event->u.circulate.event;
-		    ev->place		= event->u.circulate.place;
-		}
-		break;
-	      case CirculateRequest:
-		{
-		    register XCirculateRequestEvent *ev =
-		        (XCirculateRequestEvent *) re;
-		    ev->window		= event->u.circulate.window;
-		    ev->parent		= event->u.circulate.event;
-		    ev->place		= event->u.circulate.place;
-		}
-		break;
-	      case PropertyNotify:
-		{
-		    register XPropertyEvent *ev = (XPropertyEvent *) re;
-		    ev->window		= event->u.property.window;
-		    ev->atom		= event->u.property.atom;
-		    ev->time		= event->u.property.time;
-		    ev->state		= event->u.property.state;
-		}
-		break;
-	      case SelectionClear:
-		{
-		    register XSelectionClearEvent *ev =
-			 (XSelectionClearEvent *) re;
-		    ev->window		= event->u.selectionClear.window;
-		    ev->selection	= event->u.selectionClear.atom;
-		    ev->time		= event->u.selectionClear.time;
-		}
-		break;
-	      case SelectionRequest:
-		{
-		    register XSelectionRequestEvent *ev =
-		        (XSelectionRequestEvent *) re;
-		    ev->owner		= event->u.selectionRequest.owner;
-		    ev->requestor	= event->u.selectionRequest.requestor;
-		    ev->selection	= event->u.selectionRequest.selection;
-		    ev->target		= event->u.selectionRequest.target;
-		    ev->property	= event->u.selectionRequest.property;
-		    ev->time		= event->u.selectionRequest.time;
-		}
-		break;
-	      case SelectionNotify:
-		{
-		    register XSelectionEvent *ev = (XSelectionEvent *) re;
-		    ev->requestor	= event->u.selectionNotify.requestor;
-		    ev->selection	= event->u.selectionNotify.selection;
-		    ev->target		= event->u.selectionNotify.target;
-		    ev->property	= event->u.selectionNotify.property;
-		    ev->time		= event->u.selectionNotify.time;
-		}
-		break;
-	      case ColormapNotify:
-		{
-		    register XColormapEvent *ev = (XColormapEvent *) re;
-		    ev->window		= event->u.colormap.window;
-		    ev->colormap	= event->u.colormap.colormap;
-		    ev->new		= event->u.colormap.new;
-		    ev->state		= event->u.colormap.state;
-	        }
-		break;
-	      case ClientMessage:
-		{
-		   register int i;
-		   register XClientMessageEvent *ev 
-		   			= (XClientMessageEvent *) re;
-		   ev->window		= event->u.clientMessage.window;
-		   ev->format		= event->u.u.detail;
-		   switch (ev->format) {
-			case 8:	
-			   ev->message_type = event->u.clientMessage.u.b.type;
-			   for (i = 0; i < 20; i++) 	
-			     ev->data.b[i] = event->u.clientMessage.u.b.bytes[i];
-			   break;
-			case 16:
-			   ev->message_type = event->u.clientMessage.u.s.type;
-			   ev->data.s[0] = cvtINT16toShort(event->u.clientMessage.u.s.shorts0);
-			   ev->data.s[1] = cvtINT16toShort(event->u.clientMessage.u.s.shorts1);
-			   ev->data.s[2] = cvtINT16toShort(event->u.clientMessage.u.s.shorts2);
-			   ev->data.s[3] = cvtINT16toShort(event->u.clientMessage.u.s.shorts3);
-			   ev->data.s[4] = cvtINT16toShort(event->u.clientMessage.u.s.shorts4);
-			   ev->data.s[5] = cvtINT16toShort(event->u.clientMessage.u.s.shorts5);
-			   ev->data.s[6] = cvtINT16toShort(event->u.clientMessage.u.s.shorts6);
-			   ev->data.s[7] = cvtINT16toShort(event->u.clientMessage.u.s.shorts7);
-			   ev->data.s[8] = cvtINT16toShort(event->u.clientMessage.u.s.shorts8);
-			   ev->data.s[9] = cvtINT16toShort(event->u.clientMessage.u.s.shorts9);
-			   break;
-			case 32:
-			   ev->message_type = event->u.clientMessage.u.l.type;
-			   ev->data.l[0] = cvtINT32toLong(event->u.clientMessage.u.l.longs0);
-			   ev->data.l[1] = cvtINT32toLong(event->u.clientMessage.u.l.longs1);
-			   ev->data.l[2] = cvtINT32toLong(event->u.clientMessage.u.l.longs2);
-			   ev->data.l[3] = cvtINT32toLong(event->u.clientMessage.u.l.longs3);
-			   ev->data.l[4] = cvtINT32toLong(event->u.clientMessage.u.l.longs4);
-			   break;
-			default: /* XXX should never occur */
-				break;
-		    }
-	        }
-		break;
-	      case MappingNotify:
-		{
-		   register XMappingEvent *ev = (XMappingEvent *)re;
-		   ev->window		= 0;
-		   ev->first_keycode 	= event->u.mappingNotify.firstKeyCode;
-		   ev->request 		= event->u.mappingNotify.request;
-		   ev->count 		= event->u.mappingNotify.count;
-		}
-		break;
-	      default:
-		return(_XUnknownWireEvent(dpy, re, event));
-	}
-	return(True);
-}
-
-
-/*
- * _XDefaultIOError - Default fatal system error reporting routine.  Called 
- * when an X internal system error is encountered.
- */
-void _XDefaultIOError (dpy)
-	Display *dpy;
-{
-	if (ECHECK(EPIPE)) {
-	    (void) fprintf (stderr,
-	"X connection to %s broken (explicit kill or server shutdown).\r\n",
-			    DisplayString (dpy));
-	} else {
-	    (void) fprintf (stderr, 
-			"XIO:  fatal IO error %d (%s) on X server \"%s\"\r\n",
-#ifdef WIN32
-			WSAGetLastError(), strerror(WSAGetLastError()),
-#else
-			errno, strerror (errno),
-#endif
-			DisplayString (dpy));
-	    (void) fprintf (stderr, 
-	 "      after %lu requests (%lu known processed) with %d events remaining.\r\n",
-			NextRequest(dpy) - 1, LastKnownRequestProcessed(dpy),
-			QLength(dpy));
-
-	}
-	exit(1);
-}
-
-
-static int _XPrintDefaultError (dpy, event, fp)
-    Display *dpy;
-    XErrorEvent *event;
-    FILE *fp;
-{
-    char buffer[BUFSIZ];
-    char mesg[BUFSIZ];
-    char number[32];
-    char *mtype = "XlibMessage";
-    register _XExtension *ext = (_XExtension *)NULL;
-    _XExtension *bext = (_XExtension *)NULL;
-    XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
-    XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
-    (void) fprintf(fp, "%s:  %s\n  ", mesg, buffer);
-    XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", 
-	mesg, BUFSIZ);
-    (void) fprintf(fp, mesg, event->request_code);
-    if (event->request_code < 128) {
-	sprintf(number, "%d", event->request_code);
-	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
-    } else {
-	for (ext = dpy->ext_procs;
-	     ext && (ext->codes.major_opcode != event->request_code);
-	     ext = ext->next)
-	  ;
-	if (ext)
-	    strcpy(buffer, ext->name);
-	else
-	    buffer[0] = '\0';
-    }
-    (void) fprintf(fp, " (%s)\n", buffer);
-    if (event->request_code >= 128) {
-	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
-			      mesg, BUFSIZ);
-	fputs("  ", fp);
-	(void) fprintf(fp, mesg, event->minor_code);
-	if (ext) {
-	    sprintf(mesg, "%s.%d", ext->name, event->minor_code);
-	    XGetErrorDatabaseText(dpy, "XRequest", mesg, "", buffer, BUFSIZ);
-	    (void) fprintf(fp, " (%s)", buffer);
-	}
-	fputs("\n", fp);
-    }
-    if (event->error_code >= 128) {
-	/* kludge, try to find the extension that caused it */
-	buffer[0] = '\0';
-	for (ext = dpy->ext_procs; ext; ext = ext->next) {
-	    if (ext->error_string) 
-		(*ext->error_string)(dpy, event->error_code, &ext->codes,
-				     buffer, BUFSIZ);
-	    if (buffer[0]) {
-		bext = ext;
-		break;
-	    }
-	    if (ext->codes.first_error &&
-		ext->codes.first_error < (int)event->error_code &&
-		(!bext || ext->codes.first_error > bext->codes.first_error))
-		bext = ext;
-	}    
-	if (bext)
-	    sprintf(buffer, "%s.%d", bext->name,
-		    event->error_code - bext->codes.first_error);
-	else
-	    strcpy(buffer, "Value");
-	XGetErrorDatabaseText(dpy, mtype, buffer, "", mesg, BUFSIZ);
-	if (mesg[0]) {
-	    fputs("  ", fp);
-	    (void) fprintf(fp, mesg, event->resourceid);
-	    fputs("\n", fp);
-	}
-	/* let extensions try to print the values */
-	for (ext = dpy->ext_procs; ext; ext = ext->next) {
-	    if (ext->error_values)
-		(*ext->error_values)(dpy, event, fp);
-	}
-    } else if ((event->error_code == BadWindow) ||
-	       (event->error_code == BadPixmap) ||
-	       (event->error_code == BadCursor) ||
-	       (event->error_code == BadFont) ||
-	       (event->error_code == BadDrawable) ||
-	       (event->error_code == BadColor) ||
-	       (event->error_code == BadGC) ||
-	       (event->error_code == BadIDChoice) ||
-	       (event->error_code == BadValue) ||
-	       (event->error_code == BadAtom)) {
-	if (event->error_code == BadValue)
-	    XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
-				  mesg, BUFSIZ);
-	else if (event->error_code == BadAtom)
-	    XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
-				  mesg, BUFSIZ);
-	else
-	    XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
-				  mesg, BUFSIZ);
-	fputs("  ", fp);
-	(void) fprintf(fp, mesg, event->resourceid);
-	fputs("\n", fp);
-    }
-    XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 
-			  mesg, BUFSIZ);
-    fputs("  ", fp);
-    (void) fprintf(fp, mesg, event->serial);
-    XGetErrorDatabaseText(dpy, mtype, "CurrentSerial", "Current Serial #%d",
-			  mesg, BUFSIZ);
-    fputs("\n  ", fp);
-    (void) fprintf(fp, mesg, dpy->request);
-    fputs("\n", fp);
-    if (event->error_code == BadImplementation) return 0;
-    return 1;
-}
-
-int _XDefaultError(dpy, event)
-	Display *dpy;
-	XErrorEvent *event;
-{
-    if (_XPrintDefaultError (dpy, event, stderr) == 0) return 0;
-    exit(1);
-    /*NOTREACHED*/
-}
-
-/*ARGSUSED*/
-Bool _XDefaultWireError(display, he, we)
-    Display     *display;
-    XErrorEvent *he;
-    xError      *we;
-{
-    return True;
-}
-
-/*
- * _XError - upcall internal or user protocol error handler
- */
-int _XError (dpy, rep)
-    Display *dpy;
-    register xError *rep;
-{
-    /* 
-     * X_Error packet encountered!  We need to unpack the error before
-     * giving it to the user.
-     */
-    XEvent event; /* make it a large event */
-    register _XAsyncHandler *async, *next;
-
-    event.xerror.serial = _XSetLastRequestRead(dpy, (xGenericReply *)rep);
-
-    for (async = dpy->async_handlers; async; async = next) {
-	next = async->next;
-	if ((*async->handler)(dpy, (xReply *)rep,
-			      (char *)rep, SIZEOF(xError), async->data))
-	    return 0;
-    }
-
-    event.xerror.display = dpy;
-    event.xerror.type = X_Error;
-    event.xerror.resourceid = rep->resourceID;
-    event.xerror.error_code = rep->errorCode;
-    event.xerror.request_code = rep->majorCode;
-    event.xerror.minor_code = rep->minorCode;
-    if (dpy->error_vec &&
-	!(*dpy->error_vec[rep->errorCode])(dpy, &event.xerror, rep))
-	return 0;
-    if (_XErrorFunction != NULL) {
-	int rtn_val;
-#ifdef XTHREADS
-	if (dpy->lock)
-	    (*dpy->lock->user_lock_display)(dpy);
-	UnlockDisplay(dpy);
-#endif /* XTHREADS */
-	rtn_val = (*_XErrorFunction)(dpy, (XErrorEvent *)&event); /* upcall */
-#ifdef XTHREADS
-	LockDisplay(dpy);
-	if (dpy->lock)
-	    (*dpy->lock->user_unlock_display)(dpy);
-#endif /* XTHREADS */
-	return rtn_val;
-    } else {
-	return _XDefaultError(dpy, (XErrorEvent *)&event);
-    }
-}
-    
-/*
- * _XIOError - call user connection error handler and exit
- */
-int
-_XIOError (dpy)
-    Display *dpy;
-{
-    dpy->flags |= XlibDisplayIOError;
-#ifdef WIN32
-    errno = WSAGetLastError();
-#endif
-
-    if (_XIOErrorFunction != NULL)
-	(*_XIOErrorFunction)(dpy);
-    else
-	_XDefaultIOError(dpy);
-    exit (1);
-    return 0;
-}
-
-
-/*
- * This routine can be used to (cheaply) get some memory within a single
- * Xlib routine for scratch space.  A single buffer is reused each time
- * if possible.  To be MT safe, you can only call this between a call to
- * GetReq* and a call to Data* or _XSend*, or in a context when the thread
- * is guaranteed to not unlock the display.
- */
-char *_XAllocScratch (dpy, nbytes)
-	register Display *dpy;
-	unsigned long nbytes;
-{
-	if (nbytes > dpy->scratch_length) {
-	    if (dpy->scratch_buffer) Xfree (dpy->scratch_buffer);
-	    if ((dpy->scratch_buffer = Xmalloc((unsigned) nbytes)))
-		dpy->scratch_length = nbytes;
-	    else dpy->scratch_length = 0;
-	}
-	return (dpy->scratch_buffer);
-}
-
-/*
- * Scratch space allocator you can call any time, multiple times, and be
- * MT safe, but you must hand the buffer back with _XFreeTemp.
- */
-char *_XAllocTemp (dpy, nbytes)
-    register Display *dpy;
-    unsigned long nbytes;
-{
-    char *buf;
-
-    buf = _XAllocScratch(dpy, nbytes);
-    dpy->scratch_buffer = NULL;
-    dpy->scratch_length = 0;
-    return buf;
-}
-
-void _XFreeTemp (dpy, buf, nbytes)
-    register Display *dpy;
-    char *buf;
-    unsigned long nbytes;
-{
-    if (dpy->scratch_buffer)
-	Xfree(dpy->scratch_buffer);
-    dpy->scratch_buffer = buf;
-    dpy->scratch_length = nbytes;
-}
-
-/*
- * Given a visual id, find the visual structure for this id on this display.
- */
-Visual *_XVIDtoVisual (dpy, id)
-	Display *dpy;
-	VisualID id;
-{
-	register int i, j, k;
-	register Screen *sp;
-	register Depth *dp;
-	register Visual *vp;
-	for (i = 0; i < dpy->nscreens; i++) {
-		sp = &dpy->screens[i];
-		for (j = 0; j < sp->ndepths; j++) {
-			dp = &sp->depths[j];
-			/* if nvisuals == 0 then visuals will be NULL */
-			for (k = 0; k < dp->nvisuals; k++) {
-				vp = &dp->visuals[k];
-				if (vp->visualid == id) return (vp);
-			}
-		}
-	}
-	return (NULL);
-}
-
-int
-#if NeedFunctionPrototypes
-XFree (void *data)
-#else
-XFree (data)
-	char *data;
-#endif
-{
-	Xfree (data);
-	return 1;
-}
-
-#ifdef _XNEEDBCOPYFUNC
-void _Xbcopy(b1, b2, length)
-    register char *b1, *b2;
-    register length;
-{
-    if (b1 < b2) {
-	b2 += length;
-	b1 += length;
-	while (length--)
-	    *--b2 = *--b1;
-    } else {
-	while (length--)
-	    *b2++ = *b1++;
-    }
-}
-#endif
-
-#ifdef DataRoutineIsProcedure
-void Data (dpy, data, len)
-	Display *dpy;
-	char *data;
-	long len;
-{
-	if (dpy->bufptr + (len) <= dpy->bufmax) {
-		memcpy(dpy->bufptr, data, (int)len);
-		dpy->bufptr += ((len) + 3) & ~3;
-	} else {
-		_XSend(dpy, data, len);
-	}
-}
-#endif /* DataRoutineIsProcedure */
-
-
-#ifdef LONG64
-int
-_XData32 (dpy, data, len)
-    Display *dpy;
-    register long *data;
-    unsigned len;
-{
-    register int *buf;
-    register long i;
-
-    while (len) {
-	buf = (int *)dpy->bufptr;
-	i = dpy->bufmax - (char *)buf;
-	if (!i) {
-	    _XFlush(dpy);
-	    continue;
-	}
-	if (len < i)
-	    i = len;
-	dpy->bufptr = (char *)buf + i;
-	len -= i;
-	i >>= 2;
-	while (--i >= 0)
-	    *buf++ = *data++;
-    }
-    return 0;
-}
-#endif /* LONG64 */
-
-#ifdef WORD64
-
-/*
- * XXX This is a *really* stupid way of doing this.  It should just use 
- * dpy->bufptr directly, taking into account where in the word it is.
- */
-
-/*
- * Data16 - Place 16 bit data in the buffer.
- *
- * "dpy" is a pointer to a Display.
- * "data" is a pointer to the data.
- * "len" is the length in bytes of the data.
- */
-
-static doData16(dpy, data, len, packbuffer)
-    register Display *dpy;
-    short *data;
-    unsigned len;
-    char *packbuffer;
-{
-    long *lp,*lpack;
-    long i, nwords,bits;
-    long mask16 = 0x000000000000ffff;
-
-        lp = (long *)data;
-        lpack = (long *)packbuffer;
-
-/*  nwords is the number of 16 bit values to be packed,
- *  the low order 16 bits of each word will be packed
- *  into 64 bit words
- */
-        nwords = len >> 1;
-        bits = 48;
-
-        for(i=0;i<nwords;i++){
-	   if (bits == 48) *lpack = 0;
-           *lpack ^= (*lp & mask16) << bits;
-           bits -= 16 ;
-           lp++;
-           if(bits < 0){
-               lpack++;
-               bits = 48;
-           }
-        }
-        Data(dpy, packbuffer, len);
-}
-
-_XData16 (dpy, data, len)
-    Display *dpy;
-    short *data;
-    unsigned len;
-{
-    char packbuffer[PACKBUFFERSIZE];
-    unsigned nunits = PACKBUFFERSIZE >> 1;
-
-    for (; len > PACKBUFFERSIZE; len -= PACKBUFFERSIZE, data += nunits) {
-	doData16 (dpy, data, PACKBUFFERSIZE, packbuffer);
-    }
-    if (len) doData16 (dpy, data, len, packbuffer);
-}
-
-/*
- * Data32 - Place 32 bit data in the buffer.
- *
- * "dpy" is a pointer to a Display.
- * "data" is a pointer to the data.
- * "len" is the length in bytes of the data.
- */
-
-static doData32 (dpy, data, len, packbuffer)
-    register Display *dpy;
-    long *data;
-    unsigned len;
-    char *packbuffer;
-{
-    long *lp,*lpack;
-    long i,bits,nwords;
-    long mask32 = 0x00000000ffffffff;
-
-        lpack = (long *) packbuffer;
-        lp = data;
-
-/*  nwords is the number of 32 bit values to be packed
- *  the low order 32 bits of each word will be packed
- *  into 64 bit words
- */
-        nwords = len >> 2;
-        bits = 32;
-
-        for(i=0;i<nwords;i++){
-	   if (bits == 32) *lpack = 0;
-           *lpack ^= (*lp & mask32) << bits;
-           bits = bits ^32;
-           lp++;
-           if(bits)
-              lpack++;
-        }
-        Data(dpy, packbuffer, len);
-}
-
-_XData32 (dpy, data, len)
-    Display *dpy;
-    long *data;
-    unsigned len;
-{
-    char packbuffer[PACKBUFFERSIZE];
-    unsigned nunits = PACKBUFFERSIZE >> 2;
-
-    for (; len > PACKBUFFERSIZE; len -= PACKBUFFERSIZE, data += nunits) {
-	doData32 (dpy, data, PACKBUFFERSIZE, packbuffer);
-    }
-    if (len) doData32 (dpy, data, len, packbuffer);
-}
-
-#endif /* WORD64 */
-
-
-/* Make sure this produces the same string as DefineLocal/DefineSelf in xdm.
- * Otherwise, Xau will not be able to find your cookies in the Xauthority file.
- *
- * Note: POSIX says that the ``nodename'' member of utsname does _not_ have
- *       to have sufficient information for interfacing to the network,
- *       and so, you may be better off using gethostname (if it exists).
- */
-
-#if (defined(_POSIX_SOURCE) && !defined(AIXV3)) || defined(hpux) || defined(USG) || defined(SVR4)
-#define NEED_UTSNAME
-#include <sys/utsname.h>
-#endif
-
-/*
- * _XGetHostname - similar to gethostname but allows special processing.
- */
-int _XGetHostname (buf, maxlen)
-    char *buf;
-    int maxlen;
-{
-    int len;
-
-#ifdef NEED_UTSNAME
-    struct utsname name;
-
-    if (maxlen <= 0 || buf == NULL)
-	return 0;
-
-    uname (&name);
-    len = strlen (name.nodename);
-    if (len >= maxlen) len = maxlen - 1;
-    strncpy (buf, name.nodename, len);
-    buf[len] = '\0';
-#else
-    if (maxlen <= 0 || buf == NULL)
-	return 0;
-
-    buf[0] = '\0';
-    (void) gethostname (buf, maxlen);
-    buf [maxlen - 1] = '\0';
-    len = strlen(buf);
-#endif /* NEED_UTSNAME */
-    return len;
-}
-
-
-/*
- * _XScreenOfWindow - get the Screen of a given window
- */
-
-Screen *_XScreenOfWindow (dpy, w)
-    Display *dpy;
-    Window w;
-{
-    register int i;
-    Window root;
-    int x, y;				/* dummy variables */
-    unsigned int width, height, bw, depth;  /* dummy variables */
-
-    if (XGetGeometry (dpy, w, &root, &x, &y, &width, &height,
-		      &bw, &depth) == False) {
-	return None;
-    }
-    for (i = 0; i < ScreenCount (dpy); i++) {	/* find root from list */
-	if (root == RootWindow (dpy, i)) {
-	    return ScreenOfDisplay (dpy, i);
-	}
-    }
-    return NULL;
-}
-
-
-#if defined(WIN32)
-
-/*
- * These functions are intended to be used internally to Xlib only.
- * These functions will always prefix the path with a DOS drive in the
- * form "<drive-letter>:". As such, these functions are only suitable
- * for use by Xlib function that supply a root-based path to some
- * particular file, e.g. <ProjectRoot>/lib/X11/locale/locale.dir will
- * be converted to "C:/usr/X11R6.3/lib/X11/locale/locale.dir".
- */
-
-static int access_file (path, pathbuf, len_pathbuf, pathret)
-    char* path;
-    char* pathbuf;
-    int len_pathbuf;
-    char** pathret;
-{
-    if (access (path, F_OK) == 0) {
-	if (strlen (path) < len_pathbuf)
-	    *pathret = pathbuf;
-	else
-	    *pathret = Xmalloc (strlen (path) + 1);
-	if (*pathret) {
-	    strcpy (*pathret, path);
-	    return 1;
-	}
-    }
-    return 0;
-}
-
-static int AccessFile (path, pathbuf, len_pathbuf, pathret)
-    char* path;
-    char* pathbuf;
-    int len_pathbuf;
-    char** pathret;
-{
-    unsigned long drives;
-    int i, len;
-    char* drive;
-    char buf[MAX_PATH];
-    char* bufp;
-
-    /* just try the "raw" name first and see if it works */
-    if (access_file (path, pathbuf, len_pathbuf, pathret))
-	return 1;
-
-    /* try the places set in the environment */
-    drive = getenv ("_XBASEDRIVE");
-#ifdef __EMX__
-    if (!drive)
-	drive = getenv ("X11ROOT");
-#endif
-    if (!drive)
-	drive = "C:";
-    len = strlen (drive) + strlen (path);
-    if (len < MAX_PATH) bufp = buf;
-    else bufp = Xmalloc (len + 1);
-    strcpy (bufp, drive);
-    strcat (bufp, path);
-    if (access_file (bufp, pathbuf, len_pathbuf, pathret)) {
-	if (bufp != buf) Xfree (bufp);
-	return 1;
-    }
-
-#ifndef __EMX__ 
-    /* one last place to look */
-    drive = getenv ("HOMEDRIVE");
-    if (drive) {
-	len = strlen (drive) + strlen (path);
-	if (len < MAX_PATH) bufp = buf;
-	else bufp = Xmalloc (len + 1);
-	strcpy (bufp, drive);
-	strcat (bufp, path);
-	if (access_file (bufp, pathbuf, len_pathbuf, pathret)) {
-	    if (bufp != buf) Xfree (bufp);
-	    return 1;
-	}
-    }
-
-    /* tried everywhere else, go fishing */
-#define C_DRIVE ('C' - 'A')
-#define Z_DRIVE ('Z' - 'A')
-    /* does OS/2 (with or with gcc-emx) have getdrives? */
-    drives = _getdrives ();
-    for (i = C_DRIVE; i <= Z_DRIVE; i++) { /* don't check on A: or B: */
-	if ((1 << i) & drives) {
-	    len = 2 + strlen (path);
-	    if (len < MAX_PATH) bufp = buf;
-	    else bufp = Xmalloc (len + 1);
-	    *bufp = 'A' + i;
-	    *(bufp + 1) = ':';
-	    *(bufp + 2) = '\0';
-	    strcat (bufp, path);
-	    if (access_file (bufp, pathbuf, len_pathbuf, pathret)) {
-		if (bufp != buf) Xfree (bufp);
-		return 1;
-	    }
-	}
-    }
-#endif
-    return 0;
-}
-
-int _XOpenFile(path, flags)
-    _Xconst char* path;
-    int flags;
-{
-    char buf[MAX_PATH];
-    char* bufp;
-    int ret = -1;
-    UINT olderror = SetErrorMode (SEM_FAILCRITICALERRORS);
-
-    if (AccessFile (path, buf, MAX_PATH, &bufp))
-	ret = open (bufp, flags);
-
-    (void) SetErrorMode (olderror);
-
-    if (bufp != buf) Xfree (bufp);
-
-    return ret;
-}
-
-void* _XFopenFile(path, mode)
-    _Xconst char* path;
-    _Xconst char* mode;
-{
-    char buf[MAX_PATH];
-    char* bufp;
-    void* ret = NULL;
-    UINT olderror = SetErrorMode (SEM_FAILCRITICALERRORS);
-
-    if (AccessFile (path, buf, MAX_PATH, &bufp))
-	ret = fopen (bufp, mode);
-
-    (void) SetErrorMode (olderror);
-
-    if (bufp != buf) Xfree (bufp);
-
-    return ret;
-}
-
-int _XAccessFile(path)
-    _Xconst char* path;
-{
-    char buf[MAX_PATH];
-    char* bufp;
-    int ret = -1;
-    UINT olderror = SetErrorMode (SEM_FAILCRITICALERRORS);
-
-    ret = AccessFile (path, buf, MAX_PATH, &bufp);
-
-    (void) SetErrorMode (olderror);
-
-    if (bufp != buf) Xfree (bufp);
-
-    return ret;
-}
-
-#endif
-
diff --git a/xc/lib/X11/Xlibint.h b/xc/lib/X11/Xlibint.h
deleted file mode 100644
index 59d403c36..000000000
--- a/xc/lib/X11/Xlibint.h
+++ /dev/null
@@ -1,1429 +0,0 @@
-/* $TOG: Xlibint.h /main/117 1998/06/17 08:44:01 barstow $ */
-
-/*
-
-Copyright 1984, 1985, 1987, 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/Xlibint.h,v 3.13 1999/05/09 10:50:26 dawes Exp $ */
-
-#ifndef _XLIBINT_H_
-#define _XLIBINT_H_ 1
-
-/*
- *	Xlibint.h - Header definition and support file for the internal
- *	support routines used by the C subroutine interface
- *	library (Xlib) to the X Window System.
- *
- *	Warning, there be dragons here....
- */
-
-#include <X11/Xlib.h>
-#include <X11/Xproto.h>		/* to declare xEvent */
-
-#ifdef WIN32
-#define _XFlush _XFlushIt
-#endif
-
-/*
- * If your BytesReadable correctly detects broken connections, then
- * you should NOT define XCONN_CHECK_FREQ.
- */
-#ifndef XCONN_CHECK_FREQ
-#define XCONN_CHECK_FREQ 256
-#endif
-
-struct _XGC
-{
-    XExtData *ext_data;	/* hook for extension to hang data */
-    GContext gid;	/* protocol ID for graphics context */
-    Bool rects;		/* boolean: TRUE if clipmask is list of rectangles */
-    Bool dashes;	/* boolean: TRUE if dash-list is really a list */
-    unsigned long dirty;/* cache dirty bits */
-    XGCValues values;	/* shadow structure of values */
-};
-
-struct _XDisplay
-{
-	XExtData *ext_data;	/* hook for extension to hang data */
-	struct _XFreeFuncs *free_funcs; /* internal free functions */
-	int fd;			/* Network socket. */
-	int conn_checker;         /* ugly thing used by _XEventsQueued */
-	int proto_major_version;/* maj. version of server's X protocol */
-	int proto_minor_version;/* minor version of server's X protocol */
-	char *vendor;		/* vendor of the server hardware */
-        XID resource_base;	/* resource ID base */
-	XID resource_mask;	/* resource ID mask bits */
-	XID resource_id;	/* allocator current ID */
-	int resource_shift;	/* allocator shift to correct bits */
-	XID (*resource_alloc)(	/* allocator function */
-#if NeedFunctionPrototypes
-		struct _XDisplay*
-#endif
-		);
-	int byte_order;		/* screen byte order, LSBFirst, MSBFirst */
-	int bitmap_unit;	/* padding and data requirements */
-	int bitmap_pad;		/* padding requirements on bitmaps */
-	int bitmap_bit_order;	/* LeastSignificant or MostSignificant */
-	int nformats;		/* number of pixmap formats in list */
-	ScreenFormat *pixmap_format;	/* pixmap format list */
-	int vnumber;		/* Xlib's X protocol version number. */
-	int release;		/* release of the server */
-	struct _XSQEvent *head, *tail;	/* Input event queue. */
-	int qlen;		/* Length of input event queue */
-	unsigned long last_request_read; /* seq number of last event read */
-	unsigned long request;	/* sequence number of last request. */
-	char *last_req;		/* beginning of last request, or dummy */
-	char *buffer;		/* Output buffer starting address. */
-	char *bufptr;		/* Output buffer index pointer. */
-	char *bufmax;		/* Output buffer maximum+1 address. */
-	unsigned max_request_size; /* maximum number 32 bit words in request*/
-	struct _XrmHashBucketRec *db;
-	int (*synchandler)(	/* Synchronization handler */
-#if NeedFunctionPrototypes
-		struct _XDisplay*
-#endif
-		);
-	char *display_name;	/* "host:display" string used on this connect*/
-	int default_screen;	/* default screen for operations */
-	int nscreens;		/* number of screens on this server*/
-	Screen *screens;	/* pointer to list of screens */
-	unsigned long motion_buffer;	/* size of motion buffer */
-	unsigned long flags;	   /* internal connection flags */
-	int min_keycode;	/* minimum defined keycode */
-	int max_keycode;	/* maximum defined keycode */
-	KeySym *keysyms;	/* This server's keysyms */
-	XModifierKeymap *modifiermap;	/* This server's modifier keymap */
-	int keysyms_per_keycode;/* number of rows */
-	char *xdefaults;	/* contents of defaults from server */
-	char *scratch_buffer;	/* place to hang scratch buffer */
-	unsigned long scratch_length;	/* length of scratch buffer */
-	int ext_number;		/* extension number on this display */
-	struct _XExten *ext_procs; /* extensions initialized on this display */
-	/*
-	 * the following can be fixed size, as the protocol defines how
-	 * much address space is available. 
-	 * While this could be done using the extension vector, there
-	 * may be MANY events processed, so a search through the extension
-	 * list to find the right procedure for each event might be
-	 * expensive if many extensions are being used.
-	 */
-	Bool (*event_vec[128])(	/* vector for wire to event */
-		Display *	/* dpy */,
-		XEvent *	/* re */,
-		xEvent *	/* event */
-		);
-	Status (*wire_vec[128])( /* vector for event to wire */
-		Display *	/* dpy */,
-		XEvent *	/* re */,
-		xEvent *	/* event */
-		);
-	KeySym lock_meaning;	   /* for XLookupString */
-	struct _XLockInfo *lock;   /* multi-thread state, display lock */
-	struct _XInternalAsync *async_handlers; /* for internal async */
-	unsigned long bigreq_size; /* max size of big requests */
-	struct _XLockPtrs *lock_fns; /* pointers to threads functions */
-	void (*idlist_alloc)(	   /* XID list allocator function */
-		Display *	/* dpy */,
-		XID *		/* ids */,
-		int		/* count */
-		);
-	/* things above this line should not move, for binary compatibility */
-	struct _XKeytrans *key_bindings; /* for XLookupString */
-	Font cursor_font;	   /* for XCreateFontCursor */
-	struct _XDisplayAtoms *atoms; /* for XInternAtom */
-	unsigned int mode_switch;  /* keyboard group modifiers */
-	unsigned int num_lock;  /* keyboard numlock modifiers */
-	struct _XContextDB *context_db; /* context database */
-	Bool (**error_vec)(	/* vector for wire to error */
-		Display     *	/* display */,
-		XErrorEvent *	/* he */,
-		xError      *	/* we */
-		);
-	/*
-	 * Xcms information
-	 */
-	struct {
-	   XPointer defaultCCCs;  /* pointer to an array of default XcmsCCC */
-	   XPointer clientCmaps;  /* pointer to linked list of XcmsCmapRec */
-	   XPointer perVisualIntensityMaps;
-				  /* linked list of XcmsIntensityMap */
-	} cms;
-	struct _XIMFilter *im_filters;
-	struct _XSQEvent *qfree; /* unallocated event queue elements */
-	unsigned long next_event_serial_num; /* inserted into next queue elt */
-	struct _XExten *flushes; /* Flush hooks */
-	struct _XConnectionInfo *im_fd_info; /* _XRegisterInternalConnection */
-	int im_fd_length;	/* number of im_fd_info */
-	struct _XConnWatchInfo *conn_watchers; /* XAddConnectionWatch */
-	int watcher_count;	/* number of conn_watchers */
-	XPointer filedes;	/* struct pollfd cache for _XWaitForReadable */
-	int (*savedsynchandler)( /* user synchandler when Xlib usurps */
-		Display *	/* dpy */
-		);
-	XID resource_max;	/* allocator max ID */
-	int xcmisc_opcode;	/* major opcode for XC-MISC */
-	struct _XkbInfoRec *xkb_info; /* XKB info */
-	struct _XtransConnInfo *trans_conn; /* transport connection object */
-};
-
-#define XAllocIDs(dpy,ids,n) (*(dpy)->idlist_alloc)(dpy,ids,n)
-
-/*
- * define the following if you want the Data macro to be a procedure instead
- */
-#ifdef CRAY
-#define DataRoutineIsProcedure
-#endif /* CRAY */
-
-#ifndef _XEVENT_
-/*
- * _QEvent datatype for use in input queueing.
- */
-typedef struct _XSQEvent
-{
-    struct _XSQEvent *next;
-    XEvent event;
-    unsigned long qserial_num;	/* so multi-threaded code can find new ones */
-} _XQEvent;
-#endif
-
-#ifdef XTHREADS			/* for xReply */
-#define NEED_REPLIES
-#endif
-
-#if NeedFunctionPrototypes	/* prototypes require event type definitions */
-#define NEED_EVENTS
-#define NEED_REPLIES
-#endif
-#include <X11/Xproto.h>
-#ifdef __sgi
-#define _SGI_MP_SOURCE  /* turn this on to get MP safe errno */
-#endif
-#include <errno.h>
-#define _XBCOPYFUNC _Xbcopy
-#include <X11/Xfuncs.h>
-#include <X11/Xosdefs.h>
-
-/* Utek leaves kernel macros around in include files (bleah) */
-#ifdef dirty
-#undef dirty
-#endif
-
-#ifndef X_NOT_STDC_ENV
-#include <stdlib.h>
-#include <string.h>
-#else
-char *malloc(size_t), *realloc(char *, size_t), *calloc(size_t, size_t);
-void exit(int);
-#ifdef SYSV
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-#endif
-
-/*
- * The following definitions can be used for locking requests in multi-threaded
- * address spaces.
- */
-#ifdef XTHREADS
-/* Author: Stephen Gildea, MIT X Consortium
- *
- * declarations for C Threads locking
- */
-
-#include <X11/Xfuncproto.h>
-
-typedef struct _LockInfoRec *LockInfoPtr;
-
-/* interfaces for locking.c */
-struct _XLockPtrs {
-    /* used by all, including extensions; do not move */
-    void (*lock_display)(
-		Display *dpy
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-		, char *file
-		, int line
-#endif
-	);
-    void (*unlock_display)(
-		Display *dpy
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-		, char *file
-		, int line
-#endif
-	);
-};
-
-#if defined(WIN32) && !defined(_XLIBINT_)
-#define _XCreateMutex_fn (*_XCreateMutex_fn_p)
-#define _XFreeMutex_fn (*_XFreeMutex_fn_p)
-#define _XLockMutex_fn (*_XLockMutex_fn_p)
-#define _XUnlockMutex_fn (*_XUnlockMutex_fn_p)
-#define _Xglobal_lock (*_Xglobal_lock_p)
-#endif
-
-/* in XlibInt.c */
-extern void (*_XCreateMutex_fn)(
-#if NeedFunctionPrototypes
-    LockInfoPtr /* lock */
-#endif
-);
-extern void (*_XFreeMutex_fn)(
-#if NeedFunctionPrototypes
-    LockInfoPtr /* lock */
-#endif
-);
-extern void (*_XLockMutex_fn)(
-#if NeedFunctionPrototypes
-    LockInfoPtr	/* lock */
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-    , char * /* file */
-    , int /* line */
-#endif
-#endif
-);
-extern void (*_XUnlockMutex_fn)(
-#if NeedFunctionPrototypes
-    LockInfoPtr	/* lock */
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-    , char * /* file */
-    , int /* line */
-#endif
-#endif
-);
-
-extern LockInfoPtr _Xglobal_lock;
-
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-#define LockDisplay(d)	     if ((d)->lock_fns) (*(d)->lock_fns->lock_display)((d),__FILE__,__LINE__)
-#define UnlockDisplay(d)     if ((d)->lock_fns) (*(d)->lock_fns->unlock_display)((d),__FILE__,__LINE__)
-#define _XLockMutex(lock)		if (_XLockMutex_fn) (*_XLockMutex_fn)(lock,__FILE__,__LINE__)
-#define _XUnlockMutex(lock)	if (_XUnlockMutex_fn) (*_XUnlockMutex_fn)(lock,__FILE__,__LINE__)
-#else
-/* used everywhere, so must be fast if not using threads */
-#define LockDisplay(d)	     if ((d)->lock_fns) (*(d)->lock_fns->lock_display)(d)
-#define UnlockDisplay(d)     if ((d)->lock_fns) (*(d)->lock_fns->unlock_display)(d)
-#define _XLockMutex(lock)		if (_XLockMutex_fn) (*_XLockMutex_fn)(lock)
-#define _XUnlockMutex(lock)	if (_XUnlockMutex_fn) (*_XUnlockMutex_fn)(lock)
-#endif
-#define _XCreateMutex(lock)	if (_XCreateMutex_fn) (*_XCreateMutex_fn)(lock);
-#define _XFreeMutex(lock)	if (_XFreeMutex_fn) (*_XFreeMutex_fn)(lock);
-
-#else /* XTHREADS */
-#define LockDisplay(dis)
-#define _XLockMutex(lock)
-#define _XUnlockMutex(lock)
-#define UnlockDisplay(dis)
-#define _XCreateMutex(lock)
-#define _XFreeMutex(lock)
-#endif
-
-#define Xfree(ptr) free((ptr))
-
-/*
- * Note that some machines do not return a valid pointer for malloc(0), in
- * which case we provide an alternate under the control of the
- * define MALLOC_0_RETURNS_NULL.  This is necessary because some
- * Xlib code expects malloc(0) to return a valid pointer to storage.
- */
-#ifdef MALLOC_0_RETURNS_NULL
-
-# define Xmalloc(size) malloc(((size) == 0 ? 1 : (size)))
-# define Xrealloc(ptr, size) realloc((ptr), ((size) == 0 ? 1 : (size)))
-# define Xcalloc(nelem, elsize) calloc(((nelem) == 0 ? 1 : (nelem)), (elsize))
-
-#else
-
-# define Xmalloc(size) malloc((size))
-# define Xrealloc(ptr, size) realloc((ptr), (size))
-# define Xcalloc(nelem, elsize) calloc((nelem), (elsize))
-
-#endif
-
-#ifndef NULL
-#define NULL 0
-#endif
-#define LOCKED 1
-#define UNLOCKED 0
-
-#ifdef X_NOT_STDC_ENV
-extern int errno;			/* Internal system error number. */
-#endif
-
-#ifndef BUFSIZE
-#define BUFSIZE 2048			/* X output buffer size. */
-#endif
-#ifndef PTSPERBATCH
-#define PTSPERBATCH 1024		/* point batching */
-#endif
-#ifndef WLNSPERBATCH
-#define WLNSPERBATCH 50			/* wide line batching */
-#endif
-#ifndef ZLNSPERBATCH
-#define ZLNSPERBATCH 1024		/* thin line batching */
-#endif
-#ifndef WRCTSPERBATCH
-#define WRCTSPERBATCH 10		/* wide line rectangle batching */
-#endif
-#ifndef ZRCTSPERBATCH
-#define ZRCTSPERBATCH 256		/* thin line rectangle batching */
-#endif
-#ifndef FRCTSPERBATCH
-#define FRCTSPERBATCH 256		/* filled rectangle batching */
-#endif
-#ifndef FARCSPERBATCH
-#define FARCSPERBATCH 256		/* filled arc batching */
-#endif
-#ifndef CURSORFONT
-#define CURSORFONT "cursor"		/* standard cursor fonts */
-#endif
-
-/*
- * Display flags
- */
-#define XlibDisplayIOError	(1L << 0)
-#define XlibDisplayClosing	(1L << 1)
-#define XlibDisplayNoXkb	(1L << 2)
-#define XlibDisplayPrivSync	(1L << 3)
-#define XlibDisplayProcConni	(1L << 4) /* in _XProcessInternalConnection */
-#define XlibDisplayReadEvents	(1L << 5) /* in _XReadEvents */
-#define XlibDisplayReply	(1L << 5) /* in _XReply */
-#define XlibDisplayWriting	(1L << 6) /* in _XFlushInt, _XSend */
-
-/*
- * X Protocol packetizing macros.
- */
-
-/*   Need to start requests on 64 bit word boundaries
- *   on a CRAY computer so add a NoOp (127) if needed.
- *   A character pointer on a CRAY computer will be non-zero
- *   after shifting right 61 bits of it is not pointing to
- *   a word boundary.
- */
-#ifdef WORD64
-#define WORD64ALIGN if ((long)dpy->bufptr >> 61) {\
-           dpy->last_req = dpy->bufptr;\
-           *(dpy->bufptr)   = X_NoOperation;\
-           *(dpy->bufptr+1) =  0;\
-           *(dpy->bufptr+2) =  0;\
-           *(dpy->bufptr+3) =  1;\
-             dpy->request++;\
-             dpy->bufptr += 4;\
-         }
-#else /* else does not require alignment on 64-bit boundaries */
-#define WORD64ALIGN
-#endif /* WORD64 */
-
-
-/*
- * GetReq - Get the next available X request packet in the buffer and
- * return it. 
- *
- * "name" is the name of the request, e.g. CreatePixmap, OpenFont, etc.
- * "req" is the name of the request pointer.
- *
- */
-
-#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
-#define GetReq(name, req) \
-        WORD64ALIGN\
-	if ((dpy->bufptr + SIZEOF(x##name##Req)) > dpy->bufmax)\
-		_XFlush(dpy);\
-	req = (x##name##Req *)(dpy->last_req = dpy->bufptr);\
-	req->reqType = X_##name;\
-	req->length = (SIZEOF(x##name##Req))>>2;\
-	dpy->bufptr += SIZEOF(x##name##Req);\
-	dpy->request++
-
-#else  /* non-ANSI C uses empty comment instead of "##" for token concatenation */
-#define GetReq(name, req) \
-        WORD64ALIGN\
-	if ((dpy->bufptr + SIZEOF(x/**/name/**/Req)) > dpy->bufmax)\
-		_XFlush(dpy);\
-	req = (x/**/name/**/Req *)(dpy->last_req = dpy->bufptr);\
-	req->reqType = X_/**/name;\
-	req->length = (SIZEOF(x/**/name/**/Req))>>2;\
-	dpy->bufptr += SIZEOF(x/**/name/**/Req);\
-	dpy->request++
-#endif
-
-/* GetReqExtra is the same as GetReq, but allocates "n" additional
-   bytes after the request. "n" must be a multiple of 4!  */
-
-#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
-#define GetReqExtra(name, n, req) \
-        WORD64ALIGN\
-	if ((dpy->bufptr + SIZEOF(x##name##Req) + n) > dpy->bufmax)\
-		_XFlush(dpy);\
-	req = (x##name##Req *)(dpy->last_req = dpy->bufptr);\
-	req->reqType = X_##name;\
-	req->length = (SIZEOF(x##name##Req) + n)>>2;\
-	dpy->bufptr += SIZEOF(x##name##Req) + n;\
-	dpy->request++
-#else
-#define GetReqExtra(name, n, req) \
-        WORD64ALIGN\
-	if ((dpy->bufptr + SIZEOF(x/**/name/**/Req) + n) > dpy->bufmax)\
-		_XFlush(dpy);\
-	req = (x/**/name/**/Req *)(dpy->last_req = dpy->bufptr);\
-	req->reqType = X_/**/name;\
-	req->length = (SIZEOF(x/**/name/**/Req) + n)>>2;\
-	dpy->bufptr += SIZEOF(x/**/name/**/Req) + n;\
-	dpy->request++
-#endif
-
-
-/*
- * GetResReq is for those requests that have a resource ID 
- * (Window, Pixmap, GContext, etc.) as their single argument.
- * "rid" is the name of the resource. 
- */
-
-#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
-#define GetResReq(name, rid, req) \
-        WORD64ALIGN\
-	if ((dpy->bufptr + SIZEOF(xResourceReq)) > dpy->bufmax)\
-	    _XFlush(dpy);\
-	req = (xResourceReq *) (dpy->last_req = dpy->bufptr);\
-	req->reqType = X_##name;\
-	req->length = 2;\
-	req->id = (rid);\
-	dpy->bufptr += SIZEOF(xResourceReq);\
-	dpy->request++
-#else
-#define GetResReq(name, rid, req) \
-        WORD64ALIGN\
-	if ((dpy->bufptr + SIZEOF(xResourceReq)) > dpy->bufmax)\
-	    _XFlush(dpy);\
-	req = (xResourceReq *) (dpy->last_req = dpy->bufptr);\
-	req->reqType = X_/**/name;\
-	req->length = 2;\
-	req->id = (rid);\
-	dpy->bufptr += SIZEOF(xResourceReq);\
-	dpy->request++
-#endif
-
-/*
- * GetEmptyReq is for those requests that have no arguments
- * at all. 
- */
-#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
-#define GetEmptyReq(name, req) \
-        WORD64ALIGN\
-	if ((dpy->bufptr + SIZEOF(xReq)) > dpy->bufmax)\
-	    _XFlush(dpy);\
-	req = (xReq *) (dpy->last_req = dpy->bufptr);\
-	req->reqType = X_##name;\
-	req->length = 1;\
-	dpy->bufptr += SIZEOF(xReq);\
-	dpy->request++
-#else
-#define GetEmptyReq(name, req) \
-        WORD64ALIGN\
-	if ((dpy->bufptr + SIZEOF(xReq)) > dpy->bufmax)\
-	    _XFlush(dpy);\
-	req = (xReq *) (dpy->last_req = dpy->bufptr);\
-	req->reqType = X_/**/name;\
-	req->length = 1;\
-	dpy->bufptr += SIZEOF(xReq);\
-	dpy->request++
-#endif
-
-#ifdef WORD64
-#define MakeBigReq(req,n) \
-    { \
-    char _BRdat[4]; \
-    unsigned long _BRlen = req->length - 1; \
-    req->length = 0; \
-    memcpy(_BRdat, ((char *)req) + (_BRlen << 2), 4); \
-    memmove(((char *)req) + 8, ((char *)req) + 4, _BRlen << 2); \
-    memcpy(((char *)req) + 4, _BRdat, 4); \
-    Data32(dpy, (long *)&_BRdat, 4); \
-    }
-#else
-#define MakeBigReq(req,n) \
-    { \
-    CARD32 _BRdat; \
-    CARD32 _BRlen = req->length - 1; \
-    req->length = 0; \
-    _BRdat = ((CARD32 *)req)[_BRlen]; \
-    memmove(((char *)req) + 8, ((char *)req) + 4, _BRlen << 2); \
-    ((CARD32 *)req)[1] = _BRlen + n + 2; \
-    Data32(dpy, &_BRdat, 4); \
-    }
-#endif
-
-#define SetReqLen(req,n,badlen) \
-    if ((req->length + n) > (unsigned)65535) { \
-	if (dpy->bigreq_size) { \
-	    MakeBigReq(req,n) \
-	} else { \
-	    n = badlen; \
-	    req->length += n; \
-	} \
-    } else \
-	req->length += n
-
-#define SyncHandle() \
-	if (dpy->synchandler) (*dpy->synchandler)(dpy)
-
-extern void _XFlushGCCache(Display *dpy, GC gc);
-#define FlushGC(dpy, gc) \
-	if ((gc)->dirty) _XFlushGCCache((dpy), (gc))
-/*
- * Data - Place data in the buffer and pad the end to provide
- * 32 bit word alignment.  Transmit if the buffer fills.
- *
- * "dpy" is a pointer to a Display.
- * "data" is a pinter to a data buffer.
- * "len" is the length of the data buffer.
- */
-#ifndef DataRoutineIsProcedure
-#define Data(dpy, data, len) \
-	if (dpy->bufptr + (len) <= dpy->bufmax) {\
-		memcpy(dpy->bufptr, data, (int)len);\
-		dpy->bufptr += ((len) + 3) & ~3;\
-	} else\
-		_XSend(dpy, data, len)
-#endif /* DataRoutineIsProcedure */
-
-
-/* Allocate bytes from the buffer.  No padding is done, so if
- * the length is not a multiple of 4, the caller must be
- * careful to leave the buffer aligned after sending the
- * current request.
- *
- * "type" is the type of the pointer being assigned to.
- * "ptr" is the pointer being assigned to.
- * "n" is the number of bytes to allocate.
- *
- * Example: 
- *    xTextElt *elt;
- *    BufAlloc (xTextElt *, elt, nbytes)
- */
-
-#define BufAlloc(type, ptr, n) \
-    if (dpy->bufptr + (n) > dpy->bufmax) \
-        _XFlush (dpy); \
-    ptr = (type) dpy->bufptr; \
-    dpy->bufptr += (n);
-
-#ifdef WORD64
-#define Data16(dpy, data, len) _XData16(dpy, (short *)data, len)
-#define Data32(dpy, data, len) _XData32(dpy, (long *)data, len)
-#else
-#define Data16(dpy, data, len) Data((dpy), (char *)(data), (len))
-#define _XRead16Pad(dpy, data, len) _XReadPad((dpy), (char *)(data), (len))
-#define _XRead16(dpy, data, len) _XRead((dpy), (char *)(data), (len))
-#ifdef LONG64
-#define Data32(dpy, data, len) _XData32(dpy, (long *)data, len)
-extern int _XData32(
-#if NeedFunctionPrototypes
-	     Display *dpy,
-	     register long *data,
-	     unsigned len
-#endif
-);
-extern void _XRead32(
-#if NeedFunctionPrototypes
-	     Display *dpy,
-	     register long *data,
-	     long len
-#endif
-);
-#else
-#define Data32(dpy, data, len) Data((dpy), (char *)(data), (len))
-#define _XRead32(dpy, data, len) _XRead((dpy), (char *)(data), (len))
-#endif
-#endif /* not WORD64 */
-
-#define PackData16(dpy,data,len) Data16 (dpy, data, len)
-#define PackData32(dpy,data,len) Data32 (dpy, data, len)
-
-/* Xlib manual is bogus */
-#define PackData(dpy,data,len) PackData16 (dpy, data, len)
-
-#define min(a,b) (((a) < (b)) ? (a) : (b))
-#define max(a,b) (((a) > (b)) ? (a) : (b))
-
-#define CI_NONEXISTCHAR(cs) (((cs)->width == 0) && \
-			     (((cs)->rbearing|(cs)->lbearing| \
-			       (cs)->ascent|(cs)->descent) == 0))
-
-/* 
- * CI_GET_CHAR_INFO_1D - return the charinfo struct for the indicated 8bit
- * character.  If the character is in the column and exists, then return the
- * appropriate metrics (note that fonts with common per-character metrics will
- * return min_bounds).  If none of these hold true, try again with the default
- * char.
- */
-#define CI_GET_CHAR_INFO_1D(fs,col,def,cs) \
-{ \
-    cs = def; \
-    if (col >= fs->min_char_or_byte2 && col <= fs->max_char_or_byte2) { \
-	if (fs->per_char == NULL) { \
-	    cs = &fs->min_bounds; \
-	} else { \
-	    cs = &fs->per_char[(col - fs->min_char_or_byte2)]; \
-	    if (CI_NONEXISTCHAR(cs)) cs = def; \
-	} \
-    } \
-}
-
-#define CI_GET_DEFAULT_INFO_1D(fs,cs) \
-  CI_GET_CHAR_INFO_1D (fs, fs->default_char, NULL, cs)
-
-
-
-/*
- * CI_GET_CHAR_INFO_2D - return the charinfo struct for the indicated row and 
- * column.  This is used for fonts that have more than row zero.
- */
-#define CI_GET_CHAR_INFO_2D(fs,row,col,def,cs) \
-{ \
-    cs = def; \
-    if (row >= fs->min_byte1 && row <= fs->max_byte1 && \
-	col >= fs->min_char_or_byte2 && col <= fs->max_char_or_byte2) { \
-	if (fs->per_char == NULL) { \
-	    cs = &fs->min_bounds; \
-	} else { \
-	    cs = &fs->per_char[((row - fs->min_byte1) * \
-			        (fs->max_char_or_byte2 - \
-				 fs->min_char_or_byte2 + 1)) + \
-			       (col - fs->min_char_or_byte2)]; \
-	    if (CI_NONEXISTCHAR(cs)) cs = def; \
-        } \
-    } \
-}
-
-#define CI_GET_DEFAULT_INFO_2D(fs,cs) \
-{ \
-    unsigned int r = (fs->default_char >> 8); \
-    unsigned int c = (fs->default_char & 0xff); \
-    CI_GET_CHAR_INFO_2D (fs, r, c, NULL, cs); \
-}
-
-
-#ifdef MUSTCOPY
-
-/* for when 32-bit alignment is not good enough */
-#define OneDataCard32(dpy,dstaddr,srcvar) \
-  { dpy->bufptr -= 4; Data32 (dpy, (char *) &(srcvar), 4); }
-
-#else
-
-/* srcvar must be a variable for large architecture version */
-#define OneDataCard32(dpy,dstaddr,srcvar) \
-  { *(CARD32 *)(dstaddr) = (srcvar); }
-
-#endif /* MUSTCOPY */
-
-typedef struct _XInternalAsync {
-    struct _XInternalAsync *next;
-    /*
-     * handler arguments:
-     * rep is the generic reply that caused this handler
-     * to be invoked.  It must also be passed to _XGetAsyncReply.
-     * buf and len are opaque values that must be passed to
-     * _XGetAsyncReply or _XGetAsyncData.
-     * data is the closure stored in this struct.
-     * The handler returns True iff it handled this reply.
-     */
-    Bool (*handler)(
-#if NeedNestedPrototypes
-		    Display*	/* dpy */,
-		    xReply*	/* rep */,
-		    char*	/* buf */,
-		    int		/* len */,
-		    XPointer	/* data */
-#endif
-		    );
-    XPointer data;
-} _XAsyncHandler;
-
-typedef struct _XAsyncEState {
-    unsigned long min_sequence_number;
-    unsigned long max_sequence_number;
-    unsigned char error_code;
-    unsigned char major_opcode;
-    unsigned short minor_opcode;
-    unsigned char last_error_received;
-    int error_count;
-} _XAsyncErrorState;
-
-extern void _XDeqAsyncHandler(Display *dpy, _XAsyncHandler *handler);
-#define DeqAsyncHandler(dpy,handler) { \
-    if (dpy->async_handlers == (handler)) \
-	dpy->async_handlers = (handler)->next; \
-    else \
-	_XDeqAsyncHandler(dpy, handler); \
-    }
-
-typedef void (*FreeFuncType) (
-#if NeedFunctionPrototypes
-    Display*	/* display */
-#endif
-);
-
-typedef int (*FreeModmapType) (
-#if NeedFunctionPrototypes
-    XModifierKeymap*	/* modmap */
-#endif
-);
-
-/*
- * This structure is private to the library.
- */
-typedef struct _XFreeFuncs {
-    FreeFuncType atoms;		/* _XFreeAtomTable */
-    FreeModmapType modifiermap;	/* XFreeModifierMap */
-    FreeFuncType key_bindings;	/* _XFreeKeyBindings */
-    FreeFuncType context_db;	/* _XFreeContextDB */
-    FreeFuncType defaultCCCs;	/* _XcmsFreeDefaultCCCs */
-    FreeFuncType clientCmaps;	/* _XcmsFreeClientCmaps */
-    FreeFuncType intensityMaps;	/* _XcmsFreeIntensityMaps */
-    FreeFuncType im_filters;	/* _XFreeIMFilters */
-    FreeFuncType xkb;		/* _XkbFreeInfo */
-} _XFreeFuncRec;
-
-/* types for InitExt.c */
-typedef int (*CreateGCType) (
-#if NeedFunctionPrototypes
-    Display*	/* display */,
-    GC		/* gc */,
-    XExtCodes*	/* codes */
-#endif
-);
-
-typedef int (*CopyGCType)(
-#if NeedFunctionPrototypes
-    Display*	/* display */,
-    GC		/* gc */,
-    XExtCodes*	/* codes */
-#endif
-);
-
-typedef int (*FlushGCType) (
-#if NeedFunctionPrototypes
-    Display*	/* display */,
-    GC		/* gc */,
-    XExtCodes*	/* codes */
-#endif
-);
-
-typedef int (*FreeGCType) (
-#if NeedFunctionPrototypes
-    Display*	/* display */,
-    GC		/* gc */,
-    XExtCodes*	/* codes */
-#endif
-);
-
-typedef int (*CreateFontType) (
-#if NeedFunctionPrototypes
-    Display*	/* display */,
-    XFontStruct* /* fs */,
-    XExtCodes*	/* codes */
-#endif
-);
-
-typedef int (*FreeFontType) (
-#if NeedFunctionPrototypes
-    Display*	/* display */,
-    XFontStruct* /* fs */,
-    XExtCodes*	/* codes */
-#endif
-);
-
-typedef int (*CloseDisplayType) (
-#if NeedFunctionPrototypes
-    Display*	/* display */,
-    XExtCodes*	/* codes */
-#endif
-);
-
-typedef int (*ErrorType) (
-#if NeedFunctionPrototypes
-    Display*	/* display */,
-    xError*	/* err */,
-    XExtCodes*	/* codes */,
-    int*	/* ret_code */
-#endif
-);
-
-typedef char* (*ErrorStringType) (
-#if NeedFunctionPrototypes
-    Display*	/* display */,
-    int		/* code */,
-    XExtCodes*	/* codes */,
-    char*	/* buffer */,
-    int		/* nbytes */
-#endif
-);
-
-typedef void (*PrintErrorType)(
-#if NeedFunctionPrototypes
-    Display*	/* display */,
-    XErrorEvent* /* ev */,
-    void*	/* fp */
-#endif
-);
-
-typedef void (*BeforeFlushType)(
-#if NeedFunctionPrototypes
-    Display*	/* display */,
-    XExtCodes*	/* codes */,
-    char*	/* data */,
-    long	/* len */
-#endif
-);
-
-/*
- * This structure is private to the library.
- */
-typedef struct _XExten {		/* private to extension mechanism */
-	struct _XExten *next;		/* next in list */
-	XExtCodes codes;		/* public information, all extension told */
-	CreateGCType create_GC;		/* routine to call when GC created */
-	CopyGCType copy_GC;		/* routine to call when GC copied */
-	FlushGCType flush_GC;		/* routine to call when GC flushed */
-	FreeGCType free_GC;		/* routine to call when GC freed */
-	CreateFontType create_Font;	/* routine to call when Font created */
-	FreeFontType free_Font;		/* routine to call when Font freed */
-	CloseDisplayType close_display;	/* routine to call when connection closed */
-	ErrorType error;		/* who to call when an error occurs */
-	ErrorStringType error_string;	/* routine to supply error string */
-	char *name;			/* name of this extension */
-	PrintErrorType error_values;	/* routine to supply error values */
-	BeforeFlushType before_flush;	/* routine to call when sending data */
-	struct _XExten *next_flush;	/* next in list of those with flushes */
-} _XExtension;
-
-/* extension hooks */
-
-_XFUNCPROTOBEGIN
-
-#ifdef DataRoutineIsProcedure
-extern void Data(Display *dpy, char *data, long len);
-#endif
-extern int _XError(
-#if NeedFunctionPrototypes
-    Display*	/* dpy */,
-    xError*	/* rep */
-#endif
-);
-extern int _XIOError(
-#if NeedFunctionPrototypes
-    Display*	/* dpy */
-#endif
-);
-extern int (*_XIOErrorFunction)(
-#if NeedNestedPrototypes
-    Display*	/* dpy */
-#endif
-);
-extern int (*_XErrorFunction)(
-#if NeedNestedPrototypes
-    Display*		/* dpy */,
-    XErrorEvent*	/* error_event */
-#endif
-);
-extern void _XEatData(
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    unsigned long	/* n */
-#endif
-);
-extern char *_XAllocScratch(
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    unsigned long	/* nbytes */
-#endif
-);
-extern char *_XAllocTemp(
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    unsigned long	/* nbytes */
-#endif
-);
-extern void _XFreeTemp(
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    char*		/* buf */,
-    unsigned long	/* nbytes */
-#endif
-);
-extern Visual *_XVIDtoVisual(
-#if NeedFunctionPrototypes
-    Display*	/* dpy */,
-    VisualID	/* id */
-#endif
-);
-extern unsigned long _XSetLastRequestRead(
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    xGenericReply*	/* rep */
-#endif
-);
-extern int _XGetHostname(
-#if NeedFunctionPrototypes
-    char*	/* buf */,
-    int		/* maxlen */
-#endif
-);
-extern Screen *_XScreenOfWindow(
-#if NeedFunctionPrototypes
-    Display*	/* dpy */,
-    Window	/* w */
-#endif
-);
-extern Bool _XAsyncErrorHandler(
-#if NeedFunctionPrototypes
-    Display*	/* dpy */,
-    xReply*	/* rep */,
-    char*	/* buf */,
-    int		/* len */,
-    XPointer	/* data */
-#endif
-);
-extern char *_XGetAsyncReply(
-#if NeedFunctionPrototypes
-    Display*	/* dpy */,
-    char*	/* replbuf */,
-    xReply*	/* rep */,
-    char*	/* buf */,
-    int		/* len */,
-    int		/* extra */,
-    Bool	/* discard */
-#endif
-);
-extern void _XFlush(
-#if NeedFunctionPrototypes
-    Display*	/* dpy */
-#endif
-);
-extern int _XEventsQueued(
-#if NeedFunctionPrototypes
-    Display*	/* dpy */,
-    int 	/* mode */
-#endif
-);
-extern void _XReadEvents(
-#if NeedFunctionPrototypes
-    Display*	/* dpy */
-#endif
-);
-extern int _XRead(
-#if NeedFunctionPrototypes
-    Display*	/* dpy */,
-    char*	/* data */,
-    long	/* size */
-#endif
-);
-extern void _XReadPad(
-#if NeedFunctionPrototypes
-    Display*	/* dpy */,
-    char*	/* data */,
-    long	/* size */
-#endif
-);
-extern void _XSend(
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    _Xconst char*	/* data */,
-    long		/* size */
-#endif
-);
-extern Status _XReply(
-#if NeedFunctionPrototypes
-    Display*	/* dpy */,
-    xReply*	/* rep */,
-    int		/* extra */,
-    Bool	/* discard */
-#endif
-);
-extern void _XEnq(
-#if NeedFunctionPrototypes
-    Display*	/* dpy */,
-    xEvent*	/* event */
-#endif
-);
-extern void _XDeq(
-#if NeedFunctionPrototypes
-    Display*	/* dpy */,
-    _XQEvent*	/* prev */,
-    _XQEvent*	/* qelt */
-#endif
-);
-
-extern int (*XESetCreateGC(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* extension */,
-    int (*) (
-#if NeedNestedPrototypes
-	      Display*			/* display */,
-	      GC			/* gc */,
-	      XExtCodes*		/* codes */
-#endif
-	    )		/* proc */
-#endif
-))(
-#if NeedNestedPrototypes
-    Display*, GC, XExtCodes*
-#endif
-);
-
-extern int (*XESetCopyGC(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* extension */,
-    int (*) (
-#if NeedNestedPrototypes
-	      Display*			/* display */,
-              GC			/* gc */,
-              XExtCodes*		/* codes */
-#endif
-            )		/* proc */	      
-#endif
-))(
-#if NeedNestedPrototypes
-    Display*, GC, XExtCodes*
-#endif
-);
-
-extern int (*XESetFlushGC(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* extension */,
-    int (*) (
-#if NeedNestedPrototypes
-	      Display*			/* display */,
-              GC			/* gc */,
-              XExtCodes*		/* codes */
-#endif
-            )		/* proc */	     
-#endif
-))(
-#if NeedNestedPrototypes
-    Display*, GC, XExtCodes*
-#endif
-);
-
-extern int (*XESetFreeGC(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* extension */,
-    int (*) (
-#if NeedNestedPrototypes
-	      Display*			/* display */,
-              GC			/* gc */,
-              XExtCodes*		/* codes */
-#endif
-            )		/* proc */	     
-#endif
-))(
-#if NeedNestedPrototypes
-    Display*, GC, XExtCodes*
-#endif
-);
-
-extern int (*XESetCreateFont(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* extension */,
-    int (*) (
-#if NeedNestedPrototypes
-	      Display*			/* display */,
-              XFontStruct*		/* fs */,
-              XExtCodes*		/* codes */
-#endif
-            )		/* proc */    
-#endif
-))(
-#if NeedNestedPrototypes
-    Display*, XFontStruct*, XExtCodes*
-#endif
-);
-
-extern int (*XESetFreeFont(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* extension */,
-    int (*) (
-#if NeedNestedPrototypes
-	      Display*			/* display */,
-              XFontStruct*		/* fs */,
-              XExtCodes*		/* codes */
-#endif
-            )		/* proc */    
-#endif
-))(
-#if NeedNestedPrototypes
-    Display*, XFontStruct*, XExtCodes*
-#endif
-); 
-
-extern int (*XESetCloseDisplay(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* extension */,
-    int (*) (
-#if NeedNestedPrototypes
-	      Display*			/* display */,
-              XExtCodes*		/* codes */
-#endif
-            )		/* proc */    
-#endif
-))(
-#if NeedNestedPrototypes
-    Display*, XExtCodes*
-#endif
-);
-
-extern int (*XESetError(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* extension */,
-    int (*) (
-#if NeedNestedPrototypes
-	      Display*			/* display */,
-              xError*			/* err */,
-              XExtCodes*		/* codes */,
-              int*			/* ret_code */
-#endif
-            )		/* proc */    
-#endif
-))(
-#if NeedNestedPrototypes
-    Display*, xError*, XExtCodes*, int*
-#endif
-);
-
-extern char* (*XESetErrorString(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* extension */,
-    char* (*) (
-#if NeedNestedPrototypes
-	        Display*		/* display */,
-                int			/* code */,
-                XExtCodes*		/* codes */,
-                char*			/* buffer */,
-                int			/* nbytes */
-#endif
-              )		/* proc */	       
-#endif
-))(
-#if NeedNestedPrototypes
-    Display*, int, XExtCodes*, char*, int
-#endif
-);
-
-extern void (*XESetPrintErrorValues (
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* extension */,
-    void (*)(
-#if NeedNestedPrototypes
-	      Display*			/* display */,
-	      XErrorEvent*		/* ev */,
-	      void*			/* fp */
-#endif
-	     )		/* proc */
-#endif
-))(
-#if NeedNestedPrototypes
-    Display*, XErrorEvent*, void*
-#endif
-);
-
-extern Bool (*XESetWireToEvent(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* event_number */,
-    Bool (*) (
-#if NeedNestedPrototypes
-	       Display*			/* display */,
-               XEvent*			/* re */,
-               xEvent*			/* event */
-#endif
-             )		/* proc */    
-#endif
-))(
-#if NeedNestedPrototypes
-    Display*, XEvent*, xEvent*
-#endif
-);
-
-extern Status (*XESetEventToWire(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* event_number */,
-    Status (*) (
-#if NeedNestedPrototypes
-	      Display*			/* display */,
-              XEvent*			/* re */,
-              xEvent*			/* event */
-#endif
-            )		/* proc */   
-#endif
-))(
-#if NeedNestedPrototypes
-    Display*, XEvent*, xEvent*
-#endif
-);
-
-extern Bool (*XESetWireToError(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* error_number */,
-    Bool (*) (
-#if NeedNestedPrototypes
-	       Display*			/* display */,
-	       XErrorEvent*		/* he */,
-	       xError*			/* we */
-#endif
-            )		/* proc */   
-#endif
-))(
-#if NeedNestedPrototypes
-    Display*, XErrorEvent*, xError*
-#endif
-);
-
-extern void (*XESetBeforeFlush(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* error_number */,
-    void (*) (
-#if NeedNestedPrototypes
-	       Display*			/* display */,
-	       XExtCodes*		/* codes */,
-	       char*			/* data */,
-	       long			/* len */
-#endif
-            )		/* proc */   
-#endif
-))(
-#if NeedNestedPrototypes
-    Display*, XExtCodes*, char*, long
-#endif
-);
-
-/* internal connections for IMs */
-
-typedef void (*_XInternalConnectionProc)(
-#if NeedFunctionPrototypes
-    Display*			/* dpy */,
-    int				/* fd */,
-    XPointer			/* call_data */
-#endif
-);
-
-
-extern Status _XRegisterInternalConnection(
-#if NeedFunctionPrototypes
-    Display*			/* dpy */,
-    int				/* fd */,
-    _XInternalConnectionProc	/* callback */,
-    XPointer			/* call_data */
-#endif
-);
-
-extern void _XUnregisterInternalConnection(
-#if NeedFunctionPrototypes
-    Display*			/* dpy */,
-    int				/* fd */
-#endif
-);
-
-/* Display structure has pointers to these */
-
-struct _XConnectionInfo {	/* info from _XRegisterInternalConnection */
-    int fd;
-    _XInternalConnectionProc read_callback;
-    XPointer call_data;
-    XPointer *watch_data;	/* set/used by XConnectionWatchProc */
-    struct _XConnectionInfo *next;
-};
-
-struct _XConnWatchInfo {	/* info from XAddConnectionWatch */
-    XConnectionWatchProc fn;
-    XPointer client_data;
-    struct _XConnWatchInfo *next;
-};
-
-#ifdef __EMX__
-extern char* __XOS2RedirRoot(
-#if NeedFunctionPrototypes
-    char*
-#endif
-);
-#endif
-
-extern int _XTextHeight(
-#if NeedFunctionPrototypes
-    XFontStruct*	/* font_struct */,
-    _Xconst char*	/* string */,
-    int			/* count */
-#endif
-);
-
-extern int _XTextHeight16(
-#if NeedFunctionPrototypes
-    XFontStruct*	/* font_struct */,
-    _Xconst XChar2b*	/* string */,
-    int			/* count */
-#endif
-);
-
-#if defined(WIN32)
-
-extern int _XOpenFile(
-#if NeedFunctionPrototypes
-    _Xconst char*	/* path */,
-    int			/* flags */
-#endif
-);
-
-extern void* _XFopenFile(
-#if NeedFunctionPrototypes
-    _Xconst char*	/* path */,
-    _Xconst char*	/* mode */
-#endif
-);
-
-extern int _XAccessFile(
-#if NeedFunctionPrototypes
-    _Xconst char*	/* path */
-#endif
-);
-#else
-#define _XOpenFile(path,flags) open(path,flags)
-#define _XFopenFile(path,mode) fopen(path,mode)
-#endif
-
-_XFUNCPROTOEND
-
-#endif /* _XLIBINT_H_ */
diff --git a/xc/lib/X11/Xlocale.h b/xc/lib/X11/Xlocale.h
deleted file mode 100644
index de1b6bd9b..000000000
--- a/xc/lib/X11/Xlocale.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* $TOG: Xlocale.h /main/11 1998/02/06 18:02:56 kaleb $ */
-/*
-
-Copyright 1991, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-#ifndef _XLOCALE_H_
-#define _XLOCALE_H_
-
-#include <X11/Xfuncproto.h>
-#include <X11/Xosdefs.h>
-
-#ifndef X_LOCALE
-#ifdef X_NOT_STDC_ENV
-#define X_LOCALE
-#endif
-#endif
-
-#ifndef X_LOCALE
-#include <locale.h>
-#else
-
-#define LC_ALL      0
-#define LC_COLLATE  1
-#define LC_CTYPE    2
-#define LC_MONETARY 3
-#define LC_NUMERIC  4
-#define LC_TIME     5
-
-_XFUNCPROTOBEGIN
-extern char *_Xsetlocale(
-#if NeedFunctionPrototypes
-    int /* category */,
-    _Xconst char* /* name */
-#endif
-);
-_XFUNCPROTOEND
-
-#define setlocale _Xsetlocale
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-#endif /* X_LOCALE */
-
-#endif /* _XLOCALE_H_ */
diff --git a/xc/lib/X11/XomGeneric.h b/xc/lib/X11/XomGeneric.h
deleted file mode 100644
index 0b1083db6..000000000
--- a/xc/lib/X11/XomGeneric.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/* $XConsortium: XomGeneric.h /main/4 1996/12/05 10:40:15 swick $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-/*
- * Copyright 1995 by FUJITSU LIMITED
- * This is source code modified by FUJITSU LIMITED under the Joint
- * Development Agreement for the CDE/Motif PST.
- *
- * Modifier: Takanori Tateno   FUJITSU LIMITED
- *
- */
-
-#ifndef _XOMGENERIC_H_
-#define _XOMGENERIC_H_
-
-#include "XlcPublic.h"
-
-#define XOM_GENERIC(om)		(&((XOMGeneric) om)->gen)
-#define XOC_GENERIC(font_set)	(&((XOCGeneric) font_set)->gen)
-
-/* For VW/UDC */
-typedef struct _CodeRangeRec {
-    unsigned long       start;
-    unsigned long       end;
-    unsigned long       dmy1;
-    unsigned long       dmy2;
-} CodeRangeRec, *CodeRange;
-
-typedef struct _VRotateRec {
-    char        *charset_name;  /* Charset name                         */
-    XlcSide     side;           /* Encoding side                        */
-    int         num_cr;
-    CodeRange   code_range;
-    char        *xlfd_name;
-    XFontStruct *font;
-} VRotateRec, *VRotate;
-
-typedef enum {
-    XOMMultiByte,
-    XOMWideChar
-} XOMTextType;
-
-typedef struct _FontDataRec {
-    char 	*name;
-    XlcSide 	side;
-    /* For VW/UDC */
-    int       	scopes_num;
-    FontScope 	scopes;
-    char      	*xlfd_name;
-    XFontStruct *font;
-} FontDataRec, *FontData;
-
-#define VROTATE_NONE   0
-#define VROTATE_PART   1
-#define VROTATE_ALL    2
-
-typedef struct _OMDataRec {
-    int 	charset_count;
-    XlcCharSet 	*charset_list;
-    int 	font_data_count;
-    FontData 	font_data;
-    /* For VW/UDC */
-    int substitute_num;
-    FontData substitute;
-    /* Vertical Writing */
-    int         vmap_num;
-    FontData    vmap;
-    int		vrotate_type;
-    int         vrotate_num;
-    CodeRange   vrotate;
-} OMDataRec, *OMData;
-
-typedef struct _XOMGenericPart {
-    int 	data_num;
-    OMData 	data;
-    Bool 	on_demand_loading;
-    char 	*object_name;
-} XOMGenericPart;
-
-typedef struct _XOMGenericRec {
-    XOMMethods 		methods;
-    XOMCoreRec 		core;
-    XOMGenericPart 	gen;
-} XOMGenericRec, *XOMGeneric;
-
-/*
- * XOC dependent data
- */
-
-typedef struct _FontSetRec {
-    int 		id;
-    int 		charset_count;
-    XlcCharSet 		*charset_list;
-    int 		font_data_count;
-    FontData 		font_data;
-    char 		*font_name;
-    XFontStruct 	*info;
-    XFontStruct 	*font;
-    XlcSide 		side;
-    Bool 		is_xchar2b;
-    /* For VW/UDC */
-    int 		substitute_num;
-    FontData 		substitute;
-    /* Vertical Writing */
-    int		vpart_initialize;
-    int         vmap_num;
-    FontData    vmap;
-    int         vrotate_num;
-    VRotate     vrotate;
-} FontSetRec, *FontSet;
-
-typedef struct _XOCGenericPart {
-    XlcConv 		mbs_to_cs;
-    XlcConv 		wcs_to_cs;
-    int 		font_set_num;
-    FontSet 		font_set;
-} XOCGenericPart;
-
-typedef struct _XOCGenericRec {
-    XOCMethods 		methods;
-    XOCCoreRec 		core;	
-    XOCGenericPart 	gen;
-} XOCGenericRec, *XOCGeneric;
-
-_XFUNCPROTOBEGIN
-
-extern XOM _XomGenericOpenOM(
-#if NeedFunctionPrototypes
-    XLCd		/* lcd */,
-    Display*		/* dpy */,
-    XrmDatabase		/* rdb */,
-    _Xconst char*	/* res_name */,
-    _Xconst char*	/* res_class */
-#endif
-);
-
-extern XlcConv _XomInitConverter(
-#if NeedFunctionPrototypes
-    XOC			/* oc */,
-    XOMTextType		/* type */
-#endif
-);
-
-extern int _XomConvert(
-#if NeedFunctionPrototypes
-    XOC			/* oc */,
-    XlcConv		/* conv */,
-    XPointer*		/* from */,
-    int*		/* from_left */,
-    XPointer*		/* to */,
-    int*		/* to_left */,
-    XPointer*		/* args */,
-    int			/* num_args */
-#endif
-);
-
-_XFUNCPROTOEND
-
-#endif  /* _XOMGENERIC_H_ */
diff --git a/xc/lib/X11/Xresource.h b/xc/lib/X11/Xresource.h
deleted file mode 100644
index 1699902f5..000000000
--- a/xc/lib/X11/Xresource.h
+++ /dev/null
@@ -1,408 +0,0 @@
-/* $TOG: Xresource.h /main/39 1998/02/06 18:03:08 kaleb $ */
-
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-/* $XFree86: xc/lib/X11/Xresource.h,v 3.2 1998/10/03 08:41:30 dawes Exp $ */
-
-#ifndef _XRESOURCE_H_
-#define _XRESOURCE_H_
-
-/* You must include <X11/Xlib.h> before including this file */
-
-/****************************************************************
- ****************************************************************
- ***                                                          ***
- ***                                                          ***
- ***          X Resource Manager Intrinsics                   ***
- ***                                                          ***
- ***                                                          ***
- ****************************************************************
- ****************************************************************/
-
-_XFUNCPROTOBEGIN
-
-/****************************************************************
- *
- * Memory Management
- *
- ****************************************************************/
-
-extern char *Xpermalloc(
-#if NeedFunctionPrototypes
-    unsigned int	/* size */
-#endif
-);
-
-/****************************************************************
- *
- * Quark Management
- *
- ****************************************************************/
-
-typedef int     XrmQuark, *XrmQuarkList;
-#define NULLQUARK ((XrmQuark) 0)
-
-typedef char *XrmString;
-#define NULLSTRING ((XrmString) 0)
-
-/* find quark for string, create new quark if none already exists */
-extern XrmQuark XrmStringToQuark(
-#if NeedFunctionPrototypes
-    _Xconst char* 	/* string */
-#endif
-);
-
-extern XrmQuark XrmPermStringToQuark(
-#if NeedFunctionPrototypes
-    _Xconst char* 	/* string */
-#endif
-);
-
-/* find string for quark */
-extern XrmString XrmQuarkToString(
-#if NeedFunctionPrototypes
-    XrmQuark 		/* quark */
-#endif
-);
-
-extern XrmQuark XrmUniqueQuark(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-#define XrmStringsEqual(a1, a2) (strcmp(a1, a2) == 0)
-
-
-/****************************************************************
- *
- * Conversion of Strings to Lists
- *
- ****************************************************************/
-
-typedef enum {XrmBindTightly, XrmBindLoosely} XrmBinding, *XrmBindingList;
-
-extern void XrmStringToQuarkList(
-#if NeedFunctionPrototypes
-    _Xconst char*	/* string */,
-    XrmQuarkList	/* quarks_return */
-#endif
-);
-
-extern void XrmStringToBindingQuarkList(
-#if NeedFunctionPrototypes
-    _Xconst char*	/* string */,
-    XrmBindingList	/* bindings_return */,
-    XrmQuarkList	/* quarks_return */
-#endif
-);
-
-/****************************************************************
- *
- * Name and Class lists.
- *
- ****************************************************************/
-
-typedef XrmQuark     XrmName;
-typedef XrmQuarkList XrmNameList;
-#define XrmNameToString(name)		XrmQuarkToString(name)
-#define XrmStringToName(string)		XrmStringToQuark(string)
-#define XrmStringToNameList(str, name)	XrmStringToQuarkList(str, name)
-
-typedef XrmQuark     XrmClass;
-typedef XrmQuarkList XrmClassList;
-#define XrmClassToString(c_class)	XrmQuarkToString(c_class)
-#define XrmStringToClass(c_class)	XrmStringToQuark(c_class)
-#define XrmStringToClassList(str,c_class) XrmStringToQuarkList(str, c_class)
-
-
-
-/****************************************************************
- *
- * Resource Representation Types and Values
- *
- ****************************************************************/
-
-typedef XrmQuark     XrmRepresentation;
-#define XrmStringToRepresentation(string)   XrmStringToQuark(string)
-#define	XrmRepresentationToString(type)   XrmQuarkToString(type)
-
-typedef struct {
-    unsigned int    size;
-    XPointer	    addr;
-} XrmValue, *XrmValuePtr;
-
-
-/****************************************************************
- *
- * Resource Manager Functions
- *
- ****************************************************************/
-
-typedef struct _XrmHashBucketRec *XrmHashBucket;
-typedef XrmHashBucket *XrmHashTable;
-typedef XrmHashTable XrmSearchList[];
-typedef struct _XrmHashBucketRec *XrmDatabase;
-
-
-extern void XrmDestroyDatabase(
-#if NeedFunctionPrototypes
-    XrmDatabase		/* database */    
-#endif
-);
-
-extern void XrmQPutResource(
-#if NeedFunctionPrototypes
-    XrmDatabase*	/* database */,
-    XrmBindingList	/* bindings */,
-    XrmQuarkList	/* quarks */,
-    XrmRepresentation	/* type */,
-    XrmValue*		/* value */
-#endif
-);
-
-extern void XrmPutResource(
-#if NeedFunctionPrototypes
-    XrmDatabase*	/* database */,
-    _Xconst char*	/* specifier */,
-    _Xconst char*	/* type */,
-    XrmValue*		/* value */
-#endif
-);
-
-extern void XrmQPutStringResource(
-#if NeedFunctionPrototypes
-    XrmDatabase*	/* database */,
-    XrmBindingList      /* bindings */,
-    XrmQuarkList	/* quarks */,
-    _Xconst char*	/* value */
-#endif
-);
-
-extern void XrmPutStringResource(
-#if NeedFunctionPrototypes
-    XrmDatabase*	/* database */,
-    _Xconst char*	/* specifier */,
-    _Xconst char*	/* value */
-#endif
-);
-
-extern void XrmPutLineResource(
-#if NeedFunctionPrototypes
-    XrmDatabase*	/* database */,
-    _Xconst char*	/* line */
-#endif
-);
-
-extern Bool XrmQGetResource(
-#if NeedFunctionPrototypes
-    XrmDatabase		/* database */,
-    XrmNameList		/* quark_name */,
-    XrmClassList	/* quark_class */,
-    XrmRepresentation*	/* quark_type_return */,
-    XrmValue*		/* value_return */
-#endif
-);
-
-extern Bool XrmGetResource(
-#if NeedFunctionPrototypes
-    XrmDatabase		/* database */,
-    _Xconst char*	/* str_name */,
-    _Xconst char*	/* str_class */,
-    char**		/* str_type_return */,
-    XrmValue*		/* value_return */
-#endif
-);
-
-extern Bool XrmQGetSearchList(
-#if NeedFunctionPrototypes
-    XrmDatabase		/* database */,
-    XrmNameList		/* names */,
-    XrmClassList	/* classes */,
-    XrmSearchList	/* list_return */,
-    int			/* list_length */
-#endif
-);
-
-extern Bool XrmQGetSearchResource(
-#if NeedFunctionPrototypes
-    XrmSearchList	/* list */,
-    XrmName		/* name */,
-    XrmClass		/* class */,
-    XrmRepresentation*	/* type_return */,
-    XrmValue*		/* value_return */
-#endif
-);
-
-/****************************************************************
- *
- * Resource Database Management
- *
- ****************************************************************/
-
-extern void XrmSetDatabase(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    XrmDatabase		/* database */
-#endif
-);
-
-extern XrmDatabase XrmGetDatabase(
-#if NeedFunctionPrototypes
-    Display*		/* display */
-#endif
-);
-
-extern XrmDatabase XrmGetFileDatabase(
-#if NeedFunctionPrototypes
-    _Xconst char*	/* filename */
-#endif
-);
-
-extern Status XrmCombineFileDatabase(
-#if NeedFunctionPrototypes
-    _Xconst char* 	/* filename */,
-    XrmDatabase*	/* target */,
-    Bool		/* override */
-#endif
-);
-
-extern XrmDatabase XrmGetStringDatabase(
-#if NeedFunctionPrototypes
-    _Xconst char*	/* data */  /*  null terminated string */
-#endif
-);
-
-extern void XrmPutFileDatabase(
-#if NeedFunctionPrototypes
-    XrmDatabase		/* database */,
-    _Xconst char*	/* filename */
-#endif
-);
-
-extern void XrmMergeDatabases(
-#if NeedFunctionPrototypes
-    XrmDatabase		/* source_db */,
-    XrmDatabase*	/* target_db */
-#endif
-);
-
-extern void XrmCombineDatabase(
-#if NeedFunctionPrototypes
-    XrmDatabase		/* source_db */,
-    XrmDatabase*	/* target_db */,
-    Bool		/* override */
-#endif
-);
-
-#define XrmEnumAllLevels 0
-#define XrmEnumOneLevel  1
-
-extern Bool XrmEnumerateDatabase(
-#if NeedFunctionPrototypes
-    XrmDatabase		/* db */,
-    XrmNameList		/* name_prefix */,
-    XrmClassList	/* class_prefix */,
-    int			/* mode */,
-    Bool (*)(
-#if NeedNestedPrototypes
-	     XrmDatabase*	/* db */,
-	     XrmBindingList	/* bindings */,
-	     XrmQuarkList	/* quarks */,
-	     XrmRepresentation*	/* type */,
-	     XrmValue*		/* value */,
-	     XPointer		/* closure */
-#endif
-	     )		/* proc */,
-    XPointer		/* closure */
-#endif
-);
-
-extern char *XrmLocaleOfDatabase(
-#if NeedFunctionPrototypes
-    XrmDatabase 	/* database */
-#endif
-);
-
-
-/****************************************************************
- *
- * Command line option mapping to resource entries
- *
- ****************************************************************/
-
-typedef enum {
-    XrmoptionNoArg,	/* Value is specified in OptionDescRec.value	    */
-    XrmoptionIsArg,     /* Value is the option string itself		    */
-    XrmoptionStickyArg, /* Value is characters immediately following option */
-    XrmoptionSepArg,    /* Value is next argument in argv		    */
-    XrmoptionResArg,	/* Resource and value in next argument in argv      */
-    XrmoptionSkipArg,   /* Ignore this option and the next argument in argv */
-    XrmoptionSkipLine,  /* Ignore this option and the rest of argv	    */
-    XrmoptionSkipNArgs	/* Ignore this option and the next 
-			   OptionDescRes.value arguments in argv */
-} XrmOptionKind;
-
-typedef struct {
-    char	    *option;	    /* Option abbreviation in argv	    */
-    char	    *specifier;     /* Resource specifier		    */
-    XrmOptionKind   argKind;	    /* Which style of option it is	    */
-    XPointer	    value;	    /* Value to provide if XrmoptionNoArg   */
-} XrmOptionDescRec, *XrmOptionDescList;
-
-
-extern void XrmParseCommand(
-#if NeedFunctionPrototypes
-    XrmDatabase*	/* database */,
-    XrmOptionDescList	/* table */,
-    int			/* table_count */,
-    _Xconst char*	/* name */,
-    int*		/* argc_in_out */,
-    char**		/* argv_in_out */		     
-#endif
-);
-
-_XFUNCPROTOEND
-
-#endif /* _XRESOURCE_H_ */
-/* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/xc/lib/X11/Xrm.c b/xc/lib/X11/Xrm.c
deleted file mode 100644
index 20353efb1..000000000
--- a/xc/lib/X11/Xrm.c
+++ /dev/null
@@ -1,2681 +0,0 @@
-/* $TOG: Xrm.c /main/94 1998/02/06 18:03:25 kaleb $ */
-
-/***********************************************************
-Copyright 1987, 1988, 1990 by Digital Equipment Corporation, Maynard
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-/*
-
-Copyright 1987, 1988, 1990, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/Xrm.c,v 3.13 1999/05/30 03:03:19 dawes Exp $ */
-
-#include	<stdio.h>
-#include	<ctype.h>
-#include	"Xlibint.h"
-#include	<X11/Xresource.h>
-#include	"Xlcint.h"
-#ifdef XTHREADS
-#include	"locking.h"
-#endif
-#include 	"XrmI.h"
-#include	<X11/Xos.h>
-
-#ifdef __STDC__
-#define Const const
-#else
-#define Const /**/
-#endif
-#if defined(__STDC__) && !defined(NORCONST)
-#define RConst const
-#else
-#define RConst /**/
-#endif
-
-extern XrmQuark _XrmInternalStringToQuark();
-
-/*
-
-These Xrm routines allow very fast lookup of resources in the resource
-database.  Several usage patterns are exploited:
-
-(1) Widgets get a lot of resources at one time.  Rather than look up each from
-scratch, we can precompute the prioritized list of database levels once, then
-search for each resource starting at the beginning of the list.
-
-(2) Many database levels don't contain any leaf resource nodes.  There is no
-point in looking for resources on a level that doesn't contain any.  This
-information is kept on a per-level basis.
-
-(3) Sometimes the widget instance tree is structured such that you get the same
-class name repeated on the fully qualified widget name.  This can result in the
-same database level occuring multiple times on the search list.  The code below
-only checks to see if you get two identical search lists in a row, rather than
-look back through all database levels, but in practice this removes all
-duplicates I've ever observed.
-
-Joel McCormack
-
-*/
-
-/*
-
-The Xrm representation has been completely redesigned to substantially reduce
-memory and hopefully improve performance.
-
-The database is structured into two kinds of tables: LTables that contain
-only values, and NTables that contain only other tables.
-
-Some invariants:
-
-The next pointer of the top-level node table points to the top-level leaf
-table, if any.
-
-Within an LTable, for a given name, the tight value always precedes the
-loose value, and if both are present the loose value is always right after
-the tight value.
-
-Within an NTable, all of the entries for a given name are contiguous,
-in the order tight NTable, loose NTable, tight LTable, loose LTable.
-
-Bob Scheifler
-
-*/
-
-typedef unsigned long Signature;
-
-static XrmQuark XrmQString, XrmQANY;
-
-typedef	Bool (*DBEnumProc)(
-#if NeedNestedPrototypes    /* this is Nested on purpose, to match Xlib.h */
-    XrmDatabase*	/* db */,
-    XrmBindingList	/* bindings */,
-    XrmQuarkList	/* quarks */,
-    XrmRepresentation*	/* type */,
-    XrmValue*		/* value */,
-    XPointer		/* closure */
-#endif
-);
-
-typedef struct _VEntry {
-    struct _VEntry	*next;		/* next in chain */
-    XrmQuark		name;		/* name of this entry */
-    unsigned int	tight:1;	/* 1 if it is a tight binding */
-    unsigned int	string:1;	/* 1 if type is String */
-    unsigned int	size:30;	/* size of value */
-} VEntryRec, *VEntry;
-
-
-typedef struct _DEntry {
-    VEntryRec		entry;		/* entry */
-    XrmRepresentation	type;		/* representation type */
-} DEntryRec, *DEntry;
-
-/* the value is right after the structure */
-#define StringValue(ve) (XPointer)((ve) + 1)
-#define RepType(ve) ((DEntry)(ve))->type
-/* the value is right after the structure */
-#define DataValue(ve) (XPointer)(((DEntry)(ve)) + 1)
-#define RawValue(ve) (char *)((ve)->string ? StringValue(ve) : DataValue(ve))
-
-typedef struct _NTable {
-    struct _NTable	*next;		/* next in chain */
-    XrmQuark		name;		/* name of this entry */
-    unsigned int	tight:1;	/* 1 if it is a tight binding */
-    unsigned int	leaf:1;		/* 1 if children are values */
-    unsigned int	hasloose:1;	/* 1 if has loose children */
-    unsigned int	hasany:1;	/* 1 if has ANY entry */
-    unsigned int	pad:4;		/* unused */
-    unsigned int	mask:8;		/* hash size - 1 */
-    unsigned int	entries:16;	/* number of children */
-} NTableRec, *NTable;
-
-/* the buckets are right after the structure */
-#define NodeBuckets(ne) ((NTable *)((ne) + 1))
-#define NodeHash(ne,q) NodeBuckets(ne)[(q) & (ne)->mask]
-
-/* leaf tables have an extra level of indirection for the buckets,
- * so that resizing can be done without invalidating a search list.
- * This is completely ugly, and wastes some memory, but the Xlib
- * spec doesn't really specify whether invalidation is OK, and the
- * old implementation did not invalidate.
- */
-typedef struct _LTable {
-    NTableRec		table;
-    VEntry		*buckets;
-} LTableRec, *LTable;
-
-#define LeafHash(le,q) (le)->buckets[(q) & (le)->table.mask]
-
-/* An XrmDatabase just holds a pointer to the first top-level table.
- * The type name is no longer descriptive, but better to not change
- * the Xresource.h header file.  This type also gets used to define
- * XrmSearchList, which is a complete crock, but we'll just leave it
- * and caste types as required.
- */
-typedef struct _XrmHashBucketRec {
-    NTable table;
-    XPointer mbstate;
-    XrmMethods methods;
-#ifdef XTHREADS
-    LockInfoRec linfo;
-#endif
-} XrmHashBucketRec;
-
-/* closure used in get/put resource */
-typedef struct _VClosure {
-    XrmRepresentation	*type;		/* type of value */
-    XrmValuePtr		value;		/* value itself */
-} VClosureRec, *VClosure;
-
-/* closure used in get search list */
-typedef struct _SClosure {
-    LTable		*list;		/* search list */
-    int			idx;		/* index of last filled element */
-    int			limit;		/* maximum index */
-} SClosureRec, *SClosure;
-
-/* placed in XrmSearchList to indicate next table is loose only */
-#define LOOSESEARCH ((LTable)1)
-
-/* closure used in enumerate database */
-typedef struct _EClosure {
-    XrmDatabase db;			/* the database */
-    DBEnumProc proc;			/* the user proc */
-    XPointer closure;			/* the user closure */
-    XrmBindingList bindings;		/* binding list */
-    XrmQuarkList quarks;		/* quark list */
-    int mode;				/* XrmEnum<kind> */
-} EClosureRec, *EClosure;
-
-/* predicate to determine when to resize a hash table */
-#define GrowthPred(n,m) ((unsigned)(n) > (((m) + 1) << 2))
-
-#define GROW(prev) \
-    if (GrowthPred((*prev)->entries, (*prev)->mask)) \
-	GrowTable(prev)
-
-/* pick a reasonable value for maximum depth of resource database */
-#define MAXDBDEPTH 100
-
-/* macro used in get/search functions */
-
-/* find an entry named ename, with leafness given by leaf */
-#define NFIND(ename) \
-    q = ename; \
-    entry = NodeHash(table, q); \
-    while (entry && entry->name != q) \
-	entry = entry->next; \
-    if (leaf && entry && !entry->leaf) { \
-	entry = entry->next; \
-	if (entry && !entry->leaf) \
-	    entry = entry->next; \
-	if (entry && entry->name != q) \
-	    entry = (NTable)NULL; \
-    }
-
-/* resourceQuarks keeps track of what quarks have been associated with values
- * in all LTables.  If a quark has never been used in an LTable, we don't need
- * to bother looking for it.
- */
-
-static unsigned char *resourceQuarks = (unsigned char *)NULL;
-static XrmQuark maxResourceQuark = -1;
-
-/* determines if a quark has been used for a value in any database */
-#define IsResourceQuark(q)  ((q) > 0 && (q) <= maxResourceQuark && \
-			     resourceQuarks[(q) >> 3] & (1 << ((q) & 7)))
-
-typedef unsigned char XrmBits;
-
-#define BSLASH  ((XrmBits) (1 << 5))
-#define NORMAL	((XrmBits) (1 << 4))
-#define EOQ	((XrmBits) (1 << 3))
-#define SEP	((XrmBits) (1 << 2))
-#define ENDOF	((XrmBits) (1 << 1))
-#define SPACE	(NORMAL|EOQ|SEP|(XrmBits)0)
-#define RSEP	(NORMAL|EOQ|SEP|(XrmBits)1)
-#define EOS	(EOQ|SEP|ENDOF|(XrmBits)0)
-#define EOL	(EOQ|SEP|ENDOF|(XrmBits)1)
-#define BINDING	(NORMAL|EOQ)
-#define ODIGIT	(NORMAL|(XrmBits)1)
-
-#define next_char(ch,str) xrmtypes[(unsigned char)((ch) = *(++(str)))]
-#define next_mbchar(ch,len,str) xrmtypes[(unsigned char)(ch = (*db->methods->mbchar)(db->mbstate, str, &len), str += len, ch)]
-
-#define is_space(bits)		((bits) == SPACE)
-#define is_EOQ(bits)		((bits) & EOQ)
-#define is_EOF(bits)		((bits) == EOS)
-#define is_EOL(bits)		((bits) & ENDOF)
-#define is_binding(bits)	((bits) == BINDING)
-#define is_odigit(bits)		((bits) == ODIGIT)
-#define is_separator(bits)	((bits) & SEP)
-#define is_nonpcs(bits)		(!(bits))
-#define is_normal(bits)		((bits) & NORMAL)
-#define is_simple(bits)		((bits) & (NORMAL|BSLASH))
-#define is_special(bits)	((bits) & (ENDOF|BSLASH))
-
-/* parsing types */
-static XrmBits Const xrmtypes[256] = {
-    EOS,0,0,0,0,0,0,0,
-    0,SPACE,EOL,0,0,
-#if defined(WIN32) || defined(__EMX__) /* || defined(OS2) */
-                    EOL,	/* treat CR the same as LF, just in case */
-#else
-                    0,
-#endif
-                      0,0,
-    0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,
-    SPACE,NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,
-    NORMAL,NORMAL,BINDING,NORMAL,NORMAL,NORMAL,BINDING,NORMAL,
-    ODIGIT,ODIGIT,ODIGIT,ODIGIT,ODIGIT,ODIGIT,ODIGIT,ODIGIT,
-    NORMAL,NORMAL,RSEP,NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,
-    NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,
-    NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,
-    NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,
-    NORMAL,NORMAL,NORMAL,NORMAL,BSLASH,NORMAL,NORMAL,NORMAL,
-    NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,
-    NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,
-    NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,
-    NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,0
-    /* The rest will be automatically initialized to zero. */
-};
-
-void XrmInitialize()
-{
-    XrmQString = XrmPermStringToQuark("String");
-    XrmQANY = XrmPermStringToQuark("?");
-}
-
-XrmDatabase XrmGetDatabase(display)
-    Display *display;
-{
-    XrmDatabase retval;
-    LockDisplay(display);
-    retval = display->db;
-    UnlockDisplay(display);
-    return retval;
-}
-
-void XrmSetDatabase(display, database)
-    Display *display;
-    XrmDatabase database;
-{
-    LockDisplay(display);
-    display->db = database;
-    UnlockDisplay(display);
-}
-
-#if NeedFunctionPrototypes
-void XrmStringToQuarkList(
-    register _Xconst char  *name,
-    register XrmQuarkList quarks)   /* RETURN */
-#else
-void XrmStringToQuarkList(name, quarks)
-    register char 	 *name;
-    register XrmQuarkList quarks;   /* RETURN */
-#endif
-{
-    register XrmBits		bits;
-    register Signature  	sig = 0;
-    register char       	ch, *tname;
-    register int 		i = 0;
-
-    if ((tname = (char *)name)) {
-	tname--;
-	while (!is_EOF(bits = next_char(ch, tname))) {
-	    if (is_binding (bits)) {
-		if (i) {
-		    /* Found a complete name */
-		    *quarks++ = _XrmInternalStringToQuark(name,tname - name,
-							  sig, False);
-		    i = 0;
-		    sig = 0;
-		}
-		name = tname+1;
-	    }
-	    else {
-		sig = (sig << 1) + ch; /* Compute the signature. */
-		i++;
-	    }
-	}
-	*quarks++ = _XrmInternalStringToQuark(name, tname - name, sig, False);
-    }
-    *quarks = NULLQUARK;
-}
-
-#if NeedFunctionPrototypes
-void XrmStringToBindingQuarkList(
-    register _Xconst char   *name,
-    register XrmBindingList bindings,   /* RETURN */
-    register XrmQuarkList   quarks)     /* RETURN */
-#else
-void XrmStringToBindingQuarkList(name, bindings, quarks)
-    register char	    *name;
-    register XrmBindingList bindings;   /* RETURN */
-    register XrmQuarkList   quarks;     /* RETURN */
-#endif
-{
-    register XrmBits		bits;
-    register Signature  	sig = 0;
-    register char       	ch, *tname;
-    register XrmBinding 	binding;
-    register int 		i = 0;
-
-    if ((tname = (char *)name)) {
-	tname--;
-	binding = XrmBindTightly;
-	while (!is_EOF(bits = next_char(ch, tname))) {
-	    if (is_binding (bits)) {
-		if (i) {
-		    /* Found a complete name */
-		    *bindings++ = binding;
-		    *quarks++ = _XrmInternalStringToQuark(name, tname - name,
-							  sig, False);
-
-		    i = 0;
-		    sig = 0;
-		    binding = XrmBindTightly;
-		}
-		name = tname+1;
-
-		if (ch == '*')
-		    binding = XrmBindLoosely;
-	    }
-	    else {
-		sig = (sig << 1) + ch; /* Compute the signature. */
-		i++;
-	    }
-	}
-	*bindings = binding;
-	*quarks++ = _XrmInternalStringToQuark(name, tname - name, sig, False);
-    }
-    *quarks = NULLQUARK;
-}
-
-#ifdef DEBUG
-
-static void PrintQuarkList(quarks, stream)
-    XrmQuarkList    quarks;
-    FILE	    *stream;
-{
-    Bool	    firstNameSeen;
-
-    for (firstNameSeen = False; *quarks; quarks++) {
-	if (firstNameSeen) {
-	    (void) fprintf(stream, ".");
-	}
-	firstNameSeen = True;
-	(void) fputs(XrmQuarkToString(*quarks), stream);
-    }
-} /* PrintQuarkList */
-
-#endif /* DEBUG */
-
-/*ARGSUSED*/
-static void mbnoop(state)
-    XPointer state;
-{
-}
-
-/*ARGSUSED*/
-static char mbchar(state, str, lenp)
-    XPointer state;
-    char *str;
-    int *lenp;
-{
-    *lenp = 1;
-    return *str;
-}
-
-/*ARGSUSED*/
-static char *lcname(state)
-    XPointer state;
-{
-    return "C";
-}
-
-static RConst XrmMethodsRec mb_methods = {
-    mbnoop,
-    mbchar,
-    mbnoop,
-    lcname,
-    mbnoop
-};
-
-static XrmDatabase NewDatabase()
-{
-    register XrmDatabase db;
-
-    db = (XrmDatabase) Xmalloc(sizeof(XrmHashBucketRec));
-    if (db) {
-	_XCreateMutex(&db->linfo);
-	db->table = (NTable)NULL;
-	db->mbstate = (XPointer)NULL;
-	db->methods = _XrmInitParseInfo(&db->mbstate);
-	if (!db->methods)
-	    db->methods = (XrmMethods)&mb_methods;
-    }
-    return db;
-}
-
-/* move all values from ftable to ttable, and free ftable's buckets.
- * ttable is quaranteed empty to start with.
- */
-static void MoveValues(ftable, ttable)
-    LTable ftable;
-    register LTable ttable;
-{
-    register VEntry fentry, nfentry;
-    register VEntry *prev;
-    register VEntry *bucket;
-    register VEntry tentry;
-    register int i;
-
-    for (i = ftable->table.mask, bucket = ftable->buckets; i >= 0; i--) {
-	for (fentry = *bucket++; fentry; fentry = nfentry) {
-	    prev = &LeafHash(ttable, fentry->name);
-	    tentry = *prev;
-	    *prev = fentry;
-	    /* chain on all with same name, to preserve invariant order */
-	    while ((nfentry = fentry->next) && nfentry->name == fentry->name)
-		fentry = nfentry;
-	    fentry->next = tentry;
-	}
-    }
-    Xfree((char *)ftable->buckets);
-}
-
-/* move all tables from ftable to ttable, and free ftable.
- * ttable is quaranteed empty to start with.
- */
-static void MoveTables(ftable, ttable)
-    NTable ftable;
-    register NTable ttable;
-{
-    register NTable fentry, nfentry;
-    register NTable *prev;
-    register NTable *bucket;
-    register NTable tentry;
-    register int i;
-
-    for (i = ftable->mask, bucket = NodeBuckets(ftable); i >= 0; i--) {
-	for (fentry = *bucket++; fentry; fentry = nfentry) {
-	    prev = &NodeHash(ttable, fentry->name);
-	    tentry = *prev;
-	    *prev = fentry;
-	    /* chain on all with same name, to preserve invariant order */
-	    while ((nfentry = fentry->next) && nfentry->name == fentry->name)
-		fentry = nfentry;
-	    fentry->next = tentry;
-	}
-    }
-    Xfree((char *)ftable);
-}
-
-/* grow the table, based on current number of entries */
-static void GrowTable(prev)
-    NTable *prev;
-{
-    register NTable table;
-    register int i;
-
-    table = *prev;
-    i = table->mask;
-    if (i == 255) /* biggest it gets */
-	return;
-    while (i < 255 && GrowthPred(table->entries, i))
-	i = (i << 1) + 1;
-    i++; /* i is now the new size */
-    if (table->leaf) {
-	register LTable ltable;
-	LTableRec otable;
-
-	ltable = (LTable)table;
-	/* cons up a copy to make MoveValues look symmetric */
-	otable = *ltable;
-	ltable->buckets = (VEntry *)Xmalloc(i * sizeof(VEntry));
-	if (!ltable->buckets) {
-	    ltable->buckets = otable.buckets;
-	    return;
-	}
-	ltable->table.mask = i - 1;
-	bzero((char *)ltable->buckets, i * sizeof(VEntry));
-	MoveValues(&otable, ltable);
-    } else {
-	register NTable ntable;
-
-	ntable = (NTable)Xmalloc(sizeof(NTableRec) + i * sizeof(NTable));
-	if (!ntable)
-	    return;
-	*ntable = *table;
-	ntable->mask = i - 1;
-	bzero((char *)NodeBuckets(ntable), i * sizeof(NTable));
-	*prev = ntable;
-	MoveTables(table, ntable);
-    }
-}
-
-/* merge values from ftable into *pprev, destroy ftable in the process */
-static void MergeValues(ftable, pprev, override)
-    LTable ftable;
-    NTable *pprev;
-    Bool override;
-{
-    register VEntry fentry, tentry;
-    register VEntry *prev;
-    register LTable ttable;
-    VEntry *bucket;
-    int i;
-    register XrmQuark q;
-
-    ttable = (LTable)*pprev;
-    if (ftable->table.hasloose)
-	ttable->table.hasloose = 1;
-    for (i = ftable->table.mask, bucket = ftable->buckets;
-	 i >= 0;
-	 i--, bucket++) {
-	for (fentry = *bucket; fentry; ) {
-	    q = fentry->name;
-	    prev = &LeafHash(ttable, q);
-	    tentry = *prev;
-	    while (tentry && tentry->name != q)
-		tentry = *(prev = &tentry->next);
-	    /* note: test intentionally uses fentry->name instead of q */
-	    /* permits serendipitous inserts */
-	    while (tentry && tentry->name == fentry->name) {
-		/* if tentry is earlier, skip it */
-		if (!fentry->tight && tentry->tight) {
-		    tentry = *(prev = &tentry->next);
-		    continue;
-		}
-		if (fentry->tight != tentry->tight) {
-		    /* no match, chain in fentry */
-		    *prev = fentry;
-		    prev = &fentry->next;
-		    fentry = *prev;
-		    *prev = tentry;
-		    ttable->table.entries++;
-		} else if (override) {
-		    /* match, chain in fentry, splice out and free tentry */
-		    *prev = fentry;
-		    prev = &fentry->next;
-		    fentry = *prev;
-		    *prev = tentry->next;
-		    /* free the overridden entry */
-		    Xfree((char *)tentry);
-		    /* get next tentry */
-		    tentry = *prev;
-		} else {
-		    /* match, discard fentry */
-		    prev = &tentry->next;
-		    tentry = fentry; /* use as a temp var */
-		    fentry = fentry->next;
-		    /* free the overpowered entry */
-		    Xfree((char *)tentry);
-		    /* get next tentry */
-		    tentry = *prev;
-		}
-		if (!fentry)
-		    break;
-	    }
-	    /* at this point, tentry cannot match any fentry named q */
-	    /* chain in all bindings together, preserve invariant order */
-	    while (fentry && fentry->name == q) {
-		*prev = fentry;
-		prev = &fentry->next;
-		fentry = *prev;
-		*prev = tentry;
-		ttable->table.entries++;
-	    }
-	}
-    }
-    Xfree((char *)ftable->buckets);
-    Xfree((char *)ftable);
-    /* resize if necessary, now that we're all done */
-    GROW(pprev);
-}
-
-/* merge tables from ftable into *pprev, destroy ftable in the process */
-static void MergeTables(ftable, pprev, override)
-    NTable ftable;
-    NTable *pprev;
-    Bool override;
-{
-    register NTable fentry, tentry;
-    NTable nfentry;
-    register NTable *prev;
-    register NTable ttable;
-    NTable *bucket;
-    int i;
-    register XrmQuark q;
-
-    ttable = *pprev;
-    if (ftable->hasloose)
-	ttable->hasloose = 1;
-    if (ftable->hasany)
-	ttable->hasany = 1;
-    for (i = ftable->mask, bucket = NodeBuckets(ftable);
-	 i >= 0;
-	 i--, bucket++) {
-	for (fentry = *bucket; fentry; ) {
-	    q = fentry->name;
-	    prev = &NodeHash(ttable, q);
-	    tentry = *prev;
-	    while (tentry && tentry->name != q)
-		tentry = *(prev = &tentry->next);
-	    /* note: test intentionally uses fentry->name instead of q */
-	    /* permits serendipitous inserts */
-	    while (tentry && tentry->name == fentry->name) {
-		/* if tentry is earlier, skip it */
-		if ((fentry->leaf && !tentry->leaf) ||
-		    (!fentry->tight && tentry->tight &&
-		     (fentry->leaf || !tentry->leaf))) {
-		    tentry = *(prev = &tentry->next);
-		    continue;
-		}
-		nfentry = fentry->next;
-		if (fentry->leaf != tentry->leaf ||
-		    fentry->tight != tentry->tight) {
-		    /* no match, just chain in */
-		    *prev = fentry;
-		    *(prev = &fentry->next) = tentry;
-		    ttable->entries++;
-		} else {
-		    if (fentry->leaf)
-			MergeValues((LTable)fentry, prev, override);
-		    else
-			MergeTables(fentry, prev, override);
-		    /* bump to next tentry */
-		    tentry = *(prev = &(*prev)->next);
-		}
-		/* bump to next fentry */
-		fentry = nfentry;
-		if (!fentry)
-		    break;
-	    }
-	    /* at this point, tentry cannot match any fentry named q */
-	    /* chain in all bindings together, preserve invariant order */
-	    while (fentry && fentry->name == q) {
-		*prev = fentry;
-		prev = &fentry->next;
-		fentry = *prev;
-		*prev = tentry;
-		ttable->entries++;
-	    }
-	}
-    }
-    Xfree((char *)ftable);
-    /* resize if necessary, now that we're all done */
-    GROW(pprev);
-}
-
-void XrmCombineDatabase(from, into, override)
-    XrmDatabase	from, *into;
-    Bool override;
-{
-    register NTable *prev;
-    register NTable ftable, ttable, nftable;
-
-    if (!*into) {
-	*into = from;
-    } else if (from) {
-	_XLockMutex(&from->linfo);
-	_XLockMutex(&(*into)->linfo);
-	if ((ftable = from->table)) {
-	    prev = &(*into)->table;
-	    ttable = *prev;
-	    if (!ftable->leaf) {
-		nftable = ftable->next;
-		if (ttable && !ttable->leaf) {
-		    /* both have node tables, merge them */
-		    MergeTables(ftable, prev, override);
-		    /* bump to into's leaf table, if any */
-		    ttable = *(prev = &(*prev)->next);
-		} else {
-		    /* into has no node table, link from's in */
-		    *prev = ftable;
-		    *(prev = &ftable->next) = ttable;
-		}
-		/* bump to from's leaf table, if any */
-		ftable = nftable;
-	    } else {
-		/* bump to into's leaf table, if any */
-		if (ttable && !ttable->leaf)
-		    ttable = *(prev = &ttable->next);
-	    }
-	    if (ftable) {
-		/* if into has a leaf, merge, else insert */
-		if (ttable)
-		    MergeValues((LTable)ftable, prev, override);
-		else
-		    *prev = ftable;
-	    }
-	}
-	(from->methods->destroy)(from->mbstate);
-	_XFreeMutex(&from->linfo);
-	Xfree((char *)from);
-	_XUnlockMutex(&(*into)->linfo);
-    }
-}
-
-void XrmMergeDatabases(from, into)
-    XrmDatabase	from, *into;
-{
-    XrmCombineDatabase(from, into, True);
-}
-
-/* store a value in the database, overriding any existing entry */
-static void PutEntry(db, bindings, quarks, type, value)
-    XrmDatabase		db;
-    XrmBindingList	bindings;
-    XrmQuarkList	quarks;
-    XrmRepresentation	type;
-    XrmValuePtr		value;
-{
-    register NTable *pprev, *prev;
-    register NTable table;
-    register XrmQuark q;
-    register VEntry *vprev;
-    register VEntry entry;
-    NTable *nprev, *firstpprev;
-
-#define NEWTABLE(q,i) \
-    table = (NTable)Xmalloc(sizeof(LTableRec)); \
-    if (!table) \
-	return; \
-    table->name = q; \
-    table->hasloose = 0; \
-    table->hasany = 0; \
-    table->mask = 0; \
-    table->entries = 0; \
-    if (quarks[i]) { \
-	table->leaf = 0; \
-	nprev = NodeBuckets(table); \
-    } else { \
-	table->leaf = 1; \
-	if (!(nprev = (NTable *)Xmalloc(sizeof(VEntry *)))) \
-	    return; \
-	((LTable)table)->buckets = (VEntry *)nprev; \
-    } \
-    *nprev = (NTable)NULL; \
-    table->next = *prev; \
-    *prev = table
-
-    if (!db || !*quarks)
-	return;
-    table = *(prev = &db->table);
-    /* if already at leaf, bump to the leaf table */
-    if (!quarks[1] && table && !table->leaf)
-	table = *(prev = &table->next);
-    pprev = prev;
-    if (!table || (quarks[1] && table->leaf)) {
-	/* no top-level node table, create one and chain it in */
-	NEWTABLE(NULLQUARK,1);
-	table->tight = 1; /* arbitrary */
-	prev = nprev;
-    } else {
-	/* search along until we need a value */
-	while (quarks[1]) {
-	    q = *quarks;
-	    table = *(prev = &NodeHash(table, q));
-	    while (table && table->name != q)
-		table = *(prev = &table->next);
-	    if (!table)
-		break; /* not found */
-	    if (quarks[2]) {
-		if (table->leaf)
-		    break; /* not found */
-	    } else {
-		if (!table->leaf) {
-		    /* bump to leaf table, if any */
-		    table = *(prev = &table->next);
-		    if (!table || table->name != q)
-			break; /* not found */
-		    if (!table->leaf) {
-			/* bump to leaf table, if any */
-			table = *(prev = &table->next);
-			if (!table || table->name != q)
-			    break; /* not found */
-		    }
-		}
-	    }
-	    if (*bindings == XrmBindTightly) {
-		if (!table->tight)
-		    break; /* not found */
-	    } else {
-		if (table->tight) {
-		    /* bump to loose table, if any */
-		    table = *(prev = &table->next);
-		    if (!table || table->name != q ||
-			!quarks[2] != table->leaf)
-			break; /* not found */
-		}
-	    }
-	    /* found that one, bump to next quark */
-	    pprev = prev;
-	    quarks++;
-	    bindings++;
-	}
-	if (!quarks[1]) {
-	    /* found all the way to a leaf */
-	    q = *quarks;
-	    entry = *(vprev = &LeafHash((LTable)table, q));
-	    while (entry && entry->name != q)
-		entry = *(vprev = &entry->next);
-	    /* if want loose and have tight, bump to next entry */
-	    if (entry && *bindings == XrmBindLoosely && entry->tight)
-		entry = *(vprev = &entry->next);
-	    if (entry && entry->name == q &&
-		(*bindings == XrmBindTightly) == entry->tight) {
-		/* match, need to override */
-		if ((type == XrmQString) == entry->string &&
-		    entry->size == value->size) {
-		    /* update type if not String, can be different */
-		    if (!entry->string)
-			RepType(entry) = type;
-		    /* identical size, just overwrite value */
-		    memcpy(RawValue(entry), (char *)value->addr, value->size);
-		    return;
-		}
-		/* splice out and free old entry */
-		*vprev = entry->next;
-		Xfree((char *)entry);
-		(*pprev)->entries--;
-	    }
-	    /* this is where to insert */
-	    prev = (NTable *)vprev;
-	}
-    }
-    /* keep the top table, because we may have to grow it */
-    firstpprev = pprev;
-    /* iterate until we get to the leaf */
-    while (quarks[1]) {
-	/* build a new table and chain it in */
-	NEWTABLE(*quarks,2);
-	if (*quarks++ == XrmQANY)
-	    (*pprev)->hasany = 1;
-	if (*bindings++ == XrmBindTightly) {
-	    table->tight = 1;
-	} else {
-	    table->tight = 0;
-	    (*pprev)->hasloose = 1;
-	}
-	(*pprev)->entries++;
-	pprev = prev;
-	prev = nprev;
-    }
-    /* now allocate the value entry */
-    entry = (VEntry)Xmalloc(((type == XrmQString) ?
-			     sizeof(VEntryRec) : sizeof(DEntryRec)) +
-			    value->size);
-    if (!entry)
-	return;
-    entry->name = q = *quarks;
-    if (*bindings == XrmBindTightly) {
-	entry->tight = 1;
-    } else {
-	entry->tight = 0;
-	(*pprev)->hasloose = 1;
-    }
-    /* chain it in, with a bit of type cast ugliness */
-    entry->next = *((VEntry *)prev);
-    *((VEntry *)prev) = entry;
-    entry->size = value->size;
-    if (type == XrmQString) {
-	entry->string = 1;
-    } else {
-	entry->string = 0;
-	RepType(entry) = type;
-    }
-    /* save a copy of the value */
-    memcpy(RawValue(entry), (char *)value->addr, value->size);
-    (*pprev)->entries++;
-    /* this is a new leaf, need to remember it for search lists */
-    if (q > maxResourceQuark) {
-	unsigned oldsize = (maxResourceQuark + 1) >> 3;
-	unsigned size = ((q | 0x7f) + 1) >> 3; /* reallocate in chunks */
-	if (resourceQuarks) {
-	    unsigned char *prevQuarks = resourceQuarks;
-
-	    resourceQuarks = (unsigned char *)Xrealloc((char *)resourceQuarks,
-						       size);
-	    if (!resourceQuarks) {
-		Xfree(prevQuarks);
-	    }
-	} else
-	    resourceQuarks = (unsigned char *)Xmalloc(size);
-	if (resourceQuarks) {
-	    bzero((char *)&resourceQuarks[oldsize], size - oldsize);
-	    maxResourceQuark = (size << 3) - 1;
-	} else {
-	    maxResourceQuark = -1;
-	}
-    }
-    if (q > 0 && resourceQuarks)
-	resourceQuarks[q >> 3] |= 1 << (q & 0x7);
-    GROW(firstpprev);
-
-#undef NEWTABLE
-}
-
-void XrmQPutResource(pdb, bindings, quarks, type, value)
-    XrmDatabase		*pdb;
-    XrmBindingList      bindings;
-    XrmQuarkList	quarks;
-    XrmRepresentation	type;
-    XrmValuePtr		value;
-{
-    if (!*pdb) *pdb = NewDatabase();
-    _XLockMutex(&(*pdb)->linfo);
-    PutEntry(*pdb, bindings, quarks, type, value);
-    _XUnlockMutex(&(*pdb)->linfo);
-}
-
-#if NeedFunctionPrototypes
-void XrmPutResource(
-    XrmDatabase     *pdb,
-    _Xconst char    *specifier,
-    _Xconst char    *type,
-    XrmValuePtr	    value)
-#else
-void XrmPutResource(pdb, specifier, type, value)
-    XrmDatabase     *pdb;
-    char	    *specifier;
-    char	    *type;
-    XrmValuePtr	    value;
-#endif
-{
-    XrmBinding	    bindings[MAXDBDEPTH+1];
-    XrmQuark	    quarks[MAXDBDEPTH+1];
-
-    if (!*pdb) *pdb = NewDatabase();
-    _XLockMutex(&(*pdb)->linfo);
-    XrmStringToBindingQuarkList(specifier, bindings, quarks);
-    PutEntry(*pdb, bindings, quarks, XrmStringToQuark(type), value);
-    _XUnlockMutex(&(*pdb)->linfo);
-}
-
-#if NeedFunctionPrototypes
-void XrmQPutStringResource(
-    XrmDatabase     *pdb,
-    XrmBindingList  bindings,
-    XrmQuarkList    quarks,
-    _Xconst char    *str)
-#else
-void XrmQPutStringResource(pdb, bindings, quarks, str)
-    XrmDatabase     *pdb;
-    XrmBindingList  bindings;
-    XrmQuarkList    quarks;
-    char	    *str;
-#endif
-{
-    XrmValue	value;
-
-    if (!*pdb) *pdb = NewDatabase();
-    value.addr = (XPointer) str;
-    value.size = strlen(str)+1;
-    _XLockMutex(&(*pdb)->linfo);
-    PutEntry(*pdb, bindings, quarks, XrmQString, &value);
-    _XUnlockMutex(&(*pdb)->linfo);
-}
-
-/*	Function Name: GetDatabase
- *	Description: Parses a string and stores it as a database.
- *	Arguments: db - the database.
- *                 str - a pointer to the string containing the database.
- *                 filename - source filename, if any.
- *                 doall - whether to do all lines or just one
- */
-
-/*
- * This function is highly optimized to inline as much as possible. 
- * Be very careful with modifications, or simplifications, as they 
- * may adversely affect the performance.
- *
- * Chris Peterson, MIT X Consortium		5/17/90.
- */
-
-/* 
- * Xlib spec says max 100 quarks in a lookup, will stop and return if
- * return if any single production's lhs has more than 100 components.
- */
-#define QLIST_SIZE 100
-
-/* 
- * This should be big enough to handle things like the XKeysymDB or biggish
- * ~/.Xdefaults or app-defaults files. Anything bigger will be allocated on
- * the heap.
- */
-#define DEF_BUFF_SIZE 8192
-
-static void GetIncludeFile();
-
-static void GetDatabase(db, str, filename, doall)
-    XrmDatabase db;
-    register char *str;
-    char *filename;
-    Bool doall;
-{
-    char *rhs;
-    char *lhs, lhs_s[DEF_BUFF_SIZE];
-    XrmQuark quarks[QLIST_SIZE + 1];	/* allow for a terminal NullQuark */
-    XrmBinding bindings[QLIST_SIZE + 1];
-
-    register char *ptr;
-    register XrmBits bits = 0;
-    register char c;
-    register Signature sig;
-    register char *ptr_max;
-    register int num_quarks;
-    register XrmBindingList t_bindings;
-
-    int len, alloc_chars;
-    unsigned long str_len;
-    XrmValue value;
-    Bool only_pcs;
-    Bool dolines;
-
-    if (!db)
-	return;
-
-    /* 
-     * if strlen (str) < DEF_BUFF_SIZE allocate buffers on the stack for 
-     * speed otherwise malloc the buffer. From a buffer overflow standpoint
-     * we can be sure that neither: a) a component on the lhs, or b) a
-     * value on the rhs, will be longer than the overall length of str,
-     * i.e. strlen(str).
-     *
-     * This should give good performance when parsing "*foo: bar" type 
-     * databases as might be passed with -xrm command line options; but
-     * with larger databases, e.g. .Xdefaults, app-defaults, or KeysymDB
-     * files, the size of the buffers will be overly large. One way
-     * around this would be to double-parse each production with a resulting
-     * performance hit. In any event we can be assured that a lhs component
-     * name or a rhs value won't be longer than str itself.
-     */
-
-    str_len = strlen (str);
-    if (DEF_BUFF_SIZE > str_len) lhs = lhs_s;
-    else if ((lhs = (char*) Xmalloc (str_len)) == NULL) 
-	return;
-
-    alloc_chars = DEF_BUFF_SIZE < str_len ? str_len : DEF_BUFF_SIZE;
-    if ((rhs = (char*) Xmalloc (alloc_chars)) == NULL) {
-	if (lhs != lhs_s) Xfree (lhs);
-	return;
-    }
-
-    (*db->methods->mbinit)(db->mbstate);
-    str--;
-    dolines = True;
-    while (!is_EOF(bits) && dolines) {
-	dolines = doall;
-
-	/*
-	 * First: Remove extra whitespace. 
-	 */
-
-	do {
-	    bits = next_char(c, str);
-	} while is_space(bits);
-
-	/*
-	 * Ignore empty lines.
-	 */
-
-	if (is_EOL(bits))
-	    continue;		/* start a new line. */
-
-	/*
-	 * Second: check the first character in a line to see if it is
-	 * "!" signifying a comment, or "#" signifying a directive.
-	 */
-
-	if (c == '!') { /* Comment, spin to next newline */
-	    while (is_simple(bits = next_char(c, str))) {}
-	    if (is_EOL(bits))
-		continue;
-	    while (!is_EOL(bits = next_mbchar(c, len, str))) {}
-	    str--;
-	    continue;		/* start a new line. */
-	}
-
-	if (c == '#') { /* Directive */
-	    /* remove extra whitespace */
-	    only_pcs = True;
-	    while (is_space(bits = next_char(c, str))) {};
-	    /* only "include" directive is currently defined */
-	    if (!strncmp(str, "include", 7)) {
-		str += (7-1);
-		/* remove extra whitespace */
-		while (is_space(bits = next_char(c, str))) {};
-		/* must have a starting " */
-		if (c == '"') {
-		    char *fname = str+1;
-		    len = 0;
-		    do {
-			if (only_pcs) {
-			    bits = next_char(c, str);
-			    if (is_nonpcs(bits))
-				only_pcs = False;
-			}
-			if (!only_pcs)
-			    bits = next_mbchar(c, len, str);
-		    } while (c != '"' && !is_EOL(bits));
-		    /* must have an ending " */
-		    if (c == '"')
-			GetIncludeFile(db, filename, fname, str - len - fname);
-		}
-	    }
-	    /* spin to next newline */
-	    if (only_pcs) {
-		while (is_simple(bits))
-		    bits = next_char(c, str);
-		if (is_EOL(bits))
-		    continue;
-	    }
-	    while (!is_EOL(bits))
-		bits = next_mbchar(c, len, str);
-	    str--;
-	    continue;		/* start a new line. */
-	}
-
-	/*
-	 * Third: loop through the LHS of the resource specification
-	 * storing characters and converting this to a Quark.
-	 */
-	
-	num_quarks = 0;
-	t_bindings = bindings;
-
-	sig = 0;
-	ptr = lhs;
-	*t_bindings = XrmBindTightly;	
-	for(;;) {
-	    if (!is_binding(bits)) {
-		while (!is_EOQ(bits)) {
-		    *ptr++ = c;
-		    sig = (sig << 1) + c; /* Compute the signature. */
-		    bits = next_char(c, str);
-		}
-
-		quarks[num_quarks++] = 
-			_XrmInternalStringToQuark(lhs, ptr - lhs, sig, False);
-
-		if (num_quarks > QLIST_SIZE) {
-		    Xfree(rhs);
-		    if (lhs != lhs_s) Xfree (lhs);
-		    (*db->methods->mbfinish)(db->mbstate);
-		    return;
-		}
-
-		if (is_separator(bits))  {
-		    if (!is_space(bits))
-			break;
-
-		    /* Remove white space */
-		    do {
-			*ptr++ = c;
-			sig = (sig << 1) + c; /* Compute the signature. */
-		    } while (is_space(bits = next_char(c, str)));
-
-		    /* 
-		     * The spec doesn't permit it, but support spaces
-		     * internal to resource name/class 
-		     */
-
-		    if (is_separator(bits))
-			break;
-		    num_quarks--;
-		    continue;
-		}
-
-		if (c == '.')
-		    *(++t_bindings) = XrmBindTightly;
-		else
-		    *(++t_bindings) = XrmBindLoosely;
-
-		sig = 0;
-		ptr = lhs;
-	    }
-	    else {
-		/*
-		 * Magic unspecified feature #254.
-		 *
-		 * If two separators appear with no Text between them then
-		 * ignore them.
-		 *
-		 * If anyone of those separators is a '*' then the binding 
-		 * will be loose, otherwise it will be tight.
-		 */
-
-		if (c == '*')
-		    *t_bindings = XrmBindLoosely;
-	    }
-
-	    bits = next_char(c, str);
-	}
-
-	quarks[num_quarks] = NULLQUARK;
-
-	/*
-	 * Make sure that there is a ':' in this line.
-	 */
-
-	if (c != ':') {
-	    char oldc;
-
-	    /*
-	     * A parsing error has occured, toss everything on the line
-	     * a new_line can still be escaped with a '\'.
-	     */
-
-	    while (is_normal(bits))
-		bits = next_char(c, str);
-	    if (is_EOL(bits))
-		continue;
-	    bits = next_mbchar(c, len, str);
-	    do {
-		oldc = c;
-		bits = next_mbchar(c, len, str);
-	    } while (c && (c != '\n' || oldc == '\\'));
-	    str--;
-	    continue;
-	}
-
-	/*
-	 * I now have a quark and binding list for the entire left hand
-	 * side.  "c" currently points to the ":" separating the left hand
-	 * side for the right hand side.  It is time to begin processing
-	 * the right hand side.
-	 */
-
-	/* 
-	 * Fourth: Remove more whitespace
-	 */
-
-	for(;;) {
-	    if (is_space(bits = next_char(c, str)))
-		continue;
-	    if (c != '\\')
-		break;
-	    bits = next_char(c, str);
-	    if (c == '\n')
-		continue;
-	    str--;
-	    bits = BSLASH;
-	    c = '\\';
-	    break;
-	}
-
-	/* 
-	 * Fifth: Process the right hand side.
-	 */
-
-	ptr = rhs;
-	ptr_max = ptr + alloc_chars - 4;
-	only_pcs = True;
-	len = 1;
-
-	for(;;) {
-
-	    /*
-	     * Tight loop for the normal case:  Non backslash, non-end of value
-	     * character that will fit into the allocated buffer.
-	     */
-
-	    if (only_pcs) {
-		while (is_normal(bits) && ptr < ptr_max) {
-		    *ptr++ = c;
-		    bits = next_char(c, str);
-		}
-		if (is_EOL(bits))
-		    break;
-		if (is_nonpcs(bits)) {
-		    only_pcs = False;
-		    bits = next_mbchar(c, len, str);
-		}
-	    }
-	    while (!is_special(bits) && ptr + len <= ptr_max) {
-		len = -len;
-		while (len)
-		    *ptr++ = str[len++];
-		if (*str == '\0') {
-		    bits = EOS;
-		    break;
-		}
-		bits = next_mbchar(c, len, str);
-	    }
-
-	    if (is_EOL(bits)) {
-		str--;
-		break;
-	    }
-
-	    if (c == '\\') {
-		/*
-		 * We need to do some magic after a backslash.
-		 */
-		Bool read_next = True;
-
-		if (only_pcs) {
-		    bits = next_char(c, str);
-		    if (is_nonpcs(bits))
-			only_pcs = False;
-		}
-		if (!only_pcs)
-		    bits = next_mbchar(c, len, str);
-
-		if (is_EOL(bits)) {
-		    if (is_EOF(bits))
-			continue;
-		} else if (c == 'n') {
-		    /*
-		     * "\n" means insert a newline.
-		     */
-		    *ptr++ = '\n';
-		} else if (c == '\\') {
-		    /*
-		     * "\\" completes to just one backslash.
-		     */
-		    *ptr++ = '\\';
-		} else {
-		    /*
-		     * pick up to three octal digits after the '\'.
-		     */
-		    char temp[3];
-		    int count = 0;
-		    while (is_odigit(bits) && count < 3) {
-			temp[count++] = c;
-			if (only_pcs) {
-			    bits = next_char(c, str);
-			    if (is_nonpcs(bits))
-				only_pcs = False;
-			}
-			if (!only_pcs)
-			    bits = next_mbchar(c, len, str);
-		    }
-
-		    /*
-		     * If we found three digits then insert that octal code
-		     * into the value string as a character.
-		     */
-
-		    if (count == 3) {
-			*ptr++ = (unsigned char) ((temp[0] - '0') * 0100 +
-						  (temp[1] - '0') * 010 +
-						  (temp[2] - '0'));
-		    }
-		    else {
-			int tcount;
-
-			/* 
-			 * Otherwise just insert those characters into the 
-			 * string, since no special processing is needed on
-			 * numerics we can skip the special processing.
-			 */
-
-			for (tcount = 0; tcount < count; tcount++) {
-			    *ptr++ = temp[tcount]; /* print them in
-						      the correct order */
-			}
-		    }
-		    read_next = False;
-		}
-		if (read_next) {
-		    if (only_pcs) {
-			bits = next_char(c, str);
-			if (is_nonpcs(bits))
-			    only_pcs = False;
-		    }
-		    if (!only_pcs)
-			bits = next_mbchar(c, len, str);
-		}
-	    }
-
-	    /* 
-	     * It is important to make sure that there is room for at least
-	     * four more characters in the buffer, since I can add that
-	     * many characters into the buffer after a backslash has occured.
-	     */
-
-	    if (ptr + len > ptr_max) {
-		char * temp_str;
-
-		alloc_chars += BUFSIZ/10;		
-		temp_str = Xrealloc(rhs, sizeof(char) * alloc_chars);
-
-		if (!temp_str) {
-		    Xfree(rhs);
-		    if (lhs != lhs_s) Xfree (lhs);
-		    (*db->methods->mbfinish)(db->mbstate);
-		    return;
-		}
-
-		ptr = temp_str + (ptr - rhs); /* reset pointer. */
-		rhs = temp_str;
-		ptr_max = rhs + alloc_chars - 4;
-	    }
-	}
-
-	/*
-	 * Lastly: Terminate the value string, and store this entry 
-	 * 	   into the database.
-	 */
-
-	*ptr++ = '\0';
-
-	/* Store it in database */
-	value.size = ptr - rhs;
-	value.addr = (XPointer) rhs;
-	
-	PutEntry(db, bindings, quarks, XrmQString, &value);
-    }
-
-    if (lhs != lhs_s) Xfree (lhs);
-    Xfree (rhs);
-
-    (*db->methods->mbfinish)(db->mbstate);
-}
-
-#if NeedFunctionPrototypes
-void XrmPutStringResource(
-    XrmDatabase *pdb,
-    _Xconst char*specifier,
-    _Xconst char*str)
-#else
-void XrmPutStringResource(pdb, specifier, str)
-    XrmDatabase *pdb;
-    char	*specifier;
-    char	*str;
-#endif
-{
-    XrmValue	value;
-    XrmBinding	bindings[MAXDBDEPTH+1];
-    XrmQuark	quarks[MAXDBDEPTH+1];
-
-    if (!*pdb) *pdb = NewDatabase();
-    XrmStringToBindingQuarkList(specifier, bindings, quarks);
-    value.addr = (XPointer) str;
-    value.size = strlen(str)+1;
-    _XLockMutex(&(*pdb)->linfo);
-    PutEntry(*pdb, bindings, quarks, XrmQString, &value);
-    _XUnlockMutex(&(*pdb)->linfo);
-}
-
-
-#if NeedFunctionPrototypes
-void XrmPutLineResource(
-    XrmDatabase *pdb,
-    _Xconst char*line)
-#else
-void XrmPutLineResource(pdb, line)
-    XrmDatabase *pdb;
-    char	*line;
-#endif
-{
-    if (!*pdb) *pdb = NewDatabase();
-    _XLockMutex(&(*pdb)->linfo);
-    GetDatabase(*pdb, line, (char *)NULL, False);
-    _XUnlockMutex(&(*pdb)->linfo);
-}
-
-#if NeedFunctionPrototypes
-XrmDatabase XrmGetStringDatabase(
-    _Xconst char    *data)
-#else
-XrmDatabase XrmGetStringDatabase(data)
-    char	    *data;
-#endif
-{
-    XrmDatabase     db;
-
-    db = NewDatabase();
-    _XLockMutex(&db->linfo);
-    GetDatabase(db, data, (char *)NULL, True);
-    _XUnlockMutex(&db->linfo);
-    return db;
-}
-
-/*	Function Name: ReadInFile
- *	Description: Reads the file into a buffer.
- *	Arguments: filename - the name of the file.
- *	Returns: An allocated string containing the contents of the file.
- */
-
-static char *
-ReadInFile(filename)
-char * filename;
-{
-    register int fd, size;
-    char * filebuf;
-
-#ifdef __EMX__
-    filename = __XOS2RedirRoot(filename);
-#endif
-
-    /*
-     * MS-Windows and OS/2 note: Default open mode includes O_TEXT
-     */
-    if ( (fd = _XOpenFile (filename, O_RDONLY)) == -1 )
-	return (char *)NULL;
-
-    /*
-     * MS-Windows and OS/2 note: depending on how the sources are
-     * untarred, the newlines in resource files may or may not have
-     * been expanded to CRLF. Either way the size returned by fstat
-     * is sufficient to read the file into because in text-mode any
-     * CRLFs in a file will be converted to newlines (LF) with the
-     * result that the number of bytes actually read with be <=
-     * to the size returned by fstat.
-     */
-    GetSizeOfFile(fd, size);
-
-    if (!(filebuf = Xmalloc(size + 1))) { /* leave room for '\0' */
-	close(fd);
-	return (char *)NULL;
-    }
-    size = read (fd, filebuf, size);
-
-#ifdef __EMX__
-    { /* kill CRLF */
-      int i,k;
-      for (i=k=0; i<size; i++)
-	if (filebuf[i] != 0x0d) {
-	   filebuf[k++] = filebuf[i];
-	}
-	filebuf[k] = 0;
-    }
-#endif
-
-    if (size < 0) {
-	close (fd);
-	Xfree(filebuf);
-	return (char *)NULL;
-    }
-    close (fd);
-
-    filebuf[size] = '\0';	/* NULL terminate it. */
-    return filebuf;
-}
-
-static void
-GetIncludeFile(db, base, fname, fnamelen)
-    XrmDatabase db;
-    char *base;
-    char *fname;
-    int fnamelen;
-{
-    int len;
-    char *str;
-    char realfname[BUFSIZ];
-
-    if (fnamelen <= 0 || fnamelen >= BUFSIZ)
-	return;
-    if (*fname != '/' && base && (str = strrchr(base, '/'))) {
-	len = str - base + 1;
-	if (len + fnamelen >= BUFSIZ)
-	    return;
-	strncpy(realfname, base, len);
-	strncpy(realfname + len, fname, fnamelen);
-	realfname[len + fnamelen] = '\0';
-    } else {
-	strncpy(realfname, fname, fnamelen);
-	realfname[fnamelen] = '\0';
-    }
-    if (!(str = ReadInFile(realfname)))
-	return;
-    GetDatabase(db, str, realfname, True);
-    Xfree(str);
-}
-
-#if NeedFunctionPrototypes
-XrmDatabase XrmGetFileDatabase(
-    _Xconst char    *filename)
-#else
-XrmDatabase XrmGetFileDatabase(filename)
-    char 	    *filename;
-#endif
-{
-    XrmDatabase db;
-    char *str;
-
-    if (!(str = ReadInFile(filename)))
-	return (XrmDatabase)NULL;
-
-    db = NewDatabase();
-    _XLockMutex(&db->linfo);
-    GetDatabase(db, str, filename, True);
-    _XUnlockMutex(&db->linfo);
-    Xfree(str);
-    return db;
-}
-
-#if NeedFunctionPrototypes
-Status XrmCombineFileDatabase(
-    _Xconst char    *filename,
-    XrmDatabase     *target,
-    Bool             override)
-#else
-Status XrmCombineFileDatabase(filename, target, override)
-    char        *filename;
-    XrmDatabase *target;
-    Bool         override;
-#endif
-{
-    XrmDatabase db;
-    char *str;
-
-    if (!(str = ReadInFile(filename)))
-	return 0;
-    if (override) {
-	db = *target;
-	if (!db)
-	    *target = db = NewDatabase();
-    } else
-	db = NewDatabase();
-    _XLockMutex(&db->linfo);
-    GetDatabase(db, str, filename, True);
-    _XUnlockMutex(&db->linfo);
-    Xfree(str);
-    if (!override)
-	XrmCombineDatabase(db, target, False);
-    return 1;
-}
-
-/* call the user proc for every value in the table, arbitrary order.
- * stop if user proc returns True.  level is current depth in database.
- */
-/*ARGSUSED*/
-static Bool EnumLTable(table, names, classes, level, closure)
-    LTable		table;
-    XrmNameList		names;
-    XrmClassList 	classes;
-    register int	level;
-    register EClosure	closure;
-{
-    register VEntry *bucket;
-    register int i;
-    register VEntry entry;
-    XrmValue value;
-    XrmRepresentation type;
-    Bool tightOk;
-
-    closure->bindings[level] = (table->table.tight ?
-				XrmBindTightly : XrmBindLoosely);
-    closure->quarks[level] = table->table.name;
-    level++;
-    tightOk = !*names;
-    closure->quarks[level + 1] = NULLQUARK;
-    for (i = table->table.mask, bucket = table->buckets;
-	 i >= 0;
-	 i--, bucket++) {
-	for (entry = *bucket; entry; entry = entry->next) {
-	    if (entry->tight && !tightOk)
-		continue;
-	    closure->bindings[level] = (entry->tight ?
-					XrmBindTightly : XrmBindLoosely);
-	    closure->quarks[level] = entry->name;
-	    value.size = entry->size;
-	    if (entry->string) {
-		type = XrmQString;
-		value.addr = StringValue(entry);
-	    } else {
-		type = RepType(entry);
-		value.addr = DataValue(entry);
-	    }
-	    if ((*closure->proc)(&closure->db, closure->bindings+1,
-				 closure->quarks+1, &type, &value,
-				 closure->closure))
-		return True;
-	}
-    }
-    return False;
-}
-
-static Bool EnumAllNTable(table, level, closure)
-    NTable		table;
-    register int	level;
-    register EClosure	closure;
-{
-    register NTable *bucket;
-    register int i;
-    register NTable entry;
-    XrmQuark empty = NULLQUARK;
-
-    if (level >= MAXDBDEPTH)
-	return False;
-    for (i = table->mask, bucket = NodeBuckets(table);
-	 i >= 0;
-	 i--, bucket++) {
-	for (entry = *bucket; entry; entry = entry->next) {
-	    if (entry->leaf) {
-		if (EnumLTable((LTable)entry, &empty, &empty, level, closure))
-		    return True;
-	    } else {
-		closure->bindings[level] = (entry->tight ?
-					    XrmBindTightly : XrmBindLoosely);
-		closure->quarks[level] = entry->name;
-		if (EnumAllNTable(entry, level+1, closure))
-		    return True;
-	    }
-	}
-    }
-    return False;
-}
-
-/* recurse on every table in the table, arbitrary order.
- * stop if user proc returns True.  level is current depth in database.
- */
-static Bool EnumNTable(table, names, classes, level, closure)
-    NTable		table;
-    XrmNameList		names;
-    XrmClassList 	classes;
-    register int	level;
-    register EClosure	closure;
-{
-    register NTable	entry;
-    register XrmQuark	q;
-    register unsigned int leaf;
-    Bool (*get)();
-    Bool bilevel;
-
-/* find entries named ename, leafness leaf, tight or loose, and call get */
-#define ITIGHTLOOSE(ename) \
-    NFIND(ename); \
-    if (entry) { \
-	if (leaf == entry->leaf) { \
-	    if (!leaf && !entry->tight && entry->next && \
-		entry->next->name == q && entry->next->tight && \
-		(bilevel || entry->next->hasloose) && \
-		EnumLTable((LTable)entry->next, names+1, classes+1, \
-			   level, closure)) \
-		return True; \
-	    if ((*get)(entry, names+1, classes+1, level, closure)) \
-		return True; \
-	    if (entry->tight && (entry = entry->next) && \
-		entry->name == q && leaf == entry->leaf && \
-		(*get)(entry, names+1, classes+1, level, closure)) \
-		return True; \
-	} else if (entry->leaf) { \
-	    if ((bilevel || entry->hasloose) && \
-		EnumLTable((LTable)entry, names+1, classes+1, level, closure))\
-		return True; \
-	    if (entry->tight && (entry = entry->next) && \
-		entry->name == q && (bilevel || entry->hasloose) && \
-		EnumLTable((LTable)entry, names+1, classes+1, level, closure))\
-		return True; \
-	} \
-    }
-
-/* find entries named ename, leafness leaf, loose only, and call get */
-#define ILOOSE(ename) \
-    NFIND(ename); \
-    if (entry && entry->tight && (entry = entry->next) && entry->name != q) \
-	entry = (NTable)NULL; \
-    if (entry) { \
-	if (leaf == entry->leaf) { \
-	    if ((*get)(entry, names+1, classes+1, level, closure)) \
-		return True; \
-	} else if (entry->leaf && (bilevel || entry->hasloose)) { \
-	    if (EnumLTable((LTable)entry, names+1, classes+1, level, closure))\
-		return True; \
-	} \
-    }
-
-    if (level >= MAXDBDEPTH)
-	return False;
-    closure->bindings[level] = (table->tight ?
-				XrmBindTightly : XrmBindLoosely);
-    closure->quarks[level] = table->name;
-    level++;
-    if (!*names) {
-	if (EnumAllNTable(table, level, closure))
-	    return True;
-    } else {
-	if (names[1] || closure->mode == XrmEnumAllLevels) {
-	    get = EnumNTable; /* recurse */
-	    leaf = 0;
-	    bilevel = !names[1];
-	} else {
-	    get = EnumLTable; /* bottom of recursion */
-	    leaf = 1;
-	    bilevel = False;
-	}
-	if (table->hasloose && closure->mode == XrmEnumAllLevels) {
-	    NTable *bucket;
-	    int i;
-	    XrmQuark empty = NULLQUARK;
-
-	    for (i = table->mask, bucket = NodeBuckets(table);
-		 i >= 0;
-		 i--, bucket++) {
-		q = NULLQUARK;
-		for (entry = *bucket; entry; entry = entry->next) {
-		    if (!entry->tight && entry->name != q &&
-			entry->name != *names && entry->name != *classes) {
-			q = entry->name;
-			if (entry->leaf) {
-			    if (EnumLTable((LTable)entry, &empty, &empty,
-					   level, closure))
-				return True;
-			} else {
-			    if (EnumNTable(entry, &empty, &empty,
-					   level, closure))
-				return True;
-			}
-		    }
-		}
-	    }
-	}
-
-	ITIGHTLOOSE(*names);   /* do name, tight and loose */
-	ITIGHTLOOSE(*classes); /* do class, tight and loose */
-	if (table->hasany) {
-	    ITIGHTLOOSE(XrmQANY); /* do ANY, tight and loose */
-	}
-	if (table->hasloose) {
-	    while (1) {
-		names++;
-		classes++;
-		if (!*names)
-		    break;
-		if (!names[1] && closure->mode != XrmEnumAllLevels) {
-		    get = EnumLTable; /* bottom of recursion */
-		    leaf = 1;
-		}
-		ILOOSE(*names);   /* loose names */
-		ILOOSE(*classes); /* loose classes */
-		if (table->hasany) {
-		    ILOOSE(XrmQANY); /* loose ANY */
-		}
-	    }
-	    names--;
-	    classes--;
-	}
-    }
-    /* now look for matching leaf nodes */
-    entry = table->next;
-    if (!entry)
-	return False;
-    if (entry->leaf) {
-	if (entry->tight && !table->tight)
-	    entry = entry->next;
-    } else {
-	entry = entry->next;
-	if (!entry || !entry->tight)
-	    return False;
-    }
-    if (!entry || entry->name != table->name)
-	return False;
-    /* found one */
-    level--;
-    if ((!*names || entry->hasloose) &&
-	EnumLTable((LTable)entry, names, classes, level, closure))
-	return True;
-    if (entry->tight && entry == table->next && (entry = entry->next) &&
-	entry->name == table->name && (!*names || entry->hasloose))
-	return EnumLTable((LTable)entry, names, classes, level, closure);
-    return False;
-
-#undef ITIGHTLOOSE
-#undef ILOOSE
-}
-
-/* call the proc for every value in the database, arbitrary order.
- * stop if the proc returns True.
- */
-Bool XrmEnumerateDatabase(db, names, classes, mode, proc, closure)
-    XrmDatabase		db;
-    XrmNameList		names;
-    XrmClassList	classes;
-    int			mode;
-    DBEnumProc		proc;
-    XPointer		closure;
-{
-    XrmBinding  bindings[MAXDBDEPTH+2];
-    XrmQuark	quarks[MAXDBDEPTH+2];
-    register NTable table;
-    EClosureRec	eclosure;
-    Bool retval = False;
-
-    if (!db)
-	return False;
-    _XLockMutex(&db->linfo);
-    eclosure.db = db;
-    eclosure.proc = proc;
-    eclosure.closure = closure;
-    eclosure.bindings = bindings;
-    eclosure.quarks = quarks;
-    eclosure.mode = mode;
-    table = db->table;
-    if (table && !table->leaf && !*names && mode == XrmEnumOneLevel)
-	table = table->next;
-    if (table) {
-	if (!table->leaf)
-	    retval = EnumNTable(table, names, classes, 0, &eclosure);
-	else
-	    retval = EnumLTable((LTable)table, names, classes, 0, &eclosure);
-    }
-    _XUnlockMutex(&db->linfo);
-    return retval;
-}
-
-static void PrintBindingQuarkList(bindings, quarks, stream)
-    XrmBindingList      bindings;
-    XrmQuarkList	quarks;
-    FILE		*stream;
-{
-    Bool	firstNameSeen;
-
-    for (firstNameSeen = False; *quarks; bindings++, quarks++) {
-	if (*bindings == XrmBindLoosely) {
-	    (void) fprintf(stream, "*");
-	} else if (firstNameSeen) {
-	    (void) fprintf(stream, ".");
-	}
-	firstNameSeen = True;
-	(void) fputs(XrmQuarkToString(*quarks), stream);
-    }
-}
-
-/* output out the entry in correct file syntax */
-/*ARGSUSED*/
-static Bool DumpEntry(db, bindings, quarks, type, value, data)
-    XrmDatabase		*db;
-    XrmBindingList      bindings;
-    XrmQuarkList	quarks;
-    XrmRepresentation   *type;
-    XrmValuePtr		value;
-    XPointer		data;
-{
-    FILE			*stream = (FILE *)data;
-    register unsigned int	i;
-    register char		*s;
-    register char		c;
-
-    if (*type != XrmQString)
-	(void) putc('!', stream);
-    PrintBindingQuarkList(bindings, quarks, stream);
-    s = value->addr;
-    i = value->size;
-    if (*type == XrmQString) {
-	(void) fputs(":\t", stream);
-	if (i)
-	    i--;
-    }
-    else
-	(void) fprintf(stream, "=%s:\t", XrmRepresentationToString(*type));
-    if (i && (*s == ' ' || *s == '\t'))
-	(void) putc('\\', stream); /* preserve leading whitespace */
-    while (i--) {
-	c = *s++;
-	if (c == '\n') {
-	    if (i)
-		(void) fputs("\\n\\\n", stream);
-	    else
-		(void) fputs("\\n", stream);
-	} else if (c == '\\')
-	    (void) fputs("\\\\", stream);
-	else if ((c < ' ' && c != '\t') ||
-		 ((unsigned char)c >= 0x7f && (unsigned char)c < 0xa0))
-	    (void) fprintf(stream, "\\%03o", (unsigned char)c);
-	else
-	    (void) putc(c, stream);
-    }
-    (void) putc('\n', stream);
-    return ferror(stream) != 0;
-}
-
-#ifdef DEBUG
-
-void PrintTable(table, file)
-    NTable table;
-    FILE *file;
-{
-    XrmBinding  bindings[MAXDBDEPTH+1];
-    XrmQuark	quarks[MAXDBDEPTH+1];
-    EClosureRec closure;
-    XrmQuark	empty = NULLQUARK;
-
-    closure.db = (XrmDatabase)NULL;
-    closure.proc = DumpEntry;
-    closure.closure = (XPointer)file;
-    closure.bindings = bindings;
-    closure.quarks = quarks;
-    closure.mode = XrmEnumAllLevels;
-    if (table->leaf)
-	EnumLTable((LTable)table, &empty, &empty, 0, &closure);
-    else
-	EnumNTable(table, &empty, &empty, 0, &closure);
-}
-
-#endif /* DEBUG */
-
-#if NeedFunctionPrototypes
-void XrmPutFileDatabase(
-    XrmDatabase db,
-    _Xconst char *fileName)
-#else
-void XrmPutFileDatabase(db, fileName)
-    XrmDatabase db;
-    char 	*fileName;
-#endif
-{
-    FILE	*file;
-    XrmQuark empty = NULLQUARK;
-
-    if (!db) return;
-    if (!(file = fopen(fileName, "w"))) return;
-    if (XrmEnumerateDatabase(db, &empty, &empty, XrmEnumAllLevels,
-			     DumpEntry, (XPointer) file))
-	unlink((char *)fileName);
-    fclose(file);
-}
-
-/* macros used in get/search functions */
-
-/* find entries named ename, leafness leaf, tight or loose, and call get */
-#define GTIGHTLOOSE(ename,looseleaf) \
-    NFIND(ename); \
-    if (entry) { \
-	if (leaf == entry->leaf) { \
-	    if (!leaf && !entry->tight && entry->next && \
-		entry->next->name == q && entry->next->tight && \
-		entry->next->hasloose && \
-		looseleaf((LTable)entry->next, names+1, classes+1, closure)) \
-		return True; \
-	    if ((*get)(entry, names+1, classes+1, closure)) \
-		return True; \
-	    if (entry->tight && (entry = entry->next) && \
-		entry->name == q && leaf == entry->leaf && \
-		(*get)(entry, names+1, classes+1, closure)) \
-		return True; \
-	} else if (entry->leaf) { \
-	    if (entry->hasloose && \
-		looseleaf((LTable)entry, names+1, classes+1, closure)) \
-		return True; \
-	    if (entry->tight && (entry = entry->next) && \
-		entry->name == q && entry->hasloose && \
-		looseleaf((LTable)entry, names+1, classes+1, closure)) \
-		return True; \
-	} \
-    }
-
-/* find entries named ename, leafness leaf, loose only, and call get */
-#define GLOOSE(ename,looseleaf) \
-    NFIND(ename); \
-    if (entry && entry->tight && (entry = entry->next) && entry->name != q) \
-	entry = (NTable)NULL; \
-    if (entry) { \
-	if (leaf == entry->leaf) { \
-	    if ((*get)(entry, names+1, classes+1, closure)) \
-		return True; \
-	} else if (entry->leaf && entry->hasloose) { \
-	    if (looseleaf((LTable)entry, names+1, classes+1, closure)) \
-		return True; \
-	} \
-    }
-
-/* add tight/loose entry to the search list, return True if list is full */
-/*ARGSUSED*/
-static Bool AppendLEntry(table, names, classes, closure)
-    LTable		table;
-    XrmNameList		names;
-    XrmClassList 	classes;
-    register SClosure	closure;
-{
-    /* check for duplicate */
-    if (closure->idx >= 0 && closure->list[closure->idx] == table)
-	return False;
-    if (closure->idx == closure->limit)
-	return True;
-    /* append it */
-    closure->idx++;
-    closure->list[closure->idx] = table;
-    return False;
-}
-
-/* add loose entry to the search list, return True if list is full */
-/*ARGSUSED*/
-static Bool AppendLooseLEntry(table, names, classes, closure)
-    LTable		table;
-    XrmNameList		names;
-    XrmClassList 	classes;
-    register SClosure	closure;
-{
-    /* check for duplicate */
-    if (closure->idx >= 0 && closure->list[closure->idx] == table)
-	return False;
-    if (closure->idx >= closure->limit - 1)
-	return True;
-    /* append it */
-    closure->idx++;
-    closure->list[closure->idx] = LOOSESEARCH;
-    closure->idx++;
-    closure->list[closure->idx] = table;
-    return False;
-}
-
-/* search for a leaf table */
-static Bool SearchNEntry(table, names, classes, closure)
-    NTable		table;
-    XrmNameList		names;
-    XrmClassList 	classes;
-    SClosure		closure;
-{
-    register NTable	entry;
-    register XrmQuark	q;
-    register unsigned int leaf;
-    Bool		(*get)();
-
-    if (names[1]) {
-	get = SearchNEntry; /* recurse */
-	leaf = 0;
-    } else {
-	get = AppendLEntry; /* bottom of recursion */
-	leaf = 1;
-    }
-    GTIGHTLOOSE(*names, AppendLooseLEntry);   /* do name, tight and loose */
-    GTIGHTLOOSE(*classes, AppendLooseLEntry); /* do class, tight and loose */
-    if (table->hasany) {
-	GTIGHTLOOSE(XrmQANY, AppendLooseLEntry); /* do ANY, tight and loose */
-    }
-    if (table->hasloose) {
-	while (1) {
-	    names++;
-	    classes++;
-	    if (!*names)
-		break;
-	    if (!names[1]) {
-		get = AppendLEntry; /* bottom of recursion */
-		leaf = 1;
-	    }
-	    GLOOSE(*names, AppendLooseLEntry);   /* loose names */
-	    GLOOSE(*classes, AppendLooseLEntry); /* loose classes */
-	    if (table->hasany) {
-		GLOOSE(XrmQANY, AppendLooseLEntry); /* loose ANY */
-	    }
-	}
-    }
-    /* now look for matching leaf nodes */
-    entry = table->next;
-    if (!entry)
-	return False;
-    if (entry->leaf) {
-	if (entry->tight && !table->tight)
-	    entry = entry->next;
-    } else {
-	entry = entry->next;
-	if (!entry || !entry->tight)
-	    return False;
-    }
-    if (!entry || entry->name != table->name)
-	return False;
-    /* found one */
-    if (entry->hasloose &&
-	AppendLooseLEntry((LTable)entry, names, classes, closure))
-	return True;
-    if (entry->tight && entry == table->next && (entry = entry->next) &&
-	entry->name == table->name && entry->hasloose)
-	return AppendLooseLEntry((LTable)entry, names, classes, closure);
-    return False;
-}
-
-Bool XrmQGetSearchList(db, names, classes, searchList, listLength)
-    XrmDatabase     db;
-    XrmNameList	    names;
-    XrmClassList    classes;
-    XrmSearchList   searchList;	/* RETURN */
-    int		    listLength;
-{
-    register NTable	table;
-    SClosureRec		closure;
-
-    if (listLength <= 0)
-	return False;
-    closure.list = (LTable *)searchList;
-    closure.idx = -1;
-    closure.limit = listLength - 2;
-    if (db) {
-	_XLockMutex(&db->linfo);
-	table = db->table;
-	if (*names) {
-	    if (table && !table->leaf) {
-		if (SearchNEntry(table, names, classes, &closure)) {
-		    _XUnlockMutex(&db->linfo);
-		    return False;
-		}
-	    } else if (table && table->hasloose &&
-		       AppendLooseLEntry((LTable)table, names, classes,
-					 &closure)) {
-		_XUnlockMutex(&db->linfo);
-		return False;
-	    }
-	} else {
-	    if (table && !table->leaf)
-		table = table->next;
-	    if (table && 
-		AppendLEntry((LTable)table, names, classes, &closure)) {
-		_XUnlockMutex(&db->linfo);
-		return False;
-	    }
-	}
-	_XUnlockMutex(&db->linfo);
-    }
-    closure.list[closure.idx + 1] = (LTable)NULL;
-    return True;
-}
-
-Bool XrmQGetSearchResource(searchList, name, class, pType, pValue)
-	     XrmSearchList	searchList;
-    register XrmName		name;
-    register XrmClass		class;
-    	     XrmRepresentation	*pType;  /* RETURN */
-    	     XrmValue		*pValue; /* RETURN */
-{
-    register LTable *list;
-    register LTable table;
-    register VEntry entry;
-    int flags;
-
-/* find tight or loose entry */
-#define VTIGHTLOOSE(q) \
-    entry = LeafHash(table, q); \
-    while (entry && entry->name != q) \
-	entry = entry->next; \
-    if (entry) \
-	break
-
-/* find loose entry */
-#define VLOOSE(q) \
-    entry = LeafHash(table, q); \
-    while (entry && entry->name != q) \
-	entry = entry->next; \
-    if (entry) { \
-	if (!entry->tight) \
-	    break; \
-	if ((entry = entry->next) && entry->name == q) \
-	    break; \
-    }
-
-    list = (LTable *)searchList;
-    /* figure out which combination of name and class we need to search for */
-    flags = 0;
-    if (IsResourceQuark(name))
-	flags = 2;
-    if (IsResourceQuark(class))
-	flags |= 1;
-    if (!flags) {
-	/* neither name nor class has ever been used to name a resource */
-	table = (LTable)NULL;
-    } else if (flags == 3) {
-	/* both name and class */
-	while ((table = *list++)) {
-	    if (table != LOOSESEARCH) {
-		VTIGHTLOOSE(name);  /* do name, tight and loose */
-		VTIGHTLOOSE(class); /* do class, tight and loose */
-	    } else {
-		table = *list++;
-		VLOOSE(name);  /* do name, loose only */
-		VLOOSE(class); /* do class, loose only */
-	    }
-	}
-    } else {
-	/* just one of name or class */
-	if (flags == 1)
-	    name = class;
-	while ((table = *list++)) {
-	    if (table != LOOSESEARCH) {
-		VTIGHTLOOSE(name); /* tight and loose */
-	    } else {
-		table = *list++;
-		VLOOSE(name); /* loose only */
-	    }
-	}
-    }
-    if (table) {
-	/* found a match */
-	if (entry->string) {
-	    *pType = XrmQString;
-	    pValue->addr = StringValue(entry);
-	} else {
-	    *pType = RepType(entry);
-	    pValue->addr = DataValue(entry);
-	}
-	pValue->size = entry->size;
-	return True;
-    }
-    *pType = NULLQUARK;
-    pValue->addr = (XPointer)NULL;
-    pValue->size = 0;
-    return False;
-
-#undef VTIGHTLOOSE
-#undef VLOOSE
-}
-
-/* look for a tight/loose value */
-static Bool GetVEntry(table, names, classes, closure)
-    LTable		table;
-    XrmNameList		names;
-    XrmClassList 	classes;
-    VClosure		closure;
-{
-    register VEntry entry;
-    register XrmQuark q;
-
-    /* try name first */
-    q = *names;
-    entry = LeafHash(table, q);
-    while (entry && entry->name != q)
-	entry = entry->next;
-    if (!entry) {
-	/* not found, try class */
-	q = *classes;
-	entry = LeafHash(table, q);
-	while (entry && entry->name != q)
-	    entry = entry->next;
-	if (!entry)
-	    return False;
-    }
-    if (entry->string) {
-	*closure->type = XrmQString;
-	closure->value->addr = StringValue(entry);
-    } else {
-	*closure->type = RepType(entry);
-	closure->value->addr = DataValue(entry);
-    }
-    closure->value->size = entry->size;
-    return True;
-}
-
-/* look for a loose value */
-static Bool GetLooseVEntry(table, names, classes, closure)
-    LTable		table;
-    XrmNameList		names;
-    XrmClassList 	classes;
-    VClosure		closure;
-{
-    register VEntry	entry;
-    register XrmQuark	q;
-
-#define VLOOSE(ename) \
-    q = ename; \
-    entry = LeafHash(table, q); \
-    while (entry && entry->name != q) \
-	entry = entry->next; \
-    if (entry && entry->tight && (entry = entry->next) && entry->name != q) \
-	entry = (VEntry)NULL;
-
-    /* bump to last component */
-    while (names[1]) {
-	names++;
-	classes++;
-    }
-    VLOOSE(*names);  /* do name, loose only */
-    if (!entry) {
-	VLOOSE(*classes); /* do class, loose only */
-	if (!entry)
-	    return False;
-    }
-    if (entry->string) {
-	*closure->type = XrmQString;
-	closure->value->addr = StringValue(entry);
-    } else {
-	*closure->type = RepType(entry);
-	closure->value->addr = DataValue(entry);
-    }
-    closure->value->size = entry->size;
-    return True;
-
-#undef VLOOSE
-}
-
-/* recursive search for a value */
-static Bool GetNEntry(table, names, classes, closure)
-    NTable		table;
-    XrmNameList		names;
-    XrmClassList 	classes;
-    VClosure		closure;
-{
-    register NTable	entry;
-    register XrmQuark	q;
-    register unsigned int leaf;
-    Bool		(*get)();
-    NTable		otable;
-
-    if (names[2]) {
-	get = GetNEntry; /* recurse */
-	leaf = 0;
-    } else {
-	get = GetVEntry; /* bottom of recursion */
-	leaf = 1;
-    }
-    GTIGHTLOOSE(*names, GetLooseVEntry);   /* do name, tight and loose */
-    GTIGHTLOOSE(*classes, GetLooseVEntry); /* do class, tight and loose */
-    if (table->hasany) {
-	GTIGHTLOOSE(XrmQANY, GetLooseVEntry); /* do ANY, tight and loose */
-    }
-    if (table->hasloose) {
-	while (1) {
-	    names++;
-	    classes++;
-	    if (!names[1])
-		break;
-	    if (!names[2]) {
-		get = GetVEntry; /* bottom of recursion */
-		leaf = 1;
-	    }
-	    GLOOSE(*names, GetLooseVEntry);   /* do name, loose only */
-	    GLOOSE(*classes, GetLooseVEntry); /* do class, loose only */
-	    if (table->hasany) {
-		GLOOSE(XrmQANY, GetLooseVEntry); /* do ANY, loose only */
-	    }
-	}
-    }
-    /* look for matching leaf tables */
-    otable = table;
-    table = table->next;
-    if (!table)
-	return False;
-    if (table->leaf) {
-	if (table->tight && !otable->tight)
-	    table = table->next;
-    } else {
-	table = table->next;
-	if (!table || !table->tight)
-	    return False;
-    }
-    if (!table || table->name != otable->name)
-	return False;
-    /* found one */
-    if (table->hasloose &&
-	GetLooseVEntry((LTable)table, names, classes, closure))
-	return True;
-    if (table->tight && table == otable->next) {
-	table = table->next;
-	if (table && table->name == otable->name && table->hasloose)
-	    return GetLooseVEntry((LTable)table, names, classes, closure);
-    }
-    return False;
-}
-
-Bool XrmQGetResource(db, names, classes, pType, pValue)
-    XrmDatabase         db;
-    XrmNameList		names;
-    XrmClassList 	classes;
-    XrmRepresentation	*pType;  /* RETURN */
-    XrmValuePtr		pValue;  /* RETURN */
-{
-    register NTable table;
-    VClosureRec closure;
-
-    if (db && *names) {
-	_XLockMutex(&db->linfo);
-	closure.type = pType;
-	closure.value = pValue;
-	table = db->table;
-	if (names[1]) {
-	    if (table && !table->leaf) {
-		if (GetNEntry(table, names, classes, &closure)) {
-		    _XUnlockMutex(&db->linfo);
-		    return True;
-		}
-	    } else if (table && table->hasloose &&
-		    GetLooseVEntry((LTable)table, names, classes, &closure)) {
-		_XUnlockMutex (&db->linfo);
-		return True;
-	    }
-	} else {
-	    if (table && !table->leaf)
-		table = table->next;
-	    if (table && GetVEntry((LTable)table, names, classes, &closure)) {
-		_XUnlockMutex(&db->linfo);
-		return True;
-	    }
-	}
-	_XUnlockMutex(&db->linfo);
-    }
-    *pType = NULLQUARK;
-    pValue->addr = (XPointer)NULL;
-    pValue->size = 0;
-    return False;
-}
-
-#if NeedFunctionPrototypes
-Bool XrmGetResource(db, name_str, class_str, pType_str, pValue)
-    XrmDatabase         db;
-    _Xconst char	*name_str;
-    _Xconst char	*class_str;
-    XrmString		*pType_str;  /* RETURN */
-    XrmValuePtr		pValue;      /* RETURN */
-#else
-Bool XrmGetResource(db, name_str, class_str, pType_str, pValue)
-    XrmDatabase         db;
-    XrmString		name_str;
-    XrmString		class_str;
-    XrmString		*pType_str;  /* RETURN */
-    XrmValuePtr		pValue;      /* RETURN */
-#endif
-{
-    XrmName		names[MAXDBDEPTH+1];
-    XrmClass		classes[MAXDBDEPTH+1];
-    XrmRepresentation   fromType;
-    Bool		result;
-
-    XrmStringToNameList(name_str, names);
-    XrmStringToClassList(class_str, classes);
-    result = XrmQGetResource(db, names, classes, &fromType, pValue);
-    (*pType_str) = XrmQuarkToString(fromType);
-    return result;
-}
-
-/* destroy all values, plus table itself */
-static void DestroyLTable(table)
-    LTable table;
-{
-    register int i;
-    register VEntry *buckets;
-    register VEntry entry, next;
-
-    buckets = table->buckets;
-    for (i = table->table.mask; i >= 0; i--, buckets++) {
-	for (next = *buckets; (entry = next); ) {
-	    next = entry->next;
-	    Xfree((char *)entry);
-	}
-    }
-    Xfree((char *)table->buckets);
-    Xfree((char *)table);
-}
-
-/* destroy all contained tables, plus table itself */
-static void DestroyNTable(table)
-    NTable table;
-{
-    register int i;
-    register NTable *buckets;
-    register NTable entry, next;
-
-    buckets = NodeBuckets(table);
-    for (i = table->mask; i >= 0; i--, buckets++) {
-	for (next = *buckets; (entry = next); ) {
-	    next = entry->next;
-	    if (entry->leaf)
-		DestroyLTable((LTable)entry);
-	    else
-		DestroyNTable(entry);
-	}
-    }
-    Xfree((char *)table);
-}
-
-char *XrmLocaleOfDatabase(db)
-    XrmDatabase db;
-{
-    char* retval;
-    _XLockMutex(&db->linfo);
-    retval = (*db->methods->lcname)(db->mbstate);
-    _XUnlockMutex(&db->linfo);
-    return retval;
-}
-
-void XrmDestroyDatabase(db)
-    XrmDatabase   db;
-{
-    register NTable table, next;
-
-    if (db) {
-	_XLockMutex(&db->linfo);
-	for (next = db->table; (table = next); ) {
-	    next = table->next;
-	    if (table->leaf)
-		DestroyLTable((LTable)table);
-	    else
-		DestroyNTable(table);
-	}
-	_XFreeMutex(&db->linfo);
-	(*db->methods->destroy)(db->mbstate);
-	Xfree((char *)db);
-    }
-}
diff --git a/xc/lib/X11/XrmI.h b/xc/lib/X11/XrmI.h
deleted file mode 100644
index 183b5e091..000000000
--- a/xc/lib/X11/XrmI.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* $TOG: XrmI.h /main/11 1998/02/06 18:03:19 kaleb $ */
-/*
-
-Copyright 1990, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-
-/*
- * Macros to abstract out reading the file, and getting its size.
- *
- * You may need to redefine these for various other operating systems. 
- */
-
-#include	<X11/Xos.h>
-#include        <sys/stat.h>                        
-
-#define GetSizeOfFile(fd,size)                      \
-{                                                   \
-    struct stat status_buffer;                      \
-    if ( (fstat((fd), &status_buffer)) == -1 )      \
-	size = -1;                                  \
-    else                                            \
-	size = status_buffer.st_size;               \
-}
diff --git a/xc/lib/X11/Xutil.h b/xc/lib/X11/Xutil.h
deleted file mode 100644
index 9b217ca0f..000000000
--- a/xc/lib/X11/Xutil.h
+++ /dev/null
@@ -1,903 +0,0 @@
-/* $TOG: Xutil.h /main/45 1998/02/06 18:03:35 kaleb $ */
-
-/***********************************************************
-
-Copyright 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-/* $XFree86: xc/lib/X11/Xutil.h,v 3.1 1998/10/03 08:41:31 dawes Exp $ */
-
-#ifndef _XUTIL_H_
-#define _XUTIL_H_
-
-/* You must include <X11/Xlib.h> before including this file */
-
-/* 
- * Bitmask returned by XParseGeometry().  Each bit tells if the corresponding
- * value (x, y, width, height) was found in the parsed string.
- */
-#define NoValue		0x0000
-#define XValue  	0x0001
-#define YValue		0x0002
-#define WidthValue  	0x0004
-#define HeightValue  	0x0008
-#define AllValues 	0x000F
-#define XNegative 	0x0010
-#define YNegative 	0x0020
-
-/*
- * new version containing base_width, base_height, and win_gravity fields;
- * used with WM_NORMAL_HINTS.
- */
-typedef struct {
-    	long flags;	/* marks which fields in this structure are defined */
-	int x, y;		/* obsolete for new window mgrs, but clients */
-	int width, height;	/* should set so old wm's don't mess up */
-	int min_width, min_height;
-	int max_width, max_height;
-    	int width_inc, height_inc;
-	struct {
-		int x;	/* numerator */
-		int y;	/* denominator */
-	} min_aspect, max_aspect;
-	int base_width, base_height;		/* added by ICCCM version 1 */
-	int win_gravity;			/* added by ICCCM version 1 */
-} XSizeHints;
-
-/*
- * The next block of definitions are for window manager properties that
- * clients and applications use for communication.
- */
-
-/* flags argument in size hints */
-#define USPosition	(1L << 0) /* user specified x, y */
-#define USSize		(1L << 1) /* user specified width, height */
-
-#define PPosition	(1L << 2) /* program specified position */
-#define PSize		(1L << 3) /* program specified size */
-#define PMinSize	(1L << 4) /* program specified minimum size */
-#define PMaxSize	(1L << 5) /* program specified maximum size */
-#define PResizeInc	(1L << 6) /* program specified resize increments */
-#define PAspect		(1L << 7) /* program specified min and max aspect ratios */
-#define PBaseSize	(1L << 8) /* program specified base for incrementing */
-#define PWinGravity	(1L << 9) /* program specified window gravity */
-
-/* obsolete */
-#define PAllHints (PPosition|PSize|PMinSize|PMaxSize|PResizeInc|PAspect)
-
-
-
-typedef struct {
-	long flags;	/* marks which fields in this structure are defined */
-	Bool input;	/* does this application rely on the window manager to
-			get keyboard input? */
-	int initial_state;	/* see below */
-	Pixmap icon_pixmap;	/* pixmap to be used as icon */
-	Window icon_window; 	/* window to be used as icon */
-	int icon_x, icon_y; 	/* initial position of icon */
-	Pixmap icon_mask;	/* icon mask bitmap */
-	XID window_group;	/* id of related window group */
-	/* this structure may be extended in the future */
-} XWMHints;
-
-/* definition for flags of XWMHints */
-
-#define InputHint 		(1L << 0)
-#define StateHint 		(1L << 1)
-#define IconPixmapHint		(1L << 2)
-#define IconWindowHint		(1L << 3)
-#define IconPositionHint 	(1L << 4)
-#define IconMaskHint		(1L << 5)
-#define WindowGroupHint		(1L << 6)
-#define AllHints (InputHint|StateHint|IconPixmapHint|IconWindowHint| \
-IconPositionHint|IconMaskHint|WindowGroupHint)
-#define XUrgencyHint		(1L << 8)
-
-/* definitions for initial window state */
-#define WithdrawnState 0	/* for windows that are not mapped */
-#define NormalState 1	/* most applications want to start this way */
-#define IconicState 3	/* application wants to start as an icon */
-
-/*
- * Obsolete states no longer defined by ICCCM
- */
-#define DontCareState 0	/* don't know or care */
-#define ZoomState 2	/* application wants to start zoomed */
-#define InactiveState 4	/* application believes it is seldom used; */
-			/* some wm's may put it on inactive menu */
-
-
-/*
- * new structure for manipulating TEXT properties; used with WM_NAME, 
- * WM_ICON_NAME, WM_CLIENT_MACHINE, and WM_COMMAND.
- */
-typedef struct {
-    unsigned char *value;		/* same as Property routines */
-    Atom encoding;			/* prop type */
-    int format;				/* prop data format: 8, 16, or 32 */
-    unsigned long nitems;		/* number of data items in value */
-} XTextProperty;
-
-#define XNoMemory -1
-#define XLocaleNotSupported -2
-#define XConverterNotFound -3
-
-typedef enum {
-    XStringStyle,		/* STRING */
-    XCompoundTextStyle,		/* COMPOUND_TEXT */
-    XTextStyle,			/* text in owner's encoding (current locale)*/
-    XStdICCTextStyle		/* STRING, else COMPOUND_TEXT */
-} XICCEncodingStyle;
-
-typedef struct {
-	int min_width, min_height;
-	int max_width, max_height;
-	int width_inc, height_inc;
-} XIconSize;
-
-typedef struct {
-	char *res_name;
-	char *res_class;
-} XClassHint;
-
-/*
- * These macros are used to give some sugar to the image routines so that
- * naive people are more comfortable with them.
- */
-#define XDestroyImage(ximage) \
-	((*((ximage)->f.destroy_image))((ximage)))
-#define XGetPixel(ximage, x, y) \
-	((*((ximage)->f.get_pixel))((ximage), (x), (y)))
-#define XPutPixel(ximage, x, y, pixel) \
-	((*((ximage)->f.put_pixel))((ximage), (x), (y), (pixel)))
-#define XSubImage(ximage, x, y, width, height)  \
-	((*((ximage)->f.sub_image))((ximage), (x), (y), (width), (height)))
-#define XAddPixel(ximage, value) \
-	((*((ximage)->f.add_pixel))((ximage), (value)))
-
-/*
- * Compose sequence status structure, used in calling XLookupString.
- */
-typedef struct _XComposeStatus {
-    XPointer compose_ptr;	/* state table pointer */
-    int chars_matched;		/* match state */
-} XComposeStatus;
-
-/*
- * Keysym macros, used on Keysyms to test for classes of symbols
- */
-#define IsKeypadKey(keysym) \
-  (((KeySym)(keysym) >= XK_KP_Space) && ((KeySym)(keysym) <= XK_KP_Equal))
-
-#define IsPrivateKeypadKey(keysym) \
-  (((KeySym)(keysym) >= 0x11000000) && ((KeySym)(keysym) <= 0x1100FFFF))
-
-#define IsCursorKey(keysym) \
-  (((KeySym)(keysym) >= XK_Home)     && ((KeySym)(keysym) <  XK_Select))
-
-#define IsPFKey(keysym) \
-  (((KeySym)(keysym) >= XK_KP_F1)     && ((KeySym)(keysym) <= XK_KP_F4))
-
-#define IsFunctionKey(keysym) \
-  (((KeySym)(keysym) >= XK_F1)       && ((KeySym)(keysym) <= XK_F35))
-
-#define IsMiscFunctionKey(keysym) \
-  (((KeySym)(keysym) >= XK_Select)   && ((KeySym)(keysym) <= XK_Break))
-
-#define IsModifierKey(keysym) \
-  ((((KeySym)(keysym) >= XK_Shift_L) && ((KeySym)(keysym) <= XK_Hyper_R)) \
-   || ((KeySym)(keysym) == XK_Mode_switch) \
-   || ((KeySym)(keysym) == XK_Num_Lock))
-/*
- * opaque reference to Region data type 
- */
-typedef struct _XRegion *Region; 
-
-/* Return values from XRectInRegion() */
- 
-#define RectangleOut 0
-#define RectangleIn  1
-#define RectanglePart 2
- 
-
-/*
- * Information used by the visual utility routines to find desired visual
- * type from the many visuals a display may support.
- */
-
-typedef struct {
-  Visual *visual;
-  VisualID visualid;
-  int screen;
-  int depth;
-#if defined(__cplusplus) || defined(c_plusplus)
-  int c_class;					/* C++ */
-#else
-  int class;
-#endif
-  unsigned long red_mask;
-  unsigned long green_mask;
-  unsigned long blue_mask;
-  int colormap_size;
-  int bits_per_rgb;
-} XVisualInfo;
-
-#define VisualNoMask		0x0
-#define VisualIDMask 		0x1
-#define VisualScreenMask	0x2
-#define VisualDepthMask		0x4
-#define VisualClassMask		0x8
-#define VisualRedMaskMask	0x10
-#define VisualGreenMaskMask	0x20
-#define VisualBlueMaskMask	0x40
-#define VisualColormapSizeMask	0x80
-#define VisualBitsPerRGBMask	0x100
-#define VisualAllMask		0x1FF
-
-/*
- * This defines a window manager property that clients may use to
- * share standard color maps of type RGB_COLOR_MAP:
- */
-typedef struct {
-	Colormap colormap;
-	unsigned long red_max;
-	unsigned long red_mult;
-	unsigned long green_max;
-	unsigned long green_mult;
-	unsigned long blue_max;
-	unsigned long blue_mult;
-	unsigned long base_pixel;
-	VisualID visualid;		/* added by ICCCM version 1 */
-	XID killid;			/* added by ICCCM version 1 */
-} XStandardColormap;
-
-#define ReleaseByFreeingColormap ((XID) 1L)  /* for killid field above */
-
-
-/*
- * return codes for XReadBitmapFile and XWriteBitmapFile
- */
-#define BitmapSuccess		0
-#define BitmapOpenFailed 	1
-#define BitmapFileInvalid 	2
-#define BitmapNoMemory		3
-
-/****************************************************************
- *
- * Context Management
- *
- ****************************************************************/
-
-
-/* Associative lookup table return codes */
-
-#define XCSUCCESS 0	/* No error. */
-#define XCNOMEM   1    /* Out of memory */
-#define XCNOENT   2    /* No entry in table */
-
-typedef int XContext;
-
-#define XUniqueContext()       ((XContext) XrmUniqueQuark())
-#define XStringToContext(string)   ((XContext) XrmStringToQuark(string))
-
-_XFUNCPROTOBEGIN
-
-/* The following declarations are alphabetized. */
-
-extern XClassHint *XAllocClassHint (
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern XIconSize *XAllocIconSize (
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern XSizeHints *XAllocSizeHints (
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern XStandardColormap *XAllocStandardColormap (
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern XWMHints *XAllocWMHints (
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern int XClipBox(
-#if NeedFunctionPrototypes
-    Region		/* r */,
-    XRectangle*		/* rect_return */
-#endif
-);
-
-extern Region XCreateRegion(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern char *XDefaultString(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern int XDeleteContext(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    XID			/* rid */,
-    XContext		/* context */
-#endif
-);
-
-extern int XDestroyRegion(
-#if NeedFunctionPrototypes
-    Region		/* r */
-#endif
-);
-
-extern int XEmptyRegion(
-#if NeedFunctionPrototypes
-    Region		/* r */
-#endif
-);
-
-extern int XEqualRegion(
-#if NeedFunctionPrototypes
-    Region		/* r1 */,
-    Region		/* r2 */
-#endif
-);
-
-extern int XFindContext(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    XID			/* rid */,
-    XContext		/* context */,
-    XPointer*		/* data_return */
-#endif
-);
-
-extern Status XGetClassHint(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XClassHint*		/* class_hints_return */
-#endif
-);
-
-extern Status XGetIconSizes(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XIconSize**		/* size_list_return */,
-    int*		/* count_return */
-#endif
-);
-
-extern Status XGetNormalHints(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XSizeHints*		/* hints_return */
-#endif
-);
-
-extern Status XGetRGBColormaps(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XStandardColormap** /* stdcmap_return */,
-    int*		/* count_return */,
-    Atom		/* property */
-#endif
-);
-
-extern Status XGetSizeHints(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XSizeHints*		/* hints_return */,
-    Atom		/* property */
-#endif
-);
-
-extern Status XGetStandardColormap(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XStandardColormap*	/* colormap_return */,
-    Atom		/* property */			    
-#endif
-);
-
-extern Status XGetTextProperty(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* window */,
-    XTextProperty*	/* text_prop_return */,
-    Atom		/* property */
-#endif
-);
-
-extern XVisualInfo *XGetVisualInfo(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    long		/* vinfo_mask */,
-    XVisualInfo*	/* vinfo_template */,
-    int*		/* nitems_return */
-#endif
-);
-
-extern Status XGetWMClientMachine(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XTextProperty*	/* text_prop_return */
-#endif
-);
-
-extern XWMHints *XGetWMHints(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */		      
-#endif
-);
-
-extern Status XGetWMIconName(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XTextProperty*	/* text_prop_return */
-#endif
-);
-
-extern Status XGetWMName(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XTextProperty*	/* text_prop_return */
-#endif
-);
-
-extern Status XGetWMNormalHints(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XSizeHints*		/* hints_return */,
-    long*		/* supplied_return */ 
-#endif
-);
-
-extern Status XGetWMSizeHints(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XSizeHints*		/* hints_return */,
-    long*		/* supplied_return */,
-    Atom		/* property */
-#endif
-);
-
-extern Status XGetZoomHints(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XSizeHints*		/* zhints_return */
-#endif
-);
-
-extern int XIntersectRegion(
-#if NeedFunctionPrototypes
-    Region		/* sra */,
-    Region		/* srb */,
-    Region		/* dr_return */
-#endif
-);
-
-extern void XConvertCase(
-#if NeedFunctionPrototypes
-    KeySym		/* sym */,
-    KeySym*		/* lower */,
-    KeySym*		/* upper */
-#endif
-);
-
-extern int XLookupString(
-#if NeedFunctionPrototypes
-    XKeyEvent*		/* event_struct */,
-    char*		/* buffer_return */,
-    int			/* bytes_buffer */,
-    KeySym*		/* keysym_return */,
-    XComposeStatus*	/* status_in_out */
-#endif
-);
-
-extern Status XMatchVisualInfo(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* screen */,
-    int			/* depth */,
-    int			/* class */,
-    XVisualInfo*	/* vinfo_return */
-#endif
-);
-
-extern int XOffsetRegion(
-#if NeedFunctionPrototypes
-    Region		/* r */,
-    int			/* dx */,
-    int			/* dy */
-#endif
-);
-
-extern Bool XPointInRegion(
-#if NeedFunctionPrototypes
-    Region		/* r */,
-    int			/* x */,
-    int			/* y */
-#endif
-);
-
-extern Region XPolygonRegion(
-#if NeedFunctionPrototypes
-    XPoint*		/* points */,
-    int			/* n */,
-    int			/* fill_rule */
-#endif
-);
-
-extern int XRectInRegion(
-#if NeedFunctionPrototypes
-    Region		/* r */,
-    int			/* x */,
-    int			/* y */,
-    unsigned int	/* width */,
-    unsigned int	/* height */
-#endif
-);
-
-extern int XSaveContext(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    XID			/* rid */,
-    XContext		/* context */,
-    _Xconst char*	/* data */
-#endif
-);
-
-extern int XSetClassHint(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XClassHint*		/* class_hints */
-#endif
-);
-
-extern int XSetIconSizes(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XIconSize*		/* size_list */,
-    int			/* count */    
-#endif
-);
-
-extern int XSetNormalHints(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XSizeHints*		/* hints */
-#endif
-);
-
-extern void XSetRGBColormaps(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XStandardColormap*	/* stdcmaps */,
-    int			/* count */,
-    Atom		/* property */
-#endif
-);
-
-extern int XSetSizeHints(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XSizeHints*		/* hints */,
-    Atom		/* property */
-#endif
-);
-
-extern int XSetStandardProperties(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    _Xconst char*	/* window_name */,
-    _Xconst char*	/* icon_name */,
-    Pixmap		/* icon_pixmap */,
-    char**		/* argv */,
-    int			/* argc */,
-    XSizeHints*		/* hints */
-#endif
-);
-
-extern void XSetTextProperty(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XTextProperty*	/* text_prop */,
-    Atom		/* property */
-#endif
-);
-
-extern void XSetWMClientMachine(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XTextProperty*	/* text_prop */
-#endif
-);
-
-extern int XSetWMHints(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XWMHints*		/* wm_hints */
-#endif
-);
-
-extern void XSetWMIconName(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XTextProperty*	/* text_prop */
-#endif
-);
-
-extern void XSetWMName(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XTextProperty*	/* text_prop */
-#endif
-);
-
-extern void XSetWMNormalHints(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XSizeHints*		/* hints */
-#endif
-);
-
-extern void XSetWMProperties(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XTextProperty*	/* window_name */,
-    XTextProperty*	/* icon_name */,
-    char**		/* argv */,
-    int			/* argc */,
-    XSizeHints*		/* normal_hints */,
-    XWMHints*		/* wm_hints */,
-    XClassHint*		/* class_hints */
-#endif
-);
-
-extern void XmbSetWMProperties(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    _Xconst char*	/* window_name */,
-    _Xconst char*	/* icon_name */,
-    char**		/* argv */,
-    int			/* argc */,
-    XSizeHints*		/* normal_hints */,
-    XWMHints*		/* wm_hints */,
-    XClassHint*		/* class_hints */
-#endif
-);
-
-extern void XSetWMSizeHints(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XSizeHints*		/* hints */,
-    Atom		/* property */
-#endif
-);
-
-extern int XSetRegion(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */,
-    Region		/* r */
-#endif
-);
-
-extern void XSetStandardColormap(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XStandardColormap*	/* colormap */,
-    Atom		/* property */
-#endif
-);
-
-extern int XSetZoomHints(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XSizeHints*		/* zhints */
-#endif
-);
-
-extern int XShrinkRegion(
-#if NeedFunctionPrototypes
-    Region		/* r */,
-    int			/* dx */,
-    int			/* dy */
-#endif
-);
-
-extern Status XStringListToTextProperty(
-#if NeedFunctionPrototypes
-    char**		/* list */,
-    int			/* count */,
-    XTextProperty*	/* text_prop_return */
-#endif
-);
-
-extern int XSubtractRegion(
-#if NeedFunctionPrototypes
-    Region		/* sra */,
-    Region		/* srb */,
-    Region		/* dr_return */
-#endif
-);
-
-extern int XmbTextListToTextProperty(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    char**		/* list */,
-    int			/* count */,
-    XICCEncodingStyle	/* style */,
-    XTextProperty*	/* text_prop_return */
-#endif
-);
-
-extern int XwcTextListToTextProperty(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    wchar_t**		/* list */,
-    int			/* count */,
-    XICCEncodingStyle	/* style */,
-    XTextProperty*	/* text_prop_return */
-#endif
-);
-
-extern void XwcFreeStringList(
-#if NeedFunctionPrototypes
-    wchar_t**		/* list */
-#endif
-);
-
-extern Status XTextPropertyToStringList(
-#if NeedFunctionPrototypes
-    XTextProperty*	/* text_prop */,
-    char***		/* list_return */,
-    int*		/* count_return */
-#endif
-);
-
-extern int XmbTextPropertyToTextList(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    XTextProperty*	/* text_prop */,
-    char***		/* list_return */,
-    int*		/* count_return */
-#endif
-);
-
-extern int XwcTextPropertyToTextList(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    XTextProperty*	/* text_prop */,
-    wchar_t***		/* list_return */,
-    int*		/* count_return */
-#endif
-);
-
-extern int XUnionRectWithRegion(
-#if NeedFunctionPrototypes
-    XRectangle*		/* rectangle */,
-    Region		/* src_region */,
-    Region		/* dest_region_return */
-#endif
-);
-
-extern int XUnionRegion(
-#if NeedFunctionPrototypes
-    Region		/* sra */,
-    Region		/* srb */,
-    Region		/* dr_return */
-#endif
-);
-
-extern int XWMGeometry(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    int			/* screen_number */,
-    _Xconst char*	/* user_geometry */,
-    _Xconst char*	/* default_geometry */,
-    unsigned int	/* border_width */,
-    XSizeHints*		/* hints */,
-    int*		/* x_return */,
-    int*		/* y_return */,
-    int*		/* width_return */,
-    int*		/* height_return */,
-    int*		/* gravity_return */
-#endif
-);
-
-extern int XXorRegion(
-#if NeedFunctionPrototypes
-    Region		/* sra */,
-    Region		/* srb */,
-    Region		/* dr_return */
-#endif
-);
-
-_XFUNCPROTOEND
-
-#endif /* _XUTIL_H_ */
diff --git a/xc/lib/X11/cmsAllCol.c b/xc/lib/X11/cmsAllCol.c
deleted file mode 100644
index 2abdd282c..000000000
--- a/xc/lib/X11/cmsAllCol.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* $XConsortium: cmsAllCol.c,v 1.5 91/05/13 23:03:17 rws Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		XcmsAllCol.c
- *
- *	DESCRIPTION
- *		Source for XcmsAllocColor
- *
- *
- */
-/* $XFree86: xc/lib/X11/cmsAllCol.c,v 1.2 1999/05/09 10:50:27 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/* EXTERNS */
-
-/* SetGetCols.c */
-extern Status _XcmsSetGetColors();
-
-
-/*
- *	NAME
- *		XcmsAllocColor - Allocate Color
- *
- *	SYNOPSIS
- */
-Status
-XcmsAllocColor(dpy, colormap, pXcmsColor_in_out, result_format)
-    Display *dpy;
-    Colormap colormap;
-    XcmsColor *pXcmsColor_in_out;
-    XcmsColorFormat result_format;
-/*
- *	DESCRIPTION
- *		Given a device-dependent or device-independent color
- *		specification, XcmsAllocColor will convert it to X RGB
- *		values then use it in a call to XAllocColor.
- *
- *	RETURNS
- *		XcmsFailure if failed;
- *		XcmsSuccess if it succeeded without gamut compression;
- *		XcmsSuccessWithCompression if it succeeded with gamut
- *			compression;
- *
- *		Also returns the pixel value of the color cell and a color
- *		specification of the color actually stored.
- *
- */
-{
-    return(_XcmsSetGetColors (XAllocColor, dpy, colormap, pXcmsColor_in_out, 1,
-	    result_format, (Bool *)NULL));
-}
diff --git a/xc/lib/X11/cmsAllNCol.c b/xc/lib/X11/cmsAllNCol.c
deleted file mode 100644
index 47d5c5046..000000000
--- a/xc/lib/X11/cmsAllNCol.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/* $XConsortium: cmsAllNCol.c,v 1.9 93/09/07 21:32:50 rws Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		XcmsAlNCol.c
- *
- *	DESCRIPTION
- *		Source for XcmsAllocNamedColor
- *
- *
- */
-/* $XFree86: xc/lib/X11/cmsAllNCol.c,v 1.2 1999/05/09 10:50:28 dawes Exp $ */
-
-#define NEED_REPLIES
-#include <stdio.h>
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/*
- *      EXTERNS
- */
-extern void _XColor_to_XcmsRGB();
-extern void _XcmsRGB_to_XColor();
-
-/* cmsColNm.c */
-extern Status _XcmsResolveColorString();
-
-
-/*
- *	NAME
- *		XcmsAllocNamedColor - 
- *
- *	SYNOPSIS
- */
-#if NeedFunctionPrototypes
-Status
-XcmsAllocNamedColor (
-    Display *dpy,
-    Colormap cmap,
-    _Xconst char *colorname,
-    XcmsColor *pColor_scrn_return,
-    XcmsColor *pColor_exact_return,
-    XcmsColorFormat result_format)
-#else
-Status
-XcmsAllocNamedColor(dpy, cmap, colorname, pColor_scrn_return,
-	pColor_exact_return, result_format)
-    Display *dpy;
-    Colormap cmap;
-    char *colorname;
-    XcmsColor *pColor_scrn_return;
-    XcmsColor *pColor_exact_return;
-    XcmsColorFormat result_format;
-#endif
-/*
- *	DESCRIPTION
- *		Finds the color specification associated with the color
- *		name in the Device-Independent Color Name Database, then
- *		converts that color specification to an RGB format.  This
- *		RGB value is then used in a call to XAllocColor to allocate
- *		a read-only color cell.
- *
- *	RETURNS
- *		0 if failed to parse string or find any entry in the database.
- *		1 if succeeded in converting color name to XcmsColor.
- *		2 if succeeded in converting color name to another color name.
- *
- */
-{
-    long nbytes;
-    xAllocNamedColorReply rep;
-    xAllocNamedColorReq *req;
-    XColor hard_def;
-    XColor exact_def;
-    Status retval1 = 1;
-    Status retval2 = XcmsSuccess;
-    XcmsColor tmpColor;
-    XColor XColor_in_out;
-    XcmsCCC ccc;
-
-    /*
-     * 0. Check for invalid arguments.
-     */
-    if (dpy == NULL || colorname[0] == '\0' || pColor_scrn_return == 0
-	    || pColor_exact_return == NULL) {
-	return(XcmsFailure);
-    }
-
-    if ((ccc = XcmsCCCOfColormap(dpy, cmap)) == (XcmsCCC)NULL) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * 1. Convert string to a XcmsColor using Xcms and i18n mechanism
-     */
-    if ((retval1 = _XcmsResolveColorString(ccc, &colorname,
-	    &tmpColor, result_format)) == XcmsFailure) {
-	return(XcmsFailure);
-    }
-    if (retval1 == _XCMS_NEWNAME) {
-	goto PassToServer;
-    }
-    memcpy((char *)pColor_exact_return, (char *)&tmpColor, sizeof(XcmsColor));
-
-    /*
-     * 2. Convert tmpColor to RGB
-     *	Assume pColor_exact_return is now adjusted to Client White Point
-     */
-    if ((retval2 = XcmsConvertColors(ccc, &tmpColor,
-	    1, XcmsRGBFormat, (Bool *) NULL)) == XcmsFailure) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * 3. Convert to XColor and call XAllocColor
-     */
-    _XcmsRGB_to_XColor(&tmpColor, &XColor_in_out, 1);
-    if (XAllocColor(ccc->dpy, cmap, &XColor_in_out) == 0) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * 4. pColor_scrn_return
-     *
-     * Now convert to the target format.
-     *    We can ignore the return value because we're already in a
-     *    device-dependent format.
-     */
-    _XColor_to_XcmsRGB(ccc, &XColor_in_out, pColor_scrn_return, 1);
-    if (result_format != XcmsRGBFormat) {
-	if (result_format == XcmsUndefinedFormat) {
-	    result_format = pColor_exact_return->format;
-	}
-	if (XcmsConvertColors(ccc, pColor_scrn_return, 1, result_format,
-		(Bool *) NULL) == XcmsFailure) {
-	    return(XcmsFailure);
-	}
-    }
-
-    return(retval1 > retval2 ? retval1 : retval2);
-
-PassToServer:
-    /*
-     * All previous methods failed, so lets pass it to the server
-     * for parsing.
-     */
-    dpy = ccc->dpy;
-    LockDisplay(dpy);
-    GetReq(AllocNamedColor, req);
-
-    req->cmap = cmap;
-    nbytes = req->nbytes = strlen(colorname);
-    req->length += (nbytes + 3) >> 2; /* round up to mult of 4 */
-
-    _XSend(dpy, colorname, nbytes);
-       /* _XSend is more efficient that Data, since _XReply follows */
-
-    if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) {
-	UnlockDisplay(dpy);
-        SyncHandle();
-        return (0);
-    }
-
-    exact_def.red = rep.exactRed;
-    exact_def.green = rep.exactGreen;
-    exact_def.blue = rep.exactBlue;
-
-    hard_def.red = rep.screenRed;
-    hard_def.green = rep.screenGreen;
-    hard_def.blue = rep.screenBlue;
-
-    exact_def.pixel = hard_def.pixel = rep.pixel;
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-
-    /*
-     * Now convert to the target format.
-     */
-    _XColor_to_XcmsRGB(ccc, &exact_def, pColor_exact_return, 1);
-    _XColor_to_XcmsRGB(ccc, &hard_def, pColor_scrn_return, 1);
-    if (result_format != XcmsRGBFormat
-	    && result_format != XcmsUndefinedFormat) {
-	if (XcmsConvertColors(ccc, pColor_exact_return, 1, result_format,
-		(Bool *) NULL) == XcmsFailure) {
-	    return(XcmsFailure);
-	}
-	if (XcmsConvertColors(ccc, pColor_scrn_return, 1, result_format,
-		(Bool *) NULL) == XcmsFailure) {
-	    return(XcmsFailure);
-	}
-    }
-
-    return(XcmsSuccess);
-}
diff --git a/xc/lib/X11/cmsCmap.c b/xc/lib/X11/cmsCmap.c
deleted file mode 100644
index eb5fdac6c..000000000
--- a/xc/lib/X11/cmsCmap.c
+++ /dev/null
@@ -1,492 +0,0 @@
-/* $XConsortium: cmsCmap.c,v 1.17 95/04/27 18:28:37 converse Exp $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		XcmsCmap.c - Client Colormap Management Routines
- *
- *	DESCRIPTION
- *		Routines that store additional information about
- *		colormaps being used by the X Client.
- *
- *
- */
-
-#define NEED_EVENTS
-#define NEED_REPLIES
-#include "Xlibint.h"
-#include "Xcmsint.h"
-#include "Xutil.h"
-
-/*
- *      FORWARD DECLARATIONS
- */
-XcmsCmapRec *_XcmsAddCmapRec();
-static void _XcmsFreeClientCmaps();
-
-
-/************************************************************************
- *									*
- *			PRIVATE INTERFACES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		CmapRecForColormap
- *
- *	SYNOPSIS
- */
-static XcmsCmapRec *
-CmapRecForColormap(dpy, cmap)
-    Display *dpy;
-    Colormap cmap;
-/*
- *	DESCRIPTION
- *		Find the corresponding XcmsCmapRec for cmap.  In not found
- *		this routines attempts to create one.
- *
- *	RETURNS
- *		Returns NULL if failed; otherwise the address to
- *		the corresponding XcmsCmapRec.
- *
- */
-{
-    XcmsCmapRec *pRec;
-    int nScrn;
-    int i, j;
-    XVisualInfo visualTemplate;	/* Template of the visual we want */
-    XVisualInfo *visualList;	/* List for visuals that match */
-    int nVisualsMatched;	/* Number of visuals that match */
-    Window tmpWindow;
-    Visual *vp;
-    unsigned long border = 0;
-    _XAsyncHandler async;
-    _XAsyncErrorState async_state;
-
-    for (pRec = (XcmsCmapRec *)dpy->cms.clientCmaps; pRec != NULL;
-	    pRec = pRec->pNext) {
-	if (pRec->cmapID == cmap) {
-	    return(pRec);
-	}
-    }
-
-    /*
-     * Can't find an XcmsCmapRec associated with cmap in our records.
-     * Let's try to see if its a default colormap
-     */
-    nScrn = ScreenCount(dpy);
-    for (i = 0; i < nScrn; i++) {
-	if (cmap == DefaultColormap(dpy, i)) {
-	    /* It is ... lets go ahead and store that info */
-	    if ((pRec = _XcmsAddCmapRec(dpy, cmap, RootWindow(dpy, i),
-		    DefaultVisual(dpy, i))) == NULL) {
-		return((XcmsCmapRec *)NULL);
-	    }
-	    pRec->ccc = XcmsCreateCCC(
-		    dpy,
-		    i,			/* screenNumber */
-		    DefaultVisual(dpy, i),
-		    (XcmsColor *)NULL,	/* clientWhitePt */
-		    (XcmsCompressionProc)NULL,  /* gamutCompProc */
-		    (XPointer)NULL,	/* gamutCompClientData */
-		    (XcmsWhiteAdjustProc)NULL,  /* whitePtAdjProc */
-		    (XPointer)NULL	/* whitePtAdjClientData */
-		    );
-	    return(pRec);
-	}
-    }
-
-    /*
-     * Nope, its not a default colormap, so it's probably a foreign color map
-     * of which we have no specific details.  Let's go through the
-     * rigorous process of finding this colormap:
-     *        for each screen
-     *            for each screen's visual types
-     *                create a window with cmap specified as the colormap
-     *                if successful
-     *                    Add a CmapRec
-     *                    Create an XcmsCCC
-     *                    return the CmapRec
-     *                else
-     *                    continue
-     */
-
-    async_state.error_code = 0; /* don't care */
-    async_state.major_opcode = X_CreateWindow;
-    async_state.minor_opcode = 0;
-    for (i = 0; i < nScrn; i++) {
-	visualTemplate.screen = i;
-	visualList = XGetVisualInfo(dpy, VisualScreenMask, &visualTemplate,
-	    &nVisualsMatched);
-	if (nVisualsMatched == 0) {
-	    continue;
-	}
-
-	/*
-	 * Attempt to create a window with cmap
-	 */
-	j = 0;
-	do {
-	    vp = (visualList+j)->visual;
-	    LockDisplay(dpy);
-	    {
-		register xCreateWindowReq *req;
-
-		GetReq(CreateWindow, req);
-		async_state.min_sequence_number = dpy->request;
-		async_state.max_sequence_number = dpy->request;
-		async_state.error_count = 0;
-		async.next = dpy->async_handlers;
-		async.handler = _XAsyncErrorHandler;
-		async.data = (XPointer)&async_state;
-		dpy->async_handlers = &async;
-		req->parent = RootWindow(dpy, i);
-		req->x = 0;
-		req->y = 0;
-		req->width = 1;
-		req->height = 1;
-		req->borderWidth = 0;
-		req->depth = (visualList+j)->depth;
-		req->class = CopyFromParent;
-		req->visual = vp->visualid;
-		tmpWindow = req->wid = XAllocID(dpy);
-		req->mask = CWBorderPixel | CWColormap;
-		req->length += 2;
-		Data32 (dpy, (long *) &border, 4);
-		Data32 (dpy, (long *) &cmap, 4);
-	    }
-	    {
-		xGetInputFocusReply rep;
-		register xReq *req;
-
-		GetEmptyReq(GetInputFocus, req);
-		(void) _XReply (dpy, (xReply *)&rep, 0, xTrue);
-	    }
-	    DeqAsyncHandler(dpy, &async);
-	    UnlockDisplay(dpy);
-	    SyncHandle();
-	} while (async_state.error_count > 0 && ++j < nVisualsMatched);
-
-	Xfree((char *)visualList);
-
-	/*
-	 * if successful
-	 */
-	if (j < nVisualsMatched) {
-	    if ((pRec = _XcmsAddCmapRec(dpy, cmap, tmpWindow, vp)) == NULL)
-		return((XcmsCmapRec *)NULL);
-	    pRec->ccc = XcmsCreateCCC(
-		    dpy,
-		    i,			/* screenNumber */
-		    vp,
-		    (XcmsColor *)NULL,	/* clientWhitePt */
-		    (XcmsCompressionProc)NULL,  /* gamutCompProc */
-		    (XPointer)NULL,	/* gamutCompClientData */
-		    (XcmsWhiteAdjustProc)NULL,  /* whitePtAdjProc */
-		    (XPointer)NULL	/* whitePtAdjClientData */
-		    );
-	    XDestroyWindow(dpy, tmpWindow);
-	    return(pRec);
-	}
-    }
-
-    return(NULL);
-}
-
-
-
-/************************************************************************
- *									*
- *			API PRIVATE INTERFACES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		_XcmsAddCmapRec
- *
- *	SYNOPSIS
- */
-XcmsCmapRec *
-_XcmsAddCmapRec(dpy, cmap, windowID, visual)
-    Display *dpy;
-    Colormap cmap;
-    Window windowID;
-    Visual *visual;
-/*
- *	DESCRIPTION
- *		Create an XcmsCmapRec for the specified cmap, windowID,
- *		and visual, then adds it to its list of CmapRec's.
- *
- *	RETURNS
- *		Returns NULL if failed; otherwise the address to
- *		the added XcmsCmapRec.
- *
- */
-{
-    XcmsCmapRec *pNew;
-
-    if ((pNew = (XcmsCmapRec *) Xcalloc(1, (unsigned) sizeof(XcmsCmapRec)))
-	    == NULL) {
-	return((XcmsCmapRec *)NULL);
-    }
-
-    pNew->cmapID = cmap;
-    pNew->dpy = dpy;
-    pNew->windowID = windowID;
-    pNew->visual = visual;
-    pNew->pNext = (XcmsCmapRec *)dpy->cms.clientCmaps;
-    dpy->cms.clientCmaps = (XPointer)pNew;
-    dpy->free_funcs->clientCmaps = _XcmsFreeClientCmaps;
-
-    /*
-     * Note, we don't create the XcmsCCC for pNew->ccc here because
-     * it may require the use of XGetWindowAttributes (a round trip request)
-     * to determine the screen.
-     */
-    return(pNew);
-}
-
-
-/*
- *	NAME
- *		_XcmsCopyCmapRecAndFree
- *
- *	SYNOPSIS
- */
-XcmsCmapRec *
-_XcmsCopyCmapRecAndFree(dpy, src_cmap, copy_cmap)
-    Display *dpy;
-    Colormap src_cmap;
-    Colormap copy_cmap;
-/*
- *	DESCRIPTION
- *		Augments Xlib's XCopyColormapAndFree() to copy
- *		XcmsCmapRecs.
- *
- *	RETURNS
- *		Returns NULL if failed; otherwise the address to
- *		the copy XcmsCmapRec.
- *
- */
-{
-    XcmsCmapRec *pRec_src;
-    XcmsCmapRec *pRec_copy;
-
-    if ((pRec_src = CmapRecForColormap(dpy, src_cmap)) != NULL) {
-	pRec_copy =_XcmsAddCmapRec(dpy, copy_cmap, pRec_src->windowID,
-		pRec_src->visual);
-	if (pRec_copy != NULL && pRec_src->ccc) {
-	    pRec_copy->ccc = (XcmsCCC)Xcalloc(1, (unsigned) sizeof(XcmsCCCRec));
-	    memcpy((char *)pRec_copy->ccc, (char *)pRec_src->ccc,
-		   sizeof(XcmsCCCRec));
-	}
-	return(pRec_copy);
-    }
-    return((XcmsCmapRec *)NULL);
-}
-
-
-/*
- *	NAME
- *		_XcmsDeleteCmapRec
- *
- *	SYNOPSIS
- */
-void
-_XcmsDeleteCmapRec(dpy, cmap)
-    Display *dpy;
-    Colormap cmap;
-/*
- *	DESCRIPTION
- *		Removes and frees the specified XcmsCmapRec structure
- *		from the linked list of structures.
- *
- *	RETURNS
- *		void
- *
- */
-{
-    XcmsCmapRec **pPrevPtr;
-    XcmsCmapRec *pRec;
-    int scr;
-
-    /* If it is the default cmap for a screen, do not delete it,
-     * because the server will not actually free it */
-    for (scr = ScreenCount(dpy); --scr >= 0; ) {
-	if (cmap == DefaultColormap(dpy, scr))
-	    return;
-    }
-
-    /* search for it in the list */
-    pPrevPtr = (XcmsCmapRec **)&dpy->cms.clientCmaps;
-    while ((pRec = *pPrevPtr) && (pRec->cmapID != cmap)) {
-	pPrevPtr = &pRec->pNext;
-    }
-
-    if (pRec) {
-	if (pRec->ccc) {
-	    XcmsFreeCCC(pRec->ccc);
-	}
-	*pPrevPtr = pRec->pNext;
-	Xfree((char *)pRec);
-    }
-}
-
-
-/*
- *	NAME
- *		_XcmsFreeClientCmaps
- *
- *	SYNOPSIS
- */
-static void
-_XcmsFreeClientCmaps(dpy)
-    Display *dpy;
-/*
- *	DESCRIPTION
- *		Frees all XcmsCmapRec structures in the linked list
- *		and sets dpy->cms.clientCmaps to NULL.
- *
- *	RETURNS
- *		void
- *
- */
-{
-    XcmsCmapRec *pRecNext, *pRecFree;
-
-    pRecNext = (XcmsCmapRec *)dpy->cms.clientCmaps;
-    while (pRecNext != NULL) {
-	pRecFree = pRecNext;
-	pRecNext = pRecNext->pNext;
-	if (pRecFree->ccc) {
-	    /* Free the XcmsCCC structure */
-	    XcmsFreeCCC(pRecFree->ccc);
-	}
-	/* Now free the XcmsCmapRec structure */
-	Xfree((char *)pRecFree);
-    }
-    dpy->cms.clientCmaps = (XPointer)NULL;
-}
-
-
-
-/************************************************************************
- *									*
- *			PUBLIC INTERFACES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsCCCOfColormap
- *
- *	SYNOPSIS
- */
-XcmsCCC 
-XcmsCCCOfColormap(dpy, cmap)
-    Display *dpy;
-    Colormap cmap;
-/*
- *	DESCRIPTION
- *		Finds the XcmsCCC associated with the specified colormap.
- *
- *	RETURNS
- *		Returns NULL if failed; otherwise the address to
- *		the associated XcmsCCC structure.
- *
- */
-{
-    XWindowAttributes windowAttr;
-    XcmsCmapRec *pRec;
-    int nScrn = ScreenCount(dpy);
-    int i;
-
-    if ((pRec = CmapRecForColormap(dpy, cmap)) != NULL) {
-	if (pRec->ccc) {
-	    /* XcmsCmapRec already has a XcmsCCC */
-	    return(pRec->ccc);
-	}
-
-	/*
-	 * The XcmsCmapRec does not have a XcmsCCC yet, so let's create
-	 * one.  But first, we need to know the screen associated with
-	 * cmap, so use XGetWindowAttributes() to extract that
-	 * information.  Unless, of course there is only one screen!!
-	 */
-	if (nScrn == 1) {
-	    /* Assume screenNumber == 0 */
-	    return(pRec->ccc = XcmsCreateCCC(
-		    dpy,
-		    0,			/* screenNumber */
-		    pRec->visual,
-		    (XcmsColor *)NULL,	/* clientWhitePt */
-		    (XcmsCompressionProc)NULL,  /* gamutCompProc */
-		    (XPointer)NULL,	/* gamutCompClientData */
-		    (XcmsWhiteAdjustProc)NULL,  /* whitePtAdjProc */
-		    (XPointer)NULL	/* whitePtAdjClientData */
-		    ));
-	} else {
-	    if (XGetWindowAttributes(dpy, pRec->windowID, &windowAttr)) {
-		for (i = 0; i < nScrn; i++) {
-		    if (ScreenOfDisplay(dpy, i) == windowAttr.screen) {
-			return(pRec->ccc = XcmsCreateCCC(
-				dpy,
-				i,		   /* screenNumber */
-				pRec->visual,
-				(XcmsColor *)NULL, /* clientWhitePt */
-				(XcmsCompressionProc)NULL, /* gamutCompProc */
-				(XPointer)NULL,	   /* gamutCompClientData */
-				(XcmsWhiteAdjustProc)NULL, /* whitePtAdjProc */
-				(XPointer)NULL	   /* whitePtAdjClientData */
-				));
-		    }
-		}
-	    }
-	}
-    }
-
-    /*
-     * No such cmap
-     */
-    return(NULL);
-}
-
-XcmsCCC XcmsSetCCCOfColormap(dpy, cmap, ccc)
-    Display *dpy;
-    Colormap cmap;
-    XcmsCCC ccc;
-{
-    XcmsCCC prev_ccc = NULL;
-    XcmsCmapRec *pRec;
-
-    pRec = CmapRecForColormap(dpy, cmap);
-    if (pRec) {
-	prev_ccc = pRec->ccc;
-	pRec->ccc = ccc;
-    }
-    return prev_ccc;
-}
diff --git a/xc/lib/X11/cmsColNm.c b/xc/lib/X11/cmsColNm.c
deleted file mode 100644
index 5bfcce73e..000000000
--- a/xc/lib/X11/cmsColNm.c
+++ /dev/null
@@ -1,1061 +0,0 @@
-/* $TOG: cmsColNm.c /main/32 1998/03/13 14:14:50 barstow $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *	NAME
- *		XcmsColNm.c
- *
- *	DESCRIPTION
- *		Source for _XcmsLookupColorName().
- *
- *
- */
-/* $XFree86: xc/lib/X11/cmsColNm.c,v 3.5 1999/05/09 10:50:28 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-#include <X11/Xos.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <ctype.h>
-#define XK_LATIN1
-#include <X11/keysymdef.h>
-
-
-/*
- *      EXTERNS
- *              External declarations required locally to this package
- *              that are not already declared in any of the included header
- *		files (external includes or internal includes).
- */
-#ifdef X_NOT_STDC_ENV
-extern char *getenv();
-extern void qsort();
-extern char *bsearch();
-#endif
-extern XcmsColorSpace **_XcmsDIColorSpaces;
-
-/* CvCols.c */
-extern Status _XcmsDDConvertColors();
-extern int _XcmsEqualWhitePts();
-extern Status _XcmsDIConvertColors();
-
-
-static Status LoadColornameDB();
-void _XcmsCopyISOLatin1Lowered();
-
-
-/*
- *      LOCAL DEFINES
- *		#define declarations local to this package.
- */
-#ifndef XCMSDB
-#define XCMSDB  "/usr/lib/X11/Xcms.txt"
-#endif
-
-#ifndef isgraph
-#  define isgraph(c)	(isprint((c)) && !isspace((c)))
-#endif
-
-#ifndef XCMSDB_MAXLINELEN
-#  define XCMSDB_MAXLINELEN	256
-#endif
-
-#define FORMAT_VERSION	"0.1"
-#define START_TOKEN	"XCMS_COLORDB_START"
-#define END_TOKEN	"XCMS_COLORDB_END"
-#define DELIM_CHAR	'\t'
-
-#define	NOT_VISITED	0x0
-#define	VISITED		0x1
-#define CYCLE		0xFFFF
-#define XcmsDbInitNone		-1
-#define XcmsDbInitFailure	0
-#define XcmsDbInitSuccess	1
-
-/*
- *      LOCAL TYPEDEFS
- */
-typedef struct _XcmsPair {
-    char *first;
-    char *second;
-    int flag;
-} XcmsPair;
-
-/*
- *      LOCAL VARIABLES
- */
-static int XcmsColorDbState = XcmsDbInitNone;
-static int nEntries;
-static char *strings;
-static XcmsPair *pairs;
-static char whitePtStr[] = "WhitePoint";
-
-
-/************************************************************************
- *									*
- *			PRIVATE ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		_XcmsColorSpaceOfString
- *
- *	SYNOPSIS
- */
-static XcmsColorSpace *
-_XcmsColorSpaceOfString(ccc, color_string)
-    XcmsCCC ccc;
-    char *color_string;
-/*
- *	DESCRIPTION
- *		Returns a pointer to the color space structure
- *		(XcmsColorSpace) associated with the specified color string.
- *
- *	RETURNS
- *		Pointer to matching XcmsColorSpace structure if found;
- *		otherwise NULL.
- *
- *	CAVEATS
- *
- */
-{
-    XcmsColorSpace	**papColorSpaces;
-    int n;
-    char *pchar;
-
-    if ((pchar = strchr(color_string, ':')) == NULL) {
-	return(XcmsFailure);
-    }
-    n = (int)(pchar - color_string);
-
-    if (ccc == NULL) {
-	return(NULL);
-    }
-
-    /*
-     * First try Device-Independent color spaces
-     */
-    papColorSpaces = _XcmsDIColorSpaces;
-    if (papColorSpaces != NULL) {
-	while (*papColorSpaces != NULL) {
-	    if (strncmp((*papColorSpaces)->prefix, color_string, n) == 0 &&
-		!((*papColorSpaces)->prefix)[n]) {
-		return(*papColorSpaces);
-	    }
-	    papColorSpaces++;
-	}
-    }
-
-    /*
-     * Next try Device-Dependent color spaces
-     */
-    papColorSpaces = ((XcmsFunctionSet *)ccc->pPerScrnInfo->functionSet)->DDColorSpaces;
-    if (papColorSpaces != NULL) {
-	while (*papColorSpaces != NULL) {
-	    if (strncmp((*papColorSpaces)->prefix, color_string, n) == 0 &&
-		!((*papColorSpaces)->prefix)[n]) {
-		return(*papColorSpaces);
-	    }
-	    papColorSpaces++;
-	}
-    }
-
-    return(NULL);
-}
-
-
-/*
- *	NAME
- *		_XcmsParseColorString
- *
- *	SYNOPSIS
- */
-static int
-_XcmsParseColorString(ccc, color_string, pColor)
-    XcmsCCC ccc;
-    char *color_string;
-    XcmsColor *pColor;
-/*
- *	DESCRIPTION
- *		Assuming color_string contains a numerical string color
- *		specification, attempts to parse a string into an
- *		XcmsColor structure.		
- *
- *	RETURNS
- *		0 if failed; otherwise non-zero.
- *
- *	CAVEATS
- *		A color string containing a numerical color specification
- *		must be in ISO Latin-1 encoding!
- */
-{
-    XcmsColorSpace	*pColorSpace;
-    char		string_buf[64];
-    char		*string_lowered;
-    int			len;
-    int			res;
-
-    if (ccc == NULL) {
-	return(0);
-    }
-
-    /*
-     * While copying color_string to string_lowered, convert to lowercase
-     */
-    if ((len = strlen(color_string)) >= sizeof(string_buf)) {
-	string_lowered = (char *) Xmalloc(len+1);
-    } else {
-	string_lowered = string_buf;
-    }
-
-    _XcmsCopyISOLatin1Lowered(string_lowered, color_string);
-
-    if (*string_lowered == '#') {
-	if ((pColorSpace = _XcmsColorSpaceOfString(ccc, "rgb:")) != NULL) {
-	    res = (*pColorSpace->parseString)(string_lowered, pColor);
-	    if (len >= sizeof(string_buf)) Xfree(string_lowered);
-	    return res;
-	}
-    }
-
-    if ((pColorSpace = _XcmsColorSpaceOfString(ccc, string_lowered)) != NULL) {
-	res = (*pColorSpace->parseString)(string_lowered, pColor);
-	if (len >= sizeof(string_buf)) Xfree(string_lowered);
-	return res;
-    }
-
-    if (len >= sizeof(string_buf)) Xfree(string_lowered);
-    return(0);
-}
-
-
-/*
- *	NAME
- *		FirstCmp - Compare color names of pair recs
- *
- *	SYNOPSIS
- */
-static int
-FirstCmp(p1, p2)
-#ifdef __STDC__
-    const void *p1, *p2;
-#else
-    XcmsPair *p1, *p2;
-#endif
-/*
- *	DESCRIPTION
- *		Compares the color names of XcmsColorTuples.
- *		This routine is public to allow access from qsort???.
- *
- *	RETURNS
- *		0 if equal;
- *		< 0 if first precedes second,
- *		> 0 if first succeeds second.
- *
- */
-{
-    return(strcmp(((XcmsPair *)p1)->first, ((XcmsPair *)p2)->first));
-}
-
-
-
-/*
- *	NAME
- *		stringSectionSize - determine memory needed for strings
- *
- *	SYNOPSIS
- */
-static void
-SetNoVisit()
-/*
- *	DESCRIPTION
- *
- *	RETURNS
- *		void
- *
- */
-{
-    int i;
-    XcmsPair *pair = pairs;
-
-    for (i = 0; i < nEntries; i++, pair++) {
-	if (pair->flag != CYCLE) {
-	    pair->flag = NOT_VISITED;
-	}
-    }
-}
-
-
-
-
-/*
- *	NAME
- *		field2 - extract two fields
- *
- *	SYNOPSIS
- */
-static int
-field2(pBuf, delim, p1, p2)
-    char *pBuf;
-    char delim;	/* in:  field delimiter */
-    char **p1;	/* in/out: pointer to pointer to field 1 */
-    char **p2;	/* in/out: pointer to pointer to field 2 */
-/*
- *	DESCRIPTION
- *		Extracts two fields from a "record".
- *
- *	RETURNS
- *		XcmsSuccess if succeeded, otherwise XcmsFailure.
- *
- */
-{
-    *p1 = *p2 = NULL;
-
-    /* Find Field 1 */
-    while (!isgraph(*pBuf)) {
-	if ((*pBuf != '\n') || (*pBuf != '\0')) {
-	    return(XcmsFailure);
-	}
-	if (isspace(*pBuf) || (*pBuf == delim)) {
-	    pBuf++;
-	}
-    }
-    *p1 = pBuf;
-
-    /* Find end of Field 2 */
-    while (isprint(*pBuf) && (*pBuf != delim)) {
-	pBuf++;
-    }
-    if ((*pBuf == '\n') || (*pBuf == '\0')) {
-	return(XcmsFailure);
-    }
-    if ((*pBuf == ' ') || (*pBuf == delim)) {
-	*pBuf++ = '\0';	/* stuff end of string character */
-    } else {
-	return(XcmsFailure);
-    }
-
-    /* Find Field 2 */
-    while (!isgraph(*pBuf)) {
-	if ((*pBuf == '\n') || (*pBuf == '\0')) {
-	    return(XcmsFailure);
-	}
-	if (isspace(*pBuf) || (*pBuf == delim)) {
-	    pBuf++;
-	}
-    }
-    *p2 = pBuf;
-
-    /* Find end of Field 2 */
-    while (isprint(*pBuf) && (*pBuf != delim)) {
-	pBuf++;
-    }
-    if (*pBuf != '\0') {
-	*pBuf = '\0';	/* stuff end of string character */
-    }
-
-    return(XcmsSuccess);
-}
-
-
-/*
- *	NAME
- *		_XcmsLookupColorName - Lookup DB entry for a color name
- *
- *	SYNOPSIS
- */
-static Status
-_XcmsLookupColorName(ccc, name, pColor)
-    XcmsCCC ccc;
-    char **name;
-    XcmsColor *pColor;
-/*
- *	DESCRIPTION
- *		Searches for an entry in the Device-Independent Color Name
- *		Database for the specified string.
- *
- *	RETURNS
- *		XcmsFailure if failed to find a matching entry in
- *			the database.
- *		XcmsSuccess if succeeded in converting color name to
- *			XcmsColor.
- *		_XCMS_NEWNAME if succeeded in converting color string (which
- *			is a color name to yet another color name.  Note
- *			that the new name is passed back via 'name'.
- */
- {
-    Status		retval = 0;
-    char		name_lowered_64[64];
-    char		*name_lowered;
-    register int	i, j, left, right;
-    int			len;
-    char		*tmpName;
-    XcmsPair		*pair;
-
-    /*
-     * Check state of Database:
-     *		XcmsDbInitNone
-     *		XcmsDbInitSuccess
-     *		XcmsDbInitFailure
-     */
-    if (XcmsColorDbState == XcmsDbInitFailure) {
-	return(XcmsFailure);
-    }
-    if (XcmsColorDbState == XcmsDbInitNone) {
-	if (!LoadColornameDB()) {
-	    return(XcmsFailure);
-	}
-    }
-
-    SetNoVisit();
-
-    /*
-     * While copying name to name_lowered, convert to lowercase
-     */
-
-    tmpName = *name;
-
-Retry:
-    if ((len = strlen(tmpName)) > 63) {
-	name_lowered = (char *) Xmalloc(len+1);
-    } else {
-	name_lowered = name_lowered_64;
-    }
-
-    _XcmsCopyISOLatin1Lowered(name_lowered, tmpName);
-
-    /*
-     * Now, remove spaces.
-     */
-    for (i = 0, j = 0; j < len; j++) {
-	if (!isspace(name_lowered[j])) {
-	    name_lowered[i++] = name_lowered[j];
-	}
-    }
-    name_lowered[i] = '\0';
-
-    left = 0;
-    right = nEntries - 1;
-    while (left <= right) {
-	i = (left + right) >> 1;
-	pair = &pairs[i];
-	j = strcmp(name_lowered, pair->first);
-	if (j < 0)
-	    right = i - 1;
-	else if (j > 0)
-	    left = i + 1;
-	else {
-	    break;
-	}
-    }
-    if (len > 63) Xfree(name_lowered);
-
-    if (left > right) {
-	if (retval == 2) {
-	    if (*name != tmpName) {
-		*name = tmpName;
-	    }
-	    return(_XCMS_NEWNAME);
-	}
-	return(XcmsFailure);
-    }
-
-    if (pair->flag == CYCLE) {
-	return(XcmsFailure);
-    }
-    if (pair->flag == VISITED) {
-	pair->flag = CYCLE;
-	return(XcmsFailure);
-    }
-	    
-    if (_XcmsParseColorString(ccc, pair->second, pColor) == XcmsSuccess) {
-	/* f2 contains a numerical string specification */
-	return(XcmsSuccess);
-    } else {
-	/* f2 does not contain a numerical string specification */
-	tmpName = pair->second;
-	pair->flag = VISITED;
-	retval = 2;
-	goto Retry;
-    }
-}
-
-
-/*
- *	NAME
- *		RemoveSpaces
- *
- *	SYNOPSIS
- */
-static int
-RemoveSpaces(pString)
-    char *pString;
-/*
- *	DESCRIPTION
- *		Removes spaces from string.
- *
- *	RETURNS
- *		Void
- *
- */
-{
-    int i, count = 0;
-    char *cptr;
-
-    /* REMOVE SPACES */
-    cptr = pString;
-    for (i = strlen(pString); i; i--, cptr++) {
-	if (!isspace(*cptr)) {
-	    *pString++ = *cptr;
-	    count++;
-	}
-    }
-    *pString = '\0';
-    return(count);
-}
-
-
-/*
- *	NAME
- *		stringSectionSize - determine memory needed for strings
- *
- *	SYNOPSIS
- */
-static int
-stringSectionSize(stream, pNumEntries, pSectionSize)
-    FILE *stream;
-    int	*pNumEntries;
-    int	*pSectionSize;
-/*
- *	DESCRIPTION
- *		Determines the amount of memory required to store the
- *		color name strings and also the number of strings.
- *
- *	RETURNS
- *		XcmsSuccess if succeeded, otherwise XcmsFailure.
- *
- */
-{
-    char buf[XCMSDB_MAXLINELEN];
-    char token[XCMSDB_MAXLINELEN];
-    char token2[XCMSDB_MAXLINELEN];
-    char *pBuf;
-    char *f1;
-    char *f2;
-    int i;
-
-    *pNumEntries = 0;
-    *pSectionSize = 0;
-
-    /*
-     * Advance to START_TOKEN
-     *	 Anything before is just considered as comments.
-     */
-
-    while((pBuf = fgets(buf, XCMSDB_MAXLINELEN, stream)) != NULL) {
-	if ((sscanf(buf, "%s %s", token, token2))
-		&& (strcmp(token, START_TOKEN) == 0)) {
-	    if (strcmp(token2, FORMAT_VERSION) != 0) {
-		/* text file not in the right format */
-		return(XcmsFailure);
-	    }
-	    break;
-	} /* else it was just a blank line or comment */
-    }
-
-    if (pBuf == NULL) {
-	return(XcmsFailure);
-    }
-
-    while((pBuf = fgets(buf, XCMSDB_MAXLINELEN, stream)) != NULL) {
-	if ((sscanf(buf, "%s", token)) && (strcmp(token, END_TOKEN) == 0)) {
-	    break;
-	}
-
-	if (field2(buf, DELIM_CHAR, &f1, &f2) != XcmsSuccess) {
-	    return(XcmsFailure);
-	}
-
-	(*pNumEntries)++;
-
-	(*pSectionSize) += (i = strlen(f1)) + 1;
-	for (; i; i--, f1++) {
-	    /* REMOVE SPACES FROM COUNT */
-	    if (isspace(*f1)) {
-		(*pSectionSize)--;
-	    }
-	}
-
-	(*pSectionSize) += (i = strlen(f2)) + 1;
-	for (; i; i--, f2++) {
-	    /* REMOVE SPACES FROM COUNT */
-	    if (isspace(*f2)) {
-		(*pSectionSize)--;
-	    }
-	}
-
-    }
-
-    return(XcmsSuccess);
-}
-
-
-/*
- *	NAME
- *		ReadColornameDB - Read the Color Name Database
- *
- *	SYNOPSIS
- */
-static Status
-ReadColornameDB(stream, pRec, pString)
-    FILE *stream;
-    XcmsPair *pRec;
-    char *pString;
-/*
- *	DESCRIPTION
- *		Loads the Color Name Database from a text file.
- *
- *	RETURNS
- *		XcmsSuccess if succeeded, otherwise XcmsFailure.
- *
- */
-{
-    char buf[XCMSDB_MAXLINELEN];
-    char token[XCMSDB_MAXLINELEN];
-    char token2[XCMSDB_MAXLINELEN];
-    char *f1;
-    char *f2;
-    char *pBuf;
-
-    /*
-     * Advance to START_TOKEN
-     *	 Anything before is just considered as comments.
-     */
-
-    while((pBuf = fgets(buf, XCMSDB_MAXLINELEN, stream)) != NULL) {
-	if ((sscanf(buf, "%s %s", token, token2))
-		&& (strcmp(token, START_TOKEN) == 0)) {
-	    if (strcmp(token2, FORMAT_VERSION) != 0) {
-		/* text file not in the right format */
-		return(XcmsFailure);
-	    }
-	    break;
-	} /* else it was just a blank line or comment */
-    }
-
-    if (pBuf == NULL) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Process lines between START_TOKEN to END_TOKEN
-     */
-
-    while ((pBuf = fgets(buf, XCMSDB_MAXLINELEN, stream)) != NULL) {
-	if ((sscanf(buf, "%s", token)) && (strcmp(token, END_TOKEN) == 0)) {
-	    /*
-	     * Found END_TOKEN so break out of for loop
-	     */
-	    break;
-	}
-
-	/*
-	 * Get pairs
-	 */
-	if (field2(buf, DELIM_CHAR, &f1, &f2) != XcmsSuccess) {
-	    /* Invalid line */
-	    continue;
-	}
-
-	/*
-	 * Add strings
-	 */
-
-	/* Left String */
-	pRec->first = pString;
-	_XcmsCopyISOLatin1Lowered(pString, f1);
-	pString += (1 + RemoveSpaces(pString));
-	pRec->second = pString;
-	/* Right String */
-	_XcmsCopyISOLatin1Lowered(pString, f2);
-	pString += RemoveSpaces(pString) + 1;
-	pRec++;
-
-    }
-
-    return(XcmsSuccess);
-}
-
-
-/*
- *	NAME
- *		LoadColornameDB - Load the Color Name Database
- *
- *	SYNOPSIS
- */
-static Status
-LoadColornameDB()
-/*
- *	DESCRIPTION
- *		Loads the Color Name Database from a text file.
- *
- *	RETURNS
- *		XcmsSuccess if succeeded, otherwise XcmsFailure.
- *
- */
-{
-    int size;
-    FILE *stream;
-    char *pathname;
-    struct stat txt;
-    int length;
-
-    /* use and name of this env var is not part of the standard */
-    /* implementation-dependent feature */
-    if ((pathname = getenv("XCMSDB")) == NULL) {
-	pathname = XCMSDB;
-    }
-#ifdef __EMX__
-    pathname = __XOS2RedirRoot(pathname);
-#endif
-
-    length = strlen(pathname);
-    if ((length == 0) || (length >= (BUFSIZ - 5))){
-	XcmsColorDbState = XcmsDbInitFailure;
-	return(XcmsFailure);
-    }
-
-    if (stat(pathname, &txt)) {
-	/* can't stat file */
-	XcmsColorDbState = XcmsDbInitFailure;
-	return(XcmsFailure);
-    }
-
-    if ((stream = _XFopenFile (pathname, "r")) == NULL) {
-	return(XcmsFailure);
-    }
-
-    stringSectionSize(stream, &nEntries, &size);
-    rewind(stream);
-
-    strings = (char *) Xmalloc(size);
-    pairs = (XcmsPair *)Xcalloc(nEntries, sizeof(XcmsPair));
-
-    ReadColornameDB(stream, pairs, strings);
-    (void) fclose(stream);
-
-    /*
-     * sort the pair recs
-     */
-    qsort((char *)pairs, nEntries, sizeof(XcmsPair), FirstCmp);
-
-    XcmsColorDbState = XcmsDbInitSuccess;
-    return(XcmsSuccess);
-}
-
-
-/************************************************************************
- *									*
- *			API PRIVATE ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		_XcmsCopyISOLatin1Lowered
- *
- *	SYNOPSIS
- */
-void
-_XcmsCopyISOLatin1Lowered(dst, src)
-    char *dst, *src;
-/*
- *	DESCRIPTION
- *		ISO Latin-1 case conversion routine
- *		Identical to XmuCopyISOLatin1Lowered() but provided here
- *		to eliminate need to link with libXmu.a.
- *
- *		IMPLEMENTORS NOTE:
- *		    This routine is also used in XcmsFormatOfPrefix.
- *
- *	RETURNS
- *		Void
- *
- */
-{
-    register unsigned char *dest, *source;
-
-    for (dest = (unsigned char *)dst, source = (unsigned char *)src;
-	 *source;
-	 source++, dest++)
-    {
-	if ((*source >= XK_A) && (*source <= XK_Z))
-	    *dest = *source + (XK_a - XK_A);
-	else if ((*source >= XK_Agrave) && (*source <= XK_Odiaeresis))
-	    *dest = *source + (XK_agrave - XK_Agrave);
-	else if ((*source >= XK_Ooblique) && (*source <= XK_Thorn))
-	    *dest = *source + (XK_oslash - XK_Ooblique);
-	else
-	    *dest = *source;
-    }
-    *dest = '\0';
-}
-
-
-/*
- *	NAME
- *		_XcmsResolveColorString - 
- *
- *	SYNOPSIS
- */
-#if NeedFunctionPrototypes
-Status
-_XcmsResolveColorString (
-    XcmsCCC ccc,
-    _Xconst char **color_string,
-    XcmsColor *pColor_exact_return,
-    XcmsColorFormat result_format)
-#else
-Status
-_XcmsResolveColorString(ccc, color_string, pColor_exact_return, result_format)
-    XcmsCCC ccc;
-    char **color_string;
-    XcmsColor *pColor_exact_return;
-    XcmsColorFormat result_format;
-#endif
-/*
- *	DESCRIPTION
- *		The XcmsLookupColor function finds the color specification
- *		associated with a color name in the Device-Independent Color
- *		Name Database.
- *	RETURNS
- *		XcmsFailure if failed to convert valid color string.
- *		XcmsSuccess if succeeded in converting color string to
- *			XcmsColor.
- *		_XCMS_NEWNAME if failed to parse the string or find it in
- *			the database, or if succeeded in looking it up and
- *			found another name which is not in the database.
- *			Note that the new name is returned in color_string.
- *
- *		This function returns both the color specification found in the
- *		database (db specification) and the color specification for the
- *		color displayable by the specified screen (screen
- *		specification).  The calling routine sets the format for these
- *		returned specifications in the XcmsColor format component.
- *		If XcmsUndefinedFormat, the specification is returned in the
- *		format used to store the color in the database.
- */
-{
-    XcmsColor dbWhitePt;	/* whitePt associated with pColor_exact_return*/
-				/*    the screen's white point */
-    XcmsColor *pClientWhitePt;
-    int retval;
-    char *strptr = whitePtStr;
-
-/*
- * 0. Check for invalid arguments.
- */
-    if (ccc == NULL || (*color_string)[0] == '\0' || pColor_exact_return == NULL) {
-	return(XcmsFailure);
-    }
-
-/*
- * 1. First attempt to parse the string
- *    If successful, then convert the specification to the target format
- *    and return.
- */
-    if (_XcmsParseColorString(ccc, *color_string, pColor_exact_return)
-	    == 1) {
-	if (result_format != XcmsUndefinedFormat
-		&& pColor_exact_return->format != result_format) {
-	    /* need to be converted to the target format */
-	    return(XcmsConvertColors(ccc, pColor_exact_return, 1, 
-		    result_format, (Bool *)NULL));
-	} else {
-	    return(XcmsSuccess);
-	}
-    }
-
-/*
- * 2. Attempt to find it in the DI Color Name Database
- */
-
-    /*
-     * a. Convert String into a XcmsColor structure
-     *       Attempt to extract the specification for color_string from the
-     *       DI Database (pColor_exact_return).  If the DI Database does not
-     *	     have this entry, then return failure.
-     */
-    retval = _XcmsLookupColorName(ccc, color_string, pColor_exact_return);
-
-    if (retval != XcmsSuccess) {
-	/* color_string replaced with a color name, or not found */
-	return(_XCMS_NEWNAME);
-    }
-
-    if (pColor_exact_return->format == XcmsUndefinedFormat) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * b. If result_format not defined, then assume target format
-     *	  is the exact format.
-     */
-    if (result_format == XcmsUndefinedFormat) {
-	result_format = pColor_exact_return->format;
-    }
-
-    if ((ClientWhitePointOfCCC(ccc))->format == XcmsUndefinedFormat) {
-	pClientWhitePt = ScreenWhitePointOfCCC(ccc);
-    } else {
-	pClientWhitePt = ClientWhitePointOfCCC(ccc);
-    }
-
-    /*
-     * c. Convert to the target format, making adjustments for white
-     *	  point differences as necessary.
-     */
-    if (XCMS_DD_ID(pColor_exact_return->format)) {
-	/*
-	 * The spec format is Device-Dependent, therefore assume the
-	 *    its white point is the Screen White Point.
-	 */
-	if (XCMS_DD_ID(result_format)) {
-	    /*
-	     * Target format is Device-Dependent
-	     *	Therefore, DD --> DD conversion
-	     */
-	    return(_XcmsDDConvertColors(ccc, pColor_exact_return,
-		    1, result_format, (Bool *) NULL));
-	} else {
-	    /*
-	     * Target format is Device-Independent
-	     *	Therefore, DD --> DI conversion
-	     */
-	    if (ccc->whitePtAdjProc && !_XcmsEqualWhitePts(ccc,
-		    pClientWhitePt, ScreenWhitePointOfCCC(ccc))) {
-		return((*ccc->whitePtAdjProc)(ccc, ScreenWhitePointOfCCC(ccc),
-			pClientWhitePt, result_format,
-			pColor_exact_return, 1, (Bool *) NULL));
-	    } else {
-		if (_XcmsDDConvertColors(ccc, pColor_exact_return, 1,
-			XcmsCIEXYZFormat, (Bool *) NULL) == XcmsFailure) {
-		    return(XcmsFailure);
-		}
-		return(_XcmsDIConvertColors(ccc, pColor_exact_return,
-			pClientWhitePt, 1, result_format));
-	    }
-	}
-    } else {
-	/*
-	 * The spec format is Device-Independent, therefore attempt
-	 * to find a database white point.
-	 *
-	 * If the Database does not have a white point, then assume the
-	 * database white point is the same as the Screen White Point.
-	 */
-
-	if (_XcmsLookupColorName(ccc, &strptr, &dbWhitePt) != 1) {
-	    memcpy((char *)&dbWhitePt,
-		   (char *)&ccc->pPerScrnInfo->screenWhitePt,
-		   sizeof(XcmsColor));
-	}
-	if (XCMS_DD_ID(result_format)) {
-	    /*
-	     * Target format is Device-Dependent
-	     *	Therefore, DI --> DD conversion
-	     */
-	    if (ccc->whitePtAdjProc && !_XcmsEqualWhitePts(ccc,
-		    &dbWhitePt, ScreenWhitePointOfCCC(ccc))) {
-		return((*ccc->whitePtAdjProc)(ccc, &dbWhitePt,
-			ScreenWhitePointOfCCC(ccc), result_format,
-			pColor_exact_return, 1, (Bool *)NULL));
-	    } else {
-		if (pColor_exact_return->format != XcmsCIEXYZFormat) {
-		    if (_XcmsDIConvertColors(ccc, pColor_exact_return,
-			    &dbWhitePt, 1, XcmsCIEXYZFormat) == XcmsFailure) {
-			return(XcmsFailure);
-		    }
-		}
-		return (_XcmsDDConvertColors(ccc, pColor_exact_return, 1,
-			result_format, (Bool *)NULL));
-	    }
-	} else {
-	    /*
-	     * Target format is Device-Independent
-	     *	Therefore, DI --> DI conversion
-	     */
-	    if (ccc->whitePtAdjProc && !_XcmsEqualWhitePts(ccc,
-		    &dbWhitePt, pClientWhitePt)) {
-		/*
-		 * The calling routine wants to resolve this color
-		 * in terms if it's white point (i.e. Client White Point).
-		 * Therefore, apply white adjustment for the displacement
-		 * between dbWhitePt to clientWhitePt.
-		 */
-		return((*ccc->whitePtAdjProc)(ccc, &dbWhitePt,
-			pClientWhitePt, result_format,
-			pColor_exact_return, 1, (Bool *)NULL));
-	    } else if (_XcmsEqualWhitePts(ccc,
-		    &dbWhitePt, pClientWhitePt)) {
-		/*
-		 * Can use either dbWhitePt or pClientWhitePt to
-		 * convert to the result_format.
-		 */
-		if (pColor_exact_return->format == result_format) {
-		    return(XcmsSuccess);
-		} else {
-		    return (_XcmsDIConvertColors(ccc, pColor_exact_return,
-			    &dbWhitePt, 1, result_format));
-		}
-	    } else {
-		/*
-		 * Need to convert to a white point independent color
-		 * space (let's choose CIEXYZ) then convert to the
-		 * target color space.  Why? Lets assume that
-		 * pColor_exact_return->format and result format
-		 * are white point dependent format (e.g., CIELUV, CIELAB,
-		 * TekHVC ... same or any combination). If so, we'll
-		 * need to convert the color with dbWhitePt to an absolute
-		 * spec (i.e.  non-white point dependent) then convert that
-		 * absolute value with clientWhitePt to the result_format.
-		 */
-		if (pColor_exact_return->format != XcmsCIEXYZFormat) {
-		    if (_XcmsDIConvertColors(ccc, pColor_exact_return,
-			    &dbWhitePt, 1, XcmsCIEXYZFormat) == XcmsFailure) {
-			return(XcmsFailure);
-		    }
-		}
-		if (result_format == XcmsCIEXYZFormat) {
-		    return(XcmsSuccess);
-		} else {
-		    return(_XcmsDIConvertColors(ccc, pColor_exact_return,
-			    pClientWhitePt, 1, result_format));
-		}
-	    }
-	}
-    }
-}
diff --git a/xc/lib/X11/cmsGlobls.c b/xc/lib/X11/cmsGlobls.c
deleted file mode 100644
index c74d3ad2a..000000000
--- a/xc/lib/X11/cmsGlobls.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/*$XConsortium: cmsGlobls.c,v 1.10 93/07/05 11:44:05 rws Exp $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		XcmsGlobls.c
- *
- *	DESCRIPTION
- *		Source file containing Xcms globals
- *
- *
- */
-/* $XFree86: xc/lib/X11/cmsGlobls.c,v 1.2 1999/05/09 10:50:28 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/*
- *      EXTERNS
- *              External declarations required locally to this package
- *              that are not already declared in any of the included header
- *		files (external includes or internal includes).
- */
-extern XcmsFunctionSet	XcmsLinearRGBFunctionSet;
-#ifdef GRAY
-extern XcmsFunctionSet	XcmsGrayFunctionSet;
-#endif /* GRAY */
-
-/* UNDEFINED Color Space */
-extern XcmsColorSpace	XcmsUNDEFINEDColorSpace;
-
-/* CIE XYZ Color Space */
-extern XcmsColorSpace	XcmsCIEXYZColorSpace;
-
-/* CIE uvY Color Space */
-extern XcmsColorSpace	XcmsCIEuvYColorSpace;
-
-/* CIE xyY Color Space */
-extern XcmsColorSpace	XcmsCIExyYColorSpace;
-
-/* CIE Lab Color Space */
-extern XcmsColorSpace	XcmsCIELabColorSpace;
-
-/* CIE Luv Color Space */
-extern XcmsColorSpace	XcmsCIELuvColorSpace;
-
-/* TekHVC Color Space */
-extern XcmsColorSpace	XcmsTekHVCColorSpace;
-
-/* Device Dependent Color Space Structures */
-extern XcmsColorSpace	XcmsRGBiColorSpace;
-extern XcmsColorSpace	XcmsRGBColorSpace;
-
-
-/*
- *      GLOBALS
- *              Variables declared in this package that are allowed
- *		to be used globally.
- */
-
-    /*
-     * Initial array of Device Independent Color Spaces
-     */
-XcmsColorSpace *_XcmsDIColorSpacesInit[] = {
-    &XcmsCIEXYZColorSpace,
-    &XcmsCIEuvYColorSpace,
-    &XcmsCIExyYColorSpace,
-    &XcmsCIELabColorSpace,
-    &XcmsCIELuvColorSpace,
-    &XcmsTekHVCColorSpace,
-    &XcmsUNDEFINEDColorSpace,
-    NULL
-};
-    /*
-     * Pointer to the array of pointers to XcmsColorSpace structures for
-     * Device-Independent Color Spaces that are currently accessible by
-     * the color management system.  End of list is indicated by a NULL pointer.
-     */
-XcmsColorSpace **_XcmsDIColorSpaces = _XcmsDIColorSpacesInit;
-
-    /*
-     * Initial array of Device Dependent Color Spaces
-     */
-XcmsColorSpace *_XcmsDDColorSpacesInit[] = {
-    &XcmsRGBColorSpace,
-    &XcmsRGBiColorSpace,
-    NULL
-};
-    /*
-     * Pointer to the array of pointers to XcmsColorSpace structures for
-     * Device-Dependent Color Spaces that are currently accessible by
-     * the color management system.  End of list is indicated by a NULL pointer.
-     */
-XcmsColorSpace **_XcmsDDColorSpaces = &_XcmsDDColorSpacesInit[0];
-
-    /*
-     * Initial array of Screen Color Characterization Function Sets
-     */
-XcmsFunctionSet	*_XcmsSCCFuncSetsInit[] = {
-	&XcmsLinearRGBFunctionSet,
-#ifdef GRAY
-	&XcmsGrayFunctionSet,
-#endif /* GRAY */
-	NULL};
-    /*
-     * Pointer to the array of pointers to XcmsSCCFuncSet structures
-     * (Screen Color Characterization Function Sets) that are currently
-     * accessible by the color management system.  End of list is
-     * indicated by a NULL pointer.
-     */
-XcmsFunctionSet **_XcmsSCCFuncSets = _XcmsSCCFuncSetsInit;
-
-    /*
-     * X Consortium Registered Device-Independent Color Spaces
-     *	Note that prefix must be in lowercase.
-     */
-char	_XcmsCIEXYZ_prefix[] = "ciexyz";
-char	_XcmsCIEuvY_prefix[] = "cieuvy";
-char	_XcmsCIExyY_prefix[] = "ciexyy";
-char	_XcmsCIELab_prefix[] = "cielab";
-char 	_XcmsCIELuv_prefix[] = "cieluv";
-char	_XcmsTekHVC_prefix[] = "tekhvc";
-    /*
-     * Registered Device-Dependent Color Spaces
-     */
-char	_XcmsRGBi_prefix[] = "rgbi";
-char	_XcmsRGB_prefix[] = "rgb";
-
-XcmsRegColorSpaceEntry _XcmsRegColorSpaces[] = {
-    { _XcmsCIEXYZ_prefix, XcmsCIEXYZFormat },
-    { _XcmsCIEuvY_prefix, XcmsCIEuvYFormat },
-    { _XcmsCIExyY_prefix, XcmsCIExyYFormat },
-    { _XcmsCIELab_prefix, XcmsCIELabFormat },
-    { _XcmsCIELuv_prefix, XcmsCIELuvFormat },
-    { _XcmsTekHVC_prefix, XcmsTekHVCFormat },
-    { _XcmsRGB_prefix, XcmsRGBFormat },
-    { _XcmsRGBi_prefix,	XcmsRGBiFormat },
-    { NULL, 0 }
-};
diff --git a/xc/lib/X11/cmsInt.c b/xc/lib/X11/cmsInt.c
deleted file mode 100644
index fc8808f2b..000000000
--- a/xc/lib/X11/cmsInt.c
+++ /dev/null
@@ -1,424 +0,0 @@
-/* $XConsortium: cmsInt.c,v 1.12 94/04/17 20:21:58 rws Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		XcmsInt.c - Xcms API utility routines
- *
- *	DESCRIPTION
- *		Xcms Application Program Interface (API) utility
- *		routines for hanging information directly onto
- *		the Display structure.
- *
- *
- */
-/* $XFree86: xc/lib/X11/cmsInt.c,v 1.2 1999/05/09 10:50:29 dawes Exp $ */
-
-/* #define NEED_EVENTS */
-#include <stdio.h>
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-#ifndef XCMSCOMPPROC
-#  define XCMSCOMPPROC	XcmsTekHVCClipC
-#endif
-
-/*
- *      EXTERNS
- */
-extern XcmsColorSpace **_XcmsDIColorSpaces;
-extern XcmsFunctionSet **_XcmsSCCFuncSets;
-
-/* LRGB.c */
-extern int _XcmsLRGB_InitScrnDefault();
-
-static void _XcmsFreeDefaultCCCs();
-
-/*
- *      GLOBALS
- */
-
-
-
-/************************************************************************
- *									*
- *			   API PRIVATE ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		_XcmsCopyPointerArray
- *
- *	SYNOPSIS
- */
-XPointer *
-_XcmsCopyPointerArray(pap)
-    XPointer *pap;
-/*
- *	DESCRIPTION
- *		Copies an array of NULL terminated pointers.
- *
- *	RETURNS
- *		Returns NULL if failed; otherwise the address to
- *		the copy.
- *
- */
-{
-    XPointer *newArray;
-    char **tmp;
-    int n;
-
-    for (tmp = pap, n = 0; *tmp != NULL; tmp++, n++);
-    n++; /* add 1 to include the NULL pointer */
-
-    if ((newArray = (XPointer *)Xmalloc(n * sizeof(XPointer)))) {
-	memcpy((char *)newArray, (char *)pap,
-	       (unsigned)(n * sizeof(XPointer)));
-    }
-    return((XPointer *)newArray);
-}
-
-/*
- *	NAME
- *		_XcmsFreePointerArray
- *
- *	SYNOPSIS
- */
-void
-_XcmsFreePointerArray(pap)
-    XPointer *pap;
-/*
- *	DESCRIPTION
- *		Frees an array of NULL terminated pointers.
- *
- *	RETURNS
- *		void
- *
- */
-{
-    Xfree(pap);
-}
-
-/*
- *	NAME
- *		_XcmsPushPointerArray
- *
- *	SYNOPSIS
- */
-XPointer *
-_XcmsPushPointerArray(pap, p, papNoFree)
-    XPointer *pap;
-    XPointer p;
-    XPointer *papNoFree;
-/*
- *	DESCRIPTION
- *		Places the specified pointer at the head of an array of NULL
- *		terminated pointers.
- *
- *	RETURNS
- *		Returns NULL if failed; otherwise the address to
- *		the head of the array.
- *
- */
-{
-    XPointer *newArray;
-    char **tmp;
-    int n;
-
-    for (tmp = pap, n = 0; *tmp != NULL; tmp++, n++);
-
-    /* add 2: 1 for the new pointer and another for the NULL pointer */
-    n += 2;
-
-    if ((newArray = (XPointer *)Xmalloc(n * sizeof(XPointer)))) {
-	memcpy((char *)(newArray+1),(char *)pap,
-	       (unsigned)((n-1) * sizeof(XPointer)));
-	*newArray = p;
-    }
-    if (pap != papNoFree) {
-        _XcmsFreePointerArray(pap);
-    }
-    return((XPointer *)newArray);
-}
-
-/*
- *	NAME
- *		_XcmsInitDefaultCCCs
- *
- *	SYNOPSIS
- */
-int
-_XcmsInitDefaultCCCs(dpy)
-    Display *dpy;
-/*
- *	DESCRIPTION
- *		Initializes the Xcms per Display Info structure
- *		(XcmsPerDpyInfo).
- *
- *	RETURNS
- *		Returns 0 if failed; otherwise non-zero.
- *
- */
-{
-    int nScrn = ScreenCount(dpy);
-    int i;
-    XcmsCCC ccc;
-
-    if (nScrn <= 0) {
-	return(0);
-    }
-
-    /*
-     * Create an array of XcmsCCC structures, one for each screen.
-     * They serve as the screen's default CCC.
-     */
-    if (!(ccc = (XcmsCCC)
-	    Xcalloc((unsigned)nScrn, (unsigned) sizeof(XcmsCCCRec)))) {
-	return(0);
-    } 
-    dpy->cms.defaultCCCs = (XPointer)ccc;
-    dpy->free_funcs->defaultCCCs = _XcmsFreeDefaultCCCs;
-
-    for (i = 0; i < nScrn; i++, ccc++) {
-	ccc->dpy = dpy;
-	ccc->screenNumber = i;
-	ccc->visual = DefaultVisual(dpy, i);
-	/*
-	 * Used calloc to allocate memory so:
-	 *	ccc->clientWhitePt->format == XcmsUndefinedFormat
-	 *	ccc->gamutCompProc == NULL
-	 *	ccc->whitePtAdjProc == NULL
-	 *	ccc->pPerScrnInfo = NULL
-	 *
-	 * Don't need to create XcmsPerScrnInfo and its functionSet and
-	 * pScreenData components until the default CCC is accessed.
-	 * Note that the XcmsDefaultCCC routine calls _XcmsInitScrnInto
-	 * to do this.
-	 */
-	ccc->gamutCompProc = XCMSCOMPPROC;
-    }
-
-    return(1);
-}
-
-
-/*
- *	NAME
- *		_XcmsFreeDefaultCCCs - Free Default CCCs and its PerScrnInfo
- *
- *	SYNOPSIS
- */
-static void
-_XcmsFreeDefaultCCCs(dpy)
-    Display *dpy;
-/*
- *	DESCRIPTION
- *		This routine frees the default XcmsCCC's associated with
- *		each screen and its associated substructures as neccessary.
- *
- *	RETURNS
- *		void
- *
- *
- */
-{
-    int nScrn = ScreenCount(dpy);
-    XcmsCCC ccc;
-    int i;
-
-    /*
-     * Free Screen data in each DefaultCCC
-     *		Do not use XcmsFreeCCC here because it will not free
-     *		DefaultCCC's.
-     */
-    ccc = (XcmsCCC)dpy->cms.defaultCCCs;
-    for (i = nScrn; i--; ccc++) {
-	/*
-	 * Check if XcmsPerScrnInfo exists.
-	 *
-	 * This is the only place where XcmsPerScrnInfo structures
-	 * are freed since there is only one allocated per Screen.
-	 * It just so happens that we place its reference in the
-	 * default CCC.
-	 */
-	if (ccc->pPerScrnInfo) {
-	    /* Check if SCCData exists */
-	    if (ccc->pPerScrnInfo->state != XcmsInitNone
-		    && ccc->pPerScrnInfo->screenData) {
-		(*((XcmsFunctionSet *)ccc->pPerScrnInfo->functionSet)->screenFreeProc)
-			(ccc->pPerScrnInfo->screenData);
-	    }
-	    Xfree(ccc->pPerScrnInfo);
-	}
-    }
-
-    /*
-     * Free the array of XcmsCCC structures
-     */
-    Xfree(dpy->cms.defaultCCCs);
-    dpy->cms.defaultCCCs = (XPointer)NULL;
-}
-
-
-
-/*
- *	NAME
- *		_XcmsInitScrnInfo
- *
- *	SYNOPSIS
- */
-int
-_XcmsInitScrnInfo(dpy, screenNumber)
-    register Display *dpy;
-    int screenNumber;
-/*
- *	DESCRIPTION
- *		Given a display and screen number, this routine attempts
- *		to initialize the Xcms per Screen Info structure
- *		(XcmsPerScrnInfo).
- *
- *	RETURNS
- *		Returns zero if initialization failed; non-zero otherwise.
- */
-{
-    XcmsFunctionSet **papSCCFuncSet = _XcmsSCCFuncSets;
-    XcmsCCC defaultccc;
-
-    /*
-     * Check if the XcmsCCC's for each screen has been created.
-     * Really dont need to be created until some routine uses the Xcms
-     * API routines.
-     */
-    if ((XcmsCCC)dpy->cms.defaultCCCs == NULL) {
-	if (!_XcmsInitDefaultCCCs(dpy)) {
-	    return(0);
-	}
-    }
-
-    defaultccc = (XcmsCCC)dpy->cms.defaultCCCs + screenNumber;
-
-    /*
-     * For each SCCFuncSet, try its pInitScrnFunc.
-     *	If the function succeeds, then we got it!
-     */
-
-    if (!defaultccc->pPerScrnInfo) {
-	/*
-	 * This is one of two places where XcmsPerScrnInfo structures
-	 * are allocated.  There is one allocated per Screen that is
-	 * shared among visuals that do not have specific intensity
-	 * tables.  Other XcmsPerScrnInfo structures are created
-	 * for the latter (see XcmsCreateCCC).  The ones created
-	 * here are referenced by the default CCC.
-	 */
-	if (!(defaultccc->pPerScrnInfo = (XcmsPerScrnInfo *)
-		Xcalloc(1, (unsigned) sizeof(XcmsPerScrnInfo)))) {
-	    return(0);
-	} 
-	defaultccc->pPerScrnInfo->state = XcmsInitNone;
-    }
-
-    while (*papSCCFuncSet != NULL) {
-	if ((*(*papSCCFuncSet)->screenInitProc)(dpy, screenNumber,
-		defaultccc->pPerScrnInfo)) {
-	    defaultccc->pPerScrnInfo->state = XcmsInitSuccess;
-	    return(1);
-	}
-	papSCCFuncSet++;
-    }
-
-    /*
-     * Use Default SCCData
-     */
-    return(_XcmsLRGB_InitScrnDefault(dpy, screenNumber, defaultccc->pPerScrnInfo));
-}
-
-
-/*
- *	NAME
- *		_XcmsFreeIntensityMaps
- *
- *	SYNOPSIS
- */
-void
-_XcmsFreeIntensityMaps(dpy)
-    Display *dpy;
-/*
- *	DESCRIPTION
- *		Frees all XcmsIntensityMap structures in the linked list
- *		and sets dpy->cms.perVisualIntensityMaps to NULL.
- *
- *	RETURNS
- *		void
- *
- */
-{
-    XcmsIntensityMap *pNext, *pFree;
-
-    pNext = (XcmsIntensityMap *)dpy->cms.perVisualIntensityMaps;
-    while (pNext != NULL) {
-	pFree = pNext;
-	pNext = pNext->pNext;
-	(*pFree->pFreeScreenData)(pFree->screenData);
-	/* Now free the XcmsIntensityMap structure */
-	Xfree(pFree);
-    }
-    dpy->cms.perVisualIntensityMaps = (XPointer)NULL;
-}
-
-
-/*
- *	NAME
- *		_XcmsGetIntensityMap
- *
- *	SYNOPSIS
- */
-XcmsIntensityMap *
-_XcmsGetIntensityMap(dpy, visual)
-    Display *dpy;
-    Visual *visual;
-/*
- *	DESCRIPTION
- *		Attempts to return a per-Visual intensity map.
- *
- *	RETURNS
- *		Pointer to the XcmsIntensityMap structure if found;
- *		otherwise NULL
- *
- */
-{
-    VisualID targetID = visual->visualid;
-    XcmsIntensityMap *pNext;
-
-    pNext = (XcmsIntensityMap *)dpy->cms.perVisualIntensityMaps;
-    while (pNext != NULL) {
-	if (targetID == pNext->visualID) {
-	    return(pNext);
-	}
-	pNext = pNext->pNext;
-    }
-    return((XcmsIntensityMap *)NULL);
-}
diff --git a/xc/lib/X11/cmsLkCol.c b/xc/lib/X11/cmsLkCol.c
deleted file mode 100644
index 428436f56..000000000
--- a/xc/lib/X11/cmsLkCol.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/* $XConsortium: cmsLkCol.c,v 1.14 94/03/31 21:51:17 rws Exp $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		XcmsLkCol.c
- *
- *	DESCRIPTION
- *		Source for XcmsLookupColor
- *
- *
- */
-/* $XFree86: xc/lib/X11/cmsLkCol.c,v 1.2 1999/05/09 10:50:29 dawes Exp $ */
-
-#define NEED_REPLIES
-#include <stdio.h>
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/*
- *      EXTERNS
- */
-extern void _XColor_to_XcmsRGB();
-extern void _XcmsRGB_to_XColor();
-extern void _XcmsResolveColor();
-extern void _XcmsUnresolveColor();
-
-/* cmsColNm.c */
-extern Status _XcmsResolveColorString();
-
-#ifdef X_NOT_STDC_ENV
-extern char *getenv();
-#endif
-
-/*
- *	NAME
- *		XcmsLookupColor - 
- *
- *	SYNOPSIS
- */
-#if NeedFunctionPrototypes
-Status
-XcmsLookupColor (
-    Display *dpy,
-    Colormap cmap,
-    _Xconst char *colorname,
-    XcmsColor *pColor_exact_return,
-    XcmsColor *pColor_scrn_return,
-    XcmsColorFormat result_format)
-#else
-Status
-XcmsLookupColor(dpy, cmap, colorname, pColor_exact_return, pColor_scrn_return,
-	result_format)
-    Display *dpy;
-    Colormap cmap;
-    char *colorname;
-    XcmsColor *pColor_exact_return;
-    XcmsColor *pColor_scrn_return;
-    XcmsColorFormat result_format;
-#endif
-/*
- *	DESCRIPTION
- *		The XcmsLookupColor function finds the color specification
- *		associated with a color name in the Device-Independent Color
- *		Name Database.
- *	RETURNS
- *		This function returns both the color specification found in the
- *		database (db specification) and the color specification for the
- *		color displayable by the specified screen (screen
- *		specification).  The calling routine sets the format for these
- *		returned specifications in the XcmsColor format component.
- *		If XcmsUndefinedFormat, the specification is returned in the
- *		format used to store the color in the database.
- */
-{
-    Status retval1 = XcmsSuccess;
-    Status retval2 = XcmsSuccess;
-    XcmsCCC ccc;
-    register int n;
-    xLookupColorReply reply;
-    register xLookupColorReq *req;
-    XColor def, scr;
-
-/*
- * 0. Check for invalid arguments.
- */
-    if (dpy == NULL || colorname[0] == '\0' || pColor_scrn_return == 0
-	    || pColor_exact_return == NULL) {
-	return(XcmsFailure);
-    }
-
-    if ((ccc = XcmsCCCOfColormap(dpy, cmap)) == (XcmsCCC)NULL) {
-	return(XcmsFailure);
-    }
-
-/*
- * 1. Convert string to a XcmsColor
- */
-    if ((retval1 = _XcmsResolveColorString(ccc, &colorname,
-	    pColor_exact_return, result_format)) == XcmsFailure) {
-	return(XcmsFailure);
-    }
-    if (retval1 == _XCMS_NEWNAME) {
-	goto PassToServer;
-    }
-
-/*
- * 2. pColor_scrn_return
- *	    Assume the pColor_exact_return has already been adjusted to
- *	    the Client White Point.
- *
- */
-    /*
-     * Convert to RGB, adjusting for white point differences if necessary.
-     */
-    memcpy((char *)pColor_scrn_return, (char *)pColor_exact_return,
-	   sizeof(XcmsColor));
-    if (pColor_scrn_return->format == XcmsRGBFormat) {
-	retval2 = XcmsSuccess;
-    } else if ((retval2 = XcmsConvertColors(ccc, pColor_scrn_return, 1,
-	    XcmsRGBFormat, (Bool *)NULL)) == XcmsFailure) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Then, convert XcmsColor structure to the target specification
-     *    format.  Note that we must use NULL instead of passing
-     *    pCompressed.
-     */
-
-    if (result_format ==  XcmsUndefinedFormat) {
-	result_format = pColor_exact_return->format;
-    }
-    if (result_format == XcmsRGBFormat) {
-	_XcmsUnresolveColor(ccc, pColor_scrn_return);
-    } else {
-	_XcmsResolveColor(ccc, pColor_scrn_return);
-	if (XcmsConvertColors(ccc, pColor_scrn_return, 1, result_format,
-		(Bool *) NULL) == XcmsFailure) {
-	    return(XcmsFailure);
-	}
-    }
-
-    return(retval1 > retval2 ? retval1 : retval2);
-
-PassToServer:
-    /*
-     * Xcms and i18n methods failed, so lets pass it to the server
-     * for parsing.
-     */
-
-    LockDisplay(dpy);
-    GetReq (LookupColor, req);
-    req->cmap = cmap;
-    req->nbytes = n = strlen(colorname);
-    req->length += (n + 3) >> 2;
-    Data (dpy, colorname, (long)n);
-    if (!_XReply (dpy, (xReply *) &reply, 0, xTrue)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return (XcmsFailure);
-	}
-    def.red   = reply.exactRed;
-    def.green = reply.exactGreen;
-    def.blue  = reply.exactBlue;
-
-    scr.red   = reply.screenRed;
-    scr.green = reply.screenGreen;
-    scr.blue  = reply.screenBlue;
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-
-    _XColor_to_XcmsRGB(ccc, &def, pColor_exact_return, 1);
-    _XColor_to_XcmsRGB(ccc, &scr, pColor_scrn_return, 1);
-
-    /*
-     * Then, convert XcmsColor structure to the target specification
-     *    format.  Note that we must use NULL instead of passing
-     *    pCompressed.
-     */
-
-    if (result_format != XcmsRGBFormat
-	    && result_format != XcmsUndefinedFormat) {
-	if (XcmsConvertColors(ccc, pColor_exact_return, 1, result_format,
-		(Bool *) NULL) == XcmsFailure) {
-	    return(XcmsFailure);
-	}
-	if (XcmsConvertColors(ccc, pColor_scrn_return, 1, result_format,
-		(Bool *) NULL) == XcmsFailure) {
-	    return(XcmsFailure);
-	}
-    }
-
-    return(XcmsSuccess);
-}
diff --git a/xc/lib/X11/cmsMath.c b/xc/lib/X11/cmsMath.c
deleted file mode 100644
index 328576901..000000000
--- a/xc/lib/X11/cmsMath.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/* $TOG: cmsMath.c /main/12 1998/02/06 17:11:19 kaleb $ */
-
-/*
-
-Copyright 1990, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-/*
- * Stephen Gildea, MIT X Consortium, January 1991
- */
-
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-#if !defined(X_NOT_STDC_ENV) && (defined(__STDC__) || !(defined(sun) || (defined(sony) && !defined(SYSTYPE_SYSV) && !defined(_SYSTYPE_SYSV))))
-#include <float.h>
-#endif
-#ifndef DBL_EPSILON
-#define DBL_EPSILON 1e-6
-#endif
-
-#ifdef _X_ROOT_STATS
-int cbrt_loopcount;
-int sqrt_loopcount;
-#endif
-
-/* Newton's Method:  x_n+1 = x_n - ( f(x_n) / f'(x_n) ) */
-
-
-/* for cube roots, x^3 - a = 0,  x_new = x - 1/3 (x - a/x^2) */
-
-double
-_XcmsCubeRoot(a)
-    double a;
-{
-    register double abs_a, cur_guess, delta;
-
-#ifdef DEBUG
-    printf("_XcmsCubeRoot passed in %g\n", a);
-#endif
-#ifdef _X_ROOT_STATS
-    cbrt_loopcount = 0;
-#endif
-    if (a == 0.)
-	return 0.;
-
-    abs_a = a<0. ? -a : a;	/* convert to positive to speed loop tests */
-
-    /* arbitrary first guess */
-    if (abs_a > 1.)
-	cur_guess = abs_a/8.;
-    else
-	cur_guess = abs_a*8.;
-
-    do {
-#ifdef _X_ROOT_STATS
-	cbrt_loopcount++;
-#endif
-	delta = (cur_guess - abs_a/(cur_guess*cur_guess))/3.;
-	cur_guess -= delta;
-	if (delta < 0.) delta = -delta;
-    } while (delta >= cur_guess*DBL_EPSILON);
-
-    if (a < 0.)
-	cur_guess = -cur_guess;
-
-#ifdef DEBUG
-    printf("_XcmsCubeRoot returning %g\n", cur_guess);
-#endif
-    return cur_guess;
-}
-	
-
-
-/* for square roots, x^2 - a = 0,  x_new = x - 1/2 (x - a/x) */
-
-double
-_XcmsSquareRoot(a)
-    double a;
-{
-    register double cur_guess, delta;
-
-#ifdef DEBUG
-    printf("_XcmsSquareRoot passed in %g\n", a);
-#endif
-#ifdef _X_ROOT_STATS
-    sqrt_loopcount = 0;
-#endif
-    if (a == 0.)
-	return 0.;
-
-    if (a < 0.) {
-	/* errno = EDOM; */
-	return 0.;
-    }
-
-    /* arbitrary first guess */
-    if (a > 1.)
-	cur_guess = a/4.;
-    else
-	cur_guess = a*4.;
-
-    do {
-#ifdef _X_ROOT_STATS
-	sqrt_loopcount++;
-#endif
-	delta = (cur_guess - a/cur_guess)/2.;
-	cur_guess -= delta;
-	if (delta < 0.) delta = -delta;
-    } while (delta >= cur_guess*DBL_EPSILON);
-
-#ifdef DEBUG
-    printf("_XcmsSquareRoot returning %g\n", cur_guess);
-#endif
-    return cur_guess;
-}
-	
diff --git a/xc/lib/X11/cmsProp.c b/xc/lib/X11/cmsProp.c
deleted file mode 100644
index 9a533b69d..000000000
--- a/xc/lib/X11/cmsProp.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/* $XConsortium: cmsProp.c,v 1.11 93/09/22 22:30:00 rws Exp $" */
-
-/*
- *
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *	NAME
- *		XcmsProp.c
- *
- *	DESCRIPTION
- *		This utility routines for manipulating properties.
- *
- */
-
-#include <X11/Xatom.h>
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-
-/************************************************************************
- *									*
- *			API PRIVATE ROUTINES				*
- *									*
- ************************************************************************/
-
-
-/*
- *	NAME
- *		_XcmsGetElement -- get an element value from the property passed
- *
- *	SYNOPSIS
- */
-unsigned long
-_XcmsGetElement (format, pValue, pCount) 
-    int             format;
-    char            **pValue;
-    unsigned long   *pCount;
-/*
- *	DESCRIPTION
- *	    Get the next element from the property and return it.
- *	    Also increment the pointer the amount needed.
- *
- *	Returns
- *	    unsigned long
- */
-{
-    unsigned long value;
-
-    switch (format) {
-      case 32:
-	value = *((unsigned long *)(*pValue)) & 0xFFFFFFFF;
-	*pValue += sizeof(unsigned long);
-	*pCount -= 1;
-	break;
-      case 16:
-	value = *((unsigned short *)(*pValue));
-	*pValue += sizeof(unsigned short);
-	*pCount -= 1;
-	break;
-      case 8:
-	value = *((unsigned char *) (*pValue));
-	*pValue += 1;
-	*pCount -= 1;
-	break;
-      default:
-	value = 0;
-	break;
-    }
-    return(value);
-}
-
-
-/*
- *	NAME
- *		_XcmsGetProperty -- Determine the existance of a property
- *
- *	SYNOPSIS
- */
-int
-_XcmsGetProperty (pDpy, w, property, pFormat, pNItems, pNBytes, pValue) 
-    Display *pDpy;
-    Window  w;
-    Atom property;
-    int             *pFormat;
-    unsigned long   *pNItems;
-    unsigned long   *pNBytes;
-    char            **pValue;
-/*
- *	DESCRIPTION
- *
- *	Returns
- *	    0 if property does not exist.
- *	    1 if property exists.
- */
-{
-    char *prop_ret;
-    int format_ret;
-    long len = 6516;
-    unsigned long nitems_ret, after_ret;
-    Atom atom_ret;
-    
-    while (XGetWindowProperty (pDpy, w, property, 0, len, False, 
-			       XA_INTEGER, &atom_ret, &format_ret, 
-			       &nitems_ret, &after_ret, 
-			       (unsigned char **)&prop_ret)) {
-	if (after_ret > 0) {
-	    len += nitems_ret * (format_ret >> 3);
-	    XFree (prop_ret);
-	} else {
-	    break;
-	}
-    }
-    if (format_ret == 0 || nitems_ret == 0) { 
-	/* the property does not exist or is of an unexpected type */
-	return(XcmsFailure);
-    }
-
-    *pFormat = format_ret;
-    *pNItems = nitems_ret;
-    *pNBytes = nitems_ret * (format_ret >> 3);
-    *pValue = prop_ret;
-    return(XcmsSuccess);
-}
diff --git a/xc/lib/X11/cmsTrig.c b/xc/lib/X11/cmsTrig.c
deleted file mode 100644
index f499e8503..000000000
--- a/xc/lib/X11/cmsTrig.c
+++ /dev/null
@@ -1,610 +0,0 @@
-/* $XConsortium: cmsTrig.c,v 1.7 95/06/08 23:20:39 gildea Exp $" */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $XFree86: xc/lib/X11/cmsTrig.c,v 3.3 1999/05/09 10:50:30 dawes Exp $ */
-/*
- *	It should be pointed out that for simplicity's sake, the
- *	environment parameters are defined as floating point constants,
- *	rather than octal or hexadecimal initializations of allocated
- *	storage areas.  This means that the range of allowed numbers
- *	may not exactly match the hardware's capabilities.  For example,
- *	if the maximum positive double precision floating point number
- *	is EXACTLY 1.11...E100 and the constant "MAXDOUBLE is
- *	defined to be 1.11E100 then the numbers between 1.11E100 and
- *	1.11...E100 are considered to be undefined.  For most
- *	applications, this will cause no problems.
- *
- *	An alternate method is to allocate a global static "double" variable,
- *	say "maxdouble", and use a union declaration and initialization
- *	to initialize it with the proper bits for the EXACT maximum value.
- *	This was not done because the only compilers available to the
- *	author did not fully support union initialization features.
- *
- */
-
-/*
- *	EXTERNS
- */
-extern double _XcmsSquareRoot();
-
-/*
- *	FORWARD DECLARATIONS
- */
-double _XcmsCosine();
-static double _XcmsModulo();
-static double _XcmsModuloF();
-static double _XcmsPolynomial();
-double _XcmsSine();
-double _XcmsArcTangent();
-
-/*
- *	DEFINES
- */
-
-#ifdef __STDC__
-#define Const const
-#else
-#define Const /**/
-#endif
-#define XCMS_MAXERROR       	0.000001
-#define XCMS_MAXITER       	10000
-#define XCMS_PI       		3.14159265358979323846264338327950
-#define XCMS_TWOPI 		6.28318530717958620
-#define XCMS_HALFPI		1.57079632679489660
-#define XCMS_FOURTHPI		0.785398163397448280
-#define XCMS_SIXTHPI		0.523598775598298820
-#define XCMS_RADIANS(d)		((d) * XCMS_PI / 180.0)
-#define XCMS_DEGREES(r)		((r) * 180.0 / XCMS_PI)
-#define XCMS_X6_UNDERFLOWS	(4.209340e-52)	/* X**6 almost underflows */
-#define XCMS_X16_UNDERFLOWS	(5.421010e-20)	/* X**16 almost underflows*/
-#define XCMS_CHAR_BIT		8
-#define XCMS_LONG_MAX		0x7FFFFFFF
-#define XCMS_DEXPLEN		11
-#define XCMS_NBITS(type)	(XCMS_CHAR_BIT * (int)sizeof(type))
-#define XCMS_FABS(x)		((x) < 0.0 ? -(x) : (x))
-
-/* XCMS_DMAXPOWTWO - largest power of two exactly representable as a double */
-#ifdef _CRAY
-#define XCMS_DMAXPOWTWO	((double)(1 < 47))
-#else
-#ifdef __alpha__
-#define XCMS_DMAXPOWTWO	((double)(XCMS_LONG_MAX) * \
-	    (1L << ((XCMS_NBITS(double)-XCMS_DEXPLEN) - XCMS_NBITS(int) + 1)))
-#else
-#define XCMS_DMAXPOWTWO	((double)(XCMS_LONG_MAX) * \
-	    (1L << ((XCMS_NBITS(double)-XCMS_DEXPLEN) - XCMS_NBITS(long) + 1)))
-#endif
-#endif
-
-/*
- *	LOCAL VARIABLES
- */
-
-static double Const cos_pcoeffs[] = {
-    0.12905394659037374438e7,
-   -0.37456703915723204710e6,
-    0.13432300986539084285e5,
-   -0.11231450823340933092e3
-};
-
-static double Const cos_qcoeffs[] = {
-    0.12905394659037373590e7,
-    0.23467773107245835052e5,
-    0.20969518196726306286e3,
-    1.0
-};
-
-static double Const sin_pcoeffs[] = {
-    0.20664343336995858240e7,
-   -0.18160398797407332550e6,
-    0.35999306949636188317e4,
-   -0.20107483294588615719e2
-};
-
-static double Const sin_qcoeffs[] = {
-    0.26310659102647698963e7,
-    0.39270242774649000308e5,
-    0.27811919481083844087e3,
-    1.0
-};
-
-/*
- *
- *  FUNCTION
- *
- *	_XcmsCosine   double precision cosine
- *
- *  KEY WORDS
- *
- *	cos
- *	machine independent routines
- *	trigonometric functions
- *	math libraries
- *
- *  DESCRIPTION
- *
- *	Returns double precision cosine of double precision
- *	floating point argument.
- *
- *  USAGE
- *
- *	double _XcmsCosine (x)
- *	double x;
- *
- *  REFERENCES
- *
- *	Computer Approximations, J.F. Hart et al, John Wiley & Sons,
- *	1968, pp. 112-120.
- *
- *  RESTRICTIONS
- *
- *	The sin and cos routines are interactive in the sense that
- *	in the process of reducing the argument to the range -PI/4
- *	to PI/4, each may call the other.  Ultimately one or the
- *	other uses a polynomial approximation on the reduced
- *	argument.  The sin approximation has a maximum relative error
- *	of 10**(-17.59) and the cos approximation has a maximum
- *	relative error of 10**(-16.18).
- *
- *	These error bounds assume exact arithmetic
- *	in the polynomial evaluation.  Additional rounding and
- *	truncation errors may occur as the argument is reduced
- *	to the range over which the polynomial approximation
- *	is valid, and as the polynomial is evaluated using
- *	finite-precision arithmetic.
- *	
- *  PROGRAMMER
- *
- *	Fred Fish
- *
- *  INTERNALS
- *
- *	Computes cos(x) from:
- *
- *		(1)	Reduce argument x to range -PI to PI.
- *
- *		(2)	If x > PI/2 then call cos recursively
- *			using relation cos(x) = -cos(x - PI).
- *
- *		(3)	If x < -PI/2 then call cos recursively
- *			using relation cos(x) = -cos(x + PI).
- *
- *		(4)	If x > PI/4 then call sin using
- *			relation cos(x) = sin(PI/2 - x).
- *
- *		(5)	If x < -PI/4 then call cos using
- *			relation cos(x) = sin(PI/2 + x).
- *
- *		(6)	If x would cause underflow in approx
- *			evaluation arithmetic then return
- *			sqrt(1.0 - x**2).
- *
- *		(7)	By now x has been reduced to range
- *			-PI/4 to PI/4 and the approximation
- *			from HART pg. 119 can be used:
- *
- *			cos(x) = ( p(y) / q(y) )
- *			Where:
- *
- *			y    =	x * (4/PI)
- *
- *			p(y) =  SUM [ Pj * (y**(2*j)) ]
- *			over j = {0,1,2,3}
- *
- *			q(y) =  SUM [ Qj * (y**(2*j)) ]
- *			over j = {0,1,2,3}
- *
- *			P0   =	0.12905394659037374438571854e+7
- *			P1   =	-0.3745670391572320471032359e+6
- *			P2   =	0.134323009865390842853673e+5
- *			P3   =	-0.112314508233409330923e+3
- *			Q0   =	0.12905394659037373590295914e+7
- *			Q1   =	0.234677731072458350524124e+5
- *			Q2   =	0.2096951819672630628621e+3
- *			Q3   =	1.0000...
- *			(coefficients from HART table #3843 pg 244)
- *
- *
- *	**** NOTE ****    The range reduction relations used in
- *	this routine depend on the final approximation being valid
- *	over the negative argument range in addition to the positive
- *	argument range.  The particular approximation chosen from
- *	HART satisfies this requirement, although not explicitly
- *	stated in the text.  This may not be true of other
- *	approximations given in the reference.
- *			
- */
-
-double _XcmsCosine (x)
-double x;
-{
-    auto double y;
-    auto double yt2;
-    double retval;
-
-    if (x < -XCMS_PI || x > XCMS_PI) {
-	x = _XcmsModulo (x, XCMS_TWOPI);
-        if (x > XCMS_PI) {
-	    x = x - XCMS_TWOPI;
-        } else if (x < -XCMS_PI) {
-	    x = x + XCMS_TWOPI;
-        }
-    }
-    if (x > XCMS_HALFPI) {
-	retval = -(_XcmsCosine (x - XCMS_PI));
-    } else if (x < -XCMS_HALFPI) {
-	retval = -(_XcmsCosine (x + XCMS_PI));
-    } else if (x > XCMS_FOURTHPI) {
-	retval = _XcmsSine (XCMS_HALFPI - x);
-    } else if (x < -XCMS_FOURTHPI) {
-	retval = _XcmsSine (XCMS_HALFPI + x);
-    } else if (x < XCMS_X6_UNDERFLOWS && x > -XCMS_X6_UNDERFLOWS) {
-	retval = _XcmsSquareRoot (1.0 - (x * x));
-    } else {
-	y = x / XCMS_FOURTHPI;
-	yt2 = y * y;
-	retval = _XcmsPolynomial (3, cos_pcoeffs, yt2) / _XcmsPolynomial (3, cos_qcoeffs, yt2);
-    }
-    return (retval);
-}
-
-
-/*
- *  FUNCTION
- *
- *	_XcmsModulo   double precision modulo
- *
- *  KEY WORDS
- *
- *	_XcmsModulo
- *	machine independent routines
- *	math libraries
- *
- *  DESCRIPTION
- *
- *	Returns double precision modulo of two double
- *	precision arguments.
- *
- *  USAGE
- *
- *	double _XcmsModulo (value, base)
- *	double value;
- *	double base;
- *
- *  PROGRAMMER
- *
- *	Fred Fish
- *
- */
-static double _XcmsModulo (value, base)
-double value;
-double base;
-{
-    auto double intpart;
-
-    value /= base;
-    value = _XcmsModuloF (value, &intpart);
-    value *= base;
-    return(value);
-}
-
-
-/*
- * frac = (double) _XcmsModuloF(double val, double *dp)
- *	return fractional part of 'val'
- *	set *dp to integer part of 'val'
- *
- * Note  -> only compiled for the CA or KA.  For the KB/MC,
- * "math.c" instantiates a copy of the inline function
- * defined in "math.h".
- */
-static double
-_XcmsModuloF(val, dp)
-double val;
-register double *dp;
-{
-	register double abs;
-	/*
-	 * Don't use a register for this.  The extra precision this results
-	 * in on some systems causes problems.
-	 */
-	double ip;
-
-	/* should check for illegal values here - nan, inf, etc */
-	abs = XCMS_FABS(val);
-	if (abs >= XCMS_DMAXPOWTWO) {
-		ip = val;
-	} else {
-		ip = abs + XCMS_DMAXPOWTWO;	/* dump fraction */
-		ip -= XCMS_DMAXPOWTWO;	/* restore w/o frac */
-		if (ip > abs)		/* if it rounds up */
-			ip -= 1.0;	/* fix it */
-		ip = XCMS_FABS(ip);
-	}
-	*dp = ip;
-	return (val - ip); /* signed fractional part */
-}
-
-
-/*
- *  FUNCTION
- *
- *	_XcmsPolynomial   double precision polynomial evaluation
- *
- *  KEY WORDS
- *
- *	poly
- *	machine independent routines
- *	math libraries
- *
- *  DESCRIPTION
- *
- *	Evaluates a polynomial and returns double precision
- *	result.  Is passed a the order of the polynomial,
- *	a pointer to an array of double precision polynomial
- *	coefficients (in ascending order), and the independent
- *	variable.
- *
- *  USAGE
- *
- *	double _XcmsPolynomial (order, coeffs, x)
- *	int order;
- *	double *coeffs;
- *	double x;
- *
- *  PROGRAMMER
- *
- *	Fred Fish
- *
- *  INTERNALS
- *
- *	Evalates the polynomial using recursion and the form:
- *
- *		P(x) = P0 + x(P1 + x(P2 +...x(Pn)))
- *
- */
-
-static double _XcmsPolynomial (order, coeffs, x)
-register int order;
-double Const *coeffs;
-double x;
-{
-    auto double rtn_value;
-
-#if 0
-    auto double curr_coeff;
-    if (order <= 0) {
-	rtn_value = *coeffs;
-    } else {
-	curr_coeff = *coeffs;	/* Bug in Unisoft's compiler.  Does not */
-	coeffs++;		/* generate good code for *coeffs++ */
-	rtn_value = curr_coeff + x * _XcmsPolynomial (--order, coeffs, x);
-    }
-#else /* ++jrb -- removed tail recursion */
-    coeffs += order;
-    rtn_value = *coeffs--;
-    while(order-- > 0)
-	rtn_value = *coeffs-- + (x * rtn_value);
-#endif
-
-    return(rtn_value);
-}
-
-
-/*
- *  FUNCTION
- *
- *	_XcmsSine	double precision sine
- *
- *  KEY WORDS
- *
- *	sin
- *	machine independent routines
- *	trigonometric functions
- *	math libraries
- *
- *  DESCRIPTION
- *
- *	Returns double precision sine of double precision
- *	floating point argument.
- *
- *  USAGE
- *
- *	double _XcmsSine (x)
- *	double x;
- *
- *  REFERENCES
- *
- *	Computer Approximations, J.F. Hart et al, John Wiley & Sons,
- *	1968, pp. 112-120.
- *
- *  RESTRICTIONS
- *
- *	The sin and cos routines are interactive in the sense that
- *	in the process of reducing the argument to the range -PI/4
- *	to PI/4, each may call the other.  Ultimately one or the
- *	other uses a polynomial approximation on the reduced
- *	argument.  The sin approximation has a maximum relative error
- *	of 10**(-17.59) and the cos approximation has a maximum
- *	relative error of 10**(-16.18).
- *
- *	These error bounds assume exact arithmetic
- *	in the polynomial evaluation.  Additional rounding and
- *	truncation errors may occur as the argument is reduced
- *	to the range over which the polynomial approximation
- *	is valid, and as the polynomial is evaluated using
- *	finite-precision arithmetic.
- *	
- *  PROGRAMMER
- *
- *	Fred Fish
- *
- *  INTERNALS
- *
- *	Computes sin(x) from:
- *
- *	  (1)	Reduce argument x to range -PI to PI.
- *
- *	  (2)	If x > PI/2 then call sin recursively
- *		using relation sin(x) = -sin(x - PI).
- *
- *	  (3)	If x < -PI/2 then call sin recursively
- *		using relation sin(x) = -sin(x + PI).
- *
- *	  (4)	If x > PI/4 then call cos using
- *		relation sin(x) = cos(PI/2 - x).
- *
- *	  (5)	If x < -PI/4 then call cos using
- *		relation sin(x) = -cos(PI/2 + x).
- *
- *	  (6)	If x is small enough that polynomial
- *		evaluation would cause underflow
- *		then return x, since sin(x)
- *		approaches x as x approaches zero.
- *
- *	  (7)	By now x has been reduced to range
- *		-PI/4 to PI/4 and the approximation
- *		from HART pg. 118 can be used:
- *
- *		sin(x) = y * ( p(y) / q(y) )
- *		Where:
- *
- *		y    =  x * (4/PI)
- *
- *		p(y) =  SUM [ Pj * (y**(2*j)) ]
- *		over j = {0,1,2,3}
- *
- *		q(y) =  SUM [ Qj * (y**(2*j)) ]
- *		over j = {0,1,2,3}
- *
- *		P0   =  0.206643433369958582409167054e+7
- *		P1   =  -0.18160398797407332550219213e+6
- *		P2   =  0.359993069496361883172836e+4
- *		P3   =  -0.2010748329458861571949e+2
- *		Q0   =  0.263106591026476989637710307e+7
- *		Q1   =  0.3927024277464900030883986e+5
- *		Q2   =  0.27811919481083844087953e+3
- *		Q3   =  1.0000...
- *		(coefficients from HART table #3063 pg 234)
- *
- *
- *	**** NOTE ****	  The range reduction relations used in
- *	this routine depend on the final approximation being valid
- *	over the negative argument range in addition to the positive
- *	argument range.  The particular approximation chosen from
- *	HART satisfies this requirement, although not explicitly
- *	stated in the text.  This may not be true of other
- *	approximations given in the reference.
- *			
- */
-
-double
-_XcmsSine (x)
-double x;
-{
-    double y;
-    double yt2;
-    double retval;
-
-    if (x < -XCMS_PI || x > XCMS_PI) {
-	x = _XcmsModulo (x, XCMS_TWOPI);
-	if (x > XCMS_PI) {
-	    x = x - XCMS_TWOPI;
-	} else if (x < -XCMS_PI) {
-	    x = x + XCMS_TWOPI;
-	}
-    }
-    if (x > XCMS_HALFPI) {
-	retval = -(_XcmsSine (x - XCMS_PI));
-    } else if (x < -XCMS_HALFPI) {
-	retval = -(_XcmsSine (x + XCMS_PI));
-    } else if (x > XCMS_FOURTHPI) {
-	retval = _XcmsCosine (XCMS_HALFPI - x);
-    } else if (x < -XCMS_FOURTHPI) {
-	retval = -(_XcmsCosine (XCMS_HALFPI + x));
-    } else if (x < XCMS_X6_UNDERFLOWS && x > -XCMS_X6_UNDERFLOWS) {
-	retval = x;
-    } else {
-	y = x / XCMS_FOURTHPI;
-	yt2 = y * y;
-	retval = y * (_XcmsPolynomial (3, sin_pcoeffs, yt2) / _XcmsPolynomial(3, sin_qcoeffs, yt2));
-    }
-    return(retval);
-}
-
-
-/*
- *	NAME
- *		_XcmsArcTangent
- *
- *	SYNOPSIS
- */
-double
-_XcmsArcTangent(x)
-    double x;
-/*
- *	DESCRIPTION
- *		Computes the arctangent.
- *		This is an implementation of the Gauss algorithm as
- *		described in:
- *		    Forman S. Acton, Numerical Methods That Work,
- *			New York, NY, Harper & Row, 1970.
- *
- *	RETURNS
- *		Returns the arctangent 
- */
-{
-    double ai, a1, bi, b1, l, d;
-    double maxerror;
-    int i;
-
-    if (x == 0.0)  {
-	return (0.0);
-    }
-    if (x < 1.0) {
-	maxerror = x * XCMS_MAXERROR;
-    } else {
-	maxerror = XCMS_MAXERROR;
-    }
-    ai = _XcmsSquareRoot( 1.0 / (1.0 + (x * x)) );
-    bi = 1.0;
-    for (i = 0; i < XCMS_MAXITER; i++) {
-	a1 = (ai + bi) / 2.0;
-	b1 = _XcmsSquareRoot((a1 * bi));
-	if (a1 == b1)
-	    break;
-	d = XCMS_FABS(a1 - b1);
-	if (d < maxerror)
-	    break;
-	ai = a1;
-	bi = b1;
-    }
-
-    l = ((a1 > b1) ? b1 : a1);
-
-    a1 = _XcmsSquareRoot(1 + (x * x));
-    return (x / (a1 * l));
-}
diff --git a/xc/lib/X11/cursorfont.h b/xc/lib/X11/cursorfont.h
deleted file mode 100644
index 10e1c096a..000000000
--- a/xc/lib/X11/cursorfont.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* $TOG: cursorfont.h /main/5 1998/02/06 17:15:54 kaleb $ */
-/*
-
-Copyright 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-#define XC_num_glyphs 154
-#define XC_X_cursor 0
-#define XC_arrow 2
-#define XC_based_arrow_down 4
-#define XC_based_arrow_up 6
-#define XC_boat 8
-#define XC_bogosity 10
-#define XC_bottom_left_corner 12
-#define XC_bottom_right_corner 14
-#define XC_bottom_side 16
-#define XC_bottom_tee 18
-#define XC_box_spiral 20
-#define XC_center_ptr 22
-#define XC_circle 24
-#define XC_clock 26
-#define XC_coffee_mug 28
-#define XC_cross 30
-#define XC_cross_reverse 32
-#define XC_crosshair 34
-#define XC_diamond_cross 36
-#define XC_dot 38
-#define XC_dotbox 40
-#define XC_double_arrow 42
-#define XC_draft_large 44
-#define XC_draft_small 46
-#define XC_draped_box 48
-#define XC_exchange 50
-#define XC_fleur 52
-#define XC_gobbler 54
-#define XC_gumby 56
-#define XC_hand1 58
-#define XC_hand2 60
-#define XC_heart 62
-#define XC_icon 64
-#define XC_iron_cross 66
-#define XC_left_ptr 68
-#define XC_left_side 70
-#define XC_left_tee 72
-#define XC_leftbutton 74
-#define XC_ll_angle 76
-#define XC_lr_angle 78
-#define XC_man 80
-#define XC_middlebutton 82
-#define XC_mouse 84
-#define XC_pencil 86
-#define XC_pirate 88
-#define XC_plus 90
-#define XC_question_arrow 92
-#define XC_right_ptr 94
-#define XC_right_side 96
-#define XC_right_tee 98
-#define XC_rightbutton 100
-#define XC_rtl_logo 102
-#define XC_sailboat 104
-#define XC_sb_down_arrow 106
-#define XC_sb_h_double_arrow 108
-#define XC_sb_left_arrow 110
-#define XC_sb_right_arrow 112
-#define XC_sb_up_arrow 114
-#define XC_sb_v_double_arrow 116
-#define XC_shuttle 118
-#define XC_sizing 120
-#define XC_spider 122
-#define XC_spraycan 124
-#define XC_star 126
-#define XC_target 128
-#define XC_tcross 130
-#define XC_top_left_arrow 132
-#define XC_top_left_corner 134
-#define XC_top_right_corner 136
-#define XC_top_side 138
-#define XC_top_tee 140
-#define XC_trek 142
-#define XC_ul_angle 144
-#define XC_umbrella 146
-#define XC_ur_angle 148
-#define XC_watch 150
-#define XC_xterm 152
diff --git a/xc/lib/X11/evtomask.c b/xc/lib/X11/evtomask.c
deleted file mode 100644
index 80b56de23..000000000
--- a/xc/lib/X11/evtomask.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/* $TOG: evtomask.c /main/11 1998/02/06 17:20:16 kaleb $ */
-/*
-
-Copyright 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#include <X11/X.h>
-
-#ifdef __STDC__
-#define Const const
-#else
-#define Const /**/
-#endif
-
-/*
- * This array can be used given an event type to determine the mask bits
- * that could have generated it.
- */
-long Const _Xevent_to_mask [LASTEvent] = {
-	0,						/* no event 0 */
-	0,						/* no event 1 */
-	KeyPressMask,					/* KeyPress */
-	KeyReleaseMask,					/* KeyRelease */
-	ButtonPressMask,				/* ButtonPress */
-	ButtonReleaseMask,				/* ButtonRelease */
-	PointerMotionMask|PointerMotionHintMask|Button1MotionMask|
-		Button2MotionMask|Button3MotionMask|Button4MotionMask|
-		Button5MotionMask|ButtonMotionMask,	/* MotionNotify */
-	EnterWindowMask,				/* EnterNotify */
-	LeaveWindowMask,				/* LeaveNotify */
-	FocusChangeMask,				/* FocusIn */
-	FocusChangeMask,				/* FocusOut */
-	KeymapStateMask,				/* KeymapNotify */
-	ExposureMask,					/* Expose */
-	ExposureMask,					/* GraphicsExpose */
-	ExposureMask,					/* NoExpose */
-	VisibilityChangeMask,				/* VisibilityNotify */
-	SubstructureNotifyMask,				/* CreateNotify */
-	StructureNotifyMask|SubstructureNotifyMask,	/* DestroyNotify */
-	StructureNotifyMask|SubstructureNotifyMask,	/* UnmapNotify */
-	StructureNotifyMask|SubstructureNotifyMask,	/* MapNotify */
-	SubstructureRedirectMask,			/* MapRequest */
-	SubstructureNotifyMask|StructureNotifyMask,	/* ReparentNotify */
-	StructureNotifyMask|SubstructureNotifyMask,	/* ConfigureNotify */
-	SubstructureRedirectMask,			/* ConfigureRequest */
-	SubstructureNotifyMask|StructureNotifyMask,	/* GravityNotify */
-	ResizeRedirectMask,				/* ResizeRequest */
-	SubstructureNotifyMask|StructureNotifyMask,	/* CirculateNotify */
-	SubstructureRedirectMask,			/* CirculateRequest */
-	PropertyChangeMask,				/* PropertyNotify */
-	0,						/* SelectionClear */
-	0,						/* SelectionRequest */
-	0,						/* SelectionNotify */
-	ColormapChangeMask,				/* ColormapNotify */
-	0,						/* ClientMessage */
-	0,						/* MappingNotify */
-};
diff --git a/xc/lib/X11/globals.c b/xc/lib/X11/globals.c
deleted file mode 100644
index 9f13d5e4a..000000000
--- a/xc/lib/X11/globals.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/* $TOG: globals.c /main/20 1998/02/06 17:29:35 kaleb $ */
-/*
-
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-
-/*
- *
- *                                 Global data
- *
- * This file should contain only those objects which must be predefined.
- */
-#define NEED_EVENTS
-#include <X11/Xlibint.h>
-
-
-/*
- * If possible, it is useful to have the global data default to a null value.
- * Some shared library implementations are *much* happier if there isn't any
- * global initialized data.
- */
-#ifdef NULL_NOT_ZERO			/* then need to initialize */
-#define SetZero(t,var,z) t var = z
-#else 
-#define SetZero(t,var,z) t var
-#endif
-
-#ifdef USL_SHAREDLIB			/* then need extra variables */
-/*
- * If we need to define extra variables for each global
- */
-#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
-#define ZEROINIT(t,var,val) SetZero(t,var,val); \
-  SetZero (long, _libX_##var##Flag, 0); \
-  SetZero (void *, _libX_##var##Ptr, NULL)
-#else /* else pcc concatenation */
-#define ZEROINIT(t,var,val) SetZero(t,var,val); \
-  SetZero (long, _libX_/**/var/**/Flag, 0); \
-  SetZero (void *, _libX_/**/var/**/Ptr, NULL)
-#endif /* concat ANSI C vs. pcc */
-
-#else /* else not USL_SHAREDLIB */
-/*
- * no extra crud
- */
-#define ZEROINIT(t,var,val) SetZero (t, var, val)
-
-#endif /* USL_SHAREDLIB */
-
-
-/*
- * Error handlers; used to be in XlibInt.c
- */
-ZEROINIT (XErrorHandler, _XErrorFunction, NULL);
-ZEROINIT (XIOErrorHandler, _XIOErrorFunction, NULL);
-ZEROINIT (_XQEvent *, _qfree, NULL);
-
-
-/*
- * Debugging information and display list; used to be in XOpenDis.c
- */
-ZEROINIT (int, _Xdebug, 0);
-ZEROINIT (Display *, _XHeadOfDisplayList, NULL);
-
-
-
-#if 0
-#ifdef STREAMSCONN
-
-
-/* The following are how the Xstream connections are used:              */
-/*      1)      Local connections over pseudo-tty ports.                */
-/*      2)      SVR4 local connections using named streams or SVR3.2    */
-/*              local connections using streams.                        */
-/*      3)      SVR4 stream pipe code. This code is proprietary and     */
-/*              the actual code is not included in the XC distribution. */
-/*      4)      remote connections using tcp                            */
-/*      5)      remote connections using StarLan                        */
-
-/*
- * descriptor block for streams connections
- */
-
-#include "Xstreams.h"
-
-char _XsTypeOfStream[100] = { 0 };
-
-extern int write();
-extern int close();
-#ifdef SVR4
-extern int _XsSetupSpStream();
-extern int _XsSetupNamedStream();
-#endif 
-extern int _XsSetupLocalStream();
-extern int _XsConnectLocalClient();
-extern int _XsCallLocalServer();
-extern int _XsReadLocalStream();
-extern int _XsErrorCall();
-extern int _XsWriteLocalStream();
-extern int _XsCloseLocalStream(); 
-extern int _XsSetupTliStream();
-extern int _XsConnectTliClient();
-extern int _XsCallTliServer(); 
-extern int _XsReadTliStream(); 
-extern int _XsWriteTliStream();
-extern int _XsCloseTliStream();
-
-
-Xstream _XsStream[] = {
-
-    { 
-	/* local connections using pseudo-ttys */
-
-	_XsSetupLocalStream,
-	_XsConnectLocalClient,
-	_XsCallLocalServer,
-	_XsReadLocalStream,
-	_XsErrorCall,
-	write,
-	close,
-	NULL
-    },
-    { 
-#ifdef SVR4
-	/* local connections using named streams */
-
-        _XsSetupNamedStream,
-#else
-	/* local connections using streams */
-        _XsSetupLocalStream,
-#endif
-        _XsConnectLocalClient,
-        _XsCallLocalServer,
-        _XsReadLocalStream,
-        _XsErrorCall,
-        write,
-        close,
-        NULL
-    },
-    /* Enhanced Application Compatibility Support */
-    {
-#ifdef SVR4
-	/* SVR4 stream pipe code */
-	_XsSetupSpStream,
-#else
-	_XsSetupLocalStream,
-#endif
-	_XsConnectLocalClient,
-	_XsCallLocalServer,
-	_XsReadLocalStream,
-	_XsErrorCall,
-	write,
-	close,
-	NULL
-    },
-    /* End Enhanced Application Compatibility Support */
-
-    {
-	/* remote connections using tcp */
-        _XsSetupTliStream,
-        _XsConnectTliClient,
-        _XsCallTliServer,
-        _XsReadLocalStream,
-        _XsErrorCall,
-	write,
-	close,
-	NULL
-    },
-    {
-	/* remote connections using StarLan */
-        _XsSetupTliStream,
-        _XsConnectTliClient,
-        _XsCallTliServer,
-        _XsReadLocalStream,
-        _XsErrorCall,
-        write,
-        close,
-        NULL
-    }
-};
-
-
-#endif /* STREAMSCONN */
-#endif
-
-
-#ifdef XTEST1
-/*
- * Stuff for input synthesis extension:
- */
-/*
- * Holds the two event type codes for this extension.  The event type codes
- * for this extension may vary depending on how many extensions are installed
- * already, so the initial values given below will be added to the base event
- * code that is aquired when this extension is installed.
- *
- * These two variables must be available to programs that use this extension.
- */
-int			XTestInputActionType = 0;
-int			XTestFakeAckType   = 1;
-#endif
-
-/*
- * NOTE: any additional external definition NEED
- * to be inserted BELOW this point!!!
- */
-
-/*
- * NOTE: any additional external definition NEED
- * to be inserted ABOVE this point!!!
- */
diff --git a/xc/lib/X11/imCallbk.c b/xc/lib/X11/imCallbk.c
deleted file mode 100644
index 0079ba4b7..000000000
--- a/xc/lib/X11/imCallbk.c
+++ /dev/null
@@ -1,885 +0,0 @@
-/* $XConsortium: imCallbk.c /main/16 1996/09/28 16:37:06 rws $ */
-/***********************************************************************
-Copyright 1993 by Digital Equipment Corporation, Maynard, Massachusetts,
-Copyright 1994 by FUJITSU LIMITED
-Copyright 1994 by Sony Corporation
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the names of Digital, FUJITSU
-LIMITED and Sony Corporation not be used in advertising or publicity
-pertaining to distribution of the software without specific, written
-prior permission.  
-
-DIGITAL, FUJITSU LIMITED AND SONY CORPORATION DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL DIGITAL, FUJITSU LIMITED
-AND SONY CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-  Author: Hiroyuki Miyamoto  Digital Equipment Corporation
-                             miyamoto@jrd.dec.com
-  Modifier: Takashi Fujiwara FUJITSU LIMITED
-			     fujiwara@a80.tech.yk.fujitsu.co.jp
-	    Makoto Wakamatsu Sony Corporation
-		 	     makoto@sm.sony.co.jp
-				
-***********************************************************************/
-/* $XFree86: xc/lib/X11/imCallbk.c,v 3.4 1999/05/09 10:50:30 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "Ximint.h"
-#include "XlcPubI.h"
-
-#define sz_CARD8                 1
-#define sz_INT8                  1
-#define sz_CARD16                2
-#define sz_INT16                 2
-#define sz_BITMASK16             sz_CARD16
-#define sz_CARD32                4
-#define sz_INT32                 4
-#define sz_BITMASK32             sz_CARD32
-#define sz_XIMID                 sizeof(XIMID)
-#define sz_XICID                 sizeof(XICID)
-#define sz_XIMATTRID             sizeof(XIMATTRID)
-#define sz_XICATTRID             sizeof(XICATTRID)
-#define sz_ximPacketHeader       (XIM_HEADER_SIZE + sz_XIMID + sz_XICID)
-#define sz_ximGeometry           0
-#define sz_ximStrConversion      (sz_CARD32 + sz_CARD32 + sz_CARD32 + sz_CARD32)
-#define sz_ximPreeditStart       0
-#define sz_ximPreeditStartReply  sz_INT32
-#define sz_ximPreeditCaret       (sz_INT32 + sz_CARD32 + sz_CARD32)
-#define sz_ximPreeditCaretReply  sz_CARD32
-#define sz_ximPreeditDone        0
-#define sz_ximStatusStart        0
-#define sz_ximStatusDone         0
-
-typedef enum {
-    XimCbSuccess, 
-    XimCbNoCallback, 
-    XimCbError, 
-    XimCbQueued, 
-    XimCbBadContextID, 
-    XimCbBadOpcode
-} XimCbStatus;
-
-typedef XimCbStatus (*XimCb)(
-#if NeedFunctionPrototypes
-			     Xim, Xic, char*, int
-#endif
-			     );
-
-#define PACKET_TO_MAJOROPCODE(p) (*(CARD8*)((CARD8*)(p)))
-#define PACKET_TO_MINOROPCODE(p) (*(CARD8*)((CARD8*)(p) + sz_CARD8))
-#define PACKET_TO_LENGTH(p) (*(CARD16*)((CARD8*)(p) + sz_CARD8 + sz_CARD8))
-#define PACKET_TO_IMID(p) (*(XIMID*)((CARD8*)(p) + XIM_HEADER_SIZE))
-#define PACKET_TO_ICID(p) (*(XICID*)((CARD8*)(p) + XIM_HEADER_SIZE + sz_XIMID))
-
-#define _XimWriteData(im,len,data) \
-    (im->private.proto.write((im),(len),(XPointer)(data)))
-#define _XimReadData(im,buf,buf_len,len) \
-    (im->private.proto.read((im),(XPointer)(buf),(buf_len),&(len)))
-#define _XimFlushData(im) im->private.proto.flush((im))
-
-#if NeedFunctionPrototypes
-Public Bool _XimCbDispatch(Xim xim, INT16 len, XPointer data, XPointer call_data);
-Private XimCbStatus _XimGeometryCallback(Xim, Xic, char*, int);
-Private XimCbStatus _XimStrConversionCallback(Xim, Xic, char*, int);
-Private XimCbStatus _XimPreeditStartCallback(Xim, Xic, char*, int);
-Private XimCbStatus _XimPreeditDoneCallback(Xim, Xic, char*, int);
-Private void _free_memory_for_text(XIMText*);
-Private XimCbStatus _XimPreeditDrawCallback(Xim, Xic, char*, int);
-Private XimCbStatus _XimPreeditCaretCallback(Xim, Xic, char*, int);
-Private XimCbStatus _XimStatusStartCallback(Xim, Xic, char*, int);
-Private XimCbStatus _XimStatusDoneCallback(Xim, Xic, char*, int);
-Private XimCbStatus _XimStatusDrawCallback(Xim, Xic, char*, int);
-Private XimCbStatus _XimPreeditStateNotifyCallback(Xim, Xic, char *, int);
-#else
-Public Bool _XimCbDispatch();
-Private XimCbStatus _XimGeometryCallback();
-Private XimCbStatus _XimStrConversionCallback();
-Private XimCbStatus _XimPreeditStartCallback();
-Private XimCbStatus _XimPreeditDoneCallback();
-Private void _free_memory_for_text();
-Private XimCbStatus _XimPreeditDrawCallback();
-Private XimCbStatus _XimPreeditCaretCallback();
-Private XimCbStatus _XimStatusStartCallback();
-Private XimCbStatus _XimStatusDoneCallback();
-Private XimCbStatus _XimStatusDrawCallback();
-Private XimCbStatus _XimPreeditStateNotifyCallback();
-#endif /* NeedFunctionPrototypes */
-
-#ifdef __STDC__
-#define Const const
-#else
-#define Const /**/
-#endif
-#if defined(__STDC__) && ((defined(sun) && defined(SVR4)) || defined(WIN32))
-#define RConst /**/
-#else
-#define RConst Const
-#endif
-
-/* NOTE:
- * the table below depends on the protocol number 
- * defined in the IM Protocol document.
- */
-static RConst XimCb callback_table[] = {
-    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* #000-009 */
-    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* #010-019 */
-    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* #020-029 */
-    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* #030-039 */
-    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* #040-049 */
-    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* #050-059 */
-    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* #060-069 */
-    _XimGeometryCallback,	/* #070 */
-    _XimStrConversionCallback,	/* #071 */
-    NULL,			/* #072 */
-    _XimPreeditStartCallback,	/* #073 */
-    NULL,			/* #074 */
-    _XimPreeditDrawCallback,	/* #075 */
-    _XimPreeditCaretCallback,	/* #076 */
-    NULL,			/* #077 */
-    _XimPreeditDoneCallback,	/* #078 */
-    _XimStatusStartCallback,	/* #079 */
-    _XimStatusDrawCallback,	/* #080 */
-    _XimStatusDoneCallback,	/* #081 */
-    _XimPreeditStateNotifyCallback	/* #082 */
-    };
-
-
-Private Bool
-#if NeedFunctionPrototypes
-_XimIsReadyForProcess(Xic ic)
-#else
-_XimIsReadyForProcess(ic)
-  Xic ic;
-#endif
-{
-    return(!ic->private.proto.waitCallback); /* check HM */
-}
-
-Private void
-#if NeedFunctionPrototypes
-_XimProcessPendingCallbacks(Xic ic)
-#else
-_XimProcessPendingCallbacks(ic)
-  Xic ic;
-#endif
-{
-    XimPendingCallback pcbq;
-
-    while (((pcbq = ic->private.proto.pend_cb_que) != (XimPendingCallback)NULL) 
-	   && _XimIsReadyForProcess(ic)) {
-	(void) (*callback_table[pcbq->major_opcode])(pcbq->im, 
-						     pcbq->ic, 
-						     pcbq->proto, 
-						     pcbq->proto_len);
-	ic->private.proto.pend_cb_que = pcbq->next;
-	Xfree(pcbq->proto);	/* free memory of XimPendingCallback */
-	Xfree(pcbq);
-    }
-}
-
-Private void
-#if NeedFunctionPrototypes
-_XimPutCbIntoQueue(Xic ic, XimPendingCallback call_data)
-#else
-_XimPutCbIntoQueue(ic, call_data)
-  Xic ic;
-  XimPendingCallback call_data;
-#endif
-{
-    XimPendingCallback pcbq = ic->private.proto.pend_cb_que;
-
-    /* Queuing is FIFO
-     */
-    while (pcbq != (XimPendingCallback)NULL) {
-	if (pcbq->next == (XimPendingCallback)NULL) {
-	    break;
-	}
-	pcbq = pcbq->next;
-    }
-    if (pcbq == (XimPendingCallback)NULL) {
-	ic->private.proto.pend_cb_que = call_data;
-    }
-    else {
-	pcbq->next = call_data;
-    }
-}
-
-Public Bool
-#if NeedFunctionPrototypes
-_XimCbDispatch(Xim xim, 
-	       INT16 len, 
-	       XPointer data, 
-	       XPointer call_data)
-#else
-_XimCbDispatch(xim, len, data, call_data)
-  Xim xim;
-  INT16 len;
-  XPointer data;
-  XPointer call_data;
-#endif
-{
-    /* `data' points to the beginning of the packet defined in IM Protocol doc.
-     */
-    int major_opcode = PACKET_TO_MAJOROPCODE(data);
-    XIMID imid = PACKET_TO_IMID(data);
-    XICID icid = PACKET_TO_ICID(data);
-    Xim im = (Xim)call_data;	/* check HM */
-    Xic ic = _XimICOfXICID(im, icid);
-    char* proto;
-    int proto_len;
-
-    /* check validity of im/ic
-     */
-    if ((imid != im->private.proto.imid) || !ic) {
-	return False; /* status = XimCbBadContextID; */
-    }
-
-    /* process pending callbacks
-     */
-    _XimProcessPendingCallbacks(ic);
-
-    /* check if the protocol should be processed here
-     */
-    if (major_opcode > 82) {
-	return False; /* status = XimCbBadOpcode; */
-    }
-    if (!callback_table[major_opcode]) {
-	return False; /* status = XimCbBadOpcode; */
-    }
-
-    /* move the pointer ahead by the IM Protocol packet header size
-     */
-    proto = (char*)data + sz_ximPacketHeader;
-    proto_len = (int)len - sz_ximPacketHeader;
-
-    /* check if it can be processed right away
-     * and if no, queue the protocol, otherwise invoke a callback
-     */
-    if (!_XimIsReadyForProcess(ic)) {
-
-	/* queue the protocol
-	 */
-	XimPendingCallback pcb;
-	char *proto_buf = (proto_len > 0) ? (char*)Xmalloc(proto_len) : NULL;
-
-	pcb = (XimPendingCallback)Xmalloc(sizeof(XimPendingCallbackRec));
-	if (pcb && (proto_len <= 0 || proto_buf)) {
-	    if (proto_len > 0)
-		memcpy(proto_buf, proto, proto_len);
-
-	    pcb->major_opcode = major_opcode;
-	    pcb->im = im;
-	    pcb->ic = ic;
-	    pcb->proto = proto_buf;
-	    pcb->proto_len = proto_len;
-	    pcb->next = (XimPendingCallback)NULL; /* queue is FIFO */
-	    _XimPutCbIntoQueue(ic, pcb);
-	    /* status = XimCbQueued; */
-	} else {
-	    /* status = XimCbError; */
-	}
-    }
-    else {
-	/* invoke each callback according to the major opcode.
-	 * `proto' points to the next address of IM-ID and IC-ID.
-	 * `proto_len' specifies the packet length.
-	 */
-	(void) (*callback_table[major_opcode])(im, ic, proto, proto_len);
-    }
-    return True;
-}
-
-Private XimCbStatus
-#if NeedFunctionPrototypes
-_XimGeometryCallback(Xim im, 
-		     Xic ic, 
-		     char* proto, 
-		     int len)
-#else
-_XimGeometryCallback(im, ic, proto, len)
-  Xim im;
-  Xic ic;
-  char* proto;
-  int len;
-#endif
-{
-    XICCallback* cb = &ic->core.geometry_callback;
-
-    /* invoke the callack
-     */
-    if (cb && cb->callback) {    
-	(*cb->callback)((XIC)ic, cb->client_data, (XPointer)NULL);
-    }
-    else {
-
-	/* no callback registered
-	 */
-	return XimCbNoCallback;
-    }
-
-    return XimCbSuccess;
-}
-
-Private XimCbStatus
-#if NeedFunctionPrototypes
-_XimStrConversionCallback(Xim im, 
-			  Xic ic, 
-			  char* proto, 
-			  int len)
-#else
-_XimStrConversionCallback(im, ic, proto, len)
-  Xim im;
-  Xic ic;
-  char* proto;
-  int len;
-#endif
-{
-    XICCallback* cb = &ic->core.string_conversion_callback; /* check HM */
-    XIMStringConversionCallbackStruct cbrec;
-
-    /* invoke the callback
-     */
-    if (cb && cb->callback) {
-	int p = XIM_HEADER_SIZE;
-	cbrec.position = (XIMStringConversionPosition)
-	    *(CARD32*)&proto[p]; p += sz_CARD32;
-	cbrec.direction = (XIMCaretDirection)
-	    *(CARD32*)&proto[p]; p += sz_CARD32;
-	cbrec.operation = (XIMStringConversionOperation)
-	    *(CARD32*)&proto[p]; p += sz_CARD32;
-	cbrec.factor = (unsigned short)
-	    *(CARD32*)&proto[p];
-
-	(*cb->callback)((XIC)ic, cb->client_data, (XPointer)&cbrec);
-    }
-    else {
-
-	/* no callback registered
-	 */
-	_XimError(im, ic, 
-		  (CARD16)XIM_BadSomething, 
-		  (INT16)len, 
-		  (CARD16)XIM_STR_CONVERSION, 
-		  (char*)proto); /* send XIM_ERROR */
-	return XimCbNoCallback;
-    }
-
-    /* send a reply
-     */
-    {
-	CARD8	*buf;
-	INT16	 buf_len;
-	int	 p, length_in_bytes, i;
-
-	/* Assumption:
-	 * `cbrec.text->length' means the string length in characters
-	 */
-	{
-	    length_in_bytes = (cbrec.text->encoding_is_wchar)?
-		sizeof(wchar_t) * cbrec.text->length: /* wchar */
-		strlen(cbrec.text->string.mbs);	/* mb */
-	    buf_len = XIM_HEADER_SIZE + 
-		sz_CARD16 +
-		2 + length_in_bytes + 
-		XIM_PAD(2 + length_in_bytes) +
-		2 + 2 + sz_CARD32 * cbrec.text->length;
-	    buf = (CARD8*)Xmalloc(buf_len);
-	}
-	_XimSetHeader((XPointer)buf, XIM_STR_CONVERSION_REPLY, 0, &buf_len);
-	buf_len -= XIM_HEADER_SIZE; /* added by _XimSetHeader (HACK) */
-	p = XIM_HEADER_SIZE;
-	*(CARD16*)&buf[p] = (CARD16)im->private.proto.imid; p += sz_CARD16;
-	*(CARD16*)&buf[p] = (CARD16)ic->private.proto.icid; p += sz_CARD16;
-	*(CARD16*)&buf[p] = (CARD16)cbrec.text->length; p += sz_CARD16;
-	memcpy(&buf[p],&cbrec.text->string.mbs,length_in_bytes);
-	p += length_in_bytes;
-	*(CARD16*)&buf[p] = (CARD16)(sz_CARD32*cbrec.text->length);
-	p += XIM_PAD(2);
-	for (i = 0; i < (int)cbrec.text->length; i++) {
-	    *(CARD32*)&buf[p] = (CARD32)cbrec.text->feedback[i];
-	    p += sz_CARD32;
-	}
-
-	if (!(_XimWriteData(im, buf_len, buf))) {
-	    return XimCbError;
-	}
-	_XimFlushData(im);
-
-	Xfree(buf);
-    }
-
-    return XimCbSuccess;
-}
-
-Private XimCbStatus
-#if NeedFunctionPrototypes
-_XimPreeditStartCallback(Xim im, 
-			 Xic ic, 
-			 char* proto, 
-			 int len)
-#else
-_XimPreeditStartCallback(im, ic, proto, len)
-  Xim im;
-  Xic ic;
-  char* proto;
-  int len;
-#endif
-{
-    XICCallback* cb = &ic->core.preedit_attr.start_callback;
-    int ret;
-
-    /* invoke the callback
-     */
-    if (cb && cb->callback){
-	ret = (*(cb->callback))((XIC)ic, cb->client_data, (XPointer)NULL);
-    }
-    else {
-
-	/* no callback registered 
-	 */
-	_XimError(im, ic, 
-		  (CARD16)XIM_BadSomething, 
-		  (INT16)len, 
-		  (CARD16)XIM_PREEDIT_START, 
-		  (char*)proto); /* send XIM_ERROR */
-	return XimCbNoCallback;
-    }
-
-    /* send a reply
-     */
-    {
-	CARD32 buf32[(sz_ximPacketHeader + sz_ximPreeditStartReply) / 4];
-	CARD8 *buf = (CARD8 *)buf32;
-	INT16 buf_len = sz_XIMID + sz_XICID + sz_ximPreeditStartReply;
-	int p;
-
-	_XimSetHeader((XPointer)buf, XIM_PREEDIT_START_REPLY, 0, &buf_len);
-	p = XIM_HEADER_SIZE;
-	*(CARD16*)&buf[p] = (CARD16)im->private.proto.imid; p += sz_CARD16;
-	*(CARD16*)&buf[p] = (CARD16)ic->private.proto.icid; p += sz_CARD16;
-	*(INT32*)&buf[p]  = (INT32)ret;
-
-	if (!(_XimWriteData(im, buf_len, buf))) {
-	    return XimCbError;
-	}
-	_XimFlushData(im);
-    }
-
-    return XimCbSuccess;
-}
-
-Private XimCbStatus
-#if NeedFunctionPrototypes
-_XimPreeditDoneCallback(Xim im, 
-			Xic ic, 
-			char* proto, 
-			int len)
-#else
-_XimPreeditDoneCallback(im, ic, proto, len)
-  Xim im;
-  Xic ic;
-  char* proto;
-  int len;
-#endif
-{
-    XICCallback* cb = &ic->core.preedit_attr.done_callback;
-
-    /* invoke the callback
-     */
-    if (cb && cb->callback) {
-	(*cb->callback)((XIC)ic, cb->client_data, (XPointer)NULL);
-    }
-    else {
-
-	/* no callback registered
-	 */
-	return XimCbNoCallback;
-    }
-
-    return XimCbSuccess;
-}
-
-Private void
-#if NeedFunctionPrototypes
-_read_text_from_packet(Xim im, 
-		       char* buf, 
-		       XIMText** text_ptr)
-#else
-_read_text_from_packet(im, buf, text_ptr)
-  Xim im;
-  char* buf;
-  XIMText** text_ptr;
-#endif
-{
-    int status;
-    XIMText* text;
-    int tmp_len;
-    char* tmp_buf;
-    Status s = 0;
-
-    status = (int)*(BITMASK32*)buf; buf += sz_BITMASK32;
-
-    /* string part
-     */
-    if (status & 0x00000001) /* "no string" bit on */ {
-	buf += sz_CARD16;	/* skip "length of preedit string" */
-	buf += 2;		/* pad */
-	*text_ptr = (XIMText*)NULL;
-	return;
-    }
-
-    *text_ptr = text = (XIMText*)Xmalloc(sizeof(XIMText));
-    if (text == (XIMText*)NULL) return;
-
-	tmp_len = (int)*(CARD16*)buf;
-	buf += sz_CARD16;
-	if ((tmp_buf = (char*)Xmalloc(tmp_len + 1)) != 0) {
-	    memcpy(tmp_buf, buf, tmp_len);
-	    tmp_buf[tmp_len] = '\0';
-
-	    text->encoding_is_wchar = False;
-	    text->length = im->methods->ctstombs((XIM)im, 
-					tmp_buf, tmp_len, 
-					NULL, 0, &s); /* CT? HM */
-	    if (s != XLookupNone) {
-#ifndef NO_DEC_I18N_FIX
-                /* Allow for NULL-terminated */
-                if ((text->string.multi_byte =
-                    (char*)Xmalloc(text->length *
-                      XLC_PUBLIC(im->core.lcd,mb_cur_max) + 1))) {
-#else
-		if (text->string.multi_byte = (char*)Xmalloc(text->length+1)) {
-#endif
-			int tmp;
-#ifndef NO_DEC_I18N_FIX
-                        char *char_tmp;
-                        int char_len;
-#endif
-			tmp = im->methods->ctstombs((XIM)im,
-					   tmp_buf, tmp_len, 
-#ifndef NO_DEC_I18N_FIX
-                                           text->string.multi_byte,
-                                           text->length * XLC_PUBLIC(im->core.lcd,mb_cur_max) + 1,
-#else
-					   text->string.multi_byte, text->length, 
-#endif
-					   &s);
-			text->string.multi_byte[tmp] = '\0';
-#ifndef NO_DEC_I18N_FIX
-                        text->length = 0;
-                        char_tmp =  text->string.multi_byte;
-                        while (*char_tmp != '\0') {
-                              char_len = mblen(char_tmp, strlen(char_tmp));
-                              char_tmp = char_tmp + char_len;
-                              (text->length)++;
-                        }
-#endif
-		}
-	    }
-	    else {
-		text->length = 0;
-		text->string.multi_byte = NULL;
-	    }
-
-	    Xfree(tmp_buf);
-	}
-	buf += tmp_len;
-
-	buf += XIM_PAD(sz_CARD16 + tmp_len); /* pad */
-
-    /* feedback part
-     */
-    if (status & 0x00000002) /* "no feedback" bit on */ {
-	text->feedback = (XIMFeedback*)NULL;
-    }
-    else {
-	int i, j;
-
-	i = (int)*(CARD16*)buf; buf += sz_CARD16;
-	buf += sz_CARD16; /* skip `unused' */
-	text->feedback = (XIMFeedback*)Xmalloc(i*(sizeof(XIMFeedback)/sizeof(CARD32)));
-	j = 0;
-	while (i > 0) {
-	    text->feedback[j] = (XIMFeedback)*(CARD32*)buf;
-	    buf += sz_CARD32;
-	    i -= sz_CARD32;
-	    j++;
-	}
-	/* 
-	 * text->length tells how long both the status string and
-	 * the feedback array are. If there's "no string" the
-	 * text->length was set to zero previously. See above.
-	 * But if there is feedback (i.e. not "no feedback") then
-	 * we need to convey the length of the feedback array.
-	 * It might have been better if the protocol sent two
-	 * different values, one for the length of the status
-	 * string and one for the length of the feedback array.
-	 */
-	if (status & 0x00000001) /* "no string" bit on */ {
-	    text->length = j;
-	}
-    }
-}
-
-Private void
-#if NeedFunctionPrototypes
-_free_memory_for_text(XIMText* text)
-#else
-_free_memory_for_text(text)
-  XIMText* text;
-#endif
-{
-    if (text) {
-	if (text->string.multi_byte)
-	    Xfree(text->string.multi_byte);
-	if (text->feedback)
-	    Xfree(text->feedback);
-	Xfree(text);
-    }
-}
-
-Private XimCbStatus
-#if NeedFunctionPrototypes
-_XimPreeditDrawCallback(Xim im, 
-			Xic ic, 
-			char* proto, 
-			int len)
-#else
-_XimPreeditDrawCallback(im, ic, proto, len)
-  Xim im;
-  Xic ic;
-  char* proto;
-  int len;
-#endif
-{
-    XICCallback* cb = &ic->core.preedit_attr.draw_callback;
-    XIMPreeditDrawCallbackStruct cbs;
-
-    /* invoke the callback
-     */
-    if (cb && cb->callback) {
-	cbs.caret      = (int)*(INT32*)proto; proto += sz_INT32;
-	cbs.chg_first  = (int)*(INT32*)proto; proto += sz_INT32;
-	cbs.chg_length = (int)*(INT32*)proto; proto += sz_INT32;
-	_read_text_from_packet(im, proto, &cbs.text);
-
-	(*cb->callback)((XIC)ic, cb->client_data, (XPointer)&cbs);
-
-	_free_memory_for_text((XIMText*)cbs.text);
-    }
-    else {
-
-	/* no callback registered
-	 */
-	return XimCbNoCallback;
-    }
-
-    return XimCbSuccess;
-}
-
-Private XimCbStatus
-#if NeedFunctionPrototypes
-_XimPreeditCaretCallback(Xim im, 
-			 Xic ic, 
-			 char* proto,
-			 int len)
-#else
-_XimPreeditCaretCallback(im, ic, proto, len)
-  Xim im;
-  Xic ic;
-  char* proto;
-  int len;
-#endif
-{
-    XICCallback* cb = &ic->core.preedit_attr.caret_callback;
-    XIMPreeditCaretCallbackStruct cbs;
-
-    /* invoke the callback
-     */
-    if (cb && cb->callback) {
-	cbs.position  = (int)*(INT32*)proto; proto += sz_INT32;
-	cbs.direction = (XIMCaretDirection)*(CARD32*)proto; proto += sz_CARD32;
-	cbs.style     = (XIMCaretStyle)*(CARD32*)proto; proto += sz_CARD32;
-
-	(*cb->callback)((XIC)ic, cb->client_data, (XPointer)&cbs);
-    }
-    else {
-
-	/* no callback registered 
-	 */
-	_XimError(im, ic, 
-		  (CARD16)XIM_BadSomething, 
-		  (INT16)len, 
-		  (CARD16)XIM_PREEDIT_CARET, 
-		  (char*)proto); /* send XIM_ERROR */
-	return XimCbNoCallback;
-    }
-
-    /* Send a reply
-     */
-    {
-	CARD8 buf[sz_ximPacketHeader + sz_ximPreeditCaretReply];
-	INT16 len = sz_XIMID + sz_XICID + sz_ximPreeditCaretReply;
-	int p;
-
-	_XimSetHeader((XPointer)buf, XIM_PREEDIT_CARET_REPLY, 0, &len);
-	p = XIM_HEADER_SIZE;
-	*(CARD16*)&buf[p] = (CARD16)im->private.proto.imid; p += sz_CARD16;
-	*(CARD16*)&buf[p] = (CARD16)ic->private.proto.icid; p += sz_CARD16;
-	*(CARD32*)&buf[p] = (CARD32)cbs.position;
-
-	if (!(_XimWriteData(im, len, buf))) {
-	    return XimCbError;
-	}
-	_XimFlushData(im);
-    }
-
-    return XimCbSuccess;
-}
-
-Private XimCbStatus
-#if NeedFunctionPrototypes
-_XimStatusStartCallback(Xim im, 
-			Xic ic, 
-			char* proto, 
-			int len)
-#else
-_XimStatusStartCallback(im, ic, proto, len)
-  Xim im;
-  Xic ic;
-  char* proto;
-  int len;
-#endif
-{
-    XICCallback* cb = &ic->core.status_attr.start_callback;
-
-    /* invoke the callback
-     */
-    if (cb && cb->callback) {
-	(*cb->callback)((XIC)ic, cb->client_data, (XPointer)NULL);
-    }
-    else {
-
-	/* no callback registered
-	 */
-	return XimCbNoCallback;
-    }
-
-    return XimCbSuccess;
-}
-
-Private XimCbStatus
-#if NeedFunctionPrototypes
-_XimStatusDoneCallback(Xim im, 
-		       Xic ic, 
-		       char* proto, 
-		       int len)
-#else
-_XimStatusDoneCallback(im, ic, proto, len)
-  Xim im;
-  Xic ic;
-  char* proto;
-  int len;
-#endif
-{
-    XICCallback* cb = &ic->core.status_attr.done_callback;
-
-    /* invoke the callback
-     */
-    if (cb && cb->callback) {
-	(*cb->callback)((XIC)ic, cb->client_data, (XPointer)NULL);
-    }
-    else {
-
-	/* no callback registered
-	 */
-	return XimCbNoCallback;
-    }
-
-    return XimCbSuccess;
-}
-
-Private XimCbStatus
-#if NeedFunctionPrototypes
-_XimStatusDrawCallback(Xim im, 
-		       Xic ic, 
-		       char* proto, 
-		       int len)
-#else
-_XimStatusDrawCallback(im, ic, proto, len)
-  Xim im;
-  Xic ic;
-  char* proto;
-  int len;
-#endif
-{
-    XICCallback* cb = &ic->core.status_attr.draw_callback;
-    XIMStatusDrawCallbackStruct cbs;
-
-    /* invoke the callback
-     */
-    if (cb && cb->callback) {
-	cbs.type = (XIMStatusDataType)*(CARD32*)proto; proto += sz_CARD32;
-	if (cbs.type == XIMTextType) {
-	    _read_text_from_packet(im, proto, &cbs.data.text);
-	}
-	else if (cbs.type == XIMBitmapType) {
-	    cbs.data.bitmap = (Pixmap)*(CARD32*)proto;
-	}
-
-	(*cb->callback)((XIC)ic, cb->client_data, (XPointer)&cbs);
-
-	_free_memory_for_text((XIMText *)cbs.data.text);
-    }
-    else {
-
-	/* no callback registered
-	 */
-	return XimCbNoCallback;
-    }
-
-    return XimCbSuccess;
-}
-
-Private XimCbStatus
-#if NeedFunctionPrototypes
-_XimPreeditStateNotifyCallback( Xim im, Xic ic, char* proto, int len )
-#else
-_XimPreeditStateNotifyCallback( im, ic, proto, len )
-    Xim		 im;
-    Xic		 ic;
-    char	*proto;
-    int		 len;
-#endif
-{
-    XICCallback	*cb = &ic->core.preedit_attr.state_notify_callback;
-
-    /* invoke the callack
-     */
-    if( cb  &&  cb->callback ) {    
-	XIMPreeditStateNotifyCallbackStruct cbrec;
-
-	cbrec.state = *(BITMASK32 *)proto;
-	(*cb->callback)( (XIC)ic, cb->client_data, (XPointer)&cbrec );
-    }
-    else {
-	/* no callback registered
-	 */
-	return XimCbNoCallback;
-    }
-
-    return XimCbSuccess;
-}
-
diff --git a/xc/lib/X11/imConv.c b/xc/lib/X11/imConv.c
deleted file mode 100644
index 6203f850f..000000000
--- a/xc/lib/X11/imConv.c
+++ /dev/null
@@ -1,936 +0,0 @@
-/* $TOG: imConv.c /main/20 1998/06/17 15:46:41 kaleb $ */
-/******************************************************************
-
-              Copyright 1991, 1992 by Fuji Xerox Co.,Ltd.
-	      Copyright 1993, 1994 by FUJITSU LIMITED
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of Fuji Xerox Co.,Ltd.
-, and that the name of FUJITSU LIMITED not be used in advertising or
-publicity pertaining to distribution of the software without specific,
- written prior permission.
-Fuji Xerox Co.,Ltd. , and FUJITSU LIMITED makes no representations about
-the suitability of this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-FUJI XEROX CO.,LTD. AND FUJITSU LIMITED DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL FUJI XEROX CO.,LTD.
-AND FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT
-OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-  Auther:   Kazunori Nishihara, Fuji Xerox Co.,Ltd.
-                                kaz@ssdev.ksp.fujixerox.co.jp
-  Modifier: Takashi Fujiwara    FUJITSU LIMITED
-                                fujiwara@a80.tech.yk.fujitsu.co.jp
-
-******************************************************************/
-/* $XFree86: xc/lib/X11/imConv.c,v 1.17 1999/06/06 14:05:53 dawes Exp $ */
-
-#define NEED_EVENTS
-#include <stdio.h>
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "Ximint.h"
-#include "XlcPubI.h"
-#define XK_PUBLISHING
-#include "X11/keysym.h"
-
-#ifdef XKB
-/* 
- * rather than just call _XLookupString (i.e. the pre-XKB XLookupString) 
- * do this because with XKB the event may have some funky modifiers that 
- * _XLookupString doesn't grok.
- */
-#include "XKBlib.h"
-#define	XLOOKUPSTRING lookup_string
-#else
-#define	XLOOKUPSTRING XLookupString
-#endif
-
-/* bit (1<<i) means character is in codeset i */
-unsigned int _Xlatin1[128] = {
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x990ee, 0x88000, 0x89000, 0x89084, 0x0902e, 0x89000, 0x09080, 0x9908e,
-0x0908e, 0x89080, 0x88000, 0x89080, 0x89080, 0x990ee, 0x89000, 0x89008,
-0x9908e, 0x89080, 0x89084, 0x89084, 0x0908e, 0x89004, 0x89000, 0x99084,
-0x0900c, 0x89000, 0x88000, 0x89080, 0x09000, 0x09084, 0x09000, 0x88000,
-0x88004, 0x9800e, 0x9800e, 0x98008, 0x9800e, 0x98008, 0x98008, 0x88006,
-0x88004, 0x9800e, 0x88004, 0x9800e, 0x88004, 0x9800e, 0x9800e, 0x98004,
-0x90000, 0x88004, 0x88004, 0x98006, 0x9800e, 0x98008, 0x9800e, 0x8800e,
-0x98008, 0x88004, 0x9800e, 0x9800c, 0x9800e, 0x90002, 0x90000, 0x9800e,
-0x88004, 0x9800e, 0x9800e, 0x98008, 0x9800e, 0x98008, 0x98008, 0x88004,
-0x88004, 0x9800e, 0x88004, 0x9800e, 0x88004, 0x9800e, 0x9800e, 0x98004,
-0x90000, 0x88004, 0x88004, 0x98006, 0x9800e, 0x98008, 0x9800e, 0x8800e,
-0x98008, 0x88004, 0x9800e, 0x9800c, 0x9800e, 0x90002, 0x90000, 0x88000
-};
-
-/* bit (1<<i) means character is in codeset i */
-unsigned int _Xlatin2[128] = {
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x1800c, 0x10008, 0x00004, 0x00000, 0x0800c, 0x00000, 0x00000, 0x1800c,
-0x0800c, 0x00008, 0x00004, 0x00000, 0x00000, 0x1800c, 0x00008, 0x00004,
-0x1800c, 0x10008, 0x00008, 0x00000, 0x0800c, 0x00000, 0x00000, 0x00008,
-0x0800c, 0x00008, 0x00004, 0x00000, 0x00000, 0x00000, 0x00008, 0x00004,
-0x00000, 0x1800c, 0x1800c, 0x00000, 0x1800c, 0x00000, 0x00000, 0x08004,
-0x10008, 0x1800c, 0x10008, 0x1800c, 0x00000, 0x18008, 0x18008, 0x00000,
-0x00008, 0x00000, 0x00000, 0x18004, 0x1800c, 0x00000, 0x1800c, 0x0800c,
-0x00000, 0x00000, 0x0800c, 0x00000, 0x0800c, 0x10000, 0x00000, 0x1800c,
-0x00000, 0x1800c, 0x1800c, 0x00000, 0x1800c, 0x00000, 0x00000, 0x08004,
-0x10008, 0x1800c, 0x10008, 0x1800c, 0x00000, 0x1800c, 0x1800c, 0x00000,
-0x00008, 0x00000, 0x00000, 0x18004, 0x1800c, 0x00000, 0x1800c, 0x0800c,
-0x00000, 0x00000, 0x0800c, 0x00000, 0x0800c, 0x10000, 0x00000, 0x0000c
-};
-
-/* maps Cyrillic keysyms to 8859-5 */
-unsigned char _Xcyrillic[] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80 - */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90 - */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xf2, 0xf3, 0xf1, 0xf4, 0xf5, 0xf6, 0xf7, /* 0xa0 - */
-    0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0x00, 0xfe, 0xff,
-    0xf0, 0xa2, 0xa3, 0xa1, 0xa4, 0xa5, 0xa6, 0xa7, /* 0xb0 - */
-    0xa8, 0xa9, 0xaa, 0xab, 0xac, 0x00, 0xae, 0xaf,
-    0xee, 0xd0, 0xd1, 0xe6, 0xd4, 0xd5, 0xe4, 0xd3, /* 0xc0 - */
-    0xe5, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde,
-    0xdf, 0xef, 0xe0, 0xe1, 0xe2, 0xe3, 0xd6, 0xd2, /* 0xd0 - */
-    0xec, 0xeb, 0xd7, 0xe8, 0xed, 0xe9, 0xe7, 0xea,
-    0xce, 0xb0, 0xb1, 0xc6, 0xb4, 0xb5, 0xc4, 0xb3, /* 0xe0 - */
-    0xc5, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe,
-    0xbf, 0xcf, 0xc0, 0xc1, 0xc2, 0xc3, 0xb6, 0xb2, /* 0xf0 - */
-    0xcc, 0xcb, 0xb7, 0xc8, 0xcd, 0xc9, 0xc7, 0xca
-};
-
-/* maps Cyrillic keysyms to KOI8-R */
-unsigned char _Xkoi8_r[] =
-   {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0xa3, 0x00, 0x00, 0x00, 0x00, /* 10 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0xb3, 0x00, 0x00, 0x00, 0x00, /* 11 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, /* 12 */
-    0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
-    0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, /* 13 */
-    0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
-    0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, /* 14 */
-    0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
-    0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, /* 15 */
-    0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff};
-
-/* maps Cyrillic keysyms to KOI8-U */
-unsigned char _Xkoi8_u[] =
-   {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0xa3, 0xa4, 0x00, 0xa6, 0xa7, /* 10 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0xad, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0xb3, 0xb4, 0x00, 0xb6, 0xb7, /* 11 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0xbd, 0x00, 0x00,
-    0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, /* 12 */
-    0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
-    0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, /* 13 */
-    0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
-    0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, /* 14 */
-    0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
-    0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, /* 15 */
-    0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff};
-
-unsigned short _Xkoi8_size = sizeof _Xkoi8_r;
-
-/* maps Greek keysyms to 8859-7 */
-unsigned char _Xgreek[] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80 - */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90 - */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xb6, 0xb8, 0xb9, 0xba, 0xda, 0x00, 0xbc, /* 0xa0 - */
-    0xbe, 0xdb, 0x00, 0xbf, 0x00, 0x00, 0xb5, 0xaf,
-    0x00, 0xdc, 0xdd, 0xde, 0xdf, 0xfa, 0xc0, 0xfc, /* 0xb0 - */
-    0xfd, 0xfb, 0xe0, 0xfe, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, /* 0xc0 - */
-    0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
-    0xd0, 0xd1, 0xd3, 0x00, 0xd4, 0xd5, 0xd6, 0xd7, /* 0xd0 - */
-    0xd8, 0xd9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, /* 0xe0 - */
-    0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
-    0xf0, 0xf1, 0xf3, 0xf2, 0xf4, 0xf5, 0xf6, 0xf7, /* 0xf0 - */
-    0xf8, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-
-static unsigned short keysym_to_unicode_1a1_1ff[] = {
-            0x0104, 0x02d8, 0x0141, 0x0000, 0x013d, 0x015a, 0x0000, /* 0x01a0-0x01a7 */
-    0x0000, 0x0160, 0x015e, 0x0164, 0x0179, 0x0000, 0x017d, 0x017b, /* 0x01a8-0x01af */
-    0x0000, 0x0105, 0x02db, 0x0142, 0x0000, 0x013e, 0x015b, 0x02c7, /* 0x01b0-0x01b7 */
-    0x0000, 0x0161, 0x015f, 0x0165, 0x017a, 0x02dd, 0x017e, 0x017c, /* 0x01b8-0x01bf */
-    0x0154, 0x0000, 0x0000, 0x0102, 0x0000, 0x0139, 0x0106, 0x0000, /* 0x01c0-0x01c7 */
-    0x010c, 0x0000, 0x0118, 0x0000, 0x011a, 0x0000, 0x0000, 0x010e, /* 0x01c8-0x01cf */
-    0x0110, 0x0143, 0x0147, 0x0000, 0x0000, 0x0150, 0x0000, 0x0000, /* 0x01d0-0x01d7 */
-    0x0158, 0x016e, 0x0000, 0x0170, 0x0000, 0x0000, 0x0162, 0x0000, /* 0x01d8-0x01df */
-    0x0155, 0x0000, 0x0000, 0x0103, 0x0000, 0x013a, 0x0107, 0x0000, /* 0x01e0-0x01e7 */
-    0x010d, 0x0000, 0x0119, 0x0000, 0x011b, 0x0000, 0x0000, 0x010f, /* 0x01e8-0x01ef */
-    0x0111, 0x0144, 0x0148, 0x0000, 0x0000, 0x0151, 0x0000, 0x0000, /* 0x01f0-0x01f7 */
-    0x0159, 0x016f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0163, 0x02d9  /* 0x01f8-0x01ff */
-};
-
-static unsigned short keysym_to_unicode_2a1_2fe[] = {
-            0x0126, 0x0000, 0x0000, 0x0000, 0x0000, 0x0124, 0x0000, /* 0x02a0-0x02a7 */
-    0x0000, 0x0130, 0x0000, 0x011e, 0x0134, 0x0000, 0x0000, 0x0000, /* 0x02a8-0x02af */
-    0x0000, 0x0127, 0x0000, 0x0000, 0x0000, 0x0000, 0x0125, 0x0000, /* 0x02b0-0x02b7 */
-    0x0000, 0x0131, 0x0000, 0x011f, 0x0135, 0x0000, 0x0000, 0x0000, /* 0x02b8-0x02bf */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x010a, 0x0108, 0x0000, /* 0x02c0-0x02c7 */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x02c8-0x02cf */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0120, 0x0000, 0x0000, /* 0x02d0-0x02d7 */
-    0x011c, 0x0000, 0x0000, 0x0000, 0x0000, 0x016c, 0x015c, 0x0000, /* 0x02d8-0x02df */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x010b, 0x0109, 0x0000, /* 0x02e0-0x02e7 */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x02e8-0x02ef */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0121, 0x0000, 0x0000, /* 0x02f0-0x02f7 */
-    0x011d, 0x0000, 0x0000, 0x0000, 0x0000, 0x016c, 0x015d          /* 0x02f8-0x02ff */
-};
-
-static unsigned short keysym_to_unicode_3a2_3fe[] = {
-                    0x0138, 0x0156, 0x0000, 0x0128, 0x013b, 0x0000, /* 0x03a0-0x03a7 */
-    0x0000, 0x0000, 0x0112, 0x0122, 0x0166, 0x0000, 0x0000, 0x0000, /* 0x03a8-0x03af */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x013c, 0x0000, /* 0x03b0-0x03b7 */
-    0x0000, 0x0000, 0x0113, 0x0123, 0x0167, 0x014a, 0x0000, 0x014b, /* 0x03b8-0x03bf */
-    0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x012e, /* 0x03c0-0x03c7 */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0116, 0x0000, 0x0000, 0x012a, /* 0x03c8-0x03cf */
-    0x0000, 0x0145, 0x014c, 0x0136, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x03d0-0x03d7 */
-    0x0000, 0x0172, 0x0000, 0x0000, 0x0000, 0x0168, 0x016a, 0x0000, /* 0x03d8-0x03df */
-    0x0101, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x012f, /* 0x03e0-0x03e7 */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0117, 0x0000, 0x0000, 0x012b, /* 0x03e8-0x03ef */
-    0x0000, 0x0146, 0x014d, 0x0137, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x03f0-0x03f7 */
-    0x0000, 0x0173, 0x0000, 0x0000, 0x0000, 0x0169, 0x016b          /* 0x03f8-0x03ff */
-};
-
-static unsigned short keysym_to_unicode_4a1_4df[] = {
-            0x3002, 0x3008, 0x3009, 0x3001, 0x30fb, 0x30f2, 0x30a1, /* 0x04a0-0x04a7 */
-    0x30a3, 0x03a5, 0x30a7, 0x30a9, 0x30e3, 0x30e5, 0x30e7, 0x30c3, /* 0x04a8-0x04af */
-    0x30fc, 0x03a2, 0x30a4, 0x30a6, 0x30a8, 0x30aa, 0x30ab, 0x30ad, /* 0x04b0-0x04b7 */
-    0x30af, 0x30b1, 0x30b3, 0x30b5, 0x30b7, 0x30b9, 0x30bb, 0x30bd, /* 0x04b8-0x04bf */
-    0x30bf, 0x30c1, 0x30c4, 0x30c6, 0x30c8, 0x30ca, 0x30cb, 0x30cc, /* 0x04c0-0x04c7 */
-    0x30cd, 0x30ce, 0x30cf, 0x30d2, 0x30d5, 0x30d8, 0x30db, 0x30de, /* 0x04c8-0x04cf */
-    0x30df, 0x30e0, 0x30e1, 0x30e2, 0x30e4, 0x30e6, 0x30e8, 0x30e9, /* 0x04d0-0x04d7 */
-    0x30ea, 0x30eb, 0x30ec, 0x30ed, 0x30ef, 0x30f3, 0x309b, 0x309c  /* 0x04d8-0x04df */
-};
-
-static unsigned short keysym_to_unicode_5ac_5f2[] = {
-                                    0x060c, 0x0000, 0x0000, 0x0000, /* 0x05ac-0x05af */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x05b0-0x05b7 */
-    0x0000, 0x0000, 0x0000, 0x061b, 0x0000, 0x0000, 0x0000, 0x061f, /* 0x05b8-0x05bf */
-    0x0000, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627, /* 0x05c0-0x05c7 */
-    0x0628, 0x0629, 0x062a, 0x062b, 0x062c, 0x062d, 0x062e, 0x062f, /* 0x05c8-0x05cf */
-    0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x0637, /* 0x05d0-0x05d7 */
-    0x0638, 0x0639, 0x063a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x05d8-0x05df */
-    0x0640, 0x0641, 0x0642, 0x0643, 0x0644, 0x0645, 0x0646, 0x0647, /* 0x05e0-0x05e7 */
-    0x0648, 0x0649, 0x064a, 0x064b, 0x064c, 0x064d, 0x064e, 0x064f, /* 0x05e8-0x05ef */
-    0x0650, 0x0651, 0x0652                                          /* 0x05f0-0x05f7 */
-};
-
-static unsigned short keysym_to_unicode_6a1_6ff[] = {
-            0x0452, 0x0453, 0x0451, 0x0454, 0x0455, 0x0456, 0x0457, /* 0x06a0-0x06a7 */
-    0x0458, 0x0459, 0x045a, 0x045b, 0x045c, 0x0000, 0x045e, 0x045f, /* 0x06a8-0x06af */
-    0x2116, 0x0402, 0x0403, 0x0401, 0x0404, 0x0405, 0x0406, 0x0407, /* 0x06b0-0x06b7 */
-    0x0408, 0x0409, 0x040a, 0x040b, 0x040c, 0x0000, 0x040e, 0x040f, /* 0x06b8-0x06bf */
-    0x044e, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433, /* 0x06c0-0x06c7 */
-    0x0445, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, /* 0x06c8-0x06cf */
-    0x043f, 0x044f, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432, /* 0x06d0-0x06d7 */
-    0x044c, 0x044b, 0x0437, 0x0448, 0x044d, 0x0449, 0x0447, 0x044a, /* 0x06d8-0x06df */
-    0x042e, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, /* 0x06e0-0x06e7 */
-    0x0425, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, /* 0x06e8-0x06ef */
-    0x041f, 0x042f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, /* 0x06f0-0x06f7 */
-    0x042c, 0x042d, 0x0417, 0x0428, 0x042d, 0x0429, 0x0427, 0x042a  /* 0x06f8-0x06ff */
-};
-
-static unsigned short keysym_to_unicode_7a1_7f9[] = {
-            0x0386, 0x0388, 0x0389, 0x038a, 0x03aa, 0x0000, 0x038c, /* 0x07a0-0x07a7 */
-    0x038e, 0x03ab, 0x0000, 0x038f, 0x0000, 0x0000, 0x0385, 0x2015, /* 0x07a8-0x07af */
-    0x0000, 0x03ac, 0x03ad, 0x03ae, 0x03af, 0x03ca, 0x0390, 0x03cc, /* 0x07b0-0x07b7 */
-    0x03cd, 0x03cb, 0x03b0, 0x03ce, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x07b8-0x07bf */
-    0x0000, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, /* 0x07c0-0x07c7 */
-    0x0398, 0x0399, 0x039a, 0x039b, 0x039c, 0x039d, 0x039e, 0x039f, /* 0x07c8-0x07cf */
-    0x03a0, 0x03a1, 0x03a2, 0x03a3, 0x03a4, 0x03a5, 0x03a6, 0x03a7, /* 0x07d0-0x07d7 */
-    0x03a8, 0x03a9, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x07d8-0x07df */
-    0x0000, 0x03b1, 0x03b2, 0x03b3, 0x03b4, 0x03b5, 0x03b6, 0x03b7, /* 0x07e0-0x07e7 */
-    0x03b8, 0x03b9, 0x03ba, 0x03bb, 0x03bc, 0x03bd, 0x03be, 0x03bf, /* 0x07e8-0x07ef */
-    0x03c0, 0x03c1, 0x03c2, 0x03c3, 0x03c4, 0x03c5, 0x03c6, 0x03c7, /* 0x07f0-0x07f7 */
-    0x03c8, 0x03c9                                                  /* 0x07f8-0x07ff */
-};
-
-static unsigned short keysym_to_unicode_8a4_8fe[] = {
-                                    0x2320, 0x2321, 0x0000, 0x231c, /* 0x08a0-0x08a7 */
-    0x231d, 0x231e, 0x231f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x08a8-0x08af */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x08b0-0x08b7 */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x2264, 0x2260, 0x2265, 0x222b, /* 0x08b8-0x08bf */
-    0x2234, 0x0000, 0x221e, 0x0000, 0x0000, 0x2207, 0x0000, 0x0000, /* 0x08c0-0x08c7 */
-    0x2245, 0x2246, 0x0000, 0x0000, 0x0000, 0x0000, 0x22a2, 0x0000, /* 0x08c8-0x08cf */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x221a, 0x0000, /* 0x08d0-0x08d7 */
-    0x0000, 0x0000, 0x2282, 0x2283, 0x2229, 0x222a, 0x2227, 0x2228, /* 0x08d8-0x08df */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x08e0-0x08e7 */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x08e8-0x08ef */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0192, 0x0000, /* 0x08f0-0x08f7 */
-    0x0000, 0x0000, 0x0000, 0x2190, 0x2191, 0x2192, 0x2193          /* 0x08f8-0x08ff */
-};
-
-static unsigned short keysym_to_unicode_9df_9f8[] = {
-                                                            0x2422, /* 0x09d8-0x09df */
-    0x2666, 0x25a6, 0x2409, 0x240c, 0x240d, 0x240a, 0x0000, 0x0000, /* 0x09e0-0x09e7 */
-    0x240a, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x2500, /* 0x09e8-0x09ef */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x251c, 0x2524, 0x2534, 0x252c, /* 0x09f0-0x09f7 */
-    0x2502                                                          /* 0x09f8-0x09ff */
-};
-
-static unsigned short keysym_to_unicode_aa1_afe[] = {
-            0x2003, 0x2002, 0x2004, 0x2005, 0x2007, 0x2008, 0x2009, /* 0x0aa0-0x0aa7 */
-    0x200a, 0x2014, 0x2013, 0x0000, 0x0000, 0x0000, 0x2026, 0x2025, /* 0x0aa8-0x0aaf */
-    0x2153, 0x2154, 0x2155, 0x2156, 0x2157, 0x2158, 0x2159, 0x215a, /* 0x0ab0-0x0ab7 */
-    0x2105, 0x0000, 0x0000, 0x2012, 0x2039, 0x2024, 0x203a, 0x0000, /* 0x0ab8-0x0abf */
-    0x0000, 0x0000, 0x0000, 0x215b, 0x215c, 0x215d, 0x215e, 0x0000, /* 0x0ac0-0x0ac7 */
-    0x0000, 0x2122, 0x2120, 0x00ae, 0x25c1, 0x25b7, 0x25cb, 0x25ad, /* 0x0ac8-0x0acf */
-    0x2018, 0x2019, 0x201c, 0x201d, 0x211e, 0x0000, 0x2032, 0x2033, /* 0x0ad0-0x0ad7 */
-    0x0000, 0x271d, 0x0000, 0x220e, 0x25c2, 0x2023, 0x25cf, 0x25ac, /* 0x0ad8-0x0adf */
-    0x25e6, 0x25ab, 0x25ae, 0x25b5, 0x25bf, 0x2606, 0x2022, 0x25aa, /* 0x0ae0-0x0ae7 */
-    0x25b4, 0x25be, 0x261a, 0x261b, 0x2663, 0x2666, 0x2665, 0x0000, /* 0x0ae8-0x0aef */
-    0x2720, 0x2020, 0x2021, 0x2713, 0x2612, 0x266f, 0x266d, 0x2642, /* 0x0af0-0x0af7 */
-    0x2640, 0x2121, 0x2315, 0x2117, 0x2038, 0x201a, 0x201e          /* 0x0af8-0x0aff */
-};
-
-/* none of the APL keysyms match the Unicode characters */
-
-static unsigned short keysym_to_unicode_cdf_cfa[] = {
-                                                            0x2017, /* 0x0cd8-0x0cdf */
-    0x05d0, 0x05d1, 0x05d2, 0x05d3, 0x05d4, 0x05d5, 0x05d6, 0x05d7, /* 0x0ce0-0x0ce7 */
-    0x05d8, 0x05d9, 0x05da, 0x05db, 0x05dc, 0x05dd, 0x05de, 0x05df, /* 0x0ce8-0x0cef */
-    0x05e0, 0x05e1, 0x05e2, 0x05e3, 0x05e4, 0x05e5, 0x05e6, 0x05e7, /* 0x0cf0-0x0cf7 */
-    0x05e8, 0x05e9, 0x05ea                                          /* 0x0cf8-0x0cff */
-};
-
-static unsigned short keysym_to_unicode_da1_df9[] = {
-            0x0e01, 0x0e02, 0x0e03, 0x0e04, 0x0e05, 0x0e06, 0x0e07, /* 0x0da0-0x0da7 */
-    0x0e08, 0x0e09, 0x0e0a, 0x0e0b, 0x0e0c, 0x0e0d, 0x0e0e, 0x0e0f, /* 0x0da8-0x0daf */
-    0x0e10, 0x0e11, 0x0e12, 0x0e13, 0x0e14, 0x0e15, 0x0e16, 0x0e17, /* 0x0db0-0x0db7 */
-    0x0e18, 0x0e19, 0x0e1a, 0x0e1b, 0x0e1c, 0x0e1d, 0x0e1e, 0x0e1f, /* 0x0db8-0x0dbf */
-    0x0e20, 0x0e21, 0x0e22, 0x0e23, 0x0e24, 0x0e25, 0x0e26, 0x0e27, /* 0x0dc0-0x0dc7 */
-    0x0e28, 0x0e29, 0x0e2a, 0x0e2b, 0x0e2c, 0x0e2d, 0x0e2e, 0x0e2f, /* 0x0dc8-0x0dcf */
-    0x0e30, 0x0e31, 0x0e32, 0x0e33, 0x0e34, 0x0e35, 0x0e36, 0x0e37, /* 0x0dd0-0x0dd7 */
-    0x0e38, 0x0e39, 0x0e3a, 0x0e3b, 0x0e3c, 0x0e3d, 0x0e3e, 0x0e3f, /* 0x0dd8-0x0ddf */
-    0x0e40, 0x0e41, 0x0e42, 0x0e43, 0x0e44, 0x0e45, 0x0e46, 0x0e47, /* 0x0de0-0x0de7 */
-    0x0e48, 0x0e49, 0x0e4a, 0x0e4b, 0x0e4c, 0x0e4d, 0x0000, 0x0000, /* 0x0de8-0x0def */
-    0x0e50, 0x0e51, 0x0e52, 0x0e53, 0x0e54, 0x0e55, 0x0e56, 0x0e57, /* 0x0df0-0x0df7 */
-    0x0e58, 0x0e59                                                  /* 0x0df8-0x0dff */
-};
-
-static unsigned short keysym_to_unicode_ea0_eff[] = {
-    0x0000, 0x1101, 0x1101, 0x11aa, 0x1102, 0x11ac, 0x11ad, 0x1103, /* 0x0ea0-0x0ea7 */
-    0x1104, 0x1105, 0x11b0, 0x11b1, 0x11b2, 0x11b3, 0x11b4, 0x11b5, /* 0x0ea8-0x0eaf */
-    0x11b6, 0x1106, 0x1107, 0x1108, 0x11b9, 0x1109, 0x110a, 0x110b, /* 0x0eb0-0x0eb7 */
-    0x110c, 0x110d, 0x110e, 0x110f, 0x1110, 0x1111, 0x1112, 0x1161, /* 0x0eb8-0x0ebf */
-    0x1162, 0x1163, 0x1164, 0x1165, 0x1166, 0x1167, 0x1168, 0x1169, /* 0x0ec0-0x0ec7 */
-    0x116a, 0x116b, 0x116c, 0x116d, 0x116e, 0x116f, 0x1170, 0x1171, /* 0x0ec8-0x0ecf */
-    0x1172, 0x1173, 0x1174, 0x1175, 0x11a8, 0x11a9, 0x11aa, 0x11ab, /* 0x0ed0-0x0ed7 */
-    0x11ac, 0x11ad, 0x11ae, 0x11af, 0x11b0, 0x11b1, 0x11b2, 0x11b3, /* 0x0ed8-0x0edf */
-    0x11b4, 0x11b5, 0x11b6, 0x11b7, 0x11b8, 0x11b9, 0x11ba, 0x11bb, /* 0x0ee0-0x0ee7 */
-    0x11bc, 0x11bd, 0x11be, 0x11bf, 0x11c0, 0x11c1, 0x11c2, 0x0000, /* 0x0ee8-0x0eef */
-    0x0000, 0x0000, 0x1140, 0x0000, 0x0000, 0x1159, 0x119e, 0x0000, /* 0x0ef0-0x0ef7 */
-    0x11eb, 0x0000, 0x11f9, 0x0000, 0x0000, 0x0000, 0x0000, 0x20a9, /* 0x0ef8-0x0eff */
-};
-
-static unsigned short keysym_to_unicode_13bc_13be[] = {
-                                    0x0152, 0x0153, 0x0178          /* 0x13b8-0x13bf */
-};
-
-static unsigned short keysym_to_unicode_20a0_20ac[] = {
-    0x20a0, 0x20a1, 0x20a2, 0x20a3, 0x20a4, 0x20a5, 0x20a6, 0x20a7, /* 0x20a0-0x20a7 */
-    0x20a8, 0x20a9, 0x20aa, 0x20ab, 0x20ac                          /* 0x20a8-0x20af */
-};
-
-static int keysym_to_ucs4(keysym)
-    KeySym keysym;
-{
-    if (keysym > 0 && keysym < 0x100)
-	return keysym;
-    else if (keysym > 0x1a0 && keysym < 0x200)
-	return keysym_to_unicode_1a1_1ff[keysym - 0x1a1];
-    else if (keysym > 0x2a0 && keysym < 0x2ff)
-	return keysym_to_unicode_2a1_2fe[keysym - 0x2a1];
-    else if (keysym > 0x3a1 && keysym < 0x3ff)
-	return keysym_to_unicode_3a2_3fe[keysym - 0x3a2];
-    else if (keysym > 0x4a0 && keysym < 0x4e0)
-	return keysym_to_unicode_4a1_4df[keysym - 0x4a1];
-    else if (keysym > 0x5ab && keysym < 0x5f3)
-	return keysym_to_unicode_5ac_5f2[keysym - 0x5ac];
-    else if (keysym > 0x6a0 && keysym < 0x700)
-	return keysym_to_unicode_6a1_6ff[keysym - 0x6a1];
-    else if (keysym > 0x7a0 && keysym < 0x7fa)
-	return keysym_to_unicode_7a1_7f9[keysym - 0x7a1];
-    else if (keysym > 0x8a3 && keysym < 0x8ff)
-	return keysym_to_unicode_8a4_8fe[keysym - 0x8a4];
-    else if (keysym > 0x9de && keysym < 0x9f9)
-	return keysym_to_unicode_9df_9f8[keysym - 0x9df];
-    else if (keysym > 0xaa0 && keysym < 0xaff)
-	return keysym_to_unicode_aa1_afe[keysym - 0xaa1];
-    else if (keysym > 0xcde && keysym < 0xcfb)
-	return keysym_to_unicode_cdf_cfa[keysym - 0xcdf];
-    else if (keysym > 0xda0 && keysym < 0xdfa)
-	return keysym_to_unicode_da1_df9[keysym - 0xda1];
-    else if (keysym > 0xe9f && keysym < 0xf00)
-	return keysym_to_unicode_ea0_eff[keysym - 0xea0];
-    else if (keysym > 0x13bb && keysym < 0x13bf)
-	return keysym_to_unicode_13bc_13be[keysym - 0x13bc];
-    else if (keysym > 0x209f && keysym < 0x20ad)
-	return keysym_to_unicode_20a0_20ac[keysym - 0x20a0];
-    else 
-	return 0;
-}
-
-struct CodesetRec {
-    unsigned long locale_code;
-    char* locale_name;
-    char* escape_seq;
-};
-
-#define sLatin1	0L
-#define sLatin2	1L
-#define sLatin3	2L
-#define sLatin4	3L
-#define sKana	4L
-#define sX0201  0x01000004L
-#define sArabic	5L
-#define sCyrillic	6L
-#define sKoi8_r	0x01000006L
-#define sKoi8_u	0x02000006L
-#define sGreek	7L
-#define sHebrew	12L
-#define sThai	13L
-#define sKorean	14L
-#define sLatin5	15L
-#define sLatin6	16L
-#define sLatin7	17L
-#define sLatin8	18L
-#define sLatin9	19L
-#define sArmenian 20L
-#define sGeorgian 21L
-#define sGeorgianPS 0x01000021L
-#define sCurrency 32L
-#define sUTF8	0x02000000L
-
-static struct CodesetRec CodesetTable[] = {
-    {sLatin1,	"ISO8859-1",	"\033-A"},
-    {sLatin2,	"ISO8859-2",	"\033-B"},
-    {sLatin3,	"ISO8859-3",	"\033-C"},
-    {sLatin4,	"ISO8859-4",	"\033-D"},
-    {sCyrillic,	"ISO8859-5",	"\033-L"},
-    {sArabic,	"ISO8859-6",	"\033-G"},
-    {sGreek,	"ISO8859-7",	"\033-F"},
-    {sHebrew,	"ISO8859-8",	"\033-H"},
-    {sLatin5,	"ISO8859-9",	"\033-M"},
-    {sLatin6,	"ISO8859-10",	"\033-V"},
-    {sThai,	"TACTIS",	"\033-T"},
-    {sKorean,	"ko.euc",	"\033$(C"},
-    {sThai,	"ISO8859-11",	"\033-T"},
-    {sThai,	"TIS620.2533-1", "\033-T"},
-#if 0
-    {sLatin8,	"ISO8859-12",	"\033-?"},/* Celtic, superceded by -14 */
-    {sLatin7,	"ISO8859-13",	"\033-?"},/* Baltic Rim */
-    {sLatin8	"ISO8859-14",	"\033-?"},/* Celtic */
-#endif
-    {sUTF8,	"utf8",		"\033%B"},
-    /* Non-standard */
-    {sKoi8_r,	"KOI8-R", "\033%/1\200\210koi8-r\002"},
-    {sKoi8_u,	"KOI8-U", "\033%/1\200\211koi8-u\002"},
-    {sLatin9,	"ISO8859-15",	"\033%/1\200\213iso8859-15\002"},/* a.k.a. Latin-0 */
-    {sArmenian,	"ARMSCII-8", "\033%/1\200\210armscii-8\002"},
-    {sGeorgian,	"GEORGIAN-ACADEMY", "\033%/1\200\210georgian-academy\002"},
-    {sGeorgian,	"GEORGIAN-PS", "\033%/1\200\210georgian-ps\002"},
-	/* TODO find better values for the sLatin1 below */
-    {sLatin1,	"IBM-CP1133", "\033%/1\200\210ibm-cp1133\002"},
-    {sLatin1,	"MULELAO-1", "\033%/1\200\210mulelao-1\002"},
-    {sLatin1,	"VISCII1.1-1", "\033%/1\200\210viscii1.1-1\002"},
-    {sLatin1,	"TCVN-5712", "\033%/1\200\210tcvn-5712\002"},
-
-};
-
-#define NUM_CODESETS sizeof CodesetTable / sizeof CodesetTable[0]
-
-#ifndef XK_emdash
-#define XK_emdash 0xaa9
-#endif
-
-
-/* ================================================================ */
-/*
-File:	ConvertUTF.C
-Author: Mark E. Davis
-Copyright (C) 1994 Taligent, Inc. All rights reserved.
-
-This code is copyrighted. Under the copyright laws, this code may not
-be copied, in whole or part, without prior written consent of Taligent. 
-
-Taligent grants the right to use or reprint this code as long as this
-ENTIRE copyright notice is reproduced in the code or reproduction.
-The code is provided AS-IS, AND TALIGENT DISCLAIMS ALL WARRANTIES,
-EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  IN
-NO EVENT WILL TALIGENT BE LIABLE FOR ANY DAMAGES WHATSOEVER (INCLUDING,
-WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS
-INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR OTHER PECUNIARY
-LOSS) ARISING OUT OF THE USE OR INABILITY TO USE THIS CODE, EVEN
-IF TALIGENT HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-BECAUSE SOME STATES DO NOT ALLOW THE EXCLUSION OR LIMITATION OF
-LIABILITY FOR CONSEQUENTIAL OR INCIDENTAL DAMAGES, THE ABOVE
-LIMITATION MAY NOT APPLY TO YOU.
-
-RESTRICTED RIGHTS LEGEND: Use, duplication, or disclosure by the
-government is subject to restrictions as set forth in subparagraph
-(c)(l)(ii) of the Rights in Technical Data and Computer Software
-clause at DFARS 252.227-7013 and FAR 52.227-19.
-
-This code may be protected by one or more U.S. and International
-Patents.
-
-TRADEMARKS: Taligent and the Taligent Design Mark are registered
-trademarks of Taligent, Inc.
-*/
-/* ================================================================ */
-
-#define kReplacementCharacter	0x0000FFFDUL
-#define kMaximumUCS2		0x0000FFFFUL
-#define kMaximumUCS4		0x7FFFFFFFUL
-
-typedef enum {
-	ok, 				/* conversion successful */
-	sourceExhausted,	/* partial character in source, but hit end */
-	targetExhausted		/* insuff. room in target for conversion */
-} ConversionResult;
-
-#define halfShift		10
-#define halfBase		0x0010000UL
-#define halfMask		0x3FFUL
-#define kSurrogateHighStart	0xD800UL
-#define kSurrogateHighEnd	0xDBFFUL
-#define kSurrogateLowStart	0xDC00UL
-#define kSurrogateLowEnd	0xDFFFUL
-
-typedef unsigned int UCS4; /* wchar_t, but on AIX, SunOS wchar_t is 16 bits */
-typedef unsigned char UTF8;
-
-#if 0
-static UCS4 offsetsFromUTF8[6] = {
-	0x00000000UL, 0x00003080UL, 0x000E2080UL,
- 	0x03C82080UL, 0xFA082080UL, 0x82082080UL
-};
-
-static char bytesFromUTF8[256] = {
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-	2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
-};
-#endif
-
-static UTF8 firstByteMark[7] = {
-	0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC
-};
-
-static ConversionResult	ConvertUCS4toUTF8 (
-	UCS4** sourceStart, UCS4* sourceEnd, 
-	UTF8** targetStart, UTF8* targetEnd)
-{
-	ConversionResult result = ok;
-	register UCS4* source = *sourceStart;
-	register UTF8* target = *targetStart;
-	while (source < sourceEnd) {
-		register UCS4 ch;
-		register unsigned short bytesToWrite = 0;
-		register const UCS4 byteMask = 0xBF;
-		register const UCS4 byteMark = 0x80; 
-		ch = *source++;
-		if (ch >= kSurrogateHighStart && ch <= kSurrogateHighEnd
-				&& source < sourceEnd) {
-			register UCS4 ch2 = *source;
-			if (ch2 >= kSurrogateLowStart && ch2 <= kSurrogateLowEnd) {
-				ch = ((ch - kSurrogateHighStart) << halfShift)
-					+ (ch2 - kSurrogateLowStart) + halfBase;
-				++source;
-			};
-		};
-		if (ch < 0x80) {		bytesToWrite = 1;
-		} else if (ch < 0x800) {	bytesToWrite = 2;
-		} else if (ch < 0x10000) {	bytesToWrite = 3;
-		} else if (ch < 0x200000) {	bytesToWrite = 4;
-		} else if (ch < 0x4000000) {	bytesToWrite = 5;
-		} else if (ch <= kMaximumUCS4){	bytesToWrite = 6;
-		} else {			bytesToWrite = 2;
-						ch = kReplacementCharacter;
-		}; /* I wish there were a smart way to avoid this conditional */
-		
-		target += bytesToWrite;
-		if (target > targetEnd) {
-			target -= bytesToWrite; result = targetExhausted; break;
-		};
-		switch (bytesToWrite) {	/* note: code falls through cases! */
-		case 6:	*--target = (ch | byteMark) & byteMask; ch >>= 6;
-		case 5:	*--target = (ch | byteMark) & byteMask; ch >>= 6;
-		case 4:	*--target = (ch | byteMark) & byteMask; ch >>= 6;
-		case 3:	*--target = (ch | byteMark) & byteMask; ch >>= 6;
-		case 2:	*--target = (ch | byteMark) & byteMask; ch >>= 6;
-		case 1:	*--target =  ch | firstByteMark[bytesToWrite];
-		};
-		target += bytesToWrite;
-	};
-	*sourceStart = source;
-	*targetStart = target;
-	return result;
-}
-
-/*ARGSUSED*/
-int 
-#if NeedFunctionPrototypes
-_XGetCharCode (
-     unsigned long locale_code,
-     KeySym 		keysym,
-     unsigned char*	buf,
-     int 		nbytes)
-#else
-_XGetCharCode (locale_code, keysym, buf, nbytes)
-    unsigned long locale_code;
-    KeySym keysym;
-    unsigned char *buf;
-    int nbytes;
-#endif
-{
-    unsigned long kset;
-    int	count,isLatin1;
-
-    if (locale_code == sUTF8) {
-	unsigned int ucs4[2];
-	unsigned int* ucs4vec[1];
-	unsigned char* utf8vec[1];
-
-	ucs4[0] = keysym_to_ucs4 (keysym);
-	ucs4[1] = 0;
-	ucs4vec[0] = ucs4;
-	utf8vec[0] = buf;
-
-	(void) ConvertUCS4toUTF8 (ucs4vec, &ucs4[1], utf8vec, &buf[nbytes]);
-	return (strlen ((char*) buf));
-    }
-
-    kset = locale_code&0xffffff;
-
-    isLatin1 = ((keysym&0xffffff00)==0);
-    count = 0;
-
-    if ( keysym == NoSymbol )
-	return 0;
-    else if ((keysym >> 8) == kset) {
-	count = 1;
-	switch (kset) {
-	case sKana:
-	    *buf = (unsigned char)(keysym & 0xff);
-	    if (buf[0] == 0x7e)
-		count = 0;
-	    break;
-	case sCyrillic:
-	    if (locale_code == sKoi8_r)
-		*buf = _Xkoi8_r[keysym & 0x7f];
-	    else if (locale_code == sKoi8_u)
-		*buf = _Xkoi8_u[keysym & 0x7f];
-	    else
-		*buf = _Xcyrillic[keysym & 0x7f];
-	    break;
-	case sGreek:
-	    *buf = _Xgreek[keysym & 0x7f];
-	    if (!buf[0])
-		count = 0;
-	    break;
-	default:
-	    *buf = (unsigned char)(keysym & 0xff);
-	    break;
-	}
-    } else if ((locale_code != 0) && (isLatin1) && (keysym & 0x80)) {
-	if (_Xlatin1[keysym & 0x7f] & (1 << kset)) {
-	    /* Most non-latin1 locales use some latin-1 upper half
-	       keysyms as defined by bitpatterns in array latin1.
-	       Enforce it. */
-	    *buf = (unsigned char)(keysym & 0xff);
-	    count = 1;
-	} else {
-	    count= 1;
-	    if ((locale_code == sHebrew) && (keysym == XK_multiply))
-		*buf = (unsigned char)0xaa;
-	    else if ((locale_code == sHebrew) && (keysym == XK_division))
-		*buf = (unsigned char)0xba;
-	    else if ((locale_code == sCyrillic) && (keysym == XK_section))
-		*buf = (unsigned char)0xfd;
-	    else if ((locale_code == sX0201) && (keysym == XK_yen))
-		*buf = (unsigned char)0x5c;
-	    else count = 0;
-	}
-    } else if (isLatin1) {
-	if ((locale_code == sX0201) &&
-	    ((keysym == XK_backslash) || (keysym == XK_asciitilde)))
-	    count = 0;
-	if ( (keysym&0x80)==0 ) {
-	    *buf = (unsigned char)(keysym&0x7f);
-	    count = 1;
-	}
-    } else if ((keysym >> 8) == sLatin2) {
-	count = 1;
-	if ((keysym & 0x80) && (_Xlatin2[keysym & 0x7f] & (1 << kset)))
-	    *buf = (unsigned char)(keysym & 0xff);
-	else if (locale_code == sLatin5) {
-	    if (keysym == XK_Scedilla)
-		*buf = (unsigned char)0xde;
-	    else if (keysym == XK_scedilla)
-		*buf = (unsigned char)0xfe;
-	    else count = 0;
-	} else if (locale_code == sLatin9) {
-	    if (keysym == XK_Scaron)
-		*buf = (unsigned char)0xa6;
-	    else if (keysym == XK_scaron)
-		*buf = (unsigned char)0xa8;
-	    else if (keysym == XK_Zcaron)
-		*buf = (unsigned char)0xb4;
-	    else if (keysym == XK_zcaron)
-		*buf = (unsigned char)0xb8;
-	    else count = 0;
-	} else count = 0;
-    } else if ((keysym >> 8) == sLatin3) {
-	if (locale_code == sLatin5) {
-	    count = 1;
-	    switch (keysym) {
-	    case XK_Gbreve:	*buf = (unsigned char)0xd0; break;
-	    case XK_gbreve:	*buf = (unsigned char)0xf0; break;
-	    case XK_Scedilla:	*buf = (unsigned char)0xde; break;
-	    case XK_scedilla:	*buf = (unsigned char)0xfe; break;
-	    case XK_Iabovedot:	*buf = (unsigned char)0xdd; break;
-	    case XK_idotless:	*buf = (unsigned char)0xfd; break;
-	    default:  count = 0;
-	    }
-	}
-    } else if ((keysym >> 8) == sLatin4) {
-	if (locale_code == sLatin6) {
-	    count = 1;
-	    switch (keysym) {
-	    case XK_Emacron:	*buf = (unsigned char)0xa2; break;
-	    case XK_Gcedilla:	*buf = (unsigned char)0xa3; break;
-	    case XK_Imacron:	*buf = (unsigned char)0xa4; break;
-	    case XK_Lcedilla:	*buf = (unsigned char) 0xa8; break;
-	    case XK_Dstroke:	*buf = (unsigned char)0xa9; break;
-	    case XK_Scaron:	*buf = (unsigned char)0xaa; break;
-	    case XK_Tslash:	*buf = (unsigned char)0xab; break;
-	    case XK_Zcaron:	*buf = (unsigned char)0xac; break;
-	    case XK_Umacron:	*buf = (unsigned char)0xae; break;
-	    case XK_Utilde:	*buf = (unsigned char)0xd7; break;
-	    case XK_ENG:	*buf = (unsigned char)0xaf; break;
-	    case XK_emacron:	*buf = (unsigned char)0xb2; break;
-	    case XK_gcedilla:	*buf = (unsigned char)0xb3; break;
-	    case XK_imacron:	*buf = (unsigned char)0xb4; break;
-	    case XK_lcedilla:	*buf = (unsigned char) 0xb8; break;
-	    case XK_dstroke:	*buf = (unsigned char)0xb9; break;
-	    case XK_scaron:	*buf = (unsigned char)0xba; break;
-	    case XK_tslash:	*buf = (unsigned char)0xbb; break;
-	    case XK_zcaron:	*buf = (unsigned char)0xbc; break;
-	    case XK_umacron:	*buf = (unsigned char)0xbe; break;
-	    case XK_utilde:	*buf = (unsigned char)0xf7; break;
-	    case XK_eng:	*buf = (unsigned char)0xbf; break;
-	    case XK_kra:	*buf = (unsigned char)0xff; break;
-	    case XK_Itilde:
-	    case XK_Kcedilla: 
-	    case XK_Iogonek:
-	    case XK_Ncedilla:
-	    case XK_Omacron:
-	    case XK_Uogonek:
-	    case XK_itilde:
-	    case XK_kcedilla: 
-	    case XK_iogonek:
-	    case XK_ncedilla:
-	    case XK_omacron:
-	    case XK_uogonek:	*buf = (unsigned char)(keysym & 0xff); break;
-	    default: count = 0;
-	    }
-	}
-    } else if (locale_code == sLatin9 && keysym == XK_EuroSign) {
-	count = 1;
-	*buf = (unsigned char)0xa4;
-    } else if ((locale_code == sGreek) &&
-	       ((keysym == XK_leftsinglequotemark) ||
-		(keysym == XK_rightsinglequotemark))) {
-	*buf = (unsigned char)(keysym - (XK_leftsinglequotemark - 0xa1));
-	count = 1;
-    }
-    if (count>nbytes)
-	return nbytes;
-    if (count<nbytes)
-	buf[count]= '\0';
-    return count;
-}
-
-#ifdef XKB
-static int lookup_string (event, buffer, nbytes, keysym, status)
-    XKeyEvent*		event;
-    char*		buffer;
-    int			nbytes;
-    KeySym*		keysym;
-    XComposeStatus*	status;
-{
-    int ret;
-    unsigned ctrls = XkbGetXlibControls (event->display);
-    XkbSetXlibControls (event->display, 
-			XkbLC_ForceLatin1Lookup, XkbLC_ForceLatin1Lookup);
-    ret = XLookupString(event, (char *)buffer, nbytes, keysym, status);
-    XkbSetXlibControls (event->display, ctrls, ctrls);
-    return ret;
-}
-#endif
-
-#define BUF_SIZE (20)
-
-int
-_XimLookupMBText(ic, event, buffer, nbytes, keysym, status)
-    Xic			 ic;
-    XKeyEvent*		event;
-    char*		buffer;
-    int			nbytes;
-    KeySym*		keysym;
-    XComposeStatus*	status;
-{
-    int count, local_count;
-    KeySym symbol;
-    struct CodesetRec *cset;
-    int i;
-    Status	dummy;
-    Xim	im = (Xim)ic->core.im;
-    XLCd lcd = im->core.lcd;
-    unsigned char local_buf[BUF_SIZE];
-    unsigned char look[BUF_SIZE];
-
-
-    /* force a latin-1 lookup for compatibility */
-    count = XLOOKUPSTRING(event, (char *)buffer, nbytes, &symbol, status);
-    if (keysym != NULL) *keysym = symbol;
-    if ((nbytes == 0) || (symbol == NoSymbol)) return count;
-
-    for (cset = NULL, i = 0; i < NUM_CODESETS; i++) {
-	if (strcmp (XLC_PUBLIC(lcd,encoding_name), CodesetTable[i].locale_name) == 0) {
-	    cset = &CodesetTable[i];
-	    break;
-	}
-    }
-    if ((count == 0 && cset != NULL) || 
-	(count == 1 && (symbol > 0x7f && symbol < 0xff00) && 
-	 cset != NULL && cset->locale_code != 0)) {
-	if ((count = _XGetCharCode(cset->locale_code, symbol,
-				   look, sizeof look))) {
-	    strcpy((char*) local_buf, cset->escape_seq);
-	    local_count = strlen(cset->escape_seq);
-	    local_buf[local_count] = look[0];
-	    local_count++;
-	    local_buf[local_count] = '\0';
-	    if ((count = im->methods->ctstombs(ic->core.im,
-				(char*) local_buf, local_count,
-				(char *)buffer, nbytes, &dummy)) < 0) {
-		count = 0;
-	    }
-	}
-    } else if (count > 1) { /* not ASCII Encoding */
-	memcpy(look, (char *)buffer,count);
-	look[count] = '\0';
-	if ((count = im->methods->ctstombs(ic->core.im,
-				(char*) look, count, 
-				buffer, nbytes, &dummy)) < 0) {
-	    count = 0;
-	}
-    }
-    /* 
-     * we should make sure that if the character is a Latin1 character
-     * and it's on the right side, and we're in a non-Latin1 locale
-     * that this is a valid Latin1 character for this locale.
-     */
-    return count;
-}
-
-int
-_XimLookupWCText(ic, event, buffer, nbytes, keysym, status)
-    Xic			 ic;
-    XKeyEvent*		event;
-    wchar_t*		buffer;
-    int			nbytes;
-    KeySym*		keysym;
-    XComposeStatus*	status;
-{
-    int count, local_count;
-    KeySym symbol;
-    struct CodesetRec *cset;
-    int i;
-    Status	dummy;
-    Xim	im = (Xim)ic->core.im;
-    XLCd lcd = im->core.lcd;
-    unsigned char local_buf[BUF_SIZE];
-    unsigned char look[BUF_SIZE];
-
-    /* force a latin-1 lookup for compatibility */
-    count = XLOOKUPSTRING(event, (char *)look, nbytes, &symbol, status);
-    if (keysym != NULL) *keysym = symbol;
-    if ((nbytes == 0) || (symbol == NoSymbol)) return count;
-
-    for (cset = NULL, i = 0; i < NUM_CODESETS; i++) {
-	if (strcmp (XLC_PUBLIC(lcd,encoding_name), CodesetTable[i].locale_name) == 0) {
-	    cset = &CodesetTable[i];
-	    break;
-	}
-    }
-    if ((count == 0 && cset != NULL) ||
-	(count == 1 && (symbol > 0x7f && symbol < 0xff00) && 
-	 cset != NULL && cset->locale_code != 0)) {
-	if ((count = _XGetCharCode(cset->locale_code, symbol,
-				   look, sizeof look))) {
-	    strcpy((char*) local_buf, cset->escape_seq);
-	    local_count = strlen(cset->escape_seq);
-	    local_buf[local_count] = look[0];
-	    local_count++;
-	    local_buf[local_count] = '\0';
-	    if ((count = im->methods->ctstowcs(ic->core.im,
-				(char*) local_buf, local_count,
-				buffer, nbytes, &dummy)) < 0) {
-		count = 0;
-	    }
-	}
-    } else if (count > 1) {
-	if ((count = im->methods->ctstowcs(ic->core.im,
-				(char*) look, count, 
-				buffer, nbytes, &dummy)) < 0) {
-	    count = 0;
-	}
-    } else
-	/* 
-	 * we should make sure that if the character is a Latin1 character
-	 * and it's on the right side, and we're in a non-Latin1 locale
-	 * that this is a valid Latin1 character for this locale.
-	 */
-	buffer[0] = look[0];
-
-    return count;
-}
diff --git a/xc/lib/X11/imDefFlt.c b/xc/lib/X11/imDefFlt.c
deleted file mode 100644
index 63d610198..000000000
--- a/xc/lib/X11/imDefFlt.c
+++ /dev/null
@@ -1,417 +0,0 @@
-/* $TOG: imDefFlt.c /main/9 1997/04/28 16:39:25 barstow $ */
-/******************************************************************
-
-           Copyright 1992, 1993, 1994 by FUJITSU LIMITED
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of FUJITSU LIMITED
-not be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-FUJITSU LIMITED makes no representations about the suitability of
-this software for any purpose. 
-It is provided "as is" without express or implied warranty.
-
-FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-  Author: Takashi Fujiwara     FUJITSU LIMITED 
-                               fujiwara@a80.tech.yk.fujitsu.co.jp
-
-******************************************************************/
-/* $XFree86: xc/lib/X11/imDefFlt.c,v 1.3 1999/05/09 10:50:31 dawes Exp $ */
-
-#include <X11/Xatom.h>
-#define NEED_EVENTS
-#include "Xlibint.h"
-#include "Xutil.h"
-#include "Xlcint.h"
-#include "Ximint.h"
-
-Private long
-_XimTriggerCheck(im, ev, len, keylist)
-    Xim			 im;
-    XKeyEvent		*ev;
-    INT32		 len;
-    CARD32		*keylist;
-{
-    register long	 i;
-    KeySym	 	 keysym;
-    CARD32	 	 buf32[BUFSIZE/4];
-    char	 	*buf = (char *)buf32;
-    int			 modifier;
-    int			 modifier_mask;
-    CARD32		 min_len = sizeof(CARD32)   /* sizeof keysym */
-				 + sizeof(CARD32)   /* sizeof modifier */
-				 + sizeof(CARD32);  /* sizeof modifier mask */
-
-    XLookupString(ev, buf, BUFSIZE, &keysym, NULL);
-    if (!keysym)
-	return -1;
-
-    for (i = 0; len >= min_len; i += 3, len -= min_len) {
-	modifier      = keylist[i + 1];
-	modifier_mask = keylist[i + 2];
-	if (((KeySym)keylist[i] == keysym)
-	 && ((ev->state & modifier_mask) == modifier))
-	    return i;
-    }
-    return -1;
-}
-
-Private long
-_XimTriggerOnCheck(im, ev)
-    Xim		 im;
-    XKeyEvent	*ev;
-{
-    return _XimTriggerCheck(im, ev, (INT32)im->private.proto.im_onkeylist[0],
-					&im->private.proto.im_onkeylist[1]);
-}
-
-Private long
-_XimTriggerOffCheck(im, ev)
-    Xim		 im;
-    XKeyEvent	*ev;
-{
-    return _XimTriggerCheck(im, ev, (INT32)im->private.proto.im_offkeylist[0],
-					&im->private.proto.im_offkeylist[1]);
-}
-
-Private Bool
-_XimOnKeysCheck(ic, ev)
-    Xic		 ic;
-    XKeyEvent	*ev;
-{
-    Xim		 im = (Xim)ic->core.im;
-    long	 idx;
-
-    if (IS_DYNAMIC_EVENT_FLOW(ic->core.im) &&
-	    im->private.proto.im_onkeylist &&
-	    im->private.proto.im_onkeylist[0]) {
-	if ((idx = _XimTriggerOnCheck(im, ev)) >= 0) {
-	    (void)_XimTriggerNotify(im, ic, 0, (CARD32)idx); /* Trigger on */
-	    return True;
-	}
-    }
-    return False;
-}
-
-Private Bool
-_XimOffKeysCheck(ic, ev)
-    Xic		 ic;
-    XKeyEvent	*ev;
-{
-    Xim		 im = (Xim)ic->core.im;
-    long	 idx;
-
-    if (IS_DYNAMIC_EVENT_FLOW(ic->core.im) &&
-	    im->private.proto.im_offkeylist &&
-	    im->private.proto.im_offkeylist[0]) {
-	if ((idx = _XimTriggerOffCheck(im, ev)) >= 0) {
-	    _XimTriggerNotify(im, ic, 1, (CARD32)idx); /* Trigger off */
-	    return True;
-	}
-    }
-    return False;
-}
-
-Private void
-_XimPendingFilter(ic)
-    Xic	 	 ic;
-{
-    Xim          im = (Xim)ic->core.im;
-
-    if (IS_NEED_SYNC_REPLY(ic)) {
-	(void)_XimProcSyncReply(im, ic);
-	UNMARK_NEED_SYNC_REPLY(ic);
-    }
-    return;
-}
-
-Private Bool
-_XimProtoKeypressFilter(ic, ev)
-    Xic		 ic;
-    XKeyEvent	*ev;
-{
-#ifdef XIM_CONNECTABLE
-    Xim		im = (Xim)ic->core.im;
-#endif
-
-    if (IS_FABLICATED(ic)) {
-	_XimPendingFilter(ic);
-	UNMARK_FABLICATED(ic);
-	return NOTFILTERD;
-    }
-
-    if (IS_NEGLECT_EVENT(ic, KeyPressMask))
-	return FILTERD;
-
-#ifdef XIM_CONNECTABLE
-    if (!IS_IC_CONNECTED(ic)) {
-	if (IS_CONNECTABLE(im)) {
-	    if (_XimConnectServer(im)) {
-		if (!_XimReCreateIC(ic)) {
-		    _XimDelayModeSetAttr(im);
-		    return NOTFILTERD;
-		}
-	    } else {
-		return NOTFILTERD;
-	    }
-	} else {
-	    return NOTFILTERD;
-	}
-    }
-#else
-    if (!IS_IC_CONNECTED(ic))
-	return NOTFILTERD;
-#endif /* XIM_CONNECTABLE */
-
-    if (!IS_FORWARD_EVENT(ic, KeyPressMask)) {
-	if (_XimOnKeysCheck(ic, ev))
-	    return FILTERD;
-	return NOTFILTERD;
-    }
-    if (_XimOffKeysCheck(ic, ev))
-	return FILTERD;
-
-    if (_XimForwardEvent(ic, (XEvent *)ev,
-				IS_SYNCHRONOUS_EVENT(ic, KeyPressMask)))
-	return FILTERD;
-
-    return NOTFILTERD;
-}
-
-Private Bool
-_XimFilterKeypress (d, w, ev, client_data)
-    Display		*d;
-    Window		 w;
-    XEvent		*ev;
-    XPointer		 client_data;
-{
-    return _XimProtoKeypressFilter((Xic)client_data, (XKeyEvent *)ev );
-}
-
-Private Bool
-_XimProtoKeyreleaseFilter( ic, ev )
-    Xic		 ic;
-    XKeyEvent	*ev;
-{
-#ifdef XIM_CONNECTABLE
-    Xim		im = (Xim)ic->core.im;
-#endif
-
-    if (IS_FABLICATED(ic)) {
-	_XimPendingFilter(ic);
-	UNMARK_FABLICATED(ic);
-	return NOTFILTERD;
-    }
-
-    if (IS_NEGLECT_EVENT(ic, KeyReleaseMask))
-	return FILTERD;
-
-#ifdef XIM_CONNECTABLE
-    if (!IS_IC_CONNECTED(ic)) {
-	if (IS_CONNECTABLE(im)) {
-	    if (_XimConnectServer(im)) {
-		if (!_XimReCreateIC(ic)) {
-		    _XimDelayModeSetAttr(im);
-		    return NOTFILTERD;
-		}
-	    } else {
-		return NOTFILTERD;
-	    }
-	} else {
-	    return NOTFILTERD;
-	}
-    }
-#else
-    if (!IS_IC_CONNECTED(ic))
-	return NOTFILTERD;
-#endif /* XIM_CONNECTABLE */
-
-    if (!IS_FORWARD_EVENT(ic, KeyReleaseMask)) {
-	if (_XimOnKeysCheck(ic, ev))
-	    return FILTERD;
-	return NOTFILTERD;
-    }
-    if (_XimOffKeysCheck(ic, ev))
-	    return FILTERD;
-
-    if (_XimForwardEvent(ic, (XEvent *)ev,
-				IS_SYNCHRONOUS_EVENT(ic, KeyPressMask)))
-	return FILTERD;
-
-    return NOTFILTERD;
-}
-
-Private Bool
-_XimFilterKeyrelease (d, w, ev, client_data)
-    Display		*d;
-    Window		 w;
-    XEvent		*ev;
-    XPointer		 client_data;
-{
-    return _XimProtoKeyreleaseFilter((Xic)client_data, (XKeyEvent *)ev);
-}
-
-Private void 
-_XimRegisterKeyPressFilter(ic)
-    Xic		 ic ;
-{
-    if (ic->core.focus_window) {
-	if (!(ic->private.proto.registed_filter_event & KEYPRESS_MASK)) {
-	    _XRegisterFilterByType (ic->core.im->core.display,
-				    ic->core.focus_window,
-				    KeyPress, KeyPress,
-				    _XimFilterKeypress,
-				    (XPointer)ic);
-	    ic->private.proto.registed_filter_event |= KEYPRESS_MASK;
-	}
-    }
-    return;
-}
-
-Private void 
-_XimRegisterKeyReleaseFilter(ic)
-    Xic		 ic ;
-{
-    if (ic->core.focus_window) {
-	if (!(ic->private.proto.registed_filter_event & KEYRELEASE_MASK)) {
-	    _XRegisterFilterByType (ic->core.im->core.display,
-				    ic->core.focus_window,
-				    KeyRelease, KeyRelease,
-				    _XimFilterKeyrelease,
-				    (XPointer)ic);
-	    ic->private.proto.registed_filter_event |= KEYRELEASE_MASK;
-	}
-    }
-    return;
-}
-
-Private void 
-_XimUnregisterKeyPressFilter(ic)
-    Xic		 ic ;
-{
-    if (ic->core.focus_window) {
-	if (ic->private.proto.registed_filter_event & KEYPRESS_MASK) {
-	    _XUnregisterFilter (ic->core.im->core.display,
-				ic->core.focus_window,
-				_XimFilterKeypress,
-				(XPointer)ic);
-	    ic->private.proto.registed_filter_event &= ~KEYPRESS_MASK;
-	}
-    }
-    return;
-}
-
-Private void 
-_XimUnregisterKeyReleaseFilter(ic)
-    Xic		 ic ;
-{
-    if (ic->core.focus_window) {
-	if (ic->private.proto.registed_filter_event & KEYRELEASE_MASK) {
-	    _XUnregisterFilter (ic->core.im->core.display,
-				ic->core.focus_window,
-				_XimFilterKeyrelease,
-				(XPointer)ic);
-	    ic->private.proto.registed_filter_event &= ~KEYRELEASE_MASK;
-	}
-    }
-    return;
-}
-
-Public void
-_XimRegisterFilter(ic)
-    Xic		 ic;
-{
-    _XimRegisterKeyPressFilter(ic);
-    if (IS_FORWARD_EVENT(ic, KeyReleaseMask))
-	_XimRegisterKeyReleaseFilter(ic);
-    return;
-}
-
-Public void
-_XimUnregisterFilter(ic)
-    Xic		 ic;
-{
-    _XimUnregisterKeyPressFilter(ic);
-    _XimUnregisterKeyReleaseFilter(ic);
-    return;
-}
-
-Public void
-_XimReregisterFilter(ic)
-    Xic		 ic;
-{
-    if (IS_FORWARD_EVENT(ic, KeyReleaseMask))
-	_XimRegisterKeyReleaseFilter(ic);
-    else
-	_XimUnregisterKeyReleaseFilter(ic);
-
-    return;
-}
-
-Private Bool
-_XimFilterServerDestroy (d, w, ev, client_data)
-    Display		*d;
-    Window		 w;
-    XEvent		*ev;
-    XPointer		 client_data;
-{
-    Xim			 im = (Xim)client_data;
-
-    if (ev->type == DestroyNotify) {
-	UNMARK_SERVER_CONNECTED(im);
-#ifdef XIM_CONNECTABLE
-	if (!IS_SERVER_CONNECTED(im) && IS_RECONNECTABLE(im)) {
-	    _XimServerReconectableDestroy();
-	    return True;
-	}
-#endif /* XIM_CONNECTABLE */
-	_XimServerDestroy(im);
-    }
-    return True;
-}
-
-Public void 
-_XimRegisterServerFilter(im)
-    Xim		 im ;
-{
-    if (im->private.proto.im_window) {
-	if (!(im->private.proto.registed_filter_event & DESTROYNOTIFY_MASK)) {
-	    _XRegisterFilterByMask(im->core.display,
-		    im->private.proto.im_window,
-		    StructureNotifyMask,
-		    _XimFilterServerDestroy,
-		    (XPointer)im);
-	    XSelectInput(im->core.display, im->private.proto.im_window,
-			 StructureNotifyMask);
-	    im->private.proto.registed_filter_event |= DESTROYNOTIFY_MASK;
-	}
-    }
-    return;
-}
-
-Public void 
-_XimUnregisterServerFilter(im)
-    Xim		 im ;
-{
-    if (im->private.proto.im_window) {
-	if (im->private.proto.registed_filter_event & DESTROYNOTIFY_MASK) {
-	    _XUnregisterFilter(im->core.display,
-		    im->private.proto.im_window,
-		    _XimFilterServerDestroy,
-		    (XPointer)im);
-	    im->private.proto.registed_filter_event &= ~DESTROYNOTIFY_MASK;
-	}
-    }
-    return;
-}
-
diff --git a/xc/lib/X11/imDefIc.c b/xc/lib/X11/imDefIc.c
deleted file mode 100644
index 7193cf02e..000000000
--- a/xc/lib/X11/imDefIc.c
+++ /dev/null
@@ -1,1594 +0,0 @@
-/* $TOG: imDefIc.c /main/18 1997/06/22 18:11:11 kaleb $ */
-/******************************************************************
-
-           Copyright 1991, 1992 by Sun Microsystems, Inc.
-           Copyright 1992, 1993, 1994 by FUJITSU LIMITED
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of Sun Microsystems, Inc.
-and FUJITSU LIMITED not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior permission.
-Sun Microsystems, Inc. and FUJITSU LIMITED makes no representations about
-the suitability of this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-Sun Microsystems Inc. AND FUJITSU LIMITED DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL Sun Microsystems, Inc. AND FUJITSU LIMITED
-BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-  Author: Hideki Hiura (hhiura@Sun.COM) Sun Microsystems, Inc.
-          Takashi Fujiwara     FUJITSU LIMITED 
-                               fujiwara@a80.tech.yk.fujitsu.co.jp
-
-******************************************************************/
-/* $XFree86: xc/lib/X11/imDefIc.c,v 3.6 1999/05/09 10:50:31 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "Ximint.h"
-
-/* EXTERNS */
-
-/* imRm.c */
-extern Bool _XimCheckCreateICValues();
-
-Private Bool
-#if NeedFunctionPrototypes
-_XimCreateICCheck(
-    Xim          im,
-    INT16        len,
-    XPointer	 data,
-    XPointer     arg)
-#else
-_XimCreateICCheck(im, len, data, arg)
-    Xim          im;
-    INT16        len;
-    XPointer	 data;
-    XPointer     arg;
-#endif
-{
-    CARD16	*buf_s = (CARD16 *)((CARD8 *)data + XIM_HEADER_SIZE);
-    CARD8	 major_opcode = *((CARD8 *)data);
-    CARD8	 minor_opcode = *((CARD8 *)data + 1);
-    XIMID	 imid = buf_s[0];
-
-    if ((major_opcode == XIM_CREATE_IC_REPLY)
-     && (minor_opcode == 0)
-     && (imid == im->private.proto.imid))
-	return True;
-    if ((major_opcode == XIM_ERROR)
-     && (minor_opcode == 0)
-     && (buf_s[2] & XIM_IMID_VALID)
-     && (imid == im->private.proto.imid))
-	return True;
-    return False;
-}
-
-#ifdef XIM_CONNECTABLE
-Public Bool
-_XimReCreateIC(ic)
-    Xic			 ic;
-{
-    Xim			 im = (Xim)ic->core.im;
-    Xic			 save_ic;
-    XIMResourceList	 res;
-    unsigned int         num;
-    XIMStyle		 input_style = ic->core.input_style;
-    XimDefICValues	 ic_values;
-    INT16		 len;
-    CARD16		*buf_s;
-    char		*tmp;
-    CARD32		 tmp_buf32[BUFSIZE/4];
-    char		*tmp_buf = (char *)tmp_buf32;
-    char		*buf;
-    int			 buf_size;
-    char		*data;
-    int			 data_len;
-    int			 ret_len;
-    int			 total;
-    int			 idx;
-    CARD32		 reply32[BUFSIZE/4];
-    char		*reply = (char *)reply32;
-    XPointer		 preply;
-    int			 ret_code;
-
-    if (!(save_ic = (Xic)Xmalloc(sizeof(XicRec))))
-	return False;
-    memcpy((char *)save_ic, (char *)ic, sizeof(XicRec));
-
-    ic->core.filter_events = im->private.proto.forward_event_mask;
-    ic->private.proto.forward_event_mask =
-				im->private.proto.forward_event_mask;
-    ic->private.proto.synchronous_event_mask =
-				im->private.proto.synchronous_event_mask;
-
-    num = im->core.ic_num_resources;
-    buf_size = sizeof(XIMResource) * num;
-    if (!(res = (XIMResourceList)Xmalloc(buf_size)))
-	goto ErrorOnReCreateIC;
-    (void)memcpy((char *)res, (char *)im->core.ic_resources, buf_size);
-    ic->private.proto.ic_resources     = res;
-    ic->private.proto.ic_num_resources = num;
-
-    num = im->private.proto.ic_num_inner_resources;
-    buf_size = sizeof(XIMResource) * num;
-    if (!(res = (XIMResourceList)Xmalloc(buf_size)))
-	goto ErrorOnReCreateIC;
-    (void)memcpy((char *)res,
-			(char *)im->private.proto.ic_inner_resources, buf_size);
-    ic->private.proto.ic_inner_resources     = res;
-    ic->private.proto.ic_num_inner_resources = num;
-
-    _XimSetICMode(ic->private.proto.ic_resources,
-			ic->private.proto.ic_num_resources, input_style);
-
-    _XimSetICMode(ic->private.proto.ic_inner_resources,
-			ic->private.proto.ic_num_inner_resources, input_style);
-
-    _XimGetCurrentICValues(ic, &ic_values);
-    buf = tmp_buf;
-    buf_size = XIM_HEADER_SIZE + sizeof(CARD16) + sizeof(INT16);
-    data_len = BUFSIZE - buf_size;
-    total = 0;
-    idx = 0;
-    for (;;) {
-	data = &buf[buf_size];
-	if (!_XimEncodeSavedICATTRIBUTE(ic, ic->private.proto.ic_resources,
-		ic->private.proto.ic_num_resources, &idx, data, data_len,
-		&ret_len, (XPointer)&ic_values, XIM_CREATEIC)) {
-	    if (buf != tmp_buf)
-		Xfree(buf);
-	    goto ErrorOnReCreateIC;
-	}
-
-	total += ret_len;
-	if (idx == -1) {
-	    break;
-	}
-
-	buf_size += ret_len;
-	if (buf == tmp_buf) {
-	    if (!(tmp = (char *)Xmalloc(buf_size + data_len))) {
-		goto ErrorOnReCreateIC;
-	    }
-	    memcpy(tmp, buf, buf_size);
-	    buf = tmp;
-	} else {
-	    if (!(tmp = (char *)Xrealloc(buf, (buf_size + data_len)))) {
-		Xfree(buf);
-		goto ErrorOnReCreateIC;
-	    }
-	    buf = tmp;
-	}
-    }
-
-    buf_s = (CARD16 *)&buf[XIM_HEADER_SIZE];
-    buf_s[0] = im->private.proto.imid;
-    buf_s[1] = (INT16)total;
-
-    len = (INT16)(sizeof(CARD16) + sizeof(INT16) + total);
-    _XimSetHeader((XPointer)buf, XIM_CREATE_IC, 0, &len);
-    if (!(_XimWrite(im, len, (XPointer)buf))) {
-	if (buf != tmp_buf)
-	    Xfree(buf);
-	goto ErrorOnReCreateIC;
-    }
-    _XimFlush(im);
-    if (buf != tmp_buf)
-	Xfree(buf);
-    ic->private.proto.waitCallback = True;
-    buf_size = BUFSIZE;
-    ret_code = _XimRead(im, &len, (XPointer)reply, buf_size,
-						 _XimCreateICCheck, 0);
-    if(ret_code == XIM_TRUE) {
-	preply = reply;
-    } else if(ret_code == XIM_OVERFLOW) {
-	if(len <= 0) {
-	    preply = reply;
-	} else {
-	    buf_size = (int)len;
-	    preply = (XPointer)Xmalloc(buf_size);
-	    ret_code = _XimRead(im, &len, preply, buf_size,
-						 _XimCreateICCheck, 0);
-	    if(ret_code != XIM_TRUE) {
-		Xfree(preply);
-		ic->private.proto.waitCallback = False;
-		goto ErrorOnReCreateIC;
-	    }
-	}
-    } else {
-	ic->private.proto.waitCallback = False;
-	goto ErrorOnReCreateIC;
-    }
-    ic->private.proto.waitCallback = False;
-    buf_s = (CARD16 *)((char *)preply + XIM_HEADER_SIZE);
-    if (*((CARD8 *)preply) == XIM_ERROR) {
-	_XimProcError(im, 0, (XPointer)&buf_s[3]);
-	if(reply != preply)
-	    Xfree(preply);
-	goto ErrorOnReCreateIC;
-    }
-
-    ic->private.proto.icid = buf_s[1];		/* icid */
-    if(reply != preply)
-	Xfree(preply);
-
-    _XimRegisterFilter(ic);
-    MARK_IC_CONNECTED(ic);
-    if (save_ic->private.proto.ic_resources)
-	Xfree(save_ic->private.proto.ic_resources);
-    if (save_ic->private.proto.ic_inner_resources)
-	Xfree(save_ic->private.proto.ic_inner_resources);
-    Xfree(save_ic);
-    return True;
-
-ErrorOnReCreateIC:
-    memcpy((char *)ic, (char *)save_ic, sizeof(XicRec));
-    Xfree(save_ic);
-    return False;
-}
-
-Private char *
-_XimDelayModeGetICValues(ic, arg)
-    Xic			 ic;
-    XIMArg		*arg;
-{
-    XimDefICValues	 ic_values;
-
-    _XimGetCurrentICValues(ic, &ic_values);
-    return  _XimGetICValueData(ic, (XPointer)&ic_values,
-				ic->private.proto.ic_resources,
-				ic->private.proto.ic_num_resources,
-				arg, XIM_GETICVALUES);
-}
-#endif /* XIM_CONNECTABLE */
-
-Private Bool
-#if NeedFunctionPrototypes
-_XimGetICValuesCheck(
-    Xim          im,
-    INT16        len,
-    XPointer	 data,
-    XPointer     arg)
-#else
-_XimGetICValuesCheck(im, len, data, arg)
-    Xim          im;
-    INT16        len;
-    XPointer	 data;
-    XPointer     arg;
-#endif
-{
-    Xic		 ic = (Xic)arg;
-    CARD16	*buf_s = (CARD16 *)((CARD8 *)data + XIM_HEADER_SIZE);
-    CARD8	 major_opcode = *((CARD8 *)data);
-    CARD8	 minor_opcode = *((CARD8 *)data + 1);
-    XIMID	 imid = buf_s[0];
-    XICID	 icid = buf_s[1];
-
-    if ((major_opcode == XIM_GET_IC_VALUES_REPLY)
-     && (minor_opcode == 0)
-     && (imid == im->private.proto.imid)
-     && (icid == ic->private.proto.icid))
-	return True;
-    if ((major_opcode == XIM_ERROR)
-     && (minor_opcode == 0)
-     && (buf_s[2] & XIM_IMID_VALID)
-     && (imid == im->private.proto.imid)
-     && (buf_s[2] & XIM_ICID_VALID)
-     && (icid == ic->private.proto.icid))
-	return True;
-    return False;
-}
-
-Private char *
-_XimProtoGetICValues(xic, arg)
-    XIC			 xic ;
-    XIMArg		*arg ;
-{
-    Xic			 ic = (Xic)xic;
-    Xim			 im = (Xim)ic->core.im;
-    register XIMArg	*p;
-    register XIMArg	*pp;
-    register int	 n;
-    CARD8		*buf;
-    CARD16		*buf_s;
-    INT16		 len;
-    CARD32		 reply32[BUFSIZE/4];
-    char		*reply = (char *)reply32;
-    XPointer		 preply = NULL;
-    int			 buf_size;
-    int			 ret_code;
-    char		*makeid_name;
-    char		*decode_name;
-    CARD16		*data = NULL;
-    INT16		 data_len = 0;
-
-#ifndef XIM_CONNECTABLE
-    if (!IS_IC_CONNECTED(ic))
-	return arg->name;
-#else
-    if (!IS_IC_CONNECTED(ic)) {
-	if (IS_CONNECTABLE(im)) {
-	    if (_XimConnectServer(im)) {
-		if (!_XimReCreateIC(ic)) {
-		    _XimDelayModeSetAttr(im);
-	            return _XimDelayModeGetICValues(ic, arg);
-		}
-	    } else {
-	        return _XimDelayModeGetICValues(ic, arg);
-	    }
-        } else {
-	    return arg->name;
-        }
-    }
-#endif /* XIM_CONNECTABLE */
-
-    for (n = 0, p = arg; p && p->name; p++) {
-	n++;
-	if ((strcmp(p->name, XNPreeditAttributes) == 0)
-	 || (strcmp(p->name, XNStatusAttributes) == 0)) {
-	     n++;
-	     for (pp = (XIMArg *)p->value; pp && pp->name; pp++)
-	 	n++;
-	}
-    }
-
-    if (!n)
-	return (char *)NULL;
-
-    buf_size =  sizeof(CARD16) * n;
-    buf_size += XIM_HEADER_SIZE
-	     + sizeof(CARD16)
-	     + sizeof(CARD16)
-	     + sizeof(INT16)
-	     + XIM_PAD(2 + buf_size);
-
-    if (!(buf = (CARD8 *)Xmalloc(buf_size)))
-	return arg->name;
-    buf_s = (CARD16 *)&buf[XIM_HEADER_SIZE];
-
-    makeid_name = _XimMakeICAttrIDList(ic, ic->private.proto.ic_resources,
-				ic->private.proto.ic_num_resources, arg,
-				&buf_s[3], &len, XIM_GETICVALUES);
-
-    if (len > 0) {
-	buf_s[0] = im->private.proto.imid;		/* imid */
-	buf_s[1] = ic->private.proto.icid;		/* icid */
-	buf_s[2] = len;				/* length of ic-attr-id */
-	len += sizeof(INT16);                       /* sizeof length of attr */
-	XIM_SET_PAD(&buf_s[2], len);		/* pad */
-	len += sizeof(CARD16)			/* sizeof imid */
-	     + sizeof(CARD16);			/* sizeof icid */
-
-	_XimSetHeader((XPointer)buf, XIM_GET_IC_VALUES, 0, &len);
-	if (!(_XimWrite(im, len, (XPointer)buf))) {
-	    Xfree(buf);
-	    return arg->name;
-	}
-	_XimFlush(im);
-	Xfree(buf);
-	buf_size = BUFSIZE;
-	ret_code = _XimRead(im, &len, (XPointer)reply, buf_size,
-				 _XimGetICValuesCheck, (XPointer)ic);
-	if(ret_code == XIM_TRUE) {
-	    preply = reply;
-	} else if(ret_code == XIM_OVERFLOW) {
-	    if(len <= 0) {
-		preply = reply;
-	    } else {
-		buf_size = (int)len;
-		preply = (XPointer)Xmalloc(len);
-		ret_code = _XimRead(im, &len, preply, buf_size,
-				_XimGetICValuesCheck, (XPointer)ic);
-		if(ret_code != XIM_TRUE) {
-		    if (preply != reply)
-		        Xfree(preply);
-		    return arg->name;
-		}
-	    }
-	} else {
-	    return arg->name;
-	}
-	buf_s = (CARD16 *)((char *)preply + XIM_HEADER_SIZE);
-	if (*((CARD8 *)preply) == XIM_ERROR) {
-	    _XimProcError(im, 0, (XPointer)&buf_s[3]);
-	    if(reply != preply)
-		Xfree(preply);
-	    return arg->name;
-	}
-	data = &buf_s[4];
-	data_len = buf_s[2];
-    }
-    else if (len < 0) {
-	return arg->name;
-    }
-
-    decode_name = _XimDecodeICATTRIBUTE(ic, ic->private.proto.ic_resources,
-			ic->private.proto.ic_num_resources, data, data_len,
-			arg, XIM_GETICVALUES);
-    if (reply != preply)
-	Xfree(preply);
-
-    if (decode_name)
-	return decode_name;
-    else
-	return makeid_name;
-}
-
-#ifdef XIM_CONNECTABLE
-Private Bool
-_XimCheckNestQuarkList(quark_list, num_quark, quark, separator)
-    XrmQuark		*quark_list;
-    int			 num_quark;
-    XrmQuark		 quark;
-    XrmQuark		 separator;
-{
-    register int	 i;
-
-    for (i = 0; i < num_quark; i++) {
-	if (quark_list[i] == separator) {
-	    break;
-	}
-	if (quark_list[i] == quark) {
-	    return True;
-	}
-    }
-    return False;
-}
-
-Private Bool
-_XimCheckNestedQuarkList(quark_list, idx, num_quark, arg, separator)
-    XrmQuark		**quark_list;
-    int			  idx;
-    int			 *num_quark;
-    XIMArg		 *arg;
-    XrmQuark		  separator;
-{
-    XrmQuark		 *q_list = *quark_list;
-    int			  n_quark = *num_quark;
-    register XIMArg	 *p;
-    XrmQuark		  quark;
-    XrmQuark		 *tmp;
-    register int	  i;
-
-    for (p = arg; p && p->name; p++) {
-	quark = XrmStringToQuark(p->name);
-	if (_XimCheckNestQuarkList(&q_list[idx], n_quark - idx,
-							quark, separator)) {
-	    continue;
-	}
-	if (!(tmp = (XrmQuark *)Xmalloc((sizeof(XrmQuark) * (n_quark + 1))))) {
-	    *quark_list = q_list;
-	    *num_quark = n_quark;
-	    return False;
-	}
-	n_quark++;
-	for (i = 0; i < idx; i++) {
-	    tmp[i] = q_list[i];
-	}
-	tmp[i] = quark;
-	for (i = idx  + 1; i < n_quark; i++) {
-	    tmp[i] = q_list[i - 1];
-	}
-	q_list = tmp;
-    }
-    *quark_list = q_list;
-    *num_quark = n_quark;
-    return True;
-}
-
-Private Bool
-_XimCheckICQuarkList(quark_list, num_quark, quark, idx)
-    XrmQuark		*quark_list;
-    int			 num_quark;
-    XrmQuark		 quark;
-    int			*idx;
-{
-    register int	 i;
-
-    for (i = 0; i < num_quark; i++) {
-	if (quark_list[i] == quark) {
-	    *idx = i;
-	    return True;
-	}
-    }
-    return False;
-}
-
-Private Bool
-_XimSaveICValues(ic, arg)
-    Xic			 ic;
-    XIMArg		*arg;
-{
-    register XIMArg	*p;
-    register int	 n;
-    XrmQuark		*quark_list;
-    XrmQuark		*tmp;
-    XrmQuark		 quark;
-    int			 num_quark;
-    XrmQuark		 pre_quark;
-    XrmQuark		 sts_quark;
-    XrmQuark		 separator;
-    int			 idx;
-
-    pre_quark = XrmStringToQuark(XNPreeditAttributes);
-    sts_quark = XrmStringToQuark(XNStatusAttributes);
-    separator = XrmStringToQuark(XNSeparatorofNestedList);
-
-    if (quark_list = ic->private.proto.saved_icvalues) {
-	num_quark = ic->private.proto.num_saved_icvalues;
-	for (p = arg; p && p->name; p++) {
-	    quark = XrmStringToQuark(p->name);
-	    if ((quark == pre_quark) || (quark == sts_quark)) {
-	        if (!_XimCheckICQuarkList(quark_list, num_quark, quark, &idx)) {
-		    register XIMArg	*pp;
-		    int			 nn;
-		    XrmQuark		*q_list;
-
-		    for (pp = (XIMArg *)p->value, nn = 0;
-						pp && pp->name; pp++, nn++);
-	            if (!(tmp = (XrmQuark *)Xrealloc(quark_list,
-				(sizeof(XrmQuark) * (num_quark + nn + 2))))) {
-		        ic->private.proto.saved_icvalues = quark_list;
-		        ic->private.proto.num_saved_icvalues = num_quark;
-		        return False;
-	            }
-	            quark_list = tmp;
-		    q_list = &quark_list[num_quark];
-	            num_quark += nn + 2;
-		    *q_list++ = quark;
-		    for (pp = (XIMArg *)p->value;
-					pp && pp->name; pp++, quark_list++) {
-			*q_list = XrmStringToQuark(pp->name);
-		    }
-		    *q_list = separator;
-		} else {
-		    if (!_XimCheckNestedQuarkList(&quark_list, idx + 1,
-				&num_quark, (XIMArg *)p->value, separator)) {
-		        ic->private.proto.saved_icvalues = quark_list;
-		        ic->private.proto.num_saved_icvalues = num_quark;
-		        return False;
-		    }
-		}
-	    } else {
-	        if (_XimCheckICQuarkList(quark_list, num_quark, quark, &idx)) {
-		    continue;
-	        }
-	        if (!(tmp = (XrmQuark *)Xrealloc(quark_list,
-				(sizeof(XrmQuark) * (num_quark + 1))))) {
-		    ic->private.proto.saved_icvalues = quark_list;
-		    ic->private.proto.num_saved_icvalues = num_quark;
-		    return False;
-	        }
-	        quark_list = tmp;
-	        quark_list[num_quark] = quark;
-	        num_quark++;
-	    }
-	}
-	ic->private.proto.saved_icvalues = quark_list;
-	ic->private.proto.num_saved_icvalues = num_quark;
-	return True;
-    }
-
-    for (p = arg, n = 0; p && p->name; p++, n++) {
-	if ((!strcmp(p->name, XNPreeditAttributes))
-	 || (!strcmp(p->name, XNStatusAttributes))) {
-	    register XIMArg	*pp;
-	    int			 nn;
-
-	    for (pp = (XIMArg *)p->value, nn = 0; pp && pp->name; pp++, nn++);
-	    n += nn + 1;
-	}
-    }
-
-    if (!(quark_list = (XrmQuark *)Xmalloc(sizeof(XrmQuark) * n))) {
-	return False;
-    }
-
-    ic->private.proto.saved_icvalues = quark_list;
-    ic->private.proto.num_saved_icvalues = n;
-    for (p = arg; p && p->name; p++, quark_list++) {
-	*quark_list = XrmStringToQuark(p->name);
-	if ((*quark_list == pre_quark) || (*quark_list == sts_quark)) {
-	    register XIMArg	*pp;
-
-	    quark_list++;
-	    for (pp = (XIMArg *)p->value; pp && pp->name; pp++, quark_list++) {
-		*quark_list = XrmStringToQuark(pp->name);
-	    }
-	    *quark_list = separator;
-	}
-    }
-    return True;
-}
-
-Private char *
-_XimDelayModeSetICValues(ic, arg)
-    Xic			 ic;
-    XIMArg		*arg;
-{
-    XimDefICValues	 ic_values;
-    char		*name;
-
-    _XimGetCurrentICValues(ic, &ic_values);
-    name = _XimSetICValueData(ic, (XPointer)&ic_values,
-			ic->private.proto.ic_resources,
-			ic->private.proto.ic_num_resources,
-			arg, XIM_SETICVALUES, False);
-    _XimSetCurrentICValues(ic, &ic_values);
-    return name;
-}
-#endif /* XIM_CONNECTABLE */
-
-Private Bool
-#if NeedFunctionPrototypes
-_XimSetICValuesCheck(
-    Xim          im,
-    INT16        len,
-    XPointer	 data,
-    XPointer     arg)
-#else
-_XimSetICValuesCheck(im, len, data, arg)
-    Xim          im;
-    INT16        len;
-    XPointer	 data;
-    XPointer     arg;
-#endif
-{
-    Xic		 ic = (Xic)arg;
-    CARD16	*buf_s = (CARD16 *)((CARD8 *)data + XIM_HEADER_SIZE);
-    CARD8	 major_opcode = *((CARD8 *)data);
-    CARD8	 minor_opcode = *((CARD8 *)data + 1);
-    XIMID	 imid = buf_s[0];
-    XICID	 icid = buf_s[1];
-
-    if ((major_opcode == XIM_SET_IC_VALUES_REPLY)
-     && (minor_opcode == 0)
-     && (imid == im->private.proto.imid)
-     && (icid == ic->private.proto.icid))
-	return True;
-    if ((major_opcode == XIM_ERROR)
-     && (minor_opcode == 0)
-     && (buf_s[2] & XIM_IMID_VALID)
-     && (imid == im->private.proto.imid)
-     && (buf_s[2] & XIM_ICID_VALID)
-     && (icid == ic->private.proto.icid))
-	return True;
-    return False;
-}
-
-Private char *
-_XimProtoSetICValues(xic, arg)
-    XIC			 xic;
-    XIMArg		*arg;
-{
-    Xic			 ic = (Xic)xic;
-    Xim			 im = (Xim)ic->core.im;
-    XimDefICValues	 ic_values;
-    INT16		 len;
-    CARD16		*buf_s;
-    char		*tmp;
-    CARD32		 tmp_buf32[BUFSIZE/4];
-    char		*tmp_buf = (char *)tmp_buf32;
-    char		*buf;
-    int			 buf_size;
-    char		*data;
-    int			 data_len;
-    int			 ret_len;
-    int			 total;
-    XIMArg		*arg_ret;
-    CARD32		 reply32[BUFSIZE/4];
-    char		*reply = (char *)reply32;
-    XPointer		 preply = NULL;
-    int			 ret_code;
-    BITMASK32		 flag = 0L;
-    char		*name;
-    char		*tmp_name = (arg) ? arg->name : NULL;
-
-#ifndef XIM_CONNECTABLE
-    if (!IS_IC_CONNECTED(ic))
-	return tmp_name;
-#else
-    if (!_XimSaveICValues(ic, arg))
-	return NULL;
-
-    if (!IS_IC_CONNECTED(ic)) {
-	if (IS_CONNECTABLE(im)) {
-	    if (_XimConnectServer(im)) {
-	        if (!_XimReCreateIC(ic)) {
-		    _XimDelayModeSetAttr(im);
-	            return _XimDelayModeSetICValues(ic, arg);
-		}
-	    } else {
-	        return _XimDelayModeSetICValues(ic, arg);
-	    }
-        } else {
-	    return tmp_name;
-        }
-    }
-#endif /* XIM_CONNECTABLE */
-
-    _XimGetCurrentICValues(ic, &ic_values);
-    buf = tmp_buf;
-    buf_size = XIM_HEADER_SIZE
-	+ sizeof(CARD16) + sizeof(CARD16) + sizeof(INT16) + sizeof(CARD16);
-    data_len = BUFSIZE - buf_size;
-    total = 0;
-    arg_ret = arg;
-    for (;;) {
-	data = &buf[buf_size];
-	if ((name = _XimEncodeICATTRIBUTE(ic, ic->private.proto.ic_resources,
-			ic->private.proto.ic_num_resources, arg, &arg_ret,
-			data, data_len, &ret_len, (XPointer)&ic_values,
-			&flag, XIM_SETICVALUES))) {
-	    break;
-	}
-
-	total += ret_len;
-	if (!(arg = arg_ret)) {
-	    break;
-	}
-
-	buf_size += ret_len;
-	if (buf == tmp_buf) {
-	    if (!(tmp = (char *)Xmalloc(buf_size + data_len))) {
-		return tmp_name;
-	    }
-	    memcpy(tmp, buf, buf_size);
-	    buf = tmp;
-	} else {
-	    if (!(tmp = (char *)Xrealloc(buf, (buf_size + data_len)))) {
-		Xfree(buf);
-		return tmp_name;
-	    }
-	    buf = tmp;
-	}
-    }
-    _XimSetCurrentICValues(ic, &ic_values);
-
-    if (!total) {
-        return tmp_name;
-    }
-
-    buf_s = (CARD16 *)&buf[XIM_HEADER_SIZE];
-
-#ifdef EXT_MOVE
-    if (_XimExtenMove(im, ic, flag, &buf_s[4], (INT16)total))
-	return name;
-#endif
-
-    buf_s[0] = im->private.proto.imid;
-    buf_s[1] = ic->private.proto.icid;
-    buf_s[2] = (INT16)total;
-    buf_s[3] = 0;
-    len = (INT16)(sizeof(CARD16) + sizeof(CARD16)
-				+ sizeof(INT16) + sizeof(CARD16) + total);
-
-    _XimSetHeader((XPointer)buf, XIM_SET_IC_VALUES, 0, &len);
-    if (!(_XimWrite(im, len, (XPointer)buf))) {
-	if (buf != tmp_buf)
-	    Xfree(buf);
-	return tmp_name;
-    }
-    _XimFlush(im);
-    if (buf != tmp_buf)
-	Xfree(buf);
-    ic->private.proto.waitCallback = True;
-    buf_size = BUFSIZE;
-    ret_code = _XimRead(im, &len, (XPointer)reply, buf_size,
-					_XimSetICValuesCheck, (XPointer)ic);
-    if(ret_code == XIM_TRUE) {
-	preply = reply;
-    } else if(ret_code == XIM_OVERFLOW) {
-	buf_size = (int)len;
-	preply = (XPointer)Xmalloc(buf_size);
-	ret_code = _XimRead(im, &len, preply, buf_size,
-					_XimSetICValuesCheck, (XPointer)ic);
-	if(ret_code != XIM_TRUE) {
-	    Xfree(preply);
-	    ic->private.proto.waitCallback = False;
-	    return tmp_name;
-	}
-    } else {
-	ic->private.proto.waitCallback = False;
-	return tmp_name;
-    }
-    ic->private.proto.waitCallback = False;
-    buf_s = (CARD16 *)((char *)preply + XIM_HEADER_SIZE);
-    if (*((CARD8 *)preply) == XIM_ERROR) {
-	_XimProcError(im, 0, (XPointer)&buf_s[3]);
-	if(reply != preply)
-	    Xfree(preply);
-	return tmp_name;
-    }
-    if(reply != preply)
-	Xfree(preply);
-
-    return name;
-}
-
-Private Bool
-#if NeedFunctionPrototypes
-_XimDestroyICCheck(
-    Xim          im,
-    INT16        len,
-    XPointer	 data,
-    XPointer     arg)
-#else
-_XimDestroyICCheck(im, len, data, arg)
-    Xim          im;
-    INT16        len;
-    XPointer	 data;
-    XPointer     arg;
-#endif
-{
-    Xic		 ic = (Xic)arg;
-    CARD16	*buf_s = (CARD16 *)((CARD8 *)data + XIM_HEADER_SIZE);
-    CARD8	 major_opcode = *((CARD8 *)data);
-    CARD8	 minor_opcode = *((CARD8 *)data + 1);
-    XIMID	 imid = buf_s[0];
-    XICID	 icid = buf_s[1];
-    Bool	 ret = False;
-
-    if ((major_opcode == XIM_DESTROY_IC_REPLY)
-     && (minor_opcode == 0)
-     && (imid == im->private.proto.imid)
-     && (icid == ic->private.proto.icid))
-	ret = True;
-    if ((major_opcode == XIM_ERROR)
-     && (minor_opcode == 0)
-     && (buf_s[2] & XIM_IMID_VALID)
-     && (imid == im->private.proto.imid)
-     && (buf_s[2] & XIM_ICID_VALID)
-     && (icid == ic->private.proto.icid))
-    ret = False;
-    return ret;
-}
-
-Private void
-_XimProtoICFree(ic)
-    Xic		 ic;
-{
-#ifdef XIM_CONNECTABLE
-    Xim		 im = (Xim)ic->core.im;
-#endif
-
-    if (ic->private.proto.preedit_font) {
-	Xfree(ic->private.proto.preedit_font);
-	ic->private.proto.preedit_font = NULL;
-    }
-    if (ic->private.proto.status_font) {
-	Xfree(ic->private.proto.status_font);
-	ic->private.proto.status_font = NULL;
-    }
-    if (ic->private.proto.commit_info) {
-	_XimFreeCommitInfo(ic);
-	ic->private.proto.commit_info = NULL;
-    }
-    if (ic->private.proto.ic_inner_resources) {
-	Xfree(ic->private.proto.ic_inner_resources);
-	ic->private.proto.ic_inner_resources = NULL;
-    }
-
-#ifdef XIM_CONNECTABLE
-    if (IS_SERVER_CONNECTED(im) && IS_RECONNECTABLE(im)) {
-	return;
-    }
-#endif /* XIM_CONNECTABLE */
-
-    if (ic->private.proto.saved_icvalues) {
-	Xfree(ic->private.proto.saved_icvalues);
-	ic->private.proto.saved_icvalues = NULL;
-    }
-    if (ic->private.proto.ic_resources) {
-	Xfree(ic->private.proto.ic_resources);
-	ic->private.proto.ic_resources = NULL;
-    }
-    if (ic->core.hotkey) {
-	Xfree(ic->core.hotkey);
-	ic->core.hotkey = NULL;
-    }
-
-    return;
-}
-
-Private void
-_XimProtoDestroyIC(xic)
-    XIC		 xic;
-{
-    Xic		 ic = (Xic)xic;
-    Xim	 	 im = (Xim)ic->core.im;
-    CARD32	 buf32[BUFSIZE/4];
-    CARD8	*buf = (CARD8 *)buf32;
-    CARD16	*buf_s = (CARD16 *)&buf[XIM_HEADER_SIZE];
-    INT16	 len;
-    CARD32	 reply32[BUFSIZE/4];
-    char	*reply = (char *)reply32;
-    XPointer	 preply;
-    int		 buf_size;
-    int		 ret_code;
-
-    if (IS_SERVER_CONNECTED(im)) {
-	buf_s[0] = im->private.proto.imid;		/* imid */
-	buf_s[1] = ic->private.proto.icid;		/* icid */
-
-	len = sizeof(CARD16)			/* sizeof imid */
-	    + sizeof(CARD16);			/* sizeof icid */
-
-	_XimSetHeader((XPointer)buf, XIM_DESTROY_IC, 0, &len);
-	(void)_XimWrite(im, len, (XPointer)buf);
-	_XimFlush(im);
-	buf_size = BUFSIZE;
-	ret_code = _XimRead(im, &len, (XPointer)reply, buf_size,
-					_XimDestroyICCheck, (XPointer)ic);
-	if(ret_code == XIM_OVERFLOW) {
-	    buf_size = len;
-	    preply = (XPointer)Xmalloc(buf_size);
-	    (void)_XimRead(im, &len, preply, buf_size,
-					_XimDestroyICCheck, (XPointer)ic);
-	    Xfree(preply);
-	}
-    }
-    UNMARK_IC_CONNECTED(ic);
-    _XimUnregisterFilter(ic);
-    _XimProtoICFree(ic);
-    return;
-}
-
-Private void
-_XimProtoSetFocus(xic)
-    XIC		 xic;
-{
-    Xic		 ic = (Xic)xic;
-    Xim		 im = (Xim)ic->core.im;
-    CARD32	 buf32[BUFSIZE/4];
-    CARD8	*buf = (CARD8 *)buf32;
-    CARD16	*buf_s = (CARD16 *)&buf[XIM_HEADER_SIZE];
-    INT16	 len;
- 
-#ifndef XIM_CONNECTABLE
-    if (!IS_IC_CONNECTED(ic))
-	return;
-#else
-    if (!IS_IC_CONNECTED(ic)) {
-	if (IS_CONNECTABLE(im)) {
-	    if (_XimConnectServer(im)) {
-		if (!_XimReCreateIC(ic)) {
-		    _XimDelayModeSetAttr(im);
-		    return;
-		}
-	    } else {
-		return;
-	    }
-	} else {
-	    return;
-	}
-    }
-#endif /* XIM_CONNECTABLE */
-
-    buf_s[0] = im->private.proto.imid;		/* imid */
-    buf_s[1] = ic->private.proto.icid;		/* icid */
-
-    len = sizeof(CARD16)			/* sizeof imid */
-	+ sizeof(CARD16);			/* sizeof icid */
-
-    _XimSetHeader((XPointer)buf, XIM_SET_IC_FOCUS, 0, &len);
-    (void)_XimWrite(im, len, (XPointer)buf);
-    _XimFlush(im);
-
-    _XimRegisterFilter(ic);
-    return;
-}
-
-Private void
-_XimProtoUnsetFocus(xic)
-    XIC		 xic;
-{
-    Xic		 ic = (Xic)xic;
-    Xim		 im = (Xim)ic->core.im;
-    CARD32	 buf32[BUFSIZE/4];
-    CARD8	*buf = (CARD8 *)buf32;
-    CARD16	*buf_s = (CARD16 *)&buf[XIM_HEADER_SIZE];
-    INT16	 len;
-
-#ifndef XIM_CONNECTABLE
-    if (!IS_IC_CONNECTED(ic))
-	return;
-#else
-    if (!IS_IC_CONNECTED(ic)) {
-	if (IS_CONNECTABLE(im)) {
-	    if (_XimConnectServer(im)) {
-		if (!_XimReCreateIC(ic)) {
-		    _XimDelayModeSetAttr(im);
-		    return;
-		}
-	    } else {
-		return;
-	    }
-	} else {
-	    return;
-	}
-    }
-#endif /* XIM_CONNECTABLE */
-
-    buf_s[0] = im->private.proto.imid;		/* imid */
-    buf_s[1] = ic->private.proto.icid;		/* icid */
-
-    len = sizeof(CARD16)			/* sizeof imid */
-	+ sizeof(CARD16);			/* sizeof icid */
-
-    _XimSetHeader((XPointer)buf, XIM_UNSET_IC_FOCUS, 0, &len);
-    (void)_XimWrite(im, len, (XPointer)buf);
-    _XimFlush(im);
-
-    _XimUnregisterFilter(ic);
-    return;
-}
-
-Private Bool
-#if NeedFunctionPrototypes
-_XimResetICCheck(
-    Xim          im,
-    INT16        len,
-    XPointer	 data,
-    XPointer     arg)
-#else
-_XimResetICCheck(im, len, data, arg)
-    Xim          im;
-    INT16        len;
-    XPointer	 data;
-    XPointer     arg;
-#endif
-{
-    Xic		 ic = (Xic)arg;
-    CARD16	*buf_s = (CARD16 *)((CARD8 *)data + XIM_HEADER_SIZE);
-    CARD8	 major_opcode = *((CARD8 *)data);
-    CARD8	 minor_opcode = *((CARD8 *)data + 1);
-    XIMID	 imid = buf_s[0];
-    XICID	 icid = buf_s[1];
-
-    if ((major_opcode == XIM_RESET_IC_REPLY)
-     && (minor_opcode == 0)
-     && (imid == im->private.proto.imid)
-     && (icid == ic->private.proto.icid))
-	return True;
-    if ((major_opcode == XIM_ERROR)
-     && (minor_opcode == 0)
-     && (buf_s[2] & XIM_IMID_VALID)
-     && (imid == im->private.proto.imid)
-     && (buf_s[2] & XIM_ICID_VALID)
-     && (icid == ic->private.proto.icid))
-	return True;
-    return False;
-}
-
-Private char *
-_XimCommitedMbString(im, ic, buf)
-    Xim			 im;
-    Xic			 ic;
-    XPointer		 buf;
-{
-    CARD16		*buf_s = (CARD16 *)buf;
-    XimCommitInfo	 info;
-    int			 len;
-    int			 new_len;
-    char		*commit;
-    char		*new_commit = NULL;
-    char		*str;
-    Status		 status;
-
-    len = 0;
-    for (info = ic->private.proto.commit_info; info; info = info->next)
-	len += info->string_len;
-    len += buf_s[0];
-    if( len == 0 )
-	return( NULL );
-
-    if (!(commit = (char *)Xmalloc(len + 1)))
-	goto Error_On_Reset;
-
-    str = commit;
-    for (info = ic->private.proto.commit_info; info; info = info->next) {
-	(void)memcpy(str, info->string, info->string_len);
-	str += info->string_len;
-    }
-    (void)memcpy(str, (char *)&buf_s[1], buf_s[0]);
-    commit[len] = '\0';
-
-    new_len = im->methods->ctstombs((XIM)im, commit, len, NULL, 0, &status);
-    if (status != XLookupNone) {
-	if (!(new_commit = Xmalloc(new_len + 1))) {
-	    Xfree(commit);
-	    goto Error_On_Reset;
-	}
-	(void)im->methods->ctstombs((XIM)im, commit, len,
-						new_commit, new_len, NULL);
-	new_commit[new_len] = '\0';
-    }
-    Xfree(commit);
-
-Error_On_Reset:
-    _XimFreeCommitInfo( ic );
-    return new_commit;
-}
-
-Private char *
-_XimProtoMbReset(xic)
-    XIC		 xic;
-{
-    Xic		 ic = (Xic)xic;
-    Xim	 	 im = (Xim)ic->core.im;
-    CARD32	 buf32[BUFSIZE/4];
-    CARD8	*buf = (CARD8 *)buf32;
-    CARD16	*buf_s = (CARD16 *)&buf[XIM_HEADER_SIZE];
-    INT16	 len;
-    CARD32	 reply32[BUFSIZE/4];
-    char	*reply = (char *)reply32;
-    XPointer	 preply;
-    int		 buf_size;
-    int		 ret_code;
-    char	*commit;
-
-    if (!IS_IC_CONNECTED(ic))
-	return (char *)NULL;
-
-    buf_s[0] = im->private.proto.imid;		/* imid */
-    buf_s[1] = ic->private.proto.icid;		/* icid */
-
-    len = sizeof(CARD16)			/* sizeof imid */
-	+ sizeof(CARD16);			/* sizeof icid */
-
-    _XimSetHeader((XPointer)buf, XIM_RESET_IC, 0, &len);
-    if (!(_XimWrite(im, len, (XPointer)buf)))
-	return NULL;
-    _XimFlush(im);
-    ic->private.proto.waitCallback = True;
-    buf_size = BUFSIZE;
-    ret_code = _XimRead(im, &len, (XPointer)reply, buf_size,
-    					_XimResetICCheck, (XPointer)ic);
-    if(ret_code == XIM_TRUE) {
-    	preply = reply;
-    } else if(ret_code == XIM_OVERFLOW) {
-    	if(len < 0) {
-    	    preply = reply;
-    	} else {
-    	    buf_size = len;
-    	    preply = (XPointer)Xmalloc(buf_size);
-    	    ret_code = _XimRead(im, &len, preply, buf_size,
-    					_XimResetICCheck, (XPointer)ic);
-    	    if(ret_code != XIM_TRUE) {
-		Xfree(preply);
-    		ic->private.proto.waitCallback = False;
-    		return NULL;
-    	    }
-    	}
-    } else {
-	ic->private.proto.waitCallback = False;
-	return NULL;
-    }
-    ic->private.proto.waitCallback = False;
-    buf_s = (CARD16 *)((char *)preply + XIM_HEADER_SIZE);
-    if (*((CARD8 *)preply) == XIM_ERROR) {
-	_XimProcError(im, 0, (XPointer)&buf_s[3]);
-    	if(reply != preply)
-    	    free(preply);
-	return NULL;
-    }
-
-    commit = _XimCommitedMbString(im, ic, (XPointer)&buf_s[2]);
-
-    if(reply != preply)
-    	Xfree(preply);
-    return commit;
-}
-
-Private wchar_t *
-_XimCommitedWcString(im, ic, buf)
-    Xim		 im;
-    Xic		 ic;
-    XPointer	 buf;
-{
-    CARD16		*buf_s = (CARD16 *)buf;
-    XimCommitInfo	 info;
-    int			 len;
-    int			 new_len;
-    char		*commit;
-    wchar_t		*new_commit = (wchar_t *)NULL;
-    char		*str;
-    Status		 status;
-
-    len = 0;
-    for (info = ic->private.proto.commit_info; info; info = info->next)
-	len += info->string_len;
-    len += buf_s[0];
-    if( len == 0 )
-	return( (wchar_t *)NULL );
-
-    if (!(commit = (char *)Xmalloc(len + 1)))
-	goto Error_On_Reset;
-
-    str = commit;
-    for (info = ic->private.proto.commit_info; info; info = info->next) {
-	(void)memcpy(str, info->string, info->string_len);
-	str += info->string_len;
-    }
-    (void)memcpy(str, (char *)&buf_s[1], buf_s[0]);
-    commit[len] = '\0';
-
-    new_len = im->methods->ctstowcs((XIM)im, commit, len, NULL, 0, &status);
-    if (status != XLookupNone) {
-	if (!(new_commit =
-		     (wchar_t *)Xmalloc(sizeof(wchar_t) * (new_len + 1)))) {
-	    Xfree(commit);
-	    goto Error_On_Reset;
-	}
-	(void)im->methods->ctstowcs((XIM)im, commit, len,
-						new_commit, new_len, NULL);
-	new_commit[new_len] = (wchar_t)'\0';
-    }
-    Xfree(commit);
-
-Error_On_Reset:
-    _XimFreeCommitInfo( ic );
-    return new_commit;
-}
-
-Private wchar_t *
-_XimProtoWcReset(xic)
-    XIC		 xic;
-{
-    Xic		 ic = (Xic)xic;
-    Xim	 	 im = (Xim)ic->core.im;
-    CARD32	 buf32[BUFSIZE/4];
-    CARD8	*buf = (CARD8 *)buf32;
-    CARD16	*buf_s = (CARD16 *)&buf[XIM_HEADER_SIZE];
-    INT16	 len;
-    CARD32	 reply32[BUFSIZE/4];
-    char	*reply = (char *)reply32;
-    XPointer	 preply;
-    int		 buf_size;
-    int		 ret_code;
-    wchar_t	*commit;
-
-    if (!IS_IC_CONNECTED(ic))
-	return (wchar_t *)NULL;
-
-    buf_s[0] = im->private.proto.imid;		/* imid */
-    buf_s[1] = ic->private.proto.icid;		/* icid */
-
-    len = sizeof(CARD16)			/* sizeof imid */
-	+ sizeof(CARD16);			/* sizeof icid */
-
-    _XimSetHeader((XPointer)buf, XIM_RESET_IC, 0, &len);
-    if (!(_XimWrite(im, len, (XPointer)buf)))
-	return NULL;
-    _XimFlush(im);
-    ic->private.proto.waitCallback = True;
-    buf_size = BUFSIZE;
-    ret_code = _XimRead(im, &len, (XPointer)reply, buf_size,
-    					_XimResetICCheck, (XPointer)ic);
-    if(ret_code == XIM_TRUE) {
-    	preply = reply;
-    } else if(ret_code == XIM_OVERFLOW) {
-    	if(len <= 0) {
-    	    preply = reply;
-    	} else {
-    	    buf_size = len;
-    	    preply = (XPointer)Xmalloc(buf_size);
-    	    ret_code = _XimRead(im, &len, preply, buf_size,
-    					_XimResetICCheck, (XPointer)ic);
-	    if(ret_code != XIM_TRUE) {
-		Xfree(preply);
-		ic->private.proto.waitCallback = False;
-		return NULL;
-	    }
-    	}
-    } else {
-	ic->private.proto.waitCallback = False;
-	return NULL;
-    }
-    ic->private.proto.waitCallback = False;
-    buf_s = (CARD16 *)((char *)preply + XIM_HEADER_SIZE);
-    if (*((CARD8 *)preply) == XIM_ERROR) {
-	_XimProcError(im, 0, (XPointer)&buf_s[3]);
-    	if(reply != preply)
-    	    free(preply);
-	return NULL;
-    }
-
-    commit = _XimCommitedWcString(im, ic, (XPointer)&buf_s[2]);
-
-    Xfree(preply);
-    return commit;
-}
-
-Private XICMethodsRec ic_methods = {
-    _XimProtoDestroyIC,		/* destroy */
-    _XimProtoSetFocus,		/* set_focus */
-    _XimProtoUnsetFocus,	/* unset_focus */
-    _XimProtoSetICValues,	/* set_values */
-    _XimProtoGetICValues,	/* get_values */
-    _XimProtoMbReset,		/* mb_reset */
-    _XimProtoWcReset,		/* wc_reset */
-    _XimProtoMbLookupString,	/* mb_lookup_string */
-    _XimProtoWcLookupString,	/* wc_lookup_string */
-};
-
-Private Bool
-_XimGetInputStyle(arg, input_style)
-    XIMArg		*arg;
-    XIMStyle		*input_style;
-{
-    register XIMArg	*p;
-
-    for (p = arg; p && p->name; p++) {
-	if (!(strcmp(p->name, XNInputStyle))) {
-	    *input_style = (XIMStyle)p->value;
-	    return True;
-	}
-    }
-    return False;
-}
-
-#ifdef XIM_CONNECTABLE
-Private Bool
-_XimDelayModeCreateIC(ic, values, res, num)
-    Xic			 ic;
-    XIMArg		*values;
-    XIMResourceList	 res;
-    unsigned int	 num;
-{
-    Xim			 im = (Xim)ic->core.im;
-    XimDefICValues	 ic_values;
-    int			 len;
-    XIMStyle		 input_style;
-   
-    bzero((char *)&ic_values, sizeof(XimDefICValues));
-    _XimGetCurrentICValues(ic, &ic_values);
-    if (!(_XimGetInputStyle(values, &input_style)))
-	return False;
-
-    _XimSetICMode(res, num, input_style);
-
-    if(_XimSetICValueData(ic, (XPointer)&ic_values, res, num,
-					values, XIM_CREATEIC, False)) {
-	return False;
-    }
-    _XimSetCurrentICValues(ic, &ic_values);
-    if(!_XimSetICDefaults(ic, (XPointer)&ic_values,
-					XIM_SETICDEFAULTS, res, num)) {
-	return False;
-    }
-    ic_values.filter_events = KeyPressMask;
-    _XimSetCurrentICValues(ic, &ic_values);
-    _XimRegisterFilter(ic);
-
-    return True;
-}
-
-Public Bool
-_XimReconnectModeCreateIC(ic)
-    Xic			 ic;
-{
-    Xim			 im = (Xim)ic->core.im;
-    int			 len;
-    XIMStyle		 input_style = ic->core.input_style;
-    XIMResourceList	 res;
-    unsigned int	 num;
-
-    num = im->core.ic_num_resources;
-    len = sizeof(XIMResource) * num;
-    if (!(res = (XIMResourceList)Xmalloc(len)))
-	return False;
-    (void)memcpy((char *)res, (char *)im->core.ic_resources, len);
-    ic->private.proto.ic_resources     = res;
-    ic->private.proto.ic_num_resources = num;
-
-    _XimSetICMode(res, num, input_style);
-
-    ic->core.filter_events = KeyPressMask;
-
-    return True;
-}
-#endif /* XIM_CONNECTABLE */
-
-Public XIC
-_XimProtoCreateIC(xim, arg)
-    XIM			 xim;
-    XIMArg		*arg;
-{
-    Xim			 im = (Xim)xim;
-    Xic			 ic;
-    XimDefICValues	 ic_values;
-    XIMResourceList	 res;
-    unsigned int         num;
-    XIMStyle		 input_style;
-    INT16		 len;
-    CARD16		*buf_s;
-    char		*tmp;
-    CARD32		 tmp_buf32[BUFSIZE/4];
-    char		*tmp_buf = (char *)tmp_buf32;
-    char		*buf;
-    int			 buf_size;
-    char		*data;
-    int			 data_len;
-    int			 ret_len;
-    int			 total;
-    XIMArg		*arg_ret;
-    CARD32		 reply32[BUFSIZE/4];
-    char		*reply = (char *)reply32;
-    XPointer		 preply;
-    int			 ret_code;
-
-#ifdef XIM_CONNECTABLE
-    if (!IS_SERVER_CONNECTED(im) && !IS_CONNECTABLE(im))
-	return (XIC)NULL;
-#else
-    if (!IS_SERVER_CONNECTED(im))
-	return (XIC)NULL;
-#endif /* XIM_CONNECTABLE */
-
-    if (!(_XimGetInputStyle(arg, &input_style)))
-	return (XIC)NULL;
-
-    if ((ic = (Xic)Xmalloc(sizeof(XicRec))) == (Xic)NULL)
-	return (XIC)NULL;
-
-    bzero((char *)ic, sizeof(XicRec));
-    ic->methods = &ic_methods;
-    ic->core.im = (XIM)im;
-    ic->core.input_style = input_style;
-
-    num = im->core.ic_num_resources;
-    len = sizeof(XIMResource) * num;
-    if (!(res = (XIMResourceList)Xmalloc(len)))
-	return (XIC)NULL;
-    (void)memcpy((char *)res, (char *)im->core.ic_resources, len);
-    ic->private.proto.ic_resources     = res;
-    ic->private.proto.ic_num_resources = num;
-
-#ifdef XIM_CONNECTABLE
-    if (!_XimSaveICValues(ic, arg))
-	return False;
-
-    if (!IS_SERVER_CONNECTED(im)) {
-	if (!_XimConnectServer(im)) {
-	    if (_XimDelayModeCreateIC(ic, arg, res, num)) {
-		return (XIC)ic;
-	    }
-	    goto ErrorOnCreatingIC;
-	}
-    }
-#endif /* XIM_CONNECTABLE */
-
-    ic->core.filter_events = im->private.proto.forward_event_mask;
-    ic->private.proto.forward_event_mask =
-				im->private.proto.forward_event_mask;
-    ic->private.proto.synchronous_event_mask =
-				im->private.proto.synchronous_event_mask;
-
-    num = im->private.proto.ic_num_inner_resources;
-    len = sizeof(XIMResource) * num;
-    if (!(res = (XIMResourceList)Xmalloc(len)))
-	 return (XIC)NULL;
-    (void)memcpy((char *)res,
-			 (char *)im->private.proto.ic_inner_resources, len);
-    ic->private.proto.ic_inner_resources     = res;
-    ic->private.proto.ic_num_inner_resources = num;
-
-    _XimSetICMode(ic->private.proto.ic_resources,
-			ic->private.proto.ic_num_resources, input_style);
-
-    _XimSetICMode(ic->private.proto.ic_inner_resources,
-			ic->private.proto.ic_num_inner_resources, input_style);
-
-    _XimGetCurrentICValues(ic, &ic_values);
-    buf = tmp_buf;
-    buf_size = XIM_HEADER_SIZE + sizeof(CARD16) + sizeof(INT16);
-    data_len = BUFSIZE - buf_size;
-    total = 0;
-    arg_ret = arg;
-    for (;;) {
-	data = &buf[buf_size];
-	if (_XimEncodeICATTRIBUTE(ic, ic->private.proto.ic_resources,
-		ic->private.proto.ic_num_resources, arg, &arg_ret, data,
-		data_len, &ret_len, (XPointer)&ic_values, 0, XIM_CREATEIC)) {
-	    goto ErrorOnCreatingIC;
-	}
-
-	total += ret_len;
-	if (!(arg = arg_ret)) {
-	    break;
-	}
-
-	buf_size += ret_len;
-	if (buf == tmp_buf) {
-	    if (!(tmp = (char *)Xmalloc(buf_size + data_len))) {
-	        goto ErrorOnCreatingIC;
-	    }
-	    memcpy(tmp, buf, buf_size);
-	    buf = tmp;
-	} else {
-	    if (!(tmp = (char *)Xrealloc(buf, (buf_size + data_len)))) {
-		Xfree(buf);
-	        goto ErrorOnCreatingIC;
-	    }
-	    buf = tmp;
-	}
-    }
-    _XimSetCurrentICValues(ic, &ic_values);
-
-    if (!(_XimCheckCreateICValues(ic->private.proto.ic_resources,
-					ic->private.proto.ic_num_resources)))
-	goto ErrorOnCreatingIC;
-
-    _XimRegisterFilter(ic);
-
-    buf_s = (CARD16 *)&buf[XIM_HEADER_SIZE];
-    buf_s[0] = im->private.proto.imid;
-    buf_s[1] = (INT16)total;
-
-    len = (INT16)(sizeof(CARD16) + sizeof(INT16) + total);
-    _XimSetHeader((XPointer)buf, XIM_CREATE_IC, 0, &len);
-    if (!(_XimWrite(im, len, (XPointer)buf))) {
-	if (buf != tmp_buf)
-	    Xfree(buf);
-	goto ErrorOnCreatingIC;
-    }
-    _XimFlush(im);
-    if (buf != tmp_buf)
-	Xfree(buf);
-    ic->private.proto.waitCallback = True;
-    buf_size = BUFSIZE;
-    ret_code = _XimRead(im, &len, (XPointer)reply, buf_size,
-						 _XimCreateICCheck, 0);
-    if(ret_code == XIM_TRUE) {
-	preply = reply;
-    } else if(ret_code == XIM_OVERFLOW) {
-	if(len <= 0) {
-	    preply = reply;
-	} else {
-	    buf_size = (int)len;
-	    preply = (XPointer)Xmalloc(buf_size);
-	    ret_code = _XimRead(im, &len, preply, buf_size,
-						 _XimCreateICCheck, 0);
-	    if(ret_code != XIM_TRUE) {
-		Xfree(preply);
-		ic->private.proto.waitCallback = False;
-		goto ErrorOnCreatingIC;
-	    }
-	}
-    } else {
-	ic->private.proto.waitCallback = False;
-	goto ErrorOnCreatingIC;
-    }
-    ic->private.proto.waitCallback = False;
-    buf_s = (CARD16 *)((char *)preply + XIM_HEADER_SIZE);
-    if (*((CARD8 *)preply) == XIM_ERROR) {
-	_XimProcError(im, 0, (XPointer)&buf_s[3]);
-	if(reply != preply)
-	    Xfree(preply);
-	goto ErrorOnCreatingIC;
-    }
-
-    ic->private.proto.icid = buf_s[1];		/* icid */
-    if(reply != preply)
-	    Xfree(preply);
-    MARK_IC_CONNECTED(ic);
-    return (XIC)ic;
-
-ErrorOnCreatingIC:
-    if (ic->private.proto.ic_resources)
-	Xfree(ic->private.proto.ic_resources);
-    if (ic->private.proto.ic_inner_resources)
-	Xfree(ic->private.proto.ic_inner_resources);
-    Xfree(ic);
-    return (XIC)NULL;
-}
diff --git a/xc/lib/X11/imDefIm.c b/xc/lib/X11/imDefIm.c
deleted file mode 100644
index 86a379f24..000000000
--- a/xc/lib/X11/imDefIm.c
+++ /dev/null
@@ -1,2027 +0,0 @@
-/* $XConsortium: imDefIm.c /main/19 1996/01/21 15:11:43 kaleb $ */
-/******************************************************************
-         Copyright 1990, 1991, 1992 by Sun Microsystems, Inc.
-         Copyright 1992, 1993, 1994 by FUJITSU LIMITED
-         Copyright 1993, 1994 by Sony Corporation
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation, and
-that the name of Sun Microsystems, Inc., FUJITSU LIMITED and Sony
-Corporation not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior permission.
-Sun Microsystems, Inc., FUJITSU LIMITED and Sony Corporation makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty. 
-
-Sun Microsystems Inc., FUJITSU LIMITED AND SONY CORPORATION DISCLAIMS ALL
-WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL Sun Microsystems, Inc.,
-FUJITSU LIMITED AND SONY CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-OF THIS SOFTWARE. 
-
-  Author: Hideki Hiura (hhiura@Sun.COM) Sun Microsystems, Inc.
-          Takashi Fujiwara     FUJITSU LIMITED 
-                               fujiwara@a80.tech.yk.fujitsu.co.jp
-          Makoto Wakamatsu     Sony Corporation
-                               makoto@sm.sony.co.jp
-
-******************************************************************/
-/* $XFree86: xc/lib/X11/imDefIm.c,v 1.3 1999/08/01 07:56:52 dawes Exp $ */
-
-#include <X11/Xatom.h>
-#define NEED_EVENTS
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "XlcPublic.h"
-#include "XimTrInt.h"
-#include "Ximint.h"
-
-
-/* EXTERNS */
-/* imTransR.c */
-extern Bool _XimRegisterDispatcher();
-
-Public int
-_XimCheckDataSize(buf, len)
-    XPointer	 buf;
-    int		 len;
-{
-    CARD16	*buf_s = (CARD16 *)buf;
-
-    if(len < XIM_HEADER_SIZE)
-	return -1;
-    return  buf_s[1];
-}
-
-Public void
-#if NeedFunctionPrototypes
-_XimSetHeader(
-    XPointer	 buf,
-    CARD8	 major_opcode,
-    CARD8	 minor_opcode,
-    INT16	*len
-)
-#else
-_XimSetHeader(buf, major_opcode, minor_opcode, len)
-    XPointer	 buf;
-    CARD8	 major_opcode;
-    CARD8	 minor_opcode;
-    INT16	*len;
-#endif /* NeedFunctionPrototypes */
-{
-    CARD8	*buf_b = (CARD8 *)buf;
-    CARD16	*buf_s = (CARD16 *)buf;
-
-    buf_b[0] = major_opcode;
-    buf_b[1] = minor_opcode;
-    buf_s[1] = ((*len) / 4);
-    *len += XIM_HEADER_SIZE;
-    return;
-}
-
-Private char
-_XimGetMyEndian()
-{
-    CARD16	 test_card = 1;
-
-    if(*((char *)&test_card))
-	return LITTLEENDIAN;
-    else
-	return BIGENDIAN;
-}
-
-Private Bool
-_XimCheckServerName(im, str)
-    Xim		   im;
-    char	  *str;
-{
-    char	  *server_name = im->core.im_name;
-    int		   len;
-    int		   str_len;
-    int		   category_len = strlen(XIM_SERVER_CATEGORY);
-    char	  *pp;
-    register char *p;
-
-    if(server_name && *server_name)
-	len = strlen(server_name);
-    else
-	return True;
-
-    if((int)strlen(str) < category_len)
-	return False;
-
-    if(strncmp(str, XIM_SERVER_CATEGORY, category_len))
-	return False;
- 
-    pp = &str[category_len];
-
-    for(;;) {
-	for(p = pp; (*p != ',') && (*p); p++);
-	str_len = (int)(p - pp);
-
-	if((len == str_len) && (!strncmp(pp, server_name, len)))
-	    break;
-	if(!(*p))
-	    return False;
-	pp = p + 1;
-    }
-    return True;
-}
-
-Private char *
-_XimCheckLocaleName(im, address, address_len, locale_name, len)
-    Xim		   im;
-    char	  *address;
-    int		   address_len;
-    char	  *locale_name[];
-    int		   len;
-{
-    int		   category_len;
-    char	  *pp;
-    register char *p;
-    register int   n;
-    Bool           finish = False;
-
-    category_len = strlen(XIM_LOCAL_CATEGORY);
-    if(address_len < category_len)
-	return (char*)NULL;
-
-    if(strncmp(address, XIM_LOCAL_CATEGORY, category_len))
-	return (char*)NULL;
- 
-    pp = &address[category_len];
-
-    for(;;) {
-	for( p = pp; *p && *p != ','; p++);
-	if (!*p)
-	    finish = True;
-	address_len = (int)(p - pp);
-	*p = '\0';
-
-	for( n = 0; n < len; n++ )
-	    if( locale_name[n] && !strcmp( pp, locale_name[n] ) )
-		return locale_name[n];
-	if (finish)
-	    break;
-	pp = p + 1;
-    }
-    return (char *)NULL;
-}
-
-Private Bool
-_XimCheckTransport(address, address_len, transport, len, trans_addr)
-    char	  *address;
-    int		   address_len;
-    char	  *transport;
-    int		   len;
-    char	 **trans_addr;
-{
-    int		   category_len = strlen(XIM_TRANSPORT_CATEGORY);
-    char	  *pp;
-    register char *p;
-
-    if(address_len < category_len)
-	return False;
-
-    if(strncmp(address, XIM_TRANSPORT_CATEGORY, category_len))
-	return False;
- 
-    pp = &address[category_len];
-
-    for(;;) {
-	*trans_addr = pp;
-
-	for(p = pp; (*p != '/') && (*p != ',') && (*p); p++);
-	if(*p == ',') {
-	    pp = p + 1;
-	    continue;
-	}
-	if(!(*p))
-	    return False;
-
-	address_len = (int)(p - pp);
-
-	if((len == address_len) && (!strncmp(pp, transport, len)))
-	    break;
-	pp = p + 1;
-    }
-    pp = p + 1;
-    for(p = pp; (*p != ',') && (*p); p++);
-    if (*p)
-	*p = '\0';
-    return True;
-}
-
-Private Bool
-_CheckSNEvent(display, xevent, arg)
-    Display		*display;
-    XEvent		*xevent;
-    XPointer		 arg;
-{
-    XSelectionEvent	*event = (XSelectionEvent *)xevent;
-    Window		 window = *(Window*)arg;
-
-    if((event->type == SelectionNotify) && (window == event->requestor))
-	return True;
-    return False;
-}
-
-Private Bool
-_XimGetSelectionNotify(display, window, target, ret_address)
-    Display		 *display;
-    Window		  window;
-    Atom		  target;
-    char		**ret_address;
-{
-    XEvent		  event;
-    XSelectionEvent	 *ev = (XSelectionEvent *)&event;
-    Atom		  actual_type;
-    int			  actual_format;
-    unsigned long	  nitems, bytes_after;
-
-    for(;;) {
-	XIfEvent(display, &event, _CheckSNEvent, (XPointer)&window);
-	if((ev->type == SelectionNotify) && (window == ev->requestor))
-	    break;
-    }
-
-    if(ev->property == (Atom)None)
-	return False;
-    if( XGetWindowProperty( display, window, target, 0L, 1000000L,
-			    True, target, &actual_type, &actual_format,
-			    &nitems, &bytes_after,
-			    (unsigned char **)&*ret_address ) != Success )
-	return False;
-    return True;
-}
-
-Private Bool
-_XimPreConnectionIM(im, selection)
-    Xim			 im;
-    Atom		 selection;
-{
-    Display		*display = im->core.display; 
-    Atom		 locales, transport;
-    char		*address;
-    XLCd		 lcd;
-    char		*language;
-    char		*territory;
-    char		*codeset;
-    char		*trans_addr;
-    char		*locale_name[4], *locale;
-    int			 llen, tlen, clen;
-    register int	 i;
-    Window		 window;
-    char		*str;
-
-    if(!(lcd = im->core.lcd))
-	return False;
-
-    for( i = 0; i < 4; i++ )
-	locale_name[i] = NULL;
-    /* requestor window */
-    if(!(window = XCreateSimpleWindow(display, DefaultRootWindow(display),
-			 				0, 0, 1, 1, 1, 0, 0)))
-	return False;
-
-    /* server name check */
-    if( !(str = XGetAtomName( display, selection )) )
-	return False;
-    if(!_XimCheckServerName(im, str)) {
-	XFree( (XPointer)str );
-	goto Error;
-    }
-    XFree( (XPointer)str );
-
-    /* locale name check */
-    _XGetLCValues(lcd, XlcNLanguage, &language, XlcNTerritory, &territory,
-                    XlcNCodeset, &codeset, NULL);
-    llen = strlen( language );
-    tlen = territory ? strlen( territory ): 0;
-    clen = codeset ? strlen( codeset ): 0;
-
-    if( tlen != 0  &&  clen != 0 ) {
-	if( (locale_name[0] = Xmalloc(llen+tlen+clen+3)) != NULL )
-	    sprintf( locale_name[0], "%s_%s.%s", language, territory, codeset );
-    }
-    if( clen != 0 ) {
-	if( (locale_name[1] = Xmalloc(llen+clen+2)) != NULL )
-	    sprintf( locale_name[1], "%s.%s", language, codeset );
-	else
-	    goto Error;
-    }
-    if( tlen != 0 ) {
-	if( (locale_name[2] = Xmalloc(llen+tlen+2)) != NULL )
-	    sprintf( locale_name[2], "%s_%s", language, territory );
-	else
-	    goto Error;
-    }
-    if( (locale_name[3] = Xmalloc(llen+1)) != NULL )
-	strcpy( locale_name[3], language );
-    else
-	goto Error;
-    if((locales = XInternAtom(display, XIM_LOCALES, True)) == (Atom)None)
-	goto Error;
-
-    XConvertSelection(display, selection, locales, locales, window,
-		      CurrentTime);
-    if(!(_XimGetSelectionNotify(display, window, locales, &address)))
-	goto Error;
-
-    if((locale = _XimCheckLocaleName(im, address, strlen(address), locale_name,
-				     4)) == NULL) {
-	XFree((XPointer)address);
-	goto Error;
-    }
-    im->private.proto.locale_name = locale;
-    for( i = 0; i < 4; i++ ) {
-	if( locale_name[i] != NULL  &&  locale_name[i] != locale ) {
-	    XFree( locale_name[i] );
-	    locale_name[i] = NULL;
-	}
-    }
-    XFree((XPointer)address);
-
-    /* transport check */
-    if((transport = XInternAtom(display, XIM_TRANSPORT, True)) == (Atom)None)
-	goto Error;
-
-    XConvertSelection(display, selection, transport, transport, window,
-		      CurrentTime);
-    if(!_XimGetSelectionNotify(display, window, transport, &address))
-	goto Error;
-
-    for(i = 0; _XimTransportRec[i].transportname ; i++) {
-	if( _XimCheckTransport(address, strlen(address),
-				_XimTransportRec[i].transportname,
-				strlen(_XimTransportRec[i].transportname),
-				 &trans_addr)) {
-	    if( _XimTransportRec[i].config(im, trans_addr) ) {
-		XFree((XPointer)address);
-		XDestroyWindow(display, window);
-		return True;
-	    }
-	}
-    }
-
-    XFree((XPointer)address);
-Error:
-    for( i = 0; i < 4; i++ )
-	if( locale_name[i] != NULL )
-	    XFree( locale_name[i] );
-    XDestroyWindow(display, window);
-    return False; 
-}
-
-Private Bool
-_XimPreConnect(im)
-    Xim		    im;
-{
-    Display	   *display = im->core.display; 
-    Atom	    imserver;
-    Atom	    actual_type;
-    int		    actual_format;
-    unsigned long   nitems;
-    unsigned long   bytes_after;
-    unsigned char  *prop_return;
-    Atom	   *atoms;
-    Window	    im_window;
-    register int    i;
-
-    if((imserver = XInternAtom(display, XIM_SERVERS, True)) == (Atom)None)
-	return False;
-
-    if(XGetWindowProperty(display, RootWindow(display, 0),
-			imserver, 0L, 1000000L, False, XA_ATOM, &actual_type, 
-			&actual_format, &nitems, &bytes_after,
-			&prop_return) != Success)
-	return False;
-
-    if( (actual_type != XA_ATOM) || (actual_format != 32) ) {
-	if( nitems )
-	    XFree((XPointer)prop_return);
-	return False;
-    }
-
-    atoms = (Atom *)prop_return;
-    for(i = 0; i < nitems; i++) {
-	if((im_window = XGetSelectionOwner(display, atoms[i])) == (Window)None)
-	    continue;
-
-	if(_XimPreConnectionIM(im, atoms[i]))
-	    break;
-    }
-
-    XFree((XPointer)prop_return);
-    if(i >= nitems)
-	return False;
-
-    im->private.proto.im_window = im_window;
-    return True;
-}
-
-Private Bool
-_XimGetAuthProtocolNames(im, buf, num, len)
-    Xim		 im;
-    CARD16	*buf;
-    CARD8	*num;
-    INT16	*len;
-{
-    if (!IS_USE_AUTHORIZATION_FUNC(im)) {
-	*num = 0;
-	*len = 0;
-	return True;
-    }
-    /*
-     * Not yet
-     */
-    return True;
-}
-
-Private Bool
-_XimSetAuthReplyData(im, buf, len)
-    Xim		 im;
-    XPointer	 buf;
-    INT16	*len;
-{
-    /*
-     * Not yet
-     */
-    *len = 0;
-    return True;
-}
-
-Private Bool
-_XimSetAuthNextData(im, buf, len)
-    Xim		 im;
-    XPointer	 buf;
-    INT16	*len;
-{
-    /*
-     * Not yet
-     */
-    *len = 0;
-    return True;
-}
-
-Private Bool
-_XimSetAuthRequiredData(im, buf, len)
-    Xim		 im;
-    XPointer	 buf;
-    INT16	*len;
-{
-    /*
-     * Not yet
-     */
-    *len = 0;
-    return True;
-}
-
-Private Bool
-_XimCheckAuthSetupData(im, buf)
-    Xim		 im;
-    XPointer	 buf;
-{
-    /*
-     * Not yet
-     */
-    return True;
-}
-
-Private Bool
-_XimCheckAuthNextData(im, buf)
-    Xim		 im;
-    XPointer	 buf;
-{
-    /*
-     * Not yet
-     */
-    return True;
-}
-
-#define	NO_MORE_AUTH	2
-#define	GOOD_AUTH	1
-#define	BAD_AUTH	0
-
-Private int
-_XimClientAuthCheck(im, buf)
-    Xim		 im;
-    XPointer	 buf;
-{
-    /*
-     * Not yet
-     */
-    return NO_MORE_AUTH;
-}
-
-Private void
-_XimAuthNG(im)
-    Xim		 im;
-{
-    CARD32	 buf32[BUFSIZE/4];
-    CARD8	*buf = (CARD8 *)buf32;
-    INT16	 len = 0;
-
-    _XimSetHeader((XPointer)buf, XIM_AUTH_NG, 0, &len);
-    (void)_XimWrite(im, len, (XPointer)buf);
-    _XimFlush(im);
-    return;
-}
-
-Private	Bool
-#if NeedFunctionPrototypes
-_XimAllRecv(
-    Xim		 im,
-    INT16	 len,
-    XPointer	 data,
-    XPointer	 arg)
-#else
-_XimAllRecv(im, len, data, arg)
-    Xim		 im;
-    INT16	 len;
-    XPointer	 data;
-    XPointer	 arg;
-#endif
-{
-    return True;
-}
-
-#define	CLIENT_WAIT1		1
-#define	CLIENT_WAIT2		2
-
-Private Bool
-_XimConnection(im)
-    Xim		 im;
-{
-    CARD32	 buf32[BUFSIZE/4];
-    CARD8	*buf = (CARD8 *)buf32;
-    CARD8	*buf_b = &buf[XIM_HEADER_SIZE];
-    CARD16	*buf_s = (CARD16 *)((XPointer)buf_b);
-    INT16	 len;
-    CARD8	 num;
-    CARD32	 reply32[BUFSIZE/4];
-    char	*reply = (char *)reply32;
-    XPointer	 preply;
-    int		 buf_size;
-    int		 ret_code;
-    CARD8	 major_opcode;
-    int		 wait_mode;
-    int		 ret;
-
-    if(!(_XimConnect(im)))	/* Transport Connect */
-	return False;
-
-    if(!_XimDispatchInit(im))
-	return False;
-
-    _XimRegProtoIntrCallback(im, XIM_ERROR, 0, _XimErrorCallback, (XPointer)im);
-
-    if(!_XimGetAuthProtocolNames(im, &buf_s[4], &num, &len))
-	return False;
-
-    im->private.proto.protocol_major_version = PROTOCOLMAJORVERSION;
-    im->private.proto.protocol_minor_version = PROTOCOLMINORVERSION;
-
-    buf_b[0] = _XimGetMyEndian();
-    buf_b[1] = 0;
-    buf_s[1] = PROTOCOLMAJORVERSION;
-    buf_s[2] = PROTOCOLMINORVERSION;
-    buf_s[3] = num;
-    len  += sizeof(CARD8)
-          + sizeof(CARD8)
-          + sizeof(CARD16)
-          + sizeof(CARD16)
-          + sizeof(CARD16);
-
-    major_opcode = XIM_CONNECT;
-    wait_mode = (IS_USE_AUTHORIZATION_FUNC(im)) ? CLIENT_WAIT1 : CLIENT_WAIT2;
-
-    for(;;) {
-	_XimSetHeader((XPointer)buf, major_opcode, 0, &len);
-	if (!(_XimWrite(im, len, (XPointer)buf)))
-	    return False;
-	_XimFlush(im);
-	buf_size = BUFSIZE;
-	ret_code = _XimRead(im, &len, reply, buf_size, _XimAllRecv, 0);
-	if(ret_code == XIM_TRUE) {
-	    preply = reply;
-	} else if(ret_code == XIM_OVERFLOW) {
-	    if(len <= 0) {
-		preply = reply;
-	    } else {
-		buf_size = len;
-		preply = (XPointer)Xmalloc(buf_size);
-		ret_code = _XimRead(im, &len, preply, buf_size, _XimAllRecv, 0);
-		if(ret_code != XIM_TRUE) {
-		    Xfree(preply);
-		    return False;
-		}
-	    }
-	} else
-	    return False;
-
-	major_opcode = *((CARD8 *)preply);
-	buf_s = (CARD16 *)((char *)preply + XIM_HEADER_SIZE);
-
-	if (wait_mode == CLIENT_WAIT1) {
-	    if (major_opcode == XIM_AUTH_REQUIRED) {
-		ret = _XimClientAuthCheck(im, (XPointer)buf_s);
-		if(reply != preply)
-		    Xfree(preply);
-		if (ret == NO_MORE_AUTH) {
-		    if (!(_XimSetAuthReplyData(im,
-				(XPointer)&buf[XIM_HEADER_SIZE], &len))) {
-			_XimAuthNG(im);
-			return False;
-		    }
-		    major_opcode = XIM_AUTH_REPLY;
-		    wait_mode = CLIENT_WAIT2;
-		} else if (ret == GOOD_AUTH) {
-		    if (!(_XimSetAuthNextData(im,
-				(XPointer)&buf[XIM_HEADER_SIZE], &len))) {
-			_XimAuthNG(im);
-			return False;
-		    }
-		    major_opcode = XIM_AUTH_NEXT;
-		} else {	/* BAD_AUTH */
-		    _XimAuthNG(im);
-		    return False;
-		}
-	    } else {
-		if(reply != preply)
-		    Xfree(preply);
-		_XimAuthNG(im);
-		return False;
-	    }
-	} else {	/* CLIENT_WAIT2 */
-	    if (major_opcode == XIM_CONNECT_REPLY) {
-		break;
-	    } else if (major_opcode == XIM_AUTH_SETUP) {
-		if (!(_XimCheckAuthSetupData(im, (XPointer)buf_s))) {
-		    _XimAuthNG(im);
-		    return False;
-		}
-		if(reply != preply)
-		    Xfree(preply);
-		if (!(_XimSetAuthRequiredData(im,
-				(XPointer)&buf[XIM_HEADER_SIZE], &len))) {
-		    _XimAuthNG(im);
-		    return False;
-		}
-		major_opcode = XIM_AUTH_REQUIRED;
-	    } else if (major_opcode == XIM_AUTH_NEXT) {
-		if (!(_XimCheckAuthNextData(im, (XPointer)buf_s))) {
-		    _XimAuthNG(im);
-		    return False;
-		}
-		if(reply != preply)
-		    Xfree(preply);
-		if (!(_XimSetAuthRequiredData(im,
-				(XPointer)&buf[XIM_HEADER_SIZE], &len))) {
-		    _XimAuthNG(im);
-		    return False;
-		}
-		major_opcode = XIM_AUTH_REQUIRED;
-	    } else if (major_opcode == XIM_AUTH_NG) {
-		if(reply != preply)
-		    Xfree(preply);
-		return False;
-	    } else {
-		_XimAuthNG(im);
-		if(reply != preply)
-		    Xfree(preply);
-		return False;
-	    }
-	}
-    }
-
-    if (!( buf_s[0] == im->private.proto.protocol_major_version 
-        && buf_s[1] == im->private.proto.protocol_minor_version)) {
-	if(reply != preply)
-	    Xfree(preply);
-	return False;
-    }
-    if(reply != preply)
-	Xfree(preply);
-    MARK_SERVER_CONNECTED(im);
-
-    _XimRegProtoIntrCallback(im, XIM_REGISTER_TRIGGERKEYS, 0,
-				 _XimRegisterTriggerKeysCallback, (XPointer)im);
-    return True;
-}
-
-Private	Bool
-#if NeedFunctionPrototypes
-_XimDisconnectCheck(
-    Xim		 im,
-    INT16	 len,
-    XPointer	 data,
-    XPointer	 arg)
-#else
-_XimDisconnectCheck(im, len, data, arg)
-    Xim		 im;
-    INT16	 len;
-    XPointer	 data;
-    XPointer	 arg;
-#endif
-{
-    CARD8	 major_opcode = *((CARD8 *)data);
-    CARD8	 minor_opcode = *((CARD8 *)data + 1);
-
-    if ((major_opcode == XIM_DISCONNECT_REPLY)
-     && (minor_opcode == 0))
-	return True;
-    if ((major_opcode == XIM_ERROR)
-     && (minor_opcode == 0))
-	return True;
-    return False;
-}
-
-Private Bool
-_XimDisconnect(im)
-    Xim		 im;
-{
-    CARD32	 buf32[BUFSIZE/4];
-    CARD8	*buf = (CARD8 *)buf32;
-    INT16	 len = 0;
-    CARD32	 reply32[BUFSIZE/4];
-    char	*reply = (char *)reply32;
-    XPointer	 preply;
-    int		 buf_size;
-    int		 ret_code;
-
-    if (IS_SERVER_CONNECTED(im)) {
-	_XimSetHeader((XPointer)buf, XIM_DISCONNECT, 0, &len);
-	if (!(_XimWrite(im, len, (XPointer)buf)))
-	    return False;
-	_XimFlush(im);
-	buf_size = BUFSIZE;
-	ret_code = _XimRead(im, &len, (XPointer)reply, buf_size,
-						_XimDisconnectCheck, 0);
-	if(ret_code == XIM_OVERFLOW) {
-	    if(len > 0) {
-		buf_size = len;
-		preply = (XPointer)Xmalloc(buf_size);
-		ret_code = _XimRead(im, &len, preply, buf_size,
-						 _XimDisconnectCheck, 0);
-		Xfree(preply);
-		if(ret_code != XIM_TRUE)
-		    return False;
-	    }
-	} else if(ret_code == XIM_FALSE)
-	    return False;
-
-    }
-    if (!(_XimShutdown(im)))	/* Transport shutdown */
-	return False;
-    return True;
-}
-
-Private	Bool
-#if NeedFunctionPrototypes
-_XimOpenCheck(
-    Xim		 im,
-    INT16	 len,
-    XPointer	 data,
-    XPointer	 arg)
-#else
-_XimOpenCheck(im, len, data, arg)
-    Xim		 im;
-    INT16	 len;
-    XPointer	 data;
-    XPointer	 arg;
-#endif
-{
-    CARD8	 major_opcode = *((CARD8 *)data);
-    CARD8	 minor_opcode = *((CARD8 *)data + 1);
-
-    if ((major_opcode == XIM_OPEN_REPLY)
-     && (minor_opcode == 0))
-	return True;
-    if ((major_opcode == XIM_ERROR)
-     && (minor_opcode == 0))
-	return True;
-    return False;
-}
-
-Private Bool
-_XimOpen(im)
-    Xim			 im;
-{
-    CARD32		 buf32[BUFSIZE/4];
-    CARD8		*buf = (CARD8 *)buf32;
-    CARD8		*buf_b = &buf[XIM_HEADER_SIZE];
-    CARD16		*buf_s;
-    INT16		 len;
-    CARD32		 reply32[BUFSIZE/4];
-    char		*reply = (char *)reply32;
-    XPointer		 preply;
-    int			 buf_size;
-    int			 ret_code;
-    char		*locale_name;
-
-    locale_name = im->private.proto.locale_name;
-    len = strlen(locale_name);
-    buf_b[0] = (BYTE)len;			   /* length of locale name */
-    (void)strcpy((char *)&buf_b[1], locale_name);  /* locale name */
-    len += sizeof(BYTE);			   /* sizeof length */
-    XIM_SET_PAD(buf_b, len);			   /* pad */
-
-    _XimSetHeader((XPointer)buf, XIM_OPEN, 0, &len);
-    if (!(_XimWrite(im, len, (XPointer)buf)))
-	return False;
-    _XimFlush(im);
-    buf_size = BUFSIZE;
-    ret_code = _XimRead(im, &len, reply, buf_size,
-					_XimOpenCheck, 0);
-    if(ret_code == XIM_TRUE) {
-	preply = reply;
-    } else if(ret_code == XIM_OVERFLOW) {
-	if(len <= 0) {
-	    preply = reply;
-	} else {
-	    buf_size = len;
-	    preply = (XPointer)Xmalloc(buf_size);
-	    ret_code = _XimRead(im, &len, preply, buf_size,
-					_XimOpenCheck, 0);
-	    if(ret_code != XIM_TRUE) {
-		Xfree(preply);
-		return False;
-	    }
-	}
-    } else
-	return False;
-    buf_s = (CARD16 *)((char *)preply + XIM_HEADER_SIZE);
-    if (*((CARD8 *)preply) == XIM_ERROR) {
-	_XimProcError(im, 0, (XPointer)&buf_s[3]);
-	if(reply != preply)
-	    Xfree(preply);
-	return False;
-    }
-
-    im->private.proto.imid = buf_s[0];		/* imid */
-
-    if (!(_XimGetAttributeID(im, &buf_s[1]))) {
-	if(reply != preply)
-	    Xfree(preply);
-	return False;
-    }
-    if(reply != preply)
-	Xfree(preply);
-
-    if (!(_XimSetInnerIMResourceList(&(im->private.proto.im_inner_resources),
-				&(im->private.proto.im_num_inner_resources))))
-	return False;
-
-    if (!(_XimSetInnerICResourceList(&(im->private.proto.ic_inner_resources),
-				&(im->private.proto.ic_num_inner_resources))))
-	return False;
-
-    _XimSetIMMode(im->core.im_resources, im->core.im_num_resources);
-    _XimSetIMMode(im->private.proto.im_inner_resources,
-				im->private.proto.im_num_inner_resources);
-
-    /* Transport Callbak */
-    _XimRegProtoIntrCallback(im, XIM_SET_EVENT_MASK, 0,
-				 _XimSetEventMaskCallback, (XPointer)im);
-    _XimRegProtoIntrCallback(im, XIM_FORWARD_EVENT, 0,
-				 _XimForwardEventCallback, (XPointer)im);
-    _XimRegProtoIntrCallback(im, XIM_COMMIT, 0,
-				 _XimCommitCallback, (XPointer)im);
-    _XimRegProtoIntrCallback(im, XIM_SYNC, 0,
-				 _XimSyncCallback, (XPointer)im);
-
-    if(!_XimExtension(im))
-	return False;
-
-    /* register a hook for callback protocols */
-    _XimRegisterDispatcher(im, _XimCbDispatch, (XPointer)im);
-
-    return True;
-}
-
-Private	Bool
-#if NeedFunctionPrototypes
-_XimCloseCheck(
-    Xim		 im,
-    INT16	 len,
-    XPointer	 data,
-    XPointer	 arg)
-#else
-_XimCloseCheck(im, len, data, arg)
-    Xim		 im;
-    INT16	 len;
-    XPointer	 data;
-    XPointer	 arg;
-#endif
-{
-    CARD16	*buf_s = (CARD16 *)((CARD8 *)data + XIM_HEADER_SIZE);
-    CARD8	 major_opcode = *((CARD8 *)data);
-    CARD8	 minor_opcode = *((CARD8 *)data + 1);
-    XIMID	 imid = buf_s[0];
-
-    if ((major_opcode == XIM_CLOSE_REPLY)
-     && (minor_opcode == 0)
-     && (imid == im->private.proto.imid))
-	return True;
-    if ((major_opcode == XIM_ERROR)
-     && (minor_opcode == 0)
-     && (buf_s[2] & XIM_IMID_VALID)
-     && (imid == im->private.proto.imid))
-	return True;
-    return False;
-}
-
-Private Bool
-_XimClose(im)
-    Xim		 im;
-{
-    CARD32	 buf32[BUFSIZE/4];
-    CARD8	*buf = (CARD8 *)buf32;
-    CARD16	*buf_s = (CARD16 *)&buf[XIM_HEADER_SIZE];
-    INT16	 len;
-    CARD32	 reply32[BUFSIZE/4];
-    char	*reply = (char *)reply32;
-    XPointer	 preply;
-    int		 buf_size;
-    int		 ret_code;
-
-    if (!IS_SERVER_CONNECTED(im))
-	return True;
-
-    buf_s[0] = im->private.proto.imid;		/* imid */
-    buf_s[1] = 0;				/* unused */
-    len = sizeof(CARD16)			/* sizeof imid */
-        + sizeof(CARD16);			/* sizeof unused */
-  
-    _XimSetHeader((XPointer)buf, XIM_CLOSE, 0, &len);
-    if (!(_XimWrite(im, len, (XPointer)buf)))
-	return False;
-    _XimFlush(im);
-    buf_size = BUFSIZE;
-    ret_code = _XimRead(im, &len, (XPointer)reply, buf_size,
-						_XimCloseCheck, 0);
-    if(ret_code == XIM_TRUE) {
-	preply = reply;
-    } else if(ret_code == XIM_OVERFLOW) {
-	if(len <= 0) {
-	    preply = reply;
-	} else {
-	    buf_size = len;
-	    preply = (XPointer)Xmalloc(buf_size);
-	    ret_code = _XimRead(im, &len, preply, buf_size, _XimCloseCheck, 0);
-	    if(ret_code != XIM_TRUE) {
-		Xfree(preply);
-		return False;
-	    }
-	}
-    } else
-	return False;
-    buf_s = (CARD16 *)((char *)preply + XIM_HEADER_SIZE);
-    if (*((CARD8 *)preply) == XIM_ERROR) {
-	_XimProcError(im, 0, (XPointer)&buf_s[3]);
-	if(reply != preply)
-	    Xfree(preply);
-	return False;
-    }
-
-    if(reply != preply)
-	Xfree(preply);
-    return True;
-}
-
-Public void
-_XimProtoIMFree(im)
-    Xim		  im;
-{
-    /* XIMPrivateRec */
-    if (im->private.proto.im_onkeylist) {
-	Xfree(im->private.proto.im_onkeylist);
-	im->private.proto.im_onkeylist = NULL;
-    }
-    if (im->private.proto.im_offkeylist) {
-	Xfree(im->private.proto.im_offkeylist);
-	im->private.proto.im_offkeylist = NULL;
-    }
-    if (im->private.proto.intrproto) {
-	_XimFreeProtoIntrCallback(im);
-	im->private.proto.intrproto = NULL;
-    }
-    if (im->private.proto.im_inner_resources) {
-	Xfree(im->private.proto.im_inner_resources);
-	im->private.proto.im_inner_resources = NULL;
-    }
-    if (im->private.proto.ic_inner_resources) {
-	Xfree(im->private.proto.ic_inner_resources);
-	im->private.proto.ic_inner_resources = NULL;
-    }
-    if (im->private.proto.hold_data) {
-	Xfree(im->private.proto.hold_data);
-	im->private.proto.hold_data = NULL;
-    }
-    if (im->private.proto.locale_name) {
-	Xfree(im->private.proto.locale_name);
-	im->private.proto.locale_name = NULL;
-    }
-    if (im->private.proto.ctom_conv) {
-	_XlcCloseConverter(im->private.proto.ctom_conv);
-	im->private.proto.ctom_conv = NULL;
-    }
-    if (im->private.proto.ctow_conv) {
-	_XlcCloseConverter(im->private.proto.ctow_conv);
-	im->private.proto.ctow_conv = NULL;
-    }
-
-#ifdef XIM_CONNECTABLE
-    if (!IS_SERVER_CONNECTED(im) && IS_RECONNECTABLE(im)) {
-	return;
-    }
-#endif /* XIM_CONNECTABLE */
-
-    if (im->private.proto.saved_imvalues) {
-        Xfree(im->private.proto.saved_imvalues);
-        im->private.proto.saved_imvalues = NULL;
-    }
-    if (im->private.proto.default_styles) {
-	Xfree(im->private.proto.default_styles);
-	im->private.proto.default_styles = NULL;
-    }
-
-    /* core */
-    if (im->core.res_name) {
-        Xfree(im->core.res_name);
-	im->core.res_name = NULL;
-    }
-    if (im->core.res_class) {
-        Xfree(im->core.res_class);
-	im->core.res_class = NULL;
-    }
-    if (im->core.im_values_list) {
-	Xfree(im->core.im_values_list);
-	im->core.im_values_list = NULL;
-    }
-    if (im->core.ic_values_list) {
-	Xfree(im->core.ic_values_list);
-	im->core.ic_values_list = NULL;
-    }
-    if (im->core.im_name) {
-	Xfree(im->core.im_name);
-	im->core.im_name = NULL;
-    }
-    if (im->core.styles) {
-	Xfree(im->core.styles);
-	im->core.styles = NULL;
-    }
-    if (im->core.im_resources) {
-        Xfree(im->core.im_resources);
-	im->core.im_resources = NULL;
-    }
-    if (im->core.ic_resources) {
-        Xfree(im->core.ic_resources);
-	im->core.ic_resources = NULL;
-    }
-
-    return;
-}
-
-Private Status
-_XimProtoCloseIM(xim)
-    XIM		 xim;
-{
-    Xim		 im = (Xim)xim;
-    XIC		 ic;
-    XIC		 next;
-    Status	 status;
-
-    ic = im->core.ic_chain;
-    while (ic) {
-	(*ic->methods->destroy) (ic);
-	next = ic->core.next;
-#ifdef XIM_CONNECTABLE
-	if (!(!IS_SERVER_CONNECTED(im) && IS_RECONNECTABLE(im))) {
-	    Xfree ((char *) ic);
-	}
-#else
-	Xfree ((char *) ic);
-#endif /* XIM_CONNECTABLE */
-	ic = next;
-    }
-    _XimUnregisterServerFilter(im);
-    _XimResetIMInstantiateCallback(im);
-    status = (Status)_XimClose(im);
-    status = (Status)_XimDisconnect(im) && status;
-    _XimProtoIMFree(im);
-#ifdef XIM_CONNECTABLE
-    if (!IS_SERVER_CONNECTED(im) && IS_RECONNECTABLE(im)) {
-	_XimReconnectModeSetAttr(im);
-        for (ic = im->core.ic_chain; ic; ic = ic->core.next) {
-	    _XimReconnectModeCreateIC(ic);
-        }
-	return 0;
-    }
-#endif /* XIM_CONNECTABLE */
-    _XimDestroyIMStructureList(im);
-    return status;
-}
-
-Private Bool
-_XimCheckIMQuarkList(quark_list, num_quark, quark)
-    XrmQuark		*quark_list;
-    int			 num_quark;
-    XrmQuark		 quark;
-{
-    register int	 i;
-
-    for (i = 0; i < num_quark; i++) {
-	if (quark_list[i] == quark) {
-	    return True;
-	}
-    }
-    return False;
-}
-
-#ifdef XIM_CONNECTABLE
-Private Bool
-_XimSaveIMValues(im, arg)
-    Xim			 im;
-    XIMArg		*arg;
-{
-    register XIMArg	*p;
-    register int	 n;
-    XrmQuark		*quark_list;
-    XrmQuark		*tmp;
-    XrmQuark		 quark;
-    int			 num_quark;
-
-    if (quark_list = im->private.proto.saved_imvalues) {
-	num_quark = im->private.proto.num_saved_imvalues;
-	for (p = arg; p && p->name; p++) {
-	    quark = XrmStringToQuark(p->name);
-	    if (_XimCheckIMQuarkList(quark_list, num_quark, quark)) {
-		continue;
-	    }
-	    if (!(tmp = (XrmQuark *)Xrealloc(quark_list,
-				(sizeof(XrmQuark) * (num_quark + 1))))) {
-		im->private.proto.saved_imvalues = quark_list;
-		im->private.proto.num_saved_imvalues = num_quark;
-		return False;
-	    }
-	    num_quark++;
-	    quark_list = tmp;
-	    quark_list[num_quark] = quark;
-	}
-	im->private.proto.saved_imvalues = quark_list;
-	im->private.proto.num_saved_imvalues = num_quark;
-	return True;
-    }
-
-    for (p = arg, n = 0; p && p->name; p++, n++);
-
-    if (!(quark_list = (XrmQuark *)Xmalloc(sizeof(XrmQuark) * n))) {
-	return False;
-    }
-
-    im->private.proto.saved_imvalues = quark_list;
-    im->private.proto.num_saved_imvalues = n;
-    for (p = arg; p && p->name; p++, quark_list++) {
-	*quark_list = XrmStringToQuark(p->name);
-    }
-
-    return True;
-}
-
-Private char *
-_XimDelayModeSetIMValues(im, arg)
-    Xim			 im;
-    XIMArg		*arg;
-{
-    XimDefIMValues	 im_values;
-    char		*name;
-    XIMArg		*values;
-
-    _XimGetCurrentIMValues(im, &im_values);
-    name = _XimSetIMValueData(im, (XPointer)&im_values, values,
-		im->core.im_resources, im->core.im_num_resources);
-    _XimSetCurrentIMValues(im, &im_values);
-
-    return name;
-}
-#endif /* XIM_CONNECTABLE */
-
-Private Bool
-#if NeedFunctionPrototypes
-_XimSetIMValuesCheck(
-    Xim          im,
-    INT16        len,
-    XPointer	 data,
-    XPointer     arg)
-#else
-_XimSetIMValuesCheck(im, len, data, arg)
-    Xim          im;
-    INT16        len;
-    XPointer	 data;
-    XPointer     arg;
-#endif
-{
-    CARD16	*buf_s = (CARD16 *)((CARD8 *)data + XIM_HEADER_SIZE);
-    CARD8	 major_opcode = *((CARD8 *)data);
-    CARD8	 minor_opcode = *((CARD8 *)data + 1);
-    XIMID	 imid = buf_s[0];
-
-    if ((major_opcode == XIM_SET_IM_VALUES_REPLY)
-     && (minor_opcode == 0)
-     && (imid == im->private.proto.imid))
-	return True;
-    if ((major_opcode == XIM_ERROR)
-     && (minor_opcode == 0)
-     && (buf_s[2] & XIM_IMID_VALID)
-     && (imid == im->private.proto.imid))
-	return True;
-    return False;
-}
-
-Private char *
-_XimProtoSetIMValues(xim, arg)
-    XIM			 xim;
-    XIMArg		*arg;
-{
-    Xim			 im = (Xim)xim;
-    XimDefIMValues	 im_values;
-    INT16		 len;
-    CARD16		*buf_s;
-    char		*tmp;
-    CARD32		 tmp_buf32[BUFSIZE/4];
-    char		*tmp_buf = (char *)tmp_buf32;
-    char		*buf;
-    int			 buf_size;
-    char		*data;
-    int			 data_len;
-    int			 ret_len;
-    int			 total;
-    XIMArg		*arg_ret;
-    CARD32		 reply32[BUFSIZE/4];
-    char		*reply = (char *)reply32;
-    XPointer		 preply;
-    int			 ret_code;
-    char		*name;
-
-#ifndef XIM_CONNECTABLE
-    if (!IS_SERVER_CONNECTED(im))
-	return arg->name;
-#else
-    if (!_XimSaveIMValues(im, arg))
-	return arg->name;
-
-    if (!IS_SERVER_CONNECTED(im)) {
-	if (IS_CONNECTABLE(im)) {
-	    if (!_XimConnectServer(im)) {
-	        return _XimDelayModeSetIMValues(im, arg);
-	    }
-        } else {
-	    return arg->name;
-        }
-    }
-#endif /* XIM_CONNECTABLE */
-
-    _XimGetCurrentIMValues(im, &im_values);
-    buf = tmp_buf;
-    buf_size = XIM_HEADER_SIZE + sizeof(CARD16) + sizeof(INT16);
-    data_len = BUFSIZE - buf_size;
-    total = 0;
-    arg_ret = arg;
-    for (;;) {
-	data = &buf[buf_size];
-	if ((name = _XimEncodeIMATTRIBUTE(im, im->core.im_resources,
-		im->core.im_num_resources, arg, &arg_ret, data, data_len,
-		&ret_len, (XPointer)&im_values, XIM_SETIMVALUES))) {
-	    if (buf != tmp_buf)
-		Xfree(buf);
-	    break;
-	}
-
-	total += ret_len;
-	if (!(arg = arg_ret)) {
-	    break;
-	}
-
-	buf_size += ret_len;
-	if (buf == tmp_buf) {
-	    if (!(tmp = (char *)Xmalloc(buf_size + data_len))) {
-		return arg->name;
-	    }
-	    memcpy(tmp, buf, buf_size);
-	    buf = tmp;
-	} else {
-	    if (!(tmp = (char *)Xrealloc(buf, (buf_size + data_len)))) {
-		Xfree(buf);
-		return arg->name;
-	    }
-	    buf = tmp;
-	}
-    }
-    _XimSetCurrentIMValues(im, &im_values);
-
-    if (!total)
-	return (char *)NULL;
-
-    buf_s = (CARD16 *)&buf[XIM_HEADER_SIZE];
-    buf_s[0] = im->private.proto.imid;
-    buf_s[1] = (INT16)total;
-
-    len = (INT16)(sizeof(CARD16) + sizeof(INT16) + total);
-    _XimSetHeader((XPointer)buf, XIM_SET_IM_VALUES, 0, &len);
-    if (!(_XimWrite(im, len, (XPointer)buf))) {
-	if (buf != tmp_buf)
-	    Xfree(buf);
-	return arg->name;
-    }
-    _XimFlush(im);
-    if (buf != tmp_buf)
-	Xfree(buf);
-    buf_size = BUFSIZE;
-    ret_code = _XimRead(im, &len, (XPointer)reply, buf_size,
-					 _XimSetIMValuesCheck, 0);
-    if(ret_code == XIM_TRUE) {
-	preply = reply;
-    } else if(ret_code == XIM_OVERFLOW) {
-	if(len <= 0) {
-	    preply = reply;
-	} else {
-	    buf_size = (int)len;
-	    preply = (XPointer)Xmalloc(buf_size);
-	    ret_code = _XimRead(im, &len, reply, buf_size,
-					_XimSetIMValuesCheck, 0);
-	    if(ret_code != XIM_TRUE) {
-		Xfree(preply);
-		return arg->name;
-	    }
-	}
-    } else
-	return arg->name;
-    buf_s = (CARD16 *)((char *)preply + XIM_HEADER_SIZE);
-    if (*((CARD8 *)preply) == XIM_ERROR) {
-	_XimProcError(im, 0, (XPointer)&buf_s[3]);
-	if(reply != preply)
-	    Xfree(preply);
-	return arg->name;
-    }
-    if(reply != preply)
-	Xfree(preply);
-
-    return name;
-}
-
-#ifdef XIM_CONNECTABLE
-Private char *
-_XimDelayModeGetIMValues(im, arg)
-    Xim			 im;
-    XIMArg		*arg;
-{
-    XimDefIMValues	 im_values;
-
-    _XimGetCurrentIMValues(im, &im_values);
-    return(_XimGetIMValueData(im, (XPointer)&im_values, arg,
-			im->core.im_resources, im->core.im_num_resources));
-}
-#endif /* XIM_CONNECTABLE */
-
-Private Bool
-#if NeedFunctionPrototypes
-_XimGetIMValuesCheck(
-    Xim          im,
-    INT16        len,
-    XPointer	 data,
-    XPointer     arg)
-#else
-_XimGetIMValuesCheck(im, len, data, arg)
-    Xim          im;
-    INT16        len;
-    XPointer	 data;
-    XPointer     arg;
-#endif
-{
-    CARD16	*buf_s = (CARD16 *)((CARD8 *)data + XIM_HEADER_SIZE);
-    CARD8	 major_opcode = *((CARD8 *)data);
-    CARD8	 minor_opcode = *((CARD8 *)data + 1);
-    XIMID	 imid = buf_s[0];
-
-    if ((major_opcode == XIM_GET_IM_VALUES_REPLY)
-     && (minor_opcode == 0)
-     && (imid == im->private.proto.imid))
-	return True;
-    if ((major_opcode == XIM_ERROR)
-     && (minor_opcode == 0)
-     && (buf_s[2] & XIM_IMID_VALID)
-     && (imid == im->private.proto.imid))
-	return True;
-    return False;
-}
-
-Private char *
-_XimProtoGetIMValues(xim, arg)
-    XIM			 xim;
-    XIMArg		*arg;
-{
-    Xim			 im = (Xim)xim;
-    register XIMArg	*p;
-    register int	 n;
-    CARD8		*buf;
-    CARD16		*buf_s;
-    INT16		 len;
-    CARD32		 reply32[BUFSIZE/4];
-    char		*reply = (char *)reply32;
-    XPointer		 preply;
-    int			 buf_size;
-    int			 ret_code;
-    char		*makeid_name;
-    char		*decode_name;
-    CARD16		*data = NULL;
-    INT16		 data_len = 0;
-
-#ifndef XIM_CONNECTABLE
-    if (!IS_SERVER_CONNECTED(im))
-	return arg->name;
-#else
-    if (!IS_SERVER_CONNECTED(im)) {
-	if (IS_CONNECTABLE(im)) {
-	    if (!_XimConnectServer(im)) {
-	        return _XimDelayModeGetIMValues(im, arg);
-	    }
-        } else {
-	    return arg->name;
-        }
-    }
-#endif /* XIM_CONNECTABLE */
-
-    for (n = 0, p = arg; p->name; p++)
-	n++;
-
-    if (!n)
-	return (char *)NULL;
-
-    buf_size =  sizeof(CARD16) * n;
-    buf_size += XIM_HEADER_SIZE
-	     + sizeof(CARD16)
-	     + sizeof(INT16)
-	     + XIM_PAD(buf_size);
-
-    if (!(buf = (CARD8 *)Xmalloc(buf_size)))
-	return arg->name;
-    buf_s = (CARD16 *)&buf[XIM_HEADER_SIZE];
-
-    makeid_name = _XimMakeIMAttrIDList(im, im->core.im_resources,
-				im->core.im_num_resources, arg,
-				&buf_s[2], &len, XIM_GETIMVALUES);
-
-    if (len) {
-	buf_s[0] = im->private.proto.imid;	/* imid */
-	buf_s[1] = len;				/* length of im-attr-id */
-	XIM_SET_PAD(&buf_s[2], len);		/* pad */
-	len += sizeof(CARD16)			/* sizeof imid */
-	     + sizeof(INT16);			/* sizeof length of attr */
-
-	_XimSetHeader((XPointer)buf, XIM_GET_IM_VALUES, 0, &len);
-	if (!(_XimWrite(im, len, (XPointer)buf))) {
-	    Xfree(buf);
-	    return arg->name;
-	}
-	_XimFlush(im);
-	Xfree(buf);
-    	buf_size = BUFSIZE;
-    	ret_code = _XimRead(im, &len, (XPointer)reply, buf_size,
-    						_XimGetIMValuesCheck, 0);
-	if(ret_code == XIM_TRUE) {
-	    preply = reply;
-	} else if(ret_code == XIM_OVERFLOW) {
-	    if(len <= 0) {
-		preply = reply;
-	    } else {
-		buf_size = len;
-		preply = (XPointer)Xmalloc(buf_size);
-		ret_code = _XimRead(im, &len, preply, buf_size,
-						_XimGetIMValuesCheck, 0);
-		if(ret_code != XIM_TRUE) {
-		    Xfree(preply);
-		    return arg->name;
-		}
-	    }
-	} else
-	    return arg->name;
-	buf_s = (CARD16 *)((char *)preply + XIM_HEADER_SIZE);
-	if (*((CARD8 *)preply) == XIM_ERROR) {
-	    _XimProcError(im, 0, (XPointer)&buf_s[3]);
-	    if(reply != preply)
-		Xfree(preply);
-	    return arg->name;
-	}
-	data = &buf_s[2];
-	data_len = buf_s[1];
-    }
-    decode_name = _XimDecodeIMATTRIBUTE(im, im->core.im_resources,
-			im->core.im_num_resources, data, data_len,
-			arg, XIM_GETIMVALUES);
-    if (reply != preply)
-	Xfree(preply);
-
-    if (decode_name)
-	return decode_name;
-    else
-	return makeid_name;
-}
-
-Private XIMMethodsRec     im_methods = {
-    _XimProtoCloseIM,           /* close */
-    _XimProtoSetIMValues,       /* set_values */
-    _XimProtoGetIMValues,       /* get_values */
-    _XimProtoCreateIC,          /* create_ic */
-    _Ximctstombs,		/* ctstombs */
-    _Ximctstowcs		/* ctstowcs */
-};
-
-Private Bool
-_XimSetEncodingByName(im, buf, len)
-    Xim		  im;
-    char	**buf;
-    int		 *len;
-{
-    char	*encoding = (char *)NULL;
-    int		 encoding_len;
-    int		 compound_len;
-    BYTE	*ret;
-
-    _XGetLCValues(im->core.lcd, XlcNCodeset, &encoding, NULL);
-    if (!encoding) {
-	*buf = (char *)NULL;
-	*len = 0;
-	return True;
-    }
-    encoding_len = strlen(encoding);
-    compound_len = strlen("COMPOUND_TEXT");
-    *len = encoding_len + sizeof(BYTE) + compound_len + sizeof(BYTE);
-    if (!(ret = (BYTE *)Xmalloc(*len))) {
-	return False;
-    }
-    *buf = (char *)ret;
-
-    ret[0] = (BYTE)encoding_len;
-    (void)strncpy((char *)&ret[1], encoding, encoding_len);
-    ret += (encoding_len + sizeof(BYTE));
-    ret[0] = (BYTE)compound_len;
-    (void)strncpy((char *)&ret[1], "COMPOUND_TEXT", compound_len);
-    return True;
-}
-
-Private Bool
-_XimSetEncodingByDetail(im, buf, len)
-    Xim		 im;
-    char	**buf;
-    int		 *len;
-{
-    *len = 0;
-    *buf = NULL;
-    return True;
-}
-
-Private Bool
-_XimGetEncoding(im, buf, name, name_len, detail, detail_len)
-    Xim		 im;
-    CARD16	*buf;
-    char	*name;
-    int		 name_len;
-    char	*detail;
-    int		 detail_len;
-{
-    XLCd	 lcd = im->core.lcd;
-    CARD16	 category = buf[0];
-    CARD16	 idx = buf[1];
-    int		 len;
-    XlcConv	 ctom_conv;
-    XlcConv	 ctow_conv;
-
-    if (idx == (CARD16)XIM_Default_Encoding_IDX) { /* XXX */
-	if (!(ctom_conv = _XlcOpenConverter(lcd,
-				 XlcNCompoundText, lcd, XlcNMultiByte)))
-	    return False;
-	if (!(ctow_conv = _XlcOpenConverter(lcd,
-				 XlcNCompoundText, lcd, XlcNWideChar)))
-	    return False;
-    }
-
-    if (category == XIM_Encoding_NameCategory) {
-	while (name_len > 0) {
-	    len = (int)name[0];
-	    if (!strncmp(&name[1], "COMPOUND_TEXT", len)) {
-		if (!(ctom_conv = _XlcOpenConverter(lcd,
-				 XlcNCompoundText, lcd, XlcNMultiByte)))
-		    return False;
-		if (!(ctow_conv = _XlcOpenConverter(lcd,
-				 XlcNCompoundText, lcd, XlcNWideChar)))
-		    return False;
-		break;
-	    } else {
-		/*
-		 * Not yet
-		 */
-	    }
-	    len += sizeof(BYTE);
-	    name_len -= len;
-	    name += len;
-	}
-    } else if (category == XIM_Encoding_DetailCategory) {
-	/*
-	 * Not yet
-	 */
-    } else {
-	return False;
-    }
-    im->private.proto.ctom_conv = ctom_conv;
-    im->private.proto.ctow_conv = ctow_conv;
-    return True;
-}
-
-Private	Bool
-#if NeedFunctionPrototypes
-_XimEncodingNegoCheck(
-    Xim		 im,
-    INT16	 len,
-    XPointer	 data,
-    XPointer	 arg)
-#else
-_XimEncodingNegoCheck(im, len, data, arg)
-    Xim		 im;
-    INT16	 len;
-    XPointer	 data;
-    XPointer	 arg;
-#endif
-{
-    CARD16	*buf_s = (CARD16 *)((CARD8 *)data + XIM_HEADER_SIZE);
-    CARD8	 major_opcode = *((CARD8 *)data);
-    CARD8	 minor_opcode = *((CARD8 *)data + 1);
-    XIMID	 imid = buf_s[0];
-
-    if ((major_opcode == XIM_ENCODING_NEGOTIATION_REPLY)
-     && (minor_opcode == 0)
-     && (imid == im->private.proto.imid))
-	return True;
-    if ((major_opcode == XIM_ERROR)
-     && (minor_opcode == 0)
-     && (buf_s[2] & XIM_IMID_VALID)
-     && (imid == im->private.proto.imid))
-	return True;
-    return False;
-}
-
-Private Bool
-_XimEncodingNegotiation(im)
-    Xim		 im;
-{
-    char	*name_ptr = 0;
-    int		 name_len = 0;
-    char	*detail_ptr = 0;
-    int		 detail_len = 0;
-    CARD8	*buf;
-    CARD16	*buf_s;
-    INT16	 len;
-    CARD32	 reply32[BUFSIZE/4];
-    char	*reply = (char *)reply32;
-    XPointer	 preply;
-    int		 buf_size;
-    int		 ret_code;
-
-    if (!(_XimSetEncodingByName(im, &name_ptr, &name_len)))
-	return False;
-
-    if (!(_XimSetEncodingByDetail(im, &detail_ptr, &detail_len))) {
-	if (name_ptr)
-	    Xfree(name_ptr);
-	return False;
-    }
-
-    len = sizeof(CARD16)
-	+ sizeof(INT16)
-	+ name_len
-	+ XIM_PAD(name_len)
-	+ sizeof(INT16)
-	+ sizeof(CARD16)
-	+ detail_len;
-
-    if (!(buf = (CARD8 *)Xmalloc(XIM_HEADER_SIZE + len))) {
-	if (name_ptr)
-	    Xfree(name_ptr);
-	if (detail_ptr)
-	    Xfree(detail_ptr);
-	return False;
-    }
-    buf_s = (CARD16 *)&buf[XIM_HEADER_SIZE];
-
-    buf_s[0] = im->private.proto.imid;
-    buf_s[1] = (INT16)name_len;
-    if (name_ptr)
-	(void)memcpy((char *)&buf_s[2], name_ptr, name_len);
-    XIM_SET_PAD(&buf_s[2], name_len);
-    buf_s = (CARD16 *)((char *)&buf_s[2] + name_len);
-    buf_s[0] = detail_len;
-    buf_s[1] = 0;
-    if (detail_ptr)
-	(void)memcpy((char *)&buf_s[2], detail_ptr, detail_len);
-
-    _XimSetHeader((XPointer)buf, XIM_ENCODING_NEGOTIATION, 0, &len);
-    if (!(_XimWrite(im, len, (XPointer)buf))) {
-	Xfree(buf);
-	return False;
-    }
-    _XimFlush(im);
-    Xfree(buf);
-    buf_size = BUFSIZE;
-    ret_code = _XimRead(im, &len, (XPointer)reply, buf_size,
-					_XimEncodingNegoCheck, 0);
-    if(ret_code == XIM_TRUE) {
-	preply = reply;
-    } else if(ret_code == XIM_OVERFLOW) {
-	if(len <= 0) {
-	    preply = reply;
-	} else {
-	    buf_size = len;
-	    preply = (XPointer)Xmalloc(buf_size);
-	    ret_code = _XimRead(im, &len, preply, buf_size,
-					_XimEncodingNegoCheck, 0);
-	    if(ret_code != XIM_TRUE) {
-		Xfree(preply);
-		return False;
-	    }
-	}
-    } else
-	return False;
-    buf_s = (CARD16 *)((char *)preply + XIM_HEADER_SIZE);
-    if (*((CARD8 *)preply) == XIM_ERROR) {
-	_XimProcError(im, 0, (XPointer)&buf_s[3]);
-	if(reply != preply)
-	    Xfree(preply);
-	return False;
-    }
-
-    if (!(_XimGetEncoding(im, &buf_s[1], name_ptr, name_len,
-						detail_ptr, detail_len))) {
-	if(reply != preply)
-	    Xfree(preply);
-	return False;
-    }
-    if (name_ptr)
-	Xfree(name_ptr);
-    if (detail_ptr)
-	Xfree(detail_ptr);
-
-    if(reply != preply)
-	Xfree(preply);
-
-    return True;
-}
-
-#ifdef XIM_CONNECTABLE
-Private Bool
-_XimSendSavedIMValues(im)
-    Xim			 im;
-{
-    XimDefIMValues	 im_values;
-    INT16		 len;
-    CARD16		*buf_s;
-    char		*tmp;
-    CARD32		 tmp_buf32[BUFSIZE/4];
-    char		*tmp_buf = (char *)tmp_buf32;
-    char		*buf;
-    int			 buf_size;
-    char		*data;
-    int			 data_len;
-    int			 ret_len;
-    int			 total;
-    int			 idx;
-    CARD32		 reply32[BUFSIZE/4];
-    char		*reply = (char *)reply32;
-    XPointer		 preply;
-    int			 ret_code;
-
-    _XimGetCurrentIMValues(im, &im_values);
-    buf = tmp_buf;
-    buf_size = XIM_HEADER_SIZE + sizeof(CARD16) + sizeof(INT16);
-    data_len = BUFSIZE - buf_size;
-    total = 0;
-    idx = 0;
-    for (;;) {
-	data = &buf[buf_size];
-	if (!_XimEncodeSavedIMATTRIBUTE(im, im->core.im_resources,
-		im->core.im_num_resources, &idx, data, data_len,
-		&ret_len, (XPointer)&im_values, XIM_SETIMVALUES)) {
-	    if (buf != tmp_buf)
-		Xfree(buf);
-	    return False;
-	}
-
-	total += ret_len;
-	if (idx == -1) {
-	    break;
-	}
-
-	buf_size += ret_len;
-	if (buf == tmp_buf) {
-	    if (!(tmp = (char *)Xmalloc(buf_size + data_len))) {
-		return False;
-	    }
-	    memcpy(tmp, buf, buf_size);
-	    buf = tmp;
-	} else {
-	    if (!(tmp = (char *)Xrealloc(buf, (buf_size + data_len)))) {
-		Xfree(buf);
-		return False;
-	    }
-	    buf = tmp;
-	}
-    }
-
-    if (!total)
-	return True;
-
-    buf_s = (CARD16 *)&buf[XIM_HEADER_SIZE];
-    buf_s[0] = im->private.proto.imid;
-    buf_s[1] = (INT16)total;
-
-    len = (INT16)(sizeof(CARD16) + sizeof(INT16) + total);
-    _XimSetHeader((XPointer)buf, XIM_SET_IM_VALUES, 0, &len);
-    if (!(_XimWrite(im, len, (XPointer)buf))) {
-	if (buf != tmp_buf)
-	    Xfree(buf);
-	return False;
-    }
-    _XimFlush(im);
-    if (buf != tmp_buf)
-	Xfree(buf);
-    buf_size = BUFSIZE;
-    ret_code = _XimRead(im, &len, (XPointer)reply, buf_size,
-    					 _XimSetIMValuesCheck, 0);
-    if(ret_code == XIM_TRUE) {
-	preply = reply;
-    } else if(ret_code == XIM_OVERFLOW) {
-	if(len <= 0) {
-	    preply = reply;
-	} else {
-	    buf_size = (int)len;
-	    preply = (XPointer)Xmalloc(buf_size);
-	    ret_code = _XimRead(im, &len, reply, buf_size,
-					_XimSetIMValuesCheck, 0);
-    	    if(ret_code != XIM_TRUE) {
-		Xfree(preply);
-		return False;
-	    }
-	}
-    } else
-	return False;
-
-    buf_s = (CARD16 *)((char *)preply + XIM_HEADER_SIZE);
-    if (*((CARD8 *)preply) == XIM_ERROR) {
-	_XimProcError(im, 0, (XPointer)&buf_s[3]);
-    	if(reply != preply)
-	    Xfree(preply);
-	return False;
-    }
-    if(reply != preply)
-	Xfree(preply);
-
-    return True;
-}
-
-Private void
-_XimDelayModeIMFree(im)
-    Xim		 im;
-{
-    if (im->core.im_resources) {
-	Xfree(im->core.im_resources);
-	im->core.im_resources = NULL;
-    }
-    if (im->core.ic_resources) {
-	Xfree(im->core.ic_resources);
-	im->core.ic_resources = NULL;
-    }
-    if (im->core.im_values_list) {
-	Xfree(im->core.im_values_list);
-	im->core.im_values_list = NULL;
-    }
-    if (im->core.ic_values_list) {
-	Xfree(im->core.ic_values_list);
-	im->core.ic_values_list = NULL;
-    }
-    return;
-}
-
-Public Bool
-_XimConnectServer(im)
-    Xim		 im;
-{
-    Xim		 save_im;
-
-    if (!(save_im = (Xim)Xmalloc(sizeof(XimRec))))
-	return False;
-    memcpy((char *)save_im, (char *)im, sizeof(XimRec));
-
-    if (_XimPreConnect(im) && _XimConnection(im)
-			&& _XimOpen(im) && _XimEncodingNegotiation(im)) {
-	if (_XimSendSavedIMValues(im)) {
-	    _XimDelayModeIMFree(save_im);
-	    _XimRegisterServerFilter(im);
-	    Xfree(save_im);
-	    return True;
-	}
-    }
-    memcpy((char *)im, (char *)save_im, sizeof(XimRec));
-    Xfree(save_im);
-    return False;
-}
-
-Public Bool
-_XimDelayModeSetAttr(im)
-    Xim			 im;
-{
-    XimDefIMValues	 im_values;
-
-    if(!_XimSetIMResourceList(&im->core.im_resources,
-						&im->core.im_num_resources)) {
-	return False;
-    }
-    if(!_XimSetICResourceList(&im->core.ic_resources,
-						&im->core.ic_num_resources)) {
-	return False;
-    }
-
-    _XimSetIMMode(im->core.im_resources, im->core.im_num_resources);
-
-    _XimGetCurrentIMValues(im, &im_values);
-    if(!_XimSetLocalIMDefaults(im, (XPointer)&im_values,
-			im->core.im_resources, im->core.im_num_resources)) {
-	return False;
-    }
-    _XimSetCurrentIMValues(im, &im_values);
-    if (im->private.proto.default_styles) {
-        if (im->core.styles)
-	    Xfree(im->core.styles);
-        im->core.styles = im->private.proto.default_styles;
-    }
-
-    return True;
-}
-
-Private Bool
-_XimReconnectModeSetAttr(im)
-    Xim			 im;
-{
-    XimDefIMValues	 im_values;
-
-    if(!_XimSetIMResourceList(&im->core.im_resources,
-						&im->core.im_num_resources)) {
-	return False;
-    }
-    if(!_XimSetICResourceList(&im->core.ic_resources,
-						&im->core.ic_num_resources)) {
-	return False;
-    }
-
-    _XimSetIMMode(im->core.im_resources, im->core.im_num_resources);
-
-    if (im->private.proto.default_styles) {
-        if (im->core.styles)
-	    Xfree(im->core.styles);
-        im->core.styles = im->private.proto.default_styles;
-    }
-
-    return True;
-}
-#endif /* XIM_CONNECTABLE */
-
-Public Bool
-_XimProtoOpenIM(im)
-    Xim		 im;
-{
-    _XimInitialResourceInfo();
-
-    im->methods = &im_methods;
-
-#ifdef XIM_CONNECTABLE
-    _XimSetProtoResource(im);
-#endif /* XIM_CONNECTABLE */
-
-    if (_XimPreConnect(im)) {
-	if (_XimConnection(im) && _XimOpen(im) && _XimEncodingNegotiation(im)) {
-	    _XimRegisterServerFilter(im);
-	    return True;
-	}
-#ifdef XIM_CONNECTABLE
-    } else if (IS_DELAYBINDABLE(im)) {
-	if (_XimDelayModeSetAttr(im))
-	    return True;
-#endif /* XIM_CONNECTABLE */
-    }
-    _XimProtoIMFree(im);
-    return False;
-}
diff --git a/xc/lib/X11/imDefLkup.c b/xc/lib/X11/imDefLkup.c
deleted file mode 100644
index c877e0af9..000000000
--- a/xc/lib/X11/imDefLkup.c
+++ /dev/null
@@ -1,1197 +0,0 @@
-/* $TOG: imDefLkup.c /main/18 1998/04/28 17:33:12 kaleb $ */
-/******************************************************************
-
-           Copyright 1992, 1993, 1994 by FUJITSU LIMITED
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of FUJITSU LIMITED
-not be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-FUJITSU LIMITED makes no representations about the suitability of
-this software for any purpose. 
-It is provided "as is" without express or implied warranty.
-
-FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-  Author: Takashi Fujiwara     FUJITSU LIMITED 
-                               fujiwara@a80.tech.yk.fujitsu.co.jp
-
-******************************************************************/
-/* $XFree86: xc/lib/X11/imDefLkup.c,v 3.6 1999/05/09 10:50:32 dawes Exp $ */
-
-#include <X11/Xatom.h>
-#define  NEED_EVENTS
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "Ximint.h"
-
-Public Xic
-#if NeedFunctionPrototypes
-_XimICOfXICID(
-    Xim		  im,
-    XICID	  icid)
-#else
-_XimICOfXICID(im, icid)
-    Xim		  im;
-    XICID	  icid;
-#endif /* NeedFunctionPrototypes */
-{
-    Xic		  pic;
-
-    for (pic = (Xic)im->core.ic_chain; pic; pic = (Xic)pic->core.next) {
-	if (pic->private.proto.icid == icid)
-	    return pic;
-    }
-    return (Xic)0;
-}
-
-Private void
-_XimProcIMSetEventMask(im, buf)
-    Xim		 im;
-    XPointer	 buf;
-{
-    EVENTMASK	*buf_l = (EVENTMASK *)buf;
-
-    im->private.proto.forward_event_mask     = buf_l[0];
-    im->private.proto.synchronous_event_mask = buf_l[1];
-    return;
-}
-
-Private void
-_XimProcICSetEventMask(ic, buf)
-    Xic		 ic;
-    XPointer	 buf;
-{
-    EVENTMASK	*buf_l = (EVENTMASK *)buf;
-
-    ic->private.proto.forward_event_mask     = buf_l[0];
-    ic->private.proto.synchronous_event_mask = buf_l[1];
-    _XimReregisterFilter(ic);
-    return;
-}
-
-Public Bool
-#if NeedFunctionPrototypes
-_XimSetEventMaskCallback(
-    Xim		 xim,
-    INT16	 len,
-    XPointer	 data,
-    XPointer	 call_data)
-#else
-_XimSetEventMaskCallback(xim, len, data, call_data)
-    Xim		 xim;
-    INT16	 len;
-    XPointer	 data;
-    XPointer	 call_data;
-#endif /* NeedFunctionPrototypes */
-{
-    CARD16	*buf_s = (CARD16 *)((CARD8 *)data + XIM_HEADER_SIZE);
-    XIMID        imid = buf_s[0];
-    XICID        icid = buf_s[1];
-    Xim		 im = (Xim)call_data;
-    Xic		 ic;
-
-    if (imid == im->private.proto.imid) {
-	if (icid) {
-	    ic = _XimICOfXICID(im, icid);
-	    _XimProcICSetEventMask(ic, (XPointer)&buf_s[2]);
-	} else {
-	    _XimProcIMSetEventMask(im, (XPointer)&buf_s[2]);
-	}
-	return True;
-    }
-    return False;
-}
-
-Private Bool
-#if NeedFunctionPrototypes
-_XimSyncCheck(
-    Xim          im,
-    INT16        len,
-    XPointer	 data,
-    XPointer     arg)
-#else
-_XimSyncCheck(im, len, data, arg)
-    Xim          im;
-    INT16        len;
-    XPointer	 data;
-    XPointer     arg;
-#endif
-{
-    Xic		 ic  = (Xic)arg;
-    CARD16	*buf_s = (CARD16 *)((CARD8 *)data + XIM_HEADER_SIZE);
-    CARD8	 major_opcode = *((CARD8 *)data);
-    CARD8	 minor_opcode = *((CARD8 *)data + 1);
-    XIMID	 imid = buf_s[0];
-    XICID	 icid = buf_s[1];
-
-    if ((major_opcode == XIM_SYNC_REPLY)
-     && (minor_opcode == 0)
-     && (imid == im->private.proto.imid)
-     && (icid == ic->private.proto.icid))
-	return True;
-    if ((major_opcode == XIM_ERROR)
-     && (minor_opcode == 0)
-     && (buf_s[2] & XIM_IMID_VALID)
-     && (imid == im->private.proto.imid)
-     && (buf_s[2] & XIM_ICID_VALID)
-     && (icid == ic->private.proto.icid))
-	return True;
-    return False;
-}
-
-Public Bool
-_XimSync(im, ic)
-    Xim		 im;
-    Xic		 ic;
-{
-    CARD32	 buf32[BUFSIZE/4];
-    CARD8	*buf = (CARD8 *)buf32;
-    CARD16	*buf_s = (CARD16 *)&buf[XIM_HEADER_SIZE];
-    INT16	 len;
-    CARD32	 reply32[BUFSIZE/4];
-    char	*reply = (char *)reply32;
-    XPointer	 preply;
-    int		 buf_size;
-    int		 ret_code;
-
-    buf_s[0] = im->private.proto.imid;		/* imid */
-    buf_s[1] = ic->private.proto.icid;		/* icid */
-
-    len = sizeof(CARD16)			/* sizeof imid */
-	+ sizeof(CARD16);			/* sizeof icid */
-
-    _XimSetHeader((XPointer)buf, XIM_SYNC, 0, &len);
-    if (!(_XimWrite(im, len, (XPointer)buf)))
-	return False;
-    _XimFlush(im);
-    buf_size = BUFSIZE;
-    ret_code = _XimRead(im, &len, (XPointer)reply, buf_size,
-					_XimSyncCheck, (XPointer)ic);
-    if(ret_code == XIM_TRUE) {
-	preply = reply;
-    } else if(ret_code == XIM_OVERFLOW) {
-	if(len <= 0) {
-	    preply = reply;
-	} else {
-	    buf_size = len;
-	    preply = (XPointer)Xmalloc(len);
-	    ret_code = _XimRead(im, &len, preply, buf_size,
-					_XimSyncCheck, (XPointer)ic);
-	    if(ret_code != XIM_TRUE) {
-		Xfree(preply);
-		return False;
-	    }
-	}
-    } else {
-	return False;
-    }
-    buf_s = (CARD16 *)((char *)preply + XIM_HEADER_SIZE);
-    if (*((CARD8 *)preply) == XIM_ERROR) {
-	_XimProcError(im, 0, (XPointer)&buf_s[3]);
-	if(reply != preply)
-	    Xfree(preply);
-	return False;
-    }
-    if(reply != preply)
-	Xfree(preply);
-    return True;
-}
-
-Public Bool
-_XimProcSyncReply(im, ic)
-    Xim		 im;
-    Xic		 ic;
-{
-    CARD32	 buf32[BUFSIZE/4];
-    CARD8	*buf = (CARD8 *)buf32;
-    CARD16	*buf_s = (CARD16 *)&buf[XIM_HEADER_SIZE];
-    INT16	 len;
-
-    buf_s[0] = im->private.proto.imid;		/* imid */
-    buf_s[1] = ic->private.proto.icid;		/* icid */
-
-    len = sizeof(CARD16)			/* sizeof imid */
-	+ sizeof(CARD16);			/* sizeof icid */
-
-    _XimSetHeader((XPointer)buf, XIM_SYNC_REPLY, 0, &len);
-    if (!(_XimWrite(im, len, (XPointer)buf)))
-	return False;
-    _XimFlush(im);
-    return True;
-}
-
-Public Bool
-_XimRespSyncReply(ic, mode)
-    Xic		 ic;
-    BITMASK16	 mode;
-{
-    if (mode & XimSYNCHRONUS) /* SYNC Request */
-	MARK_NEED_SYNC_REPLY(ic);
-    return True;
-}
-
-Public Bool
-#if NeedFunctionPrototypes
-_XimSyncCallback(
-    Xim		 xim,
-    INT16	 len,
-    XPointer	 data,
-    XPointer	 call_data)
-#else
-_XimSyncCallback(xim, len, data, call_data)
-    Xim		 xim;
-    INT16	 len;
-    XPointer	 data;
-    XPointer	 call_data;
-#endif /* NeedFunctionPrototypes */
-{
-    CARD16	*buf_s = (CARD16 *)((CARD8 *)data + XIM_HEADER_SIZE);
-    XIMID        imid = buf_s[0];
-    XICID        icid = buf_s[1];
-    Xim		 im = (Xim)call_data;
-    Xic		 ic;
-
-    if ((imid == im->private.proto.imid)
-     && (ic = _XimICOfXICID(im, icid))) {
-	(void)_XimProcSyncReply(im, ic);
-	return True;
-    }
-    return False;
-}
-
-Private INT16
-_XimSetEventToWire(ev, event)
-    XEvent	*ev;
-    xEvent	*event;
-{
-    if (!(_XimProtoEventToWire(ev, event, False)))
-	return 0;
-    event->u.u.sequenceNumber =
-		((XAnyEvent *)ev)->serial & (unsigned long)0xffff;
-    return sz_xEvent;
-}
-
-Private Bool
-_XimForwardEventCore(ic, ev, sync)
-    Xic		 ic;
-    XEvent	*ev;
-    Bool	 sync;
-{
-    Xim		 im = (Xim)ic->core.im;
-    CARD32	 buf32[BUFSIZE/4];
-    CARD8	*buf = (CARD8 *)buf32;
-    CARD16	*buf_s = (CARD16 *)&buf[XIM_HEADER_SIZE];
-    CARD32	 reply32[BUFSIZE/4];
-    char	*reply = (char *)reply32;
-    XPointer	 preply;
-    int		 buf_size;
-    int		 ret_code;
-    INT16	 len;
-
-    if (!(len = _XimSetEventToWire(ev, (xEvent *)&buf_s[4])))
-	return False;				/* X event */
-
-    buf_s[0] = im->private.proto.imid;		/* imid */
-    buf_s[1] = ic->private.proto.icid;		/* icid */
-    buf_s[2] = sync ? XimSYNCHRONUS : 0;	/* flag */
-    buf_s[3] =
-        (CARD16)((((XAnyEvent *)ev)->serial & ~((unsigned long)0xffff)) >> 16);
-						/* serial number */
-
-    len += sizeof(CARD16)			/* sizeof imid */
-	 + sizeof(CARD16)			/* sizeof icid */
-	 + sizeof(BITMASK16)			/* sizeof flag */
-	 + sizeof(CARD16);			/* sizeof serila number */
-
-    _XimSetHeader((XPointer)buf, XIM_FORWARD_EVENT, 0, &len);
-    if (!(_XimWrite(im, len, (XPointer)buf)))
-	return False;
-    _XimFlush(im);
-
-    if (sync) {
-	buf_size = BUFSIZE;
-	ret_code = _XimRead(im, &len, (XPointer)reply, buf_size,
-					_XimSyncCheck, (XPointer)ic);
-	if(ret_code == XIM_TRUE) {
-	    preply = reply;
-	} else if(ret_code == XIM_OVERFLOW) {
-	    if(len <= 0) {
-		preply = reply;
-	    } else {
-		buf_size = len;
-		preply = (XPointer)Xmalloc(len);
-		ret_code = _XimRead(im, &len, preply, buf_size,
-					_XimSyncCheck, (XPointer)ic);
-		if(ret_code != XIM_TRUE) {
-		    Xfree(preply);
-		    return False;
-		}
-	    }
-	} else {
-	    return False;
-	}
-	buf_s = (CARD16 *)((char *)preply + XIM_HEADER_SIZE);
-	if (*((CARD8 *)preply) == XIM_ERROR) {
-	    _XimProcError(im, 0, (XPointer)&buf_s[3]);
-	    if(reply != preply)
-		Xfree(preply);
-	    return False;
-	}
-	if(reply != preply)
-	    Xfree(preply);
-    }
-    return True;
-}
-
-Public Bool
-_XimForwardEvent(ic, ev, sync)
-    Xic		 ic;
-    XEvent	*ev;
-    Bool	 sync;
-{
-#ifdef EXT_FORWARD
-    if (((ev->type == KeyPress) || (ev->type == KeyRelease)))
-	if (_XimExtForwardKeyEvent(ic, (XKeyEvent *)ev, sync))
-	    return True;
-#endif
-    return _XimForwardEventCore(ic, ev, sync);
-}
-
-Private void
-_XimProcEvent(d, ic, ev, buf)
-    Display		*d;
-    Xic			 ic;
-    XEvent		*ev;
-    CARD16		*buf;
-{
-    INT16	 serial = buf[0];
-    xEvent	*xev = (xEvent *)&buf[1];
-
-    _XimProtoWireToEvent(ev, xev, False);
-    ev->xany.serial |= serial << 16;
-    ev->xany.send_event = False;
-    ev->xany.display = d;
-    MARK_FABLICATED(ic);
-    return;
-}
-
-Private Bool
-_XimForwardEventRecv(im, ic, buf)
-    Xim		 im;
-    Xic		 ic;
-    XPointer	 buf;
-{
-    CARD16	*buf_s = (CARD16 *)buf;
-    Display	*d = im->core.display;
-    XEvent	 ev;
-
-    _XimProcEvent(d, ic, &ev, &buf_s[1]);
-
-    (void)_XimRespSyncReply(ic, buf_s[0]);
-
-    XPutBackEvent(d, &ev);
-
-    return True;
-}
-
-Public Bool
-#if NeedFunctionPrototypes
-_XimForwardEventCallback(
-    Xim		 xim,
-    INT16	 len,
-    XPointer	 data,
-    XPointer	 call_data)
-#else
-_XimForwardEventCallback(xim, len, data, call_data)
-    Xim		 xim;
-    INT16	 len;
-    XPointer	 data;
-    XPointer	 call_data;
-#endif /* NeedFunctionPrototypes */
-{
-    CARD16	*buf_s = (CARD16 *)((CARD8 *)data + XIM_HEADER_SIZE);
-    XIMID        imid = buf_s[0];
-    XICID        icid = buf_s[1];
-    Xim		 im = (Xim)call_data;
-    Xic		 ic;
-
-    if ((imid == im->private.proto.imid)
-     && (ic = _XimICOfXICID(im, icid))) {
-	(void)_XimForwardEventRecv(im, ic, (XPointer)&buf_s[2]);
-	return True;
-    }
-    return False;
-}
-
-Private Bool
-_XimRegisterTriggerkey(im, buf)
-    Xim			 im;
-    XPointer		 buf;
-{
-    CARD32		*buf_l = (CARD32 *)buf;
-    CARD32		 len;
-    CARD32 		*key;
-
-    if (IS_DYNAMIC_EVENT_FLOW(im))	/* already Dynamic event flow mode */
-	return True;
-
-    /*
-     *  register onkeylist
-     */
-
-    len = buf_l[0];				/* length of on-keys */
-    len += sizeof(INT32);			/* sizeof length of on-keys */
-
-    if (!(key = (CARD32 *)Xmalloc(len))) {
-	_XimError(im, 0, XIM_BadAlloc, (INT16)0, (CARD16)0, (char *)NULL);
-	return False;
-    }
-    memcpy((char *)key, (char *)buf_l, len);
-    im->private.proto.im_onkeylist = key;
-
-    MARK_DYNAMIC_EVENT_FLOW(im);
-
-    /*
-     *  register offkeylist
-     */
-
-    buf_l = (CARD32 *)((char *)buf + len);
-    len = buf_l[0];				/* length of off-keys */
-    len += sizeof(INT32);			/* sizeof length of off-keys */
-
-    if (!(key = (CARD32 *)Xmalloc(len))) {
-	_XimError(im, 0, XIM_BadAlloc, (INT16)0, (CARD16)0, (char *)NULL);
-	return False;
-    }
-
-    memcpy((char *)key, (char *)buf_l, len);
-    im->private.proto.im_offkeylist = key;
-
-    return True;
-}
-
-Public Bool
-#if NeedFunctionPrototypes
-_XimRegisterTriggerKeysCallback(
-    Xim		 xim,
-    INT16	 len,
-    XPointer	 data,
-    XPointer	 call_data)
-#else
-_XimRegisterTriggerKeysCallback(xim, len, data, call_data)
-    Xim		 xim;
-    INT16	 len;
-    XPointer	 data;
-    XPointer	 call_data;
-#endif /* NeedFunctionPrototypes */
-{
-    CARD16	*buf_s = (CARD16 *)((CARD8 *)data + XIM_HEADER_SIZE);
-    Xim		 im = (Xim)call_data;
-
-    (void )_XimRegisterTriggerkey(im, (XPointer)&buf_s[2]);
-    return True;
-}
-
-Public EVENTMASK
-_XimGetWindowEventmask(ic)
-    Xic		 ic;
-{
-    Xim			im = (Xim )ic->core.im;
-    XWindowAttributes	atr;
-
-    if (!XGetWindowAttributes(im->core.display, ic->core.focus_window, &atr))
-	return 0;
-    return (EVENTMASK)atr.your_event_mask;
-}
-
-
-Private Bool
-#if NeedFunctionPrototypes
-_XimTriggerNotifyCheck(
-    Xim          im,
-    INT16        len,
-    XPointer	 data,
-    XPointer     arg)
-#else
-_XimTriggerNotifyCheck(im, len, data, arg)
-    Xim          im;
-    INT16        len;
-    XPointer	 data;
-    XPointer     arg;
-#endif
-{
-    Xic		 ic  = (Xic)arg;
-    CARD16	*buf_s = (CARD16 *)((CARD8 *)data + XIM_HEADER_SIZE);
-    CARD8	 major_opcode = *((CARD8 *)data);
-    CARD8	 minor_opcode = *((CARD8 *)data + 1);
-    XIMID	 imid = buf_s[0];
-    XICID	 icid = buf_s[1];
-
-    if ((major_opcode == XIM_TRIGGER_NOTIFY_REPLY)
-     && (minor_opcode == 0)
-     && (imid == im->private.proto.imid)
-     && (icid == ic->private.proto.icid))
-	return True;
-    if ((major_opcode == XIM_ERROR)
-     && (minor_opcode == 0)
-     && (buf_s[2] & XIM_IMID_VALID)
-     && (imid == im->private.proto.imid)
-     && (buf_s[2] & XIM_ICID_VALID)
-     && (icid == ic->private.proto.icid))
-	return True;
-    return False;
-}
-
-Public Bool
-_XimTriggerNotify(im, ic, mode, idx)
-    Xim		 im;
-    Xic		 ic;
-    int		 mode;
-    CARD32	 idx;
-{
-    CARD32	 buf32[BUFSIZE/4];
-    CARD8	*buf = (CARD8 *)buf32;
-    CARD16	*buf_s = (CARD16 *)&buf[XIM_HEADER_SIZE];
-    CARD32	*buf_l = (CARD32 *)&buf[XIM_HEADER_SIZE];
-    CARD32	 reply32[BUFSIZE/4];
-    char	*reply = (char *)reply32;
-    XPointer	 preply;
-    int		 buf_size;
-    int		 ret_code;
-    INT16	 len;
-    EVENTMASK	 mask = _XimGetWindowEventmask(ic);
-
-    buf_s[0] = im->private.proto.imid;	/* imid */
-    buf_s[1] = ic->private.proto.icid;	/* icid */
-    buf_l[1] = mode;			/* flag */
-    buf_l[2] = idx;			/* index of keys list */
-    buf_l[3] = mask;			/* select-event-mask */
-
-    len = sizeof(CARD16)		/* sizeof imid */
-	+ sizeof(CARD16)		/* sizeof icid */
-	+ sizeof(CARD32)		/* sizeof flag */
-	+ sizeof(CARD32)		/* sizeof index of key list */
-	+ sizeof(EVENTMASK);		/* sizeof select-event-mask */
-
-    _XimSetHeader((XPointer)buf, XIM_TRIGGER_NOTIFY, 0, &len);
-    if (!(_XimWrite(im, len, (XPointer)buf)))
-	return False;
-    _XimFlush(im);
-    buf_size = BUFSIZE;
-    ret_code = _XimRead(im, &len, (XPointer)reply, buf_size,
-				_XimTriggerNotifyCheck, (XPointer)ic);
-    if(ret_code == XIM_TRUE) {
-	preply = reply;
-    } else if(ret_code == XIM_OVERFLOW) {
-	if(len <= 0) {
-	    preply = reply;
-	} else {
-	    buf_size = len;
-	    preply = (XPointer)Xmalloc(len);
-	    ret_code = _XimRead(im, &len, (XPointer)reply, buf_size,
-				_XimTriggerNotifyCheck, (XPointer)ic);
-	    if(ret_code != XIM_TRUE) {
-		Xfree(preply);
-		return False;
-	    }
-	}
-    } else {
-	return False;
-    }
-    buf_s = (CARD16 *)((char *)preply + XIM_HEADER_SIZE);
-    if (*((CARD8 *)preply) == XIM_ERROR) {
-	_XimProcError(im, 0, (XPointer)&buf_s[3]);
-	if(reply != preply)
-	    Xfree(preply);
-	return False;
-    }
-    if(reply != preply)
-	Xfree(preply);
-    return True;
-}
-
-Private Bool
-_XimRegCommitInfo(ic, string, string_len, keysym, keysym_len)
-    Xic			 ic;
-    char		*string;
-    int			 string_len;
-    KeySym		*keysym;
-    int			 keysym_len;
-{
-    XimCommitInfo	info;
-
-    if (!(info = (XimCommitInfo)Xmalloc(sizeof(XimCommitInfoRec))))
-	return False;
-    info->string	= string;
-    info->string_len	= string_len;
-    info->keysym	= keysym;
-    info->keysym_len	= keysym_len;
-    info->next = ic->private.proto.commit_info;
-    ic->private.proto.commit_info = info;
-    return True;
-}
-
-Private void
-_XimUnregCommitInfo(ic)
-    Xic			ic;
-{
-    XimCommitInfo	info;
-
-    if (!(info = ic->private.proto.commit_info))
-	return;
-
-    if (info->string)
-	Xfree(info->string);
-    if (info->keysym)
-	Xfree(info->keysym);
-    ic->private.proto.commit_info = info->next;
-    Xfree(info);
-    return;
-}
-
-Public void
-_XimFreeCommitInfo(ic)
-    Xic			ic;
-{
-    while (ic->private.proto.commit_info)
-	_XimUnregCommitInfo(ic);
-    return;
-}
-
-Private Bool
-_XimProcKeySym(ic, sym, xim_keysym, xim_keysym_len)
-    Xic			  ic;
-    CARD32		  sym;
-    KeySym		**xim_keysym;
-    int			 *xim_keysym_len;
-{
-    Xim			 im = (Xim)ic->core.im;
-
-    if (!(*xim_keysym = (KeySym *)Xmalloc(sizeof(KeySym)))) {
-	_XimError(im, ic, XIM_BadAlloc, (INT16)0, (CARD16)0, (char *)NULL);
-	return False;
-    }
-
-    **xim_keysym = (KeySym)sym;
-    *xim_keysym_len = 1;
-
-    return True;
-}
-
-Private Bool
-_XimProcCommit(ic, buf, len, xim_string, xim_string_len)
-    Xic		  ic;
-    BYTE	 *buf;
-    int		  len;
-    char	**xim_string;
-    int		 *xim_string_len;
-{
-    Xim		 im = (Xim)ic->core.im;
-    char	*string;
-
-    if (!(string = (char *)Xmalloc(len + 1))) {
-	_XimError(im, ic, XIM_BadAlloc, (INT16)0, (CARD16)0, (char *)NULL);
-	return False;
-    }
-
-    (void)memcpy(string, (char *)buf, len);
-    string[len] = '\0';
-
-    *xim_string = string;
-    *xim_string_len = len;
-    return True;
-}
-
-Private Bool
-_XimCommitRecv(im, ic, buf)
-    Xim		 im;
-    Xic		 ic;
-    XPointer	 buf;
-{
-    CARD16	*buf_s = (CARD16 *)buf;
-    BITMASK16	 flag = buf_s[0];
-    XKeyEvent	 ev;
-    char	*string = NULL;
-    int		 string_len = 0;
-    KeySym	*keysym = NULL;
-    int		 keysym_len = 0;
-
-    if ((flag & XimLookupBoth) == XimLookupChars) {
-	if (!(_XimProcCommit(ic, (BYTE *)&buf_s[2],
-			 		(int)buf_s[1], &string, &string_len)))
-	    return False;
-
-    } else if ((flag & XimLookupBoth) == XimLookupKeySym) {
-	if (!(_XimProcKeySym(ic, *(CARD32 *)&buf_s[2], &keysym, &keysym_len)))
-	    return False;
-
-    } else if ((flag & XimLookupBoth) == XimLookupBoth) {
-	if (!(_XimProcKeySym(ic, *(CARD32 *)&buf_s[2], &keysym, &keysym_len)))
-	    return False;
-
-	if (!(_XimProcCommit(ic, (BYTE *)&buf_s[5],
-			 		(int)buf_s[4], &string, &string_len)))
-	    return False;
-    }
-
-    if (!(_XimRegCommitInfo(ic, string, string_len, keysym, keysym_len))) {
-	if (string)
-	    Xfree(string);
-	if (keysym)
-	    Xfree(keysym);
-	_XimError(im, ic, XIM_BadAlloc, (INT16)0, (CARD16)0, (char *)NULL);
-	return False;
-    }
-
-    (void)_XimRespSyncReply(ic, flag);
-
-    MARK_FABLICATED(ic);
-
-    ev.type = KeyPress;
-    ev.send_event = False;
-    ev.display = im->core.display;
-    ev.window = ic->core.focus_window;
-    ev.keycode = 0;
-    ev.state = 0;
-
-    XPutBackEvent(im->core.display, (XEvent *)&ev);
-
-    return True;
-}
-
-Public Bool
-#if NeedFunctionPrototypes
-_XimCommitCallback(
-    Xim		 xim,
-    INT16	 len,
-    XPointer	 data,
-    XPointer	 call_data)
-#else
-_XimCommitCallback(xim, len, data, call_data)
-    Xim		 xim;
-    INT16	 len;
-    XPointer	 data;
-    XPointer	 call_data;
-#endif /* NeedFunctionPrototypes */
-{
-    CARD16	*buf_s = (CARD16 *)((CARD8 *)data + XIM_HEADER_SIZE);
-    XIMID        imid = buf_s[0];
-    XICID        icid = buf_s[1];
-    Xim		 im = (Xim)call_data;
-    Xic		 ic;
-
-    if ((imid == im->private.proto.imid)
-     && (ic = _XimICOfXICID(im, icid))) {
-	(void)_XimCommitRecv(im, ic, (XPointer)&buf_s[2]);
-	return True;
-    }
-    return False;
-}
-
-Public void
-_XimProcError(im, ic, data)
-    Xim		 im;
-    Xic		 ic;
-    XPointer	 data;
-{
-    return;
-}
-
-Public Bool
-#if NeedFunctionPrototypes
-_XimErrorCallback(
-    Xim		 xim,
-    INT16	 len,
-    XPointer	 data,
-    XPointer	 call_data)
-#else
-_XimErrorCallback(xim, len, data, call_data)
-    Xim		 xim;
-    INT16	 len;
-    XPointer	 data;
-    XPointer	 call_data;
-#endif /* NeedFunctionPrototypes */
-{
-    CARD16	*buf_s = (CARD16 *)((CARD8 *)data + XIM_HEADER_SIZE);
-    BITMASK16	 flag = buf_s[2];
-    XIMID        imid;
-    XICID        icid;
-    Xim		 im = (Xim)call_data;
-    Xic		 ic;
-
-    if (flag & XIM_IMID_VALID) {
-	imid = buf_s[0];
-	if (imid != im->private.proto.imid)
-	    return False;
-    }
-    if (flag & XIM_ICID_VALID) {
-	icid = buf_s[1];
-	if (!(ic = _XimICOfXICID(im, icid)))
-	    return False;
-    }
-    _XimProcError(im, ic, (XPointer)&buf_s[3]);
-
-    return True;
-}
-
-Public Bool
-#if NeedFunctionPrototypes
-_XimError(
-    Xim		 im,
-    Xic		 ic,
-    CARD16	 error_code,
-    INT16	 detail_length,
-    CARD16	 type,
-    char	*detail)
-#else
-_XimError(im, ic, error_code, detail_length, type, detail)
-    Xim		 im;
-    Xic		 ic;
-    CARD16	 error_code;
-    INT16	 detail_length;
-    CARD16	 type;
-    char	*detail;
-#endif /* NeedFunctionPrototypes */
-{
-    CARD32	 buf32[BUFSIZE/4];
-    CARD8	*buf = (CARD8 *)buf32;
-    CARD16	*buf_s = (CARD16 *)&buf[XIM_HEADER_SIZE];
-    INT16	 len = 0;
-
-    buf_s[0] = im->private.proto.imid;	/* imid */
-    buf_s[2] = XIM_IMID_VALID;		/* flag */
-    if (ic) {
-    	buf_s[1] = ic->private.proto.icid;	/* icid */
-	buf_s[2] |= XIM_ICID_VALID;		/* flag */
-    }
-    buf_s[3] = error_code;			/* Error Code */
-    buf_s[4] = detail_length;			/* length of error detail */
-    buf_s[5] = type;				/* type of error detail */
-
-    if (detail_length && detail) {
-	len = detail_length;
-	memcpy((char *)&buf_s[6], detail, len);
-	XIM_SET_PAD(&buf_s[6], len);
-    }
-
-    len += sizeof(CARD16)		/* sizeof imid */
-	 + sizeof(CARD16)		/* sizeof icid */
-	 + sizeof(BITMASK16)		/* sizeof flag */
-	 + sizeof(CARD16)		/* sizeof error_code */
-	 + sizeof(INT16)		/* sizeof length of detail */
-	 + sizeof(CARD16);		/* sizeof type */
-
-    _XimSetHeader((XPointer)buf, XIM_ERROR, 0, &len);
-    if (!(_XimWrite(im, len, (XPointer)buf)))
-	return False;
-    _XimFlush(im);
-    return True;
-}
-
-#ifndef MAXINT
-#define MAXINT		(~((unsigned int)1 << ((8 * sizeof(int)) - 1)))
-#endif /* !MAXINT */
-
-Public int
-_Ximctstombs(xim, from, from_len, to, to_len, state)
-    XIM		 xim;
-    char	*from;
-    int		 from_len;
-    char	*to;
-    int		 to_len;
-    Status	*state;
-{
-    Xim		 im = (Xim)xim;
-    XlcConv	 conv = im->private.proto.ctom_conv;
-    int		 from_left;
-    int		 to_left;
-    int		 from_savelen;
-    int		 to_savelen;
-    int		 from_cnvlen;
-    int		 to_cnvlen;
-    char	*from_buf;
-    char	*to_buf;
-    Status	 tmp_state;
-
-    if (!state)
-	state = &tmp_state;
-
-    if (!conv || !from || !from_len) {
-	*state = XLookupNone;
-	return 0;
-    }
-
-    if (to && to_len) {
-	from_left = from_len;
-	to_left = to_len;
-	from_cnvlen = 0;
-	to_cnvlen = 0;
-	for (;;) {
-	    from_savelen = from_left;
-	    to_savelen = to_left;
-	    from_buf = &from[from_cnvlen];
-	    to_buf = &to[to_cnvlen];
-	    if (_XlcConvert(conv, (XPointer *)&from_buf, &from_left,
-				 (XPointer *)&to_buf, &to_left, NULL, 0) < 0) {
-		*state = XLookupNone;
-		return 0;
-	    }
-	    from_cnvlen += (from_savelen - from_left);
-	    to_cnvlen += (to_savelen - to_left);
-	    if (from_left == 0) {
-		if (to_cnvlen > 0) {
-		    *state = XLookupChars;
-		} else {
-		    *state = XLookupNone;
-		}
-		return to_cnvlen;
-	    }
-	    if (to_left == 0)
-		break;
-	}
-    }
-
-    from_left = from_len;
-    from_cnvlen = 0;
-    to_cnvlen = 0;
-    to_buf = NULL;
-    for (;;) {
-	from_savelen = from_left;
-	to_left = MAXINT;
-	from_buf = &from[from_cnvlen];
-	if (_XlcConvert(conv, (XPointer *)&from_buf, &from_left,
-				 (XPointer *)&to_buf, &to_left, NULL, 0) < 0) {
-	    *state = XLookupNone;
-	    return 0;
-	}
-	from_cnvlen += (from_savelen - from_left);
-	to_cnvlen += (MAXINT - to_left);
-	if (from_left == 0) {
-	    if (to_cnvlen > 0)
-		*state = XBufferOverflow;
-	    else
-		*state = XLookupNone;
-	    break;
-	}
-    }
-    return to_cnvlen;
-}
-
-Public int
-_Ximctstowcs(xim, from, from_len, to, to_len, state)
-    XIM		 xim;
-    char	*from;
-    int		 from_len;
-    wchar_t	*to;
-    int		 to_len;
-    Status	*state;
-{
-    Xim		 im = (Xim)xim;
-    XlcConv	 conv = im->private.proto.ctow_conv;
-    int		 from_left;
-    int		 to_left;
-    int		 from_savelen;
-    int		 to_savelen;
-    int		 from_cnvlen;
-    int		 to_cnvlen;
-    char	*from_buf;
-    wchar_t	*to_buf;
-    Status	 tmp_state;
-
-    if (!state)
-	state = &tmp_state;
-
-    if (!conv || !from || !from_len) {
-	*state = XLookupNone;
-	return 0;
-    }
-
-    if (to && to_len) {
-	from_left = from_len;
-	to_left = to_len;
-	from_cnvlen = 0;
-	to_cnvlen = 0;
-	for (;;) {
-	    from_savelen = from_left;
-	    to_savelen = to_left;
-	    from_buf = &from[from_cnvlen];
-	    to_buf = &to[to_cnvlen];
-	    if (_XlcConvert(conv, (XPointer *)&from_buf, &from_left,
-				 (XPointer *)&to_buf, &to_left, NULL, 0) < 0) {
-		*state = XLookupNone;
-		return 0;
-	    }
-	    from_cnvlen += (from_savelen - from_left);
-	    to_cnvlen += (to_savelen - to_left);
-	    if (from_left == 0) {
-		if (to_cnvlen > 0) {
-		    *state = XLookupChars;
-		} else {
-		    *state = XLookupNone;
-		}
-		return to_cnvlen;
-	    }
-	    if (to_left == 0)
-		break;
-	}
-    }
-		
-    from_left = from_len;
-    from_cnvlen = 0;
-    to_cnvlen = 0;
-    to_buf = (wchar_t *)NULL;
-    for (;;) {
-	from_savelen = from_left;
-	to_left = MAXINT;
-	from_buf = &from[from_cnvlen];
-	if (_XlcConvert(conv, (XPointer *)&from_buf, &from_left,
-				 (XPointer *)&to_buf, &to_left, NULL, 0) < 0) {
-	    *state = XLookupNone;
-	    return 0;
-	}
-	from_cnvlen += (from_savelen - from_left);
-	to_cnvlen += (MAXINT - to_left);
-	if (from_left == 0) {
-	    if (to_cnvlen > 0)
-		*state = XBufferOverflow;
-	    else
-		*state = XLookupNone;
-	    break;
-	}
-    }
-    return to_cnvlen;
-}
-
-Public int
-_XimProtoMbLookupString(xic, ev, buffer, bytes, keysym, state)
-    XIC			 xic;
-    XKeyEvent		*ev;
-    char		*buffer;
-    int			 bytes;
-    KeySym		*keysym;
-    Status		*state;
-{
-    Xic			 ic = (Xic)xic;
-    Xim			 im = (Xim)ic->core.im;
-    int			 ret;
-    Status		 tmp_state;
-    XimCommitInfo	 info;
-
-    if (!IS_SERVER_CONNECTED(im))
-	return 0;
-
-    if (!state)
-	state = &tmp_state;
-
-    if ((ev->type == KeyPress) && (ev->keycode == 0)) { /* Filter function */
-	if (!(info = ic->private.proto.commit_info)) {
-	    if (state)
-		*state = XLookupNone;
-	    return 0;
-	}
-
-	ret = im->methods->ctstombs((XIM)im, info->string,
-			 	info->string_len, buffer, bytes, state);
-	if (*state == XBufferOverflow)
-	    return 0;
-	if (keysym && (info->keysym && *(info->keysym))) {
-	    *keysym = *(info->keysym);
-	    if (*state == XLookupChars)
-		*state = XLookupBoth;
-	    else
-		*state = XLookupKeySym;
-	}
-	_XimUnregCommitInfo(ic);
-
-    } else  if (ev->type == KeyPress) {
-	ret = _XimLookupMBText(ic, ev, buffer, bytes, keysym, NULL);
-	if (ret > 0) {
-	    if (keysym && *keysym != NoSymbol)
-		*state = XLookupBoth;
-	    else
-		*state = XLookupChars;
-	} else {
-	    if (keysym && *keysym != NoSymbol)
-		*state = XLookupKeySym;
-	    else
-		*state = XLookupNone;
-	}
-    } else {
-	*state = XLookupNone;
-	ret = 0;
-    }
-
-    return ret;
-}
-
-Public int
-_XimProtoWcLookupString(xic, ev, buffer, bytes, keysym, state)
-    XIC			 xic;
-    XKeyEvent		*ev;
-    wchar_t		*buffer;
-    int			 bytes;
-    KeySym		*keysym;
-    Status		*state;
-{
-    Xic			 ic = (Xic)xic;
-    Xim			 im = (Xim)ic->core.im;
-    int			 ret;
-    Status		 tmp_state;
-    XimCommitInfo	 info;
-
-    if (!IS_SERVER_CONNECTED(im))
-	return 0;
-
-    if (!state)
-	state = &tmp_state;
-
-    if (ev->type == KeyPress && ev->keycode == 0) { /* Filter function */
-	if (!(info = ic->private.proto.commit_info)) {
-	    if (state)
-		*state = XLookupNone;
-	    return 0;
-	}
-
-	ret = im->methods->ctstowcs((XIM)im, info->string,
-			 	info->string_len, buffer, bytes, state);
-	if (*state == XBufferOverflow)
-	    return 0;
-	if (keysym && (info->keysym && *(info->keysym))) {
-	    *keysym = *(info->keysym);
-	    if (*state == XLookupChars)
-		*state = XLookupBoth;
-	    else
-		*state = XLookupKeySym;
-	}
-	_XimUnregCommitInfo(ic);
-
-    } else if (ev->type == KeyPress) {
-	ret = _XimLookupWCText(ic, ev, buffer, bytes, keysym, NULL);
-	if (ret > 0) {
-	    if (keysym && *keysym != NoSymbol)
-		*state = XLookupBoth;
-	    else
-		*state = XLookupChars;
-	} else {
-	    if (keysym && *keysym != NoSymbol)
-		*state = XLookupKeySym;
-	    else
-		*state = XLookupNone;
-	}
-    } else {
-	*state = XLookupNone;
-	ret = 0;
-    }
-
-    return ret;
-}
diff --git a/xc/lib/X11/imDispch.c b/xc/lib/X11/imDispch.c
deleted file mode 100644
index 9e45052c0..000000000
--- a/xc/lib/X11/imDispch.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* $XConsortium: imDispch.c,v 1.4 94/03/26 16:57:53 rws Exp $ */
-/******************************************************************
-
-                Copyright 1993, 1994 by FUJITSU LIMITED
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of FUJITSU LIMITED
-not be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-FUJITSU LIMITED makes no representations about the suitability of
-this software for any purpose. 
-It is provided "as is" without express or implied warranty.
-
-FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-  Author: Takashi Fujiwara     FUJITSU LIMITED 
-                               fujiwara@a80.tech.yk.fujitsu.co.jp
-
-******************************************************************/
-/* $XFree86: xc/lib/X11/imDispch.c,v 1.2 1999/05/09 10:50:33 dawes Exp $ */
-
-#include <X11/Xlib.h>
-#include "Xlibint.h"
-#include "Xutil.h"
-#include "Xlcint.h"
-#include "Ximint.h"
-
-/* EXTERNS */
-/* imTransR.c */
-extern Bool _XimRegisterDispatcher();
-
-Public Bool
-#if NeedFunctionPrototypes
-_XimRegProtoIntrCallback(
-    Xim		 im,
-    CARD16	 major_code,
-    CARD16	 minor_code,
-    Bool	(*proc)(
-#if NeedNestedPrototypes
-                        Xim, INT16, XPointer, XPointer
-#endif
-			),
-
-    XPointer	 call_data)
-#else
-_XimRegProtoIntrCallback(im, major_code, minor_code, proc, call_data)
-    Xim		 im;
-    CARD16	 major_code;
-    CARD16	 minor_code;
-    Bool	(*proc)();
-    XPointer	 call_data;
-#endif /* NeedFunctionPrototypes */
-{
-    XimProtoIntrRec    *rec;
-
-    if (!(rec = (XimProtoIntrRec *)Xmalloc(sizeof(XimProtoIntrRec))))
-        return False;
-    rec->func       = proc;
-    rec->major_code = major_code;
-    rec->minor_code = minor_code;
-    rec->call_data  = call_data;
-    rec->next       = im->private.proto.intrproto;
-    im->private.proto.intrproto = rec;
-    return True;
-}
-
-Public void
-_XimFreeProtoIntrCallback(im)
-    Xim		im;
-{
-    register XimProtoIntrRec *rec, *next;
-
-    for (rec = im->private.proto.intrproto; rec;) {
-	next = rec->next;
-	Xfree(rec);
-	rec = next;
-    }
-    im->private.proto.intrproto = NULL;
-    return;
-}
-
-Private Bool
-#if NeedFunctionPrototypes
-_XimTransportIntr(
-    Xim		 im,
-    INT16	 len,
-    XPointer	 data,
-    XPointer	 call_data)
-#else
-_XimTransportIntr(im, len, data, call_data)
-    Xim		 im;
-    INT16	 len;
-    XPointer	 data;
-    XPointer	 call_data;
-#endif
-{
-    Xim			 call_im = (Xim)call_data;
-    XimProtoIntrRec	*rec = call_im->private.proto.intrproto;
-    CARD8		 major_opcode = *((CARD8 *)data);
-    CARD8		 minor_opcode = *((CARD8 *)data + 1);
-
-    for (; rec; rec = rec->next) {
-	if ((major_opcode == (CARD8)rec->major_code)
-	 && (minor_opcode == (CARD8)rec->minor_code))
-	    if ((*rec->func)(call_im, len, data, rec->call_data))
-		return True;
-    }
-    return False;
-}
-
-Public Bool
-_XimDispatchInit(im)
-    Xim		 im;
-{
-    if (_XimRegisterDispatcher(im, _XimTransportIntr, (XPointer)im))
-	return True;
-    return False;
-}
diff --git a/xc/lib/X11/imEvToWire.c b/xc/lib/X11/imEvToWire.c
deleted file mode 100644
index a329225e6..000000000
--- a/xc/lib/X11/imEvToWire.c
+++ /dev/null
@@ -1,786 +0,0 @@
-/* $XConsortium: imEvToWire.c,v 1.4 94/04/17 20:22:04 rws Exp $ */
-/***********************************************************
-Copyright 1993 by Digital Equipment Corporation, Maynard, Massachusetts,
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#define NEED_EVENTS
-#include <X11/Xlibint.h>
-#include <X11/Xlib.h>
-#undef NEED_EVENTS
-
-#define sw16(n, s) ((s) ?                    \
-		      (((n) << 8 & 0xff00) | \
-		       ((n) >> 8 & 0xff)     \
-		      ) : n)
-
-#define sw32(n, s) ((s) ?                         \
-		      (((n) << 24 & 0xff000000) | \
-		       ((n) <<  8 & 0xff0000) |   \
-		       ((n) >>  8 & 0xff00) |     \
-		       ((n) >> 24 & 0xff)         \
-		      ) : n)
-
-Status
-_XimProtoEventToWire(re, event, sw)
-register XEvent *re;	/* pointer to where event should be reformatted */
-register xEvent *event;	/* wire protocol event */
-Bool sw;         /* swap byte? */
-{
-	switch (event->u.u.type = re->type) {
-	      case KeyPress:
-	      case KeyRelease:
-	        {
-			register XKeyEvent *ev = (XKeyEvent*) re;
-			event->u.keyButtonPointer.root	= sw32(ev->root, sw);
-			event->u.keyButtonPointer.event	 =
-			    sw32(ev->window, sw);
-			event->u.keyButtonPointer.child  = 
-			    sw32(ev->subwindow, sw);
-			event->u.keyButtonPointer.time	 = sw32(ev->time, sw);
-			event->u.keyButtonPointer.eventX = sw16(ev->x, sw) ;
-			event->u.keyButtonPointer.eventY = sw16(ev->y, sw) ;
-			event->u.keyButtonPointer.rootX	 =
-			    sw16(ev->x_root, sw);
-			event->u.keyButtonPointer.rootY  = 
-			    sw16(ev->y_root, sw);
-			event->u.keyButtonPointer.state  = sw16(ev->state, sw);
-			event->u.keyButtonPointer.sameScreen = ev->same_screen;
-			event->u.u.detail = ev->keycode;
-		}
-	      	break;
-	      case ButtonPress:
-	      case ButtonRelease:
-	        {
-			register XButtonEvent *ev =  (XButtonEvent *) re;
-			event->u.keyButtonPointer.root	 = sw32(ev->root, sw);
-			event->u.keyButtonPointer.event	 = sw32(ev->window, sw);
-			event->u.keyButtonPointer.child	 = sw32(ev->subwindow, sw);
-			event->u.keyButtonPointer.time	 = sw32(ev->time, sw);
-			event->u.keyButtonPointer.eventX = sw16(ev->x, sw);
-			event->u.keyButtonPointer.eventY = sw16(ev->y, sw);
-			event->u.keyButtonPointer.rootX	 = sw16(ev->x_root, sw);
-			event->u.keyButtonPointer.rootY	 = sw16(ev->y_root, sw);
-			event->u.keyButtonPointer.state	 = sw16(ev->state, sw);
-			event->u.keyButtonPointer.sameScreen	= ev->same_screen;
-			event->u.u.detail		= ev->button;
-		}
-	        break;
-	      case MotionNotify:
-	        {
-			register XMotionEvent *ev =   (XMotionEvent *)re;
-			event->u.keyButtonPointer.root	= sw32(ev->root, sw);
-			event->u.keyButtonPointer.event	= sw32(ev->window, sw);
-			event->u.keyButtonPointer.child	= sw32(ev->subwindow, sw);
-			event->u.keyButtonPointer.time	= sw32(ev->time, sw);
-			event->u.keyButtonPointer.eventX= sw16(ev->x, sw);
-			event->u.keyButtonPointer.eventY= sw16(ev->y, sw);
-			event->u.keyButtonPointer.rootX	= sw16(ev->x_root, sw);
-			event->u.keyButtonPointer.rootY	= sw16(ev->y_root, sw);
-			event->u.keyButtonPointer.state	= sw16(ev->state, sw);
-			event->u.keyButtonPointer.sameScreen= ev->same_screen;
-			event->u.u.detail		= ev->is_hint;
-		}
-	        break;
-	      case EnterNotify:
-	      case LeaveNotify:
-		{
-			register XCrossingEvent *ev   = (XCrossingEvent *) re;
-			event->u.enterLeave.root	= sw32(ev->root, sw);
-			event->u.enterLeave.event	= sw32(ev->window, sw);
-			event->u.enterLeave.child	= sw32(ev->subwindow, sw);
-			event->u.enterLeave.time	= sw32(ev->time, sw);
-			event->u.enterLeave.eventX	= sw16(ev->x, sw);
-			event->u.enterLeave.eventY	= sw16(ev->y, sw);
-			event->u.enterLeave.rootX	= sw16(ev->x_root, sw);
-			event->u.enterLeave.rootY	= sw16(ev->y_root, sw);
-			event->u.enterLeave.state	= sw16(ev->state, sw);
-			event->u.enterLeave.mode	= ev->mode;
-			event->u.enterLeave.flags	= 0;
-			if (ev->same_screen) {
-				event->u.enterLeave.flags |= ELFlagSameScreen;
-				}
-			if (ev->focus) {
-				event->u.enterLeave.flags |= ELFlagFocus;
-				}
-			event->u.u.detail		= ev->detail;
-		}
-		  break;
-	      case FocusIn:
-	      case FocusOut:
-		{
-			register XFocusChangeEvent *ev = (XFocusChangeEvent *) re;
-			event->u.focus.window	= sw32(ev->window, sw);
-			event->u.focus.mode	= ev->mode;
-			event->u.u.detail	= ev->detail;
-		}
-		  break;
-	      case KeymapNotify:
-		{
-			register XKeymapEvent *ev = (XKeymapEvent *) re;
-			memcpy((char *)(((xKeymapEvent *) event)->map),
-			       &ev->key_vector[1], 
-			       sizeof (((xKeymapEvent *) event)->map));
-		}
-		break;
-	      case Expose:
-		{
-			register XExposeEvent *ev = (XExposeEvent *) re;
-			event->u.expose.window		= sw32(ev->window, sw);
-			event->u.expose.x		= sw16(ev->x, sw);
-			event->u.expose.y		= sw16(ev->y, sw);
-			event->u.expose.width		= sw16(ev->width, sw);
-			event->u.expose.height		= sw16(ev->height, sw);
-			event->u.expose.count		= sw16(ev->count, sw);
-		}
-		break;
-	      case GraphicsExpose:
-		{
-		    register XGraphicsExposeEvent *ev =
-			(XGraphicsExposeEvent *) re;
-		    event->u.graphicsExposure.drawable	= sw32(ev->drawable, sw);
-		    event->u.graphicsExposure.x		= sw16(ev->x, sw);
-		    event->u.graphicsExposure.y		= sw16(ev->y, sw);
-		    event->u.graphicsExposure.width	= sw16(ev->width, sw);
-		    event->u.graphicsExposure.height	= sw16(ev->height, sw);
-		    event->u.graphicsExposure.count	= sw16(ev->count, sw);
-		    event->u.graphicsExposure.majorEvent= ev->major_code;
-		    event->u.graphicsExposure.minorEvent= sw16(ev->minor_code, sw);
-		}
-		break;
-	      case NoExpose:
-		{
-		    register XNoExposeEvent *ev = (XNoExposeEvent *) re;
-		    event->u.noExposure.drawable	= sw32(ev->drawable, sw);
-		    event->u.noExposure.majorEvent	= ev->major_code;
-		    event->u.noExposure.minorEvent	= sw16(ev->minor_code, sw);
-		}
-		break;
-	      case VisibilityNotify:
-		{
-		    register XVisibilityEvent *ev = (XVisibilityEvent *) re;
-		    event->u.visibility.window		= sw32(ev->window, sw);
-		    event->u.visibility.state		= ev->state;
-		}
-		break;
-	      case CreateNotify:
-		{
-		    register XCreateWindowEvent *ev =
-			 (XCreateWindowEvent *) re;
-		    event->u.createNotify.window	= sw32(ev->window, sw);
-		    event->u.createNotify.parent	= sw32(ev->parent, sw);
-		    event->u.createNotify.x		= sw16(ev->x, sw);
-		    event->u.createNotify.y		= sw16(ev->y, sw);
-		    event->u.createNotify.width		= sw16(ev->width, sw);
-		    event->u.createNotify.height	= sw16(ev->height, sw);
-		    event->u.createNotify.borderWidth	= sw16(ev->border_width, sw);
-		    event->u.createNotify.override	= ev->override_redirect;
-		}
-		break;
-	      case DestroyNotify:
-		{
-		    register XDestroyWindowEvent *ev =
-				(XDestroyWindowEvent *) re;
-		    event->u.destroyNotify.window	= sw32(ev->window, sw);
-		    event->u.destroyNotify.event	= sw32(ev->event, sw);
-		}
-		break;
-	      case UnmapNotify:
-		{
-		    register XUnmapEvent *ev = (XUnmapEvent *) re;
-		    event->u.unmapNotify.window	= sw32(ev->window, sw);
-		    event->u.unmapNotify.event	= sw32(ev->event, sw);
-		    event->u.unmapNotify.fromConfigure	= ev->from_configure;
-		}
-		break;
-	      case MapNotify:
-		{
-		    register XMapEvent *ev = (XMapEvent *) re;
-		    event->u.mapNotify.window	= sw32(ev->window, sw);
-		    event->u.mapNotify.event	= sw32(ev->event, sw);
-		    event->u.mapNotify.override	= ev->override_redirect;
-		}
-		break;
-	      case MapRequest:
-		{
-		    register XMapRequestEvent *ev = (XMapRequestEvent *) re;
-		    event->u.mapRequest.window	= sw32(ev->window, sw);
-		    event->u.mapRequest.parent	= sw32(ev->parent, sw);
-		}
-		break;
-	      case ReparentNotify:
-		{
-		    register XReparentEvent *ev = (XReparentEvent *) re;
-		    event->u.reparent.window	= sw32(ev->window, sw);
-		    event->u.reparent.event	= sw32(ev->event, sw);
-		    event->u.reparent.parent	= sw32(ev->parent, sw);
-		    event->u.reparent.x		= sw16(ev->x, sw);
-		    event->u.reparent.y		= sw16(ev->y, sw);
-		    event->u.reparent.override	= ev->override_redirect;
-		}
-		break;
-	      case ConfigureNotify:
-		{
-		    register XConfigureEvent *ev = (XConfigureEvent *) re;
-		    event->u.configureNotify.window	= sw32(ev->window, sw);
-		    event->u.configureNotify.event	= sw32(ev->event, sw);
-		    event->u.configureNotify.aboveSibling	= sw32(ev->above, sw);
-		    event->u.configureNotify.x		= sw16(ev->x, sw);
-		    event->u.configureNotify.y		= sw16(ev->y, sw);
-		    event->u.configureNotify.width	= sw16(ev->width, sw);
-		    event->u.configureNotify.height	= sw16(ev->height, sw);
-		    event->u.configureNotify.borderWidth= sw16(ev->border_width, sw);
-		    event->u.configureNotify.override	= ev->override_redirect;
-		}
-		break;
-	      case ConfigureRequest:
-		{
-		    register XConfigureRequestEvent *ev =
-		        (XConfigureRequestEvent *) re;
-		    event->u.configureRequest.window	= sw32(ev->window, sw);
-		    event->u.configureRequest.parent	= sw32(ev->parent, sw);
-		    event->u.configureRequest.sibling   = sw32(ev->above, sw);
-		    event->u.configureRequest.x		= sw16(ev->x, sw);
-		    event->u.configureRequest.y		= sw16(ev->y, sw);
-		    event->u.configureRequest.width	= sw16(ev->width, sw);
-		    event->u.configureRequest.height	= sw16(ev->height, sw);
-		    event->u.configureRequest.borderWidth= sw16(ev->border_width, sw);
-		    event->u.configureRequest.valueMask= sw16(ev->value_mask, sw);
-		    event->u.u.detail 			= ev->detail;
-		}
-		break;
-	      case GravityNotify:
-		{
-		    register XGravityEvent *ev  = (XGravityEvent *) re;
-		    event->u.gravity.window	= sw32(ev->window, sw);
-		    event->u.gravity.event	= sw32(ev->event, sw);
-		    event->u.gravity.x		= sw16(ev->x, sw);
-		    event->u.gravity.y		= sw16(ev->y, sw);
-		}
-		break;
-	      case ResizeRequest:
-		{
-		    register XResizeRequestEvent *ev =
-			(XResizeRequestEvent *) re;
-		    event->u.resizeRequest.window	= sw32(ev->window, sw);
-		    event->u.resizeRequest.width	= sw16(ev->width, sw);
-		    event->u.resizeRequest.height	= sw16(ev->height, sw);
-		}
-		break;
-	      case CirculateNotify:
-		{
-		    register XCirculateEvent *ev = (XCirculateEvent *) re;
-		    event->u.circulate.window		= sw32(ev->window, sw);
-		    event->u.circulate.event		= sw32(ev->event, sw);
-		    event->u.circulate.place		= ev->place;
-		}
-		break;
-	      case CirculateRequest:
-		{
-		    register XCirculateRequestEvent *ev =
-		        (XCirculateRequestEvent *) re;
-		    event->u.circulate.window		= sw32(ev->window, sw);
-		    event->u.circulate.event		= sw32(ev->parent, sw);
-		    event->u.circulate.place		= ev->place;
-		}
-		break;
-	      case PropertyNotify:
-		{
-		    register XPropertyEvent *ev = (XPropertyEvent *) re;
-		    event->u.property.window		= sw32(ev->window, sw);
-		    event->u.property.atom		= sw32(ev->atom, sw);
-		    event->u.property.time		= sw32(ev->time, sw);
-		    event->u.property.state		= ev->state;
-		}
-		break;
-	      case SelectionClear:
-		{
-		    register XSelectionClearEvent *ev =
-			 (XSelectionClearEvent *) re;
-		    event->u.selectionClear.window	= sw32(ev->window, sw);
-		    event->u.selectionClear.atom	= sw32(ev->selection, sw);
-		    event->u.selectionClear.time	= sw32(ev->time, sw);
-		}
-		break;
-	      case SelectionRequest:
-		{
-		    register XSelectionRequestEvent *ev =
-		        (XSelectionRequestEvent *) re;
-		    event->u.selectionRequest.owner	= sw32(ev->owner, sw);
-		    event->u.selectionRequest.requestor	= sw32(ev->requestor, sw);
-		    event->u.selectionRequest.selection	= sw32(ev->selection, sw);
-		    event->u.selectionRequest.target	= sw32(ev->target, sw);
-		    event->u.selectionRequest.property	= sw32(ev->property, sw);
-		    event->u.selectionRequest.time	= sw32(ev->time, sw);
-		}
-		break;
-	      case SelectionNotify:
-		{
-		    register XSelectionEvent *ev = (XSelectionEvent *) re;
-		    event->u.selectionNotify.requestor	= sw32(ev->requestor, sw);
-		    event->u.selectionNotify.selection	= sw32(ev->selection, sw);
-		    event->u.selectionNotify.target	= sw32(ev->target, sw);
-		    event->u.selectionNotify.property	= sw32(ev->property, sw);
-		    event->u.selectionNotify.time	= sw32(ev->time, sw);
-		}
-		break;
-	      case ColormapNotify:
-		{
-		    register XColormapEvent *ev = (XColormapEvent *) re;
-		    event->u.colormap.window		= sw32(ev->window, sw);
-		    event->u.colormap.colormap		= sw32(ev->colormap, sw);
-		    event->u.colormap.new		= ev->new;
-		    event->u.colormap.state		= ev->state;
-	        }
-		break;
-	      case ClientMessage:
-		{
-		   register int i;
-		   register XClientMessageEvent *ev 
-		   			= (XClientMessageEvent *) re;
-		   event->u.clientMessage.window = sw32(ev->window, sw);
-		   event->u.u.detail		 = ev->format;
-		   switch (ev->format) {
-			case 8:	
-			  event->u.clientMessage.u.b.type   = sw32(ev->message_type, sw);
-			  for (i = 0; i < 20; i++)
-			   event->u.clientMessage.u.b.bytes[i] = ev->data.b[i];
-			  break;
-			case 16:
-			  event->u.clientMessage.u.s.type   = sw32(ev->message_type, sw);
-			  event->u.clientMessage.u.s.shorts0   = sw16(ev->data.s[0], sw);
-			  event->u.clientMessage.u.s.shorts1   = sw16(ev->data.s[1], sw);
-			  event->u.clientMessage.u.s.shorts2   = sw16(ev->data.s[2], sw);
-			  event->u.clientMessage.u.s.shorts3   = sw16(ev->data.s[3], sw);
-			  event->u.clientMessage.u.s.shorts4   = sw16(ev->data.s[4], sw);
-			  event->u.clientMessage.u.s.shorts5   = sw16(ev->data.s[5], sw);
-			  event->u.clientMessage.u.s.shorts6   = sw16(ev->data.s[6], sw);
-			  event->u.clientMessage.u.s.shorts7   = sw16(ev->data.s[7], sw);
-			  event->u.clientMessage.u.s.shorts8   = sw16(ev->data.s[8], sw);
-			  event->u.clientMessage.u.s.shorts9   = sw16(ev->data.s[9], sw);
-			  break;
-			case 32:
-			  event->u.clientMessage.u.l.type   = sw32(ev->message_type, sw);
-			  event->u.clientMessage.u.l.longs0   = sw32(ev->data.l[0], sw);
-			  event->u.clientMessage.u.l.longs1   = sw32(ev->data.l[1], sw);
-			  event->u.clientMessage.u.l.longs2   = sw32(ev->data.l[2], sw);
-			  event->u.clientMessage.u.l.longs3   = sw32(ev->data.l[3], sw);
-			  event->u.clientMessage.u.l.longs4   = sw32(ev->data.l[4], sw);
-			  break;
-			default:
-			  /* client passing bogus data, let server complain */
-			  break;
-			}
-		    }
-		break;
-	      case MappingNotify:
-		  {
-		    register XMappingEvent *ev = (XMappingEvent *) re;
-		    event->u.mappingNotify.firstKeyCode = ev->first_keycode;
-		    event->u.mappingNotify.request 	= ev->request;
-		    event->u.mappingNotify.count	= ev->count;
-		   }
-		break;
-		
-	      default:
-		return(0);
-	}
-	/* Common process */
-	if (((XAnyEvent *)re)->send_event)
-	    event->u.u.type &= 0x80;
-	event->u.u.sequenceNumber =
-	    ((XAnyEvent *)re)->serial & ~((unsigned long)0xffff);
-	event->u.u.sequenceNumber = sw16(event->u.u.sequenceNumber, sw);
-	return(1);
-}
-
-
-/*
- * reformat a wire event into an XEvent structure of the right type.
- */
-Bool
-_XimProtoWireToEvent(re, event, sw)
-register XEvent *re;	/* pointer to where event should be reformatted */
-register xEvent *event;	/* wire protocol event */
-Bool sw;                /* swap byte? */
-{
-
-	re->type = event->u.u.type & 0x7f;
-	((XAnyEvent *)re)->serial = sw16(event->u.u.sequenceNumber, sw);
-	((XAnyEvent *)re)->send_event = ((event->u.u.type & 0x80) != 0);
-	((XAnyEvent *)re)->display = NULL;
-	
-	/* Ignore the leading bit of the event type since it is set when a
-		client sends an event rather than the server. */
-
-	switch (event-> u.u.type & 0177) {
-	      case KeyPress:
-	      case KeyRelease:
-	        {
-			register XKeyEvent *ev = (XKeyEvent*) re;
-			ev->root 	= sw32(event->u.keyButtonPointer.root, sw);
-			ev->window 	= sw32(event->u.keyButtonPointer.event, sw);
-			ev->subwindow 	= sw32(event->u.keyButtonPointer.child, sw);
-			ev->time 	= sw32(event->u.keyButtonPointer.time, sw);
-			ev->x 		= cvtINT16toInt(sw16(event->u.keyButtonPointer.eventX, sw));
-			ev->y 		= cvtINT16toInt(sw16(event->u.keyButtonPointer.eventY, sw));
-			ev->x_root 	= cvtINT16toInt(sw16(event->u.keyButtonPointer.rootX, sw));
-			ev->y_root 	= cvtINT16toInt(sw16(event->u.keyButtonPointer.rootY, sw));
-			ev->state	= sw16(event->u.keyButtonPointer.state, sw);
-			ev->same_screen	= event->u.keyButtonPointer.sameScreen;
-			ev->keycode 	= event->u.u.detail;
-		}
-	      	break;
-	      case ButtonPress:
-	      case ButtonRelease:
-	        {
-			register XButtonEvent *ev =  (XButtonEvent *) re;
-			ev->root 	= sw32(event->u.keyButtonPointer.root, sw);
-			ev->window 	= sw32(event->u.keyButtonPointer.event, sw);
-			ev->subwindow 	= sw32(event->u.keyButtonPointer.child, sw);
-			ev->time 	= sw32(event->u.keyButtonPointer.time, sw);
-			ev->x 		= cvtINT16toInt(sw16(event->u.keyButtonPointer.eventX, sw));
-			ev->y 		= cvtINT16toInt(sw16(event->u.keyButtonPointer.eventY, sw));
-			ev->x_root 	= cvtINT16toInt(sw16(event->u.keyButtonPointer.rootX, sw));
-			ev->y_root 	= cvtINT16toInt(sw16(event->u.keyButtonPointer.rootY, sw));
-			ev->state	= sw16(event->u.keyButtonPointer.state, sw);
-			ev->same_screen	= event->u.keyButtonPointer.sameScreen;
-			ev->button 	= event->u.u.detail;
-		}
-	        break;
-	      case MotionNotify:
-	        {
-			register XMotionEvent *ev =   (XMotionEvent *)re;
-			ev->root 	= sw32(event->u.keyButtonPointer.root, sw);
-			ev->window 	= sw32(event->u.keyButtonPointer.event, sw);
-			ev->subwindow 	= sw32(event->u.keyButtonPointer.child, sw);
-			ev->time 	= sw32(event->u.keyButtonPointer.time, sw);
-			ev->x 		= cvtINT16toInt(sw16(event->u.keyButtonPointer.eventX, sw));
-			ev->y 		= cvtINT16toInt(sw16(event->u.keyButtonPointer.eventY, sw));
-			ev->x_root 	= cvtINT16toInt(sw16(event->u.keyButtonPointer.rootX, sw));
-			ev->y_root 	= cvtINT16toInt(sw16(event->u.keyButtonPointer.rootY, sw));
-			ev->state	= sw16(event->u.keyButtonPointer.state, sw);
-			ev->same_screen	= event->u.keyButtonPointer.sameScreen;
-			ev->is_hint 	= event->u.u.detail;
-		}
-	        break;
-	      case EnterNotify:
-	      case LeaveNotify:
-		{
-			register XCrossingEvent *ev   = (XCrossingEvent *) re;
-			ev->root	= sw32(event->u.enterLeave.root, sw);
-			ev->window	= sw32(event->u.enterLeave.event, sw);
-			ev->subwindow	= sw32(event->u.enterLeave.child, sw);
-			ev->time	= sw32(event->u.enterLeave.time, sw);
-			ev->x		= cvtINT16toInt(sw16(event->u.enterLeave.eventX, sw));
-			ev->y		= cvtINT16toInt(sw16(event->u.enterLeave.eventY, sw));
-			ev->x_root	= cvtINT16toInt(sw16(event->u.enterLeave.rootX, sw));
-			ev->y_root	= cvtINT16toInt(sw16(event->u.enterLeave.rootY, sw));
-			ev->state	= sw16(event->u.enterLeave.state, sw);
-			ev->mode	= event->u.enterLeave.mode;
-			ev->same_screen = (event->u.enterLeave.flags & 
-				ELFlagSameScreen) && True;
-			ev->focus	= (event->u.enterLeave.flags &
-			  	ELFlagFocus) && True;
-			ev->detail	= event->u.u.detail;
-		}
-		  break;
-	      case FocusIn:
-	      case FocusOut:
-		{
-			register XFocusChangeEvent *ev = (XFocusChangeEvent *) re;
-			ev->window 	= sw32(event->u.focus.window, sw);
-			ev->mode	= event->u.focus.mode;
-			ev->detail	= event->u.u.detail;
-		}
-		  break;
-	      case KeymapNotify:
-		{
-			register XKeymapEvent *ev = (XKeymapEvent *) re;
-			ev->window	= None;
-			memcpy(&ev->key_vector[1], 
-			       (char *)((xKeymapEvent *) event)->map,
-			       sizeof (((xKeymapEvent *) event)->map));
-		}
-		break;
-	      case Expose:
-		{
-			register XExposeEvent *ev = (XExposeEvent *) re;
-			ev->window	= sw32(event->u.expose.window, sw);
-			ev->x		= sw16(event->u.expose.x, sw);
-			ev->y		= sw16(event->u.expose.y, sw);
-			ev->width	= sw16(event->u.expose.width, sw);
-			ev->height	= sw16(event->u.expose.height, sw);
-			ev->count	= sw16(event->u.expose.count, sw);
-		}
-		break;
-	      case GraphicsExpose:
-		{
-		    register XGraphicsExposeEvent *ev =
-			(XGraphicsExposeEvent *) re;
-		    ev->drawable	= sw32(event->u.graphicsExposure.drawable, sw);
-		    ev->x		= sw16(event->u.graphicsExposure.x, sw);
-		    ev->y		= sw16(event->u.graphicsExposure.y, sw);
-		    ev->width		= sw16(event->u.graphicsExposure.width, sw);
-		    ev->height		= sw16(event->u.graphicsExposure.height, sw);
-		    ev->count		= sw16(event->u.graphicsExposure.count, sw);
-		    ev->major_code	= event->u.graphicsExposure.majorEvent;
-		    ev->minor_code	= sw16(event->u.graphicsExposure.minorEvent, sw);
-		}
-		break;
-	      case NoExpose:
-		{
-		    register XNoExposeEvent *ev = (XNoExposeEvent *) re;
-		    ev->drawable	= sw32(event->u.noExposure.drawable, sw);
-		    ev->major_code	= event->u.noExposure.majorEvent;
-		    ev->minor_code	= sw16(event->u.noExposure.minorEvent, sw);
-		}
-		break;
-	      case VisibilityNotify:
-		{
-		    register XVisibilityEvent *ev = (XVisibilityEvent *) re;
-		    ev->window		= sw32(event->u.visibility.window, sw);
-		    ev->state		= event->u.visibility.state;
-		}
-		break;
-	      case CreateNotify:
-		{
-		    register XCreateWindowEvent *ev =
-			 (XCreateWindowEvent *) re;
-		    ev->window		= sw32(event->u.createNotify.window, sw);
-		    ev->parent		= sw32(event->u.createNotify.parent, sw);
-		    ev->x		= cvtINT16toInt(sw16(event->u.createNotify.x, sw));
-		    ev->y		= cvtINT16toInt(sw16(event->u.createNotify.y, sw));
-		    ev->width		= sw16(event->u.createNotify.width, sw);
-		    ev->height		= sw16(event->u.createNotify.height, sw);
-		    ev->border_width	= sw16(event->u.createNotify.borderWidth, sw);
-		    ev->override_redirect	= event->u.createNotify.override;
-		}
-		break;
-	      case DestroyNotify:
-		{
-		    register XDestroyWindowEvent *ev =
-				(XDestroyWindowEvent *) re;
-		    ev->window		= sw32(event->u.destroyNotify.window, sw);
-		    ev->event		= sw32(event->u.destroyNotify.event, sw);
-		}
-		break;
-	      case UnmapNotify:
-		{
-		    register XUnmapEvent *ev = (XUnmapEvent *) re;
-		    ev->window		= sw32(event->u.unmapNotify.window, sw);
-		    ev->event		= sw32(event->u.unmapNotify.event, sw);
-		    ev->from_configure	= event->u.unmapNotify.fromConfigure;
-		}
-		break;
-	      case MapNotify:
-		{
-		    register XMapEvent *ev = (XMapEvent *) re;
-		    ev->window		= sw32(event->u.mapNotify.window, sw);
-		    ev->event		= sw32(event->u.mapNotify.event, sw);
-		    ev->override_redirect	= event->u.mapNotify.override;
-		}
-		break;
-	      case MapRequest:
-		{
-		    register XMapRequestEvent *ev = (XMapRequestEvent *) re;
-		    ev->window		= sw32(event->u.mapRequest.window, sw);
-		    ev->parent		= sw32(event->u.mapRequest.parent, sw);
-		}
-		break;
-	      case ReparentNotify:
-		{
-		    register XReparentEvent *ev = (XReparentEvent *) re;
-		    ev->event		= sw32(event->u.reparent.event, sw);
-		    ev->window		= sw32(event->u.reparent.window, sw);
-		    ev->parent		= sw32(event->u.reparent.parent, sw);
-		    ev->x		= cvtINT16toInt(sw16(event->u.reparent.x, sw));
-		    ev->y		= cvtINT16toInt(sw16(event->u.reparent.y, sw));
-		    ev->override_redirect	= event->u.reparent.override;
-		}
-		break;
-	      case ConfigureNotify:
-		{
-		    register XConfigureEvent *ev = (XConfigureEvent *) re;
-		    ev->event	= sw32(event->u.configureNotify.event, sw);
-		    ev->window	= sw32(event->u.configureNotify.window, sw);
-		    ev->above	= sw32(event->u.configureNotify.aboveSibling, sw);
-		    ev->x	= cvtINT16toInt(sw16(event->u.configureNotify.x, sw));
-		    ev->y	= cvtINT16toInt(sw16(event->u.configureNotify.y, sw));
-		    ev->width	= sw16(event->u.configureNotify.width, sw);
-		    ev->height	= sw16(event->u.configureNotify.height, sw);
-		    ev->border_width  = sw16(event->u.configureNotify.borderWidth, sw);
-		    ev->override_redirect = event->u.configureNotify.override;
-		}
-		break;
-	      case ConfigureRequest:
-		{
-		    register XConfigureRequestEvent *ev =
-		        (XConfigureRequestEvent *) re;
-		    ev->window		= sw32(event->u.configureRequest.window, sw);
-		    ev->parent		= sw32(event->u.configureRequest.parent, sw);
-		    ev->above		= sw32(event->u.configureRequest.sibling, sw);
-		    ev->x		= cvtINT16toInt(sw16(event->u.configureRequest.x, sw));
-		    ev->y		= cvtINT16toInt(sw16(event->u.configureRequest.y, sw));
-		    ev->width		= sw16(event->u.configureRequest.width, sw);
-		    ev->height		= sw16(event->u.configureRequest.height, sw);
-		    ev->border_width	= sw16(event->u.configureRequest.borderWidth, sw);
-		    ev->value_mask	= sw16(event->u.configureRequest.valueMask, sw);
-		    ev->detail  	= event->u.u.detail;
-		}
-		break;
-	      case GravityNotify:
-		{
-		    register XGravityEvent *ev = (XGravityEvent *) re;
-		    ev->window		= sw32(event->u.gravity.window, sw);
-		    ev->event		= sw32(event->u.gravity.event, sw);
-		    ev->x		= cvtINT16toInt(sw16(event->u.gravity.x, sw));
-		    ev->y		= cvtINT16toInt(sw16(event->u.gravity.y, sw));
-		}
-		break;
-	      case ResizeRequest:
-		{
-		    register XResizeRequestEvent *ev =
-			(XResizeRequestEvent *) re;
-		    ev->window		= sw32(event->u.resizeRequest.window, sw);
-		    ev->width		= sw16(event->u.resizeRequest.width, sw);
-		    ev->height		= sw16(event->u.resizeRequest.height, sw);
-		}
-		break;
-	      case CirculateNotify:
-		{
-		    register XCirculateEvent *ev = (XCirculateEvent *) re;
-		    ev->window		= sw32(event->u.circulate.window, sw);
-		    ev->event		= sw32(event->u.circulate.event, sw);
-		    ev->place		= event->u.circulate.place;
-		}
-		break;
-	      case CirculateRequest:
-		{
-		    register XCirculateRequestEvent *ev =
-		        (XCirculateRequestEvent *) re;
-		    ev->window		= sw32(event->u.circulate.window, sw);
-		    ev->parent		= sw32(event->u.circulate.event, sw);
-		    ev->place		= event->u.circulate.place;
-		}
-		break;
-	      case PropertyNotify:
-		{
-		    register XPropertyEvent *ev = (XPropertyEvent *) re;
-		    ev->window		= sw32(event->u.property.window, sw);
-		    ev->atom		= sw32(event->u.property.atom, sw);
-		    ev->time		= sw32(event->u.property.time, sw);
-		    ev->state		= event->u.property.state;
-		}
-		break;
-	      case SelectionClear:
-		{
-		    register XSelectionClearEvent *ev =
-			 (XSelectionClearEvent *) re;
-		    ev->window		= sw32(event->u.selectionClear.window, sw);
-		    ev->selection	= sw32(event->u.selectionClear.atom, sw);
-		    ev->time		= sw32(event->u.selectionClear.time, sw);
-		}
-		break;
-	      case SelectionRequest:
-		{
-		    register XSelectionRequestEvent *ev =
-		        (XSelectionRequestEvent *) re;
-		    ev->owner		= sw32(event->u.selectionRequest.owner, sw);
-		    ev->requestor	= sw32(event->u.selectionRequest.requestor, sw);
-		    ev->selection	= sw32(event->u.selectionRequest.selection, sw);
-		    ev->target		= sw32(event->u.selectionRequest.target, sw);
-		    ev->property	= sw32(event->u.selectionRequest.property, sw);
-		    ev->time		= sw32(event->u.selectionRequest.time, sw);
-		}
-		break;
-	      case SelectionNotify:
-		{
-		    register XSelectionEvent *ev = (XSelectionEvent *) re;
-		    ev->requestor	= sw32(event->u.selectionNotify.requestor, sw);
-		    ev->selection	= sw32(event->u.selectionNotify.selection, sw);
-		    ev->target		= sw32(event->u.selectionNotify.target, sw);
-		    ev->property	= sw32(event->u.selectionNotify.property, sw);
-		    ev->time		= sw32(event->u.selectionNotify.time, sw);
-		}
-		break;
-	      case ColormapNotify:
-		{
-		    register XColormapEvent *ev = (XColormapEvent *) re;
-		    ev->window		= sw32(event->u.colormap.window, sw);
-		    ev->colormap	= sw32(event->u.colormap.colormap, sw);
-		    ev->new		= event->u.colormap.new;
-		    ev->state		= event->u.colormap.state;
-	        }
-		break;
-	      case ClientMessage:
-		{
-		   register int i;
-		   register XClientMessageEvent *ev 
-		   			= (XClientMessageEvent *) re;
-		   ev->window		= sw32(event->u.clientMessage.window, sw);
-		   ev->format		= event->u.u.detail;
-		   switch (ev->format) {
-			case 8:	
-			   ev->message_type = sw32(event->u.clientMessage.u.b.type, sw);
-			   for (i = 0; i < 20; i++) 	
-			     ev->data.b[i] = event->u.clientMessage.u.b.bytes[i];
-			   break;
-			case 16:
-			   ev->message_type = sw32(event->u.clientMessage.u.s.type, sw);
-			   ev->data.s[0] = cvtINT16toShort(sw16(event->u.clientMessage.u.s.shorts0, sw));
-			   ev->data.s[1] = cvtINT16toShort(sw16(event->u.clientMessage.u.s.shorts1, sw));
-			   ev->data.s[2] = cvtINT16toShort(sw16(event->u.clientMessage.u.s.shorts2, sw));
-			   ev->data.s[3] = cvtINT16toShort(sw16(event->u.clientMessage.u.s.shorts3, sw));
-			   ev->data.s[4] = cvtINT16toShort(sw16(event->u.clientMessage.u.s.shorts4, sw));
-			   ev->data.s[5] = cvtINT16toShort(sw16(event->u.clientMessage.u.s.shorts5, sw));
-			   ev->data.s[6] = cvtINT16toShort(sw16(event->u.clientMessage.u.s.shorts6, sw));
-			   ev->data.s[7] = cvtINT16toShort(sw16(event->u.clientMessage.u.s.shorts7, sw));
-			   ev->data.s[8] = cvtINT16toShort(sw16(event->u.clientMessage.u.s.shorts8, sw));
-			   ev->data.s[9] = cvtINT16toShort(sw16(event->u.clientMessage.u.s.shorts9, sw));
-			   break;
-			case 32:
-			   ev->message_type = sw32(event->u.clientMessage.u.l.type, sw);
-			   ev->data.l[0] = cvtINT32toLong(sw32(event->u.clientMessage.u.l.longs0, sw));
-			   ev->data.l[1] = cvtINT32toLong(sw32(event->u.clientMessage.u.l.longs1, sw));
-			   ev->data.l[2] = cvtINT32toLong(sw32(event->u.clientMessage.u.l.longs2, sw));
-			   ev->data.l[3] = cvtINT32toLong(sw32(event->u.clientMessage.u.l.longs3, sw));
-			   ev->data.l[4] = cvtINT32toLong(sw32(event->u.clientMessage.u.l.longs4, sw));
-			   break;
-			default: /* XXX should never occur */
-				break;
-		    }
-	        }
-		break;
-	      case MappingNotify:
-		{
-		   register XMappingEvent *ev = (XMappingEvent *)re;
-		   ev->window		= 0;
-		   ev->first_keycode 	= event->u.mappingNotify.firstKeyCode;
-		   ev->request 		= event->u.mappingNotify.request;
-		   ev->count 		= event->u.mappingNotify.count;
-		}
-		break;
-	      default:
-		return(False);
-	}
-	return(True);
-}
diff --git a/xc/lib/X11/imExten.c b/xc/lib/X11/imExten.c
deleted file mode 100644
index 43c79cc80..000000000
--- a/xc/lib/X11/imExten.c
+++ /dev/null
@@ -1,612 +0,0 @@
-/* $XConsortium: imExten.c /main/6 1995/12/06 11:23:36 kaleb $ */
-/******************************************************************
-
-           Copyright 1992, 1993, 1994 by FUJITSU LIMITED
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of FUJITSU LIMITED
-not be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-FUJITSU LIMITED makes no representations about the suitability of
-this software for any purpose. 
-It is provided "as is" without express or implied warranty.
-
-FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-  Author: Takashi Fujiwara     FUJITSU LIMITED 
-                               fujiwara@a80.tech.yk.fujitsu.co.jp
-
-******************************************************************/
-
-#include <X11/Xatom.h>
-#define NEED_EVENTS
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "Ximint.h"
-
-/*
- * index of extensions
- */
-
-#define	XIM_EXT_SET_EVENT_MASK_IDX	0
-#ifdef EXT_FORWARD
-#define	XIM_EXT_FORWARD_KEYEVENT_IDX	1
-#endif
-#ifdef EXT_MOVE
-#define	XIM_EXT_MOVE_IDX		2
-#endif
-
-typedef struct	_XIM_QueryExtRec {
-    Bool	 is_support;
-    char	*name;
-    int		 name_len;
-    CARD16	 major_opcode;
-    CARD16	 minor_opcode;
-    int		 idx;
-} XIM_QueryExtRec;
-
-Private XIM_QueryExtRec	extensions[] = {
-	{False, "XIM_EXT_SET_EVENT_MASK", 0, 0, 0,
-					XIM_EXT_SET_EVENT_MASK_IDX}, 
-#ifdef EXT_FORWARD
-	{False, "XIM_EXT_FORWARD_KEYEVENT", 0, 0, 0,
-					XIM_EXT_FORWARD_KEYEVENT_IDX},
-#endif
-#ifdef EXT_MOVE
-	{False, "XIM_EXT_MOVE", 0, 0, 0, XIM_EXT_MOVE_IDX},
-#endif
-	{False, NULL, 0, 0, 0, 0}		/* dummy */
-};
-
-Private int
-_XimIsSupportExt(idx)
-    int		 idx;
-{
-    register int i;
-    int		 n = XIMNumber(extensions) - 1;
-
-    for (i = 0; i < n; i++) {
-	if (extensions[i].idx == idx)
-	    if (extensions[i].is_support)
-		return i;
-	    else
-		break;
-    }
-    return -1;
-}
-
-Private Bool
-_XimProcExtSetEventMask(im, ic, buf)
-    Xim		 im;
-    Xic		 ic;
-    XPointer	 buf;
-{
-    EVENTMASK	*buf_l = (EVENTMASK *)buf;
-    EVENTMASK	 select_mask = _XimGetWindowEventmask(ic);
-
-    ic->private.proto.filter_event_mask      = buf_l[0];
-    ic->private.proto.intercept_event_mask   = buf_l[1];
-    ic->private.proto.select_event_mask      = buf_l[2];
-    ic->private.proto.forward_event_mask     = buf_l[3];
-    ic->private.proto.synchronous_event_mask = buf_l[4];
-
-    select_mask &= ~ic->private.proto.intercept_event_mask;
-						/* deselected event mask */
-    select_mask |= ic->private.proto.select_event_mask;
-						/* selected event mask */
-    XSelectInput(im->core.display, ic->core.focus_window, select_mask);
-    _XimReregisterFilter(ic);
-
-    if (!(_XimProcSyncReply(im, ic)))
-	return False;
-    return True;
-}
-
-Private Bool
-#if NeedFunctionPrototypes
-_XimExtSetEventMaskCallback(
-    Xim		 xim,
-    INT16	 len,
-    XPointer	 data,
-    XPointer	 call_data)
-#else
-_XimExtSetEventMaskCallback(xim, len, data, call_data)
-    Xim		 xim;
-    INT16	 len;
-    XPointer	 data;
-    XPointer	 call_data;
-#endif /* NeedFunctionPrototypes */
-{
-    CARD16	*buf_s = (CARD16 *)((CARD8 *)data + XIM_HEADER_SIZE);
-    XIMID	 imid = buf_s[0];
-    XICID	 icid = buf_s[1];
-    Xim		 im = (Xim)call_data;
-    Xic		 ic;
-
-    if ((imid == im->private.proto.imid)
-     && (ic = _XimICOfXICID(im, icid))) {
-	(void)_XimProcExtSetEventMask(im, ic, (XPointer)&buf_s[2]);
-	return True;
-    }
-    return False;
-}
-
-#ifdef EXT_FORWARD
-Private Bool
-_XimProcExtForwardKeyEvent(im, ic, buf)
-    Xim		 im;
-    Xic		 ic;
-    XPointer	 buf;
-{
-    CARD8	*buf_b = (CARD8 *)buf;
-    CARD16	*buf_s = (CARD16 *)buf;
-    CARD32	*buf_l = (CARD32 *)buf;
-    XEvent	 ev;
-    XKeyEvent	*kev = (XKeyEvent *)&ev;
-
-    bzero(&ev, sizeof(XEvent));
-    kev->send_event	= False;
-    kev->display	= im->core.display;
-    kev->serial		= buf_s[1];		/* sequence number */
-    kev->type		= buf_b[4] & 0x7f;	/* xEvent.u.u.type */
-    kev->keycode	= buf_b[5];		/* Keycode */
-    kev->state		= buf_s[3];		/* state */
-    kev->time		= buf_l[2];		/* time */
-
-    XPutBackEvent(im->core.display, &ev);
-
-    _XimRespSyncReply(ic, buf_s[0]);
-    MARK_FABLICATED(ic);
-
-    return True;
-}
-
-Private Bool
-#if NeedFunctionPrototypes
-_XimExtForwardKeyEventCallback(
-    Xim		 xim,
-    INT16	 len,
-    XPointer	 data,
-    XPointer	 call_data)
-#else
-_XimExtForwardKeyEventCallback(xim, len, data, call_data)
-    Xim		 xim;
-    INT16	 len;
-    XPointer	 data;
-    XPointer	 call_data;
-#endif /* NeedFunctionPrototypes */
-{
-    CARD16	*buf_s = (CARD16 *)((CARD8 *)data + XIM_HEADER_SIZE);
-    XIMID	 imid = buf_s[0];
-    XICID	 icid = buf_s[1];
-    Xim		 im = (Xim)call_data;
-    Xic		 ic;
-
-    if ((imid == im->private.proto.imid)
-     && (ic = _XimICOfXICID(im, icid))) {
-	(void)_XimProcExtForwardKeyEvent(im, ic, (XPointer)&buf_s[2]);
-	return True;
-    }
-    return False;
-}
-
-Private Bool
-#if NeedFunctionPrototypes
-_XimExtForwardKeyEventCheck(
-    Xim          im,
-    INT16        len,
-    XPointer	 data,
-    XPointer     arg)
-#else
-_XimExtForwardKeyEventCheck(im, len, data, arg)
-    Xim          im;
-    INT16        len;
-    XPointer	 data;
-    XPointer     arg;
-#endif
-{
-    Xic		 ic  = (Xic)arg;
-    CARD16	*buf_s = (CARD16 *)((CARD8 *)data + XIM_HEADER_SIZE);
-    CARD8	 major_opcode = *((CARD8 *)data);
-    CARD8	 minor_opcode = *((CARD8 *)data + 1);
-    XIMID	 imid = buf_s[0];
-    XICID	 icid = buf_s[1];
-
-    if ((major_opcode == XIM_SYNC_REPLY)
-     && (minor_opcode == 0)
-     && (imid == im->private.proto.imid)
-     && (icid == ic->private.proto.icid))
-    if ((major_opcode == XIM_ERROR)
-     && (minor_opcode == 0)
-     && (buf_s[2] & XIM_IMID_VALID)
-     && (imid == im->private.proto.imid)
-     && (buf_s[2] & XIM_ICID_VALID)
-     && (icid == ic->private.proto.icid))
-	return True;
-    return False;
-}
-
-Public Bool
-_XimExtForwardKeyEvent(ic, ev, sync)
-    Xic		 ic;
-    XKeyEvent	*ev;
-    Bool	 sync;
-{
-    Xim		 im = (Xim) ic->core.im;
-    CARD32	 buf32[BUFSIZE/4];
-    CARD8	*buf = (CARD8 *)buf32;
-    CARD8	*buf_b = &buf[XIM_HEADER_SIZE];	
-    CARD16	*buf_s = (CARD16 *)buf_b;
-    CARD32	*buf_l = (CARD32 *)buf_b;
-    CARD32	 reply32[BUFSIZE/4];
-    char	*reply = (char *)reply32;
-    XPointer	preply;
-    int		buf_size;
-    int		ret_code;
-    INT16	len;
-    int		idx;
-
-    if ((idx = _XimIsSupportExt(XIM_EXT_FORWARD_KEYEVENT_IDX)) < 0)
-	return False;
-
-    buf_s[0] = im->private.proto.imid;		/* imid */
-    buf_s[1] = ic->private.proto.icid;		/* icid */
-    buf_s[2] = sync ? XimSYNCHRONUS : 0;	/* flag */
-    buf_s[3] = (CARD16)(((XAnyEvent *)ev)->serial & ((unsigned long) 0xffff));
-						/* sequence number */
-    buf_b[8] = ev->type;			/* xEvent.u.u.type */
-    buf_b[9] = ev->keycode;			/* keycode */
-    buf_s[5] = ev->state;			/* state */
-    buf_l[3] = ev->time;			/* time */
-    len = sizeof(CARD16)			/* sizeof imid */
-	+ sizeof(CARD16)			/* sizeof icid */
-	+ sizeof(BITMASK16)			/* sizeof flag */
-	+ sizeof(CARD16)			/* sizeof sequence number */
-	+ sizeof(BYTE)				/* sizeof xEvent.u.u.type */
-	+ sizeof(BYTE)				/* sizeof keycode */
-	+ sizeof(CARD16)			/* sizeof state */
-	+ sizeof(CARD32);			/* sizeof time */
-
-    _XimSetHeader((XPointer)buf,
-		extensions[idx].major_opcode,
-		extensions[idx].minor_opcode, &len);
-    if (!(_XimWrite(im, len, (XPointer)buf)))
-	return False;
-    _XimFlush(im);
-    if (sync) {
-    	buf_size = BUFSIZE;
-    	ret_code = _XimRead(im, &len, (XPointer)reply, buf_size,
-    				_XimExtForwardKeyEventCheck, (XPointer)ic);
-    	if(ret_code == XIM_TRUE) {
-    	    preply = reply;
-    	} else if(ret_code == XIM_OVERFLOW) {
-    	    if(len <= 0) {
-    		preply = reply;
-    	    } else {
-    		buf_sizex = len;
-    		preply = (XPointer)Xmalloc(buf_size);
-    		ret_code = _XimRead(im, &len, preply, buf_size,
-    				_XimExtForwardKeyEventCheck, (XPointer)ic);
-    		if(ret_code != XIM_TRUE) {
-		    Xfree(preply);
-    		    return False;
-		}
-    	    }
-    	} else
-	    return False;
-    	buf_s = (CARD16 *)((char *)preply + XIM_HEADER_SIZE);
-    	if (*((CARD8 *)preply) == XIM_ERROR) {
-	    _XimProcError(im, 0, (XPointer)&buf_s[3]);
-    	    if(reply != preply)
-    		Xfree(preply);
-	    return False;
-	}
-    	if(reply != preply)
-    	    Xfree(preply);
-    }
-    return True;
-}
-#endif /* EXT_FORWARD */
-
-Private int
-_XimCheckExtensionListSize()
-{
-    register int i;
-    int		 len;
-    int		 total = 0;
-    int		 n = XIMNumber(extensions) - 1;
-
-    for (i = 0; i < n; i++) {
-	len = strlen(extensions[i].name);
-	extensions[i].name_len = len;
-	len += sizeof(BYTE);
-	total += len;
-    }
-    return total;
-}
-
-Private void
-_XimSetExtensionList(buf)
-    CARD8	*buf;
-{
-    register int i;
-    int		 len;
-    int		 n = XIMNumber(extensions) - 1;
-
-    for (i = 0; i < n; i++) {
-	len = extensions[i].name_len;
-	buf[0] = (BYTE)len;
-	(void)strcpy((char *)&buf[1], extensions[i].name);
-	len += sizeof(BYTE);
-	buf += len;
-    }
-    return;
-}
-
-Private unsigned int
-_XimCountNumberOfExtension(total, ext)
-    INT16	 total;
-    CARD8	*ext;
-{
-    unsigned int n;
-    INT16	 len;
-    INT16	 min_len = sizeof(CARD8)
-			 + sizeof(CARD8)
-			 + sizeof(INT16);
-
-    n = 0;
-    while (total > min_len) {
-	len = *((INT16 *)(&ext[2]));
-	len += (min_len + XIM_PAD(len));
-	total -= len;
-	ext += len;
-	n++;
-    }
-    return n;
-}
-
-Private Bool
-_XimParseExtensionList(im, data)
-    Xim			 im;
-    CARD16		*data;
-{
-    int			 num = XIMNumber(extensions) - 1;
-    unsigned int	 n;
-    CARD8		*buf;
-    register int	 i;
-    register int	 j;
-    INT16		 len;
-
-    if (!(n = _XimCountNumberOfExtension(data[0], (CARD8 *)&data[1])))
-	return True;
-
-    buf = (CARD8 *)&data[1];;
-    for (i = 0; i < n; i++) {
-	len = *((INT16 *)(&buf[2]));
-	for (j = 0; j < num; j++) {
-	    if (!(strncmp(extensions[j].name, (char *)&buf[4], len))) {
-		extensions[j].major_opcode = buf[0];
-		extensions[j].minor_opcode = buf[1];
-		extensions[j].is_support   = True;
-		break;
-	    }
-	}
-	len += sizeof(CARD8)		/* sizeof major_opcode */
-	     + sizeof(CARD8)		/* sizeof minor_opcode */
-	     + sizeof(INT16)		/* sizeof length */
-	     + XIM_PAD(len);		/* sizeof pad */
-	buf += len; 
-    }
-
-    return True;
-}
-
-Private Bool
-#if NeedFunctionPrototypes
-_XimQueryExtensionCheck(
-    Xim          im,
-    INT16        len,
-    XPointer	 data,
-    XPointer     arg)
-#else
-_XimQueryExtensionCheck(im, len, data, arg)
-    Xim          im;
-    INT16        len;
-    XPointer	 data;
-    XPointer     arg;
-#endif
-{
-    CARD16	*buf_s = (CARD16 *)((CARD8 *)data + XIM_HEADER_SIZE);
-    CARD8	 major_opcode = *((CARD8 *)data);
-    CARD8	 minor_opcode = *((CARD8 *)data + 1);
-    XIMID	 imid = buf_s[0];
-
-    if ((major_opcode == XIM_QUERY_EXTENSION_REPLY)
-     && (minor_opcode == 0)
-     && (imid == im->private.proto.imid))
-	return True;
-    if ((major_opcode == XIM_ERROR)
-     && (minor_opcode == 0)
-     && (buf_s[2] & XIM_IMID_VALID)
-     && (imid == im->private.proto.imid))
-	return True;
-    return False;
-}
-
-Public Bool
-_XimExtension(im)
-    Xim		 im;
-{
-    CARD8	*buf;
-    CARD16	*buf_s;
-    int		 buf_len;
-    INT16	 len;
-    CARD32	 reply32[BUFSIZE/4];
-    char	*reply = (char *)reply32;
-    XPointer	 preply;
-    int		 buf_size;
-    int		 ret_code;
-    int		 idx;
-
-    if (!(len = _XimCheckExtensionListSize()))
-	return True;
-
-    buf_len = XIM_HEADER_SIZE
-	    + sizeof(CARD16)
-	    + sizeof(INT16)
-	    + len
-	    + XIM_PAD(len);
-
-    if (!(buf = (CARD8 *)Xmalloc(buf_len)))
-	return False;
-    buf_s = (CARD16 *)&buf[XIM_HEADER_SIZE];
-
-    buf_s[0] = im->private.proto.imid;	/* imid */
-    buf_s[1] = len;			/* length of Extensions */
-    _XimSetExtensionList((CARD8 *)&buf_s[2]);
-					/* extensions supported */
-    XIM_SET_PAD(&buf_s[2], len);	/* pad */
-    len += sizeof(CARD16)		/* sizeof imid */
-	 + sizeof(INT16);		/* sizeof length of extensions */
-
-   _XimSetHeader((XPointer)buf, XIM_QUERY_EXTENSION, 0, &len);
-    if (!(_XimWrite(im, len, (XPointer)buf)))
-	return False;
-    _XimFlush(im);
-    buf_size = BUFSIZE;
-    ret_code = _XimRead(im, &len, (XPointer)reply, buf_size,
-    					_XimQueryExtensionCheck, 0);
-    if(ret_code == XIM_TRUE) {
-    	preply = reply;
-    } else if(ret_code == XIM_OVERFLOW) {
-    	if(len <= 0) {
-    	    preply = reply;
-    	} else {
-    	    buf_size = len;
-    	    preply = (XPointer)Xmalloc(buf_size);
-    	    ret_code = _XimRead(im, &len, reply, buf_size,
-    					_XimQueryExtensionCheck, 0);
-    	    if(ret_code != XIM_TRUE) {
-		Xfree(preply);
-    		return False;
-	    }
-    	}
-    } else
-	return False;
-    buf_s = (CARD16 *)((char *)preply + XIM_HEADER_SIZE);
-    if (*((CARD8 *)preply) == XIM_ERROR) {
-	_XimProcError(im, 0, (XPointer)&buf_s[3]);
-    	if(reply != preply)
-    	    Xfree(preply);
-	return False;
-    }
-
-    if (!(_XimParseExtensionList(im, &buf_s[1]))) {
-    	if(reply != preply)
-    	    Xfree(preply);
-	return False;
-    }
-    if(reply != preply)
-    	Xfree(preply);
-
-    if ((idx = _XimIsSupportExt(XIM_EXT_SET_EVENT_MASK_IDX)) >= 0)
-	_XimRegProtoIntrCallback(im,
-	 	extensions[idx].major_opcode,
-	 	extensions[idx].minor_opcode,
-		_XimExtSetEventMaskCallback, (XPointer)im);
-#ifdef EXT_FORWARD
-    if ((idx = _XimIsSupportExt(XIM_EXT_FORWARD_KEYEVENT_IDX)) >= 0)
-	_XimRegProtoIntrCallback(im,
-		extensions[idx].major_opcode,
-		extensions[idx].minor_opcode,
-		_XimExtForwardKeyEventCallback, (XPointer)im);
-#endif
-
-    return True;
-}
-
-#ifdef EXT_MOVE
-/* flag of ExtenArgCheck */
-#define	EXT_XNSPOTLOCATION	(1L<<0)
-
-/* macro for ExtenArgCheck */
-#define SET_EXT_XNSPOTLOCATION(flag) (flag |= EXT_XNSPOTLOCATION)
-#define IS_EXT_XNSPOTLOCATION(flag)  (flag & EXT_XNSPOTLOCATION)
-
-/* length of XPoint attribute */
-#define	XIM_Xpoint_length	12
-
-Private Bool
-_XimExtMove(im, ic, x, y)
-    Xim		 im;
-    Xic		 ic;
-    CARD16	 x;
-    CARD16	 y;
-{
-    CARD32	 buf32[BUFSIZE/4];
-    CARD8	*buf = (CARD8 *)buf32;
-    CARD16	*buf_s = (CARD16 *)&buf[XIM_HEADER_SIZE];
-    INT16	 len;
-    int		idx;
-
-    if ((idx = _XimIsSupportExt(XIM_EXT_MOVE_IDX)) < 0)
-	return False;
-
-    buf_s[0] = im->private.proto.imid;	/* imid */
-    buf_s[1] = ic->private.proto.icid;	/* icid */
-    buf_s[2] = x;			/* X */
-    buf_s[3] = y;			/* Y */
-    len = sizeof(CARD16)		/* sizeof imid */
-	+ sizeof(CARD16)		/* sizeof icid */
-	+ sizeof(INT16)			/* sizeof X */
-	+ sizeof(INT16);		/* sizeof Y */
-
-    _XimSetHeader((XPointer)buf, extensions[idx].major_opcode,
-			extensions[idx].minor_opcode, &len);
-    if (!(_XimWrite(im, len, (XPointer)buf)))
-	return False;
-    _XimFlush(im);
-    return True;
-}
-
-Public BITMASK32
-_XimExtenArgCheck(arg)
-    XIMArg	*arg;
-{
-    CARD32	flag = 0L;
-    if (!strcmp(arg->name, XNSpotLocation))
-	SET_EXT_XNSPOTLOCATION(flag);
-    return flag;
-}
-
-Public Bool
-#if NeedFunctionPrototypes
-_XimExtenMove(
-    Xim		 im,
-    Xic		 ic,
-    CARD32	 flag,
-    CARD16	*buf,
-    INT16	 length)
-#else
-_XimExtenMove(im, ic, flag, buf, length)
-    Xim		 im;
-    Xic		 ic;
-    CARD32	 flag;
-    CARD16	*buf;
-    INT16	 length;
-#endif /* NeedFunctionPrototypes */
-{
-    if ((IS_EXT_XNSPOTLOCATION(flag)) && (length == XIM_Xpoint_length))
-	return _XimExtMove(im, ic, buf[4], buf[5]);
-    return False;
-}
-#endif /* EXT_MOVE */
diff --git a/xc/lib/X11/imImSw.c b/xc/lib/X11/imImSw.c
deleted file mode 100644
index bed76f840..000000000
--- a/xc/lib/X11/imImSw.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* $XConsortium: imImSw.c,v 1.2 94/01/20 18:04:32 rws Exp $ */
-/******************************************************************
-
-          Copyright 1992, 1993 by FUJITSU LIMITED
-          Copyright 1993 by Digital Equipment Corporation
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of FUJITSU LIMITED and
-Digital Equipment Corporation not be used in advertising or publicity
-pertaining to distribution of the software without specific, written
-prior permission.  FUJITSU LIMITED and Digital Equipment Corporation
-makes no representations about the suitability of this software for
-any purpose.  It is provided "as is" without express or implied
-warranty.
-
-FUJITSU LIMITED AND DIGITAL EQUIPMENT CORPORATION DISCLAIM ALL 
-WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
-FUJITSU LIMITED AND DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR 
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER 
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, 
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF 
-THIS SOFTWARE.
-
-  Author:    Takashi Fujiwara     FUJITSU LIMITED 
-                               	  fujiwara@a80.tech.yk.fujitsu.co.jp
-  Modifier:  Franky Ling          Digital Equipment Corporation
-	                          frankyling@hgrd01.enet.dec.com
-
-******************************************************************/
-/* $XFree86: xc/lib/X11/imImSw.c,v 1.2 1999/05/09 10:50:33 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "Ximint.h"
-#include "XimImSw.h"
-
-Private Bool
-_XimCheckIfDefault(im)
-    Xim		im;
-{
-    return(True);
-}
-
-XimImsportSW _XimImSportRec[] = {
-    { _XimCheckIfLocalProcessing, _XimLocalOpenIM, _XimLocalIMFree },
-    { _XimCheckIfThaiProcessing,	_XimThaiOpenIM,	 _XimThaiIMFree },
-    { _XimCheckIfDefault,         _XimProtoOpenIM, _XimProtoIMFree },
-    { NULL,                       NULL,		 NULL },
-};
diff --git a/xc/lib/X11/imInsClbk.c b/xc/lib/X11/imInsClbk.c
deleted file mode 100644
index 2df4276f9..000000000
--- a/xc/lib/X11/imInsClbk.c
+++ /dev/null
@@ -1,328 +0,0 @@
-/* $XConsortium: imInsClbk.c /main/4 1995/11/18 16:08:11 kaleb $ */
-/* $XFree86: xc/lib/X11/imInsClbk.c,v 3.0 1996/02/09 08:18:54 dawes Exp $ */
-/******************************************************************
-
-           Copyright 1993, 1994 by Sony Corporation
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of Sony Corporation
- not be used in advertising or publicity pertaining to distribution
- of the software without specific, written prior permission.
-Sony Corporation makes no representations about the suitability of
- this software for any purpose. It is provided "as is" without
- express or implied warranty.
-
-SONY CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL SONY CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-  Author:   Makoto Wakamatsu   Sony Corporation
-                               makoto@sm.sony.co.jp
-
-******************************************************************/
-
-#include	<X11/Xatom.h>
-#define NEED_EVENTS
-#include	"Xlibint.h"
-#include	"Xlcint.h"
-#include	"XlcPublic.h"
-#include	"Ximint.h"
-
-
-typedef struct _XimInstCallback {
-    Bool			 call;
-    Bool			 destroy;
-    Display			*display;
-    XLCd			 lcd;
-    char			 name[XIM_MAXLCNAMELEN];
-    char			*modifiers;
-    XrmDatabase			 rdb;
-    char			*res_name;
-    char			*res_class;
-    XIDProc			 callback;
-    XPointer			 client_data;
-    struct _XimInstCallback	*next;
-} XimInstCallbackRec, *XimInstCallback;
-
-
-Private XimInstCallback	callback_list	= NULL;
-Private Bool		lock		= False;
-
-
-Private void
-#if NeedFunctionPrototypes
-MakeLocale( XLCd lcd, char locale[] )
-#else
-MakeLocale( lcd, locale )
-    XLCd	lcd;
-    char	locale[];
-#endif
-{
-    char	*language, *territory, *codeset;
-
-    _XGetLCValues( lcd, XlcNLanguage, &language, XlcNTerritory, &territory,
-		     XlcNCodeset, &codeset, NULL );
-
-    strcpy( locale, language );
-    if( territory  &&  *territory ) {
-	strcat( locale, "_" );
-	strcat( locale, territory );
-    }
-    if( codeset  &&  *codeset ) {
-	strcat( locale, "." );
-	strcat( locale, codeset );
-    }
-}
-
-
-Private Bool
-#if NeedFunctionPrototypes
-_XimFilterPropertyNotify(
-    Display	*display,
-    Window	 window,
-    XEvent	*event,
-    XPointer	 client_data)
-#else
-_XimFilterPropertyNotify( display, window, event, client_data )
-    Display	*display;
-    Window	 window;
-    XEvent	*event;
-    XPointer	 client_data;
-#endif
-{
-    Atom		ims, actual_type, *atoms;
-    int			actual_format;
-    unsigned long	nitems, bytes_after;
-    Window		ims_window;
-    int			ii;
-    XIM			xim;
-    Bool		flag = False;
-    XimInstCallback	icb, picb, tmp;
-
-    if( (ims = XInternAtom( display, XIM_SERVERS, True )) == None  ||
-	event->xproperty.atom != ims  ||
-	event->xproperty.state == PropertyDelete )
-	return( False );
-
-    if( XGetWindowProperty( display, RootWindow(display, 0), ims, 0L, 1000000L,
-			    False, XA_ATOM, &actual_type, &actual_format,
-			    &nitems, &bytes_after, (unsigned char **)&atoms )
-	    != Success ) {
-	return( False );
-    }
-    if( actual_type != XA_ATOM  ||  actual_format != 32 ) {
-	XFree( atoms );
-	return( False );
-    }
-
-    lock = True;
-    for( ii = 0; ii < nitems; ii++, atoms ) {
-	if((ims_window = XGetSelectionOwner (display, atoms[ii]))) {
-	    for( icb = callback_list; icb; icb = icb->next ) {
-		if( !icb->call  &&  !icb->destroy ) {
-		    xim = (*icb->lcd->methods->open_im)( icb->lcd, display,
-							 icb->rdb,
-							 icb->res_name,
-							 icb->res_class );
-		    if( xim ) {
-			xim->methods->close( (XIM)xim );
-			flag = True;
-			icb->call = True;
-			icb->callback( icb->display, icb->client_data, NULL );
-		    }
-		}
-	    }
-	    break;
-	}
-    }
-    XFree( atoms );
-
-    for( icb = callback_list, picb = NULL; icb; ) {
-	if( icb->destroy ) {
-	    if( picb )
-		picb->next = icb->next;
-	    else
-		callback_list = icb->next;
-	    tmp = icb;
-	    icb = icb->next;
-	    XFree( tmp );
-	}
-	else {
-	    picb = icb;
-	    icb = icb->next;
-	}
-    }
-    lock = False;
-
-    return( flag );
-}
-
-
-Public Bool
-#if NeedFunctionPrototypes
-_XimRegisterIMInstantiateCallback(
-    XLCd	 lcd,
-    Display	*display,
-    XrmDatabase	 rdb,
-    char	*res_name,
-    char	*res_class,
-    XIDProc	 callback,
-    XPointer	 client_data)
-#else
-_XimRegisterIMInstantiateCallback( lcd, display, rdb, res_name, res_class,
-				   callback, client_data )
-    XLCd	 lcd;
-    Display	*display;
-    XrmDatabase	 rdb;
-    char	*res_name, *res_class;
-    XIDProc	 callback;
-    XPointer	 client_data;
-#endif
-{
-    XimInstCallback	icb, tmp;
-    XIM			xim;
-    Window		root;
-    XWindowAttributes	attr;
-
-    if( lock )
-	return( False );
-
-    icb = (XimInstCallback)Xmalloc(sizeof(XimInstCallbackRec));
-    if( !icb )
-	return( False );
-    icb->call = icb->destroy = False;
-    icb->display = display;
-    icb->lcd = lcd;
-    MakeLocale( lcd, icb->name );
-    icb->modifiers = lcd->core->modifiers;	/* XXXXX */
-    icb->rdb = rdb;
-    icb->res_name = res_name;
-    icb->res_class = res_class;
-    icb->callback = callback;
-    icb->client_data = client_data;
-    icb->next = NULL;
-
-    if( !callback_list )
-	callback_list = icb;
-    else {
-	for( tmp = callback_list; tmp->next; tmp = tmp->next );
-	tmp->next = icb;
-    }
-
-    xim = (*lcd->methods->open_im)( lcd, display, rdb, res_name, res_class );
-
-    if( icb == callback_list ) {
-	root = RootWindow( display, 0 );
-	XGetWindowAttributes( display, root, &attr );
-	_XRegisterFilterByType( display, root, PropertyNotify, PropertyNotify,
-				_XimFilterPropertyNotify, (XPointer)NULL );
-	XSelectInput( display, root,
-		      attr.your_event_mask | PropertyChangeMask );
-    }
-
-    if( xim ) {
-	lock = True;
-	xim->methods->close( (XIM)xim );
-	lock = False;
-	icb->call = True;
-	callback( display, client_data, NULL );
-    }
-
-    return( True );
-}
-
-
-Public Bool
-#if NeedFunctionPrototypes
-_XimUnRegisterIMInstantiateCallback(
-    XLCd	 lcd,
-    Display	*display,
-    XrmDatabase	 rdb,
-    char	*res_name,
-    char	*res_class,
-    XIDProc	 callback,
-    XPointer	 client_data)
-#else
-_XimUnRegisterIMInstantiateCallback( lcd, display, rdb, res_name, res_class,
-				     callback, client_data )
-    XLCd	 lcd;
-    Display	*display;
-    XrmDatabase	 rdb;
-    char	*res_name, *res_class;
-    XIDProc	 callback;
-    XPointer	 client_data;
-#endif
-{
-    char		locale[XIM_MAXLCNAMELEN];
-    XimInstCallback	icb, picb;
-
-    if( !callback_list )
-	return( False );
-
-    MakeLocale( lcd, locale );
-
-    for( icb = callback_list, picb = NULL; icb; picb = icb, icb = icb->next ) {
-	if( !strcmp( locale, icb->name )  &&
-	    (lcd->core->modifiers == icb->modifiers  ||		/* XXXXX */
-	     (lcd->core->modifiers  &&  icb->modifiers  &&
-	      !strcmp( lcd->core->modifiers, icb->modifiers )))  &&
-	    rdb == icb->rdb  &&					/* XXXXX */
-	    ((res_name == NULL  &&  icb->res_name == NULL)  ||
-	     (res_name != NULL  &&  icb->res_name != NULL  &&
-	      !strcmp( res_name, icb->res_name )))  &&
-	    ((res_class == NULL  &&  icb->res_class == NULL)  ||
-	     (res_class != NULL  &&  icb->res_class != NULL  &&
-	      !strcmp( res_class, icb->res_class )))  &&
-	    callback == icb->callback  &&
-	    client_data  ==  icb->client_data  &&		/* XXXXX */
-	    !icb->destroy ) {
-	    if( lock )
-		icb->destroy = True;
-	    else {
-		if( !picb ) {
-		    callback_list = icb->next;
-		    _XUnregisterFilter( display, RootWindow(display, 0),
-					_XimFilterPropertyNotify,
-					(XPointer)NULL );
-		    XSelectInput( display, RootWindow(display, 0),
-				  NoEventMask );
-		}
-		else
-		    picb->next = icb->next;
-		_XCloseLC( icb->lcd );
-		XFree( icb );
-	    }
-	    return( True );
-	}
-    }
-    return( False );
-}
-
-
-Public void
-_XimResetIMInstantiateCallback( xim )
-    Xim		xim;
-{
-    char		 locale[XIM_MAXLCNAMELEN];
-    XimInstCallback	 icb;
-    XLCd	 	 lcd = xim->core.lcd;
-
-    if( !callback_list  &&  lock )
-	return;
-
-    MakeLocale( lcd, locale );
-
-    for( icb = callback_list; icb; icb = icb->next )
-	if( !strcmp( locale, icb->name )  &&
-	    (lcd->core->modifiers == icb->modifiers  ||
-	     (lcd->core->modifiers  &&  icb->modifiers  &&
-	      !strcmp( lcd->core->modifiers, icb->modifiers ))) )
-	    icb->call = False;
-}
diff --git a/xc/lib/X11/imInt.c b/xc/lib/X11/imInt.c
deleted file mode 100644
index 1ffb82dd5..000000000
--- a/xc/lib/X11/imInt.c
+++ /dev/null
@@ -1,293 +0,0 @@
-/* $TOG: imInt.c /main/5 1998/05/30 21:11:16 kaleb $ */
-/******************************************************************
-
-           Copyright 1992, 1993, 1994 by FUJITSU LIMITED
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of FUJITSU LIMITED
-not be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-FUJITSU LIMITED makes no representations about the suitability of
-this software for any purpose. 
-It is provided "as is" without express or implied warranty.
-
-FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-  Author: Takashi Fujiwara     FUJITSU LIMITED 
-                               fujiwara@a80.tech.yk.fujitsu.co.jp
-
-******************************************************************/
-/* $XFree86: xc/lib/X11/imInt.c,v 3.6 1999/05/09 10:50:33 dawes Exp $ */
-
-#include <X11/Xatom.h>
-#include <X11/Xlib.h>
-#include <X11/Xmd.h>
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "Ximint.h"
-#include "XimImSw.h"
-
-Private Xim 		*_XimCurrentIMlist  = (Xim *)NULL;
-Private int		 _XimCurrentIMcount = 0;
-
-Private Bool
-#if NeedFunctionPrototypes
-_XimSetIMStructureList(
-    Xim		  im)
-#else
-_XimSetIMStructureList(im)
-    Xim		  im;
-#endif
-{
-    register int  i;
-    Xim		 *xim;
-
-    if(!(_XimCurrentIMlist)) {
-	if(!(_XimCurrentIMlist = (Xim *)Xmalloc(sizeof(Xim))))
-	    return False;
-	_XimCurrentIMlist[0] = im;
-	_XimCurrentIMcount   = 1;
-    }
-    else {
-	for(i = 0; i < _XimCurrentIMcount; i++) {
-	    if(!( _XimCurrentIMlist[i])) {
-		_XimCurrentIMlist[i] = im;
-		break;
-	    }
-	}
-	if(i >= _XimCurrentIMcount) {
-	    if(!(xim = (Xim *)Xrealloc(_XimCurrentIMlist, 
-					 ((i + 1) * sizeof(Xim)))))
-		return False;
-	    _XimCurrentIMlist			  = xim;
-	    _XimCurrentIMlist[_XimCurrentIMcount] = im;
-	    _XimCurrentIMcount++;
-	}
-    }
-    return True;
-}
-
-Public void
-_XimDestroyIMStructureList(im)
-    Xim		  im;
-{
-    register int  i;
-
-    for(i = 0; i < _XimCurrentIMcount; i++) {
-	if(_XimCurrentIMlist[i] == im) {
-	    _XimCurrentIMlist[i] = NULL;
-	    break;
-	}
-    }
-    return;
-}
-
-Public void
-_XimServerDestroy(im_2_destroy)
-    Xim		  im_2_destroy;
-{
-    register int  i;
-    Xim		  im;
-    XIC		  ic;
-
-    for(i = 0; i < _XimCurrentIMcount; i++) {
-	if(!(im = _XimCurrentIMlist[i]))
-	    continue;
-	/*
-	 * Only continue if this im is the one to be destroyed.
-	 */
-	if (im != im_2_destroy)
-	    continue;
-
-	if (im->core.destroy_callback.callback)
-	    (*im->core.destroy_callback.callback)((XIM)im,
-			im->core.destroy_callback.client_data, NULL);
-	for (ic = im->core.ic_chain; ic; ic = ic->core.next) {
-	    if (ic->core.destroy_callback.callback) {
-		(*ic->core.destroy_callback.callback)(ic,
-			ic->core.destroy_callback.client_data, NULL);
-	    }
-	}
-	_XimResetIMInstantiateCallback( im );
-	(void)im->methods->close((XIM)im);
-	Xfree(im);
-	_XimCurrentIMlist[i] = NULL;
-	return;
-    }
-}
-
-#ifdef XIM_CONNECTABLE
-Public void
-_XimServerReconectableDestroy()
-{
-    register int  i;
-    Xim		  im;
-    XIC		  ic;
-
-    for(i = 0; i < _XimCurrentIMcount; i++) {
-	if(!(im = _XimCurrentIMlist[i]))
-	    continue;
-
-	if (im->core.destroy_callback.callback)
-	    (*im->core.destroy_callback.callback)(im,
-			im->core.destroy_callback.client_data, NULL);
-	for (ic = im->core.ic_chain; ic; ic = ic->core.next) {
-	    if (ic->core.destroy_callback.callback) {
-		(*ic->core.destroy_callback.callback)(ic,
-			ic->core.destroy_callback.client_data, NULL);
-	    }
-	}
-	_XimResetIMInstantiateCallback( im );
-	(void)im->methods->close((XIM)im);
-    }
-    return;
-}
-#endif /* XIM_CONNECTABLE */
-
-Private char	*
-#if NeedFunctionPrototypes
-_XimStrstr(
-    register char	*src,
-    register char	*dest)
-#else
-_XimStrstr(src, dest)
-    register char	*src, *dest;
-#endif
-{
-    int			 len;
-    
-    len = strlen(dest);
-    while ((src = strchr(src, *dest)) != 0) {
-	if(!strncmp(src, dest, len))
-	    return src;
-	src++;
-    }
-    return NULL;
-}
-
-Private char *
-#if NeedFunctionPrototypes
-_XimMakeImName(
-    XLCd	   lcd)
-#else
-_XimMakeImName(lcd)
-    XLCd	   lcd;
-#endif
-{
-    char* begin;
-    char* end;
-    char* ret;
-    char* ximmodifier = XIMMODIFIER;
-
-    if(lcd->core->modifiers != NULL && *lcd->core->modifiers != '\0') {
-	begin = _XimStrstr(lcd->core->modifiers, ximmodifier);
-	if (begin != NULL) {
-	    end = begin += strlen(ximmodifier);
-	    while (*end && *end != '@')
-		end++;
-	    ret = Xmalloc(end - begin + 2);
-	    if (ret != NULL) {
-		(void)strncpy(ret, begin, end - begin + 1);
-		ret[end - begin + 1] = '\0';
-	    }
-	    return ret;
-	}
-    }
-
-    /* else return an empty string */
-    ret = Xmalloc(1);
-    if (ret != NULL) {
-	ret[0] = '\0';
-    }
-    return ret;
-}
-
-Private XIM
-#if NeedFunctionPrototypes
-_XimOpenIM(
-    XLCd		 lcd,
-    Display		*dpy,
-    XrmDatabase		 rdb,
-    char		*res_name,
-    char		*res_class)
-#else
-_XimOpenIM(lcd, dpy, rdb, res_name, res_class)
-    XLCd		 lcd;
-    Display		*dpy;
-    XrmDatabase		 rdb;
-    char		*res_name, *res_class;
-#endif
-{
-    Xim			 im;
-    register int	 i;
-    
-    if (!(im = (Xim)Xmalloc(sizeof(XimRec))))
-	return (XIM)NULL;
-    bzero(im, sizeof(XimRec));
-
-    im->core.lcd       = lcd;
-    im->core.ic_chain  = (XIC)NULL;
-    im->core.display   = dpy;
-    im->core.rdb       = rdb;
-    im->core.res_name  = NULL;
-    im->core.res_class = NULL;
-    if((res_name != NULL) && (*res_name != '\0')){
-	if(!(im->core.res_name  = (char *)Xmalloc(strlen(res_name)+1)))
-	    goto Error1;
-	strcpy(im->core.res_name,res_name);
-    }
-    if((res_class != NULL) && (*res_class != '\0')){
-	if(!(im->core.res_class = (char *)Xmalloc(strlen(res_class)+1)))
-	    goto Error2;
-	strcpy(im->core.res_class,res_class);
-    }
-    if(!(im->core.im_name = _XimMakeImName(lcd)))
-	goto Error3;
-
-    for(i= 0; ; i++) {
-	if(_XimImSportRec[i].checkprocessing(im)) {
-	    if(!(_XimImSportRec[i].im_open(im)))
-		goto Error4;
-	    if(!_XimSetIMStructureList(im))
-		goto Error4;
-	    return (XIM)im;
-	}
-    }
-
-Error4 :
-    _XimImSportRec[i].im_free(im);
-    Xfree(im);
-    return NULL;
-Error3 :
-    if(im->core.im_name)
-	Xfree(im->core.im_name);
-Error2:
-    if(im->core.res_class)
-	Xfree(im->core.res_class);
-Error1:
-    if(im->core.res_name)
-	Xfree(im->core.res_name);
-    Xfree(im);
-    return NULL;
-}
-
-Public Bool
-_XInitIM(lcd)
-    XLCd	 lcd;
-{
-    if(lcd == (XLCd)NULL)
-	return False;
-    lcd->methods->open_im = _XimOpenIM;
-    lcd->methods->register_callback = _XimRegisterIMInstantiateCallback;
-    lcd->methods->unregister_callback = _XimUnRegisterIMInstantiateCallback;
-    return True;
-}
diff --git a/xc/lib/X11/imKStoUCS.c b/xc/lib/X11/imKStoUCS.c
deleted file mode 100644
index 7fed86376..000000000
--- a/xc/lib/X11/imKStoUCS.c
+++ /dev/null
@@ -1,330 +0,0 @@
-/* $XFree86: xc/lib/X11/imKStoUCS.c,v 1.1 2000/11/28 17:25:08 dawes Exp $ */
-
-#include "Xlibint.h"
-
-#ifdef __STDC__
-#define Const const
-#else
-#define Const /**/
-#endif
-
-static unsigned short Const keysym_to_unicode_1a1_1ff[] = {
-            0x0104, 0x02d8, 0x0141, 0x0000, 0x013d, 0x015a, 0x0000, /* 0x01a0-0x01a7 */
-    0x0000, 0x0160, 0x015e, 0x0164, 0x0179, 0x0000, 0x017d, 0x017b, /* 0x01a8-0x01af */
-    0x0000, 0x0105, 0x02db, 0x0142, 0x0000, 0x013e, 0x015b, 0x02c7, /* 0x01b0-0x01b7 */
-    0x0000, 0x0161, 0x015f, 0x0165, 0x017a, 0x02dd, 0x017e, 0x017c, /* 0x01b8-0x01bf */
-    0x0154, 0x0000, 0x0000, 0x0102, 0x0000, 0x0139, 0x0106, 0x0000, /* 0x01c0-0x01c7 */
-    0x010c, 0x0000, 0x0118, 0x0000, 0x011a, 0x0000, 0x0000, 0x010e, /* 0x01c8-0x01cf */
-    0x0110, 0x0143, 0x0147, 0x0000, 0x0000, 0x0150, 0x0000, 0x0000, /* 0x01d0-0x01d7 */
-    0x0158, 0x016e, 0x0000, 0x0170, 0x0000, 0x0000, 0x0162, 0x0000, /* 0x01d8-0x01df */
-    0x0155, 0x0000, 0x0000, 0x0103, 0x0000, 0x013a, 0x0107, 0x0000, /* 0x01e0-0x01e7 */
-    0x010d, 0x0000, 0x0119, 0x0000, 0x011b, 0x0000, 0x0000, 0x010f, /* 0x01e8-0x01ef */
-    0x0111, 0x0144, 0x0148, 0x0000, 0x0000, 0x0151, 0x0000, 0x0000, /* 0x01f0-0x01f7 */
-    0x0159, 0x016f, 0x0000, 0x0171, 0x0000, 0x0000, 0x0163, 0x02d9  /* 0x01f8-0x01ff */
-};
-
-static unsigned short Const keysym_to_unicode_2a1_2fe[] = {
-            0x0126, 0x0000, 0x0000, 0x0000, 0x0000, 0x0124, 0x0000, /* 0x02a0-0x02a7 */
-    0x0000, 0x0130, 0x0000, 0x011e, 0x0134, 0x0000, 0x0000, 0x0000, /* 0x02a8-0x02af */
-    0x0000, 0x0127, 0x0000, 0x0000, 0x0000, 0x0000, 0x0125, 0x0000, /* 0x02b0-0x02b7 */
-    0x0000, 0x0131, 0x0000, 0x011f, 0x0135, 0x0000, 0x0000, 0x0000, /* 0x02b8-0x02bf */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x010a, 0x0108, 0x0000, /* 0x02c0-0x02c7 */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x02c8-0x02cf */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0120, 0x0000, 0x0000, /* 0x02d0-0x02d7 */
-    0x011c, 0x0000, 0x0000, 0x0000, 0x0000, 0x016c, 0x015c, 0x0000, /* 0x02d8-0x02df */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x010b, 0x0109, 0x0000, /* 0x02e0-0x02e7 */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x02e8-0x02ef */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0121, 0x0000, 0x0000, /* 0x02f0-0x02f7 */
-    0x011d, 0x0000, 0x0000, 0x0000, 0x0000, 0x016d, 0x015d          /* 0x02f8-0x02ff */
-};
-
-static unsigned short Const keysym_to_unicode_3a2_3fe[] = {
-                    0x0138, 0x0156, 0x0000, 0x0128, 0x013b, 0x0000, /* 0x03a0-0x03a7 */
-    0x0000, 0x0000, 0x0112, 0x0122, 0x0166, 0x0000, 0x0000, 0x0000, /* 0x03a8-0x03af */
-    0x0000, 0x0000, 0x0000, 0x0157, 0x0000, 0x0129, 0x013c, 0x0000, /* 0x03b0-0x03b7 */
-    0x0000, 0x0000, 0x0113, 0x0123, 0x0167, 0x014a, 0x0000, 0x014b, /* 0x03b8-0x03bf */
-    0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x012e, /* 0x03c0-0x03c7 */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0116, 0x0000, 0x0000, 0x012a, /* 0x03c8-0x03cf */
-    0x0000, 0x0145, 0x014c, 0x0136, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x03d0-0x03d7 */
-    0x0000, 0x0172, 0x0000, 0x0000, 0x0000, 0x0168, 0x016a, 0x0000, /* 0x03d8-0x03df */
-    0x0101, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x012f, /* 0x03e0-0x03e7 */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0117, 0x0000, 0x0000, 0x012b, /* 0x03e8-0x03ef */
-    0x0000, 0x0146, 0x014d, 0x0137, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x03f0-0x03f7 */
-    0x0000, 0x0173, 0x0000, 0x0000, 0x0000, 0x0169, 0x016b          /* 0x03f8-0x03ff */
-};
-
-static unsigned short Const keysym_to_unicode_4a1_4df[] = {
-            0x3002, 0x3008, 0x3009, 0x3001, 0x30fb, 0x30f2, 0x30a1, /* 0x04a0-0x04a7 */
-    0x30a3, 0x30a5, 0x30a7, 0x30a9, 0x30e3, 0x30e5, 0x30e7, 0x30c3, /* 0x04a8-0x04af */
-    0x30fc, 0x30a2, 0x30a4, 0x30a6, 0x30a8, 0x30aa, 0x30ab, 0x30ad, /* 0x04b0-0x04b7 */
-    0x30af, 0x30b1, 0x30b3, 0x30b5, 0x30b7, 0x30b9, 0x30bb, 0x30bd, /* 0x04b8-0x04bf */
-    0x30bf, 0x30c1, 0x30c4, 0x30c6, 0x30c8, 0x30ca, 0x30cb, 0x30cc, /* 0x04c0-0x04c7 */
-    0x30cd, 0x30ce, 0x30cf, 0x30d2, 0x30d5, 0x30d8, 0x30db, 0x30de, /* 0x04c8-0x04cf */
-    0x30df, 0x30e0, 0x30e1, 0x30e2, 0x30e4, 0x30e6, 0x30e8, 0x30e9, /* 0x04d0-0x04d7 */
-    0x30ea, 0x30eb, 0x30ec, 0x30ed, 0x30ef, 0x30f3, 0x309b, 0x309c  /* 0x04d8-0x04df */
-};
-
-static unsigned short Const keysym_to_unicode_590_5fe[] = {
-    0x06f0, 0x06f1, 0x06f2, 0x06f3, 0x06f4, 0x06f5, 0x06f6, 0x06f7, /* 0x0590-0x0597 */
-    0x06f8, 0x06f9, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0598-0x059f */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x066a, 0x0670, 0x0679, /* 0x05a0-0x05a7 */
-	
-    0x067e, 0x0686, 0x0688, 0x0691, 0x060c, 0x0000, 0x06d4, 0x0000, /* 0x05ac-0x05af */
-    0x0660, 0x0661, 0x0662, 0x0663, 0x0664, 0x0665, 0x0666, 0x0667, /* 0x05b0-0x05b7 */
-    0x0668, 0x0669, 0x0000, 0x061b, 0x0000, 0x0000, 0x0000, 0x061f, /* 0x05b8-0x05bf */
-    0x0000, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627, /* 0x05c0-0x05c7 */
-    0x0628, 0x0629, 0x062a, 0x062b, 0x062c, 0x062d, 0x062e, 0x062f, /* 0x05c8-0x05cf */
-    0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x0637, /* 0x05d0-0x05d7 */
-    0x0638, 0x0639, 0x063a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x05d8-0x05df */
-    0x0640, 0x0641, 0x0642, 0x0643, 0x0644, 0x0645, 0x0646, 0x0647, /* 0x05e0-0x05e7 */
-    0x0648, 0x0649, 0x064a, 0x064b, 0x064c, 0x064d, 0x064e, 0x064f, /* 0x05e8-0x05ef */
-    0x0650, 0x0651, 0x0652, 0x0653, 0x0654, 0x0655, 0x0698, 0x06a4, /* 0x05f0-0x05f7 */
-    0x06a9, 0x06af, 0x06ba, 0x06be, 0x06cc, 0x06d2, 0x06c1          /* 0x05f8-0x05fe */
-};
-
-static unsigned short keysym_to_unicode_680_6ff[] = {
-    0x0492, 0x0496, 0x049a, 0x049c, 0x04a2, 0x04ae, 0x04b0, 0x04b2, /* 0x0680-0x0687 */
-    0x04b6, 0x04b8, 0x04ba, 0x0000, 0x04d8, 0x04e2, 0x04e8, 0x04ee, /* 0x0688-0x068f */
-    0x0493, 0x0497, 0x049b, 0x049d, 0x04a3, 0x04af, 0x04b1, 0x04b3, /* 0x0690-0x0697 */
-    0x04b7, 0x04b9, 0x04bb, 0x0000, 0x04d9, 0x04e3, 0x04e9, 0x04ef, /* 0x0698-0x069f */
-    0x0000, 0x0452, 0x0453, 0x0451, 0x0454, 0x0455, 0x0456, 0x0457, /* 0x06a0-0x06a7 */
-    0x0458, 0x0459, 0x045a, 0x045b, 0x045c, 0x0491, 0x045e, 0x045f, /* 0x06a8-0x06af */
-    0x2116, 0x0402, 0x0403, 0x0401, 0x0404, 0x0405, 0x0406, 0x0407, /* 0x06b0-0x06b7 */
-    0x0408, 0x0409, 0x040a, 0x040b, 0x040c, 0x0490, 0x040e, 0x040f, /* 0x06b8-0x06bf */
-    0x044e, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433, /* 0x06c0-0x06c7 */
-    0x0445, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, /* 0x06c8-0x06cf */
-    0x043f, 0x044f, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432, /* 0x06d0-0x06d7 */
-    0x044c, 0x044b, 0x0437, 0x0448, 0x044d, 0x0449, 0x0447, 0x044a, /* 0x06d8-0x06df */
-    0x042e, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, /* 0x06e0-0x06e7 */
-    0x0425, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, /* 0x06e8-0x06ef */
-    0x041f, 0x042f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, /* 0x06f0-0x06f7 */
-    0x042c, 0x042b, 0x0417, 0x0428, 0x042d, 0x0429, 0x0427, 0x042a  /* 0x06f8-0x06ff */
-};
-
-static unsigned short Const keysym_to_unicode_7a1_7f9[] = {
-            0x0386, 0x0388, 0x0389, 0x038a, 0x03aa, 0x0000, 0x038c, /* 0x07a0-0x07a7 */
-    0x038e, 0x03ab, 0x0000, 0x038f, 0x0000, 0x0000, 0x0385, 0x2015, /* 0x07a8-0x07af */
-    0x0000, 0x03ac, 0x03ad, 0x03ae, 0x03af, 0x03ca, 0x0390, 0x03cc, /* 0x07b0-0x07b7 */
-    0x03cd, 0x03cb, 0x03b0, 0x03ce, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x07b8-0x07bf */
-    0x0000, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, /* 0x07c0-0x07c7 */
-    0x0398, 0x0399, 0x039a, 0x039b, 0x039c, 0x039d, 0x039e, 0x039f, /* 0x07c8-0x07cf */
-    0x03a0, 0x03a1, 0x03a3, 0x0000, 0x03a4, 0x03a5, 0x03a6, 0x03a7, /* 0x07d0-0x07d7 */
-    0x03a8, 0x03a9, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x07d8-0x07df */
-    0x0000, 0x03b1, 0x03b2, 0x03b3, 0x03b4, 0x03b5, 0x03b6, 0x03b7, /* 0x07e0-0x07e7 */
-    0x03b8, 0x03b9, 0x03ba, 0x03bb, 0x03bc, 0x03bd, 0x03be, 0x03bf, /* 0x07e8-0x07ef */
-    0x03c0, 0x03c1, 0x03c3, 0x03c2, 0x03c4, 0x03c5, 0x03c6, 0x03c7, /* 0x07f0-0x07f7 */
-    0x03c8, 0x03c9                                                  /* 0x07f8-0x07ff */
-};
-
-static unsigned short Const keysym_to_unicode_8a4_8fe[] = {
-                                    0x2320, 0x2321, 0x0000, 0x231c, /* 0x08a0-0x08a7 */
-    0x231d, 0x231e, 0x231f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x08a8-0x08af */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x08b0-0x08b7 */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x2264, 0x2260, 0x2265, 0x222b, /* 0x08b8-0x08bf */
-    0x2234, 0x0000, 0x221e, 0x0000, 0x0000, 0x2207, 0x0000, 0x0000, /* 0x08c0-0x08c7 */
-    0x2245, 0x2246, 0x0000, 0x0000, 0x0000, 0x0000, 0x22a2, 0x0000, /* 0x08c8-0x08cf */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x221a, 0x0000, /* 0x08d0-0x08d7 */
-    0x0000, 0x0000, 0x2282, 0x2283, 0x2229, 0x222a, 0x2227, 0x2228, /* 0x08d8-0x08df */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x08e0-0x08e7 */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x08e8-0x08ef */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0192, 0x0000, /* 0x08f0-0x08f7 */
-    0x0000, 0x0000, 0x0000, 0x2190, 0x2191, 0x2192, 0x2193          /* 0x08f8-0x08ff */
-};
-
-static unsigned short Const keysym_to_unicode_9df_9f8[] = {
-                                                            0x2422, /* 0x09d8-0x09df */
-    0x2666, 0x25a6, 0x2409, 0x240c, 0x240d, 0x240a, 0x0000, 0x0000, /* 0x09e0-0x09e7 */
-    0x240a, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x2500, /* 0x09e8-0x09ef */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x251c, 0x2524, 0x2534, 0x252c, /* 0x09f0-0x09f7 */
-    0x2502                                                          /* 0x09f8-0x09ff */
-};
-
-static unsigned short Const keysym_to_unicode_aa1_afe[] = {
-            0x2003, 0x2002, 0x2004, 0x2005, 0x2007, 0x2008, 0x2009, /* 0x0aa0-0x0aa7 */
-    0x200a, 0x2014, 0x2013, 0x0000, 0x0000, 0x0000, 0x2026, 0x2025, /* 0x0aa8-0x0aaf */
-    0x2153, 0x2154, 0x2155, 0x2156, 0x2157, 0x2158, 0x2159, 0x215a, /* 0x0ab0-0x0ab7 */
-    0x2105, 0x0000, 0x0000, 0x2012, 0x2039, 0x2024, 0x203a, 0x0000, /* 0x0ab8-0x0abf */
-    0x0000, 0x0000, 0x0000, 0x215b, 0x215c, 0x215d, 0x215e, 0x0000, /* 0x0ac0-0x0ac7 */
-    0x0000, 0x2122, 0x2120, 0x0000, 0x25c1, 0x25b7, 0x25cb, 0x25ad, /* 0x0ac8-0x0acf */
-    0x2018, 0x2019, 0x201c, 0x201d, 0x211e, 0x0000, 0x2032, 0x2033, /* 0x0ad0-0x0ad7 */
-    0x0000, 0x271d, 0x0000, 0x220e, 0x25c2, 0x2023, 0x25cf, 0x25ac, /* 0x0ad8-0x0adf */
-    0x25e6, 0x25ab, 0x25ae, 0x25b5, 0x25bf, 0x2606, 0x2022, 0x25aa, /* 0x0ae0-0x0ae7 */
-    0x25b4, 0x25be, 0x261a, 0x261b, 0x2663, 0x2666, 0x2665, 0x0000, /* 0x0ae8-0x0aef */
-    0x2720, 0x2020, 0x2021, 0x2713, 0x2612, 0x266f, 0x266d, 0x2642, /* 0x0af0-0x0af7 */
-    0x2640, 0x2121, 0x2315, 0x2117, 0x2038, 0x201a, 0x201e          /* 0x0af8-0x0aff */
-};
-
-/* none of the APL keysyms match the Unicode characters */
-
-static unsigned short Const keysym_to_unicode_cdf_cfa[] = {
-                                                            0x2017, /* 0x0cd8-0x0cdf */
-    0x05d0, 0x05d1, 0x05d2, 0x05d3, 0x05d4, 0x05d5, 0x05d6, 0x05d7, /* 0x0ce0-0x0ce7 */
-    0x05d8, 0x05d9, 0x05da, 0x05db, 0x05dc, 0x05dd, 0x05de, 0x05df, /* 0x0ce8-0x0cef */
-    0x05e0, 0x05e1, 0x05e2, 0x05e3, 0x05e4, 0x05e5, 0x05e6, 0x05e7, /* 0x0cf0-0x0cf7 */
-    0x05e8, 0x05e9, 0x05ea                                          /* 0x0cf8-0x0cff */
-};
-
-static unsigned short Const keysym_to_unicode_da1_df9[] = {
-            0x0e01, 0x0e02, 0x0e03, 0x0e04, 0x0e05, 0x0e06, 0x0e07, /* 0x0da0-0x0da7 */
-    0x0e08, 0x0e09, 0x0e0a, 0x0e0b, 0x0e0c, 0x0e0d, 0x0e0e, 0x0e0f, /* 0x0da8-0x0daf */
-    0x0e10, 0x0e11, 0x0e12, 0x0e13, 0x0e14, 0x0e15, 0x0e16, 0x0e17, /* 0x0db0-0x0db7 */
-    0x0e18, 0x0e19, 0x0e1a, 0x0e1b, 0x0e1c, 0x0e1d, 0x0e1e, 0x0e1f, /* 0x0db8-0x0dbf */
-    0x0e20, 0x0e21, 0x0e22, 0x0e23, 0x0e24, 0x0e25, 0x0e26, 0x0e27, /* 0x0dc0-0x0dc7 */
-    0x0e28, 0x0e29, 0x0e2a, 0x0e2b, 0x0e2c, 0x0e2d, 0x0e2e, 0x0e2f, /* 0x0dc8-0x0dcf */
-    0x0e30, 0x0e31, 0x0e32, 0x0e33, 0x0e34, 0x0e35, 0x0e36, 0x0e37, /* 0x0dd0-0x0dd7 */
-    0x0e38, 0x0e39, 0x0e3a, 0x0000, 0x0000, 0x0000, 0x0e3e, 0x0e3f, /* 0x0dd8-0x0ddf */
-    0x0e40, 0x0e41, 0x0e42, 0x0e43, 0x0e44, 0x0e45, 0x0e46, 0x0e47, /* 0x0de0-0x0de7 */
-    0x0e48, 0x0e49, 0x0e4a, 0x0e4b, 0x0e4c, 0x0e4d, 0x0000, 0x0000, /* 0x0de8-0x0def */
-    0x0e50, 0x0e51, 0x0e52, 0x0e53, 0x0e54, 0x0e55, 0x0e56, 0x0e57, /* 0x0df0-0x0df7 */
-    0x0e58, 0x0e59                                                  /* 0x0df8-0x0dff */
-};
-
-static unsigned short Const keysym_to_unicode_ea0_eff[] = {
-    0x0000, 0x1101, 0x1101, 0x11aa, 0x1102, 0x11ac, 0x11ad, 0x1103, /* 0x0ea0-0x0ea7 */
-    0x1104, 0x1105, 0x11b0, 0x11b1, 0x11b2, 0x11b3, 0x11b4, 0x11b5, /* 0x0ea8-0x0eaf */
-    0x11b6, 0x1106, 0x1107, 0x1108, 0x11b9, 0x1109, 0x110a, 0x110b, /* 0x0eb0-0x0eb7 */
-    0x110c, 0x110d, 0x110e, 0x110f, 0x1110, 0x1111, 0x1112, 0x1161, /* 0x0eb8-0x0ebf */
-    0x1162, 0x1163, 0x1164, 0x1165, 0x1166, 0x1167, 0x1168, 0x1169, /* 0x0ec0-0x0ec7 */
-    0x116a, 0x116b, 0x116c, 0x116d, 0x116e, 0x116f, 0x1170, 0x1171, /* 0x0ec8-0x0ecf */
-    0x1172, 0x1173, 0x1174, 0x1175, 0x11a8, 0x11a9, 0x11aa, 0x11ab, /* 0x0ed0-0x0ed7 */
-    0x11ac, 0x11ad, 0x11ae, 0x11af, 0x11b0, 0x11b1, 0x11b2, 0x11b3, /* 0x0ed8-0x0edf */
-    0x11b4, 0x11b5, 0x11b6, 0x11b7, 0x11b8, 0x11b9, 0x11ba, 0x11bb, /* 0x0ee0-0x0ee7 */
-    0x11bc, 0x11bd, 0x11be, 0x11bf, 0x11c0, 0x11c1, 0x11c2, 0x0000, /* 0x0ee8-0x0eef */
-    0x0000, 0x0000, 0x1140, 0x0000, 0x0000, 0x1159, 0x119e, 0x0000, /* 0x0ef0-0x0ef7 */
-    0x11eb, 0x0000, 0x11f9, 0x0000, 0x0000, 0x0000, 0x0000, 0x20a9, /* 0x0ef8-0x0eff */
-};
-
-static unsigned short keysym_to_unicode_12a1_12fe[] = {
-            0x1e02, 0x1e03, 0x0000, 0x0000, 0x0000, 0x1e0a, 0x0000, /* 0x12a0-0x12a7 */
-    0x1e80, 0x0000, 0x1e82, 0x1e0b, 0x1ef2, 0x0000, 0x0000, 0x0000, /* 0x12a8-0x12af */
-    0x1e1e, 0x1e1f, 0x0000, 0x0000, 0x1e40, 0x1e41, 0x0000, 0x1e56, /* 0x12b0-0x12b7 */
-    0x1e81, 0x1e57, 0x1e83, 0x1e60, 0x1ef3, 0x1e84, 0x1e85, 0x1e61, /* 0x12b8-0x12bf */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x12c0-0x12c7 */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x12c8-0x12cf */
-    0x0174, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1e6a, /* 0x12d0-0x12d7 */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0176, 0x0000, /* 0x12d8-0x12df */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x12e0-0x12e7 */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x12e8-0x12ef */
-    0x0175, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1e6b, /* 0x12f0-0x12f7 */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0177          /* 0x12f0-0x12ff */
-};
-		
-static unsigned short Const keysym_to_unicode_13bc_13be[] = {
-                                    0x0152, 0x0153, 0x0178          /* 0x13b8-0x13bf */
-};
-
-static unsigned short keysym_to_unicode_14a1_14ff[] = {
-            0x2741, 0x00a7, 0x0589, 0x0029, 0x0028, 0x00bb, 0x00ab, /* 0x14a0-0x14a7 */
-    0x2014, 0x002e, 0x055d, 0x002c, 0x2013, 0x058a, 0x2026, 0x055c, /* 0x14a8-0x14af */
-    0x055b, 0x055e, 0x0531, 0x0561, 0x0532, 0x0562, 0x0533, 0x0563, /* 0x14b0-0x14b7 */
-    0x0534, 0x0564, 0x0535, 0x0565, 0x0536, 0x0566, 0x0537, 0x0567, /* 0x14b8-0x14bf */
-    0x0538, 0x0568, 0x0539, 0x0569, 0x053a, 0x056a, 0x053b, 0x056b, /* 0x14c0-0x14c7 */
-    0x053c, 0x056c, 0x053d, 0x056d, 0x053e, 0x056e, 0x053f, 0x056f, /* 0x14c8-0x14cf */
-    0x0540, 0x0570, 0x0541, 0x0571, 0x0542, 0x0572, 0x0543, 0x0573, /* 0x14d0-0x14d7 */
-    0x0544, 0x0574, 0x0545, 0x0575, 0x0546, 0x0576, 0x0547, 0x0577, /* 0x14d8-0x14df */
-    0x0548, 0x0578, 0x0549, 0x0579, 0x054a, 0x057a, 0x054b, 0x057b, /* 0x14e0-0x14e7 */
-    0x054c, 0x057c, 0x054d, 0x057d, 0x054e, 0x057e, 0x054f, 0x057f, /* 0x14e8-0x14ef */
-    0x0550, 0x0580, 0x0551, 0x0581, 0x0552, 0x0582, 0x0553, 0x0583, /* 0x14f0-0x14f7 */
-    0x0554, 0x0584, 0x0555, 0x0585, 0x0556, 0x0586, 0x2019, 0x0027, /* 0x14f8-0x14ff */
-};
-
-static unsigned short keysym_to_unicode_15d0_15f6[] = {
-    0x10d0, 0x10d1, 0x10d2, 0x10d3, 0x10d4, 0x10d5, 0x10d6, 0x10d7, /* 0x15d0-0x15d7 */
-    0x10d8, 0x10d9, 0x10da, 0x10db, 0x10dc, 0x10dd, 0x10de, 0x10df, /* 0x15d8-0x15df */
-    0x10e0, 0x10e1, 0x10e2, 0x10e3, 0x10e4, 0x10e5, 0x10e6, 0x10e7, /* 0x15e0-0x15e7 */
-    0x10e8, 0x10e9, 0x10ea, 0x10eb, 0x10ec, 0x10ed, 0x10ee, 0x10ef, /* 0x15e8-0x15ef */
-    0x10f0, 0x10f1, 0x10f2, 0x10f3, 0x10f4, 0x10f5, 0x10f6          /* 0x15f0-0x15f7 */
-};
-
-static unsigned short keysym_to_unicode_16a0_16f6[] = {
-    0x0000, 0x0000, 0xf0a2, 0x1e8a, 0x0000, 0xf0a5, 0x012c, 0xf0a7, /* 0x16a0-0x16a7 */
-    0xf0a8, 0x01b5, 0x01e6, 0x0000, 0x0000, 0x0000, 0x0000, 0x019f, /* 0x16a8-0x16af */
-    0x0000, 0x017e, 0xf0b2, 0x1e8b, 0x01d1, 0xf0b5, 0x012d, 0xf0b7, /* 0x16b0-0x16b7 */
-    0xf0b8, 0x01b6, 0x01e7, 0x01d2, 0x0000, 0x0000, 0x0000, 0x0275, /* 0x16b8-0x16bf */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x018f, 0x0000, /* 0x16c0-0x16c7 */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x16c8-0x16cf */
-    0x0000, 0x1e36, 0xf0d2, 0xf0d3, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x16d0-0x16d7 */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x16d8-0x16df */
-    0x0000, 0x1e37, 0xf0e2, 0xf0e3, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x16e0-0x16e7 */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x16e8-0x16ef */
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0259          /* 0x16f0-0x16f6 */
-};
-
-static unsigned short Const keysym_to_unicode_1e9f_1eff[] = {
-                                                            0x0303,
-    0x1ea0, 0x1ea1, 0x1ea2, 0x1ea3, 0x1ea4, 0x1ea5, 0x1ea6, 0x1ea7, /* 0x1ea0-0x1ea7 */
-    0x1ea8, 0x1ea9, 0x1eaa, 0x1eab, 0x1eac, 0x1ead, 0x1eae, 0x1eaf, /* 0x1ea8-0x1eaf */
-    0x1eb0, 0x1eb1, 0x1eb2, 0x1eb3, 0x1eb4, 0x1eb5, 0x1eb6, 0x1eb7, /* 0x1eb0-0x1eb7 */
-    0x1eb8, 0x1eb9, 0x1eba, 0x1ebb, 0x1ebc, 0x1ebd, 0x1ebe, 0x1ebf, /* 0x1eb8-0x1ebf */
-    0x1ec0, 0x1ec1, 0x1ec2, 0x1ec3, 0x1ec4, 0x1ec5, 0x1ec6, 0x1ec7, /* 0x1ec0-0x1ec7 */
-    0x1ec8, 0x1ec9, 0x1eca, 0x1ecb, 0x1ecc, 0x1ecd, 0x1ece, 0x1ecf, /* 0x1ec8-0x1ecf */
-    0x1ed0, 0x1ed1, 0x1ed2, 0x1ed3, 0x1ed4, 0x1ed5, 0x1ed6, 0x1ed7, /* 0x1ed0-0x1ed7 */
-    0x1ed8, 0x1ed9, 0x1eda, 0x1edb, 0x1edc, 0x1edd, 0x1ede, 0x1edf, /* 0x1ed8-0x1edf */
-    0x1ee0, 0x1ee1, 0x1ee2, 0x1ee3, 0x1ee4, 0x1ee5, 0x1ee6, 0x1ee7, /* 0x1ee0-0x1ee7 */
-    0x1ee8, 0x1ee9, 0x1eea, 0x1eeb, 0x1eec, 0x1eed, 0x1eee, 0x1eef, /* 0x1ee8-0x1eef */
-    0x1ef0, 0x1ef1, 0x0300, 0x0301, 0x1ef4, 0x1ef5, 0x1ef6, 0x1ef7, /* 0x1ef0-0x1ef7 */
-    0x1ef8, 0x1ef9, 0x01a0, 0x01a1, 0x01af, 0x01b0, 0x0309, 0x0323  /* 0x1ef8-0x1eff */
-};
-
-static unsigned short Const keysym_to_unicode_20a0_20ac[] = {
-    0x20a0, 0x20a1, 0x20a2, 0x20a3, 0x20a4, 0x20a5, 0x20a6, 0x20a7, /* 0x20a0-0x20a7 */
-    0x20a8, 0x20a9, 0x20aa, 0x20ab, 0x20ac                          /* 0x20a8-0x20af */
-};
-
-unsigned int
-#if NeedFunctionPrototypes
-KeySymToUcs4(KeySym keysym)
-#else
-KeySymToUcs4(keysym)
-    KeySym keysym;
-#endif
-{
-    /* 'Unicode keysym' */
-    if ((keysym & 0xff000000) == 0x01000000)
-        return (keysym & 0x00ffffff);
-
-    if (keysym > 0 && keysym < 0x100)
-	return keysym;
-    else if (keysym > 0x1a0 && keysym < 0x200)
-	return keysym_to_unicode_1a1_1ff[keysym - 0x1a1];
-    else if (keysym > 0x2a0 && keysym < 0x2ff)
-	return keysym_to_unicode_2a1_2fe[keysym - 0x2a1];
-    else if (keysym > 0x3a1 && keysym < 0x3ff)
-	return keysym_to_unicode_3a2_3fe[keysym - 0x3a2];
-    else if (keysym > 0x4a0 && keysym < 0x4e0)
-	return keysym_to_unicode_4a1_4df[keysym - 0x4a1];
-    else if (keysym > 0x589 && keysym < 0x5ff)
-	return keysym_to_unicode_590_5fe[keysym - 0x590];
-    else if (keysym > 0x67f && keysym < 0x700)
-	return keysym_to_unicode_680_6ff[keysym - 0x680];
-    else if (keysym > 0x7a0 && keysym < 0x7fa)
-	return keysym_to_unicode_7a1_7f9[keysym - 0x7a1];
-    else if (keysym > 0x8a3 && keysym < 0x8ff)
-	return keysym_to_unicode_8a4_8fe[keysym - 0x8a4];
-    else if (keysym > 0x9de && keysym < 0x9f9)
-	return keysym_to_unicode_9df_9f8[keysym - 0x9df];
-    else if (keysym > 0xaa0 && keysym < 0xaff)
-	return keysym_to_unicode_aa1_afe[keysym - 0xaa1];
-    else if (keysym > 0xcde && keysym < 0xcfb)
-	return keysym_to_unicode_cdf_cfa[keysym - 0xcdf];
-    else if (keysym > 0xda0 && keysym < 0xdfa)
-	return keysym_to_unicode_da1_df9[keysym - 0xda1];
-    else if (keysym > 0xe9f && keysym < 0xf00)
-	return keysym_to_unicode_ea0_eff[keysym - 0xea0];
-    else if (keysym > 0x12a0 && keysym < 0x12ff)
-	return keysym_to_unicode_12a1_12fe[keysym - 0x12a1];
-    else if (keysym > 0x13bb && keysym < 0x13bf)
-	return keysym_to_unicode_13bc_13be[keysym - 0x13bc];
-    else if (keysym > 0x14a0 && keysym < 0x1500)
-        return keysym_to_unicode_14a1_14ff[keysym - 0x14a1];
-    else if (keysym > 0x15cf && keysym < 0x15f7)
-	return keysym_to_unicode_15d0_15f6[keysym - 0x15d0];
-    else if (keysym > 0x169f && keysym < 0x16f7)
-	return keysym_to_unicode_16a0_16f6[keysym - 0x16a0];
-    else if (keysym > 0x1e9e && keysym < 0x1f00)
-	return keysym_to_unicode_1e9f_1eff[keysym - 0x1ea0];
-    else if (keysym > 0x209f && keysym < 0x20ad)
-	return keysym_to_unicode_20a0_20ac[keysym - 0x20a0];
-    else 
-	return 0;
-}
diff --git a/xc/lib/X11/imLcFlt.c b/xc/lib/X11/imLcFlt.c
deleted file mode 100644
index e3460f51d..000000000
--- a/xc/lib/X11/imLcFlt.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* $XConsortium: imLcFlt.c /main/5 1995/11/18 16:08:14 kaleb $ */
-/******************************************************************
-
-              Copyright 1992 by Fuji Xerox Co., Ltd.
-              Copyright 1992, 1994 by FUJITSU LIMITED
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of Fuji Xerox, 
-FUJITSU LIMITED not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission. Fuji Xerox, FUJITSU LIMITED make no representations
-about the suitability of this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-FUJI XEROX, FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL FUJI XEROX,
-FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
-OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-  Author   : Kazunori Nishihara	Fuji Xerox
-  Modifier : Takashi Fujiwara   FUJITSU LIMITED 
-                                fujiwara@a80.tech.yk.fujitsu.co.jp
-
-******************************************************************/
-
-#define NEED_EVENTS
-#include "Xlibint.h"
-#include <X11/keysym.h>
-#include "Xlcint.h"
-#include "Ximint.h"
-
-Bool
-_XimLocalFilter(d, w, ev, client_data)
-    Display	*d;
-    Window	 w;
-    XEvent	*ev;
-    XPointer	 client_data;
-{
-    Xic		 ic = (Xic)client_data;
-    KeySym	 keysym;
-    static char	 buf[256];
-    DefTree	*p;
-
-    if(   (ev->type != KeyPress)
-       || (ev->xkey.keycode == 0)
-       || (((Xim)ic->core.im)->private.local.top == (DefTree *)NULL) )
-	return(False);
-
-    XLookupString((XKeyEvent *)ev, buf, sizeof(buf), &keysym, NULL);
-
-    if(IsModifierKey(keysym))
-	return (False);
-
-    for(p = ic->private.local.context; p; p = p->next) {
-	if(((ev->xkey.state & p->modifier_mask) == p->modifier) &&
-	    (keysym == p->keysym)) {
-	    break;
-	}
-    }
-
-    if(p) { /* Matched */
-	if(p->succession) { /* Intermediate */
-	    ic->private.local.context = p->succession;
-	    return(True);
-	} else { /* Terminate (reached to leaf) */
-	    ic->private.local.composed = p;
-	    /* return back to client KeyPressEvent keycode == 0 */
-	    ev->xkey.keycode = 0;
-	    XPutBackEvent(d, ev);
-	    /* initialize internal state for next key sequence */
-	    ic->private.local.context = ((Xim)ic->core.im)->private.local.top;
-	    return(True);
-	}
-    } else { /* Unmatched */
-	if(ic->private.local.context == ((Xim)ic->core.im)->private.local.top) {
-	    return(False);
-	}
-	/* Error (Sequence Unmatch occured) */
-	/* initialize internal state for next key sequence */
-	ic->private.local.context = ((Xim)ic->core.im)->private.local.top;
-	return(True);
-    }
-}
diff --git a/xc/lib/X11/imLcGIc.c b/xc/lib/X11/imLcGIc.c
deleted file mode 100644
index 366888d2e..000000000
--- a/xc/lib/X11/imLcGIc.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* $XConsortium: imLcGIc.c,v 1.3 94/03/26 17:00:30 rws Exp $ */
-/******************************************************************
-
-                Copyright 1992,1993, 1994 by FUJITSU LIMITED
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of FUJITSU LIMITED
-not be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-FUJITSU LIMITED makes no representations about the suitability of
-this software for any purpose. 
-It is provided "as is" without express or implied warranty.
-
-FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-  Author: Takashi Fujiwara     FUJITSU LIMITED 
-                               fujiwara@a80.tech.yk.fujitsu.co.jp
-
-******************************************************************/
-
-#define NEED_EVENTS
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "Ximint.h"
-
-Public char *
-_XimLocalGetICValues(xic, values)
-    XIC			 xic;
-    XIMArg		*values;
-{
-    Xic			 ic = (Xic)xic;
-    XimDefICValues	 ic_values;
-
-    _XimGetCurrentICValues(ic, &ic_values);
-    return(_XimGetICValueData(ic, (XPointer)&ic_values,
-				ic->private.local.ic_resources,
-				ic->private.local.ic_num_resources,
-				values, XIM_GETICVALUES));
-}
diff --git a/xc/lib/X11/imLcIc.c b/xc/lib/X11/imLcIc.c
deleted file mode 100644
index c84a586c7..000000000
--- a/xc/lib/X11/imLcIc.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/* $XConsortium: imLcIc.c /main/6 1996/10/22 14:24:42 kaleb $ */
-/******************************************************************
-
-                Copyright 1992,1993, 1994 by FUJITSU LIMITED
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of FUJITSU LIMITED
-not be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-FUJITSU LIMITED makes no representations about the suitability of
-this software for any purpose. 
-It is provided "as is" without express or implied warranty.
-
-FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-  Author: Takashi Fujiwara     FUJITSU LIMITED 
-                               fujiwara@a80.tech.yk.fujitsu.co.jp
-
-******************************************************************/
-
-#include <stdio.h>
-#include <X11/Xlib.h>
-#include <X11/Xmd.h>
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "Ximint.h"
-
-Private void
-_XimLocalUnSetFocus(xic)
-    XIC	 xic;
-{
-    Xic  ic = (Xic)xic;
-    ((Xim)ic->core.im)->private.local.current_ic = (XIC)NULL;
-
-    if (ic->core.focus_window)
-	_XUnregisterFilter(ic->core.im->core.display,
-			ic->core.focus_window, _XimLocalFilter, (XPointer)ic);
-    return;
-}
-
-Private void
-_XimLocalDestroyIC(xic)
-    XIC	 xic;
-{
-    Xic	 ic = (Xic)xic;
-    if(((Xim)ic->core.im)->private.local.current_ic == (XIC)ic) {
-	_XimLocalUnSetFocus(xic);
-    }
-    if(ic->private.local.ic_resources) {
-	Xfree(ic->private.local.ic_resources);
-	ic->private.local.ic_resources = NULL;
-    }
-    return;
-}
-
-Private void
-_XimLocalSetFocus(xic)
-    XIC	 xic;
-{
-    Xic	 ic = (Xic)xic;
-    XIC	 current_ic = ((Xim)ic->core.im)->private.local.current_ic;
-
-    if (current_ic == (XIC)ic)
-	return;
-
-    if (current_ic != (XIC)NULL) {
-	_XimLocalUnSetFocus(current_ic);
-    }
-    ((Xim)ic->core.im)->private.local.current_ic = (XIC)ic;
-
-    if (ic->core.focus_window)
-	_XRegisterFilterByType(ic->core.im->core.display,
-			ic->core.focus_window, KeyPress, KeyPress,
-			_XimLocalFilter, (XPointer)ic);
-    return;
-}
-
-Private char *
-_XimLocalMbReset(xic)
-    XIC	 xic;
-{
-    Xic	 ic = (Xic)xic;
-    ic->private.local.composed = (DefTree *)NULL;
-    ic->private.local.context  = ((Xim)ic->core.im)->private.local.top;
-    return((char *)NULL);
-}
-
-Private wchar_t *
-_XimLocalWcReset(xic)
-    XIC	 xic;
-{
-    Xic	 ic = (Xic)xic;
-    ic->private.local.composed = (DefTree *)NULL;
-    ic->private.local.context  = ((Xim)ic->core.im)->private.local.top;
-    return((wchar_t *)NULL);
-}
-
-Private XICMethodsRec Local_ic_methods = {
-    _XimLocalDestroyIC, 	/* destroy */
-    _XimLocalSetFocus,  	/* set_focus */
-    _XimLocalUnSetFocus,	/* unset_focus */
-    _XimLocalSetICValues,	/* set_values */
-    _XimLocalGetICValues,	/* get_values */
-    _XimLocalMbReset,		/* mb_reset */
-    _XimLocalWcReset,		/* wc_reset */
-    _XimLocalMbLookupString,	/* mb_lookup_string */
-    _XimLocalWcLookupString,	/* wc_lookup_string */
-};
-
-Public XIC
-_XimLocalCreateIC(im, values)
-    XIM			 im;
-    XIMArg		*values;
-{
-    Xic			 ic;
-    XimDefICValues	 ic_values;
-    XIMResourceList	 res;
-    unsigned int	 num;
-    int			 len;
-
-    if((ic = (Xic)Xmalloc(sizeof(XicRec))) == (Xic)NULL) {
-	return ((XIC)NULL);
-    }
-    bzero((char *)ic, sizeof(XicRec));
-
-    ic->methods = &Local_ic_methods;
-    ic->core.im = im;
-    ic->private.local.context   = ((Xim)im)->private.local.top;
-    ic->private.local.composed  = (DefTree *)NULL;
-
-    num = im->core.ic_num_resources;
-    len = sizeof(XIMResource) * num;
-    if((res = (XIMResourceList)Xmalloc(len)) == (XIMResourceList)NULL) {
-	goto Set_Error;
-    }
-    (void)memcpy((char *)res, (char *)im->core.ic_resources, len);
-    ic->private.local.ic_resources     = res;
-    ic->private.local.ic_num_resources = num;
-
-    bzero((char *)&ic_values, sizeof(XimDefICValues));
-    if(_XimCheckLocalInputStyle(ic, (XPointer)&ic_values, values,
-				 im->core.styles, res, num) == False) {
-	goto Set_Error;
-    }
-
-    _XimSetICMode(res, num, ic_values.input_style);
-
-    if(_XimSetICValueData(ic, (XPointer)&ic_values,
-			ic->private.local.ic_resources,
-			ic->private.local.ic_num_resources,
-			values, XIM_CREATEIC, True)) {
-	goto Set_Error;
-    }
-    ic_values.filter_events = KeyPressMask;
-    _XimSetCurrentICValues(ic, &ic_values);
-    if(_XimSetICDefaults(ic, (XPointer)&ic_values,
-				XIM_SETICDEFAULTS, res, num) == False) {
-	goto Set_Error;
-    }
-    _XimSetCurrentICValues(ic, &ic_values);
-
-    return((XIC)ic);
-
-Set_Error :
-    if (ic->private.local.ic_resources) {
-	Xfree(ic->private.local.ic_resources);
-	ic->private.local.ic_resources = NULL;
-    }
-    Xfree(ic);
-    return((XIC)NULL);
-}
diff --git a/xc/lib/X11/imLcIm.c b/xc/lib/X11/imLcIm.c
deleted file mode 100644
index 6d355e05f..000000000
--- a/xc/lib/X11/imLcIm.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/* $TOG: imLcIm.c /main/12 1998/06/16 16:05:15 kaleb $ */
-/******************************************************************
-
-          Copyright 1992, 1993, 1994 by FUJITSU LIMITED
-          Copyright 1993 by Digital Equipment Corporation
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of FUJITSU LIMITED and
-Digital Equipment Corporation not be used in advertising or publicity
-pertaining to distribution of the software without specific, written
-prior permission.  FUJITSU LIMITED and Digital Equipment Corporation
-makes no representations about the suitability of this software for
-any purpose.  It is provided "as is" without express or implied
-warranty.
-
-FUJITSU LIMITED AND DIGITAL EQUIPMENT CORPORATION DISCLAIM ALL 
-WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
-FUJITSU LIMITED AND DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR 
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER 
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, 
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF 
-THIS SOFTWARE.
-
-  Author:    Takashi Fujiwara     FUJITSU LIMITED 
-                               	  fujiwara@a80.tech.yk.fujitsu.co.jp
-  Modifier:  Franky Ling          Digital Equipment Corporation
-	                          frankyling@hgrd01.enet.dec.com
-
-******************************************************************/
-
-#include <stdio.h>
-/*
-#include <X11/Xlib.h>
-*/
-#include <X11/Xmd.h>
-#include <X11/Xatom.h>
-#include <X11/Xos.h>
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "XlcPublic.h"
-#include "Ximint.h"
-#include <ctype.h>
-
-Public Bool
-_XimCheckIfLocalProcessing(im)
-    Xim          im;
-{
-    FILE        *fp;
-    char        *name;
-
-    if(strcmp(im->core.im_name, "") == 0) {
-	name = _XlcFileName(im->core.lcd, COMPOSE_FILE);
-	if (name != (char *)NULL) {
-	    fp = _XFopenFile (name, "r");
-	    Xfree(name);
-	    if (fp != (FILE *)NULL) {
-		fclose(fp);
-		return(True);
-	    }
-	}
-	return(False);
-    } else if(strcmp(im->core.im_name, "local") == 0 ||
-	      strcmp(im->core.im_name, "none" ) == 0 ) {
-	return(True);
-    }
-    return(False);
-}
-
-Private void
-XimFreeDefaultTree(top)
-    DefTree *top;
-{
-    if (!top) return;
-    if (top->succession) XimFreeDefaultTree(top->succession);
-    if (top->next) XimFreeDefaultTree(top->next);
-    if (top->mb) Xfree(top->mb);
-    if (top->wc) Xfree(top->wc);
-    Xfree(top);
-}
-
-Public void
-_XimLocalIMFree(im)
-    Xim		im;
-{
-    XimFreeDefaultTree(im->private.local.top);
-    if(im->core.im_resources) {
-	Xfree(im->core.im_resources);
-	im->core.im_resources = NULL;
-    }
-    if(im->core.ic_resources) {
-	Xfree(im->core.ic_resources);
-	im->core.ic_resources = NULL;
-    }
-    if(im->core.im_values_list) {
-	Xfree(im->core.im_values_list);
-	im->core.im_values_list = NULL;
-    }
-    if(im->core.ic_values_list) {
-	Xfree(im->core.ic_values_list);
-	im->core.ic_values_list = NULL;
-    }
-    if(im->core.styles) {
-	Xfree(im->core.styles);
-	im->core.styles = NULL;
-    }
-    if(im->core.res_name) {
-	Xfree(im->core.res_name);
-	im->core.res_name = NULL;
-    }
-    if(im->core.res_class) {
-	Xfree(im->core.res_class);
-	im->core.res_class = NULL;
-    }
-    if(im->core.im_name) {
-	Xfree(im->core.im_name);
-	im->core.im_name = NULL;
-    }
-    return;
-}
-
-Private Status
-_XimLocalCloseIM(xim)
-    XIM		xim;
-{
-    Xim		im = (Xim)xim;
-    XIC		ic;
-    XIC		next;
-
-    ic = im->core.ic_chain;
-    while (ic) {
-	(*ic->methods->destroy) (ic);
-	next = ic->core.next;
-	Xfree ((char *) ic);
-	ic = next;
-    }
-    _XimLocalIMFree(im);
-    _XimDestroyIMStructureList(im);
-    return(True);
-}
-
-Public char *
-_XimLocalGetIMValues(xim, values)
-    XIM			 xim;
-    XIMArg		*values;
-{
-    Xim			 im = (Xim)xim;
-    XimDefIMValues	 im_values;
-
-    _XimGetCurrentIMValues(im, &im_values);
-    return(_XimGetIMValueData(im, (XPointer)&im_values, values,
-			im->core.im_resources, im->core.im_num_resources));
-}
-
-Public char *
-_XimLocalSetIMValues(xim, values)
-    XIM			 xim;
-    XIMArg		*values;
-{
-    Xim			 im = (Xim)xim;
-    XimDefIMValues	 im_values;
-    char		*name = (char *)NULL;
-
-    _XimGetCurrentIMValues(im, &im_values);
-    name = _XimSetIMValueData(im, (XPointer)&im_values, values,
-		im->core.im_resources, im->core.im_num_resources);
-    _XimSetCurrentIMValues(im, &im_values);
-    return(name);
-}
-
-Private void
-_XimCreateDefaultTree(im)
-    Xim		im;
-{
-    FILE *fp;
-    char *name;
-
-    name = _XlcFileName(im->core.lcd, COMPOSE_FILE);
-    if (name == (char *)NULL)
-         return;
-    fp = _XFopenFile (name, "r");
-    Xfree(name);
-    if (fp == (FILE *)NULL)
-	 return;
-    _XimParseStringFile(fp, &im->private.local.top);
-    fclose(fp);
-}
-
-Private XIMMethodsRec      Xim_im_local_methods = {
-    _XimLocalCloseIM,           /* close */
-    _XimLocalSetIMValues,       /* set_values */
-    _XimLocalGetIMValues,       /* get_values */
-    _XimLocalCreateIC,          /* create_ic */
-    _XimLcctstombs,		/* ctstombs */
-    _XimLcctstowcs		/* ctstowcs */
-};
-
-Public Bool
-_XimLocalOpenIM(im)
-    Xim			 im;
-{
-    XLCd		 lcd = im->core.lcd;
-    XlcConv		 ctom_conv;
-    XlcConv		 ctow_conv;
-    XimDefIMValues	 im_values;
-
-    _XimInitialResourceInfo();
-    if(_XimSetIMResourceList(&im->core.im_resources,
-		 		&im->core.im_num_resources) == False) {
-	goto Open_Error;
-    }
-    if(_XimSetICResourceList(&im->core.ic_resources,
-				&im->core.ic_num_resources) == False) {
-	goto Open_Error;
-    }
-
-    _XimSetIMMode(im->core.im_resources, im->core.im_num_resources);
-
-    _XimGetCurrentIMValues(im, &im_values);
-    if(_XimSetLocalIMDefaults(im, (XPointer)&im_values,
-		im->core.im_resources, im->core.im_num_resources) == False) {
-	goto Open_Error;
-    }
-    _XimSetCurrentIMValues(im, &im_values);
-
-    _XimCreateDefaultTree(im);
-
-    if (!(ctom_conv = _XlcOpenConverter(lcd,
-					XlcNCompoundText, lcd, XlcNMultiByte)))
-	goto Open_Error;
-    if (!(ctow_conv = _XlcOpenConverter(lcd,
-					XlcNCompoundText, lcd, XlcNWideChar)))
-	goto Open_Error;
-
-    im->methods = &Xim_im_local_methods;
-    im->private.local.current_ic = (XIC)NULL;
-    im->private.local.ctom_conv = ctom_conv;
-    im->private.local.ctow_conv = ctow_conv;
-
-    return(True);
-
-Open_Error :
-    if (im->core.im_resources) {
-	Xfree(im->core.im_resources);
-	im->core.im_resources = NULL;
-    }
-    if (im->core.ic_resources) {
-	Xfree(im->core.ic_resources);
-	im->core.ic_resources = NULL;
-    }
-    if (im->core.im_values_list) {
-	Xfree(im->core.im_values_list);
-	im->core.im_values_list = NULL;
-    }
-    if (im->core.ic_values_list) {
-	Xfree(im->core.ic_values_list);
-	im->core.ic_values_list = NULL;
-    }
-    if (im->core.styles) {
-	Xfree(im->core.styles);
-	im->core.styles = NULL;
-    }
-    if (im->private.local.ctom_conv) {
-	_XlcCloseConverter(im->private.local.ctom_conv);
-    }
-    if (im->private.local.ctow_conv) {
-	_XlcCloseConverter(im->private.local.ctow_conv);
-    }
-    return(False);
-}
diff --git a/xc/lib/X11/imLcLkup.c b/xc/lib/X11/imLcLkup.c
deleted file mode 100644
index 641a03e17..000000000
--- a/xc/lib/X11/imLcLkup.c
+++ /dev/null
@@ -1,331 +0,0 @@
-/* $TOG: imLcLkup.c /main/9 1998/04/28 17:34:55 kaleb $ */
-/******************************************************************
-
-              Copyright 1992 by Fuji Xerox Co., Ltd.
-              Copyright 1992, 1994  by FUJITSU LIMITED
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of Fuji Xerox,
-FUJITSU LIMITED not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  Fuji Xerox, FUJITSU LIMITED  make no representations
-about the suitability of this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-FUJI XEROX, FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL FUJI XEROX, 
-FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
-OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-  Author: Kazunori Nishihara   Fuji Xerox
-          Takashi Fujiwara     FUJITSU LIMITED 
-                               fujiwara@a80.tech.yk.fujitsu.co.jp
-
-******************************************************************/
-/* $XFree86: xc/lib/X11/imLcLkup.c,v 3.2 1999/05/09 10:50:36 dawes Exp $ */
-
-#include <stdio.h>
-#include <X11/Xatom.h>
-#include <X11/Xos.h>
-#include <X11/Xlib.h>
-#include <X11/keysym.h>
-#include <X11/Xutil.h>
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "Ximint.h"
-
-Public int
-_XimLocalMbLookupString(xic, ev, buffer, bytes, keysym, status)
-    XIC		 xic;
-    XKeyEvent	*ev;
-    char	*buffer;
-    int		 bytes;
-    KeySym	 *keysym;
-    Status	 *status;
-{
-    Xic		 ic = (Xic)xic;
-    int		 ret;
-
-    if(ev->type != KeyPress) {
-	if(status) *status = XLookupNone;
-	return(0);
-    }
-    if(ev->keycode == 0) { /* Composed Event */
-	ret = strlen(ic->private.local.composed->mb);
-	if(ret > bytes) {
-	    if(status) *status = XBufferOverflow;
-	    return(ret);
-	}
-	memcpy(buffer, ic->private.local.composed->mb, ret);
-	if(keysym) *keysym = ic->private.local.composed->ks;
-	if (ret > 0) {
-	    if(keysym && *keysym != NoSymbol) {
-		if(status) *status = XLookupBoth;
-	    } else {
-		if(status) *status = XLookupChars;
-	    }
-	} else {
-	    if(keysym && *keysym != NoSymbol) {
-		if(status) *status = XLookupKeySym;
-	    } else {
-		if(status) *status = XLookupNone;
-	    }
-	}
-	return (ret);
-    } else { /* Throughed Event */
-	ret = _XimLookupMBText(ic, ev, buffer, bytes, keysym, NULL);
-	if(ret > 0) {
-	    if(keysym && *keysym != NoSymbol) {
-		if(status) *status = XLookupBoth;
-	    } else {
-		if(status) *status = XLookupChars;
-	    }
-	} else {
-	    if(keysym && *keysym != NoSymbol) {
-		if(status) *status = XLookupKeySym;
-	    } else {
-		if(status) *status = XLookupNone;
-	    }
-	}
-    }
-    return (ret);
-}
-
-Public int
-_XimLocalWcLookupString(xic, ev, buffer, wlen, keysym, status)
-    XIC		  xic;
-    XKeyEvent	 *ev;
-    wchar_t	 *buffer;
-    int		  wlen;
-    KeySym	 *keysym;
-    Status	 *status;
-{
-    Xic		 ic = (Xic)xic;
-    int		 ret;
-
-    if(ev->type != KeyPress) {
-	if(status) *status = XLookupNone;
-	return(0);
-    }
-    if(ev->keycode == 0) { /* Composed Event */
-	ret = _Xwcslen(ic->private.local.composed->wc);
-	if(ret > wlen) {
-	    if(status) *status = XBufferOverflow;
-	    return (ret);
-	}
-	memcpy((char *)buffer, (char *)ic->private.local.composed->wc,
-	       ret * sizeof(wchar_t));
-	if(keysym) *keysym = ic->private.local.composed->ks;
-	if (ret > 0) {
-	    if(keysym && *keysym != NoSymbol) {
-		if(status) *status = XLookupBoth;
-	    } else {
-		if(status) *status = XLookupChars;
-	    }
-	} else {
-	    if(keysym && *keysym != NoSymbol) {
-		if(status) *status = XLookupKeySym;
-	    } else {
-		if(status) *status = XLookupNone;
-	    }
-	}
-	return (ret);
-    } else { /* Throughed Event */
-	ret = _XimLookupWCText(ic, ev, buffer, wlen, keysym, NULL);
-	if(ret > 0) {
-	    if(keysym && *keysym != NoSymbol) {
-		if(status) *status = XLookupBoth;
-	    } else {
-		if(status) *status = XLookupChars;
-	    }
-	} else {
-	    if(keysym && *keysym != NoSymbol) {
-		if(status) *status = XLookupKeySym;
-	    } else {
-		if(status) *status = XLookupNone;
-	    }
-	}
-    }
-    return (ret);
-}
-
-#ifndef MAXINT
-#define MAXINT		(~((unsigned int)1 << ((8 * sizeof(int)) - 1)))
-#endif /* !MAXINT */
-
-Public int
-_XimLcctstombs(xim, from, from_len, to, to_len, state)
-    XIM		 xim;
-    char	*from;
-    int		 from_len;
-    char	*to;
-    int		 to_len;
-    Status	*state;
-{
-    Xim		 im = (Xim)xim;
-    XlcConv	 conv = im->private.local.ctom_conv;
-    int		 from_left;
-    int		 to_left;
-    int		 from_savelen;
-    int		 to_savelen;
-    int		 from_cnvlen;
-    int		 to_cnvlen;
-    char	*from_buf;
-    char	*to_buf;
-    Status	 tmp_state;
-
-    if (!state)
-	state = &tmp_state;
-
-    if (!conv || !from || !from_len) {
-	*state = XLookupNone;
-	return 0;
-    }
-
-    if (to && to_len) {
-	from_left = from_len;
-	to_left = to_len;
-	from_cnvlen = 0;
-	to_cnvlen = 0;
-	for (;;) {
-	    from_savelen = from_left;
-	    to_savelen = to_left;
-	    from_buf = &from[from_cnvlen];
-	    to_buf = &to[to_cnvlen];
-	    if (_XlcConvert(conv, (XPointer *)&from_buf, &from_left,
-				 (XPointer *)&to_buf, &to_left, NULL, 0) < 0) {
-		*state = XLookupNone;
-		return 0;
-	    }
-	    from_cnvlen += (from_savelen - from_left);
-	    to_cnvlen += (to_savelen - to_left);
-	    if (from_left == 0) {
-		if (to_cnvlen > 0) {
-		    *state = XLookupChars;
-		} else {
-		    *state = XLookupNone;
-		}
-		return to_cnvlen;
-	    }
-	    if (to_left == 0)
-		break;
-	}
-    }
-
-    from_left = from_len;
-    from_cnvlen = 0;
-    to_cnvlen = 0;
-    to_buf = NULL;
-    for (;;) {
-	from_savelen = from_left;
-	to_left = MAXINT;
-	from_buf = &from[from_cnvlen];
-	if (_XlcConvert(conv, (XPointer *)&from_buf, &from_left,
-				 (XPointer *)&to_buf, &to_left, NULL, 0) < 0) {
-	    *state = XLookupNone;
-	    return 0;
-	}
-	from_cnvlen += (from_savelen - from_left);
-	to_cnvlen += (MAXINT - to_left);
-	if (from_left == 0) {
-	    if (to_cnvlen > 0)
-		*state = XBufferOverflow;
-	    else
-		*state = XLookupNone;
-	    break;
-	}
-    }
-    return to_cnvlen;
-}
-
-Public int
-_XimLcctstowcs(xim, from, from_len, to, to_len, state)
-    XIM		 xim;
-    char	*from;
-    int		 from_len;
-    wchar_t	*to;
-    int		 to_len;
-    Status	*state;
-{
-    Xim		 im = (Xim)xim;
-    XlcConv	 conv = im->private.local.ctow_conv;
-    int		 from_left;
-    int		 to_left;
-    int		 from_savelen;
-    int		 to_savelen;
-    int		 from_cnvlen;
-    int		 to_cnvlen;
-    char	*from_buf;
-    wchar_t	*to_buf;
-    Status	 tmp_state;
-
-    if (!state)
-	state = &tmp_state;
-
-    if (!conv || !from || !from_len) {
-	*state = XLookupNone;
-	return 0;
-    }
-
-    if (to && to_len) {
-	from_left = from_len;
-	to_left = to_len;
-	from_cnvlen = 0;
-	to_cnvlen = 0;
-	for (;;) {
-	    from_savelen = from_left;
-	    to_savelen = to_left;
-	    from_buf = &from[from_cnvlen];
-	    to_buf = &to[to_cnvlen];
-	    if (_XlcConvert(conv, (XPointer *)&from_buf, &from_left,
-				 (XPointer *)&to_buf, &to_left, NULL, 0) < 0) {
-		*state = XLookupNone;
-		return 0;
-	    }
-	    from_cnvlen += (from_savelen - from_left);
-	    to_cnvlen += (to_savelen - to_left);
-	    if (from_left == 0) {
-		if (to_cnvlen > 0) {
-		    *state = XLookupChars;
-		} else {
-		    *state = XLookupNone;
-		}
-		return to_cnvlen;
-	    }
-	    if (to_left == 0)
-		break;
-	}
-    }
-		
-    from_left = from_len;
-    from_cnvlen = 0;
-    to_cnvlen = 0;
-    to_buf = (wchar_t *)NULL;
-    for (;;) {
-	from_savelen = from_left;
-	to_left = MAXINT;
-	from_buf = &from[from_cnvlen];
-	if (_XlcConvert(conv, (XPointer *)&from_buf, &from_left,
-				 (XPointer *)&to_buf, &to_left, NULL, 0) < 0) {
-	    *state = XLookupNone;
-	    return 0;
-	}
-	from_cnvlen += (from_savelen - from_left);
-	to_cnvlen += (MAXINT - to_left);
-	if (from_left == 0) {
-	    if (to_cnvlen > 0)
-		*state = XBufferOverflow;
-	    else
-		*state = XLookupNone;
-	    break;
-	}
-    }
-    return to_cnvlen;
-}
diff --git a/xc/lib/X11/imLcPrs.c b/xc/lib/X11/imLcPrs.c
deleted file mode 100644
index beaebea11..000000000
--- a/xc/lib/X11/imLcPrs.c
+++ /dev/null
@@ -1,510 +0,0 @@
-/* $TOG: imLcPrs.c /main/11 1998/06/17 12:19:31 kaleb $ */
-/******************************************************************
-
-              Copyright 1992 by Oki Technosystems Laboratory, Inc.
-              Copyright 1992 by Fuji Xerox Co., Ltd.
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of Oki Technosystems
-Laboratory and Fuji Xerox not be used in advertising or publicity
-pertaining to distribution of the software without specific, written
-prior permission.
-Oki Technosystems Laboratory and Fuji Xerox make no representations
-about the suitability of this software for any purpose.  It is provided
-"as is" without express or implied warranty.
-
-OKI TECHNOSYSTEMS LABORATORY AND FUJI XEROX DISCLAIM ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL OKI TECHNOSYSTEMS
-LABORATORY AND FUJI XEROX BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
-OR PERFORMANCE OF THIS SOFTWARE.
-
-  Author: Yasuhiro Kawai	Oki Technosystems Laboratory
-  Author: Kazunori Nishihara	Fuji Xerox
-
-******************************************************************/
-
-/* $XFree86: xc/lib/X11/imLcPrs.c,v 1.4 1998/10/04 11:48:07 dawes Exp $ */
-
-#include <X11/Xlib.h>
-#include <X11/Xmd.h>
-#include <X11/Xos.h>
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "Ximint.h"
-#include <sys/stat.h>
-#include <stdio.h>
-
-extern int _Xmbstowcs(
-#if NeedFunctionPrototypes
-    wchar_t	*wstr,
-    char	*str,
-    int		len
-#endif
-);
-
-/*
- *	Parsing File Format:
- *
- *	FILE          ::= { [PRODUCTION] [COMMENT] "\n"}
- *	PRODUCTION    ::= LHS ":" RHS [ COMMENT ]
- *	COMMENT       ::= "#" {<any character except null or newline>}
- *	LHS           ::= EVENT { EVENT }
- *	EVENT         ::= [MODIFIER_LIST] "<" keysym ">"
- *	MODIFIER_LIST ::= ("!" {MODIFIER} ) | "None"
- *	MODIFIER      ::= ["~"] modifier_name
- *	RHS           ::= ( STRING | keysym | STRING keysym )
- *	STRING        ::= '"' { CHAR } '"'
- *	CHAR          ::= GRAPHIC_CHAR | ESCAPED_CHAR
- *	GRAPHIC_CHAR  ::= locale (codeset) dependent code
- *	ESCAPED_CHAR  ::= ('\\' | '\"' | OCTAL | HEX )
- *	OCTAL         ::= '\' OCTAL_CHAR [OCTAL_CHAR [OCTAL_CHAR]]
- *	OCTAL_CHAR    ::= (0|1|2|3|4|5|6|7)
- *	HEX           ::= '\' (x|X) HEX_CHAR [HEX_CHAR]]
- *	HEX_CHAR      ::= (0|1|2|3|4|5|6|7|8|9|A|B|C|D|E|F|a|b|c|d|e|f)
- *
- */
-
-static int
-nextch(fp, lastch)
-    FILE *fp;
-    int *lastch;
-{
-    int c;
-
-    if (*lastch != 0) {
-	c = *lastch;
-	*lastch = 0;
-    } else {
-	c = getc(fp);
-	if (c == '\\') {
-	    c = getc(fp);
-	    if (c == '\n') {
-		c = getc(fp);
-	    } else {
-		ungetc(c, fp);
-		c = '\\';
-	    }
-	}
-    }
-    return(c);
-}
-
-static void
-putbackch(c, lastch)
-    int c;
-    int *lastch;
-{
-    *lastch = c;
-}
-
-#define ENDOFFILE 0
-#define ENDOFLINE 1
-#define COLON 2
-#define LESS 3
-#define GREATER 4
-#define EXCLAM 5
-#define TILDE 6
-#define STRING 7
-#define KEY 8
-#define ERROR 9
-
-#ifndef isalnum
-#define isalnum(c)      \
-    (('0' <= (c) && (c) <= '9')  || \
-     ('A' <= (c) && (c) <= 'Z')  || \
-     ('a' <= (c) && (c) <= 'z'))
-#endif
-
-static int
-nexttoken(fp, tokenbuf, lastch)
-    FILE *fp;
-    char *tokenbuf;
-    int *lastch;
-{
-    int c;
-    int token;
-    char *p;
-    int i, j;
-
-    while ((c = nextch(fp, lastch)) == ' ' || c == '\t') {
-    }
-    switch (c) {
-      case EOF:
-	token = ENDOFFILE;
-	break;
-      case '\n':
-	token = ENDOFLINE;
-	break;
-      case '<':
-	token = LESS;
-	break;
-      case '>':
-	token = GREATER;
-	break;
-      case ':':
-	token = COLON;
-	break;
-      case '!':
-	token = EXCLAM;
-	break;
-      case '~':
-	token = TILDE;
-	break;
-      case '"':
-	p = tokenbuf;
-	while ((c = nextch(fp, lastch)) != '"') {
-	    if (c == '\n' || c == EOF) {
-		putbackch(c, lastch);
-		token = ERROR;
-		goto string_error;
-	    } else if (c == '\\') {
-		c = nextch(fp, lastch);
-		switch (c) {
-		  case '\\':
-		  case '"':
-		    *p++ = c;
-		    break;
-		  case '0':
-		  case '1':
-		  case '2':
-		  case '3':
-		  case '4':
-		  case '5':
-		  case '6':
-		  case '7':
-		    i = c - '0';
-		    c = nextch(fp, lastch);
-		    for (j = 0; j < 2 && c >= '0' && c <= '7'; j++) {
-			i <<= 3;
-			i += c - '0';
-			c = nextch(fp, lastch);
-		    }
-		    putbackch(c, lastch);
-		    *p++ = (char)i;
-		    break;
-		  case 'X':
-		  case 'x':
-		    i = 0;
-		    c = nextch(fp, lastch);
-#define ishexch(c) (((c) >= '0' && (c) <= '9') || \
-		    ((c) >= 'A' && (c) <= 'F') || \
-		    ((c) >= 'a' && (c) <= 'f'))
-		    for (j = 0; j < 2 && ishexch(c); j++) {
-			i <<= 4;
-			if (c >= '0' && c <= '9') {
-			    i += c - '0';
-			} else if (c >= 'A' && c <= 'F') {
-			    i += c - 'A' + 10;
-			} else {
-			    i += c - 'a' + 10;
-			}
-			c = nextch(fp, lastch);
-		    }
-		    if (j == 0) {
-		        token = ERROR;
-		        goto string_error;
-		    }
-		    putbackch(c, lastch);
-		    *p++ = (char)i;
-#undef ishexch
-		    break;
-		  case '\n':
-		  case EOF:
-		    putbackch(c, lastch);
-		    token = ERROR;
-		    goto string_error;
-		  default:
-		    *p++ = c;
-		    break;
-		}
-	    } else {
-		*p++ = c;
-	    }
-	}
-	*p = '\0';
-	token = STRING;
-	break;
-      case '#':
-	while ((c = nextch(fp, lastch)) != '\n' && c != EOF) {
-	}
-	if (c == '\n') {
-	    token = ENDOFLINE;
-	} else {
-	    token = ENDOFFILE;
-	}
-	break;
-      default:
-	if (isalnum(c) || c == '_' || c == '-') {
-	    p = tokenbuf;
-	    *p++ = c;
-	    c = nextch(fp, lastch);
-	    while (isalnum(c) || c == '_' || c == '-') {
-		*p++ = c;
-		c = nextch(fp, lastch);
-	    }
-	    *p = '\0';
-	    putbackch(c, lastch);
-	    token = KEY;
-	} else {
-	    token = ERROR;
-	}
-	break;
-    }
-string_error:
-    return(token);
-}
-
-static long
-modmask(name)
-    char *name;
-{
-    long mask;
-
-    struct _modtbl {
-	char *name;
-	long mask;
-    };
-    struct _modtbl *p;
-
-    static struct _modtbl tbl[] = {
-	{ "Ctrl",	ControlMask	},
-        { "Lock",	LockMask	},
-        { "Caps",	LockMask	},
-        { "Shift",	ShiftMask	},
-        { "Alt",	Mod1Mask	},
-        { "Meta",	Mod1Mask	},
-        { NULL,		0		}};
-
-    p = tbl;
-    mask = 0;
-    for (p = tbl; p->name != NULL; p++) {
-	if (strcmp(name, p->name) == 0) {
-	    mask = p->mask;
-	    break;
-	}
-    }
-    return(mask);
-}
-
-#define AllMask (ShiftMask | LockMask | ControlMask | Mod1Mask) 
-#define LOCAL_WC_BUFSIZE 128
-#define SEQUENCE_MAX	10
-
-static int
-parseline(fp, top, tokenbuf)
-    FILE *fp;
-    DefTree **top;
-    char* tokenbuf;
-{
-    int token;
-    unsigned modifier_mask;
-    unsigned modifier;
-    unsigned tmp;
-    KeySym keysym = NoSymbol;
-    DefTree *p;
-    Bool exclam, tilde;
-    KeySym rhs_keysym;
-    char *rhs_string_mb;
-    int l;
-    int lastch = 0;
-    wchar_t local_wc_buf[LOCAL_WC_BUFSIZE], *rhs_string_wc;
-
-    struct DefBuffer {
-	unsigned modifier_mask;
-	unsigned modifier;
-	KeySym keysym;
-    };
-
-    struct DefBuffer buf[SEQUENCE_MAX];
-    int i, n;
-
-    do {
-	token = nexttoken(fp, tokenbuf, &lastch);
-    } while (token == ENDOFLINE);
-    
-    if (token == ENDOFFILE) {
-	return(-1);
-    }
-
-    n = 0;
-    do {
-	if ((token == KEY) && (strcmp("None", tokenbuf) == 0)) {
-	    modifier = 0;
-	    modifier_mask = AllMask;
-	    token = nexttoken(fp, tokenbuf, &lastch);
-	} else {
-	    modifier_mask = modifier = 0;
-	    exclam = False;
-	    if (token == EXCLAM) {
-		exclam = True;
-		token = nexttoken(fp, tokenbuf, &lastch);
-	    }
-	    while (token == TILDE || token == KEY) {
-		tilde = False;
-		if (token == TILDE) {
-		    token = nexttoken(fp, tokenbuf, &lastch);
-		    tilde = True;
-		    if (token != KEY)
-			goto error;
-		}
-		token = nexttoken(fp, tokenbuf, &lastch);
-		tmp = modmask(tokenbuf);
-		if (!tmp) {
-		    goto error;
-		}
-		modifier_mask |= tmp;
-		if (tilde) {
-		    modifier &= ~tmp;
-		} else {
-		    modifier |= tmp;
-		}
-	    }
-	    if (exclam) {
-		modifier_mask = AllMask;
-	    }
-	}
-
-	if (token != LESS) {
-	    goto error;
-	}
-
-	token = nexttoken(fp, tokenbuf, &lastch);
-	if (token != KEY) {
-	    goto error;
-	}
-
-	token = nexttoken(fp, tokenbuf, &lastch);
-	if (token != GREATER) {
-	    goto error;
-	}
-
-	keysym = XStringToKeysym(tokenbuf);
-	if (keysym == NoSymbol) {
-	    goto error;
-	}
-
-	buf[n].keysym = keysym;
-	buf[n].modifier = modifier;
-	buf[n].modifier_mask = modifier_mask;
-	n++;
-	if( n >= SEQUENCE_MAX )
-	    goto error;
-	token = nexttoken(fp, tokenbuf, &lastch);
-    } while (token != COLON);
-
-    token = nexttoken(fp, tokenbuf, &lastch);
-    if (token == STRING) {
-	if( (rhs_string_mb = Xmalloc(strlen(tokenbuf) + 1)) == NULL )
-	    goto error;
-	strcpy(rhs_string_mb, tokenbuf);
-	token = nexttoken(fp, tokenbuf, &lastch);
-	if (token == KEY) {
-	    rhs_keysym = XStringToKeysym(tokenbuf);
-	    if (rhs_keysym == NoSymbol) {
-		Xfree(rhs_string_mb);
-		goto error;
-	    }
-	    token = nexttoken(fp, tokenbuf, &lastch);
-	}
-	if (token != ENDOFLINE && token != ENDOFFILE) {
-	    Xfree(rhs_string_mb);
-	    goto error;
-	}
-    } else if (token == KEY) {
-	rhs_keysym = XStringToKeysym(tokenbuf);
-	if (rhs_keysym == NoSymbol) {
-	    goto error;
-	}
-	token = nexttoken(fp, tokenbuf, &lastch);
-	if (token != ENDOFLINE && token != ENDOFFILE) {
-	    goto error;
-	}
-	if( (rhs_string_mb = Xmalloc(1)) == NULL ) {
-	    Xfree( rhs_string_mb );
-	    goto error;
-	}
-	rhs_string_mb[0] = '\0';
-    } else {
-	goto error;
-    }
-
-    l = _Xmbstowcs(local_wc_buf, rhs_string_mb, LOCAL_WC_BUFSIZE - 1);
-    if (l == LOCAL_WC_BUFSIZE - 1) {
-	local_wc_buf[l] = (wchar_t)'\0';
-    }
-    if( (rhs_string_wc = (wchar_t *)Xmalloc((l + 1) * sizeof(wchar_t))) == NULL ) {
-	Xfree( rhs_string_mb );
-	return( 0 );
-    }
-    memcpy((char *)rhs_string_wc, (char *)local_wc_buf, (l + 1) * sizeof(wchar_t) );
-
-    for (i = 0; i < n; i++) {
-	for (p = *top; p; p = p->next) {
-	    if (buf[i].keysym        == p->keysym &&
-		buf[i].modifier      == p->modifier &&
-		buf[i].modifier_mask == p->modifier_mask) {
-		break;
-	    }
-	}
-	if (p) {
-	    top = &p->succession;
-	} else {
-	    if( (p = (DefTree*)Xmalloc(sizeof(DefTree))) == NULL ) {
-		Xfree( rhs_string_mb );
-		goto error;
-	    }
-	    p->keysym        = buf[i].keysym;
-	    p->modifier      = buf[i].modifier;
-	    p->modifier_mask = buf[i].modifier_mask;
-	    p->succession    = NULL;
-	    p->next          = *top;
-	    p->mb            = NULL;
-	    p->wc            = NULL;
-	    p->ks            = NoSymbol;
-	    *top = p;
-	    top = &p->succession;
-	}
-    }
-
-    if( p->mb != NULL )
-	Xfree( p->mb );
-    p->mb = rhs_string_mb;
-    if( p->wc != NULL )
-	Xfree( p->wc );
-    p->wc = rhs_string_wc;
-    p->ks = rhs_keysym;
-    return(n);
-error:
-    while (token != ENDOFLINE && token != ENDOFFILE) {
-	token = nexttoken(fp, tokenbuf, &lastch);
-    }
-    return(0);
-}
-
-void
-_XimParseStringFile(fp, ptop)
-    FILE *fp;
-    DefTree **ptop;
-{
-    char tb[65535];
-    char* tbp;
-    struct stat st;
-
-    if (fstat (fileno (fp), &st) != -1) {
-	unsigned long size = (unsigned long) st.st_size;
-	if (size < sizeof tb) tbp = tb;
-	else tbp = malloc (size);
-
-	if (tbp != NULL) {
-	    while (parseline(fp, ptop, tbp) >= 0) {}
-	    if (tbp != tb) free (tbp);
-	}
-    }
-}
diff --git a/xc/lib/X11/imLcSIc.c b/xc/lib/X11/imLcSIc.c
deleted file mode 100644
index 07fca8c05..000000000
--- a/xc/lib/X11/imLcSIc.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* $XConsortium: imLcSIc.c,v 1.3 94/03/26 17:00:41 rws Exp $ */
-/******************************************************************
-
-          Copyright 1990, 1991, 1992, 1993, 1994 by FUJITSU LIMITED
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of FUJITSU LIMITED
-not be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-FUJITSU LIMITED makes no representations about the suitability of
-this software for any purpose. 
-It is provided "as is" without express or implied warranty.
-
-FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-  Author: Takashi Fujiwara     FUJITSU LIMITED 
-                               fujiwara@a80.tech.yk.fujitsu.co.jp
-
-******************************************************************/
-
-#include <stdio.h>
-#include <X11/Xlib.h>
-#include <X11/Xmd.h>
-#include <X11/Xutil.h>
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "Ximint.h"
-
-Public char *
-_XimLocalSetICValues(xic, values)
-    XIC			 xic;
-    XIMArg		*values;
-{
-    XimDefICValues	 ic_values;
-    Xic			 ic = (Xic)xic;
-    char		*name;
-
-    _XimGetCurrentICValues(ic, &ic_values);
-    name = _XimSetICValueData(ic, (XPointer)&ic_values,
-				ic->private.local.ic_resources,
-				ic->private.local.ic_num_resources,
-				values, XIM_SETICVALUES, True);
-    _XimSetCurrentICValues(ic, &ic_values);
-    return(name);
-}
diff --git a/xc/lib/X11/imRm.c b/xc/lib/X11/imRm.c
deleted file mode 100644
index 9b9d6b8de..000000000
--- a/xc/lib/X11/imRm.c
+++ /dev/null
@@ -1,3143 +0,0 @@
-/* $TOG: imRm.c /main/14 1998/06/01 09:55:01 kaleb $ */
-/******************************************************************
-
-	  Copyright 1990, 1991, 1992,1993, 1994 by FUJITSU LIMITED
-	  Copyright 1994                        by Sony Corporation
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of FUJITSU LIMITED
-and Sony Corporation not be used in advertising or publicity
-pertaining to distribution of the software without specific,
-written prior permission. FUJITSU LIMITED and Sony Corporation make
-no representations about the suitability of this software for any
-purpose. It is provided "as is" without express or implied warranty.
-
-FUJITSU LIMITED AND SONY CORPORATION DISCLAIM ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL FUJITSU LIMITED AND
-SONY CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-  Author: Takashi Fujiwara     FUJITSU LIMITED 
-			       fujiwara@a80.tech.yk.fujitsu.co.jp
-  Modifier: Makoto Wakamatsu   Sony Corporation
-			       makoto@sm.sony.co.jp
-
-******************************************************************/
-/* $XFree86: xc/lib/X11/imRm.c,v 3.7 1999/05/09 10:50:36 dawes Exp $ */
-
-#include <stdio.h>
-#include <X11/Xlib.h>
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "Ximint.h"
-#include "Xresource.h"
-
-#ifndef	isalnum
-#define	isalnum(c)	\
-    (('0' <= (c) && (c) <= '9')  || \
-     ('A' <= (c) && (c) <= 'Z')  || \
-     ('a' <= (c) && (c) <= 'z'))
-#endif
-
-typedef struct _XimValueOffsetInfo {
-    char		*name;
-    XrmQuark		 quark;
-    unsigned int	 offset;
-    Bool		 (*defaults)(
-#if NeedNestedPrototypes
-	struct _XimValueOffsetInfo *, XPointer, XPointer, unsigned long
-#endif
-			 );
-    Bool		 (*encode)(
-#if NeedNestedPrototypes
-	struct _XimValueOffsetInfo *, XPointer, XPointer
-#endif
-			 );
-    Bool		 (*decode)(
-#if NeedNestedPrototypes
-	struct _XimValueOffsetInfo *, XPointer, XPointer
-#endif
-			 );
-} XimValueOffsetInfoRec, *XimValueOffsetInfo;
-
-#ifdef XIM_CONNECTABLE
-Private Bool
-_XimCheckBool(str)
-    char	*str;
-{
-    if(!strcmp(str, "True") || !strcmp(str, "true") ||
-       !strcmp(str, "Yes")  || !strcmp(str, "yes")  ||
-       !strcmp(str, "ON")   || !strcmp(str, "on"))
-	return True;
-    return False;
-}
-
-Public void
-_XimSetProtoResource(im)
-    Xim		 im;
-{
-    char	res_name_buf[256];
-    char*	res_name;
-    char	res_class_buf[256];
-    char*	res_class;
-    char*	str_type;
-    XrmValue	value;
-    XIMStyle	preedit_style = 0;
-    XIMStyle	status_style = 0;
-    XIMStyles*	imstyles;
-    char*	dotximdot = ".xim.";
-    char*	ximdot = "xim.";
-    char*	dotXimdot = ".Xim.";
-    char*	Ximdot = "Xim.";
-
-    if (!im->core.rdb)
-	return;
-
-    if (strlen (im->core.res_name) < 200) res_name = res_name_buf;
-    else res_name = Xmalloc (strlen (im->core.res_name) + 50);
-    if (strlen (im->core.res_class) < 200) res_class = res_class_buf;
-    else res_class = Xmalloc (strlen (im->core.res_class) + 50);
-    /* pretend malloc always works */
-
-    (void) sprintf (res_name, "%s%s%s", 
-	im->core.res_name != NULL ? im->core.res_name : "*",
-	im->core.res_name != NULL ? dotximdot : ximdot,
-	"useAuth");
-    (void) sprintf (res_class, "%s%s%s", 
-	im->core.res_class != NULL ? im->core.res_class : "*",
-	im->core.res_class != NULL ? dotXimdot : Ximdot,
-	"UseAuth");
-    bzero(&value, sizeof(XrmValue));
-    if(XrmGetResource(im->core.rdb, res_name, res_class, &str_type, &value)) {
-	if(_XimCheckBool(value.addr)) {
-	    MARK_USE_AUTHORIZATION_FUNC(im);
-	}
-    }
-
-    (void) sprintf (res_name, "%s%s%s", 
-	im->core.res_name != NULL ? im->core.res_name : "*",
-	im->core.res_name != NULL ? dotximdot : ximdot,
-	"delaybinding");
-    (void) sprintf (res_class, "%s%s%s", 
-	im->core.res_class != NULL ? im->core.res_class : "*",
-	im->core.res_class != NULL ? dotXimdot : Ximdot,
-	"Delaybinding");
-    bzero(&value, sizeof(XrmValue));
-    if(XrmGetResource(im->core.rdb, res_name, res_class, &str_type, &value)) {
-	if(_XimCheckBool(value.addr)) {
-	    MARK_DELAYBINDABLE(im);
-	}
-    }
-
-    (void) sprintf (res_name, "%s%s%s", 
-	im->core.res_name != NULL ? im->core.res_name : "*",
-	im->core.res_name != NULL ? dotximdot : ximdot,
-	"reconnect");
-    (void) sprintf (res_class, "%s%s%s", 
-	im->core.res_class != NULL ? im->core.res_class : "*",
-	im->core.res_class != NULL ? dotXimdot : Ximdot,
-	"Reconnect");
-    bzero(&value, sizeof(XrmValue));
-    if(XrmGetResource(im->core.rdb, res_name, res_class, &str_type, &value)) {
-	if(_XimCheckBool(value.addr)) {
-	    MARK_RECONNECTABLE(im);
-	}
-    }
-
-    if(!IS_CONNECTABLE(im)) {
-	if (res_name != res_name_buf) Xfree (res_name);
-	if (res_class != res_class_buf) Xfree (res_class);
-	return;
-    }
-
-    (void) sprintf (res_name, "%s%s%s", 
-	im->core.res_name != NULL ? im->core.res_name : "*",
-	im->core.res_name != NULL ? dotximdot : ximdot,
-	"preeditDefaultStyle");
-    (void) sprintf (res_class, "%s%s%s", 
-	im->core.res_class != NULL ? im->core.res_class : "*",
-	im->core.res_class != NULL ? dotXimdot : Ximdot,
-	"PreeditDefaultStyle");
-    if(XrmGetResource(im->core.rdb, res_name, res_class, &str_type, &value)) {
-	if(!strcmp(value.addr, "XIMPreeditArea"))
-	    preedit_style = XIMPreeditArea;
-	else if(!strcmp(value.addr, "XIMPreeditCallbacks"))
-	    preedit_style = XIMPreeditCallbacks;
-	else if(!strcmp(value.addr, "XIMPreeditPosition"))
-	    preedit_style = XIMPreeditPosition;
-	else if(!strcmp(value.addr, "XIMPreeditNothing"))
-	    preedit_style = XIMPreeditNothing;
-	else if(!strcmp(value.addr, "XIMPreeditNone"))
-	    preedit_style = XIMPreeditNone;
-    }
-    if(!preedit_style)
-	preedit_style = XIMPreeditNothing;
-
-    (void) sprintf (res_name, "%s%s%s", 
-	im->core.res_name != NULL ? im->core.res_name : "*",
-	im->core.res_name != NULL ? dotximdot : ximdot,
-	"statusDefaultStyle");
-    (void) sprintf (res_class, "%s%s%s", 
-	im->core.res_class != NULL ? im->core.res_class : "*",
-	im->core.res_class != NULL ? dotXimdot : Ximdot,
-	"StatusDefaultStyle");
-    if(XrmGetResource(im->core.rdb, res_name, res_class, &str_type, &value)) {
-	if(!strcmp(value.addr, "XIMStatusArea"))
-	    status_style = XIMStatusArea;
-	else if(!strcmp(value.addr, "XIMStatusCallbacks"))
-	    status_style = XIMStatusCallbacks;
-	else if(!strcmp(value.addr, "XIMStatusNothing"))
-	    status_style = XIMStatusNothing;
-	else if(!strcmp(value.addr, "XIMStatusNone"))
-	    status_style = XIMStatusNone;
-    }
-    if(!status_style)
-	status_style = XIMStatusNothing;
-
-    if(!(imstyles = (XIMStyles *)Xmalloc(sizeof(XIMStyles) + sizeof(XIMStyle)))){
-	if (res_name != res_name_buf) Xfree (res_name);
-	if (res_class != res_class_buf) Xfree (res_class);
-	return;
-    }
-    imstyles->count_styles = 1;
-    imstyles->supported_styles =
-			(XIMStyle *)((char *)imstyles + sizeof(XIMStyles));
-    imstyles->supported_styles[0] = preedit_style | status_style;
-    im->private.proto.default_styles = imstyles;
-    if (res_name != res_name_buf) Xfree (res_name);
-    if (res_class != res_class_buf) Xfree (res_class);
-}
-#endif /* XIM_CONNECTABLE */
-
-static char *supported_local_im_values_list[] = {
-    XNQueryInputStyle,
-    XNResourceName,
-    XNResourceClass,
-    XNDestroyCallback,
-    XNQueryIMValuesList,
-    XNQueryICValuesList,
-    XNVisiblePosition,
-    (char *)NULL
-};
-
-static char *supported_local_ic_values_list[] = {
-    XNInputStyle,
-    XNClientWindow,
-    XNFocusWindow,
-    XNResourceName,
-    XNResourceClass,
-    XNGeometryCallback,
-    XNFilterEvents,
-    XNDestroyCallback,
-    XNStringConversionCallback,
-    XNStringConversion,
-    XNResetState,
-    XNHotKey,
-    XNHotKeyState,
-    XNPreeditAttributes,
-    XNStatusAttributes,
-    XNArea,
-    XNAreaNeeded,
-    XNSpotLocation,
-    XNColormap,
-    XNStdColormap,
-    XNForeground,
-    XNBackground,
-    XNBackgroundPixmap,
-    XNFontSet,
-    XNLineSpace,
-    XNCursor,
-    XNPreeditStartCallback,
-    XNPreeditDoneCallback,
-    XNPreeditDrawCallback,
-    XNPreeditCaretCallback,
-    XNStatusStartCallback,
-    XNStatusDoneCallback,
-    XNStatusDrawCallback,
-    XNPreeditState,
-    XNPreeditStateNotifyCallback,
-    (char *)NULL
-};
-
-static XIMStyle supported_local_styles[] = {
-    XIMPreeditNone	| XIMStatusNone,
-    XIMPreeditNothing	| XIMStatusNothing,
-    0						/* dummy */
-};
-
-Private  Bool
-_XimDefaultStyles(info, top, parm, mode)
-    XimValueOffsetInfo	  info;
-    XPointer	 	  top;
-    XPointer	 	  parm;			/* unused */
-    unsigned long	  mode;			/* unused */
-{
-    XIMStyles		 *styles;
-    XIMStyles		**out;
-    register int	  i;
-    unsigned int	  n;
-    int			  len;
-    XPointer		  tmp;
-
-    n = XIMNumber(supported_local_styles) - 1;
-    len = sizeof(XIMStyles) + sizeof(XIMStyle) * n;
-    if(!(tmp = (XPointer)Xmalloc(len))) {
-	return False;
-    }
-    bzero(tmp, len);
-
-    styles = (XIMStyles *)tmp;
-    if (n > 0) {
-	styles->count_styles = (unsigned short)n;
-	styles->supported_styles =
-				(XIMStyle *)((char *)tmp + sizeof(XIMStyles));
-	for(i = 0; i < n; i++) {
-	    styles->supported_styles[i] = supported_local_styles[i];
-	}
-    }
-
-    out = (XIMStyles **)((char *)top + info->offset);
-    *out = styles;
-    return True;
-}
-
-Private  Bool
-_XimDefaultIMValues(info, top, parm, mode)
-    XimValueOffsetInfo	  info;
-    XPointer	 	  top;
-    XPointer	 	  parm;			/* unused */
-    unsigned long	  mode;			/* unused */
-{
-    XIMValuesList	 *values_list;
-    XIMValuesList	**out;
-    register int	  i;
-    unsigned int	  n;
-    int			  len;
-    XPointer		  tmp;
-
-    n = XIMNumber(supported_local_im_values_list) - 1;
-    len = sizeof(XIMValuesList) + sizeof(char **) * n;
-    if(!(tmp = (XPointer)Xmalloc(len))) {
-	return False;
-    }
-    bzero(tmp, len);
-
-    values_list = (XIMValuesList *)tmp;
-    if (n > 0) {
-	values_list->count_values = (unsigned short)n;
-	values_list->supported_values
-			 = (char **)((char *)tmp + sizeof(XIMValuesList));
-	for(i = 0; i < n; i++) {
-	    values_list->supported_values[i]
-				 = supported_local_im_values_list[i];
-	}
-    }
-
-    out = (XIMValuesList **)((char *)top + info->offset);
-    *out = values_list;
-    return True;
-}
-
-Private  Bool
-_XimDefaultICValues(info, top, parm, mode)
-    XimValueOffsetInfo	  info;
-    XPointer	 	  top;
-    XPointer	 	  parm;			/* unused */
-    unsigned long	  mode;			/* unused */
-{
-    XIMValuesList	 *values_list;
-    XIMValuesList	**out;
-    register int	  i;
-    unsigned int	  n;
-    int			  len;
-    XPointer		  tmp;
-
-    n = XIMNumber(supported_local_ic_values_list) - 1;
-    len = sizeof(XIMValuesList) + sizeof(char **) * n;
-    if(!(tmp = (XPointer)Xmalloc(len))) {
-	return False;
-    }
-    bzero(tmp, len);
-
-    values_list = (XIMValuesList *)tmp;
-    if (n > 0) {
-	values_list->count_values = (unsigned short)n;
-	values_list->supported_values
-			 = (char **)((char *)tmp + sizeof(XIMValuesList));
-	for(i = 0; i < n; i++) {
-	    values_list->supported_values[i]
-				 = supported_local_ic_values_list[i];
-	}
-    }
-
-    out = (XIMValuesList **)((char *)top + info->offset);
-    *out = values_list;
-    return True;
-}
-
-Private  Bool
-_XimDefaultVisiblePos(info, top, parm, mode)
-    XimValueOffsetInfo	  info;
-    XPointer	 	  top;
-    XPointer	 	  parm;			/* unused */
-    unsigned long	  mode;			/* unused */
-{
-    Bool		*out;
-
-    out = (Bool *)((char *)top + info->offset);
-    *out = False;
-    return True;
-}
-
-Private  Bool
-_XimDefaultFocusWindow(info, top, parm, mode)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 parm;
-    unsigned long	 mode;
-{
-    Xic			 ic = (Xic)parm;
-    Window		*out;
-
-    if(ic->core.client_window == (Window)NULL) {
-	return True;
-    }
-
-    out = (Window *)((char *)top + info->offset);
-    *out = ic->core.client_window;
-    return True;
-}
-
-Private  Bool
-_XimDefaultResName(info, top, parm, mode)
-    XimValueOffsetInfo	  info;
-    XPointer	 	  top;
-    XPointer	 	  parm;
-    unsigned long	  mode;
-{
-    Xic			  ic = (Xic)parm;
-    Xim			  im = (Xim)ic->core.im;
-    char		**out;
-
-    if(im->core.res_name == (char *)NULL) {
-	return True;
-    }
-
-    out = (char **)((char *)top + info->offset);
-    *out = im->core.res_name;
-    return True;
-}
-
-Private  Bool
-_XimDefaultResClass(info, top, parm, mode)
-    XimValueOffsetInfo	   info;
-    XPointer	 	   top;
-    XPointer	 	   parm;
-    unsigned long	   mode;
-{
-    Xic			  ic = (Xic)parm;
-    Xim			  im = (Xim)ic->core.im;
-    char		**out;
-
-    if(im->core.res_class == (char *)NULL) {
-	return True;
-    }
-
-    out = (char **)((char *)top + info->offset);
-    *out = im->core.res_class;
-    return True;
-}
-
-Private  Bool
-_XimDefaultDestroyCB(info, top, parm, mode)
-    XimValueOffsetInfo	  info;
-    XPointer	 	  top;
-    XPointer	 	  parm;
-    unsigned long	  mode;
-{
-    Xic			 ic = (Xic)parm;
-    Xim			 im = (Xim)ic->core.im;
-    XIMCallback		*out;
-
-    out = (XIMCallback *)((char *)top + info->offset);
-    *out = im->core.destroy_callback;
-    return True;
-}
-
-Private  Bool
-_XimDefaultResetState(info, top, parm, mode)
-    XimValueOffsetInfo	  info;
-    XPointer	 	  top;
-    XPointer	 	  parm;
-    unsigned long	  mode;
-{
-    XIMResetState	*out;
-
-    out = (XIMResetState *)((char *)top + info->offset);
-    *out = XIMInitialState;
-    return True;
-}
-
-Private  Bool
-_XimDefaultHotKeyState(info, top, parm, mode)
-    XimValueOffsetInfo	  info;
-    XPointer	 	  top;
-    XPointer	 	  parm;
-    unsigned long	  mode;
-{
-    XIMHotKeyState	*out;
-
-    out = (XIMHotKeyState *)((char *)top + info->offset);
-    *out = XIMHotKeyStateOFF;
-    return True;
-}
-
-Private  Bool
-_XimDefaultArea(info, top, parm, mode)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 parm;
-    unsigned long	 mode;
-{
-    Xic			 ic = (Xic)parm;
-    Xim			 im = (Xim)ic->core.im;
-    Window		 root_return;
-    int			 x_return, y_return;
-    unsigned int	 width_return, height_return;
-    unsigned int	 border_width_return;
-    unsigned int	 depth_return;
-    XRectangle		 area;
-    XRectangle		*out;
-
-    if(ic->core.focus_window == (Window)NULL) {
-	return True;
-    }
-    if(XGetGeometry(im->core.display, (Drawable)ic->core.focus_window,
-		&root_return, &x_return, &y_return, &width_return,
-		&height_return, &border_width_return, &depth_return)
-		== (Status)NULL) {
-	return True;
-    }
-    area.x	= 0;
-    area.y	= 0;
-    area.width	= width_return;
-    area.height	= height_return;
-
-    out = (XRectangle *)((char *)top + info->offset);
-    *out = area;
-    return True;
-}
-
-Private  Bool
-_XimDefaultColormap(info, top, parm, mode)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 parm;
-    unsigned long	 mode;
-{
-    Xic			 ic = (Xic)parm;
-    Xim			 im = (Xim)ic->core.im;
-    XWindowAttributes	 win_attr;
-    Colormap		*out;
-
-    if(ic->core.client_window == (Window)NULL) {
-	return True;
-    }
-    if(XGetWindowAttributes(im->core.display, ic->core.client_window,
-					&win_attr) == (Status)NULL) {
-	return True;
-    }
-   
-    out = (Colormap *)((char *)top + info->offset);
-    *out = win_attr.colormap;
-    return True;
-}
-
-Private  Bool
-_XimDefaultStdColormap(info, top, parm, mode)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 parm;
-    unsigned long	 mode;
-{
-    Atom		*out;
-
-    out = (Atom *)((char *)top + info->offset);
-    *out = (Atom)0;
-    return True;
-}
-
-Private  Bool
-_XimDefaultFg(info, top, parm, mode)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 parm;
-    unsigned long	 mode;
-{
-    Xic			 ic = (Xic)parm;
-    Xim			 im = (Xim)ic->core.im;
-    unsigned long	 fg;
-    unsigned long	*out;
-
-    fg = WhitePixel(im->core.display, DefaultScreen(im->core.display));
-    out = (unsigned long *)((char *)top + info->offset);
-    *out = fg;
-    return True;
-}
-
-Private  Bool
-_XimDefaultBg(info, top, parm, mode)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 parm;
-    unsigned long	 mode;
-{
-    Xic			 ic = (Xic)parm;
-    Xim			 im = (Xim)ic->core.im;
-    unsigned long	 bg;
-    unsigned long	*out;
-
-    bg = BlackPixel(im->core.display, DefaultScreen(im->core.display));
-    out = (unsigned long *)((char *)top + info->offset);
-    *out = bg;
-    return True;
-}
-
-Private  Bool
-_XimDefaultBgPixmap(info, top, parm, mode)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 parm;
-    unsigned long	 mode;
-{
-    Pixmap		*out;
-
-    out = (Pixmap *)((char *)top + info->offset);
-    *out = (Pixmap)0;
-    return True;
-}
-
-Private  Bool
-_XimDefaultFontSet(info, top, parm, mode)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 parm;
-    unsigned long	 mode;
-{
-    XFontSet		*out;
-
-    out = (XFontSet *)((char *)top + info->offset);
-    *out = 0;
-    return True;
-}
-
-Private  Bool
-_XimDefaultLineSpace(info, top, parm, mode)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 parm;
-    unsigned long	 mode;
-{
-    Xic			 ic = (Xic)parm;
-    XFontSet		 fontset;
-    XFontSetExtents	*fset_extents;
-    int			 line_space = 0;
-    int			*out;
-
-    if(mode & XIM_PREEDIT_ATTR) {
-	fontset = ic->core.preedit_attr.fontset;
-    } else if(mode & XIM_STATUS_ATTR) {
-	fontset = ic->core.status_attr.fontset;
-    } else {
-	return True;
-    }
-    if (fontset) {
-	fset_extents = XExtentsOfFontSet(fontset);
-	line_space = fset_extents->max_logical_extent.height;
-    }
-    out = (int *)((char *)top + info->offset);
-    *out = line_space;
-    return True;
-}
-
-Private  Bool
-_XimDefaultCursor(info, top, parm, mode)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 parm;
-    unsigned long	 mode;
-{
-    Cursor		*out;
-
-    out = (Cursor *)((char *)top + info->offset);
-    *out = (Cursor)0;
-    return True;
-}
-
-Private  Bool
-_XimDefaultPreeditState(info, top, parm, mode)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 parm;
-    unsigned long	 mode;
-{
-    XIMPreeditState	*out;
-
-    out = (XIMPreeditState *)((char *)top + info->offset);
-    *out = XIMPreeditDisable;
-    return True;
-}
-
-Private  Bool
-_XimDefaultNest(info, top, parm, mode)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 parm;
-    unsigned long	 mode;
-{
-    return True;
-}
-
-Private  Bool
-_XimEncodeCallback(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    XIMCallback		*out;
-
-    out = (XIMCallback *)((char *)top + info->offset);
-    *out = *((XIMCallback *)val);
-    return True;
-}
-
-Private  Bool
-_XimEncodeString(info, top, val)
-    XimValueOffsetInfo	  info;
-    XPointer	 	  top;
-    XPointer	 	  val;
-{
-    int			  len;
-    char		 *string;
-    char		**out;
-
-    if(val == (XPointer)NULL) {
-	return False;
-    }
-    len = strlen((char *)val);
-    if(!(string = (char *)Xmalloc(len + 1))) {
-	return False;
-    }
-    (void)strcpy(string, (char *)val);
-    string[len] = '\0';
-
-    out = (char **)((char *)top + info->offset);
-    if(*out) {
-	Xfree(*out);
-    }
-    *out = string;
-    return True;
-}
-
-Private  Bool
-_XimEncodeStyle(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    XIMStyle		*out;
-
-    out = (XIMStyle *)((char *)top + info->offset);
-    *out = (XIMStyle)val;
-    return True;
-}
-
-Private  Bool
-_XimEncodeWindow(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    Window		*out;
-
-    out = (Window *)((char *)top + info->offset);
-    *out = (Window)val;
-    return True;
-}
-
-Private  Bool
-_XimEncodeStringConv(info, top, val)
-    XimValueOffsetInfo		 info;
-    XPointer		 	 top;
-    XPointer		 	 val;
-{
-    /*
-     * Not yet
-     */
-    return True;
-}
-
-Private  Bool
-_XimEncodeResetState(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    XIMResetState	*out;
-
-    out = (XIMResetState *)((char *)top + info->offset);
-    *out = (XIMResetState)val;
-    return True;
-}
-
-Private  Bool
-_XimEncodeHotKey(info, top, val)
-    XimValueOffsetInfo	  info;
-    XPointer	 	  top;
-    XPointer	 	  val;
-{
-    XIMHotKeyTriggers	 *hotkey = (XIMHotKeyTriggers *)val;
-    XIMHotKeyTriggers	**out;
-    XIMHotKeyTriggers	 *key_list;
-    XIMHotKeyTrigger	 *key;
-    XPointer		  tmp;
-    int			  num;
-    int			  len;
-    register int	  i;
-
-    if(hotkey == (XIMHotKeyTriggers *)NULL) {
-	return True;
-    }
-
-    if((num = hotkey->num_hot_key) == 0) {
-	return True;
-    }
-
-    len = sizeof(XIMHotKeyTriggers) + sizeof(XIMHotKeyTrigger) * num;
-    if(!(tmp = (XPointer)Xmalloc(len))) {
-	return False;
-    }
-
-    key_list = (XIMHotKeyTriggers *)tmp;
-    key = (XIMHotKeyTrigger *)((char *)tmp + sizeof(XIMHotKeyTriggers));
-
-    for(i = 0; i < num; i++) {
-	key[i] = hotkey->key[i];
-    }
-
-    key_list->num_hot_key = num;
-    key_list->key = key;
-
-    out = (XIMHotKeyTriggers **)((char *)top + info->offset);
-    *out = key_list;
-    return True;
-}
-
-Private  Bool
-_XimEncodeHotKetState(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    XIMHotKeyState	*out;
-
-    out = (XIMHotKeyState *)((char *)top + info->offset);
-    *out = (XIMHotKeyState)val;
-    return True;
-}
-
-Private  Bool
-_XimEncodeRectangle(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    XRectangle		*out;
-
-    out = (XRectangle *)((char *)top + info->offset);
-    *out = *((XRectangle *)val);
-    return True;
-}
-
-Private  Bool
-_XimEncodeSpot(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    XPoint		*out;
-
-    out = (XPoint *)((char *)top + info->offset);
-    *out = *((XPoint *)val);
-    return True;
-}
-
-Private  Bool
-_XimEncodeColormap(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    Colormap		*out;
-
-    out = (Colormap *)((char *)top + info->offset);
-    *out = (Colormap)val;
-    return True;
-}
-
-Private  Bool
-_XimEncodeStdColormap(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    Atom		*out;
-
-    out = (Atom *)((char *)top + info->offset);
-    *out = (Atom)val;
-    return True;
-}
-
-Private  Bool
-_XimEncodeLong(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    unsigned long	*out;
-
-    out = (unsigned long *)((char *)top + info->offset);
-    *out = (unsigned long)val;
-    return True;
-}
-
-Private  Bool
-_XimEncodeBgPixmap(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    Pixmap		*out;
-
-    out = (Pixmap *)((char *)top + info->offset);
-    *out = (Pixmap)val;
-    return True;
-}
-
-Private  Bool
-_XimEncodeFontSet(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    XFontSet		*out;
-
-    out = (XFontSet *)((char *)top + info->offset);
-    *out = (XFontSet)val;
-    return True;
-}
-
-Private  Bool
-_XimEncodeLineSpace(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    int			*out;
-
-    out = (int *)((char *)top + info->offset);
-    *out = (int)val;
-    return True;
-}
-
-Private  Bool
-_XimEncodeCursor(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    Cursor		*out;
-
-    out = (Cursor *)((char *)top + info->offset);
-    *out = (Cursor)val;
-    return True;
-}
-
-Private  Bool
-_XimEncodePreeditState(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    XIMPreeditState	*out;
-
-    out = (XIMPreeditState *)((char *)top + info->offset);
-    *out = (XIMPreeditState)val;
-    return True;
-}
-
-Private  Bool
-_XimEncodeNest(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    return True;
-}
-
-Private  Bool
-_XimDecodeStyles(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    XIMStyles		*styles;
-    XIMStyles		*out;
-    register int	 i;
-    unsigned int	 num;
-    int			 len;
-    XPointer		 tmp;
-
-    if(val == (XPointer)NULL) {
-	return False;
-    }
-
-    styles = *((XIMStyles **)((char *)top + info->offset));
-    num = styles->count_styles;
-
-    len = sizeof(XIMStyles) + sizeof(XIMStyle) * num;
-    if(!(tmp = (XPointer)Xmalloc(len))) {
-	return False;
-    }
-    bzero(tmp, len);
-
-    out = (XIMStyles *)tmp;
-    if(num >0) {
-	out->count_styles = (unsigned short)num;
-	out->supported_styles = (XIMStyle *)((char *)tmp + sizeof(XIMStyles));
-    
-	for(i = 0; i < num; i++) {
-	    out->supported_styles[i] = styles->supported_styles[i];
-	}
-    }
-    *((XIMStyles **)val) = out;
-    return True;
-}
-
-Private  Bool
-_XimDecodeValues(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    XIMValuesList	*values_list;
-    XIMValuesList	*out;
-    register int	 i;
-    unsigned int	 num;
-    int			 len;
-    XPointer		 tmp;
-
-    if(val == (XPointer)NULL) {
-	return False;
-    }
-
-    values_list = *((XIMValuesList **)((char *)top + info->offset));
-    num = values_list->count_values;
-
-    len = sizeof(XIMValuesList) + sizeof(char **) * num;
-    if(!(tmp = (char *)Xmalloc(len))) {
-	return False;
-    }
-    bzero(tmp, len);
-
-    out = (XIMValuesList *)tmp;
-    if(num) {
-	out->count_values = (unsigned short)num;
-	out->supported_values = (char **)((char *)tmp + sizeof(XIMValuesList));
-    
-	for(i = 0; i < num; i++) {
-	    out->supported_values[i] = values_list->supported_values[i];
-	}
-    }
-    *((XIMValuesList **)val) = out;
-    return True;
-}
-
-Private  Bool
-_XimDecodeCallback(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    XIMCallback		*in;
-    XIMCallback		*callback;
-
-    in = (XIMCallback *)((char *)top + info->offset);
-    if(!(callback = (XIMCallback *)Xmalloc(sizeof(XIMCallback)))) {
-	return False;
-    }
-    callback->client_data = in->client_data;
-    callback->callback    = in->callback;
-
-    *((XIMCallback **)val) = callback;
-    return True;
-}
-
-Private  Bool
-_XimDecodeString(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    int			 len = 0;
-    char		*in;
-    char		*string;
-
-    in = *((char **)((char *)top + info->offset));
-    if(in != (char *)NULL) {
-	len = strlen(in);
-    }
-    if(!(string = (char *)Xmalloc(len + 1))) {
-	return False;
-    }
-    if(in != (char *)NULL) {
-	(void)strcpy(string, in);
-    }
-    string[len] = '\0';
-    *((char **)val) = string;
-    return True;
-}
-
-Private  Bool
-_XimDecodeBool(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    Bool		*in;
-
-    in = (Bool *)((char *)top + info->offset);
-    *((Bool *)val) = *in;
-    return True;
-}
-
-Private  Bool
-_XimDecodeStyle(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    XIMStyle		*in;
-
-    in = (XIMStyle *)((char *)top + info->offset);
-    *((XIMStyle *)val) = *in;
-    return True;
-}
-
-Private  Bool
-_XimDecodeWindow(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    Window		*in;
-
-    in = (Window *)((char *)top + info->offset);
-    *((Window *)val) = *in;
-    return True;
-}
-
-Private  Bool
-_XimDecodeStringConv(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    /*
-     * Not yet
-     */
-    return True;
-}
-
-Private  Bool
-_XimDecodeResetState(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    XIMResetState	*in;
-
-    in = (XIMResetState *)((char *)top + info->offset);
-    *((XIMResetState *)val) = *in;
-    return True;
-}
-
-Private  Bool
-_XimDecodeHotKey(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    XIMHotKeyTriggers	*in;
-    XIMHotKeyTriggers	*hotkey;
-    XIMHotKeyTrigger	*key;
-    XPointer		 tmp;
-    int			 num;
-    int			 len;
-    register int	 i;
-
-    in = *((XIMHotKeyTriggers **)((char *)top + info->offset));
-    num = in->num_hot_key;
-    len = sizeof(XIMHotKeyTriggers) + sizeof(XIMHotKeyTrigger) * num;
-    if(!(tmp = (XPointer)Xmalloc(len))) {
-	return False;
-    }
-
-    hotkey = (XIMHotKeyTriggers *)tmp;
-    key = (XIMHotKeyTrigger *)((char *)tmp + sizeof(XIMHotKeyTriggers));
-
-    for(i = 0; i < num; i++) {
-	key[i] = in->key[i];
-    }
-    hotkey->num_hot_key = num;
-    hotkey->key = key;
-
-    *((XIMHotKeyTriggers **)val) = hotkey;
-    return True;
-}
-
-Private  Bool
-_XimDecodeHotKetState(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    XIMHotKeyState	*in;
-
-    in = (XIMHotKeyState *)((char *)top + info->offset);
-    *((XIMHotKeyState *)val) = *in;
-    return True;
-}
-
-Private  Bool
-_XimDecodeRectangle(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    XRectangle		*in;
-    XRectangle		*rect;
-
-    in = (XRectangle *)((char *)top + info->offset);
-    if(!(rect = (XRectangle *)Xmalloc(sizeof(XRectangle)))) {
-	return False;
-    }
-    *rect = *in;
-    *((XRectangle **)val) = rect;
-    return True;
-}
-
-Private  Bool
-_XimDecodeSpot(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    XPoint		*in;
-    XPoint		*spot;
-
-    in = (XPoint *)((char *)top + info->offset);
-    if(!(spot = (XPoint *)Xmalloc(sizeof(XPoint)))) {
-	return False;
-    }
-    *spot = *in;
-    *((XPoint **)val) = spot;
-    return True;
-}
-
-Private  Bool
-_XimDecodeColormap(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    Colormap		*in;
-
-    in = (Colormap *)((char *)top + info->offset);
-    *((Colormap *)val) = *in;
-    return True;
-}
-
-Private  Bool
-_XimDecodeStdColormap(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    Atom		*in;
-
-    in = (Atom *)((char *)top + info->offset);
-    *((Atom *)val) = *in;
-    return True;
-}
-
-Private  Bool
-_XimDecodeLong(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    unsigned long	*in;
-
-    in = (unsigned long *)((char *)top + info->offset);
-    *((unsigned long *)val) = *in;
-    return True;
-}
-
-Private  Bool
-_XimDecodeBgPixmap(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    Pixmap		*in;
-
-    in = (Pixmap *)((char *)top + info->offset);
-    *((Pixmap *)val) = *in;
-    return True;
-}
-
-Private  Bool
-_XimDecodeFontSet(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    XFontSet		*in;
-
-    in = (XFontSet *)((char *)top + info->offset);
-    *((XFontSet *)val) = *in;
-    return True;
-}
-
-Private  Bool
-_XimDecodeLineSpace(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    int		*in;
-
-    in = (int *)((char *)top + info->offset);
-    *((int *)val) = *in;
-    return True;
-}
-
-Private  Bool
-_XimDecodeCursor(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    Cursor		*in;
-
-    in = (Cursor *)((char *)top + info->offset);
-    *((Cursor *)val) = *in;
-    return True;
-}
-
-Private  Bool
-_XimDecodePreeditState(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    XIMPreeditState	*in;
-
-    in = (XIMPreeditState *)((char *)top + info->offset);
-    *((XIMPreeditState *)val) = *in;
-    return True;
-}
-
-Private  Bool
-_XimDecodeNest(info, top, val)
-    XimValueOffsetInfo	 info;
-    XPointer	 	 top;
-    XPointer	 	 val;
-{
-    return True;
-}
-
-static	XIMResource	im_resources[] = {
-    {XNQueryInputStyle,		   0, XimType_XIMStyles,	0, 0, 0},
-    {XNDestroyCallback,		   0,  0,			0, 0, 0},
-    {XNResourceName,		   0, XimType_STRING8,		0, 0, 0},
-    {XNResourceClass,		   0, XimType_STRING8,		0, 0, 0},
-    {XNQueryIMValuesList,	   0, 0,			0, 0, 0},
-    {XNQueryICValuesList,	   0, 0,			0, 0, 0},
-    {XNVisiblePosition,		   0, 0,			0, 0, 0}
-};
-
-static	XIMResource	im_inner_resources[] = {
-    {XNDestroyCallback,		   0, 0,			0, 0, 0},
-    {XNResourceName,		   0, XimType_STRING8,		0, 0, 0},
-    {XNResourceClass,		   0, XimType_STRING8,		0, 0, 0},
-    {XNQueryIMValuesList,	   0, 0,			0, 0, 0},
-    {XNQueryICValuesList,	   0, 0,			0, 0, 0},
-    {XNVisiblePosition,		   0, 0,			0, 0, 0}
-};
-
-static	XIMResource	ic_resources[] = {
-    {XNInputStyle,		   0, XimType_CARD32,		0, 0, 0},
-    {XNClientWindow,		   0, XimType_Window,		0, 0, 0},
-    {XNFocusWindow,		   0, XimType_Window,		0, 0, 0},
-    {XNResourceName,		   0, XimType_STRING8,		0, 0, 0},
-    {XNResourceClass,		   0, XimType_STRING8,		0, 0, 0},
-    {XNGeometryCallback,	   0, 0,			0, 0, 0},
-    {XNFilterEvents,		   0, XimType_CARD32,		0, 0, 0},
-    {XNDestroyCallback,		   0, 0,			0, 0, 0},
-    {XNStringConversionCallback,   0, 0,			0, 0, 0},
-    {XNStringConversion,	   0, XimType_XIMStringConversion,0, 0, 0},
-    {XNResetState,		   0, 0,			0, 0, 0},
-    {XNHotKey,			   0, XimType_XIMHotKeyTriggers,0, 0, 0},
-    {XNHotKeyState,		   0, XimType_XIMHotKeyState, 	0, 0, 0},
-    {XNPreeditAttributes,	   0, XimType_NEST,		0, 0, 0},
-    {XNStatusAttributes,	   0, XimType_NEST,		0, 0, 0},
-    {XNArea,			   0, XimType_XRectangle,	0, 0, 0},
-    {XNAreaNeeded,		   0, XimType_XRectangle,	0, 0, 0},
-    {XNSpotLocation,		   0, XimType_XPoint,		0, 0, 0},
-    {XNColormap,		   0, XimType_CARD32,		0, 0, 0},
-    {XNStdColormap,		   0, XimType_CARD32,		0, 0, 0},
-    {XNForeground,		   0, XimType_CARD32,		0, 0, 0},
-    {XNBackground,		   0, XimType_CARD32,		0, 0, 0},
-    {XNBackgroundPixmap,	   0, XimType_CARD32,		0, 0, 0},
-    {XNFontSet,			   0, XimType_XFontSet,		0, 0, 0},
-    {XNLineSpace,		   0, XimType_CARD32,		0, 0, 0},
-    {XNCursor,			   0, XimType_CARD32,		0, 0, 0},
-    {XNPreeditStartCallback,	   0, 0,			0, 0, 0},
-    {XNPreeditDoneCallback,	   0, 0,			0, 0, 0},
-    {XNPreeditDrawCallback,	   0, 0,			0, 0, 0},
-    {XNPreeditCaretCallback,	   0, 0,			0, 0, 0},
-    {XNStatusStartCallback,	   0, 0,			0, 0, 0},
-    {XNStatusDoneCallback,	   0, 0,			0, 0, 0},
-    {XNStatusDrawCallback,	   0, 0,			0, 0, 0},
-    {XNPreeditState,		   0, 0,			0, 0, 0},
-    {XNPreeditStateNotifyCallback, 0, 0,			0, 0, 0},
-};
-
-static	XIMResource	ic_inner_resources[] = {
-    {XNResourceName,		   0, XimType_STRING8,		0, 0, 0},
-    {XNResourceClass,		   0, XimType_STRING8,		0, 0, 0},
-    {XNGeometryCallback,	   0, 0,			0, 0, 0},
-    {XNDestroyCallback,		   0, 0,			0, 0, 0},
-    {XNStringConversionCallback,   0, 0,			0, 0, 0},
-    {XNPreeditStartCallback,	   0, 0,			0, 0, 0},
-    {XNPreeditDoneCallback,	   0, 0,			0, 0, 0},
-    {XNPreeditDrawCallback,	   0, 0,			0, 0, 0},
-    {XNPreeditCaretCallback,	   0, 0,			0, 0, 0},
-    {XNStatusStartCallback,	   0, 0,			0, 0, 0},
-    {XNStatusDoneCallback,	   0, 0,			0, 0, 0},
-    {XNStatusDrawCallback,	   0, 0,			0, 0, 0},
-    {XNPreeditStateNotifyCallback, 0, 0,			0, 0, 0},
-};
-
-static XimValueOffsetInfoRec im_attr_info[] = {
-    {XNQueryInputStyle,		 0,
-	XOffsetOf(XimDefIMValues, styles),
-	_XimDefaultStyles,	 NULL,			_XimDecodeStyles},
-
-    {XNDestroyCallback,		 0,
-	XOffsetOf(XimDefIMValues, destroy_callback),
-	NULL,		 	 _XimEncodeCallback,	_XimDecodeCallback},
-
-    {XNResourceName,		 0,
-	XOffsetOf(XimDefIMValues, res_name),
-	NULL,		 	 _XimEncodeString,	_XimDecodeString},
-
-    {XNResourceClass,		 0,
-	XOffsetOf(XimDefIMValues, res_class),
-	NULL,		 	 _XimEncodeString,	_XimDecodeString},
-
-    {XNQueryIMValuesList,		 0,
-	XOffsetOf(XimDefIMValues, im_values_list),
-	_XimDefaultIMValues,	 NULL,			_XimDecodeValues},
-
-    {XNQueryICValuesList,		 0,
-	XOffsetOf(XimDefIMValues, ic_values_list),
-	_XimDefaultICValues,	 NULL,			_XimDecodeValues},
-
-    {XNVisiblePosition,			 0,
-	XOffsetOf(XimDefIMValues, visible_position),
-	_XimDefaultVisiblePos,	 NULL,			_XimDecodeBool}
-};
-
-static XimValueOffsetInfoRec ic_attr_info[] = {
-    {XNInputStyle,		 0,
-	XOffsetOf(XimDefICValues, input_style),
-	NULL,			 _XimEncodeStyle,	_XimDecodeStyle},
-
-    {XNClientWindow,		 0,
-	XOffsetOf(XimDefICValues, client_window),
-	NULL,			 _XimEncodeWindow,	_XimDecodeWindow},
-
-    {XNFocusWindow,		 0,
-	XOffsetOf(XimDefICValues, focus_window),
-	_XimDefaultFocusWindow,  _XimEncodeWindow,	_XimDecodeWindow},
-
-    {XNResourceName,		 0,
-	XOffsetOf(XimDefICValues, res_name),
-	_XimDefaultResName,	 _XimEncodeString,	_XimDecodeString},
-
-    {XNResourceClass,		 0,
-	XOffsetOf(XimDefICValues, res_class),
-	_XimDefaultResClass,	 _XimEncodeString,	_XimDecodeString},
-
-    {XNGeometryCallback,	 0,
-	XOffsetOf(XimDefICValues, geometry_callback),
-	NULL,			 _XimEncodeCallback,	_XimDecodeCallback},
-
-    {XNFilterEvents,		 0,
-	XOffsetOf(XimDefICValues, filter_events),
-	NULL,			 NULL,			_XimDecodeLong},
-
-    {XNDestroyCallback,		 0,
-	XOffsetOf(XimDefICValues, destroy_callback),
-	_XimDefaultDestroyCB,	 _XimEncodeCallback,	_XimDecodeCallback},
-
-    {XNStringConversionCallback, 0,
-	XOffsetOf(XimDefICValues, string_conversion_callback),
-	NULL,			 _XimEncodeCallback,	_XimDecodeCallback},
-
-    {XNStringConversion,	 0,
-	XOffsetOf(XimDefICValues, string_conversion),
-	NULL,			 _XimEncodeStringConv,	_XimDecodeStringConv},
-
-    {XNResetState,		 0,
-	XOffsetOf(XimDefICValues, reset_state),
-	_XimDefaultResetState,	 _XimEncodeResetState,	_XimDecodeResetState},
-
-    {XNHotKey,			 0,
-	XOffsetOf(XimDefICValues, hotkey),
-	NULL,			 _XimEncodeHotKey,	_XimDecodeHotKey},
-
-    {XNHotKeyState,		 0,
-	XOffsetOf(XimDefICValues, hotkey_state),
-	_XimDefaultHotKeyState,	 _XimEncodeHotKetState,	_XimDecodeHotKetState},
-
-    {XNPreeditAttributes,	 0,
-	XOffsetOf(XimDefICValues, preedit_attr),
-	_XimDefaultNest,	 _XimEncodeNest,	_XimDecodeNest},
-
-    {XNStatusAttributes,	 0,
-	XOffsetOf(XimDefICValues, status_attr),
-	_XimDefaultNest,	 _XimEncodeNest,	_XimDecodeNest},
-};
-
-static XimValueOffsetInfoRec ic_pre_attr_info[] = {
-    {XNArea,			 0,
-	XOffsetOf(ICPreeditAttributes, area),
-	_XimDefaultArea,	 _XimEncodeRectangle,	_XimDecodeRectangle},
-
-    {XNAreaNeeded,		 0,
-	XOffsetOf(ICPreeditAttributes, area_needed),
-	NULL,			 _XimEncodeRectangle,	_XimDecodeRectangle},
-
-    {XNSpotLocation,		 0,
-	XOffsetOf(ICPreeditAttributes, spot_location),
-	NULL,			 _XimEncodeSpot,	_XimDecodeSpot},
-
-    {XNColormap,		 0,
-	XOffsetOf(ICPreeditAttributes, colormap),
-	_XimDefaultColormap,	 _XimEncodeColormap,	_XimDecodeColormap},
-
-    {XNStdColormap,		 0,
-	XOffsetOf(ICPreeditAttributes, std_colormap),
-	_XimDefaultStdColormap,	 _XimEncodeStdColormap,	_XimDecodeStdColormap},
-
-    {XNForeground,		 0,
-	XOffsetOf(ICPreeditAttributes, foreground),
-	_XimDefaultFg,		 _XimEncodeLong,	_XimDecodeLong},
-
-    {XNBackground,		 0,
-	XOffsetOf(ICPreeditAttributes, background),
-	_XimDefaultBg,		 _XimEncodeLong,	_XimDecodeLong},
-
-    {XNBackgroundPixmap,	 0,
-	XOffsetOf(ICPreeditAttributes, background_pixmap),
-	_XimDefaultBgPixmap, 	 _XimEncodeBgPixmap,	_XimDecodeBgPixmap},
-
-    {XNFontSet,			 0,
-	XOffsetOf(ICPreeditAttributes, fontset),
-	_XimDefaultFontSet,	 _XimEncodeFontSet,	_XimDecodeFontSet},
-
-    {XNLineSpace,		 0,
-	XOffsetOf(ICPreeditAttributes, line_spacing),
-	_XimDefaultLineSpace,	 _XimEncodeLineSpace,	_XimDecodeLineSpace},
-
-    {XNCursor,			 0,
-	XOffsetOf(ICPreeditAttributes, cursor),
-	_XimDefaultCursor,	 _XimEncodeCursor,	_XimDecodeCursor},
-
-    {XNPreeditStartCallback,	 0,
-	XOffsetOf(ICPreeditAttributes, start_callback),
-	NULL,			 _XimEncodeCallback,	_XimDecodeCallback},
-
-    {XNPreeditDoneCallback,	 0,
-	XOffsetOf(ICPreeditAttributes, done_callback),
-	NULL,			 _XimEncodeCallback,	_XimDecodeCallback},
-
-    {XNPreeditDrawCallback,	 0,
-	XOffsetOf(ICPreeditAttributes, draw_callback),
-	NULL,			 _XimEncodeCallback,	_XimDecodeCallback},
-
-    {XNPreeditCaretCallback,	 0,
-	XOffsetOf(ICPreeditAttributes, caret_callback),
-	NULL,			 _XimEncodeCallback,	_XimDecodeCallback},
-
-    {XNPreeditState,		 0,
-	XOffsetOf(ICPreeditAttributes, preedit_state),
-	_XimDefaultPreeditState, _XimEncodePreeditState,_XimDecodePreeditState},
-
-    {XNPreeditStateNotifyCallback, 0,
-	XOffsetOf(ICPreeditAttributes, state_notify_callback),
-	NULL,			 _XimEncodeCallback,	_XimDecodeCallback},
-};
-
-static XimValueOffsetInfoRec ic_sts_attr_info[] = {
-    {XNArea,			 0,
-	XOffsetOf(ICStatusAttributes, area),
-	_XimDefaultArea,	 _XimEncodeRectangle,	_XimDecodeRectangle},
-
-    {XNAreaNeeded,		 0,
-	XOffsetOf(ICStatusAttributes, area_needed),
-	NULL,			 _XimEncodeRectangle,	_XimDecodeRectangle},
-
-    {XNColormap,		 0,
-	XOffsetOf(ICStatusAttributes, colormap),
-	_XimDefaultColormap,	 _XimEncodeColormap,	_XimDecodeColormap},
-
-    {XNStdColormap,		 0,
-	XOffsetOf(ICStatusAttributes, std_colormap),
-	_XimDefaultStdColormap,	 _XimEncodeStdColormap,	_XimDecodeStdColormap},
-
-    {XNForeground,		 0,
-	XOffsetOf(ICStatusAttributes, foreground),
-	_XimDefaultFg,		 _XimEncodeLong,	_XimDecodeLong},
-
-    {XNBackground,		 0,
-	XOffsetOf(ICStatusAttributes, background),
-	_XimDefaultBg,		 _XimEncodeLong,	_XimDecodeLong},
-
-    {XNBackgroundPixmap,	 0,
-	XOffsetOf(ICStatusAttributes, background_pixmap),
-	_XimDefaultBgPixmap, 	 _XimEncodeBgPixmap,	_XimDecodeBgPixmap},
-
-    {XNFontSet,			 0,
-	XOffsetOf(ICStatusAttributes, fontset),
-	_XimDefaultFontSet,	 _XimEncodeFontSet,	_XimDecodeFontSet},
-
-    {XNLineSpace,		 0,
-	XOffsetOf(ICStatusAttributes, line_spacing),
-	_XimDefaultLineSpace,	 _XimEncodeLineSpace,	_XimDecodeLineSpace},
-
-    {XNCursor,			 0,
-	XOffsetOf(ICStatusAttributes, cursor),
-	_XimDefaultCursor,	 _XimEncodeCursor,	_XimDecodeCursor},
-
-    {XNStatusStartCallback,	 0,
-	XOffsetOf(ICStatusAttributes, start_callback),
-	NULL,			 _XimEncodeCallback,	_XimDecodeCallback},
-
-    {XNStatusDoneCallback,	 0,
-	XOffsetOf(ICStatusAttributes, done_callback),
-	NULL,			 _XimEncodeCallback,	_XimDecodeCallback},
-
-    {XNStatusDrawCallback,	 0,
-	XOffsetOf(ICStatusAttributes, draw_callback),
-	NULL,			 _XimEncodeCallback,	_XimDecodeCallback}
-};
-
-typedef struct _XimIMMode {
-    char		*name;
-    XrmQuark		 quark;
-    unsigned short	 mode;
-} XimIMMode;
-
-static XimIMMode	im_mode[] = {
-    {XNQueryInputStyle,		0,
-		(XIM_MODE_IM_DEFAULT | XIM_MODE_IM_GET)},
-    {XNDestroyCallback,		0,
-		(XIM_MODE_IM_DEFAULT | XIM_MODE_IM_SET | XIM_MODE_IM_GET)},
-    {XNResourceName,		0,
-		(XIM_MODE_IM_DEFAULT | XIM_MODE_IM_SET | XIM_MODE_IM_GET)},
-    {XNResourceClass,		0,
-		(XIM_MODE_IM_DEFAULT | XIM_MODE_IM_SET | XIM_MODE_IM_GET)},
-    {XNQueryIMValuesList,		0,
-		(XIM_MODE_IM_DEFAULT | XIM_MODE_IM_GET)},
-    {XNQueryICValuesList,		0,
-		(XIM_MODE_IM_DEFAULT | XIM_MODE_IM_GET)},
-    {XNVisiblePosition,			0,
-		(XIM_MODE_IM_DEFAULT | XIM_MODE_IM_GET)}
-};
-
-typedef struct _XimICMode {
-    char		*name;
-    XrmQuark		 quark;
-    unsigned short	 preedit_callback_mode;
-    unsigned short	 preedit_position_mode;
-    unsigned short	 preedit_area_mode;
-    unsigned short	 preedit_nothing_mode;
-    unsigned short	 preedit_none_mode;
-    unsigned short	 status_callback_mode;
-    unsigned short	 status_area_mode;
-    unsigned short	 status_nothing_mode;
-    unsigned short	 status_none_mode;
-} XimICMode;
-
-static XimICMode	ic_mode[] = {
-    {XNInputStyle, 0,
-		(XIM_MODE_PRE_CREATE | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_CREATE | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_CREATE | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_CREATE | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_CREATE | XIM_MODE_PRE_GET),
-		(XIM_MODE_STS_CREATE | XIM_MODE_STS_GET),
-		(XIM_MODE_STS_CREATE | XIM_MODE_STS_GET),
-		(XIM_MODE_STS_CREATE | XIM_MODE_STS_GET),
-		(XIM_MODE_STS_CREATE | XIM_MODE_STS_GET)},
-    {XNClientWindow, 0,
-		(XIM_MODE_PRE_ONCE | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_ONCE | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_ONCE | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_ONCE | XIM_MODE_PRE_GET),
-		0,
-		(XIM_MODE_STS_ONCE | XIM_MODE_STS_GET),
-		(XIM_MODE_STS_ONCE | XIM_MODE_STS_GET),
-		(XIM_MODE_STS_ONCE | XIM_MODE_STS_GET),
-		0},
-    {XNFocusWindow, 0,
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		0,
-		(XIM_MODE_STS_DEFAULT | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		(XIM_MODE_STS_DEFAULT | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		(XIM_MODE_STS_DEFAULT | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		0},
-    {XNResourceName, 0,
-		0,
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		0,
-		0,
-		(XIM_MODE_STS_DEFAULT | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		(XIM_MODE_STS_DEFAULT | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		0},
-    {XNResourceClass, 0,
-		0,
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		0,
-		0,
-		(XIM_MODE_STS_DEFAULT | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		(XIM_MODE_STS_DEFAULT | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		0},
-    {XNGeometryCallback, 0,
-		0,
-		0,
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		0,
-		0,
-		0,
-		(XIM_MODE_STS_DEFAULT | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		0,
-		0},
-    {XNFilterEvents, 0,
-		XIM_MODE_PRE_GET,
-		XIM_MODE_PRE_GET,
-		XIM_MODE_PRE_GET,
-		XIM_MODE_PRE_GET,
-		0,
-		XIM_MODE_STS_GET,
-		XIM_MODE_STS_GET,
-		XIM_MODE_STS_GET,
-		XIM_MODE_STS_GET},
-    {XNDestroyCallback, 0,
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		0,
-		0,
-		0,
-		0},
-    {XNStringConversionCallback, 0,
-		(XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		0,
-		0,
-		0,
-		0},
-    {XNStringConversion, 0,
-		XIM_MODE_PRE_SET,
-		XIM_MODE_PRE_SET,
-		XIM_MODE_PRE_SET,
-		XIM_MODE_PRE_SET,
-		XIM_MODE_PRE_SET,
-		0,
-		0,
-		0,
-		0},
-    {XNResetState, 0,
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		0,
-		0,
-		0,
-		0,
-		0},
-    {XNHotKey, 0,
-		(XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		0,
-		0,
-		0,
-		0,
-		0},
-    {XNHotKeyState, 0,
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		0,
-		0,
-		0,
-		0,
-		0},
-    {XNPreeditAttributes, 0,
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		0,
-		0,
-		0,
-		0,
-		0},
-    {XNStatusAttributes, 0,
-		0,
-		0,
-		0,
-		0,
-		0,
-		(XIM_MODE_STS_DEFAULT | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		(XIM_MODE_STS_DEFAULT | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		(XIM_MODE_STS_DEFAULT | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		0},
-    {XNArea, 0,
-		0,
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		0,
-		0,
-		0,
-		(XIM_MODE_STS_DEFAULT | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		0,
-		0},
-    {XNAreaNeeded, 0,
-		0,
-		0,
-		(XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		0,
-		0,
-		0,
-		(XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		0,
-		0},
-    {XNSpotLocation, 0,
-		0,
-		(XIM_MODE_PRE_CREATE | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		0,
-		0,
-		0,
-		0,
-		0,
-		0,
-		0},
-    {XNColormap, 0,
-		0,
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		0,
-		0,
-		(XIM_MODE_STS_DEFAULT | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		(XIM_MODE_STS_DEFAULT | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		0},
-    {XNStdColormap, 0,
-		0,
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		0,
-		0,
-		(XIM_MODE_STS_DEFAULT | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		(XIM_MODE_STS_DEFAULT | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		0},
-    {XNForeground, 0,
-		0,
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		0,
-		0,
-		(XIM_MODE_STS_DEFAULT | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		(XIM_MODE_STS_DEFAULT | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		0},
-    {XNBackground, 0,
-		0,
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		0,
-		0,
-		(XIM_MODE_STS_DEFAULT | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		(XIM_MODE_STS_DEFAULT | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		0},
-    {XNBackgroundPixmap, 0,
-		0,
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		0,
-		0,
-		(XIM_MODE_STS_DEFAULT | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		(XIM_MODE_STS_DEFAULT | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		0},
-    {XNFontSet, 0,
-		0,
-		(XIM_MODE_PRE_CREATE | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_CREATE | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		0,
-		0,
-		(XIM_MODE_STS_CREATE | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		(XIM_MODE_STS_DEFAULT | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		0},
-    {XNLineSpace, 0,
-		0,
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		0,
-		0,
-		(XIM_MODE_STS_DEFAULT | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		(XIM_MODE_STS_DEFAULT | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		0},
-    {XNCursor, 0,
-		0,
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		0,
-		0,
-		(XIM_MODE_STS_DEFAULT | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		(XIM_MODE_STS_DEFAULT | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		0},
-    {XNPreeditStartCallback, 0,
-		(XIM_MODE_PRE_CREATE | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		0,
-		0,
-		0,
-		0,
-		0,
-		0,
-		0,
-		0},
-    {XNPreeditDoneCallback, 0,
-		(XIM_MODE_PRE_CREATE | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		0,
-		0,
-		0,
-		0,
-		0,
-		0,
-		0,
-		0},
-    {XNPreeditDrawCallback, 0,
-		(XIM_MODE_PRE_CREATE | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		0,
-		0,
-		0,
-		0,
-		0,
-		0,
-		0,
-		0},
-    {XNPreeditCaretCallback, 0,
-		(XIM_MODE_PRE_CREATE | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		0,
-		0,
-		0,
-		0,
-		0,
-		0,
-		0,
-		0},
-    {XNPreeditState, 0,
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_DEFAULT | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		0,
-		0,
-		0,
-		0,
-		0},
-    {XNPreeditStateNotifyCallback, 0,
-		(XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		(XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
-		0,
-		0,
-		0,
-		0,
-		0},
-    {XNStatusStartCallback, 0,
-		0,
-		0,
-		0,
-		0,
-		0,
-		(XIM_MODE_STS_CREATE | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		0,
-		0,
-		0},
-    {XNStatusDoneCallback, 0,
-		0,
-		0,
-		0,
-		0,
-		0,
-		(XIM_MODE_STS_CREATE | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		0,
-		0,
-		0},
-    {XNStatusDrawCallback, 0,
-		0,
-		0,
-		0,
-		0,
-		0,
-		(XIM_MODE_STS_CREATE | XIM_MODE_STS_SET | XIM_MODE_STS_GET),
-		0,
-		0,
-		0}
-};
-
-Private Bool
-_XimSetResourceList(res_list, list_num, resource, num_resource, id)
-    XIMResourceList	 *res_list;
-    unsigned int	 *list_num;
-    XIMResourceList	  resource;
-    unsigned int	  num_resource;
-    unsigned short	  id;
-{
-    register int	  i;
-    int			  len;
-    XIMResourceList	  res;
-
-    len = sizeof(XIMResource) * num_resource;
-    if(!(res = (XIMResourceList)Xmalloc(len))) {
-	return False;
-    }
-    bzero((char *)res, len);
-
-    for(i = 0; i < num_resource; i++, id++) {
-	res[i]    = resource[i];
-	res[i].id = id;
-    }
-
-    _XIMCompileResourceList(res, num_resource);
-    *res_list  = res;
-    *list_num  = num_resource;
-    return True;
-}
-
-Public Bool
-_XimSetIMResourceList(res_list, list_num)
-    XIMResourceList	*res_list;
-    unsigned int	*list_num;
-{
-    return _XimSetResourceList(res_list, list_num,
-				im_resources, XIMNumber(im_resources), 100);
-}
-
-Public Bool
-_XimSetICResourceList(res_list, list_num)
-    XIMResourceList	*res_list;
-    unsigned int	*list_num;
-{
-    return _XimSetResourceList(res_list, list_num,
-				ic_resources, XIMNumber(ic_resources), 200);
-}
-
-Public Bool
-_XimSetInnerIMResourceList(res_list, list_num)
-    XIMResourceList	*res_list;
-    unsigned int	*list_num;
-{
-    return _XimSetResourceList(res_list, list_num,
-		im_inner_resources, XIMNumber(im_inner_resources), 100);
-}
-
-Public Bool
-_XimSetInnerICResourceList(res_list, list_num)
-    XIMResourceList	*res_list;
-    unsigned int	*list_num;
-{
-    return _XimSetResourceList(res_list, list_num,
-		ic_inner_resources, XIMNumber(ic_inner_resources), 200);
-}
-
-Private XIMResourceList
-_XimGetResourceListRecByMode(res_list, list_num, mode)
-    XIMResourceList	 res_list;
-    unsigned int	 list_num;
-    unsigned short	 mode;
-{
-    register int	 i;
-
-    for(i = 0; i < list_num; i++) {
-	if (res_list[i].mode & mode) {
-	    return (XIMResourceList)&res_list[i];
-	}
-    }
-    return (XIMResourceList)NULL;
-}
-
-Public Bool
-_XimCheckCreateICValues(res_list, list_num)
-    XIMResourceList	 res_list;
-    unsigned int	 list_num;
-{
-    if (!_XimGetResourceListRecByMode(res_list, list_num, XIM_MODE_IC_CREATE)) {
-	return True;
-    }
-    return False;
-}
-
-Public XIMResourceList
-_XimGetResourceListRecByQuark(res_list, list_num, quark)
-    XIMResourceList	 res_list;
-    unsigned int	 list_num;
-    XrmQuark		 quark;
-{
-    register int	 i;
-
-    for(i = 0; i < list_num; i++) {
-	if (res_list[i].xrm_name == quark) {
-	    return (XIMResourceList)&res_list[i];
-	}
-    }
-    return (XIMResourceList)NULL;
-}
-
-Public XIMResourceList
-_XimGetResourceListRec(res_list, list_num, name)
-    XIMResourceList	 res_list;
-    unsigned int	 list_num;
-    char		*name;
-{
-    XrmQuark		 quark = XrmStringToQuark(name);
-
-    return _XimGetResourceListRecByQuark(res_list, list_num, quark);
-}
-
-Public char *
-_XimSetIMValueData(im, top, values, res_list, list_num)
-    Xim			 im;
-    XPointer		 top;
-    XIMArg		*values;
-    XIMResourceList	 res_list;
-    unsigned int	 list_num;
-{
-    register XIMArg	*p;
-    XIMResourceList	 res;
-    int			 check;
-
-    for(p = values; p->name != NULL; p++) {
-	if(!(res = _XimGetResourceListRec(res_list, list_num, p->name))) {
-	    return p->value;
-	}
-	check = _XimCheckIMMode(res, XIM_SETIMVALUES);	
-	if(check == XIM_CHECK_INVALID) {
-	    continue;
-	} else if (check == XIM_CHECK_ERROR) {
-	    return p->value;
-	}
-	    
-	if(!_XimEncodeLocalIMAttr(res, top, p->value)) {
-	    return p->value;
-	}
-    }
-    return NULL;
-}
-
-Public char *
-_XimGetIMValueData(im, top, values, res_list, list_num)
-    Xim			 im;
-    XPointer		 top;
-    XIMArg		*values;
-    XIMResourceList	 res_list;
-    unsigned int	 list_num;
-{
-    register XIMArg	*p;
-    XIMResourceList	 res;
-    int			 check;
-
-    for(p = values; p->name != NULL; p++) {
-	if(!(res = _XimGetResourceListRec(res_list, list_num, p->name))) {
-	    return p->value;
-	}
-	check = _XimCheckIMMode(res, XIM_GETIMVALUES);	
-	if(check == XIM_CHECK_INVALID) {
-	    continue;
-	} else if (check == XIM_CHECK_ERROR) {
-	    return p->value;
-	}
-	    
-	if(!_XimDecodeLocalIMAttr(res, top, p->value)) {
-	    return p->value;
-	}
-    }
-    return NULL;
-}
-
-Public void
-_XimSetIMMode(res_list, list_num)
-    XIMResourceList	res_list;
-    unsigned int	list_num;
-{
-    XIMResourceList	res;
-    unsigned int	n = XIMNumber(im_mode);
-    register int	i;
-
-    for(i = 0; i < n; i++) {
-	if(!(res = _XimGetResourceListRecByQuark(res_list,
-						list_num, im_mode[i].quark))) {
-	    continue;
-	}
-	res->mode = im_mode[i].mode;
-    }
-    return;
-}
-
-Private int
-_XimCheckSetIMDefaultsMode(res)
-    XIMResourceList	res;
-{
-    if(res->mode & XIM_MODE_IM_DEFAULT) {
-	return XIM_CHECK_VALID;
-    }
-    return XIM_CHECK_INVALID;
-}
-
-Private int
-_XimCheckSetIMValuesMode(res)
-    XIMResourceList	res;
-{
-    if(res->mode & XIM_MODE_IM_SET) {
-	return XIM_CHECK_VALID;
-    }
-    return XIM_CHECK_INVALID;
-}
-
-Private int
- _XimCheckGetIMValuesMode(res)
-    XIMResourceList	res;
-{
-    if(res->mode & XIM_MODE_IM_GET) {
-	return XIM_CHECK_VALID;
-    }
-    return XIM_CHECK_INVALID;
-}
-
-Public int
- _XimCheckIMMode(res, mode)
-    XIMResourceList	res;
-    unsigned long	mode;
-{
-    if(res->mode == 0) {
-	return XIM_CHECK_INVALID;
-    }
-    if(mode & XIM_SETIMDEFAULTS) {
-	return _XimCheckSetIMDefaultsMode(res);
-    } else if (mode & XIM_SETIMVALUES) {
-	return _XimCheckSetIMValuesMode(res);
-    } else if (mode & XIM_GETIMVALUES) {
-	return _XimCheckGetIMValuesMode(res);
-    } else {
-	return XIM_CHECK_ERROR;
-    }
-}
-
-Public void
-_XimSetICMode(res_list, list_num, style)
-    XIMResourceList	res_list;
-    unsigned int	list_num;
-    XIMStyle		style;
-{
-    XIMResourceList	res;
-    unsigned int	n = XIMNumber(ic_mode);
-    register int	i;
-    unsigned int	pre_offset;
-    unsigned int	sts_offset;
-
-    if(style & XIMPreeditArea) {
-	pre_offset = XOffsetOf(XimICMode, preedit_area_mode);
-    } else if(style & XIMPreeditCallbacks) {
-	pre_offset = XOffsetOf(XimICMode, preedit_callback_mode);
-    } else if(style & XIMPreeditPosition) {
-	pre_offset = XOffsetOf(XimICMode, preedit_position_mode);
-    } else if(style & XIMPreeditNothing) {
-	pre_offset = XOffsetOf(XimICMode, preedit_nothing_mode);
-    } else {
-	pre_offset = XOffsetOf(XimICMode, preedit_none_mode);
-    }
-
-    if(style & XIMStatusArea) {
-	sts_offset = XOffsetOf(XimICMode, status_area_mode);
-    } else if(style & XIMStatusCallbacks) {
-	sts_offset = XOffsetOf(XimICMode, status_callback_mode);
-    } else if(style & XIMStatusNothing) {
-	sts_offset = XOffsetOf(XimICMode, status_nothing_mode);
-    } else {
-	sts_offset = XOffsetOf(XimICMode, status_none_mode);
-    }
-
-    for(i = 0; i < n; i++) {
-	if(!(res = _XimGetResourceListRecByQuark(res_list,
-						list_num, ic_mode[i].quark))) {
-	    continue;
-	}
-	res->mode = ( (*(unsigned short *)((char *)&ic_mode[i] + pre_offset))
-		    | (*(unsigned short *)((char *)&ic_mode[i] + sts_offset)));
-    }
-    return;
-}
-
-Private int
-_XimCheckSetICDefaultsMode(res, mode)
-    XIMResourceList	res;
-    unsigned long	mode;
-{
-    if(mode & XIM_PREEDIT_ATTR) {
-	if(!(res->mode & XIM_MODE_PRE_MASK)) {
-	    return XIM_CHECK_INVALID;
-	}
-
-	if(res->mode & XIM_MODE_PRE_CREATE) {
-	    return XIM_CHECK_ERROR;
-	} else if (!(res->mode & XIM_MODE_PRE_DEFAULT)) {
-	    return XIM_CHECK_INVALID;
-	}
-
-    } else if(mode & XIM_STATUS_ATTR) {
-	if(!(res->mode & XIM_MODE_STS_MASK)) {
-	    return XIM_CHECK_INVALID;
-	}
-
-	if(res->mode & XIM_MODE_STS_CREATE) {
-	    return XIM_CHECK_ERROR;
-	}
-	if(!(res->mode & XIM_MODE_STS_DEFAULT)) {
-	    return XIM_CHECK_INVALID;
-	}
-
-    } else {
-	if(!res->mode) {
-	    return XIM_CHECK_INVALID;
-	}
-
-	if(res->mode & XIM_MODE_IC_CREATE) {
-	    return XIM_CHECK_ERROR;
-	}
-	if(!(res->mode & XIM_MODE_IC_DEFAULT)) {
-	    return XIM_CHECK_INVALID;
-	}
-    }
-    return XIM_CHECK_VALID;
-}
-
-Private int
-_XimCheckCreateICMode(res, mode)
-    XIMResourceList	res;
-    unsigned long	mode;
-{
-    if(mode & XIM_PREEDIT_ATTR) {
-	if(!(res->mode & XIM_MODE_PRE_MASK)) {
-	    return XIM_CHECK_INVALID;
-	}
-
-	if(res->mode & XIM_MODE_PRE_CREATE) {
-	    res->mode &= ~XIM_MODE_PRE_CREATE;
-	} else if(res->mode & XIM_MODE_PRE_ONCE) {
-	    res->mode &= ~XIM_MODE_PRE_ONCE;
-	} else if(res->mode & XIM_MODE_PRE_DEFAULT) {
-	    res->mode &= ~XIM_MODE_PRE_DEFAULT;
-	} else if (!(res->mode & XIM_MODE_PRE_SET)) {
-	    return XIM_CHECK_ERROR;
-	}
-
-    } else if(mode & XIM_STATUS_ATTR) {
-	if(!(res->mode & XIM_MODE_STS_MASK)) {
-	    return  XIM_CHECK_INVALID;
-	}
-
-	if(res->mode & XIM_MODE_STS_CREATE) {
-	    res->mode &= ~XIM_MODE_STS_CREATE;
-	} else if(res->mode & XIM_MODE_STS_ONCE) {
-	    res->mode &= ~XIM_MODE_STS_ONCE;
-	} else if(res->mode & XIM_MODE_STS_DEFAULT) {
-	    res->mode &= ~XIM_MODE_STS_DEFAULT;
-	} else if (!(res->mode & XIM_MODE_STS_SET)) {
-	    return XIM_CHECK_ERROR;
-	}
-
-    } else {
-	if(!res->mode) {
-	    return XIM_CHECK_INVALID;
-	}
-
-	if(res->mode & XIM_MODE_IC_CREATE) {
-	    res->mode &= ~XIM_MODE_IC_CREATE;
-	} else if(res->mode & XIM_MODE_IC_ONCE) {
-	    res->mode &= ~XIM_MODE_IC_ONCE;
-	} else if(res->mode & XIM_MODE_IC_DEFAULT) {
-	    res->mode &= ~XIM_MODE_IC_DEFAULT;
-	} else if (!(res->mode & XIM_MODE_IC_SET)) {
-	    return XIM_CHECK_ERROR;
-	}
-    }
-    return XIM_CHECK_VALID;
-}
-
-Private int
-_XimCheckSetICValuesMode(res, mode)
-    XIMResourceList	res;
-    unsigned long	mode;
-{
-    if(mode & XIM_PREEDIT_ATTR) {
-	if(!(res->mode & XIM_MODE_PRE_MASK)) {
-	    return XIM_CHECK_INVALID;
-	}
-
-	if(res->mode & XIM_MODE_PRE_ONCE) {
-	    res->mode &= ~XIM_MODE_PRE_ONCE;
-	} else if(!(res->mode & XIM_MODE_PRE_SET)) {
-	    return XIM_CHECK_ERROR;
-	}
-
-    } else if(mode & XIM_STATUS_ATTR) {
-	if(!(res->mode & XIM_MODE_STS_MASK)) {
-	    return XIM_CHECK_INVALID;
-	}
-
-	if(res->mode & XIM_MODE_STS_ONCE) {
-	    res->mode &= ~XIM_MODE_STS_ONCE;
-	} else if(!(res->mode & XIM_MODE_STS_SET)) {
-	    return XIM_CHECK_ERROR;
-	}
-
-    } else {
-	if(!res->mode) {
-	    return XIM_CHECK_INVALID;
-	}
-
-	if(res->mode & XIM_MODE_IC_ONCE) {
-	    res->mode &= ~XIM_MODE_IC_ONCE;
-	} else if(!(res->mode & XIM_MODE_IC_SET)) {
-	    return XIM_CHECK_ERROR;
-	}
-    }
-    return XIM_CHECK_VALID;
-}
-
-Private int
-_XimCheckGetICValuesMode(res, mode)
-    XIMResourceList	res;
-    unsigned long	mode;
-{
-    if(mode & XIM_PREEDIT_ATTR) {
-	if(!(res->mode & XIM_MODE_PRE_MASK)) {
-	    return XIM_CHECK_INVALID;
-	}
-
-	if(!(res->mode & XIM_MODE_PRE_GET)) {
-	    return XIM_CHECK_ERROR;
-	}
-
-    } else if(mode & XIM_STATUS_ATTR) {
-	if(!(res->mode & XIM_MODE_STS_MASK)) {
-	    return XIM_CHECK_INVALID;
-	}
-
-	if(!(res->mode & XIM_MODE_STS_GET)) {
-	    return XIM_CHECK_ERROR;
-	}
-
-    } else {
-	if(!res->mode) {
-	    return XIM_CHECK_INVALID;
-	}
-
-	if(!(res->mode & XIM_MODE_IC_GET)) {
-	    return XIM_CHECK_ERROR;
-	}
-    }
-    return XIM_CHECK_VALID;
-}
-
-Public int
- _XimCheckICMode(res, mode)
-    XIMResourceList	res;
-    unsigned long	 mode;
-{
-    if(mode &XIM_SETICDEFAULTS) {
-	return _XimCheckSetICDefaultsMode(res, mode);
-    } else if (mode & XIM_CREATEIC) {
-	return _XimCheckCreateICMode(res, mode);
-    } else if (mode & XIM_SETICVALUES) {
-	return _XimCheckSetICValuesMode(res, mode);
-    } else if (mode & XIM_GETICVALUES) {
-	return _XimCheckGetICValuesMode(res, mode);
-    } else {
-	return XIM_CHECK_ERROR;
-    }
-}
-
-Public Bool
-_XimSetLocalIMDefaults(im, top, res_list, list_num)
-    Xim			 im;
-    XPointer		 top;
-    XIMResourceList	 res_list;
-    unsigned int	 list_num;
-{
-    XimValueOffsetInfo	 info;
-    unsigned int	 num;
-    register int	 i;
-    XIMResourceList	 res;
-    int			 check;
-
-    info = im_attr_info;
-    num  = XIMNumber(im_attr_info);
-
-    for(i = 0; i < num; i++) {
-	if((res = _XimGetResourceListRecByQuark( res_list, list_num,
-				info[i].quark)) == (XIMResourceList)NULL) { 
-	    return False;
-	}
-
-	check = _XimCheckIMMode(res, XIM_SETIMDEFAULTS);
-	if(check == XIM_CHECK_INVALID) {
-	    continue;
-	} else if (check == XIM_CHECK_ERROR) {
-	    return False;
-	}
-
-	if(!info[i].defaults) {
-	    continue;
-	}
-	if(!(info[i].defaults(&info[i], top, (XPointer)NULL, 0))) {
-	    return False;
-	}
-    }
-    return True;
-}
-
-Public Bool
-_XimSetICDefaults(ic, top, mode, res_list, list_num)
-    Xic			 ic;
-    XPointer		 top;
-    unsigned long	 mode;
-    XIMResourceList	 res_list;
-    unsigned int	 list_num;
-{
-    unsigned int	 num;
-    XimValueOffsetInfo	 info;
-    register int	 i;
-    XIMResourceList	 res;
-    int			 check;
-    XrmQuark		 pre_quark;
-    XrmQuark		 sts_quark;
-
-    pre_quark = XrmStringToQuark(XNPreeditAttributes);
-    sts_quark = XrmStringToQuark(XNStatusAttributes);
-
-    if(mode & XIM_PREEDIT_ATTR) {
-	info = ic_pre_attr_info;
-	num  = XIMNumber(ic_pre_attr_info);
-    } else if(mode & XIM_STATUS_ATTR) {
-	info = ic_sts_attr_info;
-	num  = XIMNumber(ic_sts_attr_info);
-    } else {
-	info = ic_attr_info;
-	num  = XIMNumber(ic_attr_info);
-    }
-
-    for(i = 0; i < num; i++) {
-	if(info[i].quark == pre_quark) {
-	    if(!_XimSetICDefaults(ic, (XPointer)((char *)top + info[i].offset),
-			(mode | XIM_PREEDIT_ATTR), res_list, list_num)) {
-		return False;
-	    }
-	} else if (info[i].quark == sts_quark) {
-	    if(!_XimSetICDefaults(ic, (XPointer)((char *)top + info[i].offset),
-			(mode | XIM_STATUS_ATTR), res_list, list_num)) {
-		return False;
-	    }
-	} else {
-	    if(!(res = _XimGetResourceListRecByQuark(res_list, list_num,
-							info[i].quark))) {
-		return False;
-	    }
-
-	    check = _XimCheckICMode(res, mode);
-	    if (check == XIM_CHECK_INVALID) {
-		continue;
-	    } else if (check == XIM_CHECK_ERROR) {
-		return False;
-	    }
-
-	    if (!info[i].defaults) {
-		continue;
-	    }
-	    if (!(info[i].defaults(&info[i], top, (XPointer)ic, mode))) {
-		return False;
-	    }
-	}
-    }
-    return True;
-}
-
-Private Bool
-_XimEncodeAttr(info, num, res, top, val)
-    XimValueOffsetInfo	 info;
-    unsigned int	 num;
-    XIMResourceList	 res;
-    XPointer		 top;
-    XPointer		 val;
-{
-    register int	 i;
-
-    for(i = 0; i < num; i++ ) {
-	if(info[i].quark == res->xrm_name) {
-	    if(!info[i].encode) {
-		return False;
-	    }
-	    return (*info[i].encode)(&info[i], top, val);
-	}
-    }
-    return False;
-}
-
-Public Bool
-_XimEncodeLocalIMAttr(res, top, val)
-    XIMResourceList	 res;
-    XPointer		 top;
-    XPointer		 val;
-{
-    return _XimEncodeAttr(im_attr_info, XIMNumber(im_attr_info),
-					res, top, val);
-}
-
-Public Bool
-_XimEncodeLocalICAttr(ic, res, top, arg, mode)
-    Xic			 ic;
-    XIMResourceList	 res;
-    XPointer		 top;
-    XIMArg		*arg;
-    unsigned long	 mode;
-{
-    unsigned int	 num;
-    XimValueOffsetInfo	 info;
-
-    if(mode & XIM_PREEDIT_ATTR) {
-	info = ic_pre_attr_info;
-	num  = XIMNumber(ic_pre_attr_info);
-    } else if(mode & XIM_STATUS_ATTR) {
-	info = ic_sts_attr_info;
-	num  = XIMNumber(ic_sts_attr_info);
-    } else {
-	info = ic_attr_info;
-	num  = XIMNumber(ic_attr_info);
-    }
-
-    return _XimEncodeAttr(info, num, res, top, arg->value);
-}
-
-Private Bool
-_XimEncodeLocalTopValue(ic, res, val, flag)
-    Xic			 ic;
-    XIMResourceList	 res;
-    XPointer		 val;
-    Bool		 flag;
-{
-    XIMArg		*p = (XIMArg *)val;
-
-    if (res->xrm_name == XrmStringToQuark(XNClientWindow)) {
-	ic->core.client_window = (Window)p->value;
-	if (ic->core.focus_window == (Window)0)
-	    ic->core.focus_window = ic->core.client_window;
-	if (flag) {
-	    _XRegisterFilterByType(ic->core.im->core.display,
-			ic->core.focus_window,
-			KeyPress, KeyPress, _XimLocalFilter, (XPointer)ic);
-	}
-    } else if (res->xrm_name == XrmStringToQuark(XNFocusWindow)) {
-	if (ic->core.client_window) {
-	    if (flag) {
-	        _XUnregisterFilter(ic->core.im->core.display,
-			ic->core.focus_window, _XimLocalFilter, (XPointer)ic);
-	    }
-	    ic->core.focus_window = (Window)p->value;
-	    if (flag) {
-	        _XRegisterFilterByType(ic->core.im->core.display,
-			ic->core.focus_window, KeyPress, KeyPress,
-			_XimLocalFilter, (XPointer)ic);
-	    }
-	} else
-	    ic->core.focus_window = (Window)p->value;
-    }
-    return True;
-}
-
-Private Bool
-_XimEncodeLocalPreeditValue(ic, res, val)
-    Xic			 ic;
-    XIMResourceList	 res;
-    XPointer		 val;
-{
-    XIMArg		*p = (XIMArg *)val;
-
-    if (res->xrm_name == XrmStringToQuark(XNStdColormap)) {
-	XStandardColormap	*colormap_ret;
-	int			 count;
-
-	if (!(XGetRGBColormaps(ic->core.im->core.display,
-				ic->core.focus_window, &colormap_ret,
-				&count, (Atom)p->value)))
-	    return False;
-    }
-    return True;
-}
-
-Private Bool
-_XimEncodeLocalStatusValue(ic, res, val)
-    Xic			 ic;
-    XIMResourceList	 res;
-    XPointer		 val;
-{
-    XIMArg		*p = (XIMArg *)val;
-
-    if (res->xrm_name == XrmStringToQuark(XNStdColormap)) {
-	XStandardColormap	*colormap_ret;
-	int			 count;
-
-	if (!(XGetRGBColormaps(ic->core.im->core.display,
-				ic->core.focus_window, &colormap_ret,
-				&count, (Atom)p->value)))
-	    return False;
-    }
-    return True;
-}
-
-Public char *
-_XimSetICValueData(ic, top, res_list, list_num, values, mode, flag)
-    Xic			 ic;
-    XPointer		 top;
-    XIMResourceList	 res_list;
-    unsigned int	 list_num;
-    XIMArg		*values;
-    unsigned long	 mode;
-    Bool		 flag;
-{
-    register  XIMArg	*p;
-    XIMResourceList	 res;
-    char		*name;
-    int			 check;
-    XrmQuark		 pre_quark;
-    XrmQuark		 sts_quark;
-
-    pre_quark = XrmStringToQuark(XNPreeditAttributes);
-    sts_quark = XrmStringToQuark(XNStatusAttributes);
-
-    for(p = values; p->name != NULL; p++) {
-	if((res = _XimGetResourceListRec(res_list, list_num,
-					p->name)) == (XIMResourceList)NULL) {
-	    return p->name;
-	}
-	if(res->xrm_name == pre_quark) {
-	    if((name = _XimSetICValueData(ic,
-			(XPointer)(&((XimDefICValues *)top)->preedit_attr),
-			res_list, list_num, (XIMArg *)p->value,
-			(mode | XIM_PREEDIT_ATTR), flag))) {
-		return name;
-	    }
-	} else if(res->xrm_name == sts_quark) {
-	    if((name = _XimSetICValueData(ic,
-			(XPointer)(&((XimDefICValues *)top)->status_attr),
-			res_list, list_num, (XIMArg *)p->value,
-			(mode | XIM_STATUS_ATTR), flag))) {
-		return name;
-	    }
-	} else {
-	    check = _XimCheckICMode(res, mode);
-	    if(check == XIM_CHECK_INVALID) {
-		continue;
-	    } else if(check == XIM_CHECK_ERROR) {
-		return p->name;
-	    }
-
-	    if(mode & XIM_PREEDIT_ATTR) {
-		if (!_XimEncodeLocalPreeditValue(ic, res, (XPointer)p))
-	    	    return False;
-    	    } else if(mode & XIM_STATUS_ATTR) {
-		if (!_XimEncodeLocalStatusValue(ic, res, (XPointer)p))
-	    	    return False;
-    	    } else {
-		if (!_XimEncodeLocalTopValue(ic, res, (XPointer)p, flag))
-	    	    return False;
-    	    }
-	    if(_XimEncodeLocalICAttr(ic, res, top, p, mode) == False) {
-		return p->name;
-	    }
-	}
-    }
-    return NULL;
-}
-
-Private Bool
-_XimCheckInputStyle(styles, style)
-    XIMStyles		*styles;
-    XIMStyle		 style;
-{
-    int			 num = styles->count_styles;
-    register int	 i;
-
-    for(i = 0; i < num; i++) {
-	if(styles->supported_styles[i] == style) {
-	    return True;
-	}
-    }
-    return False;
-}
-
-Public Bool
-_XimCheckLocalInputStyle(ic, top, values, styles, res_list, list_num)
-    Xic			 ic;
-    XPointer		 top;
-    XIMArg		*values;
-    XIMStyles		*styles;
-    XIMResourceList	 res_list;
-    unsigned int	 list_num;
-{
-    XrmQuark		 quark = XrmStringToQuark(XNInputStyle);
-    register XIMArg	*p;
-    XIMResourceList	 res;
-
-    for(p = values; p && p->name != NULL; p++) {
-	if(quark == XrmStringToQuark(p->name)) {
-	    if(!(res = _XimGetResourceListRec(res_list, list_num, p->name))) {
-		return False;
-	    }
-	    if(!_XimEncodeLocalICAttr(ic, res, top, p, 0)) {
-		return False;
-	    }
-	    if (_XimCheckInputStyle(styles,
-			((XimDefICValues *)top)->input_style)) {
-		return True;
-	    }
-	    return False;
-	}
-    }
-    return False;
-}
-
-Private Bool
-_XimDecodeAttr(info, num, res, top, val)
-    XimValueOffsetInfo	 info;
-    unsigned int	 num;
-    XIMResourceList	 res;
-    XPointer		 top;
-    XPointer		 val;
-{
-    register int	 i;
-
-    for(i = 0; i < num; i++ ) {
-	if(info[i].quark == res->xrm_name) {
-	    if(!info[i].decode) {
-		return False;
-	    }
-	    return (*info[i].decode)(&info[i], top, val); 
-	}
-    }
-    return False;
-}
-
-Public Bool
-_XimDecodeLocalIMAttr(res, top, val)
-    XIMResourceList	 res;
-    XPointer		 top;
-    XPointer		 val;
-{
-    return _XimDecodeAttr(im_attr_info, XIMNumber(im_attr_info),
-					res, top, val);
-}
-
-Public Bool
-_XimDecodeLocalICAttr(res, top, val, mode)
-    XIMResourceList	 res;
-    XPointer		 top;
-    XPointer		 val;
-    unsigned long	 mode;
-{
-    unsigned int	 num;
-    XimValueOffsetInfo	 info;
-
-    if(mode & XIM_PREEDIT_ATTR) {
-	info = ic_pre_attr_info;
-	num  = XIMNumber(ic_pre_attr_info);
-    } else if(mode & XIM_STATUS_ATTR) {
-	info = ic_sts_attr_info;
-	num  = XIMNumber(ic_sts_attr_info);
-    } else {
-	info = ic_attr_info;
-	num  = XIMNumber(ic_attr_info);
-    }
-
-    return _XimDecodeAttr(info, num, res, top, val);
-}
-
-Public char *
-_XimGetICValueData(ic, top, res_list, list_num, values, mode)
-    Xic			 ic;
-    XPointer		 top;
-    XIMResourceList	 res_list;
-    unsigned int	 list_num;
-    XIMArg		*values;
-    unsigned long	 mode;
-{
-    register  XIMArg	*p;
-    XIMResourceList	 res;
-    char		*name;
-    int			 check;
-    XrmQuark		 pre_quark;
-    XrmQuark		 sts_quark;
-
-    pre_quark = XrmStringToQuark(XNPreeditAttributes);
-    sts_quark = XrmStringToQuark(XNStatusAttributes);
-
-    for(p = values; p->name != NULL; p++) {
-	if((res = _XimGetResourceListRec(res_list, list_num,
-					p->name)) == (XIMResourceList)NULL) {
-	    return p->name;
-	}
-	if(res->xrm_name == pre_quark) {
-	    if((name = _XimGetICValueData(ic,
-			(XPointer)(&((XimDefICValues *)top)->preedit_attr),
-			res_list, list_num, (XIMArg *)p->value,
-			(mode | XIM_PREEDIT_ATTR)))) {
-		return name;
-	    }
-	} else if(res->xrm_name == sts_quark) {
-	    if((name = _XimGetICValueData(ic,
-			(XPointer)(&((XimDefICValues *)top)->status_attr),
-			res_list, list_num, (XIMArg *)p->value,
-			(mode | XIM_STATUS_ATTR)))) {
-		return name;
-	    }
-	} else {
-	    check = _XimCheckICMode(res, mode);
-	    if(check == XIM_CHECK_INVALID) {
-		continue;
-	    } else if(check == XIM_CHECK_ERROR) {
-		return p->name;
-	    }
-
-	    if(_XimDecodeLocalICAttr(res, top, p->value, mode) == False) {
-		return p->name;
-	    }
-	}
-    }
-    return NULL;
-}
-
-Public void
-_XimGetCurrentIMValues(im, im_values)
-    Xim			 im;
-    XimDefIMValues	*im_values;
-{
-    bzero((char *)im_values, sizeof(XimDefIMValues));
-
-    im_values->styles		= im->core.styles;
-    im_values->im_values_list	= im->core.im_values_list;
-    im_values->ic_values_list	= im->core.ic_values_list;
-    im_values->destroy_callback = im->core.destroy_callback;
-    im_values->res_name		= im->core.res_name;
-    im_values->res_class	= im->core.res_class;
-    im_values->visible_position	= im->core.visible_position;
-}
-
-Public void
-_XimSetCurrentIMValues(im, im_values)
-    Xim			 im;
-    XimDefIMValues	*im_values;
-{
-    im->core.styles		= im_values->styles;
-    im->core.im_values_list	= im_values->im_values_list;
-    im->core.ic_values_list	= im_values->ic_values_list;
-    im->core.destroy_callback	= im_values->destroy_callback;
-    im->core.res_name		= im_values->res_name;
-    im->core.res_class		= im_values->res_class;
-    im->core.visible_position	= im_values->visible_position;
-}
-
-Public void
-_XimGetCurrentICValues(ic, ic_values)
-    Xic			 ic;
-    XimDefICValues	*ic_values;
-{
-    bzero((char *)ic_values, sizeof(XimDefICValues));
-
-    ic_values->input_style	 = ic->core.input_style;
-    ic_values->client_window	 = ic->core.client_window;
-    ic_values->focus_window	 = ic->core.focus_window;
-    ic_values->filter_events	 = ic->core.filter_events;
-    ic_values->geometry_callback = ic->core.geometry_callback;
-    ic_values->res_name		 = ic->core.res_name;
-    ic_values->res_class	 = ic->core.res_class;
-    ic_values->destroy_callback	 = ic->core.destroy_callback;
-    ic_values->string_conversion_callback
-				 = ic->core.string_conversion_callback;
-    ic_values->string_conversion = ic->core.string_conversion;
-    ic_values->reset_state	 = ic->core.reset_state;
-    ic_values->hotkey		 = ic->core.hotkey;
-    ic_values->hotkey_state	 = ic->core.hotkey_state;
-    ic_values->preedit_attr	 = ic->core.preedit_attr;
-    ic_values->status_attr	 = ic->core.status_attr;
-}
-
-Public void
-_XimSetCurrentICValues(ic, ic_values)
-    Xic			 ic;
-    XimDefICValues	*ic_values;
-{
-    ic->core.input_style	= ic_values->input_style;
-    ic->core.client_window	= ic_values->client_window;
-    if (ic_values->focus_window)
-	ic->core.focus_window	= ic_values->focus_window;
-    ic->core.filter_events	= ic_values->filter_events;
-    ic->core.geometry_callback	= ic_values->geometry_callback;
-    ic->core.res_name		= ic_values->res_name;
-    ic->core.res_class		= ic_values->res_class;
-    ic->core.destroy_callback 	= ic_values->destroy_callback;
-    ic->core.string_conversion_callback
-				= ic_values->string_conversion_callback;
-    ic->core.string_conversion	= ic_values->string_conversion;
-    ic->core.reset_state	= ic_values->reset_state;
-    ic->core.hotkey		= ic_values->hotkey;
-    ic->core.hotkey_state	= ic_values->hotkey_state;
-    ic->core.preedit_attr	= ic_values->preedit_attr;
-    ic->core.status_attr	= ic_values->status_attr;
-}
-
-Private void
-_XimInitialIMOffsetInfo()
-{
-    unsigned int	 n = XIMNumber(im_attr_info);
-    register int	 i;
-
-    for(i = 0; i < n; i++) {
-	im_attr_info[i].quark = XrmStringToQuark(im_attr_info[i].name);
-    }
-}
-
-Private void
-_XimInitialICOffsetInfo()
-{
-    unsigned int	 n;
-    register int	 i;
-
-    n = XIMNumber(ic_attr_info);
-    for(i = 0; i < n; i++) {
-	ic_attr_info[i].quark = XrmStringToQuark(ic_attr_info[i].name);
-    }
-
-    n = XIMNumber(ic_pre_attr_info);
-    for(i = 0; i < n; i++) {
-	ic_pre_attr_info[i].quark = XrmStringToQuark(ic_pre_attr_info[i].name);
-    }
-
-    n = XIMNumber(ic_sts_attr_info);
-    for(i = 0; i < n; i++) {
-	ic_sts_attr_info[i].quark = XrmStringToQuark(ic_sts_attr_info[i].name);
-    }
-}
-
-Private void
-_XimInitialIMMode()
-{
-    unsigned int	n = XIMNumber(im_mode);
-    register int	i;
-
-    for(i = 0; i < n; i++) {
-	im_mode[i].quark = XrmStringToQuark(im_mode[i].name);
-    }
-}
-
-Private void
-_XimInitialICMode()
-{
-    unsigned int	n = XIMNumber(ic_mode);
-    register int	i;
-
-    for(i = 0; i < n; i++) {
-	ic_mode[i].quark = XrmStringToQuark(ic_mode[i].name);
-    }
-}
-
-Public void
-_XimInitialResourceInfo()
-{
-    static Bool	init_flag = False;
-
-    if(init_flag == True) {
-	return;
-    }
-    _XimInitialIMOffsetInfo();
-    _XimInitialICOffsetInfo();
-    _XimInitialIMMode();
-    _XimInitialICMode();
-    init_flag = True;
-}
diff --git a/xc/lib/X11/imRmAttr.c b/xc/lib/X11/imRmAttr.c
deleted file mode 100644
index ef01c17be..000000000
--- a/xc/lib/X11/imRmAttr.c
+++ /dev/null
@@ -1,1535 +0,0 @@
-/* $TOG: imRmAttr.c /main/13 1997/06/22 18:11:18 kaleb $ */
-/******************************************************************
-
-           Copyright 1992, 1993, 1994 by FUJITSU LIMITED
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of FUJITSU LIMITED
-not be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-FUJITSU LIMITED makes no representations about the suitability of
-this software for any purpose. 
-It is provided "as is" without express or implied warranty.
-
-FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-  Author: Takashi Fujiwara     FUJITSU LIMITED 
-                               fujiwara@a80.tech.yk.fujitsu.co.jp
-
-******************************************************************/
-/* $XFree86: xc/lib/X11/imRmAttr.c,v 1.3 1999/05/09 10:50:37 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "Ximint.h"
-
-Private XIMResourceList
-_XimGetNestedListSeparator(res_list, res_num)
-    XIMResourceList	 res_list;		/* LISTofIMATTR or IMATTR */
-    unsigned int	 res_num;
-{
-    return  _XimGetResourceListRec(res_list, res_num, XNSeparatorofNestedList);
-}
-
-Private Bool
-_XimCheckInnerIMAttributes(im, arg, mode)
-    Xim			 im;
-    XIMArg		*arg;
-    unsigned long	 mode;
-{
-    XIMResourceList	 res;
-    int			 check;
-
-    if (!(res = _XimGetResourceListRec(im->private.proto.im_inner_resources,
-			im->private.proto.im_num_inner_resources, arg->name)))
-	return False;
-
-    check = _XimCheckIMMode(res, mode);
-    if(check == XIM_CHECK_INVALID)
-	return True;
-    else if(check == XIM_CHECK_ERROR)
-	return False;
-
-    return True;
-}
-
-Public char *
-_XimMakeIMAttrIDList(im, res_list, res_num, arg, buf, len, mode)
-    Xim			 im;
-    XIMResourceList	 res_list;
-    unsigned int	 res_num;
-    XIMArg		*arg;
-    CARD16		*buf;
-    INT16		*len;
-    unsigned long	 mode;
-{
-    register XIMArg	*p;
-    XIMResourceList	 res;
-    int			 check;
-
-    *len = 0;
-    if (!arg)
-	return (char *)NULL;
-
-    for (p = arg; p->name; p++) {
-	if (!(res = _XimGetResourceListRec(res_list, res_num, p->name))) {
-	    if (_XimCheckInnerIMAttributes(im, p, mode))
-		continue;
-	    return p->name;
-	}
-
-	check = _XimCheckIMMode(res, mode);
-	if (check == XIM_CHECK_INVALID)
-	    continue;
-	else if (check == XIM_CHECK_ERROR)
-	    return p->name;
-
-	*buf = res->id;
-	*len += sizeof(CARD16);
-	 buf++;
-    }
-    return (char *)NULL;
-}
-
-Private Bool
-_XimCheckInnerICAttributes(ic, arg, mode)
-    Xic			 ic;
-    XIMArg		*arg;
-    unsigned long	 mode;
-{
-    XIMResourceList	 res;
-    int			 check;
-
-    if (!(res = _XimGetResourceListRec(ic->private.proto.ic_inner_resources,
-			ic->private.proto.ic_num_inner_resources, arg->name)))
-	return False;
-
-    check = _XimCheckICMode(res, mode);
-    if(check == XIM_CHECK_INVALID)
-	return True;
-    else if(check == XIM_CHECK_ERROR)
-	return False;
-
-    return True;
-}
-
-Public char *
-_XimMakeICAttrIDList(ic, res_list, res_num, arg, buf, len, mode)
-    Xic			 ic;
-    XIMResourceList	 res_list;
-    unsigned int	 res_num;
-    XIMArg		*arg;
-    CARD16		*buf;
-    INT16		*len;
-    unsigned long	 mode;
-{
-    register XIMArg	*p;
-    XIMResourceList	 res;
-    int			 check;
-    XrmQuark		 pre_quark;
-    XrmQuark		 sts_quark;
-    char		*name;
-    INT16		 new_len;
-
-    *len = 0;
-    if (!arg)
-	return (char *)NULL;
-
-    pre_quark = XrmStringToQuark(XNPreeditAttributes);
-    sts_quark = XrmStringToQuark(XNStatusAttributes);
-
-    for (p = arg; p && p->name; p++) {
-	if (!(res = _XimGetResourceListRec(res_list, res_num, p->name))) {
-	    if (_XimCheckInnerICAttributes(ic, p, mode))
-		continue;
-	    *len = -1;
-	    return p->name;
-	}
-
-	check = _XimCheckICMode(res, mode);
-	if(check == XIM_CHECK_INVALID)
-	    continue;
-	else if(check == XIM_CHECK_ERROR) {
-	    *len = -1;
-	    return p->name;
-	}
-
-	*buf = res->id;
-	*len += sizeof(CARD16);
-	buf++;
-	if (res->resource_size == XimType_NEST) {
-	    if (res->xrm_name == pre_quark) {
-		if ((name = _XimMakeICAttrIDList(ic, res_list, res_num,
-				(XIMArg *)p->value, buf, &new_len,
-				(mode | XIM_PREEDIT_ATTR)))) {
-		    if (new_len < 0) *len = -1;
-		    else *len += new_len;
-		    return name;
-		}
-	    } else if (res->xrm_name == sts_quark) {
-		if ((name = _XimMakeICAttrIDList(ic, res_list, res_num,
-				(XIMArg *)p->value, buf, &new_len,
-				(mode | XIM_STATUS_ATTR)))) {
-		    if (new_len < 0) *len = -1;
-		    else *len += new_len;
-		    return name;
-		}
-	    }
-	    *len += new_len;
-	    buf = (CARD16 *)((char *)buf + new_len);
-	    if (!(res = _XimGetNestedListSeparator(res_list, res_num))) {
-		p++;
-		if (p) {
-		    *len = -1;
-		    return p->name;
-		}
-		else {
-		    return (char *)NULL;
-		}
-	    }
-	    *buf = res->id;
-	    *len += sizeof(CARD16);
-	    buf++;
-	}
-    }
-    return (char *)NULL;
-}
-
-Private Bool
-_XimAttributeToValue(ic, res, data, data_len, value, mode)
-    Xic			  ic;
-    XIMResourceList	  res;
-    CARD16		 *data;
-    INT16		  data_len;
-    XPointer		  value;
-    BITMASK32		  mode;
-{
-    switch (res->resource_size) {
-    case XimType_SeparatorOfNestedList:
-    case XimType_NEST:
-	break;
-
-    case XimType_CARD8:
-    case XimType_CARD16:
-    case XimType_CARD32:
-    case XimType_Window:
-    case XimType_XIMHotKeyState:
-	_XCopyToArg((XPointer)data, (XPointer *)&value, data_len);
-	break;
-
-    case XimType_STRING8:
-	{
-	    char	*str;
-
-	    if (!(value))
-		return False;
-
-	    if (!(str = (char *)Xmalloc(data_len + 1)))
-		return False;
-
-	    (void)memcpy(str, (char *)data, data_len);
-	    str[data_len] = '\0';
-
-	    *((char **)value) = str;
-	    break;
-	}
-
-    case XimType_XIMStyles:
-	{
-	    INT16		 num = data[0];
-	    register CARD32	*style_list = (CARD32 *)&data[2];
-	    XIMStyle		*style;
-	    XIMStyles		*rep;
-	    register int	 i;
-	    char		*p;
-	    int			 alloc_len;
-
-	    if (!(value))
-		return False;
-
-	    alloc_len = sizeof(XIMStyles) + sizeof(XIMStyle) * num;
-	    if (!(p = (char *)Xmalloc(alloc_len)))
-		return False;
-
-	    rep   = (XIMStyles *)p;
-	    style = (XIMStyle *)(p + sizeof(XIMStyles));
-
-	    for (i = 0; i < num; i++)
-		style[i] = (XIMStyle)style_list[i];
-
-	    rep->count_styles = (unsigned short)num;
-	    rep->supported_styles = style;
-	    *((XIMStyles **)value) = rep;
-	    break;
-	}
-
-    case XimType_XRectangle:
-	{
-	    XRectangle	*rep;
-
-	    if (!(value))
-		return False;
-
-	    if (!(rep = (XRectangle *)Xmalloc(sizeof(XRectangle))))
-		return False;
-
-	    rep->x      = data[0];
-	    rep->y      = data[1];
-	    rep->width  = data[2];
-	    rep->height = data[3];
-	    *((XRectangle **)value) = rep;
-	    break;
-	}
-
-    case XimType_XPoint:
-	{
-	    XPoint	*rep;
-
-	    if (!(value))
-		return False;
-
-	    if (!(rep = (XPoint *)Xmalloc(sizeof(XPoint))))
-		return False;
-
-	    rep->x = data[0];
-	    rep->y = data[1];
-	    *((XPoint **)value) = rep;
-	    break;
-	}
-
-    case XimType_XFontSet:
-	{
-	    INT16	 len = data[0];
-	    char	*base_name;
-	    XFontSet	 rep = (XFontSet)NULL;
-	    char	**missing_list;
-	    int		 missing_count;
-	    char	*def_string;
-
-	    if (!(value))
-		return False;
-	    if (!ic)
-		return False;
-
-	    if (!(base_name = (char *)Xmalloc(len + 1)))
-		return False;
-
-	    (void)strncpy(base_name, (char *)&data[1], (int)len);
-	    base_name[len] = '\0';
-
-	    if (mode & XIM_PREEDIT_ATTR) {
-		if (!strcmp(base_name, ic->private.proto.preedit_font)) {
-		    rep = ic->core.preedit_attr.fontset;
-		} else if (!ic->private.proto.preedit_font_length) {
-		    rep = XCreateFontSet(ic->core.im->core.display,
-					base_name, &missing_list,
-					&missing_count, &def_string);
-		}
-	    } else if (mode & XIM_STATUS_ATTR) {
-		if (!strcmp(base_name, ic->private.proto.status_font)) {
-		    rep = ic->core.status_attr.fontset;
-		} else if (!ic->private.proto.status_font_length) {
-		    rep = XCreateFontSet(ic->core.im->core.display,
-					base_name, &missing_list,
-					&missing_count, &def_string);
-		}
-	    }
-
-	    Xfree(base_name);
-	    *((XFontSet *)value) = rep;
-	    break;
-	}
-
-    case XimType_XIMHotKeyTriggers:
-	{
-	    INT32			 num = *((CARD32 *)data);
-	    register CARD32		*key_list = (CARD32 *)&data[2];
-	    XIMHotKeyTrigger		*key;
-	    XIMHotKeyTriggers		*rep;
-	    register int		 i;
-	    char			*p;
-	    int				 alloc_len;
-
-	    if (!(value))
-		return False;
-
-	    alloc_len = sizeof(XIMHotKeyTriggers)
-		      + sizeof(XIMHotKeyTrigger) * num;
-	    if (!(p = (char *)Xmalloc(alloc_len)))
-		return False;
-
-	    rep = (XIMHotKeyTriggers *)p;
-	    key = (XIMHotKeyTrigger *)(p + sizeof(XIMHotKeyTriggers));
-
-	    for (i = 0; i < num; i++, key_list += 3) {
-		key[i].keysym        = (KeySym)key_list[0]; /* keysym */
-		key[i].modifier      = (int)key_list[1];    /* modifier */
-		key[i].modifier_mask = (int)key_list[2];    /* modifier_mask */
-	    }
-
-	    rep->num_hot_key = (int)num;
-	    rep->key = key;
-	    *((XIMHotKeyTriggers **)value) = rep;
-	    break;
-	}
-
-    case XimType_XIMStringConversion:
-	{
-	    break;
-	}
-
-    default:
-	return False;
-    }
-    return True;
-}
-
-Private Bool
-_XimDecodeInnerIMATTRIBUTE(im, arg)
-    Xim			 im;
-    XIMArg		*arg;
-{
-    XIMResourceList	 res;
-    XimDefIMValues	 im_values;
-
-    if (!(res = _XimGetResourceListRec(im->private.proto.im_inner_resources,
-			im->private.proto.im_num_inner_resources, arg->name)))
-	return False;
-
-    _XimGetCurrentIMValues(im, &im_values);
-    return _XimDecodeLocalIMAttr(res, (XPointer)&im_values, arg->value);
-}
-
-Public char *
-#if NeedFunctionPrototypes
-_XimDecodeIMATTRIBUTE(
-    Xim			 im,
-    XIMResourceList	 res_list,
-    unsigned int	 res_num,
-    CARD16		*data,
-    INT16		 data_len,
-    XIMArg		*arg,
-    BITMASK32		 mode)
-#else
-_XimDecodeIMATTRIBUTE(im, res_list, res_num,  data, data_len, arg, mode)
-    Xim			 im;
-    XIMResourceList	 res_list;
-    unsigned int	 res_num;
-    CARD16		*data;
-    INT16		 data_len;
-    XIMArg		*arg;
-    BITMASK32		 mode;
-#endif /* NeedFunctionPrototypes */
-{
-    register XIMArg	*p;
-    XIMResourceList	 res;
-    int			 check;
-    INT16		 len;
-    CARD16		*buf;
-    INT16		 total;
-    INT16		 min_len = sizeof(CARD16)	/* sizeof attributeID */
-			 	 + sizeof(INT16);	/* sizeof length */
-
-    for (p = arg; p->name; p++) {
-	if (!(res = _XimGetResourceListRec(res_list, res_num, p->name))) {
-	    if (_XimDecodeInnerIMATTRIBUTE(im, p))
-		continue;
-	    return p->name;
-	}
-
-	check = _XimCheckIMMode(res, mode);
-	if(check == XIM_CHECK_INVALID)
-	    continue;
-	else if(check == XIM_CHECK_ERROR)
-	    return p->name;
-
-	total = data_len;
-	buf = data;
-	while (total >= min_len) {
-	    if (res->id == buf[0])
-		break;
-
-	    len = buf[1];
-	    len += XIM_PAD(len) + min_len;
-	    buf = (CARD16 *)((char *)buf + len);
-	    total -= len;
-	}
-	if (total < min_len)
-	    return p->name;
-
-	if (!(_XimAttributeToValue((Xic) im->private.local.current_ic, 
-				   res, &buf[2], buf[1], p->value, mode)))
-	    return p->name;
-    }
-    return (char *)NULL;
-}
-
-Private Bool
-_XimDecodeInnerICATTRIBUTE(ic, arg, mode)
-    Xic			 ic;
-    XIMArg		*arg;
-    unsigned long	 mode;
-{
-    XIMResourceList	 res;
-    XimDefICValues	 ic_values;
-
-    if (!(res = _XimGetResourceListRec(ic->private.proto.ic_inner_resources,
-			ic->private.proto.ic_num_inner_resources, arg->name)))
-	return False;
-
-    _XimGetCurrentICValues(ic, &ic_values);
-    if (!_XimDecodeLocalICAttr(res, (XPointer)&ic_values, arg->value, mode))
-	return False;
-    _XimSetCurrentICValues(ic, &ic_values);
-    return True;
-}
-
-Public char *
-#if NeedFunctionPrototypes
-_XimDecodeICATTRIBUTE(
-    Xic			 ic,
-    XIMResourceList	 res_list,
-    unsigned int	 res_num,
-    CARD16		*data,
-    INT16		 data_len,
-    XIMArg		*arg,
-    BITMASK32		 mode)
-#else
-_XimDecodeICATTRIBUTE(ic, res_list, res_num,  data, data_len, arg, mode)
-    Xic			 ic;
-    XIMResourceList	 res_list;
-    unsigned int	 res_num;
-    CARD16		*data;
-    INT16		 data_len;
-    XIMArg		*arg;
-    BITMASK32		 mode;
-#endif /* NeedFunctionPrototypes */
-{
-    register XIMArg	*p;
-    XIMResourceList	 res;
-    int			 check;
-    INT16		 len;
-    CARD16		*buf;
-    INT16		 total;
-    char		*name;
-    INT16		 min_len = sizeof(CARD16)	/* sizeof attributeID */
-			 	 + sizeof(INT16);	/* sizeof length */
-    XrmQuark		 pre_quark;
-    XrmQuark		 sts_quark;
-
-    if (!arg)
-	return (char *)NULL;
-
-    pre_quark = XrmStringToQuark(XNPreeditAttributes);
-    sts_quark = XrmStringToQuark(XNStatusAttributes);
-
-    for (p = arg; p->name; p++) {
-	if (!(res = _XimGetResourceListRec(res_list, res_num, p->name))) {
-	    if (_XimDecodeInnerICATTRIBUTE(ic, p, mode))
-		continue;
-	    return p->name;
-	}
-
-	check = _XimCheckICMode(res, mode);
-	if (check == XIM_CHECK_INVALID)
-	    continue;
-	else if (check == XIM_CHECK_ERROR)
-	    return p->name;
-
-	total = data_len;
-	buf = data;
-	while (total >= min_len) {
-	    if (res->id == buf[0])
-		break;
-
-	    len = buf[1];
-	    len += XIM_PAD(len) + min_len;
-	    buf = (CARD16 *)((char *)buf + len);
-	    total -= len;
-	}
-	if (total < min_len)
-	    return p->name;
-
-	if (res->resource_size == XimType_NEST) {
-	    if (res->xrm_name == pre_quark) {
-	        if ((name = _XimDecodeICATTRIBUTE(ic, res_list, res_num,
-			&buf[2], buf[1], (XIMArg *)p->value,
-			(mode | XIM_PREEDIT_ATTR))))
-		    return name;
-	    } else if (res->xrm_name == sts_quark) {
-	        if ((name = _XimDecodeICATTRIBUTE(ic, res_list, res_num,
-			&buf[2], buf[1], (XIMArg *)p->value,
-			(mode | XIM_STATUS_ATTR))))
-		    return name;
-	    }
-	} else {
-	    if (!(_XimAttributeToValue(ic, res, &buf[2], buf[1],
-							p->value, mode)))
-		return p->name;
-	}
-    }
-    return (char *)NULL;
-}
-
-Private Bool
-_XimValueToAttribute(res, buf, buf_size, value, len, mode, param)
-    XIMResourceList	 res;
-    XPointer		 buf;
-    int			 buf_size;
-    XPointer		 value;
-    int			*len;
-    unsigned long	 mode;
-    XPointer		 param;
-{
-    int			 ret_len;
-
-    switch (res->resource_size) {
-    case XimType_SeparatorOfNestedList:
-    case XimType_NEST:
-	*len = 0;
-	break;
-
-    case XimType_CARD8:
-	ret_len = sizeof(CARD8);
-	if (buf_size < ret_len + XIM_PAD(ret_len)) {
-	    *len = -1;
-	    return False;
-	}
-
-	*((CARD8 *)buf) = (CARD8)(long)value;
-	*len = ret_len;
-	break;
-
-    case XimType_CARD16:
-	ret_len = sizeof(CARD16);
-	if (buf_size < ret_len + XIM_PAD(ret_len)) {
-	    *len = -1;
-	    return False;
-	}
-
-	*((CARD16 *)buf) = (CARD16)(long)value;
-	*len = ret_len;
-	break;
-
-    case XimType_CARD32:
-    case XimType_Window:
-    case XimType_XIMHotKeyState:
-	ret_len = sizeof(CARD32);
-	if (buf_size < ret_len + XIM_PAD(ret_len)) {
-	    *len = -1;
-	    return False;
-	}
-
-	*((CARD32 *)buf) = (CARD32)value;
-	*len = ret_len;
-	break;
-
-    case XimType_STRING8:
-	if (!value) {
-	    *len = 0;
-	    return False;
-	}
-
-	ret_len = strlen((char *)value);
-	if (buf_size < ret_len + XIM_PAD(ret_len)) {
-	    *len = -1;
-	    return False;
-	}
-
-	(void)memcpy((char *)buf, (char *)value, ret_len);
-	*len = ret_len;
-	break;
-
-    case XimType_XRectangle:
-	{
-	    XRectangle	*rect = (XRectangle *)value;
-	    CARD16	*buf_s = (CARD16 *)buf;
-
-	    if (!rect) {
-		*len = 0;
-		return False;
-	    }
-
-	    ret_len = sizeof(INT16)		/* sizeof X */
-	    	    + sizeof(INT16)		/* sizeof Y */
-	            + sizeof(CARD16)		/* sizeof width */
-	            + sizeof(CARD16);		/* sizeof height */
-	    if (buf_size < ret_len + XIM_PAD(ret_len)) {
-		*len = -1;
-		return False;
-	    }
-
-	    buf_s[0] = (CARD16)rect->x;		/* X */
-	    buf_s[1] = (CARD16)rect->y;		/* Y */
-	    buf_s[2] = (CARD16)rect->width;	/* width */
-	    buf_s[3] = (CARD16)rect->height;	/* heght */
-	    *len = ret_len;
-	    break;
-	}
-
-    case XimType_XPoint:
-	{
-	    XPoint	*point = (XPoint *)value;
-	    CARD16	*buf_s = (CARD16 *)buf;
-
-	    if (!point) {
-		*len = 0;
-		return False;
-	    }
-
-	    ret_len = sizeof(INT16)		/* sizeof X */
-	            + sizeof(INT16);		/* sizeof Y */
-	    if (buf_size < ret_len + XIM_PAD(ret_len)) {
-		*len = -1;
-		return False;
-	    }
-
-	    buf_s[0] = (CARD16)point->x;		/* X */
-	    buf_s[1] = (CARD16)point->y;		/* Y */
-	    *len = ret_len;
-	    break;
-	}
-
-    case XimType_XFontSet:
-	{
-	    XFontSet	 font = (XFontSet)value;
-	    Xic		 ic = (Xic)param;
-	    char	*base_name = NULL;
-	    int		 length;
-	    CARD16	*buf_s = (CARD16 *)buf;
-
-	    if (!font) {
-		*len = 0;
-		return False;
-	    }
-
-	    if (mode & XIM_PREEDIT_ATTR) {
-		base_name = ic->private.proto.preedit_font;
-		length	  = ic->private.proto.preedit_font_length;
-	    } else if (mode & XIM_STATUS_ATTR) {
-		base_name = ic->private.proto.status_font;
-		length	  = ic->private.proto.status_font_length;
-	    }
-
-	    if (!base_name) {
-		*len = 0;
-		return False;
-	    }
-
-	    ret_len = sizeof(CARD16)		/* sizeof length of Base name */
-		    + length;			/* sizeof Base font name list */
-	    if (buf_size < ret_len + XIM_PAD(ret_len)) {
-		*len = -1;
-		return False;
-	    }
-
-	    buf_s[0] = (INT16)length;		/* length of Base font name */
-	    (void)memcpy((char *)&buf_s[1], base_name, length);
-						/* Base font name list */
-	    *len = ret_len;
-	    break;
-	}
-
-    case XimType_XIMHotKeyTriggers:
-	{
-	    XIMHotKeyTriggers	*hotkey = (XIMHotKeyTriggers *)value;
-	    INT32		 num;
-	    CARD32		*buf_l = (CARD32 *)buf;
-	    register CARD32	*key = (CARD32 *)&buf_l[1];
-	    register int	 i;
-
-	    if (!hotkey) {
-		*len = 0;
-		return False;
-	    }
-	    num = (INT32)hotkey->num_hot_key;
-
-	    ret_len = sizeof(INT32)		/* sizeof number of key list */
-	           + (sizeof(CARD32)		/* sizeof keysyn */
-	           +  sizeof(CARD32)		/* sizeof modifier */
-	           +  sizeof(CARD32))		/* sizeof modifier_mask */
-	           *  num;			/* number of key list */
-	    if (buf_size < ret_len + XIM_PAD(ret_len)) {
-		*len = -1;
-		return False;
-	    }
-
-	    buf_l[0] = num;		/* number of key list */
-	    for (i = 0; i < num; i++, key += 3) {
-		key[0] = (CARD32)(hotkey->key[i].keysym);
-						/* keysym */
-		key[1] = (CARD32)(hotkey->key[i].modifier);
-						/* modifier */
-		key[2] = (CARD32)(hotkey->key[i].modifier_mask);
-						/* modifier_mask */
-	    }
-	    *len = ret_len;
-	    break;
-	}
-
-    case XimType_XIMStringConversion:
-	{
-	    *len = 0;
-	    break;
-	}
-
-    default:
-	return False;
-    }
-    return True;
-}
-
-Private Bool
-_XimSetInnerIMAttributes(im, top, arg, mode)
-    Xim			 im;
-    XPointer		 top;
-    XIMArg		*arg;
-    unsigned long	 mode;
-{
-    XIMResourceList	 res;
-    int			 check;
-
-    if (!(res = _XimGetResourceListRec(im->private.proto.im_inner_resources,
-			im->private.proto.im_num_inner_resources, arg->name)))
-	return False;
-
-    check = _XimCheckIMMode(res, mode);
-    if(check == XIM_CHECK_INVALID)
-	return True;
-    else if(check == XIM_CHECK_ERROR)
-	return False;
-
-    return _XimEncodeLocalIMAttr(res, top, arg->value);
-}
-
-Public char *
-_XimEncodeIMATTRIBUTE(im, res_list, res_num, arg, arg_ret,  buf, size, ret_len, top, mode)
-    Xim			  im;
-    XIMResourceList	  res_list;
-    unsigned int	  res_num;
-    XIMArg		 *arg;
-    XIMArg		**arg_ret;
-    char		 *buf;
-    int			  size;
-    int			 *ret_len;
-    XPointer		  top;
-    unsigned long	  mode;
-{
-    register XIMArg	*p;
-    XIMResourceList	 res;
-    int			 check;
-    CARD16		*buf_s;
-    int			 len;
-    int			 min_len = sizeof(CARD16) /* sizeof attribute ID */
-				 + sizeof(INT16); /* sizeof value length */
-
-    *ret_len = 0;
-    for (p = arg; p->name; p++) {
-	if (!(res = _XimGetResourceListRec(res_list, res_num, p->name))) {
-	    if (_XimSetInnerIMAttributes(im, top, p, mode))
-		continue;
-	    return p->name;
-	}
-
-	check = _XimCheckIMMode(res, mode);
-	if (check == XIM_CHECK_INVALID)
-	    continue;
-	else if (check == XIM_CHECK_ERROR)
-	    return p->name;
-
-	if (!(_XimEncodeLocalIMAttr(res, top, p->value)))
-	    return p->name;
-
-	buf_s = (CARD16 *)buf;
-	if (!(_XimValueToAttribute(res, (XPointer)&buf_s[2], (size - min_len),
-				p->value, &len, mode, (XPointer)NULL)))
-	    return p->name;
-
-	if (len == 0) {
-	    continue;
-	} else if (len < 0) {
-	    *arg_ret = p;
-	    return (char *)NULL;
-	}
-
-	buf_s[0] = res->id;			/* attribute ID */
-	buf_s[1] = len;				/* value length */
-	XIM_SET_PAD(&buf_s[2], len);		/* pad */
-	len += min_len;
-
-	buf += len;
-	*ret_len += len;
-	size -= len;
-    }
-    *arg_ret = (XIMArg *)NULL;
-    return (char *)NULL;
-}
-
-#ifdef XIM_CONNECTABLE
-Public	Bool
-_XimEncodeSavedIMATTRIBUTE(im, res_list, res_num, idx, buf, size, ret_len, top, mode)
-    Xim			 im;
-    XIMResourceList	 res_list;
-    unsigned int	 res_num;
-    int			*idx;
-    char		*buf;
-    int			 size;
-    int			*ret_len;
-    XPointer		 top;
-    unsigned long	 mode;
-{
-    register int	 i;
-    int			 num = im->private.proto.num_saved_imvalues;
-    XrmQuark		*quark_list = im->private.proto.saved_imvalues;
-    XIMResourceList	 res;
-    XPointer		 value;
-    CARD16		*buf_s;
-    int			 len;
-    int			 min_len = sizeof(CARD16) /* sizeof attribute ID */
-				 + sizeof(INT16); /* sizeof value length */
-
-    if (!im->private.proto.saved_imvalues) {
-	*idx = -1;
-	*ret_len = 0;
-	return True;
-    }
-
-    *ret_len = 0;
-    for (i = *idx; i < num; i++) {
-	if (!(res = _XimGetResourceListRecByQuark(res_list,
-						res_num, quark_list[i])))
-	    continue;
-
-	if (!_XimDecodeLocalIMAttr(res, top, value))
-	    return False;
-
-	buf_s = (CARD16 *)buf;
-	if (!(_XimValueToAttribute(res, (XPointer)&buf_s[2],
-			(size - min_len), value, &len, mode, (XPointer)NULL)))
-	    return False;
-
-	if (len == 0) {
-	    continue;
-	} else if (len < 0) {
-	    *idx = i;
-	    return True;
-	}
-
-	buf_s[0] = res->id;			/* attribute ID */
-	buf_s[1] = len;				/* value length */
-	XIM_SET_PAD(&buf_s[2], len);		/* pad */
-	len += min_len;
-
-	buf += len;
-	*ret_len += len;
-	size -= len;
-    }
-    *idx = -1;
-    return True;
-}
-#endif /* XIM_CONNECTABLE */
-
-Private Bool
-_XimEncodeTopValue(ic, res, p)
-    Xic			 ic;
-    XIMResourceList	 res;
-    XIMArg		*p;
-{
-    if (res->xrm_name == XrmStringToQuark(XNClientWindow)) {
-	ic->core.client_window = (Window)p->value;
-	if (ic->core.focus_window == (Window)0)
-	    ic->core.focus_window = ic->core.client_window;
-	_XimRegisterFilter(ic);
-
-    } else if (res->xrm_name == XrmStringToQuark(XNFocusWindow)) {
-	if (ic->core.client_window) {
-	    _XimUnregisterFilter(ic);
-	    ic->core.focus_window = (Window)p->value;
-	    _XimRegisterFilter(ic);
-	} else /* client_window not yet */
-	    ic->core.focus_window = (Window)p->value;
-    }
-    return True;
-}
-
-Private Bool
-_XimEncodePreeditValue(ic, res, p)
-    Xic			 ic;
-    XIMResourceList	 res;
-    XIMArg		*p;
-{
-    if (res->xrm_name == XrmStringToQuark(XNStdColormap)) {
-	XStandardColormap	*colormap_ret;
-	int			 count;
-
-	if (!(XGetRGBColormaps(ic->core.im->core.display,
-				ic->core.focus_window, &colormap_ret,
-				&count, (Atom)p->value)))
-	    return False;
-
-    } else if (res->xrm_name == XrmStringToQuark(XNFontSet)) {
-	int		  list_ret;
-	XFontStruct	**struct_list;
-	char		**name_list;
-	char		 *tmp;
-	int		  len;
-	register int	  i;
-
-	if (!p->value)
-	    return False;
-
-	if (ic->private.proto.preedit_font)
-	    Xfree(ic->private.proto.preedit_font);
-
-	list_ret = XFontsOfFontSet((XFontSet)p->value,
-						 &struct_list, &name_list);
-	for (i = 0, len = 0; i < list_ret; i++) {
-	     len += (strlen(name_list[i]) + sizeof(char));
-	}
-	if (!(tmp = Xmalloc(len + 1))) {
-	    ic->private.proto.preedit_font = NULL;
-	    return False;
-	}
-
-	tmp[0] = '\0';
-	for (i = 0; i < list_ret; i++) {
-	    strcat(tmp, name_list[i]);
-	    strcat(tmp, ",");
-	}
-	tmp[len - 1] = 0;
-	ic->private.proto.preedit_font        = tmp;
-	ic->private.proto.preedit_font_length = len - 1;
-    }
-    return True;
-}
-
-Private Bool
-_XimEncodeStatusValue(ic, res, p)
-    Xic			 ic;
-    XIMResourceList	 res;
-    XIMArg		*p;
-{
-    if (res->xrm_name == XrmStringToQuark(XNStdColormap)) {
-	XStandardColormap	*colormap_ret;
-	int			 count;
-
-	if (!(XGetRGBColormaps(ic->core.im->core.display,
-				ic->core.focus_window, &colormap_ret,
-				&count, (Atom)p->value)))
-	    return False;
-
-    } else if (res->xrm_name == XrmStringToQuark(XNFontSet)) {
-	int		  list_ret;
-	XFontStruct	**struct_list;
-	char		**name_list;
-	char		 *tmp;
-	int		  len;
-	register int	  i;
-
-	if (!p->value)
-	    return False;
-
-	if (ic->private.proto.status_font)
-	    Xfree(ic->private.proto.status_font);
-
-	list_ret = XFontsOfFontSet((XFontSet)p->value,
-						 &struct_list, &name_list);
-	for (i = 0, len = 0; i < list_ret; i++) {
-	     len += (strlen(name_list[i]) + sizeof(char));
-	}
-	if (!(tmp = Xmalloc(len+1))) {
-	    ic->private.proto.status_font = NULL;
-	    return False;
-	}
-
-	tmp[0] = '\0';
-	for(i = 0; i < list_ret; i++) {
-	    strcat(tmp, name_list[i]);
-	    strcat(tmp, ",");
-	}
-	tmp[len - 1] = 0;
-	ic->private.proto.status_font        = tmp;
-	ic->private.proto.status_font_length = len - 1;
-    }
-    return True;
-}
-
-Private Bool
-_XimSetInnerICAttributes(ic, top, arg, mode)
-    Xic			 ic;
-    XPointer		 top;
-    XIMArg		*arg;
-    unsigned long	 mode;
-{
-    XIMResourceList	 res;
-    int			 check;
-
-    if (!(res = _XimGetResourceListRec(ic->private.proto.ic_inner_resources,
-			ic->private.proto.ic_num_inner_resources, arg->name)))
-	return False;
-
-    check = _XimCheckICMode(res, mode);
-    if(check == XIM_CHECK_INVALID)
-	return True;
-    else if(check == XIM_CHECK_ERROR)
-	return False;
-
-    return _XimEncodeLocalICAttr(ic, res, top, arg, mode);
-}
-
-Public char *
-_XimEncodeICATTRIBUTE(ic, res_list, res_num, arg, arg_ret, buf, size, ret_len, top, flag, mode)
-    Xic			  ic;
-    XIMResourceList	  res_list;
-    unsigned int	  res_num;
-    XIMArg		 *arg;
-    XIMArg		**arg_ret;
-    char		 *buf;
-    int			  size;
-    int			 *ret_len;
-    XPointer		  top;
-    BITMASK32		 *flag;
-    unsigned long	  mode;
-{
-    register XIMArg	*p;
-    XIMResourceList	 res;
-    int			 check;
-    CARD16		*buf_s;
-    int			 len;
-    int			 min_len = sizeof(CARD16) /* sizeof attribute ID */
-				 + sizeof(INT16); /* sizeof value length */
-    XrmQuark		 pre_quark;
-    XrmQuark		 sts_quark;
-    char		*name;
-
-    pre_quark = XrmStringToQuark(XNPreeditAttributes);
-    sts_quark = XrmStringToQuark(XNStatusAttributes);
-
-    *ret_len = 0;
-    for (p = arg; p && p->name; p++) {
-	buf_s = (CARD16 *)buf;
-	if (!(res = _XimGetResourceListRec(res_list, res_num, p->name))) {
-	    if (_XimSetInnerICAttributes(ic, top, p, mode))
-		continue;
-	    return p->name;
-	}
-
-	check = _XimCheckICMode(res, mode);
-	if (check == XIM_CHECK_INVALID)
-	    continue;
-	else if (check == XIM_CHECK_ERROR)
-	    return p->name;
-
-	if (mode & XIM_PREEDIT_ATTR) {
-	    if (!(_XimEncodePreeditValue(ic, res, p)))
-		return p->name;
-	} else if (mode & XIM_STATUS_ATTR) {
-	    if (!(_XimEncodeStatusValue(ic, res, p)))
-		return p->name;
-	} else {
-	    if (!(_XimEncodeTopValue(ic, res, p)))
-		return p->name;
-	}
-
-	if (res->resource_size == XimType_NEST) {
-	    XimDefICValues	*ic_attr = (XimDefICValues *)top;
-
-	    if (res->xrm_name == pre_quark) {
-		XIMArg		*arg_rt;
-		if ((name = _XimEncodeICATTRIBUTE(ic, res_list, res_num,
-				(XIMArg *)p->value, &arg_rt,
-				(char *)&buf_s[2], (size - min_len),
-				 &len, (XPointer)&ic_attr->preedit_attr, flag,
-				(mode | XIM_PREEDIT_ATTR)))) {
-		    return name;
-		}
-
-	    } else if (res->xrm_name == sts_quark) {
-		XIMArg		*arg_rt;
-		if ((name = _XimEncodeICATTRIBUTE(ic, res_list, res_num,
-				(XIMArg *)p->value,  &arg_rt,
-				(char *)&buf_s[2], (size - min_len),
-				 &len, (XPointer)&ic_attr->status_attr, flag,
-				(mode | XIM_STATUS_ATTR)))) {
-		    return name;
-		}
-	    }
-	} else {
-#ifdef EXT_MOVE
-	    if (flag)
-		*flag |= _XimExtenArgCheck(p);
-#endif
-    	    if (!(_XimEncodeLocalICAttr(ic, res, top, p, mode)))
-		return p->name;
-
-	    if (!(_XimValueToAttribute(res, (XPointer)&buf_s[2],
-			 	(size - min_len), p->value,
-				&len, mode, (XPointer)ic)))
-		return p->name;
-	}
-
-	if (len == 0) {
-	    continue;
-	} else if (len < 0) {
-	    *arg_ret = p;
-	    return (char *)NULL;
-	}
-
-	buf_s[0] = res->id;			/* attribute ID */
-	buf_s[1] = len;				/* value length */
-	XIM_SET_PAD(&buf_s[2], len);		/* pad */
-	len += min_len;
-
-	buf += len;
-	*ret_len += len;
-	size -= len;
-    }
-    *arg_ret = (XIMArg *)NULL;
-    return (char *)NULL;
-}
-
-#ifdef XIM_CONNECTABLE
-Private Bool
-_XimEncodeSavedPreeditValue(ic, res, value)
-    Xic			  ic;
-    XIMResourceList	  res;
-    XPointer		  value;
-{
-    int			  list_ret;
-    XFontStruct		**struct_list;
-    char		**name_list;
-    char		 *tmp;
-    int			  len;
-    register int	  i;
-
-    if (res->xrm_name == XrmStringToQuark(XNFontSet)) {
-	if (!value)
-	    return False;
-
-	if (ic->private.proto.preedit_font)
-	    Xfree(ic->private.proto.preedit_font);
-
-	list_ret = XFontsOfFontSet((XFontSet)value,
-						&struct_list, &name_list);
-	for(i = 0, len = 0; i < list_ret; i++) {
-	    len += (strlen(name_list[i]) + sizeof(char));
-	}
-	if(!(tmp = Xmalloc(len + 1))) {
-	    ic->private.proto.preedit_font = NULL;
-	    return False;
-	}
-
-	tmp[0] = '\0';
-	for(i = 0; i < list_ret; i++) {
-	    strcat(tmp, name_list[i]);
-	    strcat(tmp, ",");
-	}
-	tmp[len - 1] = 0;
-	ic->private.proto.preedit_font        = tmp;
-	ic->private.proto.preedit_font_length = len - 1;
-    }
-    return True;
-}
-
-Private Bool
-_XimEncodeSavedStatusValue(ic, res, value)
-    Xic			  ic;
-    XIMResourceList	  res;
-    XPointer		  value;
-{
-    int			  list_ret;
-    XFontStruct		**struct_list;
-    char		**name_list;
-    char		 *tmp;
-    int			  len;
-    register int	  i;
-
-    if (res->xrm_name == XrmStringToQuark(XNFontSet)) {
-	if (!value)
-	    return False;
-
-	if (ic->private.proto.status_font)
-	    Xfree(ic->private.proto.status_font);
-
-	list_ret = XFontsOfFontSet((XFontSet)value,
-						&struct_list, &name_list);
-	for(i = 0, len = 0; i < list_ret; i++) {
-	    len += (strlen(name_list[i]) + sizeof(char));
-	}
-	if(!(tmp = Xmalloc(len + 1))) {
-	    ic->private.proto.status_font = NULL;
-	    return False;
-	}
-
-	tmp[0] = '\0';
-	for(i = 0; i < list_ret; i++) {
-	    strcat(tmp, name_list[i]);
-	    strcat(tmp, ",");
-	}
-	tmp[len - 1] = 0;
-	ic->private.proto.status_font        = tmp;
-	ic->private.proto.status_font_length = len - 1;
-    }
-    return True;
-}
-
-Public	Bool
-_XimEncodeSavedICATTRIBUTE(ic, res_list, res_num, idx, buf, size, ret_len, top, mode)
-    Xic			 ic;
-    XIMResourceList	 res_list;
-    unsigned int	 res_num;
-    int			*idx;
-    char		*buf;
-    int			 size;
-    int			*ret_len;
-    XPointer		 top;
-    unsigned long	 mode;
-{
-    int			 i;
-    int			 num = ic->private.proto.num_saved_icvalues;
-    XrmQuark		*quark_list = ic->private.proto.saved_icvalues;
-    XIMResourceList	 res;
-    XPointer		 value;
-    CARD16		*buf_s;
-    int			 len;
-    int			 min_len = sizeof(CARD16) /* sizeof attribute ID */
-				 + sizeof(INT16); /* sizeof value length */
-    XrmQuark		 pre_quark;
-    XrmQuark		 sts_quark;
-    XrmQuark		 separator;
-
-    if (!ic->private.proto.saved_icvalues) {
-	*idx = -1;
-	*ret_len = 0;
-	return True;
-    }
-
-    pre_quark = XrmStringToQuark(XNPreeditAttributes);
-    sts_quark = XrmStringToQuark(XNStatusAttributes);
-    separator = XrmStringToQuark(XNSeparatorofNestedList);
-
-    *ret_len = 0;
-    for (i = *idx; i < num; i++) {
-	if (quark_list[i] == separator) {
-	    *idx = i;
-	    return True;
-	}
-
-	if (!(res = _XimGetResourceListRecByQuark(res_list,
-						res_num, quark_list[i])))
-	    continue;
-
-	if (!_XimDecodeLocalICAttr(res, top,(XPointer)&value, mode))
-	    return False;
-
-	if (mode & XIM_PREEDIT_ATTR) {
-	    if (!(_XimEncodeSavedPreeditValue(ic, res, value))) {
-		return False;
-	    }
-	} else if (mode & XIM_STATUS_ATTR) {
-	    if (!(_XimEncodeSavedStatusValue(ic, res, value))) {
-		return False;
-	    }
-	}
-
-	buf_s = (CARD16 *)buf;
-	if (res->resource_size == XimType_NEST) {
-	    XimDefICValues	*ic_attr = (XimDefICValues *)top;
-
-	    i++;
-	    if (res->xrm_name == pre_quark) {
-		if (!_XimEncodeSavedICATTRIBUTE(ic, res_list, res_num,
-				 &i, (char *)&buf_s[2], (size - min_len),
-				 &len, (XPointer)&ic_attr->preedit_attr,
-				(mode | XIM_PREEDIT_ATTR))) {
-		    return False;
-		}
-
-	    } else if (res->xrm_name == sts_quark) {
-		if (!_XimEncodeSavedICATTRIBUTE(ic, res_list, res_num,
-				&i, (char *)&buf_s[2], (size - min_len),
-				&len, (XPointer)&ic_attr->status_attr,
-				(mode | XIM_STATUS_ATTR))) {
-		    return False;
-		}
-	    }
-	} else {
-	    if (!(_XimValueToAttribute(res, (XPointer)&buf_s[2],
-			 	(size - min_len), value,
-				&len, mode, (XPointer)ic))) {
-		return False;
-	    }
-	}
-
-	if (len == 0) {
-	    continue;
-	} else if (len < 0) {
-	    if (quark_list[i] == separator)
-		i++;
-	    *idx = i;
-	    return True;
-	}
-
-	buf_s[0] = res->id;			/* attribute ID */
-	buf_s[1] = len;				/* value length */
-	XIM_SET_PAD(&buf_s[2], len);		/* pad */
-	len += min_len;
-
-	buf += len;
-	*ret_len += len;
-	size -= len;
-    }
-    *idx = -1;
-    return True;
-}
-#endif /* XIM_CONNECTABLE */
-
-Private unsigned int
-_XimCountNumberOfAttr(total, attr, names_len)
-    INT16	 total;
-    CARD16	*attr;
-    int		*names_len;
-{
-    unsigned int n;
-    INT16	 len;
-    INT16	 min_len = sizeof(CARD16)	/* sizeof attrinute ID */
-			 + sizeof(CARD16)	/* sizeof type of value */
-			 + sizeof(INT16);	/* sizeof length of attribute */
-
-    n = 0;
-    *names_len = 0;
-    while (total > min_len) {
-	len = attr[2];
-	*names_len += (len + 1);
-	len += (min_len + XIM_PAD(len + 2));
-	total -= len;
-	attr = (CARD16 *)((char *)attr + len);
-	n++;
-    }
-    return n;
-}
-
-Public Bool
-_XimGetAttributeID(im, buf)
-    Xim			  im;
-    CARD16		 *buf;
-{
-    unsigned int	  n;
-    XIMResourceList	  res;
-    int			  res_len;
-    char		 *names;
-    int			  names_len;
-    XPointer		  tmp;
-    XIMValuesList	 *values_list;
-    char		**values;
-    int			  values_len;
-    register int	  i;
-    INT16		  len;
-    INT16		  min_len = sizeof(CARD16) /* sizeof attrinute ID */
-				  + sizeof(CARD16) /* sizeof type of value */
-				  + sizeof(INT16); /* sizeof length of attr */
-    /*
-     * IM attribute ID
-     */
-
-    if (!(n = _XimCountNumberOfAttr(buf[0], &buf[1], &names_len)))
-	return False;
-    res_len = sizeof(XIMResource) * n;
-
-    if (!(res = (XIMResourceList)Xmalloc(res_len)))
-	return False;
-    bzero((char *)res, res_len);
-
-    values_len = sizeof(XIMValuesList) + (sizeof(char **) * n) + names_len;
-    if (!(tmp = (XPointer)Xmalloc(values_len)))
-	return False;
-    bzero(tmp, values_len);
-
-    values_list = (XIMValuesList *)tmp;
-    values = (char **)((char *)tmp + sizeof(XIMValuesList));
-    names = (char *)((char *)values + (sizeof(char **) * n));
-
-    values_list->count_values = n;
-    values_list->supported_values = values;
-
-    buf++;
-    for (i = 0; i < n; i++) {
-	len = buf[2];
-	(void)memcpy(names, (char *)&buf[3], len);
-	values[i] = names;
-	names[len] = '\0';
-	res[i].resource_name = names;
-	res[i].resource_size = buf[1];
-	res[i].id	     = buf[0];
-	names += (len + 1);
-	len += (min_len + XIM_PAD(len + 2));
-	buf = (CARD16 *)((char *)buf + len);
-    }
-    _XIMCompileResourceList(res, n);
-
-    if (im->core.im_resources)
-	Xfree(im->core.im_resources);
-    if (im->core.im_values_list)
-	Xfree(im->core.im_values_list);
-    im->core.im_resources     = res;
-    im->core.im_num_resources = n;
-    im->core.im_values_list   = values_list;
-
-    /*
-     * IC attribute ID
-     */
-
-    if (!(n = _XimCountNumberOfAttr(buf[0], &buf[2], &names_len)))
-	return False;
-    res_len = sizeof(XIMResource) * n;
-
-    if (!(res = (XIMResourceList)Xmalloc(res_len)))
-	return False;
-    bzero((char *)res, res_len);
-
-    values_len = sizeof(XIMValuesList) + (sizeof(char **) * n) + names_len;
-    if (!(tmp = (XPointer)Xmalloc(values_len)))
-	return False;
-    bzero(tmp, values_len);
-
-    values_list = (XIMValuesList *)tmp;
-    values = (char **)((char *)tmp + sizeof(XIMValuesList));
-    names = (char *)((char *)values + (sizeof(char **) * n));
-
-    values_list->count_values = n;
-    values_list->supported_values = values;
-
-    buf += 2;
-    for (i = 0; i < n; i++) {
-	len = buf[2];
-	(void)memcpy(names, (char *)&buf[3], len);
-	values[i] = names;
-	names[len] = '\0';
-	res[i].resource_name = names;
-	res[i].resource_size = buf[1];
-	res[i].id	     = buf[0];
-	names += (len + 1);
-	len += (min_len + XIM_PAD(len + 2));
-	buf = (CARD16 *)((char *)buf + len);
-    }
-    _XIMCompileResourceList(res, n);
-
-    if (im->core.ic_resources)
-	Xfree(im->core.ic_resources);
-    if (im->core.ic_values_list)
-	Xfree(im->core.ic_values_list);
-    im->core.ic_resources     = res;
-    im->core.ic_num_resources = n;
-    im->core.ic_values_list   = values_list;
-
-    return True;
-}
diff --git a/xc/lib/X11/imThaiFlt.c b/xc/lib/X11/imThaiFlt.c
deleted file mode 100644
index 2455ce8b2..000000000
--- a/xc/lib/X11/imThaiFlt.c
+++ /dev/null
@@ -1,1219 +0,0 @@
-/* $TOG: imThaiFlt.c /main/10 1998/02/06 17:36:48 kaleb $ */
-/***********************************************************
-
-Copyright 1993, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1993 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-/* $XFree86: xc/lib/X11/imThaiFlt.c,v 3.2 1999/05/09 10:50:37 dawes Exp $ */
-
-/*
-**++ 
-**  FACILITY: 
-** 
-**      Xlib 
-** 
-**  ABSTRACT: 
-** 
-**	Thai specific functions.
-**	Handles character classifications, composibility checking,
-**	Input sequence check and other Thai specific requirements
-**	according to WTT specification and DEC extensions.
-** 
-**  MODIFICATION HISTORY: 
-** 
-**/
-
-#include <stdio.h>
-#include <X11/Xlib.h>
-#include <X11/Xmd.h>
-#include <X11/keysym.h>
-#include <X11/Xutil.h>
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "Ximint.h"
-#include "XimThai.h"
-
-/* EXTERNS */
-/* KeyBind.c */
-extern int _XKeyInitialize();
-
-/* lcStd.c */
-extern int _Xlcmbstowcs();
-
-#define SPACE   32
-
-/* character classification table */
-#define TACTIS_CHARS 256
-Private
-char tactis_chtype[TACTIS_CHARS] = {
-    CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, CTRL,  /*  0 -  7 */
-    CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, CTRL,  /*  8 - 15 */
-    CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, CTRL,  /* 16 - 23 */
-    CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, CTRL,  /* 24 - 31 */
-    NON,  NON,  NON,  NON,  NON,  NON,  NON,  NON,   /* 32 - 39 */
-    NON,  NON,  NON,  NON,  NON,  NON,  NON,  NON,   /* 40 - 47 */
-    NON,  NON,  NON,  NON,  NON,  NON,  NON,  NON,   /* 48 - 55 */
-    NON,  NON,  NON,  NON,  NON,  NON,  NON,  NON,   /* 56 - 63 */
-    NON,  NON,  NON,  NON,  NON,  NON,  NON,  NON,   /* 64 - 71 */
-    NON,  NON,  NON,  NON,  NON,  NON,  NON,  NON,   /* 72 - 79 */
-    NON,  NON,  NON,  NON,  NON,  NON,  NON,  NON,   /* 80 - 87 */
-    NON,  NON,  NON,  NON,  NON,  NON,  NON,  NON,   /* 88 - 95 */
-    NON,  NON,  NON,  NON,  NON,  NON,  NON,  NON,   /* 96 - 103 */
-    NON,  NON,  NON,  NON,  NON,  NON,  NON,  NON,   /* 104 - 111 */
-    NON,  NON,  NON,  NON,  NON,  NON,  NON,  NON,   /* 112 - 119 */
-    NON,  NON,  NON,  NON,  NON,  NON,  NON,  CTRL,  /* 120 - 127 */
-    CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, CTRL,  /* 128 - 135 */
-    CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, CTRL,  /* 136 - 143 */
-    CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, CTRL,  /* 144 - 151 */
-    CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, CTRL,  /* 152 - 159 */
-    NON,  CONS, CONS, CONS, CONS, CONS, CONS, CONS,  /* 160 - 167 */
-    CONS, CONS, CONS, CONS, CONS, CONS, CONS, CONS,  /* 168 - 175 */
-    CONS, CONS, CONS, CONS, CONS, CONS, CONS, CONS,  /* 176 - 183 */
-    CONS, CONS, CONS, CONS, CONS, CONS, CONS, CONS,  /* 184 - 191 */
-    CONS, CONS, CONS, CONS,  FV3, CONS,  FV3, CONS,  /* 192 - 199 */
-    CONS, CONS, CONS, CONS, CONS, CONS, CONS, NON,   /* 200 - 207 */
-    FV1,  AV2,  FV1,  FV1,  AV1,  AV3,  AV2,  AV3,   /* 208 - 215 */
-    BV1,  BV2,  BD,   NON,  NON,  NON,  NON,  NON,   /* 216 - 223 */
-    LV,   LV,   LV,   LV,   LV,   FV2,  NON,  AD2,   /* 224 - 231 */
-    TONE, TONE, TONE, TONE, AD1,  AD1,  AD3,  NON,   /* 232 - 239 */
-    NON,  NON,  NON,  NON,  NON,  NON,  NON,  NON,   /* 240 - 247 */
-    NON,  NON,  NON,  NON,  NON,  NON,  NON,  CTRL   /* 248 - 255 */
-};
-
-/* Composibility checking tables */
-#define NC  0   /* NOT COMPOSIBLE - following char displays in next cell */
-#define CP  1   /* COMPOSIBLE - following char is displayed in the same cell
-                                as leading char, also implies ACCEPT */
-#define XC  3   /* Non-display */
-#define AC  4   /* ACCEPT - display the following char in the next cell */
-#define RJ  5   /* REJECT - discard that following char, ignore it */
-
-#define CH_CLASSES      17  /* 17 classes of chars */
-
-Private
-char write_rules_lookup[CH_CLASSES][CH_CLASSES] = {
-        /* Table 0: writing/outputing rules */
-        /* row: leading char,  column: following char */
-/* CTRL NON CONS LV FV1 FV2 FV3 BV1 BV2 BD TONE AD1 AD2 AD3 AV1 AV2 AV3 */
-   {XC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC}/*CTRL*/
-  ,{XC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC}/*NON*/
-  ,{XC, NC, NC, NC, NC, NC, NC, CP, CP, CP, CP, CP, CP, CP, CP, CP, CP}/*CONS*/
-  ,{XC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC}/*LV*/
-  ,{XC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC}/*FV1*/
-  ,{XC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC}/*FV2*/
-  ,{XC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC}/*FV3*/
-  ,{XC, NC, NC, NC, NC, NC, NC, NC, NC, NC, CP, CP, NC, NC, NC, NC, NC}/*BV1*/
-  ,{XC, NC, NC, NC, NC, NC, NC, NC, NC, NC, CP, NC, NC, NC, NC, NC, NC}/*BV2*/
-  ,{XC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC}/*BD*/
-  ,{XC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC}/*TONE*/
-  ,{XC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC}/*AD1*/
-  ,{XC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC}/*AD2*/
-  ,{XC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC, NC}/*AD3*/
-  ,{XC, NC, NC, NC, NC, NC, NC, NC, NC, NC, CP, CP, NC, NC, NC, NC, NC}/*AV1*/
-  ,{XC, NC, NC, NC, NC, NC, NC, NC, NC, NC, CP, NC, NC, NC, NC, NC, NC}/*AV2*/
-  ,{XC, NC, NC, NC, NC, NC, NC, NC, NC, NC, CP, NC, CP, NC, NC, NC, NC}/*AV3*/
-};
-
-Private
-char wtt_isc1_lookup[CH_CLASSES][CH_CLASSES] = {
-      /* Table 1: WTT default input sequence check rules */
-      /* row: leading char,  column: following char */
-/* CTRL NON CONS LV FV1 FV2 FV3 BV1 BV2 BD TONE AD1 AD2 AD3 AV1 AV2 AV3 */
-   {XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*CTRL*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*NON*/
-  ,{XC, AC, AC, AC, AC, AC, AC, CP, CP, CP, CP, CP, CP, CP, CP, CP, CP}/*CONS*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*LV*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*FV1*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*FV2*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*FV3*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, CP, CP, RJ, RJ, RJ, RJ, RJ}/*BV1*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, CP, RJ, RJ, RJ, RJ, RJ, RJ}/*BV2*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*BD*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*TONE*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*AD1*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*AD2*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*AD3*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, CP, CP, RJ, RJ, RJ, RJ, RJ}/*AV1*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, CP, RJ, RJ, RJ, RJ, RJ, RJ}/*AV2*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, CP, RJ, CP, RJ, RJ, RJ, RJ}/*AV3*/
-};
-
-Private
-char wtt_isc2_lookup[CH_CLASSES][CH_CLASSES] = {
-      /* Table 2: WTT strict input sequence check rules */
-      /* row: leading char,  column: following char */
-/* CTRL NON CONS LV FV1 FV2 FV3 BV1 BV2 BD TONE AD1 AD2 AD3 AV1 AV2 AV3 */
-   {XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*CTRL*/
-  ,{XC, AC, AC, AC, RJ, RJ, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*NON*/
-  ,{XC, AC, AC, AC, AC, RJ, AC, CP, CP, CP, CP, CP, CP, CP, CP, CP, CP}/*CONS*/
-  ,{XC, RJ, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*LV*/
-  ,{XC, AC, AC, AC, AC, RJ, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*FV1*/
-  ,{XC, AC, AC, AC, AC, RJ, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*FV2*/
-  ,{XC, AC, AC, AC, RJ, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*FV3*/
-  ,{XC, AC, AC, AC, AC, RJ, AC, RJ, RJ, RJ, CP, CP, RJ, RJ, RJ, RJ, RJ}/*BV1*/
-  ,{XC, AC, AC, AC, RJ, RJ, AC, RJ, RJ, RJ, CP, RJ, RJ, RJ, RJ, RJ, RJ}/*BV2*/
-  ,{XC, AC, AC, AC, RJ, RJ, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*BD*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*TONE*/
-  ,{XC, AC, AC, AC, RJ, RJ, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*AD1*/
-  ,{XC, AC, AC, AC, RJ, RJ, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*AD2*/
-  ,{XC, AC, AC, AC, RJ, RJ, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*AD3*/
-  ,{XC, AC, AC, AC, RJ, RJ, AC, RJ, RJ, RJ, CP, CP, RJ, RJ, RJ, RJ, RJ}/*AV1*/
-  ,{XC, AC, AC, AC, RJ, RJ, AC, RJ, RJ, RJ, CP, RJ, RJ, RJ, RJ, RJ, RJ}/*AV2*/
-  ,{XC, AC, AC, AC, RJ, RJ, AC, RJ, RJ, RJ, CP, RJ, CP, RJ, RJ, RJ, RJ}/*AV3*/
-};
-
-Private
-char thaicat_isc_lookup[CH_CLASSES][CH_CLASSES] = {
-      /* Table 3: Thaicat input sequence check rules */
-      /* row: leading char,  column: following char */
-/* CTRL NON CONS LV FV1 FV2 FV3 BV1 BV2 BD TONE AD1 AD2 AD3 AV1 AV2 AV3 */
-   {XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*CTRL*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*NON*/
-  ,{XC, AC, AC, AC, AC, AC, AC, CP, CP, CP, CP, CP, CP, CP, CP, CP, CP}/*CONS*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*LV*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*FV1*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*FV2*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ} /*FV3*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, CP, CP, RJ, RJ, RJ, RJ, RJ}/*BV1*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, CP, RJ, RJ, RJ, RJ, RJ, RJ}/*BV2*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*BD*/
-  ,{XC, AC, AC, AC, AC, AC, AC, CP, CP, RJ, RJ, RJ, RJ, RJ, CP, CP, CP}/*TONE*/
-  ,{XC, AC, AC, AC, AC, AC, AC, CP, RJ, RJ, RJ, RJ, RJ, RJ, CP, RJ, RJ}/*AD1*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, CP}/*AD2*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ, RJ}/*AD3*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, CP, CP, RJ, RJ, RJ, RJ, RJ}/*AV1*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, CP, RJ, RJ, RJ, RJ, RJ, RJ}/*AV2*/
-  ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, CP, RJ, CP, RJ, RJ, RJ, RJ}/*AV3*/
-};
-
-
-/* returns classification of a char */
-Private int
-#if NeedFunctionPrototypes
-THAI_chtype (unsigned char	ch)
-#else
-THAI_chtype (ch)
-    unsigned char	ch;
-#endif
-{
-    return tactis_chtype[ch];
-}
-
-
-/* returns the display level */
-Private int
-#if NeedFunctionPrototypes
-THAI_chlevel (unsigned char	ch)
-#else
-THAI_chlevel (ch)
-    unsigned char	ch;
-#endif
-{
-    int     chlevel;
-
-    switch (tactis_chtype[ch])
-    {
-        case CTRL:
-            chlevel = NON;
-            break;
-        case BV1:
-        case BV2:
-        case BD:
-            chlevel = BELOW;
-            break;
-        case TONE:
-        case AD1:
-        case AD2:
-            chlevel = TOP;
-            break;
-        case AV1:
-        case AV2:
-        case AV3:
-        case AD3:
-            chlevel = ABOVE;
-            break;
-        case NON:
-        case CONS:
-        case LV:
-        case FV1:
-        case FV2:
-        case FV3:
-        default: /* if tactis_chtype is invalid */
-            chlevel = BASE;
-            break;
-    }
-    return chlevel;
-}
-
-
-/* return True if char is non-spacing */
-Private Bool
-#if NeedFunctionPrototypes
-THAI_isdead (unsigned char	ch)
-#else
-THAI_isdead (ch)
-    unsigned char	ch;
-#endif
-{
-    return ((tactis_chtype[ch] == CTRL) || (tactis_chtype[ch] == BV1) ||
-            (tactis_chtype[ch] == BV2)  || (tactis_chtype[ch] == BD)  ||
-            (tactis_chtype[ch] == TONE) || (tactis_chtype[ch] == AD1) ||
-            (tactis_chtype[ch] == AD2)  || (tactis_chtype[ch] == AD3) ||
-            (tactis_chtype[ch] == AV1)  || (tactis_chtype[ch] == AV2) ||
-            (tactis_chtype[ch] == AV3));
-}
-
-
-/* return True if char is consonant */
-Private Bool
-#if NeedFunctionPrototypes
-THAI_iscons (unsigned char	ch)
-#else
-THAI_iscons (ch)
-    unsigned char	ch;
-#endif
-{
-    return (tactis_chtype[ch] == CONS);
-}
-
-
-/* return True if char is vowel */
-Private Bool
-#if NeedFunctionPrototypes
-THAI_isvowel (unsigned char	ch)
-#else
-THAI_isvowel (ch)
-    unsigned char	ch;
-#endif
-{
-    return ((tactis_chtype[ch] == LV)  || (tactis_chtype[ch] == FV1) ||
-            (tactis_chtype[ch] == FV2) || (tactis_chtype[ch] == FV3) ||
-            (tactis_chtype[ch] == BV1) || (tactis_chtype[ch] == BV2) ||
-            (tactis_chtype[ch] == AV1) || (tactis_chtype[ch] == AV2) ||
-            (tactis_chtype[ch] == AV3));
-}
-
-
-/* return True if char is tonemark */
-Private Bool
-#if NeedFunctionPrototypes
-THAI_istone (unsigned char	ch)
-#else
-THAI_istone (ch)
-    unsigned char	ch;
-#endif
-{
-    return (tactis_chtype[ch] == TONE);
-}
-
-
-Private Bool
-#if NeedFunctionPrototypes
-THAI_iscomposible (
-    unsigned char	follow_ch, 
-    unsigned char	lead_ch)
-#else
-THAI_iscomposible (follow_ch, lead_ch)
-    unsigned char	follow_ch;
-    unsigned char	lead_ch;
-#endif
-{/* "Can follow_ch be put in the same display cell as lead_ch?" */
-
-    return (write_rules_lookup[THAI_chtype(lead_ch)][THAI_chtype(follow_ch)] 
-            == CP);
-}
-
-Private Bool
-#if NeedFunctionPrototypes
-THAI_isaccepted (
-    unsigned char	follow_ch, 
-    unsigned char	lead_ch,
-    unsigned char	mode)
-#else
-THAI_isaccepted (follow_ch, lead_ch, mode)
-    unsigned char	follow_ch;
-    unsigned char	lead_ch;
-    unsigned char	mode;
-#endif
-{
-    Bool iskeyvalid; /*  means "Can follow_ch be keyed in after lead_ch?" */
-
-    switch (mode)
-    {
-        case WTT_ISC1:
-            iskeyvalid = 
-          (wtt_isc1_lookup[THAI_chtype(lead_ch)][THAI_chtype(follow_ch)] != RJ);
-            break;
-        case WTT_ISC2:
-            iskeyvalid = 
-          (wtt_isc2_lookup[THAI_chtype(lead_ch)][THAI_chtype(follow_ch)] != RJ);
-            break;
-        case THAICAT_ISC:
-            iskeyvalid =
-       (thaicat_isc_lookup[THAI_chtype(lead_ch)][THAI_chtype(follow_ch)] != RJ);
-            break;
-        default:
-            iskeyvalid = True;
-            break;
-    }
-
-    return iskeyvalid;
-}
-
-Private void 
-#if NeedFunctionPrototypes
-THAI_apply_write_rules(
-    unsigned char	*instr, 
-    unsigned char	*outstr, 
-    unsigned char	insert_ch, 
-    int 		*num_insert_ch)
-#else
-THAI_apply_write_rules(instr, outstr, insert_ch, num_insert_ch)
-    unsigned char	*instr;
-    unsigned char	*outstr;
-    unsigned char	insert_ch;
-    int 		*num_insert_ch;
-#endif
-{
-/*
-Input parameters: 
-    instr - input string
-    insert_ch specify what char to be added when invalid composition is found
-Output parameters:
-    outstr - output string after input string has been applied the rules
-    num_insert_ch - number of insert_ch added to outstr.
-*/
-    unsigned char   *lead_ch = NULL, *follow_ch = NULL, *out_ch = NULL;
-
-    *num_insert_ch = 0;
-    lead_ch = follow_ch = instr;
-    out_ch = outstr;
-    if ((*lead_ch == '\0') || !(THAI_find_chtype(instr,DEAD)))
-    {   /* Empty string or can't find any non-spacing char*/
-        strcpy((char *)outstr, (char *)instr);
-    } else { /* String of length >= 1, keep looking */
-        follow_ch++;
-        if (THAI_isdead(*lead_ch)) { /* is first char non-spacing? */
-            *out_ch++ = SPACE;
-            (*num_insert_ch)++;
-        }
-        *out_ch++ = *lead_ch;
-        while (*follow_ch != '\0')  /* more char in string to check */
-        {
-            if (THAI_isdead(*follow_ch) && 
-                 !THAI_iscomposible(*follow_ch,*lead_ch)) 
-            {
-                *out_ch++ = SPACE;
-                (*num_insert_ch)++;
-            }
-            *out_ch++ = *follow_ch;
-            lead_ch = follow_ch;
-            follow_ch++;
-        }
-        *out_ch = '\0';
-    }
-}
-
-Private int 
-#if NeedFunctionPrototypes
-THAI_find_chtype (
-    unsigned char	*instr, 
-    int		chtype)
-#else
-THAI_find_chtype (instr, chtype)
-    unsigned char	*instr;
-    int		chtype;
-#endif
-{
-/*
-Input parameters:
-    instr - input string
-    chtype - type of character to look for
-Output parameters:
-    function returns first position of character with matched chtype
-    function returns -1 if it does not find.
-*/
-    int i = 0, position = -1;
-
-    switch (chtype)
-    {
-        case DEAD:
-            for (i = 0; *instr != '\0' && THAI_isdead(*instr); i++, instr++)
-		;
-            if (*instr != '\0') position = i; 
-            break;
-        default:
-            break;
-    }
-    return position;
-}
-
-
-Private int 
-#if NeedFunctionPrototypes
-THAI_apply_scm(
-    unsigned char	*instr, 
-    unsigned char	*outstr, 
-    unsigned char	spec_ch, 
-    int		num_sp, 
-    unsigned char	insert_ch)
-#else
-THAI_apply_scm(instr, outstr, spec_ch, num_sp, insert_ch)
-    unsigned char	*instr;
-    unsigned char	*outstr;
-    unsigned char	spec_ch;
-    int		num_sp;
-    unsigned char	insert_ch;
-#endif
-{
-    unsigned char   *scan, *outch;
-    int             i, dead_count, found_count;
-    Bool            isconsecutive;
-
-    scan = instr;
-    outch = outstr;
-    dead_count = found_count = 0;
-    isconsecutive = False;
-    while (*scan != '\0') {
-        if (THAI_isdead(*scan))
-            dead_count++;       /* count number of non-spacing char */
-        if (*scan == spec_ch)
-            if (!isconsecutive) 
-                found_count++;      /* count number consecutive spec char found */
-        *outch++ = *scan++;
-        if (found_count == num_sp) {
-            for (i = 0; i < dead_count; i++)
-                *outch++ = insert_ch;
-            dead_count = found_count = 0;
-        }
-    }
-    /* what to return? */
-    return 0; /* probably not right but better than returning garbage */
-}
-
-/* The following functions are copied from XKeyBind.c */
-
-Private void ComputeMaskFromKeytrans();
-Private int IsCancelComposeKey();
-Private void SetLed();
-Private CARD8 FindKeyCode();
-
-/* The following functions are specific to this module */ 
-
-Private int XThaiTranslateKey();
-Private int XThaiTranslateKeySym();
-
-Private KeySym HexIMNormalKey();
-Private KeySym HexIMFirstComposeKey();
-Private KeySym HexIMSecondComposeKey();
-Private KeySym HexIMComposeSequence();
-Private void InitIscMode();
-Private Bool ThaiComposeConvert();
-
-/*
- * Definitions
- */
-
-#define BellVolume 		0
-
-/*
- * Macros to save and recall last input character in XIC
- */
-#define IC_SavePreviousChar(ic,ch) \
-		*((ic)->private.local.context->mb) = (char) (ch)
-#define IC_GetPreviousChar(ic,ch) \
-		(ch) = (unsigned char) *((ic)->private.local.context->mb)
-/*
- * Input sequence check mode in XIC
- */
-#define IC_IscMode(ic)		((ic)->private.local.thai.input_mode)
-
-/*
- * Max. size of string handled by the two String Lookup functions.
- */
-#define STR_LKUP_BUF_SIZE	256
-
-/*
- * Size of buffer to contain previous locale name.
- */
-#define SAV_LOCALE_NAME_SIZE	256
-
-/*
- * Size of buffer to contain the IM modifier.
- */
-#define MAXTHAIIMMODLEN 20
-
-#define AllMods (ShiftMask|LockMask|ControlMask| \
-		 Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask)
-
-
-#define IsISOControlKey(ks) ((ks) >= XK_2 && (ks) <= XK_8)
-
-#define IsValidControlKey(ks)   (((((ks)>=XK_A && (ks)<=XK_asciitilde) || \
-                (ks)==XK_space || (ks)==XK_Delete) && \
-                ((ks)!=0)))
-
-#define COMPOSE_LED 2
-
-typedef KeySym (*StateProc)();
-
-/*
- * macros to classify XKeyEvent state field
- */
-
-#define IsShift(state) (((state) & ShiftMask) != 0)
-#define IsLock(state) (((state) & LockMask) != 0)
-#define IsControl(state) (((state) & ControlMask) != 0)
-#define IsMod1(state) (((state) & Mod1Mask) != 0)
-#define IsMod2(state) (((state) & Mod2Mask) != 0)
-#define IsMod3(state) (((state) & Mod3Mask) != 0)
-#define IsMod4(state) (((state) & Mod4Mask) != 0)
-#define IsMod5(state) (((state) & Mod5Mask) != 0)
-
-/*
- * key starts Thai compose sequence (Hex input method) if :
- */
-
-#define IsComposeKey(ks, event)  \
-	(( ks==XK_Alt_L && 	\
-	   IsControl((event)->state) &&	\
-	   !IsShift((event)->state))	\
-	 ? True : False)
-
-/*
- *  State handler to implement the Thai hex input method.
- */
-
-Private int nstate_handlers = 3;
-Private StateProc state_handler[] = {
-	HexIMNormalKey,
-	HexIMFirstComposeKey,
-	HexIMSecondComposeKey
-};
-
-/*
- *  Table for 'Thai Compose' character input.
- *  The current implementation uses latin-1 keysyms.
- */
-struct _XMapThaiKey {
-	KeySym from;
-	KeySym to;
-};
-
-Private struct _XMapThaiKey ThaiComposeTable[] = {
-	{ /* 0xa4 */ XK_currency,	/* 0xa5 */ XK_yen },
-	{ /* 0xa2 */ XK_cent,		/* 0xa3 */ XK_sterling },
-	{ /* 0xe6 */ XK_ae,		/* 0xef */ XK_idiaeresis },
-	{ /* 0xd3 */ XK_Oacute,		/* 0xee */ XK_icircumflex },
-	{ /* 0xb9 */ XK_onesuperior,	/* 0xfa */ XK_uacute },
-	{ /* 0xd2 */ XK_Ograve,		/* 0xe5 */ XK_aring },
-	{ /* 0xbc */ XK_onequarter,	/* 0xfb */ XK_ucircumflex },
-	{	     XK_VoidSymbol,		   XK_VoidSymbol }
-};
-
-struct _XKeytrans {
-	struct _XKeytrans *next;/* next on list */
-	char *string;		/* string to return when the time comes */
-	int len;		/* length of string (since NULL is legit)*/
-	KeySym key;		/* keysym rebound */
-	unsigned int state;	/* modifier state */
-	KeySym *modifiers;	/* modifier keysyms you want */
-	int mlen;		/* length of modifier list */
-};
-
-/* Convert keysym to 'Thai Compose' keysym */
-/* The current implementation use latin-1 keysyms */
-Private Bool
-ThaiComposeConvert(dpy, insym, outsym ,lower, upper)
-    Display *dpy;
-    KeySym insym;
-    KeySym *outsym,*lower,*upper;
-{
-    struct _XMapThaiKey *table_entry = ThaiComposeTable;
-
-    while (table_entry->from != XK_VoidSymbol) {
-	if (table_entry->from == insym) {
-	    *outsym = table_entry->to;
-	    *lower = *outsym;
-	    *upper = *outsym;
-	    return True;
-	}
-	table_entry++;
-    }
-    return False;
-}
-
-Private int
-XThaiTranslateKey(dpy, keycode, modifiers, modifiers_return, keysym_return,
-	      lsym_return, usym_return)
-    register Display *dpy;
-    KeyCode keycode;
-    register unsigned int modifiers;
-    unsigned int *modifiers_return;
-    KeySym *keysym_return,*lsym_return,*usym_return;
-{
-    int per;
-    register KeySym *syms;
-    KeySym sym = 0, lsym = 0, usym = 0;
-
-    if ((! dpy->keysyms) && (! _XKeyInitialize(dpy)))
-	return 0;
-    *modifiers_return = (ShiftMask|LockMask) | dpy->mode_switch;
-    if (((int)keycode < dpy->min_keycode) || ((int)keycode > dpy->max_keycode))
-    {
-	*keysym_return = NoSymbol;
-	return 1;
-    }
-    per = dpy->keysyms_per_keycode;
-    syms = &dpy->keysyms[(keycode - dpy->min_keycode) * per];
-    while ((per > 2) && (syms[per - 1] == NoSymbol))
-	per--;
-    if ((per > 2) && (modifiers & dpy->mode_switch)) {
-	syms += 2;
-	per -= 2;
-    }
-    if (!(modifiers & ShiftMask) &&
-	(!(modifiers & LockMask) || (dpy->lock_meaning == NoSymbol))) {
-	if ((per == 1) || (syms[1] == NoSymbol))
-	    XConvertCase(syms[0], keysym_return, &usym);
-	else {
-	    XConvertCase(syms[0], &lsym, &usym);
-	    *keysym_return = syms[0];
-	}
-    } else if (!(modifiers & LockMask) ||
-	       (dpy->lock_meaning != XK_Caps_Lock)) {
-	if ((per == 1) || ((usym = syms[1]) == NoSymbol))
-	    XConvertCase(syms[0], &lsym, &usym);
-	*keysym_return = usym;
-    } else {
-	if ((per == 1) || ((sym = syms[1]) == NoSymbol))
-	    sym = syms[0];
-	XConvertCase(sym, &lsym, &usym);
-	if (!(modifiers & ShiftMask) && (sym != syms[0]) &&
-	    ((sym != usym) || (lsym == usym)))
-	    XConvertCase(syms[0], &lsym, &usym);
-	*keysym_return = usym;
-    }
-    /*
-     * ThaiCat keyboard support :
-     * When the Shift and Thai keys are hold for some keys a 'Thai Compose'  
-     * character code is generated which is different from column 3 and
-     * 4 of the keymap. 
-     * Since we don't know whether ThaiCat keyboard or WTT keyboard is
-     * in use, the same mapping is done for all Thai input.
-     * We just arbitary choose to use column 3 keysyms as the indices of 
-     * this mapping.
-     * When the control key is also hold, this mapping has no effect.
-     */
-    if ((modifiers & Mod1Mask) &&
-	(modifiers & ShiftMask) &&
-	!(modifiers & ControlMask)) {
-	if (ThaiComposeConvert(dpy, syms[0], &sym, &lsym, &usym))
-	    *keysym_return = sym;
-    }
-
-    if (*keysym_return == XK_VoidSymbol)
-	*keysym_return = NoSymbol;
-    *lsym_return = lsym;
-    *usym_return = usym;
-    return 1;
-}
-
-/* 
- * XThaiTranslateKeySym
- *
- * Translate KeySym to TACTIS code output.
- * The current implementation uses ISO latin-1 keysym.
- * Should be changed to TACTIS keysyms when they are defined by the
- * standard.
- */
-Private int
-XThaiTranslateKeySym(dpy, symbol, lsym, usym, modifiers, buffer, nbytes)
-    Display *dpy;
-    register KeySym symbol, lsym, usym;
-    unsigned int modifiers;
-    unsigned char *buffer;
-    int nbytes;
-{
-    KeySym ckey;
-    register struct _XKeytrans *p; 
-    int length;
-    unsigned long hiBytes;
-    register unsigned char c;
-
-    /*
-     * initialize length = 1 ;
-     */
-    length = 1;
-
-    if (!symbol)
-	return 0;
-    /* see if symbol rebound, if so, return that string. */
-    for (p = dpy->key_bindings; p; p = p->next) {
-	if (((modifiers & AllMods) == p->state) && (symbol == p->key)) {
-	    length = p->len;
-	    if (length > nbytes) length = nbytes;
-	    memcpy (buffer, p->string, length);
-	    return length;
-	}
-    }
-    /* try to convert to TACTIS, handling control */
-    hiBytes = symbol >> 8;
-    if (!(nbytes &&
-	  ((hiBytes == 0) ||
-	   ((hiBytes == 0xFF) &&
-	    (((symbol >= XK_BackSpace) && (symbol <= XK_Clear)) ||
-	     (symbol == XK_Return) ||
-	     (symbol == XK_Escape) ||
-	     (symbol == XK_KP_Space) ||
-	     (symbol == XK_KP_Tab) ||
-	     (symbol == XK_KP_Enter) ||
-	     ((symbol >= XK_KP_Multiply) && (symbol <= XK_KP_9)) ||
-	     (symbol == XK_KP_Equal) ||
-             (symbol == XK_Scroll_Lock) ||
-#ifdef DXK_PRIVATE /* DEC private keysyms */
-             (symbol == DXK_Remove) ||
-#endif
-             (symbol == NoSymbol) ||
-	     (symbol == XK_Delete))))))
-	return 0;
-
-    /* if X keysym, convert to ascii by grabbing low 7 bits */
-    if (symbol == XK_KP_Space)
-	c = XK_space & 0x7F; /* patch encoding botch */
-/* not for Thai
-    else if (symbol == XK_hyphen)
-	c = XK_minus & 0xFF; */ /* map to equiv character */
-    else if (hiBytes == 0xFF)
-	c = symbol & 0x7F;
-    else
-	c = symbol & 0xFF;
-    /* only apply Control key if it makes sense, else ignore it */
-    if (modifiers & ControlMask) {
-    if (!(IsKeypadKey(lsym) || lsym==XK_Return || lsym==XK_Tab)) {
-        if (IsISOControlKey(lsym)) ckey = lsym;
-        else if (IsISOControlKey(usym)) ckey = usym;
-        else if (lsym == XK_question) ckey = lsym;
-        else if (usym == XK_question) ckey = usym;
-        else if (IsValidControlKey(lsym)) ckey = lsym;
-        else if (IsValidControlKey(usym)) ckey = usym;
-        else length = 0;
-
-        if (length != 0) {
-        if (ckey == XK_2) c = '\000';
-        else if (ckey >= XK_3 && ckey <= XK_7)
-            c = (char)(ckey-('3'-'\033'));
-        else if (ckey == XK_8) c = '\177';
-        else if (ckey == XK_Delete) c = '\030';
-        else if (ckey == XK_question) c = '\037';
-        else if (ckey == XK_quoteleft) c = '\036';  /* KLee 1/24/91 */
-        else c = (char)(ckey & 0x1f);
-        }
-    }
-    }
-    /*
-     *  ThaiCat has a key that generates two TACTIS codes D1 & E9.
-     *  It is represented by the latin-1 keysym XK_thorn (0xfe). 
-     *  If c is XK_thorn, this key is pressed and it is converted to  
-     *  0xd1 0xe9.
-     */
-    if (c == XK_thorn) {
-	buffer[0] = 0xd1;
-	buffer[1] = 0xe9;
-	buffer[2] = '\0';
-	return 2;
-    }
-    else {
-	/* Normal case */
-        buffer[0] = c;
-	buffer[1] = '\0';
-        return 1;
-    }
-}
-
-/*
- * given a KeySym, returns the first keycode containing it, if any.
- */
-Private CARD8
-FindKeyCode(dpy, code)
-    register Display *dpy;
-    register KeySym code;
-{
-
-    register KeySym *kmax = dpy->keysyms + 
-	(dpy->max_keycode - dpy->min_keycode + 1) * dpy->keysyms_per_keycode;
-    register KeySym *k = dpy->keysyms;
-    while (k < kmax) {
-	if (*k == code)
-	    return (((k - dpy->keysyms) / dpy->keysyms_per_keycode) +
-		    dpy->min_keycode);
-	k += 1;
-	}
-    return 0;
-}
-
-	
-/*
- * given a list of modifiers, computes the mask necessary for later matching.
- * This routine must lookup the key in the Keymap and then search to see
- * what modifier it is bound to, if any.  Sets the AnyModifier bit if it
- * can't map some keysym to a modifier.
- */
-Private void
-ComputeMaskFromKeytrans(dpy, p)
-    Display *dpy;
-    register struct _XKeytrans *p;
-{
-    register int i;
-    register CARD8 code;
-    register XModifierKeymap *m = dpy->modifiermap;
-
-    p->state = AnyModifier;
-    for (i = 0; i < p->mlen; i++) {
-	/* if not found, then not on current keyboard */
-	if ((code = FindKeyCode(dpy, p->modifiers[i])) == 0)
-		return;
-	/* code is now the keycode for the modifier you want */
-	{
-	    register int j = m->max_keypermod<<3;
-
-	    while ((--j >= 0) && (code != m->modifiermap[j]))
-		;
-	    if (j < 0)
-		return;
-	    p->state |= (1<<(j/m->max_keypermod));
-	}
-    }
-    p->state &= AllMods;
-}
-
-
-/************************************************************************
- *
- *
- * Compose handling routines - compose handlers 0,1,2
- * 
- * 
- ************************************************************************/
-
-#define NORMAL_KEY_STATE 0
-#define FIRST_COMPOSE_KEY_STATE 1
-#define SECOND_COMPOSE_KEY_STATE 2
-
-Private
-KeySym HexIMNormalKey (thai_part, symbol, event)
-    XicThaiPart *thai_part;
-    KeySym symbol;
-    XKeyEvent *event;
-
-{
-    if (IsComposeKey (symbol, event))	/* start compose sequence	*/
-	{
-	SetLed (event->display,COMPOSE_LED, LedModeOn);
-	thai_part->comp_state = FIRST_COMPOSE_KEY_STATE;
-	return NoSymbol;
-	}
-    return symbol;
-}
-
-
-Private
-KeySym HexIMFirstComposeKey (thai_part, symbol, event)	
-    XicThaiPart *thai_part;
-    KeySym symbol;
-    XKeyEvent *event;
-
-{
-    if (IsModifierKey (symbol)) return symbol; /* ignore shift etc. */
-    if (IsCancelComposeKey (&symbol, event))	/* cancel sequence */
-	{
-	SetLed (event->display,COMPOSE_LED, LedModeOff);
-	thai_part->comp_state = NORMAL_KEY_STATE;
-	return symbol;
-	}
-    if (IsComposeKey (symbol, event))		/* restart sequence ?? */
-	{
-	return NoSymbol;			/* no state change necessary */
-	}
-
-    thai_part->keysym = symbol;		/* save key pressed */
-    thai_part->comp_state = SECOND_COMPOSE_KEY_STATE;
-    return NoSymbol;
-}
-
-Private
-KeySym HexIMSecondComposeKey (thai_part, symbol, event)
-    XicThaiPart *thai_part;
-    KeySym symbol;
-    XKeyEvent *event;
-
-{
-    if (IsModifierKey (symbol)) return symbol;	/* ignore shift etc. */
-    if (IsComposeKey (symbol, event))		/* restart sequence ? */
-	{
-	thai_part->comp_state =FIRST_COMPOSE_KEY_STATE;
-	return NoSymbol;
-	}
-    SetLed (event->display,COMPOSE_LED, LedModeOff);
-    if (IsCancelComposeKey (&symbol, event))	/* cancel sequence ? */
-	{
-	thai_part->comp_state = NORMAL_KEY_STATE;
-	return symbol;
-	}
-
-    if ((symbol = HexIMComposeSequence (thai_part->keysym, symbol))
-								==NoSymbol)
-	{ /* invalid compose sequence */
-	XBell(event->display, BellVolume);
-	}
-    thai_part->comp_state = NORMAL_KEY_STATE; /* reset to normal state */
-    return symbol;
-}
-
-
-/*
- * Interprets two keysyms entered as hex digits and return the Thai keysym
- * correspond to the TACTIS code formed.
- * The current implementation of this routine returns ISO Latin Keysyms.
- */
-
-Private
-KeySym HexIMComposeSequence (ks1, ks2)
-
-KeySym ks1, ks2;
-{
-int	hi_digit;
-int	lo_digit;
-int	tactis_code;
-
-    if ((ks1 >= XK_0) && (ks1 <= XK_9))
-	hi_digit = ks1 - XK_0;
-    else if ((ks1 >= XK_A) && (ks1 <= XK_F))
-	hi_digit = ks1 - XK_A + 10;
-    else if ((ks1 >= XK_a) && (ks1 <= XK_f))
-	hi_digit = ks1 - XK_a + 10;
-    else	/* out of range */
-	return NoSymbol;
-	    
-    if ((ks2 >= XK_0) && (ks2 <= XK_9))
-	lo_digit = ks2 - XK_0;
-    else if ((ks2 >= XK_A) && (ks2 <= XK_F))
-	lo_digit = ks2 - XK_A + 10;
-    else if ((ks2 >= XK_a) && (ks2 <= XK_f))
-	lo_digit = ks2 - XK_a + 10;
-    else	/* out of range */
-	return NoSymbol;
-
-    tactis_code = hi_digit * 0x10 + lo_digit ;
-
-    return (KeySym)tactis_code;
-
-}
-
-/*
- * routine determines
- *	1) whether key event should cancel a compose sequence
- *	2) whether cancelling key event should be processed or ignored
- */
-
-Private
-int IsCancelComposeKey(symbol, event)
-    KeySym *symbol;
-    XKeyEvent *event;
-{
-    if (*symbol==XK_Delete && !IsControl(event->state) &&
-						!IsMod1(event->state)) {
-	*symbol=NoSymbol;  /* cancel compose sequence, and ignore key */
-	return True;
-    }
-    if (IsComposeKey(*symbol, event)) return False;
-    return (
-	IsControl (event->state) ||
-	IsMod1(event->state) ||
-	IsKeypadKey (*symbol) ||
-	IsFunctionKey (*symbol) ||
-	IsMiscFunctionKey (*symbol) ||
-#ifdef DXK_PRIVATE /* DEC private keysyms */
-	*symbol == DXK_Remove ||
-#endif
-	IsPFKey (*symbol) ||
-	IsCursorKey (*symbol) ||
-	(*symbol >= XK_Tab && *symbol < XK_Multi_key)
-		? True : False);	/* cancel compose sequence and pass */
-					/* cancelling key through	    */
-}
-
-
-/*
- *	set specified keyboard LED on or off
- */
-
-Private
-void SetLed (dpy, num, state)
-    Display *dpy;
-    int num;
-    int state;
-{
-    XKeyboardControl led_control;
-
-    led_control.led_mode = state;
-    led_control.led = num;
-    XChangeKeyboardControl (dpy, KBLed | KBLedMode,	&led_control);
-}
-
-
-/*
- * Initialize ISC mode from im modifier 
- */
-Private void InitIscMode(ic)
-Xic ic;
-{
-    Xim im;
-    char *im_modifier_name;
-
-    /* If already defined, just return */
-
-    if (IC_IscMode(ic)) return;
-
-    /* Get IM modifier */
-
-    im = (Xim) XIMOfIC((XIC)ic);
-    im_modifier_name = im->core.im_name;
-
-    /* Match with predefined value, default is Basic Check */
-
-    if (!strncmp(im_modifier_name,"BasicCheck",MAXTHAIIMMODLEN+1))
-	IC_IscMode(ic) = WTT_ISC1;
-    else if (!strncmp(im_modifier_name,"Strict",MAXTHAIIMMODLEN+1))
-	IC_IscMode(ic) = WTT_ISC2;
-    else if (!strncmp(im_modifier_name,"Thaicat",MAXTHAIIMMODLEN+1))
-	IC_IscMode(ic) = THAICAT_ISC;
-    else if (!strncmp(im_modifier_name,"Passthrough",MAXTHAIIMMODLEN+1))
-	IC_IscMode(ic) = NOISC;
-    else
-	IC_IscMode(ic) = WTT_ISC1;
-
-    return;
-}
-    
-/*
- * Filter function for TACTIS
- */
-Bool
-_XimThaiFilter(d, w, ev, client_data)
-Display		*d;
-Window		w;
-XEvent		*ev;
-XPointer	client_data;
-{
-    Xic		    ic = (Xic)client_data;
-    unsigned int    modifiers;
-    KeySym 	    symbol;
-    KeySym	    lsym,usym;
-    int 	    count;
-    int 	    isc_mode; /* Thai Input Sequence Check mode */
-    unsigned char   previous_char; /* Last inputted Thai char */
-    int		    state;
-    XicThaiPart     *thai_part;
-    char	    buf[10];
-    int	            i;
-
-    if ((ev->type != KeyPress)
-        || (ev->xkey.keycode == 0))
-        return False;
-
-    if (!IC_IscMode(ic)) InitIscMode(ic);
-
-    if (! XThaiTranslateKey(ev->xkey.display, ev->xkey.keycode, ev->xkey.state,
-	 		&modifiers, &symbol, &lsym, &usym))
-	return False;
-
-    /*
-     *  Hex input method processing 
-     */
-
-    thai_part = &ic->private.local.thai;
-    state = thai_part->comp_state;
-    if (state >= 0 && state < nstate_handlers) /* call handler for state */
-    {
-        symbol = (* state_handler[state])(thai_part, symbol, (XKeyEvent *)ev);
-    }
-
-    /*
-     *  Translate KeySym into mb.
-     */
-    count = XThaiTranslateKeySym(ev->xkey.display, symbol, lsym,
-				usym, ev->xkey.state, buf, 10);
-
-    if (!symbol && !count)
-	return True;
-
-    /* Return symbol if cannot convert to character */
-    if (!count)
-	return False;
-
-    /*
-     *  Thai Input sequence check
-     */
-    isc_mode = IC_IscMode(ic);
-    if ((IC_GetPreviousChar(ic, previous_char))) {
-	if (!THAI_isaccepted(buf[0],previous_char, isc_mode)) {
-	    /* reject character */
-            XBell(ev->xkey.display, BellVolume);
-    	    return True;
-        }
-    }
-    /* Remember the last character inputted. */
-    IC_SavePreviousChar(ic, buf[count-1]);
-    for (i=0; i<count; i++)
-        ic->private.local.composed->mb[i] = buf[i];
-    ic->private.local.composed->mb[count] = '\0';
-
-    i = _Xlcmbstowcs(ic->core.im->core.lcd, ic->private.local.composed->wc,
-			ic->private.local.composed->mb, count);
-    
-    if (!((buf[0] > 0 && buf[0] <= 0x1f) || (buf[0] == 0) || (buf[0] == 0x7f)))
-        ic->private.local.composed->keysym = NoSymbol;
-    else
-        ic->private.local.composed->keysym = symbol;
-    ev->xkey.keycode = 0;
-    XPutBackEvent(d, ev);
-    return True;
-}
diff --git a/xc/lib/X11/imThaiIc.c b/xc/lib/X11/imThaiIc.c
deleted file mode 100644
index b22b06089..000000000
--- a/xc/lib/X11/imThaiIc.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/* $XConsortium: imThaiIc.c /main/5 1996/10/22 14:24:50 kaleb $ */
-/******************************************************************
-
-          Copyright 1992, 1993, 1994 by FUJITSU LIMITED
-          Copyright 1993 by Digital Equipment Corporation
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of FUJITSU LIMITED and
-Digital Equipment Corporation not be used in advertising or publicity
-pertaining to distribution of the software without specific, written
-prior permission.  FUJITSU LIMITED and Digital Equipment Corporation
-makes no representations about the suitability of this software for
-any purpose.  It is provided "as is" without express or implied
-warranty.
-
-FUJITSU LIMITED AND DIGITAL EQUIPMENT CORPORATION DISCLAIM ALL 
-WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
-FUJITSU LIMITED AND DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR 
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER 
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, 
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF 
-THIS SOFTWARE.
-
-  Author:    Takashi Fujiwara     FUJITSU LIMITED 
-                               	  fujiwara@a80.tech.yk.fujitsu.co.jp
-  Modifier:  Franky Ling          Digital Equipment Corporation
-	                          frankyling@hgrd01.enet.dec.com
-
-******************************************************************/
-
-#include <stdio.h>
-#include <X11/Xlib.h>
-#include <X11/Xmd.h>
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "Ximint.h"
-
-Private void
-_XimThaiUnSetFocus(xic)
-    XIC	 xic;
-{
-    Xic  ic = (Xic)xic;
-    ((Xim)ic->core.im)->private.local.current_ic = (XIC)NULL;
-
-    if (ic->core.focus_window)
-	_XUnregisterFilter(ic->core.im->core.display, ic->core.focus_window,
-			_XimThaiFilter, (XPointer)ic);
-    return;
-}
-
-Private void
-_XimThaiDestroyIC(xic)
-    XIC	 xic;
-{
-    Xic	 ic = (Xic)xic;
-    if(((Xim)ic->core.im)->private.local.current_ic == (XIC)ic) {
-	_XimThaiUnSetFocus(xic);
-    }
-    if(ic->private.local.ic_resources) {
-	Xfree(ic->private.local.ic_resources);
-	ic->private.local.ic_resources = NULL;
-    }
-
-    Xfree(ic->private.local.context->mb);
-    Xfree(ic->private.local.context->wc);
-    Xfree(ic->private.local.context);
-    Xfree(ic->private.local.composed->mb);
-    Xfree(ic->private.local.composed->wc);
-    Xfree(ic->private.local.composed);
-    return;
-}
-
-Private void
-_XimThaiSetFocus(xic)
-    XIC	 xic;
-{
-    Xic	 ic = (Xic)xic;
-    XIC	 current_ic = ((Xim)ic->core.im)->private.local.current_ic;
-
-    if (current_ic == (XIC)ic)
-	return;
-
-    if (current_ic != (XIC)NULL) {
-	_XimThaiUnSetFocus(current_ic);
-    }
-    ((Xim)ic->core.im)->private.local.current_ic = (XIC)ic;
-
-    if (ic->core.focus_window)
-	_XRegisterFilterByType(ic->core.im->core.display, ic->core.focus_window,
-			KeyPress, KeyPress, _XimThaiFilter, (XPointer)ic);
-    return;
-}
-
-Private char *
-_XimThaiMbReset(xic)
-    XIC	 xic;
-{
-    Xic	 ic = (Xic)xic;
-    ic->private.local.thai.comp_state = 0;
-    ic->private.local.thai.keysym = 0;
-    ic->private.local.composed->mb[0] = '\0';
-    ic->private.local.composed->wc[0] = 0;
-    return((char *)NULL);
-}
-
-Private wchar_t *
-_XimThaiWcReset(xic)
-    XIC	 xic;
-{
-    Xic	 ic = (Xic)xic;
-    ic->private.local.thai.comp_state = 0;
-    ic->private.local.thai.keysym = 0;
-    ic->private.local.composed->mb[0] = '\0';
-    ic->private.local.composed->wc[0] = 0;
-    return((wchar_t *)NULL);
-}
-
-Private XICMethodsRec Thai_ic_methods = {
-    _XimThaiDestroyIC, 	/* destroy */
-    _XimThaiSetFocus,  	/* set_focus */
-    _XimThaiUnSetFocus,	/* unset_focus */
-    _XimLocalSetICValues,	/* set_values */
-    _XimLocalGetICValues,	/* get_values */
-    _XimThaiMbReset,		/* mb_reset */
-    _XimThaiWcReset,		/* wc_reset */
-    _XimLocalMbLookupString,	/* mb_lookup_string */
-    _XimLocalWcLookupString,	/* wc_lookup_string */
-};
-
-XIC
-_XimThaiCreateIC(im, values)
-    XIM			 im;
-    XIMArg		*values;
-{
-    Xic			 ic;
-    XimDefICValues	 ic_values;
-    XIMResourceList	 res;
-    unsigned int	 num;
-    int			 len;
-
-    if((ic = (Xic)Xmalloc(sizeof(XicRec))) == (Xic)NULL) {
-	return ((XIC)NULL);
-    }
-    bzero((char *)ic,      sizeof(XicRec));
-
-    ic->methods = &Thai_ic_methods;
-    ic->core.im = im;
-    ic->core.filter_events = KeyPressMask;
-    if ((ic->private.local.context = (DefTree *)Xmalloc(sizeof(DefTree)))
-		== (DefTree *)NULL)
-	goto Set_Error;
-    if ((ic->private.local.context->mb = (char *)Xmalloc(10))
-		== (char *)NULL)
-	goto Set_Error;
-    if ((ic->private.local.context->wc = (wchar_t *)Xmalloc(10*sizeof(wchar_t)))
-		== (wchar_t *)NULL)
-	goto Set_Error;
-    if ((ic->private.local.composed = (DefTree *)Xmalloc(sizeof(DefTree)))
-	    == (DefTree *)NULL)
-	goto Set_Error;
-    if ((ic->private.local.composed->mb = (char *)Xmalloc(10))
-		== (char *)NULL)
-	goto Set_Error;
-    if ((ic->private.local.composed->wc = (wchar_t *)Xmalloc(10*sizeof(wchar_t)))
-		== (wchar_t *)NULL)
-	goto Set_Error;
-
-    ic->private.local.thai.comp_state = 0;
-    ic->private.local.thai.keysym = 0;
-    ic->private.local.thai.input_mode = 0;
-
-    num = im->core.ic_num_resources;
-    len = sizeof(XIMResource) * num;
-    if((res = (XIMResourceList)Xmalloc(len)) == (XIMResourceList)NULL) {
-	goto Set_Error;
-    }
-    (void)memcpy((char *)res, (char *)im->core.ic_resources, len);
-    ic->private.local.ic_resources     = res;
-    ic->private.local.ic_num_resources = num;
-
-    bzero((char *)&ic_values, sizeof(XimDefICValues));
-    if(_XimCheckLocalInputStyle(ic, (XPointer)&ic_values, values,
-				 im->core.styles, res, num) == False) {
-	goto Set_Error;
-    }
-
-    _XimSetICMode(res, num, ic_values.input_style);
-
-    if(_XimSetICValueData(ic, (XPointer)&ic_values,
-			ic->private.local.ic_resources,
-			ic->private.local.ic_num_resources,
-			values, XIM_CREATEIC, True)) {
-	goto Set_Error;
-    }
-    if(_XimSetICDefaults(ic, (XPointer)&ic_values,
-				XIM_SETICDEFAULTS, res, num) == False) {
-	goto Set_Error;
-    }
-    ic_values.filter_events = KeyPressMask;
-    _XimSetCurrentICValues(ic, &ic_values);
-
-    return ((XIC)ic);
-
-Set_Error :
-    if (ic->private.local.ic_resources) {
-	Xfree(ic->private.local.ic_resources);
-    }
-    Xfree(ic);
-    return((XIC)NULL);
-}
diff --git a/xc/lib/X11/imThaiIm.c b/xc/lib/X11/imThaiIm.c
deleted file mode 100644
index 28e5d470d..000000000
--- a/xc/lib/X11/imThaiIm.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/* $XConsortium: imThaiIm.c /main/5 1996/01/21 15:12:18 kaleb $ */
-/******************************************************************
-
-          Copyright 1992, 1993, 1994 by FUJITSU LIMITED
-          Copyright 1993 by Digital Equipment Corporation
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of FUJITSU LIMITED and
-Digital Equipment Corporation not be used in advertising or publicity
-pertaining to distribution of the software without specific, written
-prior permission.  FUJITSU LIMITED and Digital Equipment Corporation
-makes no representations about the suitability of this software for
-any purpose.  It is provided "as is" without express or implied
-warranty.
-
-FUJITSU LIMITED AND DIGITAL EQUIPMENT CORPORATION DISCLAIM ALL 
-WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
-FUJITSU LIMITED AND DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR 
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER 
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, 
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF 
-THIS SOFTWARE.
-
-  Author:    Takashi Fujiwara     FUJITSU LIMITED 
-                               	  fujiwara@a80.tech.yk.fujitsu.co.jp
-  Modifier:  Franky Ling          Digital Equipment Corporation
-	                          frankyling@hgrd01.enet.dec.com
-
-******************************************************************/
-
-#include <stdio.h>
-#include <X11/Xlib.h>
-#include <X11/Xmd.h>
-#include <X11/Xatom.h>
-#include <X11/Xos.h>
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "XlcPublic.h"
-#include "Ximint.h"
-
-Private XIMMethodsRec      Xim_im_thai_methods = {
-    _XimThaiCloseIM,           /* close */
-    _XimLocalSetIMValues,      /* set_values */
-    _XimLocalGetIMValues,      /* get_values */
-    _XimThaiCreateIC,          /* create_ic */
-    _XimLcctstombs,            /* ctstombs */
-    _XimLcctstowcs             /* ctstowcs */
-};
-
-#define THAI_LANGUAGE_NAME 	"th"
-
-Bool
-_XimCheckIfThaiProcessing(im)
-    Xim          im;
-{
-    char *language;
-
-    _XGetLCValues(im->core.lcd, XlcNLanguage, &language, NULL);
-    if(strcmp(language, THAI_LANGUAGE_NAME) == 0) {
-	return(True);
-    }
-    return(False);
-}
-
-Public Bool
-_XimThaiOpenIM(im)
-    Xim		 im;
-{
-    XLCd		 lcd = im->core.lcd;
-    XlcConv		 ctom_conv;
-    XlcConv		 ctow_conv;
-    XimDefIMValues	 im_values;
-
-    _XimInitialResourceInfo();
-    if(_XimSetIMResourceList(&im->core.im_resources,
-		 		&im->core.im_num_resources) == False) {
-	goto Open_Error;
-    }
-    if(_XimSetICResourceList(&im->core.ic_resources,
-				&im->core.ic_num_resources) == False) {
-	goto Open_Error;
-    }
-
-    _XimSetIMMode(im->core.im_resources, im->core.im_num_resources);
-
-    _XimGetCurrentIMValues(im, &im_values);
-    if(_XimSetLocalIMDefaults(im, (XPointer)&im_values,
-		im->core.im_resources, im->core.im_num_resources) == False) {
-	goto Open_Error;
-    }
-    _XimSetCurrentIMValues(im, &im_values);
-
-    if (!(ctom_conv = _XlcOpenConverter(lcd,
-					XlcNCompoundText, lcd, XlcNMultiByte)))
-	goto Open_Error;
-    if (!(ctow_conv = _XlcOpenConverter(lcd,
-					XlcNCompoundText, lcd, XlcNWideChar)))
-	goto Open_Error;
-
-    im->methods = &Xim_im_thai_methods;
-    im->private.local.current_ic = (XIC)NULL;
-    im->private.local.ctom_conv = ctom_conv;
-    im->private.local.ctow_conv = ctow_conv;
-
-    return(True);
-
-Open_Error :
-    if (im->core.im_resources) {
-	Xfree(im->core.im_resources);
-	im->core.im_resources = NULL;
-    }
-    if (im->core.ic_resources) {
-	Xfree(im->core.ic_resources);
-	im->core.ic_resources = NULL;
-    }
-    if (im->core.im_values_list) {
-	Xfree(im->core.im_values_list);
-	im->core.im_values_list = NULL;
-    }
-    if (im->core.ic_values_list) {
-	Xfree(im->core.ic_values_list);
-	im->core.ic_values_list = NULL;
-    }
-    if (im->core.styles) {
-	Xfree(im->core.styles);
-	im->core.styles = NULL;
-    }
-    if (im->private.local.ctom_conv) {
-	_XlcCloseConverter(im->private.local.ctom_conv);
-    }
-    if (im->private.local.ctow_conv) {
-	_XlcCloseConverter(im->private.local.ctow_conv);
-    }
-    return(False);
-}
-
-Public void
-_XimThaiIMFree(im)
-    Xim		im;
-{
-    if(im->core.im_resources) {
-	Xfree(im->core.im_resources);
-	im->core.im_resources = NULL;
-    }
-    if(im->core.ic_resources) {
-	Xfree(im->core.ic_resources);
-	im->core.ic_resources = NULL;
-    }
-    if(im->core.im_values_list) {
-	Xfree(im->core.im_values_list);
-	im->core.im_values_list = NULL;
-    }
-    if(im->core.ic_values_list) {
-	Xfree(im->core.ic_values_list);
-	im->core.ic_values_list = NULL;
-    }
-    if(im->core.styles) {
-	Xfree(im->core.styles);
-	im->core.styles = NULL;
-    }
-    if(im->core.res_name) {
-	Xfree(im->core.res_name);
-	im->core.res_name = NULL;
-    }
-    if(im->core.res_class) {
-	Xfree(im->core.res_class);
-	im->core.res_class = NULL;
-    }
-    if(im->core.im_name) {
-	Xfree(im->core.im_name);
-	im->core.im_name = NULL;
-    }
-    return;
-}
-
-Public Status
-_XimThaiCloseIM(xim)
-    XIM		xim;
-{
-    Xim		im = (Xim)xim;
-    XIC		ic;
-    XIC		next;
-
-    ic = im->core.ic_chain;
-    while (ic) {
-	(*ic->methods->destroy) (ic);
-	next = ic->core.next;
-	Xfree ((char *) ic);
-	ic = next;
-    }
-    _XimThaiIMFree(im);
-    return(True);
-}
diff --git a/xc/lib/X11/imTrX.c b/xc/lib/X11/imTrX.c
deleted file mode 100644
index c383f430e..000000000
--- a/xc/lib/X11/imTrX.c
+++ /dev/null
@@ -1,505 +0,0 @@
-/* $XConsortium: imTrX.c /main/8 1995/11/18 16:08:29 kaleb $ */
-/******************************************************************
-
-           Copyright 1992 by Sun Microsystems, Inc.
-           Copyright 1992, 1993, 1994 by FUJITSU LIMITED
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of Sun Microsystems, Inc.
-and FUJITSU LIMITED not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior permission.
-Sun Microsystems, Inc. and FUJITSU LIMITED makes no representations about
-the suitability of this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-Sun Microsystems Inc. AND FUJITSU LIMITED DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL Sun Microsystems, Inc. AND FUJITSU LIMITED
-BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-  Author: Hideki Hiura (hhiura@Sun.COM) Sun Microsystems, Inc.
-          Takashi Fujiwara     FUJITSU LIMITED 
-                               fujiwara@a80.tech.yk.fujitsu.co.jp
-
-******************************************************************/
-
-#include <string.h>
-#include <X11/Xatom.h>
-#define NEED_EVENTS
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "Ximint.h"
-#include "XimTrInt.h"
-#include "XimTrX.h"
-
-Private Bool
-_XimXRegisterDispatcher(im, callback, call_data)
-    Xim			 im;
-    Bool		 (*callback)(
-#if NeedNestedPrototypes
-				     Xim, INT16, XPointer, XPointer
-#endif
-				     );
-    XPointer		 call_data;
-{
-    XIntrCallbackPtr	 rec;
-    XSpecRec		*spec = (XSpecRec *)im->private.proto.spec;
-
-    if (!(rec = (XIntrCallbackPtr)Xmalloc(sizeof(XIntrCallbackRec))))
-        return False;
-
-    rec->func       = callback;
-    rec->call_data  = call_data;
-    rec->next       = spec->intr_cb;
-    spec->intr_cb   = rec;
-    return True;
-}
-
-Private void
-_XimXFreeIntrCallback(im)
-    Xim			 im;
-{
-    XSpecRec		*spec = (XSpecRec *)im->private.proto.spec;
-    register XIntrCallbackPtr rec, next;
-
-    for (rec = spec->intr_cb; rec;) {
-	next = rec->next;
-	Xfree(rec);
-	rec = next;
-    }
-    return;
-}
-
-Private Bool
-#if NeedFunctionPrototypes
-_XimXCallDispatcher(Xim im, INT16 len, XPointer data)
-#else
-_XimXCallDispatcher(im, len, data)
-    Xim			 	 im;
-    INT16			 len;
-    XPointer			 data;
-#endif
-{
-    register XIntrCallbackRec	*rec;
-    XSpecRec		*spec = (XSpecRec *)im->private.proto.spec;
-
-    for (rec = spec->intr_cb; rec; rec = rec->next) {
-	if ((*rec->func)(im, len, data, rec->call_data))
-	    return True;
-    }
-    return False;
-}
-
-Private Bool
-_XimXFilterWaitEvent(d, w, ev, arg)
-    Display	*d;
-    Window	 w;
-    XEvent	*ev;
-    XPointer	 arg;
-{
-    Xim		 im = (Xim)arg;
-    XSpecRec	*spec = (XSpecRec *)im->private.proto.spec;
-
-    spec->ev = (XPointer)ev;
-    return _XimFilterWaitEvent(im);
-}
-
-Private Bool
-_CheckConnect(display, event, xim)
-    Display	*display;
-    XEvent	*event;
-    XPointer	 xim;
-{
-    Xim		 im = (Xim)xim;
-    XSpecRec	*spec = (XSpecRec *)im->private.proto.spec;
-
-    if ((event->type == ClientMessage)
-     && (event->xclient.message_type == spec->imconnectid)) {
-	return True;
-    }
-    return False;
-}
-
-Private Bool
-#if NeedFunctionPrototypes
-_XimXConnect(Xim im)
-#else
-_XimXConnect(im)
-    Xim im;
-#endif
-{
-    XEvent	 event;
-    XSpecRec	*spec = (XSpecRec *)im->private.proto.spec;
-    CARD32	 major_code;
-    CARD32	 minor_code;
-
-    if (!(spec->lib_connect_wid = XCreateSimpleWindow(im->core.display,
-		DefaultRootWindow(im->core.display), 0, 0, 1, 1, 1, 0, 0))) {
-	return False;
-    }
-
-    event.xclient.type         = ClientMessage;
-    event.xclient.display      = im->core.display;
-    event.xclient.window       = im->private.proto.im_window;
-    event.xclient.message_type = spec->imconnectid;
-    event.xclient.format       = 32;
-    event.xclient.data.l[0]    = (CARD32)spec->lib_connect_wid;
-    event.xclient.data.l[1]    = spec->major_code;
-    event.xclient.data.l[2]    = spec->minor_code;
-
-    if(event.xclient.data.l[1] == 1 || event.xclient.data.l[1] == 2) {
-	XWindowAttributes	 atr;
-	long			 event_mask;
-
-	XGetWindowAttributes(im->core.display, spec->lib_connect_wid, &atr);
-	event_mask = atr.your_event_mask | PropertyChangeMask;
-	XSelectInput(im->core.display, spec->lib_connect_wid, event_mask);
-	_XRegisterFilterByType(im->core.display, spec->lib_connect_wid,
-			PropertyNotify, PropertyNotify,
-			 _XimXFilterWaitEvent, (XPointer)im);
-    }
-
-    XSendEvent(im->core.display, im->private.proto.im_window,
-		 False, NoEventMask, &event);
-    XFlush(im->core.display);
-
-    for (;;) {
-	XIfEvent(im->core.display, &event, _CheckConnect, (XPointer)im);
-	if (event.xclient.type != ClientMessage) {
-	    return False;
-	}
-	if (event.xclient.message_type == spec->imconnectid)
-	    break;
-    }
-
-    spec->ims_connect_wid = (Window)event.xclient.data.l[0];
-    major_code = (CARD32)event.xclient.data.l[1];
-    minor_code = (CARD32)event.xclient.data.l[2];
-
-    if (((major_code == 0) && (minor_code <= 2)) ||
-	((major_code == 1) && (minor_code == 0)) ||
-	((major_code == 2) && (minor_code <= 1))) {
-	spec->major_code = major_code;
-	spec->minor_code = minor_code;
-    }
-    if (((major_code == 0) && (minor_code == 2)) ||
-	((major_code == 2) && (minor_code == 1))) {
-	spec->BoundarySize = (CARD32)event.xclient.data.l[3];
-    }
-	
-    /* ClientMessage Event Filter */
-    _XRegisterFilterByType(im->core.display, spec->lib_connect_wid,
-			ClientMessage, ClientMessage,
-			 _XimXFilterWaitEvent, (XPointer)im);
-    return True;
-}
-
-Private Bool
-#if NeedFunctionPrototypes
-_XimXShutdown(Xim im)
-#else
-_XimXShutdown(im)
-    Xim		 im;
-#endif
-{
-    XSpecRec	*spec = (XSpecRec *)im->private.proto.spec;
-
-    if (!spec)
-	return True;
-
-    /* ClientMessage Event Filter */
-    _XUnregisterFilter(im->core.display,
-	    ((XSpecRec *)im->private.proto.spec)->lib_connect_wid,
-	    _XimXFilterWaitEvent, (XPointer)im);
-    XDestroyWindow(im->core.display,
-	    ((XSpecRec *)im->private.proto.spec)->lib_connect_wid);
-    _XimXFreeIntrCallback(im);
-    Xfree(spec);
-    im->private.proto.spec = 0;
-    return True;
-}
-
-Private char *
-_NewAtom(atomName)
-    char	*atomName;
-{
-    static int	 sequence = 0;
-
-    (void)sprintf(atomName, "_client%d", sequence);
-    sequence = ((sequence < 20) ? sequence + 1 : 0);
-    return atomName;
-}
-
-Private Bool
-#if NeedFunctionPrototypes
-_XimXWrite(Xim im, INT16 len, XPointer data)    
-#else
-_XimXWrite(im, len, data)    
-    Xim		 im;
-    INT16	 len;
-    XPointer	 data;
-#endif
-{
-    Atom	 atom;
-    char	 atomName[16];
-    XSpecRec	*spec = (XSpecRec *)im->private.proto.spec;
-    XEvent	 event;
-    CARD8	*p;
-    CARD32	 major_code = spec->major_code;
-    CARD32	 minor_code = spec->minor_code;
-    int		 BoundSize;
-
-    bzero(&event,sizeof(XEvent));
-    event.xclient.type         = ClientMessage;
-    event.xclient.display      = im->core.display;
-    event.xclient.window       = spec->ims_connect_wid;
-    if(major_code == 1 && minor_code == 0) {
-        BoundSize = 0;
-    } else if((major_code == 0 && minor_code == 2) ||
-              (major_code == 2 && minor_code == 1)) {
-        BoundSize = spec->BoundarySize;
-    } else if(major_code == 0 && minor_code == 1) {
-        BoundSize = len;
-    } else {
-        BoundSize = XIM_CM_DATA_SIZE;
-    }
-    if (len > BoundSize) {
-	event.xclient.message_type = spec->improtocolid;
-	atom = XInternAtom(im->core.display, _NewAtom(atomName), False);
-	XChangeProperty(im->core.display, spec->ims_connect_wid,
-			atom, XA_STRING, 8, PropModeAppend,
-			(unsigned char *)data, len);
-	if(major_code == 0) {
-	    event.xclient.format = 32;
-	    event.xclient.data.l[0] = (long)len;
-	    event.xclient.data.l[1] = (long)atom;
-	    XSendEvent(im->core.display, spec->ims_connect_wid,
-					False, NoEventMask, &event);
-	}
-    } else {
-	int		 length;
-
-	event.xclient.format = 8;
-	for(length = 0 ; length < len ; length += XIM_CM_DATA_SIZE) {
-	    p = (CARD8 *)&event.xclient.data.b[0];
-	    if((length + XIM_CM_DATA_SIZE) >= len) {
-		event.xclient.message_type = spec->improtocolid;
-		bzero(p, XIM_CM_DATA_SIZE);
-		memcpy((char *)p, (data + length), (len - length));
-	    } else {
-		event.xclient.message_type = spec->immoredataid;
-		memcpy((char *)p, (data + length), XIM_CM_DATA_SIZE);
-	    }
-	    XSendEvent(im->core.display, spec->ims_connect_wid,
-					False, NoEventMask, &event);
-	}
-    }
-
-    return True;
-}
-
-Private Bool
-_XimXGetReadData(im, buf, buf_len, ret_len, event)
-    Xim			  im;
-    char		 *buf;
-    int			  buf_len;
-    int			 *ret_len;
-    XEvent		 *event;
-{
-    char		 *data;
-    int			  len;
-
-    char		  tmp_buf[XIM_CM_DATA_SIZE];
-    XSpecRec		 *spec = (XSpecRec *)im->private.proto.spec;
-    unsigned long	  length;
-    Atom		  prop;
-    int			  return_code;
-    Atom		  type_ret;
-    int			  format_ret;
-    unsigned long	  nitems;
-    unsigned long	  bytes_after_ret;
-    unsigned char	 *prop_ret;
-
-    if ((event->type == ClientMessage) && (event->xclient.format == 8)) {
-	data = event->xclient.data.b;
-	if (buf_len >= XIM_CM_DATA_SIZE) {
-	    (void)memcpy(buf, data, XIM_CM_DATA_SIZE);
-	    *ret_len = XIM_CM_DATA_SIZE;
-	} else {
-	    (void)memcpy(buf, data, buf_len);
-	    len = XIM_CM_DATA_SIZE - buf_len;
-	    (void)memcpy(tmp_buf, &data[buf_len], len);
-	    bzero(data, XIM_CM_DATA_SIZE);
-	    (void)memcpy(data, tmp_buf, len);
-	    XPutBackEvent(im->core.display, event);
-	    *ret_len = buf_len;
-	}
-    } else if ((event->type == ClientMessage)
-				&& (event->xclient.format == 32)) {
-	length = (unsigned long)event->xclient.data.l[0];
-	prop   = (Atom)event->xclient.data.l[1];
-	return_code = XGetWindowProperty(im->core.display,
-		spec->lib_connect_wid, prop, 0L,
-		(long)((length + 3)/ 4), True, AnyPropertyType,
-		&type_ret, &format_ret, &nitems, &bytes_after_ret, &prop_ret);
-	if (return_code != Success || format_ret == 0 || nitems == 0) {
-	    if (return_code == Success)
-		XFree(prop_ret);
-	    return False;
-	}
-	if (buf_len >= length) {
-	    (void)memcpy(buf, prop_ret, (int)nitems);
-	    *ret_len  = (int)nitems;
-	    if (bytes_after_ret > 0) {
-	        XGetWindowProperty(im->core.display,
-		    spec->lib_connect_wid, prop, 0L,
-		    ((length + bytes_after_ret + 3)/ 4), True, AnyPropertyType,
-		    &type_ret, &format_ret, &nitems, &bytes_after_ret,
-		    &prop_ret);
-	        XChangeProperty(im->core.display, spec->lib_connect_wid, prop,
-		    XA_STRING, 8, PropModePrepend, &prop_ret[length],
-		    (nitems - length)); 
-	    }
-	} else {
-	    (void)memcpy(buf, prop_ret, buf_len);
-	    *ret_len  = buf_len;
-	    len = nitems - buf_len;
-
-	    if (bytes_after_ret > 0) {
-		XFree(prop_ret);
-	        XGetWindowProperty(im->core.display,
-		spec->lib_connect_wid, prop, 0L,
-		((length + bytes_after_ret + 3)/ 4), True, AnyPropertyType,
-		&type_ret, &format_ret, &nitems, &bytes_after_ret, &prop_ret);
-	    }
-	    XChangeProperty(im->core.display, spec->lib_connect_wid, prop,
-		    XA_STRING, 8, PropModePrepend, &prop_ret[buf_len], len); 
-	    event->xclient.data.l[0] = (long)len;
-	    event->xclient.data.l[1] = (long)prop;
-	    XPutBackEvent(im->core.display, event);
-	}
-	XFree(prop_ret);
-    } else if (event->type == PropertyNotify) {
-	prop = event->xproperty.atom;
-	return_code = XGetWindowProperty(im->core.display,
-		spec->lib_connect_wid, prop, 0L,
-		1000000L, True, AnyPropertyType,
-		&type_ret, &format_ret, &nitems, &bytes_after_ret, &prop_ret);
-	if (return_code != Success || format_ret == 0 || nitems == 0) {
-	    if (return_code == Success)
-		XFree(prop_ret);
-	    return False;
-	}
-	if (buf_len >= nitems) {
-	    (void)memcpy(buf, prop_ret, (int)nitems);
-	    *ret_len  = (int)nitems;
-	} else {
-	    (void)memcpy(buf, prop_ret, buf_len);
-	    *ret_len  = buf_len;
-	    len = nitems - buf_len;
-	    XChangeProperty(im->core.display, spec->lib_connect_wid, prop,
-		XA_STRING, 8, PropModePrepend, &prop_ret[buf_len], len); 
-	}
-	XFree(prop_ret);
-    }
-    return True;
-}
-
-Private Bool
-_CheckCMEvent(display, event, xim)
-    Display	*display;
-    XEvent	*event;
-    XPointer	 xim;
-{
-    Xim		 im = (Xim)xim;
-    XSpecRec	*spec = (XSpecRec *)im->private.proto.spec;
-    CARD32	 major_code = spec->major_code;
-
-    if ((event->type == ClientMessage)
-     &&((event->xclient.message_type == spec->improtocolid) ||
-        (event->xclient.message_type == spec->immoredataid)))
-	return True;
-    if((major_code == 1 || major_code == 2) &&
-       (event->type == PropertyNotify) &&
-       (event->xproperty.state == PropertyNewValue))
-	return True;
-    return False;
-}
-
-Private Bool
-#if NeedFunctionPrototypes
-_XimXRead(Xim im, XPointer recv_buf, int buf_len, int *ret_len)
-#else
-_XimXRead(im, recv_buf, buf_len, ret_len)
-    Xim		 im;
-    XPointer	 recv_buf;
-    int		 buf_len;
-    int		*ret_len;
-#endif
-{
-    XEvent	*ev;
-    XEvent	 event;
-    int		 len;
-    XSpecRec	*spec = (XSpecRec *)im->private.proto.spec;
-    XPointer	  arg = spec->ev;
-
-    if (!arg) {
-	bzero(&event, sizeof(XEvent));
-	ev = &event;
-	XIfEvent(im->core.display, ev, _CheckCMEvent, (XPointer)im);
-    } else {
-	ev = (XEvent *)arg;
-	spec->ev = (XPointer)NULL;
-    }
-    if (!(_XimXGetReadData(im, recv_buf, buf_len, &len, ev)))
-	return False;
-    *ret_len = len;
-    return True;
-}
-
-Private void
-#if NeedFunctionPrototypes
-_XimXFlush(Xim im)
-#else
-_XimXFlush(im)
-    Xim		 im;
-#endif
-{
-    XFlush(im->core.display);
-    return;
-}
-
-Public Bool
-_XimXConf(im, address)
-    Xim		 im;
-    char	*address;
-{
-    XSpecRec	*spec;
-
-    if (!(spec = (XSpecRec *)Xmalloc(sizeof(XSpecRec))))
-	return False;
-    bzero(spec, sizeof(XSpecRec));
-
-    spec->improtocolid = XInternAtom(im->core.display, _XIM_PROTOCOL, False);
-    spec->imconnectid  = XInternAtom(im->core.display, _XIM_XCONNECT, False);
-    spec->immoredataid = XInternAtom(im->core.display, _XIM_MOREDATA, False);
-    spec->major_code = MAJOR_TRANSPORT_VERSION;
-    spec->minor_code = MINOR_TRANSPORT_VERSION;
-
-    im->private.proto.spec     = (XPointer)spec;
-    im->private.proto.connect  = _XimXConnect;
-    im->private.proto.shutdown = _XimXShutdown;
-    im->private.proto.write    = _XimXWrite;
-    im->private.proto.read     = _XimXRead;
-    im->private.proto.flush    = _XimXFlush;
-    im->private.proto.register_dispatcher  = _XimXRegisterDispatcher;
-    im->private.proto.call_dispatcher = _XimXCallDispatcher;
-
-    return True;
-}
diff --git a/xc/lib/X11/imTrans.c b/xc/lib/X11/imTrans.c
deleted file mode 100644
index d0a1dae82..000000000
--- a/xc/lib/X11/imTrans.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/* $XConsortium: imTrans.c /main/7 1996/01/06 11:59:21 kaleb $ */
-/******************************************************************
-
-           Copyright 1992 by Sun Microsystems, Inc.
-           Copyright 1992, 1993, 1994 by FUJITSU LIMITED
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of Sun Microsystems, Inc.
-and FUJITSU LIMITED not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior permission.
-Sun Microsystems, Inc. and FUJITSU LIMITED makes no representations about
-the suitability of this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-Sun Microsystems Inc. AND FUJITSU LIMITED DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL Sun Microsystems, Inc. AND FUJITSU LIMITED
-BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-  Author: Hideki Hiura (hhiura@Sun.COM) Sun Microsystems, Inc.
-          Takashi Fujiwara     FUJITSU LIMITED 
-                               fujiwara@a80.tech.yk.fujitsu.co.jp
-
-******************************************************************/
-
-#include <stdio.h>
-#include <X11/Xatom.h>
-#include <X11/Xmd.h>
-#define NEED_EVENTS
-#include "Xlibint.h"
-#include <X11/Xtrans.h>
-#include "Xlcint.h"
-#include "Ximint.h"
-#include "XimTrans.h"
-
-
-#ifndef XIM_CONNECTION_RETRIES
-#define XIM_CONNECTION_RETRIES 5
-#endif
-
-
-Private Bool
-_XimTransConnect(im)
-    Xim			 im;
-{
-    TransSpecRec	*spec = (TransSpecRec *)im->private.proto.spec;
-    int			connect_stat, retry;
-    Window		window;
-
-    for (retry = XIM_CONNECTION_RETRIES; retry >= 0; retry--)
-    {
-	if ((spec->trans_conn = _XimXTransOpenCOTSClient (
-	    spec->address)) == NULL)
-	{
-	    break;
-	}
-
-	if ((connect_stat = _XimXTransConnect (
-	    spec->trans_conn, spec->address)) < 0)
-	{
-	    _XimXTransClose (spec->trans_conn);
-	    spec->trans_conn = NULL;
-
-	    if (connect_stat == TRANS_TRY_CONNECT_AGAIN)
-	    {
-		sleep(1);
-		continue;
-	    }
-	    else
-		break;
-	}
-	else
-	    break;
-    }
-
-    if (spec->trans_conn == NULL)
-	return False;
-
-    spec->fd = _XimXTransGetConnectionNumber (spec->trans_conn);
-
-    if (!(window = XCreateSimpleWindow(im->core.display,
-		DefaultRootWindow(im->core.display), 0, 0, 1, 1, 1, 0, 0)))
-	return False;
-    spec->window = window;
-
-    _XRegisterFilterByType(im->core.display, window, KeyPress, KeyPress,
-				_XimTransFilterWaitEvent, (XPointer)im);
-
-    return _XRegisterInternalConnection(im->core.display, spec->fd, 
-			(_XInternalConnectionProc)_XimTransInternalConnection, 
-			(XPointer)im);
-}
-
-
-Private Bool
-_XimTransShutdown(im)
-    Xim im;
-{
-    TransSpecRec *spec = (TransSpecRec *)im->private.proto.spec;
-
-    _XimXTransDisconnect(spec->trans_conn);
-    (void)_XimXTransClose(spec->trans_conn);
-    _XimFreeTransIntrCallback(im);
-    _XUnregisterInternalConnection(im->core.display, spec->fd);
-    _XUnregisterFilter(im->core.display, spec->window,
-				_XimTransFilterWaitEvent, (XPointer)im);
-    XDestroyWindow(im->core.display, spec->window);
-    Xfree(spec->address);
-    Xfree(spec);
-    return True;
-}
-
-
-
-Public Bool
-#if NeedFunctionPrototypes
-_XimTransRegisterDispatcher(
-    Xim				 im,
-    Bool			 (*callback)(
-#if NeedNestedPrototypes
-					     Xim, INT16, XPointer, XPointer
-#endif
-					     ),
-    XPointer			 call_data)
-#else
-_XimTransRegisterDispatcher(im, callback, call_data)
-    Xim				 im;
-    Bool			 (*callback)();
-    XPointer			 call_data;
-#endif
-{
-    TransSpecRec		*spec = (TransSpecRec *)im->private.proto.spec;
-    TransIntrCallbackPtr	 rec;
-
-    if (!(rec = (TransIntrCallbackPtr)Xmalloc(sizeof(TransIntrCallbackRec))))
-        return False;
-
-    rec->func       = callback;
-    rec->call_data  = call_data;
-    rec->next       = spec->intr_cb;
-    spec->intr_cb   = rec;
-    return True;
-}
-
-
-Public void
-_XimFreeTransIntrCallback(im)
-    Xim				 im;
-{
-    TransSpecRec		*spec = (TransSpecRec *)im->private.proto.spec;
-    register TransIntrCallbackPtr	 rec, next;
-
-    for (rec = spec->intr_cb; rec;) {
-	next = rec->next;
-	Xfree(rec);
-	rec = next;
-    }
-    return;
-}
-
-
-Public Bool
-#if NeedFunctionPrototypes
-_XimTransCallDispatcher(Xim im, INT16 len, XPointer data)
-#else
-_XimTransCallDispatcher(im, len, data)
-    Xim				 im;
-    INT16			 len;
-    XPointer			 data;
-#endif
-{
-    TransSpecRec		*spec = (TransSpecRec *)im->private.proto.spec;
-    TransIntrCallbackRec	*rec;
-
-    for (rec = spec->intr_cb; rec; rec = rec->next) {
-	if ((*rec->func)(im, len, data, rec->call_data))
-	    return True;
-    }
-    return False;
-}
-
-
-Public Bool
-_XimTransFilterWaitEvent(d, w, ev, arg)
-    Display		*d;
-    Window		 w;
-    XEvent		*ev;
-    XPointer		 arg;
-{
-    Xim			 im = (Xim)arg;
-    TransSpecRec	*spec = (TransSpecRec *)im->private.proto.spec;
-
-    spec->is_putback  = False;
-    return _XimFilterWaitEvent(im);
-}
-
-
-Public void
-_XimTransInternalConnection(d, fd, arg)
-    Display		*d;
-    int			 fd;
-    XPointer		 arg;
-{
-    Xim			 im = (Xim)arg;
-    XEvent		 ev;
-    XKeyEvent		*kev;
-    TransSpecRec	*spec = (TransSpecRec *)im->private.proto.spec;
-
-    if (spec->is_putback)
-	return;
-    kev = (XKeyEvent *)&ev;
-    kev->type = KeyPress;
-    kev->send_event = False;
-    kev->display = im->core.display;
-    kev->window = spec->window;
-    kev->keycode = 0;
-    XPutBackEvent(im->core.display, &ev);
-    XFlush(im->core.display);
-    spec->is_putback = True;
-    return;
-}
-
-
-Public Bool
-#if NeedFunctionPrototypes
-_XimTransWrite(Xim im, INT16 len, XPointer data)
-#else
-_XimTransWrite(im, len, data)
-    Xim			 im;
-    INT16		 len;
-    XPointer		 data;
-#endif
-{
-    TransSpecRec	*spec	= (TransSpecRec *)im->private.proto.spec;
-    char		*buf = (char *)data;
-    register int	 nbyte;
-
-    while (len > 0) {
-	if ((nbyte = _XimXTransWrite(spec->trans_conn, buf, len)) <= 0)
-	    return False;
-	len -= nbyte;
-	buf += nbyte;
-    }
-    return True;
-}
-
-
-Public Bool
-_XimTransRead(im, recv_buf, buf_len, ret_len)
-    Xim			 im;
-    XPointer		 recv_buf;
-    int			 buf_len;
-    int			*ret_len;
-{
-    TransSpecRec	*spec = (TransSpecRec *)im->private.proto.spec;
-    int			 len;
-
-    if (buf_len == 0) {
-	*ret_len = 0;
-	return True;
-    }
-    if ((len = _XimXTransRead(spec->trans_conn, recv_buf, buf_len)) <= 0)
-	return False;
-    *ret_len = len;
-    return True;
-}
-
-
-Public void
-_XimTransFlush(im)
-    Xim		 im;
-{
-    return;
-}
-
-
-
-Public Bool
-_XimTransConf(im, address)
-    Xim		   	 im;
-    char	 	*address;
-{
-    char		*paddr;
-    TransSpecRec	*spec;
-
-    if (!(paddr = (char *)Xmalloc(strlen(address) + 1)))
-	return False;
-
-    if (!(spec = (TransSpecRec *) Xmalloc(sizeof(TransSpecRec)))) {
-	Xfree(paddr);
-	return False;
-    }
-
-    bzero(spec, sizeof(TransSpecRec));
-
-    (void)strcpy(paddr, address);
-    spec->address   = paddr;
-
-    im->private.proto.spec     = (XPointer)spec;
-    im->private.proto.connect  = _XimTransConnect;
-    im->private.proto.shutdown = _XimTransShutdown;
-    im->private.proto.write    = _XimTransWrite;
-    im->private.proto.read     = _XimTransRead;
-    im->private.proto.flush    = _XimTransFlush;
-    im->private.proto.register_dispatcher = _XimTransRegisterDispatcher;
-    im->private.proto.call_dispatcher = _XimTransCallDispatcher;
-
-    return True;
-}
diff --git a/xc/lib/X11/imTransR.c b/xc/lib/X11/imTransR.c
deleted file mode 100644
index 7f7a94621..000000000
--- a/xc/lib/X11/imTransR.c
+++ /dev/null
@@ -1,312 +0,0 @@
-/* $XConsortium: imTransR.c /main/9 1995/12/06 11:23:40 kaleb $ */
-/******************************************************************
-
-              Copyright 1992 by Sun Microsystems, Inc.
-              Copyright 1992, 1993, 1994 by FUJITSU LIMITED
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of Sun Microsystems, Inc.
-and FUJITSU LIMITED not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior permission.
-Sun Microsystems, Inc. and FUJITSU LIMITED makes no representations about
-the suitability of this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-Sun Microsystems Inc. AND FUJITSU LIMITED DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL Sun Microsystems, Inc. AND FUJITSU LIMITED
-BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-  Author: Hideki Hiura (hhiura@Sun.COM) Sun Microsystems, Inc.
-          Takashi Fujiwara     FUJITSU LIMITED 
-                               fujiwara@a80.tech.yk.fujitsu.co.jp
-
-******************************************************************/
-/* $XFree86: xc/lib/X11/imTransR.c,v 3.3 1999/05/09 10:50:37 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "XimTrInt.h"
-#include "Ximint.h"
-
-Public TransportSW _XimTransportRec[] = {
-    { "X",          _XimXConf },  /* 1st entry must be X. 
-					This will be a fallback */
-#ifdef TCPCONN
-    { "tcp",        _XimTransConf }, /* use X transport lib */
-#endif /* TCPCONN */
-#if defined(UNIXCONN) || defined(LOCALCONN)
-    { "local",      _XimTransConf }, /* use X transport lib */
-#endif /* UNIXCONN */
-#ifdef DNETCONN
-    { "dnet",     _XimTransConf }, /* use X transport lib */
-#endif /* DNETCONN */
-#ifdef STREAMSCONN
-    { "streams",    _XimTransConf }, /* use X transport lib */
-#endif /* STREAMSCONN */
-    { (char *)NULL, (Bool (*)())NULL },
-};
-
-Public Bool
-_XimConnect(im)
-    Xim		 im;
-{
-    return im->private.proto.connect(im);
-}
-
-Public Bool
-_XimShutdown(im)
-    Xim		 im;
-{
-    return im->private.proto.shutdown(im);
-}
-
-Public Bool
-#if NeedFunctionPrototypes
-_XimWrite(Xim im, INT16 len, XPointer data)
-#else
-_XimWrite(im, len, data)
-    Xim		 im;
-    INT16	 len;
-    XPointer	 data;
-#endif
-{
-    return im->private.proto.write(im, len, data);
-}
-
-Private int
-_CheckProtocolData(im, recv_buf)
-    Xim		  im;
-    char	 *recv_buf;
-{
-    int		 data_len;
-
-    data_len = (int)(((*((CARD16 *)recv_buf + 1)) * 4) + XIM_HEADER_SIZE);
-    return data_len;
-}
-
-Private int
-_XimReadData(im, len, buf, buf_size)
-    Xim		 im;
-    INT16	*len;
-    XPointer	 buf;
-    int		 buf_size;
-{
-    char	*hold_buf;
-    char	*tmp;
-    int		 data_len;
-    int		 packet_size;
-    int		 ret_len;
-    register int i;
-
-    if (buf_size < XIM_HEADER_SIZE) {
-	*len = (INT16)XIM_HEADER_SIZE;
-	return XIM_OVERFLOW;
-    }
-
-    bzero(buf, buf_size);
-    packet_size = 0;
-    data_len = 0;
-
-    if ((hold_buf = im->private.proto.hold_data)) {
-	data_len = im->private.proto.hold_data_len;
-	if (data_len >= XIM_HEADER_SIZE) {
-	    packet_size = _CheckProtocolData(im, hold_buf);
-	    if (packet_size > buf_size) {
-		*len = (INT16)packet_size;
-		return XIM_OVERFLOW;
-	    }
-	    if (packet_size <= data_len) {
-		memcpy(buf, hold_buf, packet_size);
-		for (i = packet_size; i < data_len; i++) {
-		    if (hold_buf[i])
-			break;
-		}
-		data_len -= i;
-
-		if (data_len) {
-		    if (!(tmp = (char *)Xmalloc(data_len))) {
-			return XIM_FALSE;
-		    }
-		    memcpy(tmp, &hold_buf[i], data_len);
-		    im->private.proto.hold_data = tmp;
-		    im->private.proto.hold_data_len = data_len;
-		} else {
-		    im->private.proto.hold_data = 0;
-		    im->private.proto.hold_data_len = 0;
-		}
-		Xfree(hold_buf);
-		*len = (INT16)packet_size;
-		return XIM_TRUE;
-	    }
-	}
-	memcpy(buf, hold_buf, data_len);
-	buf_size -= data_len;
-	Xfree(hold_buf);
-	im->private.proto.hold_data = 0;
-	im->private.proto.hold_data_len = 0;
-    }
-
-    if (!packet_size) {
-	while (data_len < XIM_HEADER_SIZE) {
-	    if (!(im->private.proto.read(im,
-			(XPointer)&buf[data_len], buf_size, &ret_len))) {
-		return XIM_FALSE;
-	    }
-	    data_len += ret_len;
-	    buf_size -= ret_len;
-	}
-	packet_size = _CheckProtocolData(im, buf);
-    }
-
-    if (packet_size > buf_size) {
-	if (!(tmp = (char *)Xmalloc(data_len))) {
-	    return XIM_FALSE;
-	}
-	memcpy(tmp, buf, data_len);
-	bzero(buf, data_len);
-	im->private.proto.hold_data = tmp;
-	im->private.proto.hold_data_len = data_len;
-	*len = (INT16)packet_size;
-	return XIM_OVERFLOW;
-    }
-
-    while (data_len < packet_size) {
-	if (!(im->private.proto.read(im,
-			(XPointer)&buf[data_len], buf_size, &ret_len))) {
-	    return XIM_FALSE;
-	}
-	data_len += ret_len;
-	buf_size -= ret_len;
-    }
-
-    for (i = packet_size; i < data_len; i++) {
-	if (buf[i])
-	    break;
-    }
-    data_len -= i;
-
-    if (data_len) {
-	if (!(tmp = (char *)Xmalloc(data_len))) {
-	    return XIM_FALSE;
-	}
-	memcpy(tmp, &buf[i], data_len);
-	bzero(&buf[i], data_len);
-	im->private.proto.hold_data = tmp;
-	im->private.proto.hold_data_len = data_len;
-    } else {
-	im->private.proto.hold_data = 0;
-	im->private.proto.hold_data_len = 0;
-    }
-    *len = (INT16)packet_size;
-    return XIM_TRUE;
-}
-
-Private Bool
-_XimCallDispatcher(im, len, data)
-    Xim		 im;
-    INT16	 len;
-    XPointer	 data;
-{
-    return im->private.proto.call_dispatcher(im, len, data);
-}
-
-Public int
-_XimRead(im, len, buf, buf_size, predicate, arg)
-    Xim		 im;
-    INT16	*len;
-    XPointer	 buf;
-    int		 buf_size;
-    Bool	 (*predicate)(
-#if NeedNestedPrototypes
-			      Xim, INT16, XPointer, XPointer
-#endif
-			      );
-    XPointer	 arg;
-{
-    INT16	 read_len;
-    int		 ret_code;
-
-    for (;;) {
-	ret_code = _XimReadData(im, &read_len, buf, buf_size);
-	if(ret_code != XIM_TRUE) {
-	    return ret_code;
-	}
-	if ((*predicate)(im, read_len, buf, arg))
-	    break;
-	if (_XimCallDispatcher(im, read_len, buf))
-	    continue;
-	_XimError(im, 0, XIM_BadProtocol, (INT16)0, (CARD16)0, (char *)NULL);
-    }
-    *len = read_len;
-    return True;
-}
-
-Public Bool
-_XimRegisterDispatcher(im, callback, call_data)
-    Xim		 im;
-    Bool	 (*callback)(
-#if NeedNestedPrototypes
-			     Xim, INT16, XPointer, XPointer
-#endif
-			     );
-    XPointer	 call_data;
-{
-    return im->private.proto.register_dispatcher(im, callback, call_data);
-}
-
-Public void
-_XimFlush(im)
-    Xim		 im;
-{
-    im->private.proto.flush(im);
-    return;
-}
-
-Public Bool
-_XimFilterWaitEvent(im)
-    Xim		 im;
-{
-    INT16	 read_len;
-    CARD32	 reply32[BUFSIZE/4];
-    char	*reply = (char *)reply32;
-    XPointer	 preply;
-    int		 buf_size;
-    int		 ret_code;
-
-    buf_size = BUFSIZE;
-    ret_code = _XimReadData(im, &read_len, (XPointer)reply, buf_size);
-    if(ret_code == XIM_TRUE) {
-	preply = reply;
-    } else if(ret_code == XIM_OVERFLOW) {
-	if(read_len <= 0) {
-	    preply = reply;
-	} else {
-	    buf_size = (int)read_len;
-	    preply = (XPointer)Xmalloc(buf_size);
-	    ret_code = _XimReadData(im, &read_len, preply, buf_size);
-	    if(ret_code != XIM_TRUE) {
-		if (preply != reply)
-		    Xfree(preply);
-		return False;
-	    }
-	}
-    } else {
-	return False;
-    }
-    if (_XimCallDispatcher(im, read_len, preply)) {
-	if(reply != preply)
-	    Xfree(preply);
-	return True;
-    }
-    _XimError(im, 0, XIM_BadProtocol, (INT16)0, (CARD16)0, (char *)NULL);
-    if(reply != preply)
-	Xfree(preply);
-    return True;
-}
diff --git a/xc/lib/X11/jump_funcs b/xc/lib/X11/jump_funcs
deleted file mode 100644
index afae6fac5..000000000
--- a/xc/lib/X11/jump_funcs
+++ /dev/null
@@ -1,1463 +0,0 @@
-# $TOG: jump_funcs /main/8 1998/06/17 15:34:53 kaleb $
-# $XFree86: xc/lib/X11/jump_funcs,v 3.10 1998/10/03 08:41:36 dawes Exp $
-#
-00000000 T _XSaveContext        libX11         Context
-00000000 T _XFindContext        libX11         Context
-00000000 T _XDeleteContext      libX11         Context
-00000000 T _XListDepths         libX11         Depths
-00000000 T _XrmParseCommand     libX11         ParseCmd
-00000000 T _Xpermalloc          libX11         Quarks
-00000000 T __XrmInternalStringToQuark libX11         Quarks
-00000000 T _XrmStringToQuark    libX11         Quarks
-00000000 T _XrmPermStringToQuark libX11         Quarks
-00000000 T _XrmUniqueQuark      libX11         Quarks
-00000000 T _XrmQuarkToString    libX11         Quarks
-00000000 T _XAllocColorCells    libX11         XAllCells
-00000000 T _XAllocColorPlanes   libX11         XAllPlanes
-00000000 T _XAllowEvents        libX11         XAllowEv
-00000000 T _XAutoRepeatOn       libX11         XAutoRep
-00000000 T _XAutoRepeatOff      libX11         XAutoRep
-00000000 T _XSetWindowBackground libX11         XBackgnd
-00000000 T _XSetWindowBorderWidth libX11         XBdrWidth
-00000000 T _XBell               libX11         XBell
-00000000 T _XSetWindowBorder    libX11         XBorder
-00000000 T _XEnableAccessControl libX11         XChAccCon
-00000000 T _XDisableAccessControl libX11         XChAccCon
-00000000 T _XSetAccessControl   libX11         XChAccCon
-00000000 T _XSetCloseDownMode   libX11         XChClMode
-00000000 T _XChangeActivePointerGrab libX11         XChActPGb
-00000000 T _XSetWindowColormap  libX11         XChCmap
-00000000 T _XChangeGC           libX11         XChGC
-00000000 T _XChangeKeyboardControl libX11         XChKeyCon
-00000000 T _XChangePointerControl libX11         XChPntCon
-00000000 T _XChangeProperty     libX11         XChProp
-00000000 T _XChangeSaveSet      libX11         XChSaveSet
-00000000 T _XAddToSaveSet       libX11         XChSaveSet
-00000000 T _XRemoveFromSaveSet  libX11         XChSaveSet
-00000000 T _XChangeWindowAttributes libX11         XChWAttrs
-00000000 T _XResizeWindow       libX11         XChWindow
-00000000 T _XCheckIfEvent       libX11         XChkIfEv
-00000000 T _XCheckMaskEvent     libX11         XChkMaskEv
-00000000 T _XCheckWindowEvent   libX11         XChkWinEv
-00000000 T _XCheckTypedEvent    libX11         XChkTypEv
-00000000 T _XCheckTypedWindowEvent libX11         XChkTypWEv
-00000000 T _XCirculateSubwindows libX11         XCirWin
-00000000 T _XCirculateSubwindowsDown libX11         XCirWinDn
-00000000 T _XCirculateSubwindowsUp libX11         XCirWinUp
-00000000 T _XCloseDisplay       libX11         XClDisplay
-00000000 T _XClearWindow        libX11         XClear
-00000000 T _XClearArea          libX11         XClearArea
-00000000 T _XMoveResizeWindow   libX11         XConfWind
-00000000 T __XConnectDisplay    libX11         XConnDis
-00000000 T __XDisconnectDisplay libX11         XConnDis
-00000000 T __XSendClientPrefix  libX11         XConnDis
-00000000 T _XSetAuthorization   libX11         XConnDis
-00000000 T _XConvertSelection   libX11         XConvSel
-00000000 T _XCopyArea           libX11         XCopyArea
-00000000 T _XCopyColormapAndFree libX11         XCopyCmap
-00000000 T _XCopyGC             libX11         XCopyGC
-00000000 T _XCopyPlane          libX11         XCopyPlane
-00000000 T _XCreateBitmapFromData libX11         XCrBFData
-00000000 T _XCreateColormap     libX11         XCrCmap
-00000000 T _XCreatePixmapCursor libX11         XCrCursor
-00000000 T _XCreateGC           libX11         XCrGC
-00000000 T __XUpdateGCCache     libX11         XCrGC
-00000000 T __XFlushGCCache      libX11         XCrGC
-00000000 T _XFlushGC            libX11         XCrGC
-00000000 T _XGContextFromGC     libX11         XCrGC
-00000000 T _XCreateGlyphCursor  libX11         XCrGlCur
-00000000 T _XCreatePixmapFromBitmapData libX11         XCrPFBData
-00000000 T _XCreatePixmap       libX11         XCrPixmap
-00000000 T _XCreateSimpleWindow libX11         XCrWindow
-00000000 T _XCreateFontCursor   libX11         XCursor
-00000000 T _XDefineCursor       libX11         XDefCursor
-00000000 T _XDeleteProperty     libX11         XDelProp
-00000000 T _XDestroySubwindows  libX11         XDestSubs
-00000000 T _XDestroyWindow      libX11         XDestWind
-00000000 T _XDisplayName        libX11         XDisName
-00000000 T _XDrawArc            libX11         XDrArc
-00000000 T _XDrawArcs           libX11         XDrArcs
-00000000 T _XDrawLine           libX11         XDrLine
-00000000 T _XDrawLines          libX11         XDrLines
-00000000 T _XDrawPoint          libX11         XDrPoint
-00000000 T _XDrawPoints         libX11         XDrPoints
-00000000 T _XDrawRectangle      libX11         XDrRect
-00000000 T _XDrawRectangles     libX11         XDrRects
-00000000 T _XDrawSegments       libX11         XDrSegs
-00000000 T _XGetErrorText       libX11         XErrDes
-00000000 T _XGetErrorDatabaseText libX11         XErrDes
-00000000 T _XSetErrorHandler    libX11         XErrHndlr
-00000000 T _XSetIOErrorHandler  libX11         XErrHndlr
-00000000 T __XEventToWire       libX11         XEvToWire
-00000000 T _XFetchName          libX11         XFetchName
-00000000 T _XGetIconName        libX11         XFetchName
-00000000 T _XFillArc            libX11         XFillArc
-00000000 T _XFillArcs           libX11         XFillArcs
-00000000 T _XFillPolygon        libX11         XFillPoly
-00000000 T _XFillRectangle      libX11         XFillRect
-00000000 T _XFillRectangles     libX11         XFillRects
-00000000 T _XFlush              libX11         XFlush
-00000000 T _XLoadQueryFont      libX11         XFont
-00000000 T _XFreeFont           libX11         XFont
-00000000 T _XQueryFont          libX11         XFont
-00000000 T _XListFonts          libX11         XFontNames
-00000000 T _XFreeFontNames      libX11         XFontNames
-00000000 T _XListFontsWithInfo  libX11         XFontInfo
-00000000 T _XFreeFontInfo       libX11         XFontInfo
-00000000 T _XFreeColormap       libX11         XFreeCmap
-00000000 T _XFreeColors         libX11         XFreeCols
-00000000 T _XFreeCursor         libX11         XFreeCurs
-00000000 T __XFreeExtData       libX11         XFreeEData
-00000000 T _XFreeGC             libX11         XFreeGC
-00000000 T _XFreePixmap         libX11         XFreePix
-00000000 T _XActivateScreenSaver libX11         XFSSaver
-00000000 T _XResetScreenSaver   libX11         XFSSaver
-00000000 T _XForceScreenSaver   libX11         XFSSaver
-00000000 T _XSetArcMode         libX11         XGCMisc
-00000000 T _XSetFillRule        libX11         XGCMisc
-00000000 T _XSetFillStyle       libX11         XGCMisc
-00000000 T _XSetGraphicsExposures libX11         XGCMisc
-00000000 T _XSetSubwindowMode   libX11         XGCMisc
-00000000 T _XGeometry           libX11         XGeom
-00000000 T _XGetAtomName        libX11         XGetAtomNm
-00000000 T _XAllocNamedColor    libX11         XGetColor
-00000000 T _XGetDefault         libX11         XGetDflt
-00000000 T _XGetFontPath        libX11         XGetFPath
-00000000 T _XFreeFontPath       libX11         XGetFPath
-00000000 T _XGetFontProperty    libX11         XGetFProp
-00000000 T _XGetGeometry        libX11         XGetGeom
-00000000 T _XAllocColor         libX11         XGetHColor
-00000000 T _XGetSizeHints       libX11         XGetHints
-00000000 T _XGetWMHints         libX11         XGetHints
-00000000 T _XGetZoomHints       libX11         XGetHints
-00000000 T _XGetNormalHints     libX11         XGetHints
-00000000 T _XGetIconSizes       libX11         XGetHints
-00000000 T _XGetCommand         libX11         XGetHints
-00000000 T _XGetTransientForHint libX11         XGetHints
-00000000 T _XGetClassHint       libX11         XGetHints
-00000000 T _XGetInputFocus      libX11         XGetIFocus
-00000000 T _XGetImage           libX11         XGetImage
-00000000 T _XGetSubImage        libX11         XGetImage
-00000000 T _XGetKeyboardControl libX11         XGetKCnt
-00000000 T _XGetMotionEvents    libX11         XGetMoEv
-00000000 T _XGetPointerControl  libX11         XGetPCnt
-00000000 T _XGetPointerMapping  libX11         XGetPntMap
-00000000 T _XGetKeyboardMapping libX11         XGetPntMap
-00000000 T _XGetWindowProperty  libX11         XGetProp
-00000000 T _XGetSelectionOwner  libX11         XGetSOwner
-00000000 T _XGetScreenSaver     libX11         XGetSSaver
-00000000 T _XGetStandardColormap libX11         XGetStCmap
-00000000 T _XGetWindowAttributes libX11         XGetWAttrs
-00000000 T _XGrabButton         libX11         XGrButton
-00000000 T _XGrabKey            libX11         XGrKey
-00000000 T _XGrabKeyboard       libX11         XGrKeybd
-00000000 T _XGrabPointer        libX11         XGrPointer
-00000000 T _XGrabServer         libX11         XGrServer
-00000000 T _XAddHost            libX11         XHost
-00000000 T _XRemoveHost         libX11         XHost
-00000000 T _XAddHosts           libX11         XHost
-00000000 T _XRemoveHosts        libX11         XHost
-00000000 T _XIfEvent            libX11         XIfEvent
-00000000 T __XGetScanlinePad    libX11         XImUtil
-00000000 T __XGetBitsPerPixel   libX11         XImUtil
-00000000 T _XCreateImage        libX11         XImUtil
-00000000 T __XSetImage          libX11         XImUtil
-00000000 T __XInitImageFuncPtrs libX11         XImUtil
-00000000 T _XDrawImageString    libX11         XImText
-00000000 T _XDrawImageString16  libX11         XImText16
-00000000 T _XInitExtension      libX11         XInitExt
-00000000 T _XAddExtension       libX11         XInitExt
-00000000 T _XEHeadOfExtensionList libX11         XInitExt
-00000000 T _XAddToExtensionList libX11         XInitExt
-00000000 T _XFindOnExtensionList libX11         XInitExt
-00000000 T _XESetCreateGC       libX11         XInitExt
-00000000 T _XESetCopyGC         libX11         XInitExt
-00000000 T _XESetFlushGC        libX11         XInitExt
-00000000 T _XESetFreeGC         libX11         XInitExt
-00000000 T _XESetCreateFont     libX11         XInitExt
-00000000 T _XESetFreeFont       libX11         XInitExt
-00000000 T _XESetCloseDisplay   libX11         XInitExt
-00000000 T _XESetWireToEvent    libX11         XInitExt
-00000000 T _XESetEventToWire    libX11         XInitExt
-00000000 T _XESetWireToError    libX11         XInitExt
-00000000 T _XESetError          libX11         XInitExt
-00000000 T _XESetErrorString    libX11         XInitExt
-00000000 T _XESetPrintErrorValues libX11         XInitExt
-00000000 T _XInstallColormap    libX11         XInsCmap
-00000000 T _XInternAtom         libX11         XIntAtom
-00000000 T _XKeycodeToKeysym    libX11         XKeyBind
-00000000 T _XKeysymToKeycode    libX11         XKeyBind
-00000000 T _XLookupKeysym       libX11         XKeyBind
-00000000 T _XRefreshKeyboardMapping libX11         XKeyBind
-00000000 T _XLookupString       libX11         XKeyBind
-00000000 T _XRebindKeysym       libX11         XKeyBind
-00000000 T _XKeysymToString     libX11         XKeysymStr
-00000000 T _XKillClient         libX11         XKillCl
-00000000 T _XListHosts          libX11         XLiHosts
-00000000 T _XListInstalledColormaps libX11         XLiICmaps
-00000000 T _XListProperties     libX11         XLiProps
-00000000 T _XListExtensions     libX11         XListExt
-00000000 T _XFreeExtensionList  libX11         XListExt
-00000000 T _XLoadFont           libX11         XLoadFont
-00000000 T _XLookupColor        libX11         XLookupCol
-00000000 T _XLowerWindow        libX11         XLowerWin
-00000000 T _XConnectionNumber   libX11         XMacros
-00000000 T _XRootWindow         libX11         XMacros
-00000000 T _XDefaultScreen      libX11         XMacros
-00000000 T _XDefaultRootWindow  libX11         XMacros
-00000000 T _XDefaultVisual      libX11         XMacros
-00000000 T _XDefaultGC          libX11         XMacros
-00000000 T _XBlackPixel         libX11         XMacros
-00000000 T _XWhitePixel         libX11         XMacros
-00000000 T _XAllPlanes          libX11         XMacros
-00000000 T _XQLength            libX11         XMacros
-00000000 T _XDisplayWidth       libX11         XMacros
-00000000 T _XDisplayHeight      libX11         XMacros
-00000000 T _XDisplayWidthMM     libX11         XMacros
-00000000 T _XDisplayHeightMM    libX11         XMacros
-00000000 T _XDisplayPlanes      libX11         XMacros
-00000000 T _XDisplayCells       libX11         XMacros
-00000000 T _XScreenCount        libX11         XMacros
-00000000 T _XServerVendor       libX11         XMacros
-00000000 T _XProtocolVersion    libX11         XMacros
-00000000 T _XProtocolRevision   libX11         XMacros
-00000000 T _XVendorRelease      libX11         XMacros
-00000000 T _XDisplayString      libX11         XMacros
-00000000 T _XDefaultDepth       libX11         XMacros
-00000000 T _XDefaultColormap    libX11         XMacros
-00000000 T _XBitmapUnit         libX11         XMacros
-00000000 T _XBitmapBitOrder     libX11         XMacros
-00000000 T _XBitmapPad          libX11         XMacros
-00000000 T _XImageByteOrder     libX11         XMacros
-00000000 T _XNextRequest        libX11         XMacros
-00000000 T _XLastKnownRequestProcessed libX11         XMacros
-00000000 T _XScreenOfDisplay    libX11         XMacros
-00000000 T _XDefaultScreenOfDisplay libX11         XMacros
-00000000 T _XDisplayOfScreen    libX11         XMacros
-00000000 T _XRootWindowOfScreen libX11         XMacros
-00000000 T _XBlackPixelOfScreen libX11         XMacros
-00000000 T _XWhitePixelOfScreen libX11         XMacros
-00000000 T _XDefaultColormapOfScreen libX11         XMacros
-00000000 T _XDefaultDepthOfScreen libX11         XMacros
-00000000 T _XDefaultGCOfScreen  libX11         XMacros
-00000000 T _XDefaultVisualOfScreen libX11         XMacros
-00000000 T _XWidthOfScreen      libX11         XMacros
-00000000 T _XHeightOfScreen     libX11         XMacros
-00000000 T _XWidthMMOfScreen    libX11         XMacros
-00000000 T _XHeightMMOfScreen   libX11         XMacros
-00000000 T _XPlanesOfScreen     libX11         XMacros
-00000000 T _XCellsOfScreen      libX11         XMacros
-00000000 T _XMinCmapsOfScreen   libX11         XMacros
-00000000 T _XMaxCmapsOfScreen   libX11         XMacros
-00000000 T _XDoesSaveUnders     libX11         XMacros
-00000000 T _XDoesBackingStore   libX11         XMacros
-00000000 T _XEventMaskOfScreen  libX11         XMacros
-00000000 T _XScreenNumberOfScreen libX11         XMacros
-00000000 T _XDestroyImage       libX11         XMacros
-00000000 T _XGetPixel           libX11         XMacros
-00000000 T _XPutPixel           libX11         XMacros
-00000000 T _XSubImage           libX11         XMacros
-00000000 T _XAddPixel           libX11         XMacros
-00000000 T _XNoOp               libX11         XMacros
-00000000 T _XMapRaised          libX11         XMapRaised
-00000000 T _XMapSubwindows      libX11         XMapSubs
-00000000 T _XMapWindow          libX11         XMapWindow
-00000000 T _XMaskEvent          libX11         XMaskEvent
-00000000 T _XMaxRequestSize     libX11         XMisc
-00000000 T _XResourceManagerString libX11         XMisc
-00000000 T _XDisplayMotionBufferSize libX11         XMisc
-00000000 T _XDisplayKeycodes    libX11         XMisc
-00000000 T _XVisualIDFromVisual libX11         XMisc
-00000000 T _XGetModifierMapping libX11         XModMap
-00000000 T _XSetModifierMapping libX11         XModMap
-00000000 T _XNewModifiermap     libX11         XModMap
-00000000 T _XFreeModifiermap    libX11         XModMap
-00000000 T _XInsertModifiermapEntry libX11         XModMap
-00000000 T _XDeleteModifiermapEntry libX11         XModMap
-00000000 T _XMoveWindow         libX11         XMoveWin
-00000000 T _XNextEvent          libX11         XNextEvent
-00000000 T _XOpenDisplay        libX11         XOpenDis
-00000000 T __XFreeDisplayStructure libX11         XOpenDis
-00000000 T _XParseColor         libX11         XParseCol
-00000000 T _XParseGeometry      libX11         XParseGeom
-00000000 T _XPeekEvent          libX11         XPeekEvent
-00000000 T _XPeekIfEvent        libX11         XPeekIfEv
-00000000 T _XEventsQueued       libX11         XPending
-00000000 T _XPending            libX11         XPending
-00000000 T _XSetWindowBackgroundPixmap libX11         XPmapBgnd
-00000000 T _XSetWindowBorderPixmap libX11         XPmapBord
-00000000 T _XPolygonRegion      libX11         XPolyReg
-00000000 T _XDrawText           libX11         XPolyTxt
-00000000 T _XDrawText16         libX11         XPolyTxt16
-00000000 T _XPutBackEvent       libX11         XPutBEvent
-00000000 T __XReverse_Bytes     libX11         XPutImage
-00000000 T _XPutImage           libX11         XPutImage
-00000000 T _XQueryBestSize      libX11         XQuBest
-00000000 T _XQueryColor         libX11         XQuColor
-00000000 T _XQueryColors        libX11         XQuColors
-00000000 T _XQueryBestCursor    libX11         XQuCurShp
-00000000 T _XQueryExtension     libX11         XQuExt
-00000000 T _XQueryKeymap        libX11         XQuKeybd
-00000000 T _XQueryPointer       libX11         XQuPntr
-00000000 T _XQueryBestStipple   libX11         XQuStipShp
-00000000 T _XQueryTextExtents16 libX11         XQuTextE16
-00000000 T _XQueryTextExtents   libX11         XQuTextExt
-00000000 T _XQueryBestTile      libX11         XQuTileShp
-00000000 T _XQueryTree          libX11         XQuTree
-00000000 T _XRaiseWindow        libX11         XRaiseWin
-00000000 T _XReadBitmapFile     libX11         XRdBitF
-00000000 T _XRecolorCursor      libX11         XRecolorC
-00000000 T _XConfigureWindow    libX11         XReconfWin
-00000000 T _XCreateRegion       libX11         XRegion
-00000000 T _XClipBox            libX11         XRegion
-00000000 T _XUnionRectWithRegion libX11         XRegion
-00000000 T _XSetRegion          libX11         XRegion
-00000000 T _XDestroyRegion      libX11         XRegion
-00000000 T _XOffsetRegion       libX11         XRegion
-00000000 T _XShrinkRegion       libX11         XRegion
-00000000 T _XIntersectRegion    libX11         XRegion
-00000000 T _XUnionRegion        libX11         XRegion
-00000000 T _XSubtractRegion     libX11         XRegion
-00000000 T _XXorRegion          libX11         XRegion
-00000000 T _XEmptyRegion        libX11         XRegion
-00000000 T _XEqualRegion        libX11         XRegion
-00000000 T _XPointInRegion      libX11         XRegion
-00000000 T _XRectInRegion       libX11         XRegion
-00000000 T _XReparentWindow     libX11         XRepWindow
-00000000 T _XRestackWindows     libX11         XRestackWs
-00000000 T _XRotateWindowProperties libX11         XRotProp
-00000000 T _XScreenResourceString libX11         XScrResStr
-00000000 T _XSelectInput        libX11         XSelInput
-00000000 T _XSendEvent          libX11         XSendEvent
-00000000 T _XSetBackground      libX11         XSetBack
-00000000 T _XSetClipRectangles  libX11         XSetCRects
-00000000 T __XSetClipRectangles libX11         XSetCRects
-00000000 T _XSetClipMask        libX11         XSetClMask
-00000000 T _XSetClipOrigin      libX11         XSetClOrig
-00000000 T _XSetDashes          libX11         XSetDashes
-00000000 T _XSetFontPath        libX11         XSetFPath
-00000000 T _XSetFont            libX11         XSetFont
-00000000 T _XSetForeground      libX11         XSetFore
-00000000 T _XSetFunction        libX11         XSetFunc
-00000000 T _XSetSizeHints       libX11         XSetHints
-00000000 T _XSetWMHints         libX11         XSetHints
-00000000 T _XSetZoomHints       libX11         XSetHints
-00000000 T _XSetNormalHints     libX11         XSetHints
-00000000 T _XSetIconSizes       libX11         XSetHints
-00000000 T _XSetCommand         libX11         XSetHints
-00000000 T _XSetStandardProperties libX11         XSetHints
-00000000 T _XSetTransientForHint libX11         XSetHints
-00000000 T _XSetClassHint       libX11         XSetHints
-00000000 T _XSetInputFocus      libX11         XSetIFocus
-00000000 T _XSetLineAttributes  libX11         XSetLStyle
-00000000 T _XSetPlaneMask       libX11         XSetPMask
-00000000 T _XSetPointerMapping  libX11         XSetPntMap
-00000000 T _XChangeKeyboardMapping libX11         XSetPntMap
-00000000 T _XSetSelectionOwner  libX11         XSetSOwner
-00000000 T _XSetScreenSaver     libX11         XSetSSaver
-00000000 T _XSetState           libX11         XSetState
-00000000 T _XSetStipple         libX11         XSetStip
-00000000 T _XSetStandardColormap libX11         XSetStCmap
-00000000 T _XSetTile            libX11         XSetTile
-00000000 T _XSetTSOrigin        libX11         XSetTSOrig
-00000000 T _XRotateBuffers      libX11         XStBytes
-00000000 T _XFetchBuffer        libX11         XStBytes
-00000000 T _XFetchBytes         libX11         XStBytes
-00000000 T _XStoreBuffer        libX11         XStBytes
-00000000 T _XStoreBytes         libX11         XStBytes
-00000000 T _XStoreColor         libX11         XStColor
-00000000 T _XStoreColors        libX11         XStColors
-00000000 T _XStoreNamedColor    libX11         XStNColor
-00000000 T _XStoreName          libX11         XStName
-00000000 T _XSetIconName        libX11         XStName
-00000000 T __XInitKeysymDB      libX11         XStrKeysym
-00000000 T _XStringToKeysym     libX11         XStrKeysym
-00000000 T _XSync               libX11         XSync
-00000000 T __XSyncFunction      libX11         XSynchro
-00000000 T _XSynchronize        libX11         XSynchro
-00000000 T _XSetAfterFunction   libX11         XSynchro
-00000000 T _XDrawString         libX11         XText
-00000000 T _XDrawString16       libX11         XText16
-00000000 T _XTextExtents        libX11         XTextExt
-00000000 T _XTextWidth          libX11         XTextExt
-00000000 T _XTextExtents16      libX11         XTextExt16
-00000000 T _XTextWidth16        libX11         XTextExt16
-00000000 T _XTranslateCoordinates libX11         XTrCoords
-00000000 T _XUndefineCursor     libX11         XUndefCurs
-00000000 T _XUngrabButton       libX11         XUngrabBut
-00000000 T _XUngrabKeyboard     libX11         XUngrabKbd
-00000000 T _XUngrabKey          libX11         XUngrabKey
-00000000 T _XUngrabPointer      libX11         XUngrabPtr
-00000000 T _XUngrabServer       libX11         XUngrabSvr
-00000000 T _XUninstallColormap  libX11         XUninsCmap
-00000000 T _XUnloadFont         libX11         XUnldFont
-00000000 T _XUnmapSubwindows    libX11         XUnmapSubs
-00000000 T _XUnmapWindow        libX11         XUnmapWin
-00000000 T _XGetVisualInfo      libX11         XVisUtil
-00000000 T _XMatchVisualInfo    libX11         XVisUtil
-00000000 T _XWarpPointer        libX11         XWarpPtr
-00000000 T _XWindowEvent        libX11         XWinEvent
-00000000 T _XCreateWindow       libX11         XWindow
-00000000 T __XProcessWindowAttributes libX11         XWindow
-00000000 T _XWriteBitmapFile    libX11         XWrBitF
-00000000 T __XFlush             libX11         XlibInt
-00000000 T __XEventsQueued      libX11         XlibInt
-00000000 T __XReadEvents        libX11         XlibInt
-00000000 T __XRead              libX11         XlibInt
-00000000 T __XReadPad           libX11         XlibInt
-00000000 T __XSend              libX11         XlibInt
-00000000 T __XAllocID           libX11         XlibInt
-00000000 T __XSetLastRequestRead libX11         XlibInt
-00000000 T __XReply             libX11         XlibInt
-00000000 T __XEatData           libX11         XlibInt
-00000000 T __XEnq               libX11         XlibInt
-00000000 T __XUnknownWireEvent  libX11         XlibInt
-00000000 T __XUnknownNativeEvent libX11         XlibInt
-00000000 T __XWireToEvent       libX11         XlibInt
-00000000 T __XDefaultIOError    libX11         XlibInt
-00000000 T __XDefaultError      libX11         XlibInt
-00000000 T __XDefaultWireError  libX11         XlibInt
-00000000 T __XError             libX11         XlibInt
-00000000 T __XIOError           libX11         XlibInt
-00000000 T __XAllocScratch      libX11         XlibInt
-00000000 T __XVIDtoVisual       libX11         XlibInt
-00000000 T _XFree               libX11         XlibInt
-00000000 T __XGetHostname       libX11         XlibInt
-00000000 T __XScreenOfWindow    libX11         XlibInt
-00000000 T __DUMMY__            libX11         XlibInt
-00000000 T __XAllocIDs          libX11       XlibInt
-00000000 T __XAllocTemp         libX11       XlibInt
-00000000 T __XFreeTemp          libX11       XlibInt
-00000000 T _XrmInitialize       libX11         Xrm
-00000000 T _XrmGetDatabase      libX11         Xrm
-00000000 T _XrmSetDatabase      libX11         Xrm
-00000000 T _XrmStringToQuarkList libX11         Xrm
-00000000 T _XrmStringToBindingQuarkList libX11         Xrm
-00000000 T _XrmCombineDatabase  libX11         Xrm
-00000000 T _XrmMergeDatabases   libX11         Xrm
-00000000 T _XrmQPutResource     libX11         Xrm
-00000000 T _XrmPutResource      libX11         Xrm
-00000000 T _XrmQPutStringResource libX11         Xrm
-00000000 T _XrmPutStringResource libX11         Xrm
-00000000 T _XrmPutLineResource  libX11         Xrm
-00000000 T _XrmGetStringDatabase libX11         Xrm
-00000000 T _XrmGetFileDatabase  libX11         Xrm
-00000000 T _XrmCombineFileDatabase libX11         Xrm
-00000000 T _XrmEnumerateDatabase libX11         Xrm
-00000000 T _XrmPutFileDatabase  libX11         Xrm
-00000000 T _XrmQGetSearchList   libX11         Xrm
-00000000 T _XrmQGetSearchResource libX11         Xrm
-00000000 T _XrmQGetResource     libX11         Xrm
-00000000 T _XrmGetResource      libX11         Xrm
-00000000 T _XrmLocaleOfDatabase libX11         Xrm
-00000000 T _XrmDestroyDatabase  libX11         Xrm
-00000000 T _XGetGCValues        libX11         GetGCVals
-00000000 T _XGetWMSizeHints     libX11         GetNrmHint
-00000000 T _XGetWMNormalHints   libX11         GetNrmHint
-00000000 T _XGetRGBColormaps    libX11         GetRGBCMap
-00000000 T _XGetTextProperty    libX11         GetTxtProp
-00000000 T _XGetWMName          libX11         GetTxtProp
-00000000 T _XGetWMIconName      libX11         GetTxtProp
-00000000 T _XGetWMClientMachine libX11         GetTxtProp
-00000000 T _XGetWMColormapWindows libX11         GetWMCMapW
-00000000 T _XGetWMProtocols     libX11         GetWMProto
-00000000 T _XIconifyWindow      libX11         Iconify
-00000000 T _XListPixmapFormats  libX11         PixFormats
-00000000 T _XAllocSizeHints     libX11         PropAlloc
-00000000 T _XAllocStandardColormap libX11         PropAlloc
-00000000 T _XAllocWMHints       libX11         PropAlloc
-00000000 T _XAllocClassHint     libX11         PropAlloc
-00000000 T _XAllocIconSize      libX11         PropAlloc
-00000000 T _XReconfigureWMWindow libX11         ReconfWM
-00000000 T _XSetWMSizeHints     libX11         SetNrmHint
-00000000 T _XSetWMNormalHints   libX11         SetNrmHint
-00000000 T _XSetRGBColormaps    libX11         SetRGBCMap
-00000000 T _XSetTextProperty    libX11         SetTxtProp
-00000000 T _XSetWMName          libX11         SetTxtProp
-00000000 T _XSetWMIconName      libX11         SetTxtProp
-00000000 T _XSetWMClientMachine libX11         SetTxtProp
-00000000 T _XSetWMColormapWindows libX11         SetWMCMapW
-00000000 T _XSetWMProperties    libX11         SetWMProps
-00000000 T _XSetWMProtocols     libX11         SetWMProto
-00000000 T _XStringListToTextProperty libX11         StrToText
-00000000 T _XTextPropertyToStringList libX11         TextToStr
-00000000 T _XFreeStringList     libX11         TextToStr
-00000000 T _XWMGeometry         libX11         WMGeom
-00000000 T _XWithdrawWindow     libX11         Withdraw
-00000000 T _XauDisposeAuth      libX11         AuDispose
-00000000 T _XauGetBestAuthByAddr libX11         AuGetBest
-00000000 T _XauFileName         libX11         AuFileName
-00000000 T _XauReadAuth         libX11         AuRead
-00000000 T _XcmsCIELabToCIEXYZ  libX11         CIELab
-00000000 T _XcmsCIEXYZToCIELab  libX11         CIELab
-00000000 T _XcmsCIELabClipab    libX11         CIELabGcC
-00000000 T _XcmsCIELabClipL     libX11         CIELabGcL
-00000000 T _XcmsCIELabClipLab   libX11         CIELabGcLC
-00000000 T _XcmsCIELabQueryMinL libX11         CIELabMnL
-00000000 T _XcmsCIELabQueryMaxC libX11         CIELabMxC
-00000000 T _XcmsCIELabQueryMaxL libX11         CIELabMxL
-00000000 T __XcmsCIELabQueryMaxLCRGB libX11         CIELabMxLC
-00000000 T _XcmsCIELabQueryMaxLC libX11         CIELabMxLC
-00000000 T _XcmsCIELabWhiteShiftColors libX11         CIELabWpAj
-00000000 T _XcmsCIELuvToCIEuvY  libX11         CIELuv
-00000000 T _XcmsCIEuvYToCIELuv  libX11         CIELuv
-00000000 T _XcmsCIELuvClipuv    libX11         CIELuvGcC
-00000000 T _XcmsCIELuvClipL     libX11         CIELuvGcL
-00000000 T _XcmsCIELuvClipLuv   libX11         CIELuvGcLC
-00000000 T _XcmsCIELuvQueryMinL libX11         CIELuvMnL
-00000000 T _XcmsCIELuvQueryMaxC libX11         CIELuvMxC
-00000000 T _XcmsCIELuvQueryMaxL libX11         CIELuvMxL
-00000000 T __XcmsCIELuvQueryMaxLCRGB libX11         CIELuvMxLC
-00000000 T _XcmsCIELuvQueryMaxLC libX11         CIELuvMxLC
-00000000 T _XcmsCIELuvWhiteShiftColors libX11         CIELuvWpAj
-00000000 T _XcmsCIEuvYToCIEXYZ  libX11         CIEuvY
-00000000 T _XcmsCIEXYZToCIEuvY  libX11         CIEuvY
-00000000 T _XcmsCIExyYToCIEXYZ  libX11         CIExyY
-00000000 T _XcmsCIEXYZToCIExyY  libX11         CIExyY
-00000000 T _XcmsTekHVCToCIEuvY  libX11         TekHVC
-00000000 T _XcmsCIEuvYToTekHVC  libX11         TekHVC
-00000000 T __XcmsTekHVC_CheckModify libX11         TekHVC
-00000000 T _XcmsTekHVCClipC     libX11         TekHVCGcC
-00000000 T _XcmsTekHVCClipV     libX11         TekHVCGcV
-00000000 T _XcmsTekHVCClipVC    libX11         TekHVCGcVC
-00000000 T _XcmsTekHVCQueryMinV libX11         TekHVCMnV
-00000000 T _XcmsTekHVCQueryMaxC libX11         TekHVCMxC
-00000000 T _XcmsTekHVCQueryMaxV libX11         TekHVCMxV
-00000000 T __XcmsTekHVCQueryMaxVCRGB libX11         TekHVCMxVC
-00000000 T _XcmsTekHVCQueryMaxVC libX11         TekHVCMxVC
-00000000 T _XcmsTekHVCQueryMaxVSamples libX11         TekHVCMxVs
-00000000 T _XcmsTekHVCWhiteShiftColors libX11         TekHVCWpAj
-00000000 T _XcmsAddColorSpace   libX11         XcmsAddDIC
-00000000 T _XcmsAddFunctionSet  libX11         XcmsAddSF
-00000000 T _XcmsAllocNamedColor libX11         XcmsAlNCol
-00000000 T _XcmsAllocColor      libX11         XcmsAllCol
-00000000 T _XcmsCreateCCC       libX11         XcmsCCC
-00000000 T _XcmsDefaultCCC      libX11         XcmsCCC
-00000000 T _XcmsFreeCCC         libX11         XcmsCCC
-00000000 T __XcmsAddCmapRec     libX11         XcmsCmap
-00000000 T __XcmsCopyCmapRecAndFree libX11         XcmsCmap
-00000000 T __XcmsDeleteCmapRec  libX11         XcmsCmap
-00000000 T _XcmsCCCOfColormap   libX11         XcmsCmap
-00000000 T __XcmsCopyISOLatin1Lowered libX11         XcmsColNm
-00000000 T __XcmsResolveColorString libX11         XcmsColNm
-00000000 T __XcmsConvertColorsWithWhitePt libX11         XcmsCvColW
-00000000 T __XcmsEqualWhitePts  libX11         XcmsCvCols
-00000000 T __XcmsDIConvertColors libX11         XcmsCvCols
-00000000 T __XcmsDDConvertColors libX11         XcmsCvCols
-00000000 T _XcmsConvertColors   libX11         XcmsCvCols
-00000000 T __XcmsRegFormatOfPrefix libX11         XcmsCvCols
-00000000 T _XcmsFormatOfPrefix  libX11         XcmsIdOfPr
-00000000 T __XcmsCopyPointerArray libX11         XcmsInt
-00000000 T __XcmsFreePointerArray libX11         XcmsInt
-00000000 T __XcmsPushPointerArray libX11         XcmsInt
-00000000 T __XcmsInitDefaultCCCs libX11         XcmsInt
-00000000 T __XcmsInitScrnInfo   libX11         XcmsInt
-00000000 T __XcmsFreeIntensityMaps libX11         XcmsInt
-00000000 T __XcmsGetIntensityMap libX11         XcmsInt
-00000000 T __XcmsGetTableType0  libX11         XcmsLRGB
-00000000 T __XcmsGetTableType1  libX11         XcmsLRGB
-00000000 T __XcmsValueCmp       libX11         XcmsLRGB
-00000000 T __XcmsIntensityCmp   libX11         XcmsLRGB
-00000000 T __XcmsValueInterpolation libX11         XcmsLRGB
-00000000 T __XcmsIntensityInterpolation libX11         XcmsLRGB
-00000000 T __XcmsTableSearch    libX11         XcmsLRGB
-00000000 T __XcmsMatVec         libX11         XcmsLRGB
-00000000 T _XcmsCIEXYZToRGBi    libX11         XcmsLRGB
-00000000 T _XcmsRGBiToCIEXYZ    libX11         XcmsLRGB
-00000000 T _XcmsRGBiToRGB       libX11         XcmsLRGB
-00000000 T _XcmsRGBToRGBi       libX11         XcmsLRGB
-00000000 T __XcmsLRGB_InitScrnDefault libX11         XcmsLRGB
-00000000 T _XcmsLookupColor     libX11         XcmsLkCol
-00000000 T __XcmsCubeRoot       libX11         XcmsMath
-00000000 T __XcmsSquareRoot     libX11         XcmsMath
-00000000 T _XcmsDisplayOfCCC    libX11         XcmsOfCCC
-00000000 T _XcmsVisualOfCCC     libX11         XcmsOfCCC
-00000000 T _XcmsScreenNumberOfCCC libX11         XcmsOfCCC
-00000000 T _XcmsScreenWhitePointOfCCC libX11         XcmsOfCCC
-00000000 T _XcmsClientWhitePointOfCCC libX11         XcmsOfCCC
-00000000 T _XcmsPrefixOfFormat  libX11         XcmsPrOfId
-00000000 T __XcmsGetElement     libX11         XcmsProp
-00000000 T __XcmsGetProperty    libX11         XcmsProp
-00000000 T _XcmsQueryBlack      libX11         XcmsQBlack
-00000000 T _XcmsQueryBlue       libX11         XcmsQBlue
-00000000 T _XcmsQueryGreen      libX11         XcmsQGreen
-00000000 T _XcmsQueryRed        libX11         XcmsQRed
-00000000 T _XcmsQueryWhite      libX11         XcmsQWhite
-00000000 T _XcmsQueryColor      libX11         XcmsQuCol
-00000000 T _XcmsQueryColors     libX11         XcmsQuCols
-00000000 T _XcmsSetWhitePoint   libX11         XcmsSetCCC
-00000000 T _XcmsSetCompressionProc libX11         XcmsSetCCC
-00000000 T _XcmsSetWhiteAdjustProc libX11         XcmsSetCCC
-00000000 T __XcmsSetGetColors   libX11         XcmsSetGet
-00000000 T _XcmsStoreColor      libX11         XcmsStCol
-00000000 T _XcmsStoreColors     libX11         XcmsStCols
-00000000 T __XcmsCosine         libX11         XcmsTrig
-00000000 T __XcmsSine           libX11         XcmsTrig
-00000000 T __XcmsArcTangent     libX11         XcmsTrig
-00000000 T __XcmsRGB_to_XColor  libX11         XcmsXRGB
-00000000 T __XColor_to_XcmsRGB  libX11         XcmsXRGB
-00000000 T __XcmsResolveColor   libX11         XcmsXRGB
-00000000 T __XcmsUnresolveColor libX11         XcmsXRGB
-00000000 T __XUnresolveColor    libX11         XcmsXRGB
-00000000 T __XParseBaseFontNameList libX11         XFSWrap
-00000000 T _XCreateFontSet      libX11         XFSWrap
-00000000 T _XFontsOfFontSet     libX11         XFSWrap
-00000000 T _XBaseFontNameListOfFontSet libX11         XFSWrap
-00000000 T _XLocaleOfFontSet    libX11         XFSWrap
-00000000 T _XContextDependentDrawing libX11         XFSWrap
-00000000 T _XExtentsOfFontSet   libX11         XFSWrap
-00000000 T _XFreeFontSet        libX11         XFSWrap
-00000000 T _XVaCreateNestedList libX11         XICWrap
-00000000 T _XGetIMValues        libX11         XICWrap
-00000000 T _XCreateIC           libX11         XICWrap
-00000000 T _XDestroyIC          libX11         XICWrap
-00000000 T _XGetICValues        libX11         XICWrap
-00000000 T _XSetICValues        libX11         XICWrap
-00000000 T _XSetICFocus         libX11         XICWrap
-00000000 T _XUnsetICFocus       libX11         XICWrap
-00000000 T _XIMOfIC             libX11         XICWrap
-00000000 T _XmbResetIC          libX11         XICWrap
-00000000 T _XwcResetIC          libX11         XICWrap
-00000000 T _XmbLookupString     libX11         XICWrap
-00000000 T _XwcLookupString     libX11         XICWrap
-00000000 T __XIMCompileResourceList libX11         XIMWrap
-00000000 T __XCopyToArg         libX11         XIMWrap
-00000000 T _XOpenIM             libX11         XIMWrap
-00000000 T _XCloseIM            libX11         XIMWrap
-00000000 T _XDisplayOfIM        libX11         XIMWrap
-00000000 T _XLocaleOfIM         libX11         XIMWrap
-00000000 T _XSetLocaleModifiers libX11         XlcWrap
-00000000 T _XSupportsLocale     libX11         XlcWrap
-00000000 T __XlcValidModSyntax  libX11         XlcWrap
-00000000 T __XlcDefaultMapModifiers libX11         XlcWrap
-00000000 T __XlcAddLoader       libX11         XlcWrap
-00000000 T __XlcCurrentLC       libX11         XlcWrap
-00000000 T _XmbSetWMProperties  libX11         XmbWMProps
-00000000 T _XmbDrawText         libX11         XmbWrap
-00000000 T _XmbDrawString       libX11         XmbWrap
-00000000 T _XmbDrawImageString  libX11         XmbWrap
-00000000 T _XmbTextEscapement   libX11         XmbWrap
-00000000 T _XmbTextExtents      libX11         XmbWrap
-00000000 T _XmbTextPerCharExtents libX11         XmbWrap
-00000000 T _XwcDrawText         libX11         XwcWrap
-00000000 T _XwcDrawString       libX11         XwcWrap
-00000000 T _XwcDrawImageString  libX11         XwcWrap
-00000000 T _XwcTextEscapement   libX11         XwcWrap
-00000000 T _XwcTextExtents      libX11         XwcWrap
-00000000 T _XwcTextPerCharExtents libX11         XwcWrap
-00000000 T _XFilterEvent        libX11         XFilterEv
-00000000 T __XRegisterFilterByMask libX11         XRegstFlt
-00000000 T __XRegisterFilterByType libX11         XRegstFlt
-00000000 T __XUnregisterFilter  libX11         XRegstFlt
-#ifdef X_LOCALE
-00000000 T __DUMMY__ libX11         XSetLocale
-#else
-00000000 T __XlcMapOSLocaleName libX11         XSetLocale
-#endif
-00000000 T _XDefaultString      libX11         XCnvToStr
-00000000 T __XlcDefaultLoader   libX11         XlcDefLd
-00000000 T __XrmInitParseInfo   libX11         XlcLoad
-00000000 T _XmbTextPropertyToTextList libX11         XmbPrpText
-00000000 T _XmbTextListToTextProperty libX11         XmbTextPrp
-00000000 T _XwcTextPropertyToTextList libX11         XwcPrpText
-00000000 T _XwcFreeStringList   libX11         XwcPrpText
-00000000 T _XwcTextListToTextProperty libX11         XwcTextPrp
-00000000 T __X11TransConnectDisplay libX11         ConnDis
-00000000 T _XGetAtomNames       libX11         GetAtomNm
-00000000 T _XInitImage          libX11         ImUtil
-00000000 T _XESetBeforeFlush    libX11         InitExt
-00000000 T __XFreeAtomTable     libX11         IntAtom
-00000000 T __XUpdateAtomCache   libX11         IntAtom
-00000000 T _XInternAtoms        libX11         IntAtom
-00000000 T __XKeyInitialize     libX11         KeyBind
-00000000 T _XConvertCase        libX11         KeyBind
-00000000 T __XTranslateKey      libX11         KeyBind
-00000000 T __XTranslateKeySym   libX11         KeyBind
-00000000 T __XKeysymToModifiers libX11         KeyBind
-00000000 T _XExtendedMaxRequestSize libX11         Misc
-00000000 T _XReadBitmapFileData libX11         RdBitF
-00000000 T __XAsyncErrorHandler libX11         XlibAsync
-00000000 T __XDeqAsyncHandler   libX11         XlibAsync
-00000000 T __XGetAsyncReply     libX11         XlibAsync
-00000000 T __XGetAsyncData      libX11         XlibAsync
-00000000 T __XPollfdCacheInit   libX11         XlibInt
-00000000 T __XPollfdCacheAdd    libX11         XlibInt
-00000000 T __XPollfdCacheDel    libX11         XlibInt
-00000000 T __XRegisterInternalConnection libX11         XlibInt
-00000000 T __XUnregisterInternalConnection libX11         XlibInt
-00000000 T _XInternalConnectionNumbers libX11         XlibInt
-00000000 T _XProcessInternalConnection libX11         XlibInt
-00000000 T _XAddConnectionWatch libX11         XlibInt
-00000000 T _XRemoveConnectionWatch libX11         XlibInt
-00000000 T __XDeq               libX11         XlibInt
-00000000 T __XcmsCIEXYZ_ValidSpec libX11         XYZ
-00000000 T __XcmsCIEuvY_ValidSpec libX11         uvY
-00000000 T _XcmsSetCCCOfColormap libX11         cmsCmap
-00000000 T _XDirectionalDependentDrawing libX11         FSWrap
-00000000 T _XContextualDrawing  libX11         FSWrap
-00000000 T _XSetIMValues        libX11         ICWrap
-00000000 T _XRegisterIMInstantiateCallback libX11         IMWrap
-00000000 T _XUnregisterIMInstantiateCallback libX11         IMWrap
-00000000 T _XCreateOC           libX11         OCWrap
-00000000 T _XDestroyOC          libX11         OCWrap
-00000000 T _XOMOfOC             libX11         OCWrap
-00000000 T _XSetOCValues        libX11         OCWrap
-00000000 T _XGetOCValues        libX11         OCWrap
-00000000 T _XOpenOM             libX11         OMWrap
-00000000 T _XCloseOM            libX11         OMWrap
-00000000 T _XSetOMValues        libX11         OMWrap
-00000000 T _XGetOMValues        libX11         OMWrap
-00000000 T _XDisplayOfOM        libX11         OMWrap
-00000000 T _XLocaleOfOM         libX11         OMWrap
-00000000 T __XlcRemoveLoader    libX11         lcWrap
-00000000 T __XOpenLC            libX11         lcWrap
-00000000 T __XCloseLC           libX11         lcWrap
-00000000 T __XlcCopyFromArg     libX11         lcWrap
-00000000 T __XlcCopyToArg       libX11         lcWrap
-00000000 T __XlcCountVaList     libX11         lcWrap
-00000000 T __XlcVaToArgList     libX11         lcWrap
-00000000 T __XlcCompileResourceList libX11         lcWrap
-00000000 T __XlcGetValues       libX11         lcWrap
-00000000 T __XlcSetValues       libX11         lcWrap
-00000000 T _XInitThreads        libX11         locking
-00000000 T _XLockDisplay        libX11         LockDis
-00000000 T _XUnlockDisplay      libX11         LockDis
-00000000 T __X11TransFreeConnInfo libX11         x11trans
-00000000 T __X11TransOpenCOTSClient libX11         x11trans
-00000000 T __X11TransOpenCLTSClient libX11         x11trans
-00000000 T __X11TransSetOption  libX11         x11trans
-00000000 T __X11TransConnect    libX11         x11trans
-00000000 T __X11TransBytesReadable libX11         x11trans
-00000000 T __X11TransRead       libX11         x11trans
-00000000 T __X11TransWrite      libX11         x11trans
-00000000 T __X11TransReadv      libX11         x11trans
-00000000 T __X11TransWritev     libX11         x11trans
-00000000 T __X11TransDisconnect libX11         x11trans
-00000000 T __X11TransClose      libX11         x11trans
-00000000 T __X11TransCloseForCloning libX11         x11trans
-00000000 T __X11TransIsLocal    libX11         x11trans
-00000000 T __X11TransGetMyAddr  libX11         x11trans
-00000000 T __X11TransGetPeerAddr libX11         x11trans
-00000000 T __X11TransGetConnectionNumber libX11         x11trans
-00000000 T __X11TransGetHostname libX11         x11trans
-00000000 T __X11TransConvertAddress libX11         x11trans
-00000000 T __XimCbDispatch      libX11         imCallbk
-00000000 T __XimLookupMBText    libX11         imConv
-00000000 T __XimLookupWCText    libX11         imConv
-00000000 T __XimRegisterFilter  libX11         imDefFlt
-00000000 T __XimUnregisterFilter libX11         imDefFlt
-00000000 T __XimReregisterFilter libX11         imDefFlt
-00000000 T __XimRegisterServerFilter libX11         imDefFlt
-00000000 T __XimUnregisterServerFilter libX11         imDefFlt
-00000000 T __XimProtoCreateIC   libX11         imDefIc
-00000000 T __XimCheckDataSize   libX11         imDefIm
-00000000 T __XimSetHeader       libX11         imDefIm
-00000000 T __XimProtoIMFree     libX11         imDefIm
-00000000 T __XimProtoOpenIM     libX11         imDefIm
-00000000 T __XimICOfXICID       libX11         imDefLkup
-00000000 T __XimSetEventMaskCallback libX11         imDefLkup
-00000000 T __XimSync            libX11         imDefLkup
-00000000 T __XimProcSyncReply   libX11         imDefLkup
-00000000 T __XimRespSyncReply   libX11         imDefLkup
-00000000 T __XimSyncCallback    libX11         imDefLkup
-00000000 T __XimForwardEvent    libX11         imDefLkup
-00000000 T __XimForwardEventCallback libX11         imDefLkup
-00000000 T __XimRegisterTriggerKeysCallback libX11         imDefLkup
-00000000 T __XimGetWindowEventmask libX11         imDefLkup
-00000000 T __XimTriggerNotify   libX11         imDefLkup
-00000000 T __XimFreeCommitInfo  libX11         imDefLkup
-00000000 T __XimCommitCallback  libX11         imDefLkup
-00000000 T __XimProcError       libX11         imDefLkup
-00000000 T __XimErrorCallback   libX11         imDefLkup
-00000000 T __XimError           libX11         imDefLkup
-00000000 T __Ximctstombs        libX11         imDefLkup
-00000000 T __Ximctstowcs        libX11         imDefLkup
-00000000 T __XimProtoMbLookupString libX11         imDefLkup
-00000000 T __XimProtoWcLookupString libX11         imDefLkup
-00000000 T __XimRegProtoIntrCallback libX11         imDispch
-00000000 T __XimFreeProtoIntrCallback libX11         imDispch
-00000000 T __XimDispatchInit    libX11         imDispch
-00000000 T __XimProtoEventToWire libX11         imEvToWire
-00000000 T __XimProtoWireToEvent libX11         imEvToWire
-00000000 T __XimExtension       libX11         imExten
-00000000 T __XimRegisterIMInstantiateCallback libX11         imInsClbk
-00000000 T __XimUnRegisterIMInstantiateCallback libX11         imInsClbk
-00000000 T __XimResetIMInstantiateCallback libX11         imInsClbk
-00000000 T __XimDestroyIMStructureList libX11         imInt
-00000000 T __XimServerDestroy   libX11         imInt
-00000000 T __DUMMY__          libX11         imInt
-00000000 T __XInitIM            libX11         imInt
-00000000 T __XimLocalFilter     libX11         imLcFlt
-00000000 T __XimLocalGetICValues libX11         imLcGIc
-00000000 T __XimLocalCreateIC   libX11         imLcIc
-00000000 T __XimCheckIfLocalProcessing libX11         imLcIm
-00000000 T __XimLocalIMFree     libX11         imLcIm
-00000000 T __XimLocalGetIMValues libX11         imLcIm
-00000000 T __XimLocalSetIMValues libX11         imLcIm
-00000000 T __XimLocalOpenIM     libX11         imLcIm
-00000000 T __XimLocalMbLookupString libX11         imLcLkup
-00000000 T __XimLocalWcLookupString libX11         imLcLkup
-00000000 T __XimParseStringFile  libX11         imLcPrs
-00000000 T __XimSetICValueData  libX11         imLcSIc
-00000000 T __XimLocalSetICValues libX11         imLcSIc
-00000000 T __XimSetIMResourceList libX11         imRm
-00000000 T __XimSetICResourceList libX11         imRm
-00000000 T __XimSetInnerIMResourceList libX11         imRm
-00000000 T __XimSetInnerICResourceList libX11         imRm
-00000000 T __XimCheckCreateICValues libX11         imRm
-00000000 T __XimGetResourceListRec libX11         imRm
-00000000 T __XimSetIMMode       libX11         imRm
-00000000 T __XimCheckIMMode     libX11         imRm
-00000000 T __XimSetICMode       libX11         imRm
-00000000 T __XimCheckICMode     libX11         imRm
-00000000 T __XimSetLocalIMDefaults libX11         imRm
-00000000 T __XimSetICDefaults   libX11         imRm
-00000000 T __XimDecodeLocalIMAttr libX11         imRm
-00000000 T __XimDecodeLocalICAttr libX11         imRm
-00000000 T __XimCheckLocalInputStyle libX11         imRm
-00000000 T __XimEncodeLocalIMAttr libX11         imRm
-00000000 T __XimEncodeLocalICAttr libX11         imRm
-00000000 T __XimGetCurrentIMValues libX11         imRm
-00000000 T __XimSetCurrentIMValues libX11         imRm
-00000000 T __XimGetCurrentICValues libX11         imRm
-00000000 T __XimSetCurrentICValues libX11         imRm
-00000000 T __XimInitialResourceInfo libX11         imRm
-00000000 T __XimDecodeIMATTRIBUTE libX11         imRmAttr
-00000000 T __XimDecodeICATTRIBUTE libX11         imRmAttr
-00000000 T __XimEncodeIMATTRIBUTE libX11         imRmAttr
-00000000 T __XimEncodeICATTRIBUTE libX11         imRmAttr
-00000000 T __XimGetAttributeID  libX11         imRmAttr
-00000000 T __XimThaiFilter      libX11         imThaiFlt
-00000000 T __XimThaiCreateIC    libX11         imThaiIc
-00000000 T __XimCheckIfThaiProcessing libX11         imThaiIm
-00000000 T __XimThaiOpenIM      libX11         imThaiIm
-00000000 T __XimThaiIMFree      libX11         imThaiIm
-00000000 T __XimThaiCloseIM     libX11         imThaiIm
-00000000 T __XimXConf           libX11         imTrX
-00000000 T __XimConnect         libX11         imTransR
-00000000 T __XimShutdown        libX11         imTransR
-00000000 T __XimFlush           libX11         imTransR
-00000000 T __XimFilterWaitEvent libX11         imTransR
-00000000 T __XimFreeTransIntrCallback libX11         imTrans
-00000000 T __XimTransFilterWaitEvent libX11         imTrans
-00000000 T __XimTransInternalConnection libX11         imTrans
-00000000 T __XimTransFlush      libX11         imTrans
-00000000 T __XimTransConf       libX11         imTrans
-00000000 T __XlcParseCharSet    libX11         lcCT
-00000000 T __XlcInitCTInfo      libX11         lcCT
-00000000 T __XlcGetCSValues     libX11         lcCharSet
-00000000 T __XlcGetCharSet      libX11         lcCharSet
-00000000 T __XlcAddCharSet      libX11         lcCharSet
-00000000 T __XlcCreateDefaultCharSet libX11         lcCharSet
-00000000 T __XlcSetConverter    libX11         lcConv
-00000000 T __XlcOpenConverter   libX11         lcConv
-00000000 T __XlcCloseConverter  libX11         lcConv
-00000000 T __XlcConvert         libX11         lcConv
-00000000 T __XlcResetConverter  libX11         lcConv
-00000000 T __XlcGetResource     libX11         lcDB
-00000000 T __XlcGetLocaleDataBase libX11         lcDB
-00000000 T __XlcDestroyLocaleDataBase libX11         lcDB
-00000000 T __XlcCreateLocaleDataBase libX11         lcDB
-00000000 T __XlcEucLoader       libX11         lcEuc
-00000000 T __XlcFileName        libX11         lcFile
-00000000 T __XlcResolveLocaleName libX11         lcFile
-00000000 T __XlcResolveDBName   libX11         lcFile
-00000000 T __XlcResolveI18NPath libX11         lcFile
-00000000 T __XlcGenericLoader   libX11         lcGenConv
-00000000 T __XlcInitLoader      libX11         lcInit
-00000000 T __XmbTextPropertyToTextList libX11         lcPrTxt
-00000000 T __XwcTextPropertyToTextList libX11         lcPrTxt
-00000000 T __XwcFreeStringList  libX11         lcPrTxt
-00000000 T __XGetLCValues       libX11         lcPubWrap
-00000000 T __XlcDestroyLC       libX11         lcPubWrap
-00000000 T __XlcCreateLC        libX11         lcPubWrap
-00000000 T __XrmDefaultInitParseInfo libX11         lcRM
-00000000 T __XlcSjisLoader      libX11         lcSjis
-00000000 T __Xlcmbtowc          libX11         lcStd
-00000000 T __Xlcwctomb          libX11         lcStd
-00000000 T __Xlcmbstowcs        libX11         lcStd
-00000000 T __Xlcwcstombs        libX11         lcStd
-00000000 T __Xmbtowc            libX11         lcStd
-00000000 T __Xwctomb            libX11         lcStd
-00000000 T __Xmbstowcs          libX11         lcStd
-00000000 T __Xwcstombs          libX11         lcStd
-00000000 T __Xwcscpy            libX11         lcStd
-00000000 T __Xwcsncpy           libX11         lcStd
-00000000 T __Xwcslen            libX11         lcStd
-00000000 T __Xwcscmp            libX11         lcStd
-00000000 T __Xwcsncmp           libX11         lcStd
-00000000 T __XmbTextListToTextProperty libX11         lcTxtPr
-00000000 T __XwcTextListToTextProperty libX11         lcTxtPr
-00000000 T __XlcUtfLoader       libX11         lcUTF
-00000000 T __XlcCompareISOLatin1 libX11         lcUtil
-00000000 T __XlcNCompareISOLatin1 libX11         lcUtil
-00000000 T __DUMMY__ libX11         omDefault
-00000000 T __DUMMY__ libX11         omDefault
-00000000 T __DUMMY__ libX11         omDefault
-00000000 T __DUMMY__ libX11         omDefault
-00000000 T __DUMMY__ libX11         omDefault
-00000000 T __DUMMY__ libX11         omDefault
-00000000 T __DUMMY__ libX11         omDefault
-00000000 T __DUMMY__ libX11         omDefault
-00000000 T __DUMMY__ libX11         omDefault
-00000000 T __DUMMY__ libX11         omDefault
-00000000 T __XomGenericOpenOM   libX11         omGeneric
-00000000 T __XInitOM            libX11         omGeneric
-00000000 T __XmbGenericDrawImageString libX11         omImText
-00000000 T __XwcGenericDrawImageString libX11         omImText
-00000000 T __XomGenericDrawString libX11         omText
-00000000 T __XmbGenericDrawString libX11         omText
-00000000 T __XwcGenericDrawString libX11         omText
-00000000 T __XmbGenericTextEscapement libX11         omTextEsc
-00000000 T __XwcGenericTextEscapement libX11         omTextEsc
-00000000 T __XomGenericTextExtents libX11         omTextExt
-00000000 T __XmbGenericTextExtents libX11         omTextExt
-00000000 T __XwcGenericTextExtents libX11         omTextExt
-00000000 T __XmbGenericTextPerCharExtents libX11         omTextPer
-00000000 T __XwcGenericTextPerCharExtents libX11         omTextPer
-00000000 T __XomConvert         libX11         omXChar
-00000000 T __XomInitConverter   libX11         omXChar
-00000000 T __Xmblen             libX11         lcStd
-00000000 T _SmcOpenConnection   libSM          sm_client
-00000000 T _SmcCloseConnection  libSM          sm_client
-00000000 T _SmcModifyCallbacks  libSM          sm_client
-00000000 T _SmcSetProperties    libSM          sm_client
-00000000 T _SmcDeleteProperties libSM          sm_client
-00000000 T _SmcGetProperties    libSM          sm_client
-00000000 T _SmcInteractRequest  libSM          sm_client
-00000000 T _SmcInteractDone     libSM          sm_client
-00000000 T _SmcSaveYourselfDone libSM          sm_client
-00000000 T _SmsGenerateClientID libSM          sm_genid
-00000000 T _SmsInitialize       libSM          sm_manager
-00000000 T _SmsClientHostName   libSM          sm_manager
-00000000 T _SmsRegisterClientReply libSM          sm_manager
-00000000 T _SmsSaveYourself     libSM          sm_manager
-00000000 T _SmsInteract         libSM          sm_manager
-00000000 T _SmsDie              libSM          sm_manager
-00000000 T _SmsShutdownCancelled libSM          sm_manager
-00000000 T _SmsReturnProperties libSM          sm_manager
-00000000 T _SmsCleanUp          libSM          sm_manager
-00000000 T __SmcProcessMessage  libSM          sm_process
-00000000 T __SmsProcessMessage  libSM          sm_process
-00000000 T __SmcDefaultErrorHandler libSM          sm_error
-00000000 T __SmsDefaultErrorHandler libSM          sm_error
-00000000 T _SmcSetErrorHandler  libSM          sm_error
-00000000 T _SmsSetErrorHandler  libSM          sm_error
-00000000 T _SmFreeProperty      libSM          sm_misc
-00000000 T _SmFreeReasons       libSM          sm_misc
-00000000 T _SmcProtocolVersion  libSM          sm_misc
-00000000 T _SmcProtocolRevision libSM          sm_misc
-00000000 T _SmcVendor           libSM          sm_misc
-00000000 T _SmcRelease          libSM          sm_misc
-00000000 T _SmcClientID         libSM          sm_misc
-00000000 T _SmcGetIceConnection libSM          sm_misc
-00000000 T _SmsProtocolVersion  libSM          sm_misc
-00000000 T _SmsProtocolRevision libSM          sm_misc
-00000000 T _SmsClientID         libSM          sm_misc
-00000000 T _SmsGetIceConnection libSM          sm_misc
-00000000 T _IceAcceptConnection libICE         accept
-00000000 T _IceAuthFileName     libICE         authutil
-00000000 T _IceLockAuthFile     libICE         authutil
-00000000 T _IceUnlockAuthFile   libICE         authutil
-00000000 T _IceReadAuthFileEntry libICE         authutil
-00000000 T _IceFreeAuthFileEntry libICE         authutil
-00000000 T _IceWriteAuthFileEntry libICE         authutil
-00000000 T _IceGetAuthFileEntry libICE         authutil
-00000000 T _IceOpenConnection   libICE         connect
-00000000 T __IceErrorBadMinor   libICE         error
-00000000 T __IceErrorBadState   libICE         error
-00000000 T __IceErrorBadLength  libICE         error
-00000000 T __IceErrorBadValue   libICE         error
-00000000 T __IceErrorNoAuthentication libICE         error
-00000000 T __IceErrorNoVersion  libICE         error
-00000000 T __IceErrorAuthenticationRejected libICE         error
-00000000 T __IceErrorAuthenticationFailed libICE         error
-00000000 T __IceErrorProtocolDuplicate libICE         error
-00000000 T __IceErrorMajorOpcodeDuplicate libICE         error
-00000000 T __IceErrorUnknownProtocol libICE         error
-00000000 T __IceErrorBadMajor   libICE         error
-00000000 T __IceDefaultErrorHandler libICE         error
-00000000 T _IceSetErrorHandler  libICE         error
-00000000 T __IceDefaultIOErrorHandler libICE         error
-00000000 T _IceSetIOErrorHandler libICE         error
-00000000 T __IceGetPoValidAuthIndices libICE         getauth
-00000000 T __IceGetPaValidAuthIndices libICE         getauth
-00000000 T __IcePoMagicCookie1Proc libICE         iceauth
-00000000 T __IcePaMagicCookie1Proc libICE         iceauth
-00000000 T _IceListenForConnections libICE         listen
-00000000 T _IceComposeNetworkIdList libICE         listen
-00000000 T _IceSetHostBasedAuthProc libICE         listen
-00000000 T _IceInitThreads      libICE         locking
-00000000 T _IceAllocScratch     libICE         misc
-00000000 T _IceConnectionStatus libICE         misc
-00000000 T _IceVendor           libICE         misc
-00000000 T _IceRelease          libICE         misc
-00000000 T _IceProtocolVersion  libICE         misc
-00000000 T _IceProtocolRevision libICE         misc
-00000000 T _IceConnectionNumber libICE         misc
-00000000 T _IceConnectionString libICE         misc
-00000000 T __IceRead            libICE         misc
-00000000 T __IceReadSkip        libICE         misc
-00000000 T __IceWrite           libICE         misc
-00000000 T __IceAddOpcodeMapping libICE         misc
-00000000 T __IceGetPeerName     libICE         misc
-00000000 T _IcePing             libICE         ping
-00000000 T __IceProcessCoreMessage libICE         process
-00000000 T _IceProtocolSetup    libICE         protosetup
-00000000 T _IceRegisterForProtocolSetup libICE         register
-00000000 T _IceRegisterForProtocolReply libICE         register
-00000000 T __IceAddReplyWait    libICE         replywait
-00000000 T __IceSearchReplyWaits libICE         replywait
-00000000 T __IceSetReplyReady   libICE         replywait
-00000000 T __IceCheckReplyReady libICE         replywait
-00000000 T _IceSetPaAuthData    libICE         setauth
-00000000 T _IceProtocolShutdown libICE         shutdown
-00000000 T _IceSetShutdownNegotiation libICE         shutdown
-00000000 T _IceCheckShutdownNegotiation libICE         shutdown
-00000000 T _IceCloseConnection  libICE         shutdown
-00000000 T __IceFreeConnection  libICE         shutdown
-00000000 T _IceAddConnectionWatch libICE         watch
-00000000 T _IceRemoveConnectionWatch libICE         watch
-00000000 T __IceConnectionOpened libICE         watch
-00000000 T __IceConnectionClosed libICE         watch
-00000000 T __XimGetResourceName libX11       imRm
-00000000 T __XimGetResourceListRecByQuark libX11       imRm
-00000000 T __XimSetIMValueData  libX11       imRm
-00000000 T __XimGetIMValueData  libX11       imRm
-00000000 T __XimGetICValueData  libX11       imRm
-00000000 T __XimMakeIMAttrIDList libX11       imRmAttr
-00000000 T __XimMakeICAttrIDList libX11       imRmAttr
-00000000 T __XimWrite           libX11       imTransR
-00000000 T __XimRead            libX11       imTransR
-00000000 T __XimRegisterDispatcher libX11       imTransR
-00000000 T __XimTransRegisterDispatcher libX11       imTrans
-00000000 T __XimTransCallDispatcher libX11       imTrans
-00000000 T __XimTransWrite      libX11       imTrans
-00000000 T __XimTransRead       libX11       imTrans
-00000000 T __XimXTransFreeConnInfo libX11         ximtrans
-00000000 T __XimXTransOpenCOTSClient libX11         ximtrans
-00000000 T __XimXTransOpenCLTSClient libX11         ximtrans
-00000000 T __XimXTransSetOption libX11         ximtrans
-00000000 T __XimXTransConnect   libX11         ximtrans
-00000000 T __XimXTransBytesReadable libX11         ximtrans
-00000000 T __XimXTransRead      libX11         ximtrans
-00000000 T __XimXTransWrite     libX11         ximtrans
-00000000 T __XimXTransReadv     libX11         ximtrans
-00000000 T __XimXTransWritev    libX11         ximtrans
-00000000 T __XimXTransDisconnect libX11         ximtrans
-00000000 T __XimXTransClose     libX11         ximtrans
-00000000 T __XimXTransCloseForCloning libX11         ximtrans
-00000000 T __XimXTransIsLocal   libX11         ximtrans
-00000000 T __XimXTransGetMyAddr libX11         ximtrans
-00000000 T __XimXTransGetPeerAddr libX11         ximtrans
-00000000 T __XimXTransGetConnectionNumber libX11         ximtrans
-00000000 T __XimXTransGetHostname libX11         ximtrans
-00000000 T _SmcRequestSaveYourself libSM          sm_client
-00000000 T _SmcRequestSaveYourselfPhase2 libSM          sm_client
-00000000 T __SmsProtocolSetupProc libSM          sm_manager
-00000000 T _SmsSaveYourselfPhase2 libSM          sm_manager
-00000000 T _SmsSaveComplete     libSM          sm_manager
-00000000 T _IceGetConnectionContext libICE         connect
-00000000 T __IceErrorSetupFailed libICE         error
-00000000 T __IceGetPoAuthData   libICE         getauth
-00000000 T __IceGetPaAuthData   libICE         getauth
-00000000 T _IceGenerateMagicCookie libICE         iceauth
-00000000 T _IceGetListenConnectionNumber libICE         listen
-00000000 T _IceGetListenConnectionString libICE         listen
-00000000 T _IceFreeListenObjs   libICE         listen
-00000000 T _IceAppLockConn      libICE         locking
-00000000 T _IceAppUnlockConn    libICE         locking
-00000000 T _IceFlush            libICE         misc
-00000000 T _IceGetOutBufSize    libICE         misc
-00000000 T _IceGetInBufSize     libICE         misc
-00000000 T _IceLastSentSequenceNumber libICE         misc
-00000000 T _IceLastReceivedSequenceNumber libICE         misc
-00000000 T _IceSwapping         libICE         misc
-00000000 T _IceProcessMessages  libICE         process
-00000000 T __IceTransFreeConnInfo libICE         transport
-00000000 T __IceTransOpenCOTSClient libICE         transport
-00000000 T __IceTransOpenCOTSServer libICE         transport
-00000000 T __IceTransOpenCLTSClient libICE         transport
-00000000 T __IceTransOpenCLTSServer libICE         transport
-00000000 T __IceTransSetOption  libICE         transport
-00000000 T __IceTransCreateListener libICE         transport
-00000000 T __IceTransResetListener libICE         transport
-00000000 T __IceTransAccept     libICE         transport
-00000000 T __IceTransConnect    libICE         transport
-00000000 T __IceTransBytesReadable libICE         transport
-00000000 T __IceTransRead       libICE         transport
-00000000 T __IceTransWrite      libICE         transport
-00000000 T __IceTransReadv      libICE         transport
-00000000 T __IceTransWritev     libICE         transport
-00000000 T __IceTransDisconnect libICE         transport
-00000000 T __IceTransClose      libICE         transport
-00000000 T __IceTransCloseForCloning libICE         transport
-00000000 T __IceTransIsLocal    libICE         transport
-00000000 T __IceTransGetMyAddr  libICE         transport
-00000000 T __IceTransGetPeerAddr libICE         transport
-00000000 T __IceTransGetConnectionNumber libICE         transport
-00000000 T __IceTransMakeAllCOTSServerListeners libICE         transport
-00000000 T __IceTransMakeAllCLTSServerListeners libICE         transport
-00000000 T __IceTransGetHostname libICE         transport
-00000000 T __IceTransGetMyNetworkId libICE         transport
-00000000 T __IceTransGetPeerNetworkId libICE         transport
-00000000 T __XimLcctstombs      libX11         imLcLkup
-00000000 T __XimLcctstowcs      libX11         imLcLkup
-#ifdef HASXDMAUTH
-00000000 T _XdmcpWrap           libX11         Wrap
-00000000 T __XdmcpWrapperToOddParity libX11         Wrap
-00000000 T __XdmcpAuthSetup     libX11         Wraphelp
-00000000 T __XdmcpAuthDoIt      libX11         Wraphelp
-#else
-00000000 T __DUMMY__           libX11         Wrap
-00000000 T __DUMMY__ libX11         Wrap
-00000000 T __DUMMY__     libX11         Wraphelp
-00000000 T __DUMMY__      libX11         Wraphelp
-#endif
-#ifdef X_LOCALE
-00000000 T __Xsetlocale         libX11         SetLocale
-#else
-00000000 T __DUMMY__         libX11         SetLocale
-#endif
-#ifdef XKB
-#undef XKB
-00000000 T _XkbQueryExtension   libX11         XKB
-00000000 T _XkbLibraryVersion   libX11         XKB
-00000000 T _XkbSelectEvents     libX11         XKB
-00000000 T _XkbSelectEventDetails libX11         XKB
-00000000 T _XkbLockModifiers    libX11         XKB
-00000000 T _XkbLatchModifiers   libX11         XKB
-00000000 T _XkbLockGroup        libX11         XKB
-00000000 T _XkbLatchGroup       libX11         XKB
-00000000 T _XkbSetXlibControls  libX11         XKB
-00000000 T _XkbGetXlibControls  libX11         XKB
-00000000 T _XkbXlibControlsImplemented libX11         XKB
-00000000 T _XkbSetDebuggingFlags libX11         XKB
-00000000 T _XkbComputeEffectiveMap libX11         XKB
-00000000 T _XkbGetState         libX11         XKB
-00000000 T _XkbSetDetectableAutoRepeat libX11         XKB
-00000000 T _XkbGetDetectableAutoRepeat libX11         XKB
-00000000 T _XkbSetAutoResetControls libX11         XKB
-00000000 T _XkbGetAutoResetControls libX11         XKB
-00000000 T _XkbOpenDisplay      libX11         XKB
-00000000 T _XkbSetAtomFuncs     libX11         XKB
-00000000 T _XkbKeycodeToKeysym  libX11         XKBBind
-00000000 T _XkbKeysymToModifiers libX11         XKBBind
-00000000 T _XkbTranslateKey     libX11         XKBBind
-00000000 T _XkbLookupKeySym     libX11         XKBBind
-00000000 T _XkbTranslateKeyCode libX11         XKBBind
-00000000 T _XkbRefreshKeyboardMapping libX11         XKBBind
-00000000 T _XkbTranslateKeySym  libX11         XKBBind
-00000000 T _XkbLookupKeyBinding libX11         XKBBind
-00000000 T _XkbToControl        libX11         XKBBind
-00000000 T _XkbGetCompatMap     libX11         XKBCompat
-00000000 T _XkbSetCompatMap     libX11         XKBCompat
-00000000 T _XkbSetAutoRepeatRate libX11         XKBCtrls
-00000000 T _XkbGetAutoRepeatRate libX11         XKBCtrls
-00000000 T _XkbSetServerInternalMods libX11         XKBCtrls
-00000000 T _XkbSetIgnoreLockMods libX11         XKBCtrls
-00000000 T _XkbChangeEnabledControls libX11         XKBCtrls
-00000000 T _XkbGetControls      libX11         XKBCtrls
-00000000 T _XkbSetControls      libX11         XKBCtrls
-00000000 T _XkbNoteControlsChanges libX11         XKBCtrls
-00000000 T _XkbGetUpdatedMap    libX11         XKBGetMap
-00000000 T _XkbGetMap           libX11         XKBGetMap
-00000000 T _XkbGetKeyTypes      libX11         XKBGetMap
-00000000 T _XkbGetKeyActions    libX11         XKBGetMap
-00000000 T _XkbGetKeySyms       libX11         XKBGetMap
-00000000 T _XkbGetKeyBehaviors  libX11         XKBGetMap
-00000000 T _XkbGetVirtualMods   libX11         XKBGetMap
-00000000 T _XkbGetKeyExplicitComponents libX11         XKBGetMap
-00000000 T _XkbGetKeyModifierMap libX11         XKBGetMap
-00000000 T _XkbGetKeyVirtualModMap libX11         XKBGetMap
-00000000 T _XkbGetMapChanges    libX11         XKBGetMap
-00000000 T _XkbGetKeyboardByName libX11         XKBGetByName
-00000000 T _XkbGetKeyboard      libX11         XKBGetByName
-00000000 T _XkbGetNames         libX11         XKBNames
-00000000 T _XkbSetNames         libX11         XKBNames
-00000000 T _XkbChangeNames      libX11         XKBNames
-00000000 T _XkbNoteNameChanges  libX11         XKBNames
-00000000 T _XkbSetMap           libX11         XKBSetMap
-00000000 T _XkbChangeMap        libX11         XKBSetMap
-00000000 T _XkbNoteMapChanges   libX11         XKBUse
-00000000 T _XkbIgnoreExtension  libX11         XKBUse
-00000000 T _XkbUseExtension     libX11         XKBUse
-00000000 T _XkbGetIndicatorState libX11         XKBleds
-00000000 T _XkbGetIndicatorMap  libX11         XKBleds
-00000000 T _XkbSetIndicatorMap  libX11         XKBleds
-00000000 T _XkbGetNamedDeviceIndicator libX11         XKBleds
-00000000 T _XkbGetNamedIndicator libX11         XKBleds
-00000000 T _XkbSetNamedDeviceIndicator libX11         XKBleds
-00000000 T _XkbSetNamedIndicator libX11         XKBleds
-00000000 T _XkbDeviceBell       libX11         XKBBell
-00000000 T _XkbForceDeviceBell  libX11         XKBBell
-00000000 T _XkbDeviceBellEvent  libX11         XKBBell
-00000000 T _XkbBell             libX11         XKBBell
-00000000 T _XkbForceBell        libX11         XKBBell
-00000000 T _XkbBellEvent        libX11         XKBBell
-00000000 T _XkbComputeShapeBounds libX11         XKBGeom
-00000000 T _XkbComputeShapeTop  libX11         XKBGeom
-00000000 T _XkbComputeRowBounds libX11         XKBGeom
-00000000 T _XkbComputeSectionBounds libX11         XKBGeom
-00000000 T _XkbFindOverlayForKey libX11         XKBGeom
-00000000 T _XkbGetGeometry      libX11         XKBGeom
-00000000 T _XkbGetNamedGeometry libX11         XKBGeom
-00000000 T _XkbSetGeometry      libX11         XKBSetGeom
-00000000 T _XkbNoteDeviceChanges libX11         XKBExtDev
-00000000 T _XkbGetDeviceInfo    libX11         XKBExtDev
-00000000 T _XkbGetDeviceInfoChanges libX11         XKBExtDev
-00000000 T _XkbGetDeviceButtonActions libX11         XKBExtDev
-00000000 T _XkbGetDeviceLedInfo libX11         XKBExtDev
-00000000 T _XkbSetDeviceInfo    libX11         XKBExtDev
-00000000 T _XkbChangeDeviceInfo libX11         XKBExtDev
-00000000 T _XkbSetDeviceLedInfo libX11         XKBExtDev
-00000000 T _XkbSetDeviceButtonActions libX11         XKBExtDev
-00000000 T _XkbListComponents   libX11         XKBList
-00000000 T _XkbFreeComponentList libX11         XKBList
-00000000 T _XkbInitCanonicalKeyTypes libX11         XKBMisc
-00000000 T _XkbKeyTypesForCoreSymbols libX11         XKBMisc
-00000000 T _XkbApplyCompatMapToKey libX11         XKBMisc
-00000000 T _XkbUpdateMapFromCore libX11         XKBMisc
-00000000 T _XkbChangeTypesOfKey libX11         XKBMisc
-00000000 T _XkbVirtualModsToReal libX11         XKBMisc
-00000000 T _XkbUpdateActionVirtualMods libX11         XKBMisc
-00000000 T _XkbUpdateKeyTypeVirtualMods libX11         XKBMisc
-00000000 T _XkbApplyVirtualModChanges libX11         XKBMisc
-00000000 T _XkbAllocClientMap   libX11         XKBMAlloc
-00000000 T _XkbAllocServerMap   libX11         XKBMAlloc
-00000000 T _XkbCopyKeyType      libX11         XKBMAlloc
-00000000 T _XkbCopyKeyTypes     libX11         XKBMAlloc
-00000000 T _XkbAddKeyType       libX11         XKBMAlloc
-00000000 T _XkbResizeKeyType    libX11         XKBMAlloc
-00000000 T _XkbResizeKeySyms    libX11         XKBMAlloc
-00000000 T _XkbResizeKeyActions libX11         XKBMAlloc
-00000000 T _XkbFreeClientMap    libX11         XKBMAlloc
-00000000 T _XkbFreeServerMap    libX11         XKBMAlloc
-00000000 T _XkbFreeGeomProperties libX11         XKBGAlloc
-00000000 T _XkbFreeGeomKeyAliases libX11         XKBGAlloc
-00000000 T _XkbFreeGeomColors   libX11         XKBGAlloc
-00000000 T _XkbFreeGeomPoints   libX11         XKBGAlloc
-00000000 T _XkbFreeGeomOutlines libX11         XKBGAlloc
-00000000 T _XkbFreeGeomShapes   libX11         XKBGAlloc
-00000000 T _XkbFreeGeomOverlayKeys libX11         XKBGAlloc
-00000000 T _XkbFreeGeomOverlayRows libX11         XKBGAlloc
-00000000 T _XkbFreeGeomOverlays libX11         XKBGAlloc
-00000000 T _XkbFreeGeomKeys     libX11         XKBGAlloc
-00000000 T _XkbFreeGeomRows     libX11         XKBGAlloc
-00000000 T _XkbFreeGeomSections libX11         XKBGAlloc
-00000000 T _XkbFreeGeomDoodads  libX11         XKBGAlloc
-00000000 T _XkbFreeGeometry     libX11         XKBGAlloc
-00000000 T _XkbAllocGeomProps   libX11         XKBGAlloc
-00000000 T _XkbAllocGeomColors  libX11         XKBGAlloc
-00000000 T _XkbAllocGeomKeyAliases libX11         XKBGAlloc
-00000000 T _XkbAllocGeomShapes  libX11         XKBGAlloc
-00000000 T _XkbAllocGeomSections libX11         XKBGAlloc
-00000000 T _XkbAllocGeomOverlays libX11         XKBGAlloc
-00000000 T _XkbAllocGeomOverlayRows libX11         XKBGAlloc
-00000000 T _XkbAllocGeomOverlayKeys libX11         XKBGAlloc
-00000000 T _XkbAllocGeomDoodads libX11         XKBGAlloc
-00000000 T _XkbAllocGeomSectionDoodads libX11         XKBGAlloc
-00000000 T _XkbAllocGeomOutlines libX11         XKBGAlloc
-00000000 T _XkbAllocGeomRows    libX11         XKBGAlloc
-00000000 T _XkbAllocGeomPoints  libX11         XKBGAlloc
-00000000 T _XkbAllocGeomKeys    libX11         XKBGAlloc
-00000000 T _XkbAllocGeometry    libX11         XKBGAlloc
-00000000 T _XkbAddGeomProperty  libX11         XKBGAlloc
-00000000 T _XkbAddGeomKeyAlias  libX11         XKBGAlloc
-00000000 T _XkbAddGeomColor     libX11         XKBGAlloc
-00000000 T _XkbAddGeomOutline   libX11         XKBGAlloc
-00000000 T _XkbAddGeomShape     libX11         XKBGAlloc
-00000000 T _XkbAddGeomKey       libX11         XKBGAlloc
-00000000 T _XkbAddGeomRow       libX11         XKBGAlloc
-00000000 T _XkbAddGeomSection   libX11         XKBGAlloc
-00000000 T _XkbAddGeomDoodad    libX11         XKBGAlloc
-00000000 T _XkbAddGeomOverlayKey libX11         XKBGAlloc
-00000000 T _XkbAddGeomOverlayRow libX11         XKBGAlloc
-00000000 T _XkbAddGeomOverlay   libX11         XKBGAlloc
-00000000 T _XkbAllocCompatMap   libX11         XKBAlloc
-00000000 T _XkbFreeCompatMap    libX11         XKBAlloc
-00000000 T _XkbAllocNames       libX11         XKBAlloc
-00000000 T _XkbFreeNames        libX11         XKBAlloc
-00000000 T _XkbAllocControls    libX11         XKBAlloc
-00000000 T _XkbFreeControls     libX11         XKBAlloc
-00000000 T _XkbAllocIndicatorMaps libX11         XKBAlloc
-00000000 T _XkbFreeIndicatorMaps libX11         XKBAlloc
-00000000 T _XkbAllocKeyboard    libX11         XKBAlloc
-00000000 T _XkbFreeKeyboard     libX11         XKBAlloc
-00000000 T _XkbAddDeviceLedInfo libX11         XKBAlloc
-00000000 T _XkbResizeDeviceButtonActions libX11         XKBAlloc
-00000000 T _XkbAllocDeviceInfo  libX11         XKBAlloc
-00000000 T _XkbFreeDeviceInfo   libX11         XKBAlloc
-00000000 T _XkbChangeKeycodeRange libX11         XKBMAlloc
-#else
-00000000 T __DUMMY__   libX11         XKB
-00000000 T __DUMMY__   libX11         XKB
-00000000 T __DUMMY__     libX11         XKB
-00000000 T __DUMMY__ libX11         XKB
-00000000 T __DUMMY__    libX11         XKB
-00000000 T __DUMMY__   libX11         XKB
-00000000 T __DUMMY__        libX11         XKB
-00000000 T __DUMMY__       libX11         XKB
-00000000 T __DUMMY__  libX11         XKB
-00000000 T __DUMMY__  libX11         XKB
-00000000 T __DUMMY__ libX11         XKB
-00000000 T __DUMMY__ libX11         XKB
-00000000 T __DUMMY__ libX11         XKB
-00000000 T __DUMMY__         libX11         XKB
-00000000 T __DUMMY__ libX11         XKB
-00000000 T __DUMMY__ libX11         XKB
-00000000 T __DUMMY__ libX11         XKB
-00000000 T __DUMMY__ libX11         XKB
-00000000 T __DUMMY__      libX11         XKB
-00000000 T __DUMMY__     libX11         XKB
-00000000 T __DUMMY__  libX11         XKBBind
-00000000 T __DUMMY__ libX11         XKBBind
-00000000 T __DUMMY__     libX11         XKBBind
-00000000 T __DUMMY__     libX11         XKBBind
-00000000 T __DUMMY__ libX11         XKBBind
-00000000 T __DUMMY__ libX11         XKBBind
-00000000 T __DUMMY__  libX11         XKBBind
-00000000 T __DUMMY__ libX11         XKBBind
-00000000 T __DUMMY__        libX11         XKBBind
-00000000 T __DUMMY__     libX11         XKBCompat
-00000000 T __DUMMY__     libX11         XKBCompat
-00000000 T __DUMMY__ libX11         XKBCtrls
-00000000 T __DUMMY__ libX11         XKBCtrls
-00000000 T __DUMMY__ libX11         XKBCtrls
-00000000 T __DUMMY__ libX11         XKBCtrls
-00000000 T __DUMMY__ libX11         XKBCtrls
-00000000 T __DUMMY__      libX11         XKBCtrls
-00000000 T __DUMMY__      libX11         XKBCtrls
-00000000 T __DUMMY__ libX11         XKBCtrls
-00000000 T __DUMMY__    libX11         XKBGetMap
-00000000 T __DUMMY__           libX11         XKBGetMap
-00000000 T __DUMMY__      libX11         XKBGetMap
-00000000 T __DUMMY__    libX11         XKBGetMap
-00000000 T __DUMMY__       libX11         XKBGetMap
-00000000 T __DUMMY__  libX11         XKBGetMap
-00000000 T __DUMMY__   libX11         XKBGetMap
-00000000 T __DUMMY__ libX11         XKBGetMap
-00000000 T __DUMMY__ libX11         XKBGetMap
-00000000 T __DUMMY__ libX11         XKBGetMap
-00000000 T __DUMMY__    libX11         XKBGetMap
-00000000 T __DUMMY__ libX11         XKBGetByName
-00000000 T __DUMMY__      libX11         XKBGetByName
-00000000 T __DUMMY__         libX11         XKBNames
-00000000 T __DUMMY__         libX11         XKBNames
-00000000 T __DUMMY__      libX11         XKBNames
-00000000 T __DUMMY__  libX11         XKBNames
-00000000 T __DUMMY__           libX11         XKBSetMap
-00000000 T __DUMMY__        libX11         XKBSetMap
-00000000 T __DUMMY__   libX11         XKBUse
-00000000 T __DUMMY__  libX11         XKBUse
-00000000 T __DUMMY__     libX11         XKBUse
-00000000 T __DUMMY__ libX11         XKBleds
-00000000 T __DUMMY__  libX11         XKBleds
-00000000 T __DUMMY__  libX11         XKBleds
-00000000 T __DUMMY__ libX11         XKBleds
-00000000 T __DUMMY__ libX11         XKBleds
-00000000 T __DUMMY__ libX11         XKBleds
-00000000 T __DUMMY__ libX11         XKBleds
-00000000 T __DUMMY__       libX11         XKBBell
-00000000 T __DUMMY__  libX11         XKBBell
-00000000 T __DUMMY__  libX11         XKBBell
-00000000 T __DUMMY__             libX11         XKBBell
-00000000 T __DUMMY__        libX11         XKBBell
-00000000 T __DUMMY__        libX11         XKBBell
-00000000 T __DUMMY__ libX11         XKBGeom
-00000000 T __DUMMY__  libX11         XKBGeom
-00000000 T __DUMMY__ libX11         XKBGeom
-00000000 T __DUMMY__ libX11         XKBGeom
-00000000 T __DUMMY__ libX11         XKBGeom
-00000000 T __DUMMY__      libX11         XKBGeom
-00000000 T __DUMMY__ libX11         XKBGeom
-00000000 T __DUMMY__      libX11         XKBSetGeom
-00000000 T __DUMMY__ libX11         XKBExtDev
-00000000 T __DUMMY__    libX11         XKBExtDev
-00000000 T __DUMMY__ libX11         XKBExtDev
-00000000 T __DUMMY__ libX11         XKBExtDev
-00000000 T __DUMMY__ libX11         XKBExtDev
-00000000 T __DUMMY__    libX11         XKBExtDev
-00000000 T __DUMMY__ libX11         XKBExtDev
-00000000 T __DUMMY__ libX11         XKBExtDev
-00000000 T __DUMMY__ libX11         XKBExtDev
-00000000 T __DUMMY__   libX11         XKBList
-00000000 T __DUMMY__ libX11         XKBList
-00000000 T __DUMMY__ libX11         XKBMisc
-00000000 T __DUMMY__ libX11         XKBMisc
-00000000 T __DUMMY__ libX11         XKBMisc
-00000000 T __DUMMY__ libX11         XKBMisc
-00000000 T __DUMMY__ libX11         XKBMisc
-00000000 T __DUMMY__ libX11         XKBMisc
-00000000 T __DUMMY__ libX11         XKBMisc
-00000000 T __DUMMY__ libX11         XKBMisc
-00000000 T __DUMMY__ libX11         XKBMisc
-00000000 T __DUMMY__   libX11         XKBMAlloc
-00000000 T __DUMMY__   libX11         XKBMAlloc
-00000000 T __DUMMY__      libX11         XKBMAlloc
-00000000 T __DUMMY__     libX11         XKBMAlloc
-00000000 T __DUMMY__       libX11         XKBMAlloc
-00000000 T __DUMMY__    libX11         XKBMAlloc
-00000000 T __DUMMY__    libX11         XKBMAlloc
-00000000 T __DUMMY__ libX11         XKBMAlloc
-00000000 T __DUMMY__    libX11         XKBMAlloc
-00000000 T __DUMMY__    libX11         XKBMAlloc
-00000000 T __DUMMY__ libX11         XKBGAlloc
-00000000 T __DUMMY__ libX11         XKBGAlloc
-00000000 T __DUMMY__   libX11         XKBGAlloc
-00000000 T __DUMMY__   libX11         XKBGAlloc
-00000000 T __DUMMY__ libX11         XKBGAlloc
-00000000 T __DUMMY__   libX11         XKBGAlloc
-00000000 T __DUMMY__ libX11         XKBGAlloc
-00000000 T __DUMMY__ libX11         XKBGAlloc
-00000000 T __DUMMY__ libX11         XKBGAlloc
-00000000 T __DUMMY__     libX11         XKBGAlloc
-00000000 T __DUMMY__     libX11         XKBGAlloc
-00000000 T __DUMMY__ libX11         XKBGAlloc
-00000000 T __DUMMY__  libX11         XKBGAlloc
-00000000 T __DUMMY__     libX11         XKBGAlloc
-00000000 T __DUMMY__   libX11         XKBGAlloc
-00000000 T __DUMMY__  libX11         XKBGAlloc
-00000000 T __DUMMY__ libX11         XKBGAlloc
-00000000 T __DUMMY__  libX11         XKBGAlloc
-00000000 T __DUMMY__ libX11         XKBGAlloc
-00000000 T __DUMMY__ libX11         XKBGAlloc
-00000000 T __DUMMY__ libX11         XKBGAlloc
-00000000 T __DUMMY__ libX11         XKBGAlloc
-00000000 T __DUMMY__ libX11         XKBGAlloc
-00000000 T __DUMMY__ libX11         XKBGAlloc
-00000000 T __DUMMY__ libX11         XKBGAlloc
-00000000 T __DUMMY__    libX11         XKBGAlloc
-00000000 T __DUMMY__  libX11         XKBGAlloc
-00000000 T __DUMMY__    libX11         XKBGAlloc
-00000000 T __DUMMY__    libX11         XKBGAlloc
-00000000 T __DUMMY__  libX11         XKBGAlloc
-00000000 T __DUMMY__  libX11         XKBGAlloc
-00000000 T __DUMMY__     libX11         XKBGAlloc
-00000000 T __DUMMY__   libX11         XKBGAlloc
-00000000 T __DUMMY__     libX11         XKBGAlloc
-00000000 T __DUMMY__       libX11         XKBGAlloc
-00000000 T __DUMMY__       libX11         XKBGAlloc
-00000000 T __DUMMY__   libX11         XKBGAlloc
-00000000 T __DUMMY__    libX11         XKBGAlloc
-00000000 T __DUMMY__ libX11         XKBGAlloc
-00000000 T __DUMMY__ libX11         XKBGAlloc
-00000000 T __DUMMY__   libX11         XKBGAlloc
-00000000 T __DUMMY__   libX11         XKBAlloc
-00000000 T __DUMMY__    libX11         XKBAlloc
-00000000 T __DUMMY__       libX11         XKBAlloc
-00000000 T __DUMMY__        libX11         XKBAlloc
-00000000 T __DUMMY__    libX11         XKBAlloc
-00000000 T __DUMMY__     libX11         XKBAlloc
-00000000 T __DUMMY__ libX11         XKBAlloc
-00000000 T __DUMMY__ libX11         XKBAlloc
-00000000 T __DUMMY__    libX11         XKBAlloc
-00000000 T __DUMMY__     libX11         XKBAlloc
-00000000 T __DUMMY__ libX11         XKBAlloc
-00000000 T __DUMMY__ libX11         XKBAlloc
-00000000 T __DUMMY__  libX11         XKBAlloc
-00000000 T __DUMMY__   libX11         XKBAlloc
-00000000 T __DUMMY__   libX11         XKBAlloc
-#endif
-00000000 T _IceListenForWellKnownConnections libICE         listenwk
-00000000 T __IceTransNoListen   libICE         transport
diff --git a/xc/lib/X11/jump_ignore b/xc/lib/X11/jump_ignore
deleted file mode 100644
index f7468065f..000000000
--- a/xc/lib/X11/jump_ignore
+++ /dev/null
@@ -1,63 +0,0 @@
-# $XConsortium: jump_ignore,v 1.3 95/06/06 21:20:40 kaleb Exp $
-# $XFree86: xc/lib/X11/jump_ignore,v 3.10 1999/05/30 02:27:59 dawes Exp $
-# jump_ignore
-00000000 T __XlcAddCT           libX11         lcCT
-00000000 T __XKeycodeToKeysym   libX11         KeyBind
-00000000 T __XKeysymToKeycode   libX11         KeyBind
-00000000 T __XLookupKeysym      libX11         KeyBind
-00000000 T __XRefreshKeyboardMapping libX11         KeyBind
-00000000 T __XLookupString      libX11         KeyBind
-00000000 T __XkbReloadDpy       libX11         XKBBind
-00000000 T __XkbReadGetCompatMapReply libX11         XKBCompat
-00000000 T __XkbKSToKnownSet    libX11         XKBCvt
-00000000 T __XkbKSToThai        libX11         XKBCvt
-00000000 T __XkbGetConverters   libX11         XKBCvt
-00000000 T __XkbGetCharset      libX11         XKBCvt
-00000000 T __XkbReadGetMapReply libX11         XKBGetMap
-00000000 T __XkbReadGetNamesReply libX11         XKBNames
-00000000 T __XkbInitReadBuffer  libX11         XKBRdBuf
-00000000 T __XkbSkipReadBufferData libX11         XKBRdBuf
-00000000 T __XkbCopyFromReadBuffer libX11         XKBRdBuf
-00000000 T __XkbReadCopyKeySyms libX11         XKBRdBuf
-00000000 T __XkbReadBufferCopyKeySyms libX11         XKBRdBuf
-00000000 T __XkbWriteCopyKeySyms libX11         XKBRdBuf
-00000000 T __XkbPeekAtReadBuffer libX11         XKBRdBuf
-00000000 T __XkbGetReadBufferPtr libX11         XKBRdBuf
-00000000 T __XkbFreeReadBuffer  libX11         XKBRdBuf
-00000000 T __XkbGetReadBufferCountedString libX11         XKBRdBuf
-00000000 T __XkbNoteCoreMapChanges libX11         XKBUse
-00000000 T __XkbReadGetIndicatorMapReply libX11         XKBleds
-00000000 T __XkbReadGetGeometryReply libX11         XKBGeom
-00000000 T __SendSetGeometry    libX11         XKBSetGeom
-00000000 T __XmbDefaultTextEscapement libX11         omDefault
-00000000 T __XwcDefaultTextEscapement libX11         omDefault
-00000000 T __XmbDefaultTextExtents libX11         omDefault
-00000000 T __XwcDefaultTextExtents libX11         omDefault
-00000000 T __XmbDefaultTextPerCharExtents libX11         omDefault
-00000000 T __XwcDefaultTextPerCharExtents libX11         omDefault
-00000000 T __XmbDefaultDrawString libX11         omDefault
-00000000 T __XwcDefaultDrawString libX11         omDefault
-00000000 T __XmbDefaultDrawImageString libX11         omDefault
-00000000 T __XwcDefaultDrawImageString libX11         omDefault
-00000000 T __XSnprintf libX11         snprintf
-00000000 T __XVsnprintf libX11         snprintf
-00000004 D __XkbInternAtomFunc  libX11         XKB
-00000004 D __XkbGetAtomNameFunc libX11         XKB
-00000000 T __XTextHeight        libX11         TextExt
-00000000 T __XTextHeight16      libX11         TextExt16
-00000000 T _default_ct_data_list libX11         lcCT
-00000000 T _default_ct_data_list_num libX11         lcCT
-00000000 T __XlcParsePath       libX11         lcFile
-00000000 T __XlcGetCodeSetFromName libX11         lcGenConv
-00000000 T __XlcParse_scopemaps libX11         lcGeneric
-00000000 T __XlcDbg_printValue  libX11         lcGeneric
-00000000 T _add_conversion      libX11         lcGeneric
-00000000 T __XlcJisLoader       libX11         lcJis
-00000000 T _parse_fontname      libX11         omGeneric
-00000000 T _destroy_fontdata    libX11         omGeneric
-00000000 T _read_EncodingInfo   libX11         omGeneric
-00000000 T __XomGetFontDataFromFontSet libX11         omXChar
-00000000 K __Xcyrillic          libX11         XKBCvt
-00000000 K __Xkoi8              libX11         XKBCvt
-00000000 K __Xkoi8u             libX11         XKBCvt
-00000000 K __Xgreek             libX11         XKBCvt
diff --git a/xc/lib/X11/jump_vars b/xc/lib/X11/jump_vars
deleted file mode 100644
index 46f2a9a3a..000000000
--- a/xc/lib/X11/jump_vars
+++ /dev/null
@@ -1,80 +0,0 @@
-# $XConsortium: jump_vars,v 1.2 94/12/07 10:48:04 kaleb Exp $
-# $XFree86: xc/lib/X11/jump_vars,v 3.1 1995/01/28 15:42:57 dawes Exp $
-#
-00008000 K __XkeyTable          libX11         XStrKeysym
-00000100 K __Xevent_to_mask     libX11         evtomask
-00000004 D __qfree              libX11         globals
-00000004 C __XIOErrorFunction   libX11         globals
-00000004 C __XErrorFunction     libX11         globals
-00000004 C __Xdebug             libX11         globals
-00000004 C __XHeadOfDisplayList libX11         globals
-00000040 D _XcmsCIELabColorSpace libX11         CIELab
-00000040 D _XcmsCIELuvColorSpace libX11         CIELuv
-00000040 D _XcmsCIEXYZColorSpace libX11         CIEXYZ
-00000040 D _XcmsCIEuvYColorSpace libX11         CIEuvY
-00000040 D _XcmsCIExyYColorSpace libX11         CIExyY
-00000040 D _XcmsTekHVCColorSpace libX11         TekHVC
-00000040 D _XcmsUNDEFINEDColorSpace libX11         UNDEFINED
-00000040 D __XcmsDIColorSpacesInit libX11         XcmsGlobls
-00000004 D __XcmsDIColorSpaces  libX11         XcmsGlobls
-00000020 D __XcmsDDColorSpacesInit libX11         XcmsGlobls
-00000004 D __XcmsDDColorSpaces  libX11         XcmsGlobls
-00000010 D __XcmsSCCFuncSetsInit libX11         XcmsGlobls
-00000004 D __XcmsSCCFuncSets    libX11         XcmsGlobls
-00000010 D __XcmsCIEXYZ_prefix   libX11         XcmsGlobls
-00000010 D __XcmsCIEuvY_prefix   libX11         XcmsGlobls
-00000010 D __XcmsCIExyY_prefix   libX11         XcmsGlobls
-00000010 D __XcmsCIELab_prefix   libX11         XcmsGlobls
-00000010 D __XcmsCIELuv_prefix   libX11         XcmsGlobls
-00000010 D __XcmsTekHVC_prefix   libX11         XcmsGlobls
-00000010 D __XcmsRGBi_prefix     libX11         XcmsGlobls
-00000010 D __XcmsRGB_prefix      libX11         XcmsGlobls
-00000080 D __XcmsRegColorSpaces libX11         XcmsGlobls
-00000040 D _XcmsRGBiColorSpace  libX11         XcmsLRGB
-00000040 D _XcmsRGBColorSpace   libX11         XcmsLRGB
-00000020 D _XcmsLinearRGBFunctionSet libX11         XcmsLRGB
-000000a8 D __X11TransSocketINETFuncs libX11         x11trans
-000000a8 D __X11TransSocketTCPFuncs libX11         x11trans
-000000a8 D __X11TransSocketUNIXFuncs libX11         x11trans
-000000a8 D __X11TransSocketLocalFuncs libX11         x11trans
-000000a8 D __XimXTransSocketINETFuncs libX11         ximtrans
-000000a8 D __XimXTransSocketTCPFuncs libX11         ximtrans
-000000a8 D __XimXTransSocketUNIXFuncs libX11         ximtrans
-000000a8 D __XimXTransSocketLocalFuncs libX11         ximtrans
-00000040 D __XimImSportRec      libX11         imImSw
-00000040 D __XimTransportRec    libX11         imTransR
-00000004 D __XlcGenericMethods  libX11         lcGeneric
-00000004 D __XlcPublicMethods   libX11         lcPublic
-00000004 D __SmcOpcode          libSM          sm_client
-00000004 D __SmsOpcode          libSM          sm_client
-00000004 D __SmVersionCount     libSM          sm_client
-00000018 D __SmcVersions        libSM          sm_client
-00000018 D __SmsVersions        libSM          sm_client
-00000004 D __SmAuthCount        libSM          sm_client
-00000004 D __SmAuthNames        libSM          sm_client
-00000004 D __SmcAuthProcs       libSM          sm_client
-00000004 D __SmsAuthProcs       libSM          sm_client
-00000004 D __SmcErrorHandler    libSM          sm_client
-00000004 D __SmsErrorHandler    libSM          sm_client
-00000004 C __SmsNewClientProc   libSM          sm_client
-00000004 C __SmsNewClientData   libSM          sm_client
-00000004 D __IceConnectionCount libICE         connect
-00000004 D __IceLastMajorOpcode libICE         connect
-00000004 D __IceAuthCount       libICE         connect
-00000004 D __IceAuthNames       libICE         connect
-00000004 D __IcePoAuthProcs     libICE         connect
-00000004 D __IcePaAuthProcs     libICE         connect
-00000004 D __IcePaAuthDataEntryCount libICE         connect
-00000004 D __IceVersionCount    libICE         connect
-00000018 D __IceVersions        libICE         connect
-00000004 D __IceWatchProcs      libICE         connect
-00000004 D __IceErrorHandler    libICE         connect
-00000004 D __IceIOErrorHandler  libICE         connect
-00000600 C __IceConnectionObjs  libICE         connect
-00000600 C __IceConnectionStrings libICE         connect
-00001000 C __IceProtocols       libICE         connect
-00001000 C __IcePaAuthDataEntries libICE         connect
-00000070 D __IceTransSocketINETFuncs libICE         transport
-00000070 D __IceTransSocketTCPFuncs libICE         transport
-00000070 D __IceTransSocketUNIXFuncs libICE         transport
-00000070 D __IceTransSocketLocalFuncs libICE         transport
diff --git a/xc/lib/X11/lcCT.c b/xc/lib/X11/lcCT.c
deleted file mode 100644
index 33df0df8b..000000000
--- a/xc/lib/X11/lcCT.c
+++ /dev/null
@@ -1,922 +0,0 @@
-/* $TOG: lcCT.c /main/17 1998/06/18 13:17:06 kaleb $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-/*
- * Copyright 1995 by FUJITSU LIMITED
- * This is source code modified by FUJITSU LIMITED under the Joint
- * Development Agreement for the CDE/Motif PST.
- *
- * Modifier: Takanori Tateno   FUJITSU LIMITED
- *
- */
-/* $XFree86: xc/lib/X11/lcCT.c,v 3.13 1999/06/06 14:05:53 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "XlcPubI.h"
-#include <X11/Xos.h>
-#include <stdio.h>
-
-typedef struct _StateRec {
-    XlcCharSet charset;
-    XlcCharSet GL_charset;
-    XlcCharSet GR_charset;
-    XlcCharSet ext_seg_charset;
-    int ext_seg_left;
-} StateRec, *State;
-
-typedef struct _CTDataRec {
-    char *name;
-    char *encoding;		/* Compound Text encoding */
-} CTDataRec, *CTData;
-
-typedef struct _CTInfoRec {
-    XlcCharSet charset;
-    int encoding_len;
-    char *encoding;		/* Compound Text encoding */
-    int ext_segment_len;
-    char *ext_segment;		/* extended segment */
-    struct _CTInfoRec *next;
-} CTInfoRec, *CTInfo;
-
-static CTDataRec default_ct_data[] =
-{
-    { "ISO8859-1:GL", "\033(B" },
-    { "ISO8859-1:GR", "\033-A" },
-    { "ISO8859-2:GR", "\033-B" },
-    { "ISO8859-3:GR", "\033-C" },
-    { "ISO8859-4:GR", "\033-D" },
-    { "ISO8859-7:GR", "\033-F" },
-    { "ISO8859-6:GR", "\033-G" },
-    { "ISO8859-8:GR", "\033-H" },
-    { "ISO8859-5:GR", "\033-L" },
-    { "ISO8859-9:GR", "\033-M" },
-    { "ISO8859-10:GR", "\033-V" },
-    { "JISX0201.1976-0:GL", "\033(J" },
-    { "JISX0201.1976-0:GR", "\033)I" },
-
-    { "GB2312.1980-0:GL", "\033$(A" },
-    { "GB2312.1980-0:GR", "\033$)A" },
-    { "JISX0208.1983-0:GL", "\033$(B" },
-    { "JISX0208.1983-0:GR", "\033$)B" },
-    { "KSC5601.1987-0:GL", "\033$(C" },
-    { "KSC5601.1987-0:GR", "\033$)C" },
-#ifdef notdef
-    { "JISX0212.1990-0:GL", "\033$(D" },
-    { "JISX0212.1990-0:GR", "\033$)D" },
-    { "CNS11643.1986-1:GL", "\033$(G" },
-    { "CNS11643.1986-1:GR", "\033$)G" },
-    { "CNS11643.1986-2:GL", "\033$(H" },
-    { "CNS11643.1986-2:GR", "\033$)H" },
-#endif
-    { "TIS620.2533-1:GR", "\033-T"},
-    { "ISO10646-1", "\033%B"},
-    /* Non-Standard Character Set Encodings */
-    { "KOI8-R:GR", "\033%/1\200\210koi8-r\002"},
-    { "KOI8-U:GR", "\033%/1\200\211koi8-u\002"},
-    { "ISO8859-15:GR", "\033%/1\200\213iso8859-15\002"},
-    { "ARMSCII-8:GR", "\033%/1\200\210armscii-8\002"},
-    { "ISO8859-14:GR", "\033%/1\200\213iso8859-14\002"},
-    { "IBM-CP1133:GR", "\033%/1\200\210ibm-cp1133\002"},
-    { "MULELAO-1:GR", "\033%/1\200\210mulelao-1\002"},
-    { "VISCII1.1-1:GR", "\033%/1\200\210viscii1.1-1\002"},
-    { "TCVN-5712:GR", "\033%/1\200\210tcvn-5712\002"},
-    { "GEORGIAN-ACADEMY:GR", "\033%/1\200\210georgian-academy\002"},
-    { "GEORGIAN-PS:GR", "\033%/1\200\210georgian-ps\002"},
-} ; 
-
-#define XctC0		0x0000
-#define XctHT		0x0009
-#define XctNL		0x000a
-#define XctESC		0x001b
-#define XctGL		0x0020
-#define XctC1		0x0080
-#define XctCSI		0x009b
-#define XctGR		0x00a0
-
-#define XctCntrlFunc	0x0023
-#define XctMB		0x0024
-#define XctOtherCoding	0x0025
-#define XctGL94		0x0028
-#define XctGR94		0x0029
-#define XctGR96		0x002d
-#define XctNonStandard	0x002f
-#define XctIgnoreExt	0x0030
-#define XctNotIgnoreExt	0x0031
-#define XctLeftToRight	0x0031
-#define XctRightToLeft	0x0032
-#define XctDirection	0x005d
-#define XctDirectionEnd	0x005d
-
-#define XctGL94MB	0x2428
-#define XctGR94MB	0x2429
-#define XctExtSeg	0x252f
-#define XctOtherSeg	0x2f00
-
-#define XctESCSeq	0x1b00
-#define XctCSISeq	0x9b00
-
-#define SKIP_I(str)	while (*(str) >= 0x20 && *(str) <=  0x2f) (str)++;
-#define SKIP_P(str)	while (*(str) >= 0x30 && *(str) <=  0x3f) (str)++;
-
-typedef struct {
-    XlcSide side;
-    int char_size;
-    int set_size;
-    int ext_seg_length;
-    int version;
-    CTInfo ct_info;
-} CTParseRec, *CTParse;
-
-CTDataRec *default_ct_data_list()
-{
-	return(default_ct_data);
-}
-
-size_t default_ct_data_list_num()
-{
-	size_t num = sizeof(default_ct_data) / sizeof(CTDataRec);
-	return(num);
-}
-
-static CTInfo ct_list = NULL;
-
-static CTInfo
-_XlcGetCTInfoFromEncoding(encoding, length)
-    register char *encoding;
-    register int length;
-{
-    register CTInfo ct_info;
-
-    for (ct_info = ct_list; ct_info; ct_info = ct_info->next) {
-	if (length >= ct_info->encoding_len) {
-	    if (ct_info->ext_segment) {
-		if (!strncmp(ct_info->encoding, encoding, 4) &&
-		    !strncmp(ct_info->ext_segment, encoding + 6,
-			     ct_info->ext_segment_len))
-		    return ct_info;
-	    } else if (!strncmp(ct_info->encoding, encoding,
-				ct_info->encoding_len)) {
-		return ct_info;
-	    }
-	}
-    }
-
-    return (CTInfo) NULL;
-}
-
-static unsigned int
-_XlcParseCT(parse, text, length)
-    register CTParse parse;
-    char **text;
-    int *length;
-{
-    unsigned int ret = 0;
-    unsigned char ch;
-    register unsigned char *str = (unsigned char *) *text;
-
-    bzero((char *) parse, sizeof(CTParseRec));
-
-    switch (ch = *str++) {
-	case XctESC:
-	    if (*str == XctOtherCoding && *(str + 1) == XctNonStandard
-		&& *(str + 2) >= 0x30 && *(str + 2) <= 0x3f && *length >= 6) {
-
-		/* non-standard encodings */
-		parse->side = XlcGLGR;
-		parse->set_size = 0;
-		str += 2;
-		if (*str <= 0x34) {
-		    parse->char_size = *str - 0x30;
-		    if (parse->char_size == 0) parse->char_size = 1;
-		    ret = XctExtSeg;
-		    parse->ct_info = _XlcGetCTInfoFromEncoding(*text, *length);
-		} else
-		    ret = XctOtherSeg;
-		str++;
-		parse->ext_seg_length = (*str - 128) * 128 + *(str + 1) - 128;
-		str += 2;
-
-		goto done;
-	    } else if (*str == XctCntrlFunc && *length >= 4 &&
-		       *(str + 1) >= 0x20 && *(str + 1) <= 0x2f &&
-		       (*(str + 2) == XctIgnoreExt ||
-			*(str + 2) == XctNotIgnoreExt)) {
-		
-		/* ignore extension or not */
-		str++;
-		parse->version = *str++ - 0x20;
-		ret = *str++;
-
-		goto done;
-	    }
-	    
-	    if (*str == XctMB) {	/* multiple-byte sets */
-		parse->char_size = 2;
-		str++;
-	    } else
-		parse->char_size = 1;
-	
-	    switch (*str) {
-		case XctGL94:
-		    parse->side = XlcGL;
-		    parse->set_size = 94;
-		    ret = (parse->char_size == 1) ? XctGL94 : XctGL94MB;
-		    break;
-		case XctGR94:
-		    parse->side = XlcGR;
-		    parse->set_size = 94;
-		    ret = (parse->char_size == 1) ? XctGR94 : XctGR94MB;
-		    break;
-		case XctGR96:
-		    if (parse->char_size == 1) {
-			parse->side = XlcGR;
-			parse->set_size = 96;
-			ret = XctGR96;
-		    }
-		    break;
-	    }
-	    if (ret) {
-		str++;
-		if (*str >= 0x24 && *str <= 0x2f) {	/* non-standard */
-		    ret = 0;
-		    str++;
-		}
-	    }
-
-	    SKIP_I(str)
-
-	    if (ret && *str < 0x40)			/* non-standard */
-		ret = 0;
-
-	    if (*str < 0x30 || *str > 0x7e || (char *) str - *text >= *length)
-		break;
-	    
-	    if (ret == 0)
-		ret = XctESCSeq;
-	    else {
-		if (parse->char_size == 2) {
-		    if (*str >= 0x70)
-			parse->char_size = 4;
-		    else if (*str >= 0x60)
-			parse->char_size = 3;
-		}
-		parse->ct_info = _XlcGetCTInfoFromEncoding(*text, *length);
-	    }
-	    str++;
-	    goto done;
-	case XctCSI:
-	    /* direction */
-	    if (*str == XctLeftToRight && *(str + 1) == XctDirection) {
-		ret = XctLeftToRight;
-		str += 2;
-		goto done;
-	    } else if (*str == XctRightToLeft && *(str + 1) == XctDirection) {
-		ret = XctRightToLeft;
-		str += 2;
-		goto done;
-	    } else if (*str == XctDirectionEnd) {
-		ret = XctDirectionEnd;
-		str++;
-		goto done;
-	    }
-
-	    SKIP_P(str)
-	    SKIP_I(str)
-
-	    if (*str < 0x40 && *str > 0x7e)
-		break;
-
-	    ret = XctCSISeq;
-	    str++;
-	    goto done;
-    }
-
-    if (ch & 0x80) {
-	if (ch < 0xa0)
-	    ret = XctC1;
-	else
-	    ret = XctGR;
-    } else {
-	if (ch == XctHT || ch == XctNL)
-	    ret = ch;
-	else if (ch < 0x20)
-	    ret = XctC0;
-	else
-	    ret = XctGL;
-    }
-
-    return ret;
-
-done:
-    *length -= (char *) str - *text;
-    *text = (char *) str;
-
-    return ret;
-}
-
-XlcCharSet
-_XlcAddCT(name, encoding)
-    _Xconst char *name;
-    char *encoding;
-{
-    CTInfo ct_info;
-    XlcCharSet charset;
-    CTParseRec parse;
-    char *ct_ptr = encoding;
-    int length;
-    unsigned int type;
-
-    length = strlen(encoding);
-
-    switch (type = _XlcParseCT(&parse, &ct_ptr, &length)) {
-	case XctExtSeg:
-	case XctGL94:
-	case XctGL94MB:
-	case XctGR94:
-	case XctGR94MB:
-	case XctGR96:
-	    if (parse.ct_info)		/* existed */
-		return parse.ct_info->charset;
-	    break;
-	default:
-	    return (XlcCharSet) NULL;
-    }
-
-    charset = _XlcCreateDefaultCharSet(name, encoding);
-    if (charset == NULL)
-	return (XlcCharSet) NULL;
-    _XlcAddCharSet(charset);
-
-    ct_info = (CTInfo) Xmalloc(sizeof(CTInfoRec));
-    if (ct_info == NULL)
-	return (XlcCharSet) NULL;
-    
-    ct_info->charset = charset;
-    ct_info->encoding = charset->ct_sequence;
-    ct_info->encoding_len = strlen(ct_info->encoding);
-    if (type == XctExtSeg) {
-	ct_info->ext_segment = ct_info->encoding + 6;
-	ct_info->ext_segment_len = strlen(ct_info->ext_segment);
-    } else {
-	ct_info->ext_segment = NULL;
-	ct_info->ext_segment_len = 0;
-    }
-    ct_info->next = ct_list;
-    ct_list = ct_info;
-
-    return charset;
-}
-
-static CTInfo
-_XlcGetCTInfoFromCharSet(charset)
-    register XlcCharSet charset;
-{
-    register CTInfo ct_info;
-
-    for (ct_info = ct_list; ct_info; ct_info = ct_info->next)
-	if (ct_info->charset == charset)
-	    return ct_info;
-
-    return (CTInfo) NULL;
-}
-
-Bool
-_XlcParseCharSet(charset)
-    XlcCharSet charset;
-{
-    CTParseRec parse;
-    char *ptr, *bufp, buf[BUFSIZ];
-    int length;
-
-    if (charset->ct_sequence == NULL)
-	return False;
-
-    if (charset->name && strlen(charset->name) >= sizeof(buf))
-	return False;
-
-    ptr = charset->ct_sequence;
-    length = strlen(ptr);
-
-    (void) _XlcParseCT(&parse, &ptr, &length);
-	
-    if (charset->name) {
-	charset->xrm_name = XrmStringToQuark(charset->name);
-
-	if ((length = strlen (charset->name)) < sizeof buf) bufp = buf;
-	else bufp = Xmalloc (length + 1);
-
-	if (bufp == NULL) return False;
-	strcpy(bufp, charset->name);
-	if ((ptr = strchr(bufp, ':')))
-	    *ptr = '\0';
-	charset->xrm_encoding_name = XrmStringToQuark(bufp);
-	if (bufp != buf) Xfree (bufp);
-	charset->encoding_name = XrmQuarkToString(charset->xrm_encoding_name);
-    } else {
-	charset->xrm_name = 0;
-	charset->encoding_name = NULL;
-	charset->xrm_encoding_name = 0;
-    }
-
-    charset->side = parse.side;
-    charset->char_size = parse.char_size;
-    charset->set_size = parse.set_size;
-
-    return True;
-}
-
-static void init_converter();
-
-Bool
-_XlcInitCTInfo()
-{
-    register XlcCharSet charset;
-    register CTData ct_data;
-    register int num;
-
-    if (ct_list == NULL) {
-	num = sizeof(default_ct_data) / sizeof(CTDataRec);
-	for (ct_data = default_ct_data; num-- > 0; ct_data++) {
-	    charset = _XlcAddCT(ct_data->name, ct_data->encoding);
-	    if (charset == NULL)
-		continue;
-	}
-	init_converter();
-    }
-
-    return True;
-}
-
-
-static int
-_XlcCheckCTSequence(state, ctext, ctext_len)
-    State state;
-    char **ctext;
-    int *ctext_len;
-{
-    XlcCharSet charset;
-    CTParseRec parse;
-    CTInfo ct_info;
-    int length;
-
-    _XlcParseCT(&parse, ctext, ctext_len);
-
-    ct_info = parse.ct_info;
-    if (parse.ext_seg_length > 0) {	/* XctExtSeg or XctOtherSeg */
-	if (ct_info) {
-	    length = ct_info->ext_segment_len;
-	    *ctext += length;
-	    *ctext_len -= length;
-	    state->ext_seg_left = parse.ext_seg_length - length;
-	    state->ext_seg_charset = ct_info->charset;
-	} else {
-	    state->ext_seg_left = parse.ext_seg_length;
-	    state->ext_seg_charset = NULL;
-	}
-    } else if (ct_info) {
-	if ((charset = ct_info->charset)) {
-	    if (charset->side == XlcGL)
-		state->GL_charset = charset;
-	    else if (charset->side == XlcGR)
-		state->GR_charset = charset;
-	}
-    }
-
-    return 0;
-}
-
-
-static void
-init_state(conv)
-    XlcConv conv;
-{
-    State state = (State) conv->state;
-    static XlcCharSet GL_charset = NULL;
-    static XlcCharSet GR_charset = NULL;
-
-    if (GL_charset == NULL) {
-	GL_charset = _XlcGetCharSet("ISO8859-1:GL");
-	GR_charset = _XlcGetCharSet("ISO8859-1:GR");
-    }
-
-    state->GL_charset = state->charset = GL_charset;
-    state->GR_charset = GR_charset;
-    state->ext_seg_charset = NULL;
-    state->ext_seg_left = 0;
-}
-
-static int
-cttocs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    register State state = (State) conv->state;
-    register unsigned char ch;
-    int length;
-    XlcCharSet charset = NULL;
-    char *ctptr, *bufptr;
-    int ctext_len, buf_len;
-
-    ctptr = *((char **) from);
-    bufptr = *((char **) to);
-    ctext_len = *from_left;
-    buf_len = *to_left;
-
-    while (ctext_len > 0 && buf_len > 0) {
-	if (state->ext_seg_left > 0) {
-	    length = min(state->ext_seg_left, ctext_len);
-	    length = min(length, buf_len);
-
-	    ctext_len -= length;
-	    state->ext_seg_left -= length;
-
-	    if (state->ext_seg_charset) {
-		charset = state->ext_seg_charset;
-		buf_len -= length;
-		if (charset->side == XlcGL) {
-		    while (length-- > 0)
-			*bufptr++ = *ctptr++ & 0x7f;
-		} else if (charset->side == XlcGR) {
-		    while (length-- > 0)
-			*bufptr++ = *ctptr++ | 0x80;
-		} else {
-		    while (length-- > 0)
-			*bufptr++ = *ctptr++;
-		}
-
-		if (state->ext_seg_left < 1)
-		    state->ext_seg_charset = NULL;
-	    }
-	    break;
-	}
-	ch = *((unsigned char *) ctptr);
-	if (ch == 0x1b || ch == 0x9b) {
-	    length = _XlcCheckCTSequence(state, &ctptr, &ctext_len);
-	    if (length < 0)
-		return -1;
-	    if (state->ext_seg_left > 0 && charset)
-		break;
-	} else {
-	    if (charset) {
-		if (charset != (ch & 0x80 ? state->GR_charset :
-				state->GL_charset))
-		    break;
-	    } else
-		charset = ch & 0x80 ? state->GR_charset : state->GL_charset;
-
-	    if ((ch < 0x20 && ch != '\0' && ch != '\n' && ch != '\t') ||
-		    (ch >= 0x80 && ch < 0xa0))
-		return -1;
-
-	    *bufptr++ = *ctptr++;
-	    ctext_len--;
-	    buf_len--;
-	}
-    }
-
-    if (charset)
-	state->charset = charset;
-    if (num_args > 0)
-	*((XlcCharSet *) args[0]) = state->charset;
-
-    *from_left -= ctptr - *((char **) from);
-    *from = (XPointer) ctptr;
-
-    *to_left -= bufptr - *((char **) to);
-    *to = (XPointer) bufptr;
-
-    return 0;
-}
-
-static int
-cstoct(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    State state = (State) conv->state;
-    XlcSide side;
-    unsigned char min_ch, max_ch;
-    register unsigned char ch;
-    int length;
-    CTInfo ct_info;
-    XlcCharSet charset;
-    char *csptr, *ctptr;
-    int csstr_len, ct_len;
-
-    if (num_args < 1)
-	return -1;
-    
-    csptr = *((char **) from);
-    ctptr = *((char **) to);
-    csstr_len = *from_left;
-    ct_len = *to_left;
-    
-    charset = (XlcCharSet) args[0];
-
-    ct_info = _XlcGetCTInfoFromCharSet(charset);
-    if (ct_info == NULL)
-	return -1;
-
-    side = charset->side;
-
-    if (ct_info->ext_segment) {
-	if (charset != state->ext_seg_charset && state->ext_seg_left < 1) {
-	    length = ct_info->encoding_len;
-	    if (ct_len < length)
-		return -1;
-	    strcpy(ctptr, ct_info->encoding);
-	    ctptr[4] = ((ct_info->ext_segment_len + csstr_len) / 128) | 0x80;
-	    ctptr[5] = ((ct_info->ext_segment_len + csstr_len) % 128) | 0x80;
-	    ctptr += length;
-	    ct_len -= length;
-	    state->ext_seg_left = csstr_len;
-	}
-	length = min(state->ext_seg_left, csstr_len);
-	state->ext_seg_left -= length;
-
-	if (side == XlcGL) {
-	    while (length-- > 0)
-		*ctptr++ = *csptr++ & 0x7f;
-	} else if (side == XlcGR) {
-	    while (length-- > 0)
-		*ctptr++ = *csptr++ | 0x80;
-	} else {
-	    while (length-- > 0)
-		*ctptr++ = *csptr++;
-	}
-	state->ext_seg_charset = (state->ext_seg_left > 0) ? charset : NULL;
-    } else {
-	if ((side == XlcGR && charset != state->GR_charset) ||
-	    (side == XlcGL && charset != state->GL_charset)) {
-
-	    ct_len -= ct_info->encoding_len;
-	    if (ct_len < 0)
-		return -1;
-	    strcpy(ctptr, ct_info->encoding);
-	    ctptr += ct_info->encoding_len;
-	}
-
-	min_ch = 0x20;
-	max_ch = 0x7f;
-
-	if (charset->set_size == 94) {
-	    max_ch--;
-	    if (charset->char_size > 1 || side == XlcGR)
-		min_ch++;
-	}
-
-	while (csstr_len > 0 && ct_len > 0) {
-	    ch = *((unsigned char *) csptr++) & 0x7f;
-	    if (ch < min_ch || ch > max_ch)
-		if (ch != 0x00 && ch != 0x09 && ch != 0x0a && ch != 0x1b)
-		    continue;	/* XXX */
-	    if (side == XlcGL)
-		*ctptr++ = ch & 0x7f;
-	    else if (side == XlcGR)
-		*ctptr++ = ch | 0x80;
-	    else
-		*ctptr++ = ch;
-	    csstr_len--;
-	    ct_len--;
-	}
-	if (side == XlcGR)
-	    state->GR_charset = charset;
-	else if (side == XlcGL)
-	    state->GL_charset = charset;
-    }
-
-    *from_left -= csptr - *((char **) from);
-    *from = (XPointer) csptr;
-
-    *to_left -= ctptr - *((char **) to);
-    *to = (XPointer) ctptr;
-
-    return 0;
-}
-
-static int
-strtocs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    State state = (State) conv->state;
-    register char *src, *dst;
-    unsigned char side;
-    register int length;
-
-    src = (char *) *from;
-    dst = (char *) *to;
-
-    length = min(*from_left, *to_left);
-    side = *((unsigned char *) src) & 0x80;
-
-    while (side == (*((unsigned char *) src) & 0x80) && length-- > 0)
-	*dst++ = *src++;
-    
-    *from_left -= src - (char *) *from;
-    *from = (XPointer) src;
-    *to_left -= dst - (char *) *to;
-    *to = (XPointer) dst;
-
-    if (num_args > 0)
-	*((XlcCharSet *)args[0]) = side ? state->GR_charset : state->GL_charset;
-
-    return 0;
-}
-
-static int
-cstostr(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    State state = (State) conv->state;
-    char *csptr, *string_ptr;
-    int csstr_len, str_len;
-    unsigned char ch;
-    int unconv_num = 0;
-
-    if (num_args < 1 || (state->GL_charset != (XlcCharSet) args[0] &&
-	state->GR_charset != (XlcCharSet) args[0]))
-	return -1;
-    
-    csptr = *((char **) from);
-    string_ptr = *((char **) to);
-    csstr_len = *from_left;
-    str_len = *to_left;
-
-    while (csstr_len-- > 0 && str_len > 0) {
-	ch = *((unsigned char *) csptr++);
-	if ((ch < 0x20 && ch != 0x00 && ch != 0x09 && ch != 0x0a) ||
-	    ch == 0x7f || ((ch & 0x80) && ch < 0xa0)) {
-	    unconv_num++;
-	    continue;
-	}
-	*((unsigned char *) string_ptr++) = ch;
-	str_len--;
-    }
-
-    *from_left -= csptr - *((char **) from);
-    *from = (XPointer) csptr;
-
-    *to_left -= string_ptr - *((char **) to);
-    *to = (XPointer) string_ptr;
-
-    return unconv_num;
-}
-
-
-static void
-close_converter(conv)
-    XlcConv conv;
-{
-    if (conv->state)
-	Xfree((char *) conv->state);
-
-    Xfree((char *) conv);
-}
-
-static XlcConv
-create_conv(methods)
-    XlcConvMethods methods;
-{
-    register XlcConv conv;
-
-    conv = (XlcConv) Xmalloc(sizeof(XlcConvRec));
-    if (conv == NULL)
-	return (XlcConv) NULL;
-
-    conv->state = (XPointer) Xmalloc(sizeof(StateRec));
-    if (conv->state == NULL)
-	goto err;
-    
-    conv->methods = methods;
-
-    init_state(conv);
-
-    return conv;
-
-err:
-    close_converter(conv);
-
-    return (XlcConv) NULL;
-}
-
-static XlcConvMethodsRec cttocs_methods = {
-    close_converter,
-    cttocs,
-    init_state
-} ;
-
-static XlcConv
-open_cttocs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(&cttocs_methods);
-}
-
-static XlcConvMethodsRec cstoct_methods = {
-    close_converter,
-    cstoct,
-    init_state
-} ;
-
-static XlcConv
-open_cstoct(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(&cstoct_methods);
-}
-
-static XlcConvMethodsRec strtocs_methods = {
-    close_converter,
-    strtocs,
-    init_state
-} ;
-
-static XlcConv
-open_strtocs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(&strtocs_methods);
-}
-
-static XlcConvMethodsRec cstostr_methods = {
-    close_converter,
-    cstostr,
-    init_state
-} ;
-
-static XlcConv
-open_cstostr(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(&cstostr_methods);
-}
-
-static void
-init_converter()
-{
-    _XlcSetConverter((XLCd) NULL, XlcNCompoundText, (XLCd) NULL, XlcNCharSet,
-		     open_cttocs);
-    _XlcSetConverter((XLCd) NULL, XlcNString, (XLCd) NULL, XlcNCharSet,
-		     open_strtocs);
-
-    _XlcSetConverter((XLCd) NULL, XlcNCharSet, (XLCd) NULL, XlcNCompoundText,
-		     open_cstoct);
-    _XlcSetConverter((XLCd) NULL, XlcNCharSet, (XLCd) NULL, XlcNString,
-		     open_cstostr);
-}
diff --git a/xc/lib/X11/lcCharSet.c b/xc/lib/X11/lcCharSet.c
deleted file mode 100644
index 39c55ca00..000000000
--- a/xc/lib/X11/lcCharSet.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/* $XConsortium: lcCharSet.c,v 1.3 95/02/22 22:02:59 kaleb Exp $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-/* $XFree86: xc/lib/X11/lcCharSet.c,v 3.2 1999/05/09 10:50:38 dawes Exp $ */
-
-#include <stdio.h>
-#include "Xlibint.h"
-#include "XlcPublic.h"
-
-/* EXTERNS */
-/* lcCt.c */
-extern Bool _XlcParseCharSet();
-
-#if NeedVarargsPrototypes
-char *
-_XlcGetCSValues(XlcCharSet charset, ...)
-#else
-char *
-_XlcGetCSValues(charset, va_alist)
-    XlcCharSet charset;
-    va_dcl
-#endif
-{
-    va_list var;
-    XlcArgList args;
-    char *ret;
-    int num_args;
-
-    Va_start(var, charset);
-    _XlcCountVaList(var, &num_args);
-    va_end(var);
-
-    Va_start(var, charset);
-    _XlcVaToArgList(var, num_args, &args);
-    va_end(var);
-
-    if (args == (XlcArgList) NULL)
-	return (char *) NULL;
-    
-    if (charset->get_values)
-	ret = (*charset->get_values)(charset, args, num_args);
-    else
-	ret = args->name;
-
-    Xfree(args);
-
-    return ret;
-}
-
-typedef struct _XlcCharSetListRec {
-    XlcCharSet charset;
-    struct _XlcCharSetListRec *next;
-} XlcCharSetListRec, *XlcCharSetList;
-
-static XlcCharSetList charset_list = NULL;
-
-XlcCharSet
-_XlcGetCharSet(name)
-    char *name;
-{
-    XlcCharSetList list;
-    XrmQuark xrm_name;
-    
-    xrm_name = XrmStringToQuark(name);
-
-    for (list = charset_list; list; list = list->next) {
-	if (xrm_name == list->charset->xrm_name)
-	    return (XlcCharSet) list->charset;
-    }
-
-    return (XlcCharSet) NULL;
-}
-
-Bool
-_XlcAddCharSet(charset)
-    XlcCharSet charset;
-{
-    XlcCharSetList list;
-
-    if (_XlcGetCharSet(charset->name))
-	return False;
-
-    list = (XlcCharSetList) Xmalloc(sizeof(XlcCharSetListRec));
-    if (list == NULL)
-	return False;
-    
-    list->charset = charset;
-    list->next = charset_list;
-    charset_list = list;
-
-    return True;
-}
-
-static XlcResource resources[] = {
-    { XlcNName, NULLQUARK, sizeof(char *),
-      XOffsetOf(XlcCharSetRec, name), XlcGetMask },
-    { XlcNEncodingName, NULLQUARK, sizeof(char *),
-      XOffsetOf(XlcCharSetRec, encoding_name), XlcGetMask },
-    { XlcNSide, NULLQUARK, sizeof(XlcSide),
-      XOffsetOf(XlcCharSetRec, side), XlcGetMask },
-    { XlcNCharSize, NULLQUARK, sizeof(int),
-      XOffsetOf(XlcCharSetRec, char_size), XlcGetMask },
-    { XlcNSetSize, NULLQUARK, sizeof(int),
-      XOffsetOf(XlcCharSetRec, set_size), XlcGetMask },
-    { XlcNControlSequence, NULLQUARK, sizeof(char *),
-      XOffsetOf(XlcCharSetRec, ct_sequence), XlcGetMask }
-};
-
-static char *
-get_values(charset, args, num_args)
-    register XlcCharSet charset;
-    register XlcArgList args;
-    register int num_args;
-{
-    if (resources[0].xrm_name == NULLQUARK)
-	_XlcCompileResourceList(resources, XlcNumber(resources));
-
-    return _XlcGetValues((XPointer) charset, resources, XlcNumber(resources),
-			 args, num_args, XlcGetMask);
-}
-
-XlcCharSet
-_XlcCreateDefaultCharSet(name, ct_sequence)
-    _Xconst char *name;
-    char *ct_sequence;
-{
-    XlcCharSet charset;
-
-    charset = (XlcCharSet) Xmalloc(sizeof(XlcCharSetRec));
-    if (charset == NULL)
-	return (XlcCharSet) NULL;
-    bzero((char *) charset, sizeof(XlcCharSetRec));
-    
-    charset->name = (char *) Xmalloc(strlen(name) + strlen(ct_sequence) + 2);
-    if (charset->name == NULL) {
-	Xfree((char *) charset);
-	return (XlcCharSet) NULL;
-    }
-    strcpy(charset->name, name);
-    charset->ct_sequence = charset->name + strlen(name) + 1;
-    strcpy(charset->ct_sequence, ct_sequence);
-    charset->get_values = get_values;
-
-    _XlcParseCharSet(charset);
-
-    return (XlcCharSet) charset;
-}
diff --git a/xc/lib/X11/lcConv.c b/xc/lib/X11/lcConv.c
deleted file mode 100644
index b6e5006b7..000000000
--- a/xc/lib/X11/lcConv.c
+++ /dev/null
@@ -1,333 +0,0 @@
-/* $XConsortium: lcConv.c /main/8 1996/09/28 16:37:28 rws $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-/* $XFree86: xc/lib/X11/lcConv.c,v 1.2 1999/05/09 10:50:38 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "XlcPubI.h"
-#include <stdio.h>
-
-typedef XlcConv (*XlcConverter)();
-
-typedef struct _XlcConverterListRec {
-    XLCd from_lcd;
-    char *from;
-    XrmQuark from_type;
-    XLCd to_lcd;
-    char *to;
-    XrmQuark to_type;
-    XlcConverter converter;
-    struct _XlcConverterListRec *next;
-} XlcConverterListRec, *XlcConverterList;
-
-static XlcConverterList conv_list = NULL;
-
-static void
-close_converter(conv)
-    XlcConv conv;
-{
-    (*conv->methods->close)(conv);
-}
-
-static XlcConv
-get_converter(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    XrmQuark from_type;
-    XLCd to_lcd;
-    XrmQuark to_type;
-{
-    register XlcConverterList list, prev = NULL;
-
-    for (list = conv_list; list; list = list->next) {
-	if (list->from_lcd == from_lcd && list->to_lcd == to_lcd 
-	    && list->from_type == from_type && list->to_type == to_type) {
-
-	    if (prev && prev != conv_list) {	/* XXX */
-		prev->next = list->next;
-		list->next = conv_list;
-		conv_list = list;
-	    }
-
-	    return (*list->converter)(from_lcd, list->from, to_lcd, list->to);
-	}
-
-	prev = list;
-    }
-    
-    return (XlcConv) NULL;
-}
-
-Bool
-_XlcSetConverter(from_lcd, from, to_lcd, to, converter)
-    XLCd from_lcd;
-    char *from;
-    XLCd to_lcd;
-    char *to;
-    XlcOpenConverterProc converter;
-{
-    register XlcConverterList list;
-    register XrmQuark from_type, to_type;
-
-    from_type = XrmStringToQuark(from);
-    to_type = XrmStringToQuark(to);
-
-    for (list = conv_list; list; list = list->next) {
-	if (list->from_lcd == from_lcd && list->to_lcd == to_lcd 
-	    && list->from_type == from_type && list->to_type == to_type) {
-
-	    list->converter = converter;
-	    return True;
-	}
-    }
-
-    list = (XlcConverterList) Xmalloc(sizeof(XlcConverterListRec));
-    if (list == NULL)
-	return False;
-    
-    list->from_lcd = from_lcd;
-    list->from = from;
-    list->from_type = from_type;
-    list->to_lcd = to_lcd;
-    list->to = to;
-    list->to_type = to_type;
-    list->converter = converter;
-    list->next = conv_list;
-    conv_list = list;
-
-    return True;
-}
-
-typedef struct _ConvRec {
-    XlcConv from_conv;
-    XlcConv to_conv;
-} ConvRec, *Conv;
-
-static int
-indirect_convert(lc_conv, from, from_left, to, to_left, args, num_args)
-    XlcConv lc_conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    Conv conv = (Conv) lc_conv->state;
-    XlcConv from_conv = conv->from_conv;
-    XlcConv to_conv = conv->to_conv;
-    XlcCharSet charset;
-    char buf[BUFSIZ], *cs;
-    XPointer tmp_args[1];
-    int cs_left, ret, length, unconv_num = 0;
-
-    if (from == NULL || *from == NULL) {
-	if (from_conv->methods->reset)
-	    (*from_conv->methods->reset)(from_conv);
-
-	if (to_conv->methods->reset)
-	    (*to_conv->methods->reset)(to_conv);
-
-	return 0;
-    }
-
-    while (*from_left > 0) {
-	cs = buf;
-	cs_left = BUFSIZ;
-	tmp_args[0] = (XPointer) &charset;
-
-	ret = (*from_conv->methods->convert)(from_conv, from, from_left, &cs,
-					     &cs_left, tmp_args, 1);
-	if (ret < 0)
-	    break;
-
-	length = cs_left = cs - buf;
-	cs = buf;
-
-	tmp_args[0] = (XPointer) charset;
-
-	ret = (*to_conv->methods->convert)(to_conv, &cs, &cs_left, to, to_left,
-					   tmp_args, 1);
-	if (ret < 0) {
-	    unconv_num += length / charset->char_size;
-	    continue;
-	}
-	
-	if (*to_left < 1)
-	    break;
-    }
-
-    return unconv_num;
-}
-
-static void
-close_indirect_converter(lc_conv)
-    XlcConv lc_conv;
-{
-    Conv conv = (Conv) lc_conv->state;
-
-    if (conv) {
-	if (conv->from_conv)
-	    close_converter(conv->from_conv);
-	if (conv->to_conv)
-	    close_converter(conv->to_conv);
-
-	Xfree((char *) conv);
-    }
-
-    Xfree((char *) lc_conv);
-}
-
-static void
-reset_indirect_converter(lc_conv)
-    XlcConv lc_conv;
-{
-    Conv conv = (Conv) lc_conv->state;
-
-    if (conv) {
-	if (conv->from_conv && conv->from_conv->methods->reset)
-	    (*conv->from_conv->methods->reset)(conv->from_conv);
-	if (conv->to_conv && conv->to_conv->methods->reset)
-	    (*conv->to_conv->methods->reset)(conv->to_conv);
-    }
-}
-
-static XlcConvMethodsRec conv_methods = {
-    close_indirect_converter,
-    indirect_convert,
-    reset_indirect_converter
-} ;
-
-static XlcConv
-open_indirect_converter(from_lcd, from, to_lcd, to)
-    XLCd from_lcd;
-    char *from;
-    XLCd to_lcd;
-    char *to;
-{
-    XlcConv lc_conv, from_conv, to_conv;
-    Conv conv;
-    XrmQuark from_type, to_type;
-    static XrmQuark QChar, QCharSet, QCTCharSet = (XrmQuark) 0;
-
-    if (QCTCharSet == (XrmQuark) 0) {
-	QCTCharSet = XrmStringToQuark(XlcNCTCharSet);
-	QCharSet = XrmStringToQuark(XlcNCharSet);
-	QChar = XrmStringToQuark(XlcNChar);
-    }
-
-    from_type = XrmStringToQuark(from);
-    to_type = XrmStringToQuark(to);
-
-    if (from_type == QCharSet || from_type == QChar || to_type == QCharSet ||
-	to_type == QChar)
-	return (XlcConv) NULL;
-
-    lc_conv = (XlcConv) Xmalloc(sizeof(XlcConvRec));
-    if (lc_conv == NULL)
-	return (XlcConv) NULL;
-    
-    lc_conv->methods = &conv_methods;
-
-    lc_conv->state = (XPointer) Xcalloc(1, sizeof(ConvRec));
-    if (lc_conv->state == NULL)
-	goto err;
-    
-    conv = (Conv) lc_conv->state;
-
-    from_conv = get_converter(from_lcd, from_type, from_lcd, QCTCharSet);
-    if (from_conv == NULL)
-	from_conv = get_converter(from_lcd, from_type, from_lcd, QCharSet);
-    if (from_conv == NULL)
-	from_conv = get_converter((XLCd)NULL, from_type, (XLCd)NULL, QCharSet);
-    if (from_conv == NULL)
-	from_conv = get_converter(from_lcd, from_type, from_lcd, QChar);
-    if (from_conv == NULL)
-	goto err;
-    conv->from_conv = from_conv;
-
-    to_conv = get_converter(to_lcd, QCTCharSet, to_lcd, to_type);
-    if (to_conv == NULL)
-	to_conv = get_converter(to_lcd, QCharSet, to_lcd, to_type);
-    if (to_conv == NULL)
-	to_conv = get_converter((XLCd) NULL, QCharSet, (XLCd) NULL, to_type);
-    if (to_conv == NULL)
-	goto err;
-    conv->to_conv = to_conv;
-
-    return lc_conv;
-
-err:
-    close_indirect_converter(lc_conv);
-
-    return (XlcConv) NULL;
-}
-
-XlcConv
-_XlcOpenConverter(from_lcd, from, to_lcd, to)
-    XLCd from_lcd;
-    char *from;
-    XLCd to_lcd;
-    char *to;
-{
-    XlcConv conv;
-    XrmQuark from_type, to_type;
-
-    from_type = XrmStringToQuark(from);
-    to_type = XrmStringToQuark(to);
-
-    if ((conv = get_converter(from_lcd, from_type, to_lcd, to_type)))
-	return conv;
-    
-    return open_indirect_converter(from_lcd, from, to_lcd, to);
-}
-
-void
-_XlcCloseConverter(conv)
-    XlcConv conv;
-{
-    close_converter(conv);
-}
-
-int
-_XlcConvert(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    return (*conv->methods->convert)(conv, from, from_left, to, to_left, args,
-				     num_args);
-}
-
-void
-_XlcResetConverter(conv)
-    XlcConv conv;
-{
-    if (conv->methods->reset)
-	(*conv->methods->reset)(conv);
-}
diff --git a/xc/lib/X11/lcDB.c b/xc/lib/X11/lcDB.c
deleted file mode 100644
index 14fa0b6c5..000000000
--- a/xc/lib/X11/lcDB.c
+++ /dev/null
@@ -1,1300 +0,0 @@
-/* $TOG: lcDB.c /main/16 1998/06/26 14:37:14 kaleb $ */
-/*
- *
- * Copyright IBM Corporation 1993
- *
- * All Rights Reserved
- *
- * License to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appear in all copies and that
- * both that copyright notice and this permission notice appear in
- * supporting documentation, and that the name of IBM not be
- * used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.
- *
- * IBM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS, AND 
- * NONINFRINGEMENT OF THIRD PARTY RIGHTS, IN NO EVENT SHALL
- * IBM BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
-*/
-/*
- *  (c) Copyright 1995 FUJITSU LIMITED
- *  This is source code modified by FUJITSU LIMITED under the Joint
- *  Development Agreement for the CDE/Motif PST.
- */
-/* $XFree86: xc/lib/X11/lcDB.c,v 3.10 1999/05/09 10:50:39 dawes Exp $ */
-
-
-
-#ifndef	NOT_X_ENV
-
-#include <X11/Xlib.h>
-#include <X11/Xresource.h>
-#include "Xlibint.h"
-#include "XlcPubI.h"
-
-#else	/* NOT_X_ENV */
-
-#define	Xmalloc	malloc
-#define	Xrealloc	realloc
-#define	Xfree	free
-
-#endif	/* NOT_X_ENV */
-
-/* specifying NOT_X_ENV allows users to just use
-   the database parsing routine. */
-/* For UDC/VW */
-#ifndef	BUFSIZE
-#define	BUFSIZE	2048
-#endif
-
-#ifdef COMMENT
-#ifdef  BUFSIZE
-#undef BUFSIZE
-#endif
-#define BUFSIZE 6144 /* 2048*3 */
-#endif
-
-#include <stdio.h>
-
-typedef struct _DatabaseRec {
-    char *category;
-    char *name;
-    char **value;
-    int value_num;
-    struct _DatabaseRec *next;
-} DatabaseRec, *Database;
-
-typedef enum {
-    S_NULL,	/* outside category */
-    S_CATEGORY,	/* inside category */
-    S_NAME,	/* has name, expecting values */
-    S_VALUE
-} ParseState;
-
-typedef enum {
-    T_NEWLINE,
-    T_COMMENT,
-    T_SEMICOLON,
-    T_DOUBLE_QUOTE,
-    T_LEFT_BRACE,
-    T_RIGHT_BRACE,
-    T_SPACE,
-    T_TAB,
-    T_BACKSLASH,
-    T_NUMERIC_HEX,
-    T_NUMERIC_DEC,
-    T_NUMERIC_OCT,
-    T_DEFAULT
-} Token;
-
-typedef struct {
-    Token token;	/* token id */
-    char *name;		/* token sequence */
-    int len;		/* length of token sequence */
-    int (*parse_proc)(); /* parsing procedure */
-} TokenTable;
-
-static int f_newline();
-static int f_comment();
-static int f_semicolon();
-static int f_double_quote();
-static int f_left_brace();
-static int f_right_brace();
-static int f_white();
-static int f_backslash();
-static int f_numeric();
-static int f_default();
-
-static TokenTable token_tbl[] = {
-    { T_NEWLINE,	"\n",	1,	f_newline },
-    { T_COMMENT,	"#",	1,	f_comment },
-    { T_SEMICOLON,	";",	1,	f_semicolon },
-    { T_DOUBLE_QUOTE,	"\"",	1,	f_double_quote },
-    { T_LEFT_BRACE,	"{",	1,	f_left_brace },
-    { T_RIGHT_BRACE,	"}",	1,	f_right_brace },
-    { T_SPACE,		" ",	1,	f_white },
-    { T_TAB,		"\t",	1,	f_white },
-    { T_BACKSLASH,	"\\",	1,	f_backslash },
-    { T_NUMERIC_HEX,	"\\x",	2,	f_numeric },
-    { T_NUMERIC_DEC,	"\\d",	2,	f_numeric },
-    { T_NUMERIC_OCT,	"\\o",	2,	f_numeric },
-    { T_DEFAULT,	" ",	1,	f_default },	/* any character */
-    {0} 
-};
-
-#define	SYM_CR          '\r'
-#define	SYM_NEWLINE	'\n'
-#define	SYM_COMMENT	'#'
-#define	SYM_SEMICOLON	';'
-#define	SYM_DOUBLE_QUOTE	'"'
-#define	SYM_LEFT_BRACE	'{'
-#define	SYM_RIGHT_BRACE	'}'
-#define	SYM_SPACE	' '
-#define	SYM_TAB		'\t'
-#define	SYM_BACKSLASH	'\\'
-
-/************************************************************************/
-
-#define MAX_NAME_NEST	64
-
-typedef struct {
-    ParseState pre_state;
-    char *category;
-    char *name[MAX_NAME_NEST];
-    int nest_depth;
-    char **value;
-    int value_len;
-    int value_num;
-    int bufsize;        /* bufMaxSize >= bufsize >= 0 */
-    int bufMaxSize;     /* default : BUFSIZE */
-    char *buf;
-} DBParseInfo;
-
-static DBParseInfo parse_info;
-
-static void init_parse_info()
-{
-    static int first = 1;
-    char *ptr;
-    int  size;
-    if(first == 1){
-	bzero(&parse_info, sizeof(DBParseInfo));
-	parse_info.buf = (char *)Xmalloc(BUFSIZE);
-	parse_info.bufMaxSize = BUFSIZE;
-	first = 0;
-	return ;
-    }
-    ptr = parse_info.buf;
-    size = parse_info.bufMaxSize;
-    bzero(&parse_info, sizeof(DBParseInfo));
-    parse_info.buf = ptr;
-    parse_info.bufMaxSize = size;
-}
-
-static void
-clear_parse_info()
-{
-    int i;
-    char *ptr;
-    int size;
-    parse_info.pre_state = S_NULL;
-    if(parse_info.category != NULL){
-	Xfree(parse_info.category);
-    }
-    for(i = 0; i <= parse_info.nest_depth; ++i){
-	if(parse_info.name[i]){
-	    Xfree(parse_info.name[i]);
-	}
-    }
-    if(parse_info.value){
-	if(*parse_info.value){
-	    Xfree(*parse_info.value);
-	}
-	Xfree((char *)parse_info.value);
-    }
-    ptr = parse_info.buf;
-    size = parse_info.bufMaxSize;
-    bzero(&parse_info, sizeof(DBParseInfo));
-    parse_info.buf = ptr;
-    parse_info.bufMaxSize = size;
-}
-
-static Bool
-realloc_parse_info(len)
-int len;
-{
-    char *p;
-
-
-    parse_info.bufMaxSize = BUFSIZE * 
-	    ((parse_info.bufsize + len)/BUFSIZE + 1);
-    p = (char *)Xrealloc(parse_info.buf, parse_info.bufMaxSize);
-    if(p == NULL){
-        return(False);
-    }
-    parse_info.buf = p;
-
-    return(True);
-}
-/************************************************************************/
-typedef struct _Line {
-    char *str;
-    int cursize;
-    int maxsize;
-    int seq;
-} Line;
-
-static void
-free_line(line)
-    Line *line;
-{
-    if(line->str != NULL){
-	Xfree(line->str);
-    }
-    bzero(line, sizeof(Line));
-}
-
-static int
-realloc_line(line, size)
-    Line *line;
-    int size;
-{
-    char *str = line->str;
-
-    if(str != NULL){
-	str = (char *)Xrealloc(str, size);
-    }else{
-	str = (char *)Xmalloc(size);
-    }
-    if(str == NULL){
-	/* malloc error */
-	if (line->str != NULL) {
-	    Xfree(line->str);
-	}
-	bzero(line, sizeof(Line));
-	return 0;
-    }
-    line->str = str;
-    line->maxsize = size;
-    return 1;
-}
-
-#define	iswhite(ch)	((ch) == SYM_SPACE   || (ch) == SYM_TAB)
-
-static void
-zap_comment(str, quoted)
-    char *str;
-    int *quoted;
-{
-    char *p = str;
-#ifdef	never
-    *quoted = 0;
-    if(*p == SYM_COMMENT){
-	int len = strlen(str);
-	if(p[len - 1] == SYM_NEWLINE || p[len - 1] == SYM_CR){
-	    *p++ = SYM_NEWLINE;
-	}
-	*p = '\0';
-    }
-#else
-    while(*p){
-	if(*p == SYM_DOUBLE_QUOTE){
-	    if(p == str || p[-1] != SYM_BACKSLASH){
-		/* unescaped double quote changes quoted state. */
-		*quoted = *quoted ? 0 : 1;
-	    }
-	}
-	if(*p == SYM_COMMENT && !*quoted){
-	    int pos = p - str;
-	    if(pos == 0 ||
-	       (iswhite(p[-1]) && (pos == 1 || p[-2] != SYM_BACKSLASH))) {
-		int len = strlen(p);
-		if(len > 0 && (p[len - 1] == SYM_NEWLINE || p[len-1] == SYM_CR)) {
-		    /* newline is the identifier for finding end of value.
-		       therefore, it should not be removed. */
-		    *p++ = SYM_NEWLINE;
-		}
-		*p = '\0';
-		break;
-	    }
-	}
-	++p;
-    }
-#endif
-}
-
-static int
-read_line(fd, line)
-    FILE *fd;
-    Line *line;
-{
-    char buf[BUFSIZE], *p;
-    int len;
-    int quoted = 0;	/* quoted by double quote? */
-    char *str;
-    int cur;
-
-    str = line->str;
-    cur = line->cursize = 0;
-
-    while((p = fgets(buf, BUFSIZE, fd)) != NULL){
-	++line->seq;
-	zap_comment(p, &quoted);	/* remove comment line */
-	len = strlen(p);
-	if(len == 0){
-	    if(cur > 0){
-		break;
-	    }
-	    continue;
-	}
-	if(cur + len + 1 > line->maxsize){
-	    /* need to reallocate buffer. */
-	    if(! realloc_line(line, line->maxsize + BUFSIZE)){
-		return -1;	/* realloc error. */
-	    }
-	    str = line->str;
-	}
-	strncpy(str + cur, p, len);
-
-	cur += len;
-	str[cur] = '\0';
-#ifdef __EMX__  /* Take out carriage returns under OS/2 */
-	if(cur>1) {
-	   if(str[cur-2] == '\r' && str[cur-1] == '\n'){
-	      str[cur-2] = '\n';
-	      str[cur-1] = '\0';
-	      cur--;
-	   }
-	}
-#endif
-	if(!quoted){
-	    if(cur > 1 && str[cur - 2] == SYM_BACKSLASH &&
-	       (str[cur - 1] == SYM_NEWLINE || str[cur-1] == SYM_CR)){
-		/* the line is ended backslash followed by newline.
-		   need to concatinate the next line. */
-		cur -= 2;
-		str[cur] = '\0';
-	    }else{
-		break;
-	    }
-	}
-    }
-    if(quoted){
-	/* error.  still in quoted state. */
-	return -1;
-    }
-    return line->cursize = cur;
-}
-
-/************************************************************************/
-
-static Token
-get_token(str)
-    char *str;
-{
-    switch(*str){
-    case SYM_NEWLINE:
-    case SYM_CR:	return T_NEWLINE;
-    case SYM_COMMENT:	return T_COMMENT;
-    case SYM_SEMICOLON:	return T_SEMICOLON;
-    case SYM_DOUBLE_QUOTE:	return T_DOUBLE_QUOTE;
-    case SYM_LEFT_BRACE:	return T_LEFT_BRACE;
-    case SYM_RIGHT_BRACE:	return T_RIGHT_BRACE;
-    case SYM_SPACE:	return T_SPACE;
-    case SYM_TAB:	return T_TAB;
-    case SYM_BACKSLASH:
-	switch(str[1]){
-	case 'x': return T_NUMERIC_HEX;
-	case 'd': return T_NUMERIC_DEC;
-	case 'o': return T_NUMERIC_OCT;
-	}
-	return T_BACKSLASH;
-    default:
-	return T_DEFAULT;
-    }
-}
-
-static int
-get_word(str, word)
-    char *str;
-    char *word;
-{
-    char *p = str, *w = word;
-    Token token;
-    int token_len;
-
-    while(*p != '\0'){
-	token = get_token(p);
-	token_len = token_tbl[token].len;
-	if(token == T_BACKSLASH){
-	    p += token_len;
-	    if(*p == '\0'){
-		break;
-	    }
-	    token = get_token(p);
-	    token_len = token_tbl[token].len;
-	}else if(token != T_COMMENT &&
-		 token != T_DEFAULT){
-	    break;
-	}
-	strncpy(w, p, token_len);
-	p += token_len; w += token_len;
-    }
-    *w = '\0';
-    return p - str;	/* return number of scanned chars */
-}
-
-static int
-get_quoted_word(str, word)
-    char *str;
-    char *word;
-{
-    char *p = str, *w = word;
-    Token token;
-    int token_len;
-
-    if(*p == SYM_DOUBLE_QUOTE){
-	++p;
-    }
-    while(*p != '\0'){
-	token = get_token(p);
-	token_len = token_tbl[token].len;
-	if(token == T_DOUBLE_QUOTE){
-	    p += token_len;
-	    goto found;
-	}
-	if(token == T_BACKSLASH){
-	    p += token_len;
-	    if(*p == '\0'){
-		break;
-	    }
-	    token = get_token(p);
-	    token_len = token_tbl[token].len;
-	}
-	strncpy(w, p, token_len);
-	p += token_len; w += token_len;
-    }
-    /* error. cannot detect next double quote */
-    return 0;
-
- found:;
-    *w = '\0';
-    return p - str;
-}
-
-/************************************************************************/
-
-static int
-append_value_list()
-{
-    char **value_list = parse_info.value;
-    char *value;
-    int value_num = parse_info.value_num;
-    int value_len = parse_info.value_len;
-    char *str = parse_info.buf;
-    int len = parse_info.bufsize;
-    char *p;
-
-    if(len < 1){
-	return 1; /* return with no error */
-    }
-
-    if(value_list == (char **)NULL){
-	value_list = (char **)Xmalloc(sizeof(char *) * 2);
-	*value_list = NULL;
-    }else{
-	char **prev_list = value_list;
-
-	value_list = (char **)
-	    Xrealloc(value_list, sizeof(char *) * (value_num + 2));
-	if (value_list == NULL){
-	    Xfree(prev_list);
-	}
-    }
-    if(value_list == (char **)NULL){
-	goto err;
-    }
-
-    value = *value_list;
-    if(value == NULL){
-	value = (char *)Xmalloc(value_len + len + 1);
-    }else{
-	char *prev_value = value;
-
-	value = (char *)Xrealloc(value, value_len + len + 1);
-	if (value == NULL){
-	    Xfree(prev_value);
-	}
-    }
-    if(value == NULL){
-	goto err;
-    }
-    if(value != *value_list){
-	int delta, i;
-	delta = value - *value_list;
-	*value_list = value;
-	for(i = 1; i < value_num; ++i){
-	    value_list[i] += delta;
-	}
-    }
-
-    value_list[value_num] = p = &value[value_len];
-    value_list[value_num + 1] = NULL;
-    strncpy(p, str, len);
-    p[len] = 0;
-
-    parse_info.value = value_list;
-    parse_info.value_num = value_num + 1;
-    parse_info.value_len = value_len + len + 1;
-    parse_info.bufsize = 0;
-    return 1;
-
- err:
-    if(value_list){
-	Xfree((char **)value_list);
-    }
-    if(value){
-	Xfree(value);
-    }
-    parse_info.value = (char **)NULL;
-    parse_info.value_num = 0;
-    parse_info.value_len = 0;
-    parse_info.bufsize = 0;
-    return 0;
-}
-
-static int 
-construct_name(name, size)
-    char *name;
-    int size;
-{
-    register int i, len = 0;
-    char *p = name;
-
-    for(i = 0; i <= parse_info.nest_depth; ++i){
-	len += strlen(parse_info.name[i]) + 1;
-    }
-    if (len >= size)
-	return 0;
-
-    strcpy(p, parse_info.name[0]);
-    p += strlen(parse_info.name[0]);
-    for(i = 1; i <= parse_info.nest_depth; ++i){
-	*p++ = '.';
-	strcpy(p, parse_info.name[i]);
-	p += strlen(parse_info.name[i]);
-    }
-    return *name != '\0';
-}
-
-static int
-store_to_database(db)
-    Database *db;
-{
-    Database new = (Database)NULL;
-    char name[BUFSIZE];
-
-    if(parse_info.pre_state == S_VALUE){
-	if(! append_value_list()){
-	    goto err;
-	}
-    }
-
-    if(parse_info.name[parse_info.nest_depth] == NULL){
-	goto err;
-    }
-
-    new = (Database)Xmalloc(sizeof(DatabaseRec));
-    if(new == (Database)NULL){
-	goto err;
-    }
-    bzero(new, sizeof(DatabaseRec));
-
-    new->category = (char *)Xmalloc(strlen(parse_info.category) + 1);
-    if(new->category == NULL){
-	goto err;
-    }
-    strcpy(new->category, parse_info.category);
-
-    if(! construct_name(name, sizeof(name))){
-	goto err;
-    }
-    new->name = (char *)Xmalloc(strlen(name) + 1);
-    if(new->name == NULL){
-	goto err;
-    }
-    strcpy(new->name, name);
-    new->next = *db;
-    new->value = parse_info.value;
-    new->value_num = parse_info.value_num;
-    *db = new;
-
-    Xfree(parse_info.name[parse_info.nest_depth]);
-    parse_info.name[parse_info.nest_depth] = NULL;
-
-    parse_info.value = (char **)NULL;
-    parse_info.value_num = 0;
-    parse_info.value_len = 0;
-
-    return 1;
-
- err:
-    if(new){
-	if(new->category){
-	    Xfree(new->category);
-	}
-	if(new->name){
-	    Xfree(new->name);
-	}
-    }
-    if(parse_info.value){
-	if(*parse_info.value){
-	    Xfree(*parse_info.value);
-	}
-	Xfree((char **)parse_info.value);
-	parse_info.value = (char **)NULL;
-	parse_info.value_num = 0;
-	parse_info.value_len = 0;
-    }
-    return 0;
-}
-
-#define END_MARK	"END"
-#define	END_MARK_LEN	3 /*strlen(END_MARK)*/
-
-static int
-check_category_end(str)
-    char *str;
-{
-    char *p;
-    int len;
-
-    p = str;
-    if(strncmp(p, END_MARK, END_MARK_LEN)){
-	return 0;
-    }
-    p += END_MARK_LEN;
-
-    while(iswhite(*p)){
-	++p;
-    }
-    len = strlen(parse_info.category);
-    if(strncmp(p, parse_info.category, len)){
-	return 0;
-    }
-    p += len;
-    return p - str;
-}
-
-/************************************************************************/
-
-static int
-f_newline(str, token, db)
-    char *str;
-    Token token;
-    Database *db;
-{
-    switch(parse_info.pre_state){
-    case S_NULL:
-    case S_CATEGORY:
-	break;
-    case S_NAME:
-	return 0; /* no value */
-    case S_VALUE:
-	if(!store_to_database(db))
-	    return 0;
-	parse_info.pre_state = S_CATEGORY;
-	break;
-    default:
-	return 0;
-    }
-    return token_tbl[token].len;
-}
-
-static int
-f_comment(str, token, db)
-    char *str;
-    Token token;
-    Database *db;
-{
-    /* NOTE: comment is already handled in read_line(),
-       so this function is not necessary. */
-
-    char *p = str;
-
-    while(*p != SYM_NEWLINE && *p != SYM_CR && *p != '\0'){
-	++p;	/* zap to the end of line */
-    }
-    return p - str;
-}
-
-static int
-f_white(str, token, db)
-    char *str;
-    Token token;
-    Database *db;
-{
-    char *p = str;
-
-    while(iswhite(*p)){
-	++p;
-    }
-    return p - str;
-}
-
-static int
-f_semicolon(str, token, db)
-    char *str;
-    Token token;
-    Database *db;
-{
-    switch(parse_info.pre_state){
-    case S_NULL:
-    case S_CATEGORY:
-    case S_NAME:
-	return 0;
-    case S_VALUE:
-	if(! append_value_list())
-	    return 0;
-	parse_info.pre_state = S_VALUE;
-	break;
-    default:
-	return 0;
-    }
-    return token_tbl[token].len;
-}
-
-static int
-f_left_brace(str, token, db)
-    char *str;
-    Token token;
-    Database *db;
-{
-    switch(parse_info.pre_state){
-    case S_NULL:
-    case S_CATEGORY:
-    case S_VALUE:
-	return 0;
-    case S_NAME:
-	if(parse_info.name[parse_info.nest_depth] == NULL ||
-	   parse_info.nest_depth + 1 > MAX_NAME_NEST)
-	    return 0;
-	++parse_info.nest_depth;
-	parse_info.pre_state = S_CATEGORY;
-	break;
-    default:
-	return 0;
-    }
-    return token_tbl[token].len;
-}
-
-static int
-f_right_brace(str, token, db)
-    char *str;
-    Token token;
-    Database *db;
-{
-    if(parse_info.nest_depth < 1)
-	return 0;
-
-    switch(parse_info.pre_state){
-    case S_NULL:
-    case S_NAME:
-	return 0;
-    case S_VALUE:
-	if(! store_to_database(db))
-	    return 0;
-	/* fall into next case */
-    case S_CATEGORY:
-	if(parse_info.name[parse_info.nest_depth] != NULL){
-	    Xfree(parse_info.name[parse_info.nest_depth]);
-	    parse_info.name[parse_info.nest_depth] = NULL;
-	}
-	--parse_info.nest_depth;
-	parse_info.pre_state = S_CATEGORY;
-	break;
-    default:
-	return 0;
-    }
-    return token_tbl[token].len;
-}
-
-static int
-f_double_quote(str, token, db)
-    char *str;
-    Token token;
-    Database *db;
-{
-    char word[BUFSIZE];
-    char* wordp;
-    int len;
-
-    if ((len = strlen (str)) < sizeof word)
-	wordp = word;
-    else
-	wordp = Xmalloc (len + 1);
-    if (wordp == NULL)
-	return 0;
-
-    len = 0;
-    switch(parse_info.pre_state){
-    case S_NULL:
-    case S_CATEGORY:
-	goto err;
-    case S_NAME:
-    case S_VALUE:
-	len = get_quoted_word(str, wordp);
-	if(len < 1)
-	    goto err;
-	if( (parse_info.bufsize + (int)strlen(wordp) +1) 
-					>= parse_info.bufMaxSize){
-	    if(realloc_parse_info(strlen(wordp) +1) == False){
-		goto err;
-	    }
-	}
-	strcpy(&parse_info.buf[parse_info.bufsize], wordp);
-	parse_info.bufsize += strlen(wordp);
-	parse_info.pre_state = S_VALUE;
-	break;
-    default:
-	goto err;
-    }
-    if (wordp != word) Xfree (wordp);
-    return len;	/* including length of token */
-
-err:
-    if (wordp != word) Xfree (wordp);
-    return 0;
-}
-
-static int
-f_backslash(str, token, db)
-    char *str;
-    Token token;
-    Database *db;
-{
-    return f_default(str, token, db);
-}
-
-static int
-f_numeric(str, token, db)
-    char *str;
-    Token token;
-    Database *db;
-{
-    char word[BUFSIZE], *p;
-    char* wordp;
-    int len;
-    int token_len;
-
-    if ((len = strlen (str)) < sizeof word)
-	wordp = word;
-    else
-	wordp = Xmalloc (len + 1);
-    if (wordp == NULL)
-	return 0;
-
-    switch(parse_info.pre_state){
-    case S_NULL:
-    case S_CATEGORY:
-	goto err;
-    case S_NAME:
-    case S_VALUE:
-	token_len = token_tbl[token].len;
-	p = str + token_len;
-	len = get_word(p, wordp);
-	if(len < 1)
-	    goto err;
-	if( (parse_info.bufsize + token_len + (int)strlen(wordp) +1) 
-					>= parse_info.bufMaxSize){
-	    if(realloc_parse_info(token_len + strlen(wordp) +1) == False)
-		goto err;
-	}
-	strncpy(&parse_info.buf[parse_info.bufsize], str, token_len);
-	strcpy(&parse_info.buf[parse_info.bufsize + token_len], wordp);
-	parse_info.bufsize += token_len + strlen(wordp);
-	parse_info.pre_state = S_VALUE;
-	break;
-    default:
-	goto err;
-    }
-    if (wordp != word) Xfree (wordp);
-    return len + token_len;
-
-err:
-    if (wordp != word) Xfree (wordp);
-    return 0;
-}
-
-static int
-f_default(str, token, db)
-    char *str;
-    Token token;
-    Database *db;
-{
-    char word[BUFSIZE], *p;
-    char* wordp;
-    int len;
-
-    if ((len = strlen (str)) < sizeof word)
-	wordp = word;
-    else
-	wordp = Xmalloc (len + 1);
-    if (wordp == NULL)
-	return 0;
-
-    len = get_word(str, wordp);
-    if(len < 1)
-	goto err;
-
-    switch(parse_info.pre_state){
-    case S_NULL:
-	if(parse_info.category != NULL)
-	    goto err;
-	p = (char *)Xmalloc(strlen(wordp) + 1);
-	if(p == NULL)
-	    goto err;
-	strcpy(p, wordp);
-	parse_info.category = p;
-	parse_info.pre_state = S_CATEGORY;
-	break;
-    case S_CATEGORY:
-	if(parse_info.nest_depth == 0){
-	    if(check_category_end(str)){
-		/* end of category is detected.
-		   clear context and zap to end of this line */
-		clear_parse_info();
-		len = strlen(str);
-		break;
-	    }
-	}
-	p = (char *)Xmalloc(strlen(wordp) + 1);
-	if(p == NULL)
-	    goto err;
-	strcpy(p, wordp);
-	if(parse_info.name[parse_info.nest_depth] != NULL){
-	    Xfree(parse_info.name[parse_info.nest_depth]);
-	}
-	parse_info.name[parse_info.nest_depth] = p;
-	parse_info.pre_state = S_NAME;
-	break;
-    case S_NAME:
-    case S_VALUE:
-	if( (parse_info.bufsize + (int)strlen(wordp) +1 ) 
-					>= parse_info.bufMaxSize){
-	    if(realloc_parse_info(strlen(wordp) +1) == False)
-		goto err;
-	}
-	strcpy(&parse_info.buf[parse_info.bufsize], wordp);
-	parse_info.bufsize += strlen(wordp);
-	parse_info.pre_state = S_VALUE;
-	break;
-    default:
-	goto err;
-    }
-    if (wordp != word) Xfree (wordp);
-    return len;
-
-err:
-    if (wordp != word) Xfree (wordp);
-    return 0;
-}
-
-/************************************************************************/
-
-#ifdef	DEBUG
-static void
-PrintDatabase(db)
-    Database db;
-{
-    Database p = db;
-    int i = 0, j;
-
-    printf("***\n*** BEGIN Database\n***\n");
-    while(p){
-	printf("%3d: ", i++);
-	printf("%s, %s, ", p->category, p->name);
-	printf("\t[%d: ", p->value_num);
-	for(j = 0; j < p->value_num; ++j){
-	    printf("%s, ", p->value[j]);
-	}
-	printf("]\n");
-	p = p->next;
-    }
-    printf("***\n*** END   Database\n***\n");
-}
-#endif
-
-static void
-DestroyDatabase(db)
-    Database db;
-{
-    Database p = db;
-
-    while(p){
-	if(p->category != NULL){
-	    Xfree(p->category);
-	}
-	if(p->name != NULL){
-	    Xfree(p->name);
-	}
-	if(p->value != (char **)NULL){
-	    if(*p->value != NULL){
-		Xfree(*p->value);
-	    }
-	    Xfree((char *)p->value);
-	}
-	db = p->next;
-	Xfree((char *)p);
-	p = db;
-    }
-}
-
-static int
-CountDatabase(db)
-    Database db;
-{
-    Database p = db;
-    int cnt = 0;
-
-    while(p){
-	++cnt;
-	p = p->next;
-    }
-    return cnt;
-}
-
-static Database
-CreateDatabase(dbfile)
-    char *dbfile;
-{
-    Database db = (Database)NULL;
-    FILE *fd;
-    Line line;
-    char *p;
-    Token token;
-    int len;
-    int error = 0;
-
-    fd = _XFopenFile(dbfile, "r");
-    if(fd == (FILE *)NULL){
-	return NULL;
-    }
-
-    bzero(&line, sizeof(Line));
-    init_parse_info();
-
-    do {
-	int rc = read_line(fd, &line);
-	if(rc < 0){
-	    error = 1;
-	    break;
-	}else if(rc == 0){
-	    break;
-	}
-	p = line.str;
-	while(*p){
-	    token = get_token(p);
-	    len = (*token_tbl[token].parse_proc)(p, token, &db);
-	    if(len < 1){
-		error = 1;
-		break;
-	    }
-	    p += len;
-	}
-    } while (!error);
-
-    if(parse_info.pre_state != S_NULL){
-	clear_parse_info();
-	error = 1;
-    }
-    if(error){
-#ifdef	DEBUG
-	fprintf(stderr, "database format error at line %d.\n", line.seq);
-#endif
-	DestroyDatabase(db);
-	db = (Database)NULL;
-    }
-
-    fclose(fd);
-    free_line(&line);
-
-#ifdef	DEBUG
-    PrintDatabase(db);
-#endif
-
-    return db;
-}
-
-/************************************************************************/
-
-#ifndef	NOT_X_ENV
-
-/* locale framework functions */
-
-typedef struct _XlcDatabaseRec {
-    XrmQuark category_q;
-    XrmQuark name_q;
-    Database db;
-    struct _XlcDatabaseRec *next;
-} XlcDatabaseRec, *XlcDatabase;
-
-typedef	struct _XlcDatabaseListRec {
-    XrmQuark name_q;
-    XlcDatabase lc_db;
-    Database database;
-    int ref_count;
-    struct _XlcDatabaseListRec *next;
-} XlcDatabaseListRec, *XlcDatabaseList;
-
-/* database cache list (per file) */
-static XlcDatabaseList _db_list = (XlcDatabaseList)NULL;
-
-/************************************************************************/
-/*	_XlcGetResource(lcd, category, class, value, count)		*/
-/*----------------------------------------------------------------------*/
-/*	This function retrieves XLocale database information.		*/
-/************************************************************************/
-void
-_XlcGetResource(lcd, category, class, value, count)
-    XLCd lcd;
-    char *category;
-    char *class;
-    char ***value;
-    int *count;
-{
-    XLCdPublicMethodsPart *methods = XLC_PUBLIC_METHODS(lcd);
-
-    (*methods->get_resource)(lcd, category, class, value, count);
-    return;
-}
-
-/************************************************************************/
-/*	_XlcGetLocaleDataBase(lcd, category, class, value, count)	*/
-/*----------------------------------------------------------------------*/
-/*	This function retrieves XLocale database information.		*/
-/************************************************************************/
-void
-_XlcGetLocaleDataBase(lcd, category, name, value, count)
-    XLCd lcd;
-    char *category;
-    char *name;
-    char ***value;
-    int *count;
-{
-    XlcDatabase lc_db = (XlcDatabase)XLC_PUBLIC(lcd, xlocale_db);
-    XrmQuark category_q, name_q;
-
-    category_q = XrmStringToQuark(category);
-    name_q = XrmStringToQuark(name);
-    for(; lc_db->db; ++lc_db){
-	if(category_q == lc_db->category_q && name_q == lc_db->name_q){
-	    *value = lc_db->db->value;
-	    *count = lc_db->db->value_num;
-	    return;
-	}
-    }
-    *value = (char **)NULL;
-    *count = 0;
-}
-
-/************************************************************************/
-/*	_XlcDestroyLocaleDataBase(lcd)					*/
-/*----------------------------------------------------------------------*/
-/*	This function destroy the XLocale Database that bound to the 	*/
-/*	specified lcd.  If the XLocale Database is refered from some 	*/
-/*	other lcd, this function just decreases reference count of 	*/
-/*	the database.  If no locale refers the database, this function	*/
-/*	remove it from the cache list and free work area.		*/
-/************************************************************************/
-void
-_XlcDestroyLocaleDataBase(lcd)
-    XLCd lcd;
-{
-    XlcDatabase lc_db = (XlcDatabase)XLC_PUBLIC(lcd, xlocale_db);
-    XlcDatabaseList p, prev;
-
-    for(p = _db_list, prev = (XlcDatabaseList)NULL; p;
-	prev = p, p = p->next){
-	if(p->lc_db == lc_db){
-	    if((-- p->ref_count) < 1){
-		if(p->lc_db != (XlcDatabase)NULL){
-		    Xfree((char *)p->lc_db);
-		}
-		DestroyDatabase(p->database);
-		if(prev == (XlcDatabaseList)NULL){
-		    _db_list = p->next;
-		}else{
-		    prev->next = p->next;
-		}
-		Xfree((char*)p);
-	    }
-	    break;
-	}
-    }
-    XLC_PUBLIC(lcd, xlocale_db) = (XPointer)NULL;
-}
-
-/************************************************************************/
-/*	_XlcCreateLocaleDataBase(lcd)					*/
-/*----------------------------------------------------------------------*/
-/*	This function create an XLocale database which correspond to	*/
-/*	the specified XLCd.						*/
-/************************************************************************/
-XPointer
-_XlcCreateLocaleDataBase(lcd)
-    XLCd lcd;
-{
-    XlcDatabaseList list, new;
-    Database p, database = (Database)NULL;
-    XlcDatabase lc_db = (XlcDatabase)NULL;
-    XrmQuark name_q;
-    char *name;
-    int i, n;
-
-    name = _XlcFileName(lcd, "locale");
-    if(name == NULL){
-	return (XPointer)NULL;
-    }
-
-#ifndef __EMX__
-    name_q = XrmStringToQuark(name);
-#else
-    name_q = XrmStringToQuark((char*)__XOS2RedirRoot(name));
-#endif
-    for(list = _db_list; list; list = list->next){
-	if(name_q == list->name_q){
-	    list->ref_count++;
-	    Xfree (name);
-	    return XLC_PUBLIC(lcd, xlocale_db) = (XPointer)list->lc_db;
-	}
-    }
-
-    database = CreateDatabase(name);
-    if(database == (Database)NULL){
-	Xfree (name);
-	return (XPointer)NULL;
-    }
-    n = CountDatabase(database);
-    lc_db = (XlcDatabase)Xmalloc(sizeof(XlcDatabaseRec) * (n + 1));
-    if(lc_db == (XlcDatabase)NULL){
-	goto err;
-    }
-    bzero(lc_db, sizeof(XlcDatabaseRec) * (n + 1));
-    for(p = database, i = 0; p && i < n; p = p->next, ++i){
-	lc_db[i].category_q = XrmStringToQuark(p->category);
-	lc_db[i].name_q = XrmStringToQuark(p->name);
-	lc_db[i].db = p;
-    }
-
-    new = (XlcDatabaseList)Xmalloc(sizeof(XlcDatabaseListRec));
-    if(new == (XlcDatabaseList)NULL){
-	goto err;
-    }
-    new->name_q = name_q;
-    new->lc_db = lc_db;
-    new->database = database;
-    new->ref_count = 1;
-    new->next = _db_list;
-    _db_list = new;
-
-    Xfree (name);
-    return XLC_PUBLIC(lcd, xlocale_db) = (XPointer)lc_db;
-
- err:
-    DestroyDatabase(database);
-    if(lc_db != (XlcDatabase)NULL){
-	Xfree((char *)lc_db);
-    }
-    Xfree (name);
-    return (XPointer)NULL;
-}
-
-#endif	/* NOT_X_ENV */
diff --git a/xc/lib/X11/lcDefConv.c b/xc/lib/X11/lcDefConv.c
deleted file mode 100644
index 1e0aad5d4..000000000
--- a/xc/lib/X11/lcDefConv.c
+++ /dev/null
@@ -1,363 +0,0 @@
-/* $XConsortium: lcDefConv.c /main/5 1996/10/22 14:24:59 kaleb $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-/* $XFree86: xc/lib/X11/lcDefConv.c,v 1.2 1997/11/22 12:50:09 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "XlcPubI.h"
-
-typedef struct _StateRec {
-    XlcCharSet charset;
-    XlcCharSet GL_charset;
-    XlcCharSet GR_charset;
-    XlcConv ct_conv;
-    int (*to_converter)();
-} StateRec, *State;
-
-static int
-strtostr(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    register char *src, *dst;
-    unsigned char side;
-    register int length;
-
-    if (from == NULL || *from == NULL)
-	return 0;
-
-    src = (char *) *from;
-    dst = (char *) *to;
-
-    length = min(*from_left, *to_left);
-
-    if (num_args > 0) {
-	side = (length > 0) ? *((unsigned char *) src) & 0x80 : 0;
-	while (length-- > 0 && side == (*((unsigned char *) src) & 0x80))
-	    *dst++ = *src++;
-    } else {
-	while (length-- > 0)
-	    *dst++ = *src++;
-    }
-    
-    *from_left -= src - (char *) *from;
-    *from = (XPointer) src;
-    *to_left -= dst - (char *) *to;
-    *to = (XPointer) dst;
-
-    if (num_args > 0) {
-	State state = (State) conv->state;
-
-	*((XlcCharSet *)args[0]) = side ? state->GR_charset : state->GL_charset;
-    }
-
-    return 0;
-}
-
-static int
-wcstostr(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    register wchar_t *src, side;
-    register char *dst;
-    register int length;
-
-    if (from == NULL || *from == NULL)
-	return 0;
-
-    src = (wchar_t *) *from;
-    dst = (char *) *to;
-
-    length = min(*from_left, *to_left);
-
-    if (num_args > 0) {
-	side = (length > 0) ? *src & 0x80 : 0;
-	while (length-- > 0 && side == (*src & 0x80))
-	    *dst++ = *src++;
-    } else {
-	while (length-- > 0)
-	    *dst++ = *src++;
-    }
-    
-    *from_left -= src - (wchar_t *) *from;
-    *from = (XPointer) src;
-    *to_left -= dst - (char *) *to;
-    *to = (XPointer) dst;
-
-    if (num_args > 0) {
-	State state = (State) conv->state;
-
-	*((XlcCharSet *)args[0]) = side ? state->GR_charset : state->GL_charset;
-    }
-
-    return 0;
-}
-
-static int
-cstostr(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    register char *src, *dst;
-    unsigned char side;
-    register int length;
-
-    if (from == NULL || *from == NULL)
-	return 0;
-
-    if (num_args > 0) {
-	State state = (State) conv->state;
-	XlcCharSet charset = (XlcCharSet) args[0];
-
-	if (charset != state->GL_charset && charset != state->GR_charset)
-	    return -1;
-    }
-
-    src = (char *) *from;
-    dst = (char *) *to;
-
-    length = min(*from_left, *to_left);
-
-    if (num_args > 0) {
-	side = (length > 0) ? *((unsigned char *) src) & 0x80 : 0;
-	while (length-- > 0 && side == (*((unsigned char *) src) & 0x80))
-	    *dst++ = *src++;
-    } else {
-	while (length-- > 0)
-	    *dst++ = *src++;
-    }
-    
-    *from_left -= src - (char *) *from;
-    *from = (XPointer) src;
-    *to_left -= dst - (char *) *to;
-    *to = (XPointer) dst;
-
-    if (num_args > 0) {
-	State state = (State) conv->state;
-
-	*((XlcCharSet *)args[0]) = side ? state->GR_charset : state->GL_charset;
-    }
-
-    return 0;
-}
-
-static int
-strtowcs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    register char *src;
-    register wchar_t *dst;
-    register int length;
-
-    if (from == NULL || *from == NULL)
-	return 0;
-
-    if (num_args > 0) {
-	State state = (State) conv->state;
-	XlcCharSet charset = (XlcCharSet) args[0];
-
-	if (charset != state->GL_charset && charset != state->GR_charset)
-	    return -1;
-    }
-
-    src = (char *) *from;
-    dst = (wchar_t *) *to;
-
-    length = min(*from_left, *to_left);
-
-    while (length-- > 0)
-	*dst++ = (wchar_t) *src++;
-    
-    *from_left -= src - (char *) *from;
-    *from = (XPointer) src;
-    *to_left -= dst - (wchar_t *) *to;
-    *to = (XPointer) dst;
-
-    return 0;
-}
-
-
-static void
-close_converter(conv)
-    XlcConv conv;
-{
-    if (conv->state)
-	Xfree((char *) conv->state);
-
-    Xfree((char *) conv);
-}
-
-static XlcConv
-create_conv(methods)
-    XlcConvMethods methods;
-{
-    register XlcConv conv;
-    State state;
-    static XlcCharSet GL_charset = NULL;
-    static XlcCharSet GR_charset = NULL;
-
-    if (GL_charset == NULL) {
-	GL_charset = _XlcGetCharSet("ISO8859-1:GL");
-	GR_charset = _XlcGetCharSet("ISO8859-1:GR");
-    }
-
-    conv = (XlcConv) Xmalloc(sizeof(XlcConvRec));
-    if (conv == NULL)
-	return (XlcConv) NULL;
-
-    state = (State) Xmalloc(sizeof(StateRec));
-    if (state == NULL)
-	goto err;
-    
-    state->GL_charset = state->charset = GL_charset;
-    state->GR_charset = GR_charset;
-
-    conv->methods = methods;
-    conv->state = (XPointer) state;
-
-    return conv;
-
-err:
-    close_converter(conv);
-
-    return (XlcConv) NULL;
-}
-
-static XlcConvMethodsRec strtostr_methods = {
-    close_converter,
-    strtostr,
-    NULL
-} ;
-
-static XlcConv
-open_strtostr(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(&strtostr_methods);
-}
-
-static XlcConvMethodsRec wcstostr_methods = {
-    close_converter,
-    wcstostr,
-    NULL
-} ;
-
-static XlcConv
-open_wcstostr(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(&wcstostr_methods);
-}
-
-static XlcConvMethodsRec cstostr_methods = {
-    close_converter,
-    cstostr,
-    NULL
-} ;
-
-static XlcConv
-open_cstostr(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(&cstostr_methods);
-}
-
-static XlcConvMethodsRec strtowcs_methods = {
-    close_converter,
-    strtowcs,
-    NULL
-} ;
-
-static XlcConv
-open_strtowcs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(&strtowcs_methods);
-}
-
-XLCd
-_XlcDefaultLoader(name)
-    _Xconst char *name;
-{
-    XLCd lcd;
-
-    if (strcmp(name, "C"))
-	return (XLCd) NULL;
-
-    lcd = _XlcCreateLC(name, _XlcPublicMethods);
-
-    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNWideChar, open_strtowcs);
-    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNCompoundText, open_strtostr);
-    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNString, open_strtostr);
-    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNCharSet, open_strtostr);
-    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNChar, open_strtostr);/* XXX */
-
-    _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNMultiByte, open_wcstostr);
-    _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNCompoundText, open_wcstostr);
-    _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNString, open_wcstostr);
-    _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNCharSet, open_wcstostr);
-
-    _XlcSetConverter(lcd, XlcNString, lcd, XlcNMultiByte, open_strtostr);
-    _XlcSetConverter(lcd, XlcNString, lcd, XlcNWideChar, open_strtowcs);
-
-    _XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNMultiByte, open_cstostr);
-    _XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNWideChar, open_strtowcs);
-
-    return lcd;
-}
diff --git a/xc/lib/X11/lcDynamic.c b/xc/lib/X11/lcDynamic.c
deleted file mode 100644
index 57c3febe9..000000000
--- a/xc/lib/X11/lcDynamic.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* $TOG: lcDynamic.c /main/3 1998/02/06 17:40:11 kaleb $ */
-/*
-Copyright 1996, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-*/
-/*
- * Copyright 1995 by FUJITSU LIMITED
- * This is source code modified by FUJITSU LIMITED under the Joint
- * Development Agreement for the CDE/Motif PST.
- *
- * Modifier: Takanori Tateno   FUJITSU LIMITED
- *
- */
-#ifdef USE_DYNAMIC_LOADER
-#include <stdio.h>
-#include <string.h>
-#include "Xlibint.h"
-
-#ifndef XLOCALEDIR
-#define XLOCALEDIR "/usr/lib/X11/locale"
-#endif
-
-#define LCLIBNAME    "xi18n.so"
-
-extern void *dlopen();
-extern void *dlsym();
-extern int dlclose();
-extern char *dlerror();
-
-#define LAZY       1
-#define NOW        2
-#define GLOBAL     0x100
-
-XLCd
-_XlcDynamicLoader(name)
-    char *name;
-{
-    char libpath[1024];
-    XLCdMethods _XlcGenericMethods;
-    XLCd lcd;
-    void *nlshandler;
-
-    sprintf(libpath,"%s/%s/%s",
-		XLOCALEDIR,name,LCLIBNAME);
-    nlshandler = dlopen(libpath,LAZY);
-    _XlcGenericMethods = (XLCdMethods)dlsym(nlshandler,
-				"genericMethods");
-    lcd = _XlcCreateLC(name,_XlcGenericMethods);
-    
-
-    return lcd;
-}
-#endif /* USE_DYNAMIC_LOADER */
diff --git a/xc/lib/X11/lcEuc.c b/xc/lib/X11/lcEuc.c
deleted file mode 100644
index 9c6c2937e..000000000
--- a/xc/lib/X11/lcEuc.c
+++ /dev/null
@@ -1,1507 +0,0 @@
-/* $TOG: lcEuc.c /main/21 1998/04/30 11:02:13 kaleb $ */
-/******************************************************************
-
-        Copyright 1992, 1993 by FUJITSU LIMITED
-        Copyright 1993 by Fujitsu Open Systems Solutions, Inc.
-
-Permission to use, copy, modify, distribute and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of FUJITSU LIMITED and
-Fujitsu Open Systems Solutions, Inc. not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.
-FUJITSU LIMITED and Fujitsu Open Systems Solutions, Inc. makes no
-representations about the suitability of this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-FUJITSU LIMITED AND FUJITSU OPEN SYSTEMS SOLUTIONS, INC. DISCLAIMS ALL
-WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL FUJITSU OPEN SYSTEMS
-SOLUTIONS, INC. AND FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT
-OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-OF THIS SOFTWARE.
-
-    Authors: Shigeru Yamada 		(yamada@ossi.com)
-             Jeffrey Bloomfield		(jeffb@ossi.com)
-             Yoshiyuki Segawa		(segawa@ossi.com)
-
-*****************************************************************/
-/* $XFree86: xc/lib/X11/lcEuc.c,v 3.6 1998/10/03 08:41:38 dawes Exp $ */
-
-
-#ifdef X_LOCALE
-
-#include "Xlibint.h"
-#include "XlcGeneric.h"
-
-#include <ctype.h>
-#ifdef WIN32
-#define isascii __isascii
-#endif
-
-#define CS0     codesets[0]             /* Codeset 0 - 7-bit ASCII      */
-#define CS1     codesets[1]             /* Codeset 1 - Kanji            */
-#define CS2     codesets[2]             /* Codeset 2 - Half-Kana        */
-#define CS3     codesets[3]             /* Codeset 3 - User defined     */
-
-#define SS2	0x8e	/* Single-shift char: CS2 */
-#define SS3	0x8f    /* Single-shift char: CS3 */
-
-#define ASCII_CODESET   0
-#define KANJI_CODESET   1
-#define KANA_CODESET    2
-#define USERDEF_CODESET 3
-#define MAX_CODESETS  
-
-#define GR	0x80	/* begins right-side (non-ascii) region */
-#define GL	0x7f    /* ends left-side (ascii) region        */
-
-#define isleftside(c)	(((c) & GR) ? 0 : 1)
-#define isrightside(c)	(!isleftside(c))
-
-#define BIT8OFF(c)	((c) & GL)
-#define BIT8ON(c)	((c) | GR)
-
-typedef unsigned char   Uchar;
-typedef unsigned long   Ulong;
-typedef unsigned int	Uint;
-
-static CodeSet GetCodeSetFromCharSet();
-static CodeSet wc_codeset();
-
-#define BADCHAR(min_ch, c)  (BIT8OFF(c) < (char)min_ch && BIT8OFF(c) != 0x0 && \
-			     BIT8OFF(c) != '\t' && BIT8OFF(c) != '\n' && \
-			     BIT8OFF(c) != 0x1b)
-
-/*
- * Notes:
- * 1. Defining FORCE_INDIRECT_CONVERTER (see _XlcEucLoader())
- *    forces indirect (charset) conversions (e.g. wcstocs()<->cstombs()).
- * 2. Using direct converters (e.g. mbstowcs()) decreases conversion
- *    times by 20-40% (depends on specific converter used).
- */
-
-static int
-euc_mbstowcs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-
-    XLCd lcd = (XLCd)conv->state;
-
-    register Uchar ch;
-    register int chr_len = 0;
-    register int sshift =  False;
-    register int shift_mult = 0;
-    register Uint chrcode;
-
-    Uint wc_encode = 0;
-    Uint wc_tmp = 0;
-
-    int cs0flg = False;
-    int cs1flg = False;
-    int length;
-    int num_conv;
-    int unconv_num = 0;
-
-    Bool new_char;
-
-    XPointer inbufptr = *from;
-    wchar_t *outbufptr = (wchar_t *) *to;
-    wchar_t *outbuf_base = outbufptr;
-
-    CodeSet *codesets = XLC_GENERIC(lcd, codeset_list); 
-    int codeset_num = XLC_GENERIC(lcd, codeset_num);
-    Ulong wc_shift = XLC_GENERIC(lcd, wc_shift_bits);
-
-
-    if (*from_left > *to_left)
-	*from_left = *to_left;
-
-    for (new_char = True; *from_left > 0;) {
-
-	ch = *inbufptr++;
-
-	if (isleftside(ch)) {				/* CS0 */
-            if (ASCII_CODESET >= codeset_num) {
-		unconv_num++;
-		(*from_left)--;
-		continue;
-	    }
-	    if( cs0flg == True) {
-		new_char = True;
-		cs0flg = False;
-	    }
-	    length = CS0->length;
-	    *outbufptr++ = (wchar_t)ch;
-	    (*from_left)--;
-	    continue;
-	}
-	else if (ch == SS2) {				/* CS2 */
-	    if (KANA_CODESET >= codeset_num) {
-		unconv_num++;
-		(*from_left)--;
-		continue;
-	    }
-	    if (sshift == True || cs1flg == True) {
-		cs1flg = False;
-		unconv_num++;
-		continue;
-	    }
-	    length = CS2->length;
-	    wc_encode = CS2->wc_encoding;
-	    chrcode = 0;
-	    sshift = True;
-	    cs0flg = True;
-	    (*from_left)--;
-	    continue;
-	}
-	else if (ch == SS3) {				/* CS3 */
-	    if (USERDEF_CODESET >= codeset_num) {
-		unconv_num++;
-		(*from_left)--;
-		continue;
-	    }
-	    if (sshift == True || cs1flg == True) {
-		cs1flg = False;
-		unconv_num++;
-		continue;
-	    }
-	    length = CS3->length;
-	    if (*from_left < 1 )
-		unconv_num++;
-	    wc_encode = CS3->wc_encoding;
-	    chrcode = 0;
-	    sshift = True;
-	    cs0flg = True;
-	    (*from_left)--;
-	    continue;
-
-	} else {					/* CS1 */
-	    if (KANJI_CODESET >= codeset_num) {
-		unconv_num++;
-		(*from_left)--;
-		continue;
-	    }
-	    if (sshift == False) {
-		length = CS1->length;
-		if (*from_left < 1)
-		    unconv_num++;
-		wc_encode = CS1->wc_encoding;
-	    }
-	    chrcode = BIT8OFF(ch);
-	    cs0flg = True;
-	    cs1flg = True;
-	    (*from_left)--;
-	}
-
-	if (new_char) {				/* begin new character */
-	    chr_len = length;
-	    shift_mult = length - 1;
-	    new_char = False;
-	}
-
-	chrcode <<= (wc_shift * shift_mult);
-	shift_mult--;
-	wc_tmp |= chrcode; 
-
-	if (--chr_len == 0) {
-	    wc_tmp |= wc_encode;
-	    *outbufptr++ = wc_tmp;
-
-	    new_char = True;
-	    sshift = False;
-	    cs0flg = False;
-	    cs1flg = False;
-	    wc_tmp  = (Uint)0;
-	}
-
-    }	/* end for */
-
-    *to = (XPointer)outbufptr;
-
-    if (cs0flg == True || cs1flg == True)	/* error check on last char */
-	unconv_num++;
-
-    if ((num_conv = (int)(outbufptr - outbuf_base)) > 0)
-        *to_left = (*to_left) - num_conv;
-
-    return unconv_num;
-}
-
-
-static int
-euc_wcstombs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    wchar_t *inbufptr = (wchar_t *) *from;
-    register XPointer outbufptr = *to;
-    XPointer outbuf_base = outbufptr;
-    wchar_t  wch;
-    register int length;
-    Uchar tmp;
-    int num_conv;
-    int unconv_num = 0;
-
-    XLCd lcd = (XLCd)conv->state;
-    CodeSet codeset;
-    Ulong wc_shift = XLC_GENERIC(lcd, wc_shift_bits);
-
-
-    if (*from_left > *to_left)
-        *from_left = *to_left;
-
-    for (; *from_left > 0 ; (*from_left)-- ) {
-
-	wch = *inbufptr++;
-
-	if (!(codeset = wc_codeset(lcd, wch))) {
-	    unconv_num++;
-	    (*from_left)--;
-	    continue;
-	}
-
-	length = codeset->length;
-	wch ^= (wchar_t)codeset->wc_encoding;
-
-	if (codeset->parse_info)	/* put out SS2 or SS3 */
-	    *outbufptr++ = *codeset->parse_info->encoding;
-
-	do {
-	    length--;
-	    tmp = (wch>>(wchar_t)(length * wc_shift));
-
-	    if (codeset->side == XlcGR)
-		tmp = BIT8ON(tmp);
-
-	    *outbufptr++ = (Uchar)tmp;
-	} while (length);
-    }
-
-    *to = (XPointer)outbufptr;
-
-    if ((num_conv = (int)(outbufptr - outbuf_base)) > 0)
-	*to_left -= num_conv;
-
-    return unconv_num;
-}
-
-
-static int
-euc_mbtocs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    XLCd lcd = (XLCd)conv->state;
-    XlcCharSet charset;
-    CodeSet *codesets = XLC_GENERIC(lcd, codeset_list);
-    int codeset_num = XLC_GENERIC(lcd, codeset_num);
-    int length;
-    int unconv_num = 0;
-    int min_ch = 0;
-    register char *src = *from, *dst = *to;
-
-
-    if (isleftside(*src)) { 			/* 7-bit (CS0) */
-	if (ASCII_CODESET >= codeset_num)
-	    return -1;
-	charset = *CS0->charset_list;
-    }
-    else if ((Uchar)*src == SS2) {		/* half-kana (CS2) */
-	if (KANA_CODESET >= codeset_num)
-	    return -1;
-	charset = *CS2->charset_list;
-	src++;
-	(*from_left)--;
-    }
-    else if ((Uchar)*src == SS3) {		/* user-def */
-	if (USERDEF_CODESET >= codeset_num)
-	    return -1;
-	charset = *CS3->charset_list;
-	src++;
-	(*from_left)--;
-    }
-    else  { 					/* Kanji (CS1) */
-	if (KANJI_CODESET >= codeset_num)
-	    return -1;
-	charset = *CS1->charset_list;
-    }
-
-    if(*from_left < charset->char_size || *to_left < charset->char_size)
-	return -1;
-
-    min_ch = 0x20;
-    if (charset->set_size == 94)
-	if (charset->char_size > 1 || charset->side == XlcGR)
-	    min_ch = 0x21;
-
-    length = charset->char_size;
-    do {
-	if(BADCHAR(min_ch, *src)) {
-	    unconv_num++;
-	    src++;
-	    break;
-	}
-	switch (charset->side) {
-	    case XlcGL:
-		*dst++ = BIT8OFF(*src++);
-		break;
-	    case XlcGR:
-		*dst++ = BIT8ON(*src++);
-		break;
-	    default:
-		*dst++ = *src++;
-		break;
-	    }
-    } while (--length);
-
-    *to = dst;
-    *from = src;
-    *from_left -= charset->char_size;
-    *to_left -= charset->char_size - length;
-
-    if (num_args > 0)
-	*((XlcCharSet *) args[0]) = charset;
-
-    return unconv_num;
-}
-
-
-static int
-euc_mbstocs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    char *tmp_from, *tmp_to;
-    int tmp_from_left, tmp_to_left;
-    XlcCharSet charset, tmp_charset;
-    XPointer tmp_args[1];
-    int unconv_num = 0, ret;
-
-
-/* Determine the charset of the segment and convert one characater: */
-
-    tmp_args[0] = (XPointer) &charset; /* charset from euc_mbtocs() */
-    while
-      ((ret = euc_mbtocs(conv, from, from_left, to, to_left, tmp_args, 1)) > 0)
-	unconv_num += ret;
-    if ( ret < 0 )
-	return ret;
-
-    tmp_from = *from;
-    tmp_from_left = *from_left;
-    tmp_to_left = *to_left;
-    tmp_to = *to;
-
-
-/* Convert remainder of the segment: */
-
-    tmp_args[0] = (XPointer) &tmp_charset;
-    while( (ret = euc_mbtocs(conv, &tmp_from, &tmp_from_left, &tmp_to,
-      &tmp_to_left, tmp_args, 1)) >= 0 ) {
-
-	if (ret > 0) {
-	    unconv_num += ret;
-	    continue;
-	}
-
-	if (tmp_charset != charset)  /* quit on end of segment */
-	    break;
-
-	*from = tmp_from;
-	*from_left = tmp_from_left;
-	*to = tmp_to;
-	*to_left = tmp_to_left;
-    } 
-
-    if (num_args > 0)
-	*((XlcCharSet *) args[0]) = charset;
-    
-    return unconv_num;
-}
-
-
-static int
-euc_wcstocs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    XLCd lcd = (XLCd)conv->state;
-    wchar_t *wcptr = (wchar_t *) *from;
-    register char *bufptr = (char *) *to;
-    wchar_t wch;
-    char *tmpptr;
-    register int length;
-    CodeSet codeset;
-    Ulong wc_encoding;
-    int wcstr_len = *from_left, buf_len = *to_left;
-
-
-    if (!(codeset = wc_codeset(lcd, *wcptr)))
-	return -1;
-
-    wc_encoding = codeset->wc_encoding;
-
-    if (wcstr_len < buf_len / codeset->length)
-	buf_len = wcstr_len * codeset->length;
-
-    for ( ; wcstr_len > 0 && buf_len > 0; wcptr++, wcstr_len--) {
-	wch = *wcptr;
-
-	if ((wch & XLC_GENERIC(lcd, wc_encode_mask)) != wc_encoding)
-	    break;
-
-	length = codeset->length;
-
-	buf_len -= length;
-	bufptr += length;
-	tmpptr = bufptr - 1;
-
-	while (length--) {
-	    *tmpptr-- = codeset->length == 1 && codeset->side == XlcGR ?
-	      BIT8ON(wch) : BIT8OFF(wch);
-	    wch >>= (wchar_t)XLC_GENERIC(lcd, wc_shift_bits);
-	}
-    }
-
-    if (num_args > 0)
-	*((XlcCharSet *) args[0]) = *codeset->charset_list;
-
-    *from_left -= wcptr - (wchar_t *) *from;
-    *from = (XPointer) wcptr;
-
-    *to_left -= bufptr - *to;
-    *to = bufptr;
-
-    return 0;
-}
-
-
-static int
-euc_cstombs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    XLCd lcd = (XLCd)conv->state;
-    register char *csptr = *from;
-    register char *bufptr = *to;
-    int csstr_len = *from_left;
-    register int buf_len = *to_left;
-    int length;
-    CodeSet codeset;
-    int cvt_length;
-
-
-    if (num_args < 1)
-	return -1;
-    
-    if (!(codeset = GetCodeSetFromCharSet(lcd, (XlcCharSet) args[0])))
-	return -1;
-
-    cvt_length = 0;
-    csstr_len /= codeset->length;
-    buf_len /= codeset->length;
-
-    if (codeset->parse_info)
-	csstr_len *= 2;
-
-    if (csstr_len < buf_len)
-	buf_len = csstr_len;
-
-    cvt_length += buf_len * codeset->length;
-
-    if (bufptr) {
-	while (buf_len--) {
-	    if (codeset->parse_info)	/* put out SS2 or SS3 */
-		*bufptr++ = *codeset->parse_info->encoding;
-
-	    length = codeset->length;
-	    while (length--)
-		*bufptr++ = codeset->side == XlcGR ?
-		  BIT8ON(*csptr++) : BIT8OFF(*csptr++);
-	}
-    }
-
-    *from_left -= csptr - *from;
-    *from = csptr;
-    if (bufptr)
-	*to += cvt_length;
-    *to_left -= cvt_length;
-
-    return 0;
-}
-
-
-static int
-euc_cstowcs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    XLCd lcd = (XLCd)conv->state;
-    register char *csptr = *from;
-    wchar_t *bufptr = (wchar_t *) *to;
-    wchar_t *toptr = (wchar_t *) *to;
-    int csstr_len = *from_left;
-    register int buf_len = *to_left;
-    wchar_t wch;
-    int length;
-    Ulong wc_shift_bits = XLC_GENERIC(lcd, wc_shift_bits);
-    CodeSet codeset;
-
-    
-    if (num_args < 1)
-	return -1;
-    
-    if (!(codeset = GetCodeSetFromCharSet(lcd, (XlcCharSet) args[0])))
-        return -1;
-
-    csstr_len /= codeset->length;
-    if (csstr_len < buf_len)
-	buf_len = csstr_len;
-    *to_left -= buf_len;
-
-    if (bufptr) {
-
-	toptr += buf_len;
-	*to = (XPointer) toptr;
-	
-        while (buf_len--) {
-
-            wch = (wchar_t) BIT8OFF(*csptr);
-            csptr++;
-
-            length = codeset->length - 1;
-            while (length--) {
-                wch = (wch << wc_shift_bits) | BIT8OFF(*csptr);
-                csptr++;
-            }
-            *bufptr++ = wch | codeset->wc_encoding;
-        }
-    }
-    *from_left -= csptr - *from;
-    *from = csptr;
-
-    return 0;
-}
-
-
-static CodeSet
-wc_codeset(lcd, wch)
-    XLCd lcd;
-    wchar_t wch;
-{
-
-    register CodeSet *codesets = XLC_GENERIC(lcd, codeset_list);
-    register int end = XLC_GENERIC(lcd, codeset_num);
-    register Ulong widech = (Ulong)(wch & XLC_GENERIC(lcd, wc_encode_mask));
-
-    for (; --end >= 0; codesets++)
-	if ( widech == (*codesets)->wc_encoding )
-	    return *codesets;
-
-    return NULL;
-}
-
-
-static CodeSet
-GetCodeSetFromCharSet(lcd, charset)
-    XLCd lcd;
-    XlcCharSet charset;
-{
-    register CodeSet *codeset = XLC_GENERIC(lcd, codeset_list);
-    register XlcCharSet *charset_list;
-    register int codeset_num, num_charsets;
-
-    codeset_num = XLC_GENERIC(lcd, codeset_num);
-
-    for ( ; codeset_num-- > 0; codeset++) {
-	num_charsets = (*codeset)->num_charsets;
-	charset_list = (*codeset)->charset_list;
-
-	for ( ; num_charsets-- > 0; charset_list++)
-	    if (*charset_list == charset)
-		return *codeset;
-    }
-
-    return (CodeSet) NULL;
-}
-
-
-static XlcConv
-create_conv(lcd, methods)
-    XLCd lcd;
-    XlcConvMethods methods;
-{
-    XlcConv conv;
-
-    conv = (XlcConv) Xmalloc(sizeof(XlcConvRec));
-    if (conv == NULL)
-	return (XlcConv) NULL;
-    
-    conv->methods = methods;
-    conv->state = (XPointer) lcd;
-    return conv;
-}
-
-
-/*
- *    Stripped down Direct CT converters for EUC
- *
- */
-
-typedef struct _CTDataRec {
-    int side;
-    int length;
-    char *name;
-    Ulong wc_encoding;
-    char sshift;
-    char *ct_encoding;
-    int ct_encoding_len;
-    int set_size;
-    Uchar min_ch;
-    Uchar ct_type;
-} CTDataRec, *CTData;
-
-typedef struct _StateRec {
-    CTData GL_charset;
-    CTData GR_charset;
-    CTData charset;
-} StateRec, *State;
-
-#define CT_STD  0
-#define CT_NSTD 1
-#define CT_DIR  2
-#define CT_EXT0 3
-#define CT_EXT1 4
-#define CT_EXT2 5
-#define CT_VER  6
-
-static CTDataRec ctdata[] =
-{
-  { XlcGL,      1, "ISO8859-1:GL",       0, 0, "\033(B"   ,  3, 0, 0, CT_STD  },
-  { XlcGR,      1, "ISO8859-1:GR",       0, 0, "\033-A"   ,  3, 0, 0, CT_STD  },
-  { XlcGL,      1, "JISX0201.1976-0:GL", 0, 0, "\033(J"   ,  3, 0, 0, CT_STD  },
-  { XlcGR,      1, "JISX0201.1976-0:GR", 0, 0, "\033)I"   ,  3, 0, 0, CT_STD  },
-  { XlcGL,      2, "JISX0208.1983-0:GL", 0, 0, "\033$(B"  ,  4, 0, 0, CT_STD  },
-  { XlcGR,      2, "JISX0208.1983-0:GR", 0, 0, "\033$)B"  ,  4, 0, 0, CT_STD  },
-  { XlcGL,      2, "JISX0212.1990-0:GL", 0, 0, "\033$(D"  ,  4, 0, 0, CT_STD  },
-  { XlcGR,      2, "JISX0212.1990-0:GR", 0, 0, "\033$)D"  ,  4, 0, 0, CT_STD  },
-  { XlcUnknown, 0, "Ignore-Ext-Status?", 0, 0, "\033#"    ,  2, 0, 0, CT_VER  },
-  { XlcUnknown, 0, "NonStd-?-OctetChar", 0, 0, "\033%/0"  ,  4, 0, 0, CT_NSTD },
-  { XlcUnknown, 1, "NonStd-1-OctetChar", 0, 0, "\033%/1"  ,  4, 0, 0, CT_NSTD },
-  { XlcUnknown, 2, "NonStd-2-OctetChar", 0, 0, "\033%/2"  ,  4, 0, 0, CT_NSTD },
-  { XlcUnknown, 3, "NonStd-3-OctetChar", 0, 0, "\033%/3"  ,  4, 0, 0, CT_NSTD },
-  { XlcUnknown, 4, "NonStd-4-OctetChar", 0, 0, "\033%/4"  ,  4, 0, 0, CT_NSTD },
-  { XlcUnknown, 0, "Extension-2"       , 0, 0, "\033%/"   ,  3, 0, 0, CT_EXT2 },
-  { XlcUnknown, 0, "Extension-0"       , 0, 0, "\033"     ,  1, 0, 0, CT_EXT0 },
-  { XlcUnknown, 0, "Begin-L-to-R-Text",  0, 0, "\2331]"   ,  3, 0, 0, CT_DIR  },
-  { XlcUnknown, 0, "Begin-R-to-L-Text",  0, 0, "\2332]"   ,  3, 0, 0, CT_DIR  },
-  { XlcUnknown, 0, "End-Of-String",      0, 0, "\233]"    ,  2, 0, 0, CT_DIR  },
-  { XlcUnknown, 0, "Extension-1"       , 0, 0, "\233"     ,  1, 0, 0, CT_EXT1 },
-};
-
-/* Note on above table:  euc_ctstombs() and euc_ctstowcs() parser depends on
- * certain table entries occuring in decreasing string length--
- *   1.  CT_EXT2 and CT_EXT0 entries must occur after CT_NSTD entries.
- *   2.  CT_DIR and CT_EXT1 entries must occur after CT_DIR entries.
- */
-
-static CTData ctd_endp = ctdata + ((sizeof(ctdata) / sizeof(CTDataRec))) - 1;
-static CTData ctdptr[sizeof(ctdata) / sizeof(CTDataRec)];
-
-#define Ascii   0
-#define Kanji   1
-#define Kana    2
-#define Userdef 3
-
-/*
- * initCTptr(): Set ctdptr[] to point at ctdata[], indexed by codeset_num.
- */
-static void
-initCTptr(lcd)
-    XLCd lcd;
-{
-    int num_codesets = XLC_GENERIC(lcd, codeset_num);
-    int num_charsets;
-    int i, j;
-    CodeSet *codesets = XLC_GENERIC(lcd, codeset_list);
-    CodeSet codeset;
-    XlcCharSet charset;
-    CTData ctdp = ctdata;
-
-    ctdptr[Ascii] = &ctdata[0];		/* failsafe */
-
-    for (i = 0; i < num_codesets; i++) {
-
-	codeset = codesets[i];
-	num_charsets = codeset->num_charsets;
-
-	for (j = 0; j < num_charsets; j++) {
-
-	    charset = codeset->charset_list[j];
-
-	    for (ctdp = ctdata; ctdp <= ctd_endp; ctdp++)
-
-		if (! strcmp(ctdp->name, charset->name)) {
-
-		    ctdptr[codeset->cs_num] = ctdp;
-
-		    ctdptr[codeset->cs_num]->wc_encoding = codeset->wc_encoding;
-
-		    ctdptr[codeset->cs_num]->set_size =
-		      charset->set_size;
-
-		    ctdptr[codeset->cs_num]->min_ch =
-		      charset->set_size == 94 &&
-		      (ctdptr[codeset->cs_num]->length > 1 ||
-		      ctdptr[codeset->cs_num]->side == XlcGR) ? 0x21 : 0x20;
-
-		    if (codeset->parse_info) {
-			ctdptr[codeset->cs_num]->sshift =
-			  *codeset->parse_info->encoding;
-		    }
-
-		    break;
-		}
-	}
-    }
-}
-
-
-#define SKIP_I(str)     while (*(str) >= 0x20 && *(str) <=  0x2f) (str)++;
-#define SKIP_P(str)     while (*(str) >= 0x30 && *(str) <=  0x3f) (str)++;
-
-static int
-euc_ctstowcs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    XLCd lcd = (XLCd)conv->state;
-    Ulong wc_shift_bits = XLC_GENERIC(lcd, wc_shift_bits);
-    register XPointer inbufptr = *from;
-    XPointer inbuf_base;
-    register wchar_t *outbufptr = (wchar_t *) *to;
-    wchar_t *outbuf_base = outbufptr;
-    register int clen, length;
-    int num_conv;
-    int unconv_num = 0;
-    unsigned int ct_seglen = 0;
-    Uchar ct_type = 0;
-    register int shift_mult;
-    wchar_t wc_tmp;
-    wchar_t wch;
-    Ulong wc_encoding;
-    CTData ctdp = ctdata;
-    Bool save_outbuf = True;
-    /* If outbufptr is NULL, doen't save output, but just counts
-       a length to hold the output */
-    if (outbufptr == NULL) save_outbuf = False;
-
-    for (length = ctdata[Ascii].length; *from_left > 0; (*from_left) -= length)
-    {
-	ct_type = CT_STD;
-	if (*inbufptr == '\033' || *inbufptr == (char)'\233') {
-	    for (ctdp = ctdata; ctdp <= ctd_endp ; ctdp++) {
-
-		if(!strncmp(inbufptr, ctdp->ct_encoding, ctdp->ct_encoding_len))
-		{
-		    inbufptr += ctdp->ct_encoding_len;
-		    (*from_left) -= ctdp->ct_encoding_len;
-		    if (ctdp->length) {
-			length = ctdp->length;
-			if( *from_left < length ) {
-			    *to = (XPointer)outbufptr;
-			    *to_left -= outbufptr - outbuf_base;
-			    return( unconv_num + *from_left );
-			}
-		    }
-		    ct_type = ctdp->ct_type;
-		    break;
-		}
-	    }
-	    if (ctdp > ctd_endp) 	/* failed to match CT sequence */
-		unconv_num++;
-	}
-
-/* The following code insures that non-standard encodings, direction, extension,
- * and version strings are ignored; subject to change in future.
- */
-	switch (ct_type) {
-	case CT_STD:
-	    break;
-	case CT_EXT2:
-	    inbufptr++;
-	    (*from_left)--;
-	case CT_NSTD:
-	    ct_seglen = (BIT8OFF(*inbufptr) << 7) + BIT8OFF(*(inbufptr+1)) + 2;
-	    inbufptr += ct_seglen;
-	    (*from_left) -= ct_seglen;
-	    continue;
-	case CT_EXT0:
-	    inbuf_base = inbufptr;
-	    SKIP_I(inbufptr);
-	    inbufptr++;
-	    ct_seglen = (unsigned)(inbufptr - inbuf_base);
-	    *(from_left) -= ct_seglen;
-	    continue;
-	case CT_EXT1:
-	    inbuf_base = inbufptr;
-	    SKIP_P(inbufptr);
-	    SKIP_I(inbufptr);
-	    inbufptr++;
-	    ct_seglen = (unsigned)(inbufptr - inbuf_base);
-	    *(from_left) -= ct_seglen;
-	    continue;
-	case CT_DIR:
-	    continue;
-	case CT_VER:
-	    inbufptr += 2;
-	    *(from_left) -= 2;
-	    continue;
-	}
-
-	wc_encoding = (ctdp == ctdptr[Kana] && isleftside(*inbufptr)) ?
-	    ctdptr[Ascii]->wc_encoding: ctdp->wc_encoding;
-
-	shift_mult = length - 1;
-	wch = (wchar_t)0;
-	clen = length;
-
-	do {
-	    wc_tmp = BIT8OFF(*inbufptr++) << (wc_shift_bits * shift_mult);
-	    wch |= wc_tmp;
-	    shift_mult--;
-	} while (--clen);
-
-	if (save_outbuf == True)
-	    *outbufptr++ = wch | wc_encoding;
-	if (--*to_left == 0 && *from_left != length) {
-	    *to = (XPointer)outbufptr;
-	    unconv_num = *from_left;
-	    return unconv_num;
-	}
-    }
-
-    *to = (XPointer)outbufptr;
-
-    return unconv_num;
-
-}
-
-
-#define byte1			(length == codeset->length - 1)
-#define byte2			(byte1 == 0)
-#define kanji			(codeset->cs_num == 1)
-#define kana			(codeset->cs_num == 2)
-#define userdef			(codeset->cs_num == 3)
-
-static int
-euc_wcstocts(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    register int ct_len = *to_left;
-    register wchar_t *inbufptr = (wchar_t *) *from;
-    register char *ctptr = *to;
-    XPointer ct_base = ctptr;
-    wchar_t  wch;
-    register int length;
-    register int unconv_num = 0;
-    Uchar tmp;
-    Uchar t1 = 0;
-    int num_conv;
-
-    StateRec ct_state;
-    XLCd lcd = (XLCd)conv->state;
-    CTData charset;
-    CodeSet codeset;
-    Ulong wc_shift = XLC_GENERIC(lcd, wc_shift_bits);
-
-
-/* Initial State: */
-    ct_state.GL_charset = ctdptr[0]; /* Codeset 0 */
-    ct_state.GR_charset = NULL;
-
-    if (*from_left > *to_left)
-	*from_left = *to_left;
-
-    for (; *from_left > 0 ; (*from_left)-- ) {
-
-	wch = *inbufptr++;
-
-	if (!(codeset = wc_codeset(lcd, wch))) {
-	    unconv_num++;
-	    (*from_left)--;
-	    continue;
-	}
-
-	charset = ctdptr[codeset->cs_num];
-
-	length = codeset->length;
-	wch ^= (wchar_t)codeset->wc_encoding;
-
-	if ( (charset->side == XlcGR && charset != ct_state.GR_charset) ||
-	     (charset->side == XlcGL && charset != ct_state.GL_charset) ) {
-
-	    ct_len -= ctdptr[codeset->cs_num]->ct_encoding_len;
-
-	    if (ct_len < 0) {
-		unconv_num++;
-		break;
-	    }
-
-	    if (ctptr) {
-		strcpy(ctptr, ctdptr[codeset->cs_num]->ct_encoding);
-		ctptr += ctdptr[codeset->cs_num]->ct_encoding_len;
-	    }
-	}
-
-	if (charset->side == XlcGR) {
-	    ct_state.GR_charset = charset;
-	    ct_state.GL_charset = NULL;
-	} else if (charset->side == XlcGL) {
-	    ct_state.GL_charset = charset;
-	    ct_state.GR_charset = NULL;
-	}
-
-	do {
-
-	    length--;
-	    tmp = wch>>(wchar_t)( (Ulong)length * wc_shift);
-
-	    if (kana) {
-		if (BADCHAR(charset->min_ch, (char)tmp)) {
-		    unconv_num++;
-		    break;
-		}
-		*ctptr++ = (char)BIT8ON(tmp);
-	    }
-
-	    else if (byte1 && (kanji || userdef))
-		t1 = tmp;
-
-	    else if (byte2 && (kanji || userdef)) {
-		if (BADCHAR(charset->min_ch, (char)t1) ||
-		  BADCHAR(charset->min_ch, (char)tmp)) {
-		    unconv_num++;
-		    break;
-		}
-		if (charset->side == XlcGR) {
-		    *ctptr++ = (char)BIT8ON(t1);
-		    *ctptr++ = (char)BIT8ON(tmp);
-		} else {
-		    *ctptr++ = (char)BIT8OFF(t1);
-		    *ctptr++ = (char)BIT8OFF(tmp);
-		}
-	    }
-
-	    else {
-		if (BADCHAR(charset->min_ch, (char)tmp)) {
-		    unconv_num++;
-		    break;
-		}
-		*ctptr++ = (char)tmp;
-	    }
-
-
-	} while (length); 
-
-    }	/* end for */
-
-    *to = (XPointer)ctptr;
-
-    if ((num_conv = (int)(ctptr - ct_base)) > 0)
-	(*to_left) -= num_conv;
-
-    return unconv_num;
-}
-#undef byte1
-#undef byte2
-#undef kana
-#undef kanji
-#undef userdef
-
-
-#define byte1	(ctdp->length == clen)
-#define kana    (ctdp == ctdptr[Kana] && isrightside(*inbufptr))
-/* #define kanji   (ctdp == ctdptr[Kanji]) */
-#define kanji   (strstr(ctdp->name, "JISX0208"))
-#define userdef (ctdp == ctdptr[Userdef])
-
-static int
-euc_ctstombs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    register XPointer inbufptr = *from;
-    register XPointer outbufptr = *to;
-    XPointer inbuf_base;
-    XPointer outbuf_base = outbufptr;
-    register int clen, length;
-    int unconv_num = 0;
-    int num_conv;
-    unsigned int ct_seglen = 0;
-    Uchar ct_type = 0;
-    CTData ctdp = &ctdata[0];	/* default */
-    Bool save_outbuf = True;
-    /* If outbufptr is NULL, doen't save output, but just counts
-       a length to hold the output */
-    if (outbufptr == NULL) save_outbuf = False;
-
-    for (length = ctdata[Ascii].length; *from_left > 0; (*from_left) -= length)
-    {
-	ct_type = CT_STD;
-	if (*inbufptr == '\033' || *inbufptr == (char)'\233') {
-
-	    for (ctdp = ctdata; ctdp <= ctd_endp ; ctdp++) {
-
-		if(!strncmp(inbufptr, ctdp->ct_encoding, ctdp->ct_encoding_len))
-		{
-		    inbufptr += ctdp->ct_encoding_len;
-		    (*from_left) -= ctdp->ct_encoding_len;
-		    if (ctdp->length) {
-			length = ctdp->length;
-			if( *from_left < length ) {
-			    *to = (XPointer)outbufptr;
-			    *to_left -= outbufptr - outbuf_base;
-			    return( unconv_num + *from_left );
-			}
-		    }
-		    ct_type = ctdp->ct_type;
-		    break;
-		}
-	    }
-	    if (ctdp > ctd_endp) 	/* failed to match CT sequence */
-		unconv_num++;
-	}
-
-/* The following code insures that non-standard encodings, direction, extension,
- * and version strings are ignored; subject to change in future.
- */
-	switch (ct_type) {
-	case CT_STD:
-	    break;
-	case CT_EXT2:
-	    inbufptr++;
-	    (*from_left)--;
-	case CT_NSTD:
-	    ct_seglen = (BIT8OFF(*inbufptr) << 7) + BIT8OFF(*(inbufptr+1)) + 2;
-	    inbufptr += ct_seglen;
-	    (*from_left) -= ct_seglen;
-	    continue;
-	case CT_EXT0:
-	    inbuf_base = inbufptr;
-	    SKIP_I(inbufptr);
-	    inbufptr++;
-	    ct_seglen = (unsigned)(inbufptr - inbuf_base);
-	    *(from_left) -= ct_seglen;
-	    continue;
-	case CT_EXT1:
-	    inbuf_base = inbufptr;
-	    SKIP_P(inbufptr);
-	    SKIP_I(inbufptr);
-	    inbufptr++;
-	    ct_seglen = (unsigned)(inbufptr - inbuf_base);
-	    *(from_left) -= ct_seglen;
-	    continue;
-	case CT_DIR:
-	    continue;
-	case CT_VER:
-	    inbufptr += 2;
-	    *(from_left) -= 2;
-	    continue;
-	}
-
-	clen = length;
-	do {
-
-	    if (byte1)
-		if (kanji) {
-		    *inbufptr = BIT8ON(*inbufptr);
-		    *(inbufptr+1) = BIT8ON(*(inbufptr+1));
-		}
-		else if (kana || userdef) {
-		    if (save_outbuf == True) {
-			*outbufptr++ = ctdp->sshift;
-		    }
-		    (*to_left)--;
-		}
-	    if (save_outbuf == True) {
-		*outbufptr++ = *inbufptr;
-	    }
-	    (*to_left)--;
-	    inbufptr++;
-
-	    if (*to_left == 0 && *from_left != length) {
-		*to = (XPointer)outbufptr;
-		unconv_num = *from_left;
-		return unconv_num;
-	    }
-	} while (--clen);
-    }
-
-    *to = outbufptr;
-
-    return unconv_num;
-
-}
-#undef byte1
-#undef kana
-#undef kanji
-#undef userdef
-
-
-static int
-euc_mbstocts(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    register int ct_len = *to_left;
-    int cs_num;
-    int clen, length;
-    int unconv_num = 0;
-    int num_conv;
-    XPointer inbufptr = *from;
-    register char *ctptr = *to;
-    XPointer ct_base = ctptr;
-
-    StateRec ct_state;
-    CTData charset;
-    XLCd lcd = (XLCd) conv->state;
-    int codeset_num = XLC_GENERIC(lcd, codeset_num);
-
-
-/* Initial State: */
-    ct_state.GL_charset = NULL;
-    ct_state.GR_charset = NULL;
-
-    if (*from_left > *to_left)
-        *from_left = *to_left;
-
-    for (;*from_left > 0; (*from_left) -= length) {
-
-	if (isleftside(*inbufptr)) {		/* 7-bit (CS0) */
-	    if (ASCII_CODESET >= codeset_num) {
-	      	unconv_num++;
-		(*from_left)--;
-		continue;
-	    }
-	    cs_num = Ascii;
-	    charset = ctdptr[Ascii];
-	}
-	else if ((Uchar)*inbufptr == SS2) {	/* Kana */
-	    if (KANA_CODESET >= codeset_num) {
-	      	unconv_num++;
-		(*from_left)--;
-		continue;
-	    }
-	    cs_num = Kana;
-	    charset = ctdptr[Kana];
-	    inbufptr++;
-	    (*from_left)--;
-	}
-	else if ((Uchar)*inbufptr == SS3) {	/* Userdef */
-	    if (USERDEF_CODESET >= codeset_num) {
-	      	unconv_num++;
-		(*from_left)--;
-		continue;
-	    }
-	    cs_num = Userdef;
-	    charset = ctdptr[Userdef];
-	    inbufptr++;
-	    (*from_left)--;
-	}
-	else {
-	    if (KANJI_CODESET >= codeset_num) {
-	      	unconv_num++;
-		(*from_left)--;
-		continue;
-	    }
-	    cs_num = Kanji;
-	    charset = ctdptr[Kanji];
-	}
-
-	length = charset->length;
-
-	if (BADCHAR(charset->min_ch, *inbufptr))
-            continue;
-
-	if ( (charset->side == XlcGR && charset != ct_state.GR_charset) ||
-	     (charset->side == XlcGL && charset != ct_state.GL_charset) ) {
-
-	    ct_len -= ctdptr[cs_num]->ct_encoding_len;
-	    if (ct_len < 0) {
-		unconv_num++;
-		break;
-	    }
-	
-	    if (ctptr) {
-		strcpy(ctptr, ctdptr[cs_num]->ct_encoding);
-		ctptr += ctdptr[cs_num]->ct_encoding_len;
-	    }
-	}
-
-	if (charset->side == XlcGR) {
-	    ct_state.GR_charset = charset;
-	    ct_state.GL_charset = NULL;
-	} else if (charset->side == XlcGL) {
-	    ct_state.GL_charset = charset;
-	    ct_state.GR_charset = NULL;
-	}
-
-	clen = length;
-
-	do {
-	    *ctptr++ = charset == ct_state.GR_charset ?
-		BIT8ON(*inbufptr++) : BIT8OFF(*inbufptr++);
-	} while (--clen); 
-    }
-
-    *to = (XPointer)ctptr;
-
-    if ((num_conv = (int)(ctptr - ct_base)) > 0)
-	(*to_left) -= num_conv;
-    return unconv_num;
-
-}
-
-
-static void
-close_converter(conv)
-    XlcConv conv;
-{
-	Xfree((char *) conv);
-}
-
-enum { MBSTOCS, WCSTOCS, MBTOCS, CSTOMBS, CSTOWCS, MBSTOWCS, WCSTOMBS,
-       CTSTOWCS, CTSTOMBS, WCSTOCTS, MBSTOCTS };
-
-static XlcConvMethodsRec conv_methods[] = {
-    {close_converter, euc_mbstocs,  NULL },
-    {close_converter, euc_wcstocs,  NULL },
-    {close_converter, euc_mbtocs,   NULL },
-    {close_converter, euc_cstombs,  NULL },
-    {close_converter, euc_cstowcs,  NULL },
-    {close_converter, euc_mbstowcs, NULL },
-    {close_converter, euc_wcstombs, NULL },
-    {close_converter, euc_ctstowcs, NULL },
-    {close_converter, euc_ctstombs, NULL },
-    {close_converter, euc_wcstocts, NULL },
-    {close_converter, euc_mbstocts, NULL },
-};
-
-
-static XlcConv
-open_mbstocs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &conv_methods[MBSTOCS]);
-}
-
-static XlcConv
-open_wcstocs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &conv_methods[WCSTOCS]);
-}
-
-static XlcConv
-open_mbtocs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &conv_methods[MBTOCS]);
-}
-
-static XlcConv
-open_cstombs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &conv_methods[CSTOMBS]);
-}
-
-static XlcConv
-open_cstowcs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &conv_methods[CSTOWCS]);
-}
-
-static XlcConv
-open_mbstowcs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &conv_methods[MBSTOWCS]);
-}
-
-static XlcConv
-open_wcstombs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &conv_methods[WCSTOMBS]);
-}
-
-static XlcConv
-open_ctstowcs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &conv_methods[CTSTOWCS]);
-}
-
-static XlcConv
-open_ctstombs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &conv_methods[CTSTOMBS]);
-}
-
-static XlcConv
-open_wcstocts(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &conv_methods[WCSTOCTS]);
-}
-
-static XlcConv
-open_mbstocts(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &conv_methods[MBSTOCTS]);
-}
-
-XLCd
-#ifdef DYNAMIC_LOAD
-_XlcGenericLoader(name)
-#else
-_XlcEucLoader(name)
-#endif
-    _Xconst char *name;
-{
-    XLCd lcd;
-
-    lcd = _XlcCreateLC(name, _XlcGenericMethods);
-    if (lcd == NULL)
-	return lcd;
-
-
-    if (!XLC_PUBLIC_PART(lcd)->codeset ||
-	(_XlcNCompareISOLatin1(XLC_PUBLIC_PART(lcd)->codeset, "euc", 3))) {
-	_XlcDestroyLC(lcd);
-	return (XLCd) NULL;
-    }
-
-    initCTptr(lcd);
-
-    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNCharSet, open_mbstocs);
-    _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNCharSet, open_wcstocs);
-    _XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNMultiByte, open_cstombs);
-    _XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNWideChar, open_cstowcs);
-    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNChar, open_mbtocs);
-
-#ifndef FORCE_INDIRECT_CONVERTER
-    _XlcSetConverter(lcd, XlcNCompoundText, lcd, XlcNMultiByte, open_ctstombs);
-    _XlcSetConverter(lcd, XlcNCompoundText, lcd, XlcNWideChar, open_ctstowcs);
-    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNCompoundText, open_mbstocts);
-    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNWideChar, open_mbstowcs);
-    _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNCompoundText, open_wcstocts);
-    _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNMultiByte, open_wcstombs);
-#endif
-
-    return lcd;
-}
-
-#else
-typedef int dummy;
-#endif /* X_LOCALE */
diff --git a/xc/lib/X11/lcFile.c b/xc/lib/X11/lcFile.c
deleted file mode 100644
index 7a7d95738..000000000
--- a/xc/lib/X11/lcFile.c
+++ /dev/null
@@ -1,390 +0,0 @@
-/* $TOG: lcFile.c /main/13 1998/05/28 14:21:35 kaleb $ */
-/*
- *
- * Copyright IBM Corporation 1993
- *
- * All Rights Reserved
- *
- * License to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appear in all copies and that
- * both that copyright notice and this permission notice appear in
- * supporting documentation, and that the name of IBM not be
- * used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.
- *
- * IBM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS, AND 
- * NONINFRINGEMENT OF THIRD PARTY RIGHTS, IN NO EVENT SHALL
- * IBM BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
-*/
-/* $XFree86: xc/lib/X11/lcFile.c,v 3.17 1999/05/09 10:50:39 dawes Exp $ */
-
-#include <stdio.h>
-#include <ctype.h>
-#include "Xlibint.h"
-#include "XlcPubI.h"
-#include <X11/Xos.h>
-#ifdef X_NOT_STDC_ENV
-extern char *getenv();
-#endif
-
-/************************************************************************/
-
-#define	iscomment(ch)	((ch) == '#' || (ch) == '\0')
-#if defined(WIN32)
-#define isreadable(f)	(_XAccessFile(f))
-#else
-#define isreadable(f)	((access((f), R_OK) != -1) ? 1 : 0)
-#endif
-
-#ifndef __EMX__
-#define LC_PATHDELIM ':'
-#else
-#define LC_PATHDELIM ';'
-#endif
-
-#define XLC_BUFSIZE 256
-
-#ifndef X_NOT_POSIX
-#ifdef _POSIX_SOURCE
-#include <limits.h>
-#else
-#define _POSIX_SOURCE
-#include <limits.h>
-#undef _POSIX_SOURCE
-#endif
-#endif
-#ifndef PATH_MAX
-#ifdef WIN32
-#define PATH_MAX 512
-#else
-#include <sys/param.h>
-#endif
-#ifndef PATH_MAX
-#ifdef MAXPATHLEN
-#define PATH_MAX MAXPATHLEN
-#else
-#define PATH_MAX 1024
-#endif
-#endif
-#endif
-
-#define NUM_LOCALEDIR	64
-
-static int
-parse_line(line, argv, argsize)
-    char *line;
-    char **argv;
-    int argsize;
-{
-    int argc = 0;
-    char *p = line;
-
-    while(argc < argsize){
-	while(isspace(*p)){
-	    ++p;
-	}
-	if(*p == '\0'){
-	    break;
-	}
-	argv[argc++] = p;
-	while(*p != ':' && *p != '\n' && *p != '\0'){
-	    ++p;
-	}
-	if(*p == '\0'){
-	    break;
-	}
-	*p++ = '\0';
-    }
-
-    return argc;
-}
-
-/* parse the colon separated list in path into argv */
-int
-_XlcParsePath(path, argv, argsize)
-    char *path;
-    char **argv;
-    int argsize;
-{
-    char *p = path;
-    int i, n;
-
-#if 0
-    while((p = strchr(p, LC_PATHDELIM)) != NULL){
-	*p = ' ';	/* place space on delimter */
-    }
-#endif
-    n = parse_line(path, argv, argsize);
-    if(n == 0){
-	return 0;
-    }
-    for(i = 0; i < n; ++i){
-	int len;
-	p = argv[i];
-	len = strlen(p);
-	if(p[len - 1] == '/'){
-	    /* eliminate slash */
-	    p[len - 1] = '\0';
-	}
-    }
-    return n;
-}
-
-#ifndef XLOCALEDIR
-#define XLOCALEDIR "/usr/lib/X11/locale"
-#endif
-
-static void
-xlocaledir(buf, buf_len)
-    char *buf;
-    int buf_len;
-{
-    char *dir, *p = buf;
-    int len = 0;
-
-    dir = getenv("XLOCALEDIR");
-    if(dir != NULL){
-	len = strlen(dir);
-	strncpy(p, dir, buf_len);
-	if (len < buf_len) {
-	    p[len++] = LC_PATHDELIM;
-	    p += len;
-	}
-    }
-    if (len < buf_len)
-#ifndef __EMX__
-      strncpy(p, XLOCALEDIR, buf_len - len);
-#else
-      strncpy(p,__XOS2RedirRoot(XLOCALEDIR), buf_len - len);
-#endif
-    buf[buf_len-1] = '\0';
-}
-
-enum { LtoR, RtoL };
-
-static char *
-resolve_name(lc_name, file_name, direction)
-    char *lc_name;
-    char *file_name;
-    int direction;	/* mapping direction */
-{
-    FILE *fp;
-    char buf[XLC_BUFSIZE], *name = NULL;
-
-    fp = _XFopenFile (file_name, "r");
-    if(fp == (FILE *)NULL){
-	return NULL;
-    }
-
-    while(fgets(buf, XLC_BUFSIZE, fp) != NULL){
-	char *p = buf;
-	int n;
-	char *args[2], *from, *to;
-#ifdef __EMX__  /* Take out CR under OS/2 */
-	int len;
-
-	len=strlen(p);
-	if (len>1) {
-	  if (*(p+len-2) == '\r' && *(p+len-1) == '\n') {
-		*(p+len-2) = '\n';
-		*(p+len-1) = '\0';
-	  }
-	}
-#endif
-	while(isspace(*p)){
-	    ++p;
-	}
-	if(iscomment(*p)){
-	    continue;
-	}
-	n = parse_line(p, args, 2);		/* get first 2 fields */
-	if(n != 2){
-	    continue;
-	}
-	if(direction == LtoR){
-	    from = args[0], to = args[1];	/* left to right */
-	}else{
-	    from = args[1], to = args[0];	/* right to left */
-	}
-	if(! strcmp(from, lc_name)){
-	    name = Xmalloc(strlen(to) + 1);
-	    if(name != NULL){
-		strcpy(name, to);
-	    }
-	    break;
-	}
-    }
-    if(fp != (FILE *)NULL){
-	fclose(fp);
-    }
-    return name;
-}
-
-/*
-#define	isupper(ch)	('A' <= (ch) && (ch) <= 'Z')
-#define	tolower(ch)	((ch) - 'A' + 'a')
-*/
-static char *
-lowercase(dst, src)
-    char *dst;
-    char *src;
-{
-    char *s, *t;
-
-    for(s = src, t = dst; *s; ++s, ++t){
-	*t = isupper(*s) ? tolower(*s) : *s;
-    }
-    *t = '\0';
-    return dst;
-}
-
-/************************************************************************/
-char *
-_XlcFileName(lcd, category)
-    XLCd lcd;
-    char *category;
-{
-    char *siname;
-    char cat[XLC_BUFSIZE], dir[XLC_BUFSIZE];
-    int i, n;
-    char *args[NUM_LOCALEDIR];
-    char *file_name = NULL;
-
-    if(lcd == (XLCd)NULL){
-	return NULL;
-    }
-
-    siname = XLC_PUBLIC(lcd, siname);
-
-    lowercase(cat, category);
-    xlocaledir(dir,XLC_BUFSIZE);
-    n = _XlcParsePath(dir, args, NUM_LOCALEDIR);
-    for(i = 0; i < n; ++i){
-	char buf[PATH_MAX], *name;
-
-	name = NULL;
-	if ((5 + (args[i] ? strlen (args[i]) : 0) +
-	    (cat ? strlen (cat) : 0)) < PATH_MAX) {
-	    sprintf(buf, "%s/%s.dir", args[i], cat);
-	    name = resolve_name(siname, buf, RtoL);
-	}
-	if(name == NULL){
-	    continue;
-	}
-	if(*name == '/'){
-	    /* supposed to be absolute path name */
-	    file_name = name;
-	}else{
-	    file_name = Xmalloc(2 + (args[i] ? strlen (args[i]) : 0) +
-				(name ? strlen (name) : 0));
-	    if (file_name != NULL)
-		sprintf(file_name, "%s/%s", args[i], name);
-	    Xfree(name);
-	}
-	if(isreadable(file_name)){
-	    break;
-	}
-	Xfree(file_name);
-	file_name = NULL;
-	/* Then, try with next dir */
-    }
-    return file_name;
-}
-
-/************************************************************************/
-#ifndef LOCALE_ALIAS
-#define LOCALE_ALIAS    "locale.alias"
-#endif
-
-int
-_XlcResolveLocaleName(lc_name, pub)
-    char* lc_name;
-    XLCdPublicPart* pub;
-{
-    char dir[PATH_MAX], buf[PATH_MAX], *name = NULL;
-    char *dst;
-    int i, n, sinamelen;
-    char *args[NUM_LOCALEDIR];
-    static char locale_alias[] = LOCALE_ALIAS;
-    char *tmp_siname;
-
-    xlocaledir (dir, PATH_MAX);
-    n = _XlcParsePath(dir, args, NUM_LOCALEDIR);
-    for(i = 0; i < n; ++i){
-	if ((2 + (args[i] ? strlen (args[i]) : 0) + 
-	    strlen (locale_alias)) < PATH_MAX) {
-	    sprintf (buf, "%s/%s", args[i], locale_alias);
-	    name = resolve_name (lc_name, buf, LtoR);
-	}
-	if(name != NULL){
-	    break;
-	}
-    }
-
-    if (name == NULL) {
-	/* vendor locale name == Xlocale name, no expansion of alias */
-	pub->siname = Xmalloc (strlen (lc_name) + 1);
-	strcpy (pub->siname, lc_name);
-    } else {
-	pub->siname = name;
-    }
-
-    sinamelen = strlen (pub->siname);
-    if (sinamelen == 1 && pub->siname[0] == 'C') {
-	pub->language = pub->siname;
-	pub->territory = pub->codeset = NULL;
-	return 1;
-    }
-
-    /* 
-     * pub->siname is in the format <lang>_<terr>.<codeset>, typical would
-     * be "en_US.ISO8859-1", "en_US.utf8", "ru_RU.KOI-8", or ja_JP.SJIS,
-     * although it could be ja.SJIS too.
-     */
-    tmp_siname = Xrealloc (pub->siname, 2 * (sinamelen + 1));
-    if (tmp_siname == NULL) {
-	return 0;
-    }
-    pub->siname = tmp_siname;
-
-    /* language */
-    dst = &pub->siname[sinamelen + 1];
-    strcpy (dst, pub->siname);
-    pub->language = dst;
-
-    /* territory */
-    dst = strchr (dst, '_');
-    if (dst) {
-	*dst = '\0';
-	pub->territory = ++dst;
-    } else
-	dst = &pub->siname[sinamelen + 1];
-
-    /* codeset */
-    dst = strchr (dst, '.');
-    if (dst) {
-	*dst = '\0';
-	pub->codeset = ++dst;
-    }
-
-    return (pub->siname[0] != '\0') ? 1 : 0;
-}
-
-/************************************************************************/
-int
-_XlcResolveI18NPath(buf, buf_len)
-    char *buf;
-    int buf_len;
-{
-    if(buf != NULL){
-	xlocaledir(buf, buf_len);
-    }
-    return 1;
-}
diff --git a/xc/lib/X11/lcGenConv.c b/xc/lib/X11/lcGenConv.c
deleted file mode 100644
index 6e796cfaf..000000000
--- a/xc/lib/X11/lcGenConv.c
+++ /dev/null
@@ -1,2882 +0,0 @@
-/* $TOG: lcGenConv.c /main/17 1997/11/13 18:54:29 kaleb $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-/*
- *  (c) Copyright 1995 FUJITSU LIMITED
- *  This is source code modified by FUJITSU LIMITED under the Joint
- *  Development Agreement for the CDE/Motif PST.
- *
- *   Modifier: Masayoshi Shimamura      FUJITSU LIMITED
- *
- */
-/* $XFree86: xc/lib/X11/lcGenConv.c,v 3.11 1999/05/09 10:50:39 dawes Exp $ */
-
-
-#include "Xlibint.h"
-#include "XlcGeneric.h"
-#include <stdio.h>
-
-#if !defined(X_NOT_STDC_ENV) && !defined(macII) && !defined(Lynx_22) && !defined(X_LOCALE)
-#define STDCVT
-#endif
-
-typedef struct _CTDataRec {
-    char *name;
-    char *encoding;             /* Compound Text encoding */
-} CTDataRec, *CTData;
-
-extern CTDataRec *default_ct_data_list();
-extern size_t 	 default_ct_data_list_num();
-
-static CTDataRec directionality_data[] =
-{
-    { "BEGIN_LEFT-TO-RIGHT_TEXT", "\2331]" },
-    { "BEGIN_RIGHT-TO-LEFT_TEXT", "\2332]" },
-    { "END_OF_STRING", "\233]" },
-};
-
-typedef struct _StateRec {
-    XLCd lcd;
-    XlcCharSet charset;		/* charset of current state */
-    XlcCharSet GL_charset;	/* charset of initial state in GL */
-    XlcCharSet GR_charset;	/* charset of initial state in GR */
-} StateRec, *State;
-
-#define GR      0x80    /* begins right-side (non-ascii) region */
-#define GL      0x7f    /* ends left-side (ascii) region        */
-#define ESC	0x1b
-#define CSI	0x9b
-#define STX	0x02
-
-#define isleftside(c)   (((c) & GR) ? 0 : 1)
-#define isrightside(c)  (!isleftside(c))
-
-
-/* Forward declarations for local routines. */
-static int mbstocts();
-static int ctstombs();
-
-
-/* ------------------------------------------------------------------------- */
-/*				Misc                                         */
-/* ------------------------------------------------------------------------- */
-
-static int
-compare(src, encoding, length)
-    register char *src;
-    register char *encoding;
-    register int length;
-{
-    char *start = src;
-
-    while (length-- > 0) {
-	if (*src++ != *encoding++)
-	    return 0;
-	if (*encoding == '\0')
-	    return src - start;
-    }
-
-    return 0;
-}
-
-static unsigned long
-conv_to_dest(conv, code)
-    Conversion conv;
-    unsigned long code;
-{
-    int i;
-    int conv_num = conv->conv_num;
-    FontScope convlist = conv->convlist;
-
-    for (i = 0; i < conv_num; i++) {
-  	if (convlist[i].start <= code && code <= convlist[i].end) {
-	    switch (convlist[i].shift_direction) {
-	    case '+':
-	        return(code + convlist[i].shift);
-	    case '-':
-		return(code - convlist[i].shift);
-            default:
-		return(code);
-	    }
-	}
-    }
-
-    return(code);
-}
-
-static unsigned long
-conv_to_source(conv, code)
-    Conversion conv;
-    unsigned long code;
-{
-    int i;
-    int conv_num;
-    FontScope convlist;
-    unsigned long start_p;
-    unsigned long start_m;
-    unsigned long end_p;
-    unsigned long end_m;
-
-    if (!conv)
-	return(code);
-
-    conv_num = conv->conv_num;
-    convlist = conv->convlist;
-
-    for (i = 0; i < conv_num; i++) {
-        start_p = convlist[i].start + convlist[i].shift;
-        start_m = convlist[i].start - convlist[i].shift;
-        end_p = convlist[i].end + convlist[i].shift;
-        end_m = convlist[i].end - convlist[i].shift;
-
-        switch (convlist[i].shift_direction) {
-	case '+':
-	    if (start_p <= code && code <= end_p)
-		return(code - convlist[i].shift);
-            break;
-	case '-':
-	    if (start_m <= code && code <= end_m)
-		return(code + convlist[i].shift);
-            break;
-        default:
-	    continue;
-	}
-    }
-
-    return(code);
-}
-
-static unsigned long
-mb_to_gi(mb, codeset)
-    unsigned long mb;
-    CodeSet codeset;
-{
-    int i;
-    unsigned long mb_tmp, mask = 0;
-
-    if (codeset->mbconv) {
-	mb_tmp = conv_to_dest(codeset->mbconv, mb);
-	if (mb_tmp != mb)
-	    return(mb_tmp);
-    }
-
-    if (codeset->side == XlcC0 || codeset->side == XlcGL || 
-	codeset->side == XlcC1 || codeset->side == XlcGR) {
-
-        for (i = 0; i < codeset->length; i++)
-	    mask = (mask << 8) | GL;
-	mb = mb & mask;
-    }
-
-    return(mb);
-}
-
-static unsigned long
-gi_to_mb(glyph_index, codeset)
-    unsigned long glyph_index;
-    CodeSet codeset;
-{
-    int i;
-    unsigned long mask = 0;
-
-    if (codeset->side == XlcC1 || codeset->side == XlcGR) {
-        for (i = 0; i < codeset->length; i++)
-	    mask = (mask << 8) | GR;
-	glyph_index = glyph_index | mask;
-    }
-
-    if (codeset->mbconv)
-        return( conv_to_source(codeset->mbconv, glyph_index) );
-
-    return(glyph_index);
-}
-
-static Bool
-gi_to_wc(lcd, glyph_index, codeset, wc)
-    XLCd lcd;
-    unsigned long glyph_index;
-    CodeSet codeset;
-    wchar_t *wc;
-{
-    unsigned char mask = 0;
-    unsigned long wc_encoding = codeset->wc_encoding;
-    int i, length = codeset->length;
-    unsigned long wc_shift_bits = XLC_GENERIC(lcd, wc_shift_bits);
-
-    for (i = wc_shift_bits; i > 0; i--)
-	mask = (mask << 1) | 0x01;
-
-    for (*wc = 0, length--; length >= 0; length--)
-	*wc = (*wc << wc_shift_bits) | ((glyph_index >> (length * 8 )) & mask);
-
-    *wc = *wc | wc_encoding;
-
-    return(True);
-}
-
-static Bool
-wc_to_gi(lcd, wc, glyph_index, codeset)
-    XLCd lcd;
-    wchar_t wc;
-    unsigned long *glyph_index;
-    CodeSet *codeset;
-{
-    int i;
-    unsigned char mask = 0;
-    unsigned long wc_encoding;
-    unsigned long wc_encode_mask = XLC_GENERIC(lcd, wc_encode_mask);
-    unsigned long wc_shift_bits = XLC_GENERIC(lcd, wc_shift_bits);
-    int codeset_num = XLC_GENERIC(lcd, codeset_num);
-    CodeSet *codeset_list = XLC_GENERIC(lcd, codeset_list);
-
-    wc_encoding = wc & wc_encode_mask;
-    for (*codeset = NULL, i = 0; i < codeset_num; i++) {
-	if (wc_encoding == codeset_list[i]->wc_encoding) {
-	    *codeset = codeset_list[i];
-	    break;
-        }
-    }
-    if (*codeset == NULL)
-	return(False);
-
-    for (i = wc_shift_bits; i > 0; i--)
-	mask = (mask << 1) | 0x01;
-
-    wc = wc & ~wc_encode_mask;
-    for (*glyph_index = 0, i = (*codeset)->length - 1; i >= 0; i--)
-	*glyph_index = (*glyph_index << 8) | 
-		      ( ((unsigned long)wc >> (i * wc_shift_bits)) & mask );
-
-    return(True);
-}
-
-static CodeSet
-byteM_parse_codeset(lcd, inbufptr)
-    XLCd lcd;
-    XPointer inbufptr;
-{
-    unsigned char ch;
-    CodeSet codeset;
-    ByteInfoList byteM;
-    ByteInfoListRec byteM_rec;
-    ByteInfo byteinfo;
-    ByteInfoRec byteinfo_rec;
-    Bool hit;
-    int i, j, k;
-
-    int codeset_num               = XLC_GENERIC(lcd, codeset_num);
-    CodeSet *codeset_list         = XLC_GENERIC(lcd, codeset_list);
-
-    for (i = 0; i < codeset_num; i++) {
-        codeset = codeset_list[i];
-        byteM = codeset->byteM;
-        if (codeset->side != XlcNONE || byteM == NULL)
-	    continue;
-
-        for (j = 0; j < codeset->length; j++) {
-	    ch = *((unsigned char *)(inbufptr + j)); 
-	    byteM_rec = byteM[j];
-	    byteinfo = byteM_rec.byteinfo;
-
-	    for (hit=False,k=0; k < byteM_rec.byteinfo_num; k++) {
-	        byteinfo_rec = byteinfo[k];
-	        if (byteinfo_rec.start <= ch && ch <= byteinfo_rec.end) {
-	            hit = True;
-		    break;
-                }
-            }
-
-            if (!hit)
-		break;
-        }
-
-        if (hit)
-	    return(codeset);
-    }
-
-    return(NULL);
-}                
-
-static CodeSet
-GLGR_parse_codeset(lcd, ch)
-    XLCd lcd;
-    unsigned char ch;
-{
-    int i;
-    CodeSet initial_state_GL      = XLC_GENERIC(lcd, initial_state_GL);
-    CodeSet initial_state_GR      = XLC_GENERIC(lcd, initial_state_GR);
-    CodeSet *codeset_list         = XLC_GENERIC(lcd, codeset_list);
-    int codeset_num               = XLC_GENERIC(lcd, codeset_num);
-
-    XlcSide side = XlcGL;
-    CodeSet codeset = initial_state_GL;
-
-    if (isrightside(ch)) {
-        side = XlcGR;
-        codeset = initial_state_GR;
-    }
-
-    if (codeset)
-	return(codeset);
-
-    for (i = 0; i < codeset_num; i++) {
-	codeset = codeset_list[i];
-	if (codeset->side == side)
-	    return(codeset);
-    }
-    
-    return(NULL);
-}
-
-static XlcCharSet
-gi_parse_charset(glyph_index, codeset)
-    unsigned long glyph_index;
-    CodeSet codeset;
-{
-    int i;
-    XlcCharSet *charset_list = codeset->charset_list;
-    int num_charsets = codeset->num_charsets;
-    ExtdSegment ctextseg = codeset->ctextseg;
-    XlcCharSet charset;
-    int area_num;
-    FontScope area;
-    CTDataRec *default_ct_data = default_ct_data_list();
-    size_t table_size = default_ct_data_list_num();
-
-    /* lockup ct sequence */
-    for (i = 0; i < num_charsets; i++) {
-	charset = charset_list[i];
-        if (*charset->ct_sequence != '\0')
-	    break;
-    }
-    if (i >= num_charsets)
-	return(NULL);
-
-    /* Standard Character Set Encoding ? */
-    for (i = 0; i < table_size; i++)
-        if (compare(charset->ct_sequence, 
-	       default_ct_data[i].encoding, strlen(charset->ct_sequence)))
-	    goto check_extended_seg;
-
-    return(charset);
-
-check_extended_seg:
-    if (!ctextseg)
-        return(charset);
-
-    area = ctextseg->area;
-    area_num = ctextseg->area_num;
-
-    for (i = 0; i < area_num; i++) {
-
-        if (area[i].start <= glyph_index && glyph_index <= area[i].end) {
-
-	    charset = ctextseg->charset;
-
-            if (*charset->ct_sequence == '\0')
-                return(NULL);
-
-	    break;
-	}
-    }
-
-    return(charset);
-}
-
-static Bool
-ct_parse_csi(inbufptr, ctr_seq_len)
-    XPointer inbufptr;
-    int *ctr_seq_len;
-{
-    int i;
-    int num = sizeof(directionality_data) / sizeof(directionality_data[0]);
-
-    for (i = 0; i < num; i++) {
-	if ( !(*ctr_seq_len = strlen(directionality_data[i].encoding)) )
-	    continue;
-
-	if ( strncmp(inbufptr, directionality_data[i].encoding, 
-						*ctr_seq_len) == 0)
-            return(True);
-    }
-
-    return(False);
-}
-
-static int
-cmp_esc_sequence(inbufptr, ct_sequence, encoding_name)
-    XPointer inbufptr;
-    char *ct_sequence;
-    char *encoding_name;
-{
-    int i, seq_len, name_len, total_len;
-    unsigned char byte_m, byte_l;
-    CTDataRec *default_ct_data = default_ct_data_list();
-    size_t table_size = default_ct_data_list_num();
-
-    /* check esc sequence */
-    if ( !(seq_len = strlen(ct_sequence) ) )
-	return(0);
-    if ( strncmp(inbufptr, ct_sequence, seq_len) != 0)
-	return(0);
-
-    /* Standard Character Set Encoding ? */
-    for (i = 0; i < table_size; i++) {
-        if (compare(ct_sequence, 
-                default_ct_data[i].encoding, strlen(ct_sequence)))
-            return(seq_len);
-    }
-
-    /*
-     *   Non-Standard Character Set Encoding
-     *
-     * +-----+-----+-----+-----+-----+-----+-----+----   ----+-----+-----+
-     * |     esc sequence      |  M  |  L  |     encoding name     | STX |
-     * +-----+-----+-----+-----+-----+-----+-----+----   ----+-----+-----+
-     *           4bytes         1byte 1byte     variable length     1byte 
-     * 	                   |                                         |
-     * 	                   +-----------------------------------------+
-     * 	                     name length  = ((M - 128) * 128) + (L - 128)
-     */
-
-    /* get length of encoding name */
-    inbufptr += seq_len;
-    byte_m = *inbufptr++;
-    byte_l = *inbufptr++;
-    name_len = ((byte_m - 128) * 128) + (byte_l - 128);
-    total_len = seq_len + name_len;
-
-    /* compare encoding names */
-    if ( strncmp(inbufptr, encoding_name, name_len - 3) != 0 )
-	return(0);
-
-    /* check STX (Start of Text) */
-    inbufptr = inbufptr + name_len - 3;
-    if ( *inbufptr != STX )
-	return(0);
-
-    return(total_len);
-}
-
-static Bool
-ct_parse_charset(lcd, inbufptr, charset, ctr_seq_len)
-    XLCd lcd;
-    XPointer inbufptr;
-    XlcCharSet *charset;
-    int *ctr_seq_len;
-{
-    int i, j;
-    ExtdSegment ctextseg;
-    int num_charsets;
-    XlcCharSet *charset_list;
-    CodeSet codeset;
-    int codeset_num       = XLC_GENERIC(lcd, codeset_num);
-    CodeSet *codeset_list = XLC_GENERIC(lcd, codeset_list);
-    int segment_conv_num  = XLC_GENERIC(lcd, segment_conv_num);
-    SegConv segment_conv  = XLC_GENERIC(lcd, segment_conv);
-
-
-    /* get charset from XLC_XLOCALE by escape sequence */
-
-    for (i = 0; i < codeset_num; i++) {
-	codeset = codeset_list[i];
-
-	num_charsets = codeset->num_charsets;
-	charset_list = codeset->charset_list;
-	ctextseg     = codeset->ctextseg;
-
-	for (j = 0; j < num_charsets; j++) {
-	    *charset = charset_list[j];
-            if (( *ctr_seq_len = cmp_esc_sequence(inbufptr, 
-		    (*charset)->ct_sequence, (*charset)->encoding_name) ))
-		return(True);
-	}
-
-	if (ctextseg) {
-	    *charset = ctextseg->charset;
-            if (( *ctr_seq_len = cmp_esc_sequence(inbufptr, 
-		    (*charset)->ct_sequence, (*charset)->encoding_name) ))
-		return(True);
-	}
-    }
-
-    /* get charset from XLC_SEGMENTCONVERSION by escape sequence */
-
-    if (!segment_conv)
-	return(False);
-
-    for (i = 0; i < segment_conv_num; i++) {
-	*charset = segment_conv[i].source;
-        if (( *ctr_seq_len = cmp_esc_sequence(inbufptr, 
-	        (*charset)->ct_sequence, (*charset)->encoding_name) ))
-	    return(True);
-	*charset = segment_conv[i].dest;
-        if (( *ctr_seq_len = cmp_esc_sequence(inbufptr, 
-	        (*charset)->ct_sequence, (*charset)->encoding_name) ))
-	    return(True);
-    }
-    
-    return(False);
-}
-
-static Bool
-segment_conversion(lcd, charset, glyph_index)
-    XLCd lcd;
-    XlcCharSet *charset;
-    unsigned long *glyph_index;
-{
-    int i;
-    int segment_conv_num = XLC_GENERIC(lcd, segment_conv_num);
-    SegConv segment_conv = XLC_GENERIC(lcd, segment_conv);
-    FontScopeRec range;
-    ConversionRec conv_rec;
-
-    if (!segment_conv)
-	return(True);
-
-    for (i = 0; i < segment_conv_num; i++) {
-	if (segment_conv[i].source == *charset)
-	    break;
-    }
-
-    if (i >= segment_conv_num)
-	return(True);
-
-    range = segment_conv[i].range;
-    if (*glyph_index < range.start || range.end < *glyph_index)
-	return(True);
-    
-    *charset = segment_conv[i].dest;
-    conv_rec.conv_num = segment_conv[i].conv_num;
-    conv_rec.convlist = segment_conv[i].conv;
-    *glyph_index = conv_to_dest(&conv_rec, *glyph_index);
-
-    return(True);
-}
-
-CodeSet
-_XlcGetCodeSetFromName(lcd, name)
-    XLCd lcd;
-    char *name;
-{
-    int i, j;
-    XlcCharSet charset;
-    int num_charsets;
-    XlcCharSet *charset_list;
-    CodeSet codeset;
-
-    int codeset_num       = XLC_GENERIC(lcd, codeset_num);
-    CodeSet *codeset_list = XLC_GENERIC(lcd, codeset_list);
-
-    for (i = 0; i < codeset_num; i++) {
-        codeset = codeset_list[i];
-
-        num_charsets = codeset->num_charsets;
-        charset_list = codeset->charset_list;
-
-        for (j = 0; j < num_charsets; j++) {
-            charset = charset_list[j];
-
-            if (!strlen(charset->name))
-                continue;
-            if ( strcmp(charset->name, name) == 0)
-                return(codeset);
-        }
-    }
-
-    return(NULL);
-}
-
-static Bool
-_XlcGetCodeSetFromCharSet(lcd, charset, codeset, glyph_index)
-    XLCd lcd;
-    XlcCharSet charset;
-    CodeSet *codeset;
-    unsigned long *glyph_index;
-{
-    int i, j, num;
-    CodeSet *codeset_list = XLC_GENERIC(lcd, codeset_list);
-    XlcCharSet *charset_list;
-    int codeset_num, num_charsets;
-    Conversion ctconv;
-    unsigned long glyph_index_tmp;
-    ExtdSegment ctextseg;
-    CTDataRec *default_ct_data = default_ct_data_list();
-    size_t table_size = default_ct_data_list_num();
-
-    codeset_num = XLC_GENERIC(lcd, codeset_num);
-
-    for (num = 0 ; num < codeset_num; num++) {
-        *codeset = codeset_list[num];
-        ctconv = (*codeset)->ctconv;
-	ctextseg = (*codeset)->ctextseg;
-
-        num_charsets = (*codeset)->num_charsets;
-        charset_list = (*codeset)->charset_list;
-
-        glyph_index_tmp = conv_to_source(ctconv, *glyph_index);
-
-        /* Standard Character Set Encoding ? */
-        for (i = 0; i < table_size; i++) {
-            if (compare(charset->ct_sequence, 
-	           default_ct_data[i].encoding, strlen(charset->ct_sequence)))
-	        break;
-        }
-
-        if (i < table_size) {
-
-            /* Standard Character Set Encoding */
-	    if (glyph_index_tmp == *glyph_index) {
-                for (j = 0; j < num_charsets; j++) {
-                    if (charset_list[j] == charset) {
-                        goto end_loop;
-                    }
-                }
-            }
-
-	} else {
-
-            /* Non-Standard Character Set Encoding */
-            for (j = 0; j < num_charsets; j++) {
-                if (charset_list[j] == charset) {
-                    goto end_loop;
-                }
-            }
-
-            if (glyph_index_tmp != *glyph_index) {
-		if (ctextseg->charset == charset) {
-		    goto end_loop;
-                }
-            }
-
-	}
-
-    }
-
-end_loop:
-    if (num < codeset_num) {
-	*glyph_index = glyph_index_tmp;
-	return(True);
-    }
-
-    return(False);
-}
-
-static Bool
-check_string_encoding(codeset)
-    CodeSet codeset;
-{
-    int i;
-    XlcCharSet charset;
-    XlcCharSet *charset_list = codeset->charset_list;
-    int num_charsets = codeset->num_charsets;
-
-    for (i = 0; i < num_charsets; i++) {
-        charset = charset_list[i];
-        if ( strcmp(charset->encoding_name, "ISO8859-1") == 0 || 
-	     charset->string_encoding)
-            return(True);
-    }
-
-    return(False);
-}
-
-static void
-output_ulong_value(outbufptr, code, length, side)
-    XPointer outbufptr;
-    unsigned long code;
-    int length;
-    XlcSide side;
-{
-    int i;
-    unsigned long mask = 0xff;
-
-    for (i = 0; i < length; i++) {
-	*outbufptr = ( code >> (8 * (length - i - 1)) ) & mask;
-
-	if (side == XlcC0 || side == XlcGL) {
-	    *outbufptr = *outbufptr & GL;
-	} else if (side == XlcC1 || side == XlcGR) {
-	    *outbufptr = *outbufptr | GR;
-	}
-
-	outbufptr++;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-/*				Init                                          */
-/* -------------------------------------------------------------------------- */
-
-static void
-init_state(conv)
-    XlcConv conv;
-{
-    register State state = (State) conv->state;
-
-    /* for CT */
-    state->charset = NULL;
-    state->GL_charset = _XlcGetCharSet("ISO8859-1:GL");
-    state->GR_charset = _XlcGetCharSet("ISO8859-1:GR");
-}
-
-/* -------------------------------------------------------------------------- */
-/*				Convert                                       */
-/* -------------------------------------------------------------------------- */
-
-static int
-mbstowcs_org(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    State state = (State) conv->state;
-    XLCd lcd = state->lcd;
-
-    unsigned char ch;
-    unsigned long mb = 0;
-    wchar_t wc;
-
-    int length = 0, len_left = 0;
-    int unconv_num = 0;
-    int num;
-    Bool ss_flag = 0;
-
-    CodeSet codeset = NULL;
-    ParseInfo parse_info;
-
-    XPointer inbufptr = *from;
-    wchar_t *outbufptr = (wchar_t *) *to;
-    int from_size = *from_left;
-
-    unsigned char *mb_parse_table = XLC_GENERIC(lcd, mb_parse_table);
-    ParseInfo *mb_parse_list      = XLC_GENERIC(lcd, mb_parse_list);
-
-
-    if (*from_left > *to_left)
-        *from_left = *to_left;
-
-    while (*from_left && *to_left) {
-
-	ch = *inbufptr++;
-	(*from_left)--;
-
-	/* null ? */
-	if (!ch) {
-            if (outbufptr) {*outbufptr++ = L'\0';}
-	    (*to_left)--;
-
-	    /* error check */
-            if (len_left) {
-	        unconv_num += (length - len_left);
-		len_left = 0;
-            }
-
-	    continue;
-	}
-
-	/* same mb char data */
-        if (len_left)
-	    goto output_one_wc;
-
-        /* next mb char data for single shift ? */
-	if (mb_parse_table) {
-	    if ((num = mb_parse_table[ch]) > 0) {
-		parse_info = mb_parse_list[num - 1];
-
-                codeset = parse_info->codeset;
-		length = len_left = codeset->length;
-		mb = 0;
-		ss_flag = 1;
-
-		continue;
-	    }
-        } 
-    
-	/* next mb char data for byteM ? */
-	if ((codeset = byteM_parse_codeset(lcd, (inbufptr - 1))))
-	    goto next_mb_char;
-
-	/* next mb char data for GL or GR side ? */
-	if ((codeset = GLGR_parse_codeset(lcd, ch)))
-	    goto next_mb_char;
-	    
-        /* can't find codeset for the ch */
-        unconv_num++;
-        continue;
-
-next_mb_char:
-        length = len_left = codeset->length;
-	mb = 0;
-	ss_flag = 0;
-
-output_one_wc:
-	mb = (mb << 8) | ch;  /* 1 byte left shift */
-	len_left--;
-
-        /* last of one mb char data */
-        if (!len_left) {
-            gi_to_wc(lcd, mb_to_gi(mb, codeset), codeset, &wc);
-            if (outbufptr) {*outbufptr++ = wc;}
-	    (*to_left)--;
-        }
-
-    } /* end of while */
-
-    /* error check on last char */
-    if (len_left) {
-	inbufptr -= (length - len_left + ss_flag);
-	(*from_left) += (length - len_left + ss_flag);
-	unconv_num += (length - len_left + ss_flag);
-    }
-
-    *from = *from + from_size;
-    *from_left = 0;
-    *to = (XPointer)outbufptr;
-
-    return unconv_num;
-}
-
-static int
-stdc_mbstowcs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    char *src = *((char **) from);
-    wchar_t *dst = *((wchar_t **) to);
-    int src_left = *from_left;
-    int dst_left = *to_left;
-    int length, unconv_num = 0;
-
-    while (src_left > 0 && dst_left > 0) {
-	length = mbtowc(dst, src, src_left);
-
-	if (length > 0) {
-	    src += length;
-	    src_left -= length;
-	    if (dst)
-	        dst++;
-	    dst_left--;
-	} else if (length < 0) {
-	    src++;
-	    src_left--;
-	    unconv_num++;
-        } else {
-            /* null ? */
-            src++;
-            src_left--;
-            if (dst) 
-                *dst++ = L'\0';
-            dst_left--;
-        }
-    }
-
-    *from = (XPointer) src;
-    if (dst)
-	*to = (XPointer) dst;
-    *from_left = src_left;
-    *to_left = dst_left;
-
-    return unconv_num;
-}
-
-static int
-wcstombs_org(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    State state = (State) conv->state;
-    XLCd lcd = state->lcd;
-
-    char *encoding;
-    unsigned long mb, glyph_index;
-    wchar_t wc;
-
-    int length;
-    int unconv_num = 0;
-
-    CodeSet codeset;
-
-    wchar_t *inbufptr = (wchar_t *) *from;
-    XPointer outbufptr = *to;
-    int from_size = *from_left;
-    
-    char *default_string = XLC_PUBLIC(lcd, default_string);
-    int defstr_len = strlen(default_string);
-
-
-    if (*from_left > *to_left)
-        *from_left = *to_left;
-
-    while (*from_left && *to_left) {
-
-        wc = *inbufptr++;
-        (*from_left)--;
-
-        /* null ? */
-        if (!wc) {
-            if (outbufptr) {*outbufptr++ = '\0';}
-            (*to_left)--;
-
-            continue;
-        }
-
-        /* convert */
-	if ( !wc_to_gi(lcd, wc, &glyph_index, &codeset) ) {
-
-	    /* output default_string of XDefaultString() */
-            if (*to_left < defstr_len)
-		break;
-	    if (outbufptr) {strncpy((char *)outbufptr, default_string, defstr_len);}
-
-	    if (outbufptr) {outbufptr += defstr_len;}
-	    (*to_left) -= defstr_len;
-
-            unconv_num++;
-
-        } else {
-            mb = gi_to_mb(glyph_index, codeset);
-	    if (codeset->parse_info) {
-
-		/* output shift sequence */
-		encoding = codeset->parse_info->encoding;
-                length = strlen(encoding);
-                if (*to_left < length)
-		    break;
-	        if (outbufptr) {strncpy((char *)outbufptr, encoding, length);}
-
-	        if (outbufptr) {outbufptr += length;}
-	        (*to_left) -= length;
-            }
-
-            /* output characters */
-	    length = codeset->length;
-            if (*to_left < length)
-		break;
-
-	    if (outbufptr) {
-		output_ulong_value(outbufptr, mb, length, XlcNONE);
-	        outbufptr += length;
-	    }
-
-	    (*to_left) -= length;
-        }
-
-    } /* end of while */
-
-    *from = *from + from_size;
-    *from_left = 0;
-    *to = outbufptr;
-
-    return unconv_num;
-}
-
-static int
-stdc_wcstombs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    wchar_t *src = *((wchar_t **) from);
-    char *dst = *((char **) to);
-    int src_left = *from_left;
-    int dst_left = *to_left;
-    int length, unconv_num = 0;
-
-    while (src_left > 0 && dst_left >= MB_CUR_MAX) {
-	length = wctomb(dst, *src);		/* XXX */
-
-        if (length > 0) {
-	    src++;
-	    src_left--;
-	    if (dst) 
-		dst += length;
-	    dst_left -= length;
-	} else if (length < 0) {
-	    src++;
-	    src_left--;
-	    unconv_num++;
-	} 
-    }
-
-    *from = (XPointer) src;
-    if (dst)
-      *to = (XPointer) dst;
-    *from_left = src_left;
-    *to_left = dst_left;
-
-    return unconv_num;
-}
-
-static int
-wcstocts(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    State state = (State) conv->state;
-    XLCd lcd = state->lcd;
-    CTDataRec *default_ct_data = default_ct_data_list();
-    size_t table_size = default_ct_data_list_num();
-
-    unsigned long glyph_index;
-    wchar_t wc;
-
-    int i, total_len, seq_len, name_len;
-    int unconv_num = 0;
-    Bool first_flag = True, standard_flag;
-    XlcSide side;
-
-    CodeSet codeset;
-    XlcCharSet charset, old_charset = NULL;
-    char *ct_sequence;
-
-    wchar_t *inbufptr = (wchar_t *) *from;
-    XPointer outbufptr = *to;
-    int from_size = *from_left;
-
-
-    if (*from_left > *to_left)
-        *from_left = *to_left;
-
-    while (*from_left && *to_left) {
-
-        wc = *inbufptr++;
-        (*from_left)--;
-
-        /* null ? */
-        if (!wc) {
-            if (outbufptr) {*outbufptr++ = '\0';}
-            (*to_left)--;
-
-            continue;
-        }
-
-        /* convert */
-	if ( !wc_to_gi(lcd, wc, &glyph_index, &codeset) ) {
-            unconv_num++;
-	    continue;
-        }
-
-        /* parse charset */
-        if ( !(charset = gi_parse_charset(glyph_index, codeset)) ) {
-            unconv_num++;
-	    continue;
-        }
-
-        /* Standard Character Set Encoding ? */
-	standard_flag = False;
-        for (i = 0; i < table_size; i++)
-            if (compare(charset->ct_sequence, 
-                    default_ct_data[i].encoding, strlen(charset->ct_sequence)))
-                standard_flag = True;
-
-        /*
-         *   Non-Standard Character Set Encoding
-         *
-         * +-----+-----+-----+-----+-----+-----+-----+----   ----+-----+-----+
-         * |     esc sequence      |  M  |  L  |     encoding name     | STX |
-         * +-----+-----+-----+-----+-----+-----+-----+----   ----+-----+-----+
-         *           4bytes         1byte 1byte     variable length     1byte 
-         * 	                   |                                         |
-         * 	                   +-----------------------------------------+
-         * 	                     name length  = ((M - 128) * 128) + (L - 128)
-         */
-
-        /* make encoding data */
-	ct_sequence = charset->ct_sequence;
-	side = charset->side;
-        seq_len = strlen(charset->ct_sequence);
-	if (standard_flag) {
-            name_len = 0;
-	    total_len = seq_len;
-	} else {
-            name_len = 2 + strlen(charset->encoding_name) + 1;
-	    total_len = seq_len + name_len;
-	}
-
-        /* output escape sequence of CT */
-	if ( (charset != old_charset) &&
-	    !(first_flag && (strcmp(charset->encoding_name,"ISO8859-1")==0))) {
-
-	    if (*to_left < total_len + 1) {
-                unconv_num++;
-	        break;
-	    }
-
-	    if (outbufptr) {
-	        strcpy((char *)outbufptr, charset->ct_sequence);
-		outbufptr += seq_len;
-
-                if (!standard_flag) {
-		    *outbufptr++ = name_len / 128 + 128;
-		    *outbufptr++ = name_len % 128 + 128;
-	            strcpy((char *)outbufptr, charset->encoding_name);
-		    outbufptr = outbufptr + name_len - 2 - 1;
-		    *outbufptr++ = STX;
-                }
-	    }
-
-	    (*to_left) -= total_len;
-
-	    first_flag = False;
-	    old_charset = charset;
-	}
-
-        /* output glyph index */
-	if (codeset->ctconv)
-            glyph_index = conv_to_dest(codeset->ctconv, glyph_index);
-        if (*to_left < charset->char_size) {
-            unconv_num++;
-	    break;
-        }
-
-	if (outbufptr) {
-	   output_ulong_value(outbufptr, glyph_index, charset->char_size, side);
-	   outbufptr += charset->char_size;
-	}
-
-	(*to_left) -= charset->char_size;
-
-    } /* end of while */
-
-    *from = *from + from_size;
-    *from_left = 0;
-    *to = outbufptr;
-
-    return unconv_num;
-}
-
-static int
-stdc_wcstocts(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    XPointer buf = Xmalloc((*from_left) * MB_CUR_MAX);
-    XPointer buf_ptr1 = buf;
-    int buf_left1 = (*from_left) * MB_CUR_MAX;
-    XPointer buf_ptr2 = buf_ptr1;
-    int buf_left2;
-    int unconv_num1 = 0, unconv_num2 = 0;
-
-    unconv_num1 = stdc_wcstombs(conv, 
-		from, from_left, &buf_ptr1, &buf_left1, args, num_args);
-    if (unconv_num1 < 0)
-        goto ret;
-
-    buf_left2 = buf_ptr1 - buf_ptr2;
-
-    unconv_num2 = mbstocts(conv, 
-		&buf_ptr2, &buf_left2, to, to_left, args, num_args);
-    if (unconv_num2 < 0)
-        goto ret;
-
-ret:
-    if (buf)
-	Xfree((char *)buf);
-
-    return (unconv_num1 + unconv_num2);
-}
-
-static int
-ctstowcs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    State state = (State) conv->state;
-    XLCd lcd = state->lcd;
-
-    unsigned char ch;
-    unsigned long glyph_index = 0;
-    wchar_t wc;
-
-    int ctr_seq_len = 0, gi_len_left = 0, gi_len = 0;
-    int unconv_num = 0;
-
-    CodeSet codeset = NULL;
-    XlcCharSet charset_tmp;
-
-    XPointer inbufptr = *from;
-    wchar_t *outbufptr = (wchar_t *) *to;
-    int from_size = *from_left;
-
-
-    init_state(conv);
-
-    if (from == NULL || *from == NULL) {
-	init_state(conv);
-        return( 0 );
-    }
-
-    if (*from_left > *to_left)
-        *from_left = *to_left;
-
-    while (*from_left && *to_left) {
-
-	ch = *inbufptr++;
-	(*from_left)--;
-
-	/* null ? */
-	if (!ch) {
-            if (outbufptr) {*outbufptr++ = L'\0';}
-	    (*to_left)--;
-
-	    /* error check */
-            if (gi_len_left) {
-	        unconv_num += (gi_len - gi_len_left);
-		gi_len_left = 0;
-            }
-
-	    continue;
-	}
-
-	/* same glyph_index data */
-        if (gi_len_left)
-	    goto output_one_wc;
-
-        /* control sequence ? */
-        if (ch == CSI) {
-            if ( !ct_parse_csi(inbufptr - 1, &ctr_seq_len) )
-	        goto skip_the_seg;
-
-	    if (*from_left < ctr_seq_len) {
-		inbufptr--;
-		(*from_left)++;
-		unconv_num += *from_left;
-		break;
-	    }
-
-            /* skip the control sequence */
-	    inbufptr += (ctr_seq_len - 1);
-	    *from_left -= (ctr_seq_len - 1);
-
-            continue;
-	}
-
-        /* escape sequence ? */
-        if (ch == ESC) {
-	    if ( !ct_parse_charset(lcd, 
-			inbufptr - 1, &state->charset, &ctr_seq_len) )
-		goto skip_the_seg;
-
-	    if (state->charset->side == XlcC0 || 
-		state->charset->side == XlcGL)
-	      {
-		state->GL_charset = state->charset;
-	      }
-	    else if (state->charset->side == XlcC1 || 
-		     state->charset->side == XlcGR)
-	      {
-		state->GR_charset = state->charset;
-	      }	
-	    else if (state->charset->side == XlcGLGR)
-	      {
-		state->GL_charset = state->charset;
-		state->GR_charset = state->charset;
-	      }	
-
-	    if (*from_left < ctr_seq_len) {
-		inbufptr--;
-		(*from_left)++;
-		unconv_num += *from_left;
-		break;
-	    }
-
-            /* skip the escape sequence */
-	    inbufptr += (ctr_seq_len - 1);
-	    *from_left -= (ctr_seq_len - 1);
-
-            continue;
-        } 
-
- 	/* check current state */
-	if (isleftside(ch))
-	  state->charset = state->GL_charset;
-	else
-	  state->charset = state->GR_charset;
-
-	gi_len = gi_len_left = state->charset->char_size;
-	glyph_index = 0;
-
-output_one_wc:
-        if (state->charset->side == XlcC1 || state->charset->side == XlcGR)
-            glyph_index = (glyph_index << 8) | (ch & GL);
-        else
-            glyph_index = (glyph_index << 8) | ch;
-
-	gi_len_left--;
-
-        /* last of one glyph_index data */
-        if (!gi_len_left) {
-
-	    /* segment conversion */
-	    charset_tmp = state->charset;
-	    if ( !segment_conversion(lcd, &charset_tmp, &glyph_index) ) {
-		unconv_num += gi_len;
-		continue;
-            }
-
-            /* get codeset */
-            if ( !_XlcGetCodeSetFromCharSet(lcd, charset_tmp, 
-						&codeset, &glyph_index) ) {
-		unconv_num += gi_len;
-		continue;
-            }
-
-            /* convert glyph index to wicd char */
-            gi_to_wc(lcd, glyph_index, codeset, &wc);
-            if (outbufptr) {*outbufptr++ = wc;}
-	    (*to_left)--;
-        }
-
-        continue;
-
-skip_the_seg:
-	/* skip until next escape or control sequence */
-        while ( *from_left ) {
-	    ch = *inbufptr++;
-	    (*from_left)--;
-	    unconv_num++;
-
-            if (ch == ESC || ch == CSI) {
-		inbufptr--;
-		(*from_left)++;
-		unconv_num--;
-		break;
-	    }
-        }
-
-        if ( !(*from_left) )
-	    break;
-
-    } /* end of while */
-
-    /* error check on last char */
-    if (gi_len_left) {
-	inbufptr -= (gi_len - gi_len_left);
-	(*from_left) += (gi_len - gi_len_left);
-	unconv_num += (gi_len - gi_len_left);
-    }
-
-    *from = *from + from_size;
-    *from_left = 0;
-    *to = (XPointer)outbufptr;
-
-    return unconv_num;
-}
-
-static int
-stdc_ctstowcs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    XPointer buf = Xmalloc((*from_left) * MB_CUR_MAX);
-    XPointer buf_ptr1 = buf;
-    int buf_left1 = (*from_left) * MB_CUR_MAX;
-    XPointer buf_ptr2 = buf_ptr1;
-    int buf_left2;
-    int unconv_num1 = 0, unconv_num2 = 0;
-
-    unconv_num1 = ctstombs(conv, 
-		from, from_left, &buf_ptr1, &buf_left1, args, num_args);
-    if (unconv_num1 < 0)
-        goto ret;
-
-    buf_left2 = buf_ptr1 - buf_ptr2;
-
-    unconv_num2 = stdc_mbstowcs(conv, 
-		&buf_ptr2, &buf_left2, to, to_left, args, num_args);
-    if (unconv_num2 < 0)
-        goto ret;
-
-ret:
-    if (buf)
-	Xfree((char *)buf);
-
-    return (unconv_num1 + unconv_num2);
-}
-
-static int
-mbstocts(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    XPointer buf = Xmalloc((*from_left) * sizeof(wchar_t));
-    XPointer buf_ptr1 = buf;
-    int buf_left1 = (*from_left);
-    XPointer buf_ptr2 = buf_ptr1;
-    int buf_left2;
-    int unconv_num1 = 0, unconv_num2 = 0;
-
-    unconv_num1 = mbstowcs_org(conv, 
-		from, from_left, &buf_ptr1, &buf_left1, args, num_args);
-    if (unconv_num1 < 0)
-        goto ret;
-
-    buf_left2 = (buf_ptr1 - buf_ptr2) / sizeof(wchar_t);
-
-    unconv_num2 += wcstocts(conv, 
-		&buf_ptr2, &buf_left2, to, to_left, args, num_args);
-    if (unconv_num2 < 0)
-        goto ret;
-
-ret:
-    if (buf)
-	Xfree((char *)buf);
-
-    return (unconv_num1 + unconv_num2);
-}
-
-static int
-mbstostr(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    State state = (State) conv->state;
-    XLCd lcd = state->lcd;
-
-    unsigned char ch;
-    unsigned long mb = 0;
-
-
-    int length = 0, len_left = 0;
-    int unconv_num = 0;
-    int num;
-    Bool ss_flag = 0;
-
-    CodeSet codeset = NULL;
-    ParseInfo parse_info;
-
-    XPointer inbufptr = *from;
-    XPointer outbufptr = *to;
-    int from_size = *from_left;
-
-    unsigned char *mb_parse_table = XLC_GENERIC(lcd, mb_parse_table);
-    ParseInfo *mb_parse_list      = XLC_GENERIC(lcd, mb_parse_list);
-
-
-    if (*from_left > *to_left)
-        *from_left = *to_left;
-
-    while (*from_left && *to_left) {
-
-	ch = *inbufptr++;
-	(*from_left)--;
-
-	/* null ? */
-	if (!ch) {
-            if (outbufptr) {*outbufptr++ = '\0';}
-	    (*to_left)--;
-
-            /* error check */
-            if (len_left) {
-                unconv_num += (length - len_left);
-                len_left = 0;
-            }
-
-	    continue;
-	}
-
-        /* same mb char data */
-        if (len_left)
-            goto output_one_mb;
-
-        /* next mb char data for single shift ? */
-	if (mb_parse_table) {
-	    if ((num = mb_parse_table[ch]) > 0) {
-		parse_info = mb_parse_list[num - 1];
-
-                codeset = parse_info->codeset;
-                length = len_left = codeset->length;
-                mb = 0;
-                ss_flag = 1;
-
-                continue;
-	    }
-        } 
-    
-	/* next char data : byteM ? */
-	if ((codeset = byteM_parse_codeset(lcd, (inbufptr - 1))))
-	    goto next_mb_char;
-
-	/* next char data : GL or GR side ? */
-	if ((codeset = GLGR_parse_codeset(lcd, ch)))
-	    goto next_mb_char;
-	    
-        /* can't find codeset for the ch */
-        unconv_num++;
-        continue;
-
-next_mb_char:
-        length = len_left = codeset->length;
-        mb = 0;
-        ss_flag = 0;
-
-output_one_mb:
-        mb = (mb << 8) | ch;  /* 1 byte left shift */
-        len_left--;
-
-        /* last of one mb char data */
-        if (!len_left) {
-            if (check_string_encoding(codeset)) {
-                if (outbufptr) {*outbufptr++ = mb & 0xff;}
-		(*to_left)--;
-            } else {
-	        unconv_num++;
-            }
-        }
-
-    } /* end of while */
-
-    /* error check on last char */
-    if (len_left) {
-        inbufptr -= (length - len_left + ss_flag);
-        (*from_left) += (length - len_left + ss_flag);
-        unconv_num += (length - len_left + ss_flag);
-    }
-
-    *from = *from + from_size;
-    *from_left = 0;
-    *to = (XPointer)outbufptr;
-
-    return unconv_num;
-}
-
-static int
-mbtocs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    State state = (State) conv->state;
-    XLCd lcd = state->lcd;
-
-    unsigned char ch;
-    unsigned long mb = 0;
-    unsigned long glyph_index;
-
-    int length = 0, len_left = 0, char_len;
-    int unconv_num = 0;
-    int num;
-    XlcSide side;
-
-    CodeSet codeset = NULL;
-    XlcCharSet charset;
-    ParseInfo parse_info;
-
-    XPointer inbufptr = *from;
-    XPointer outbufptr = *to;
-    int from_size = *from_left;
-
-
-    unsigned char *mb_parse_table = XLC_GENERIC(lcd, mb_parse_table);
-    ParseInfo *mb_parse_list      = XLC_GENERIC(lcd, mb_parse_list);
-
-
-    if (*from_left > *to_left)
-        *from_left = *to_left;
-
-    while (*from_left && *to_left) {
-
-	ch = *inbufptr++;
-	(*from_left)--;
-
-	/* null ? */
-	if (!ch) {
-            unconv_num = 1;
-            if (len_left)
-	        unconv_num += (length - len_left);
-	    break;
-	}
-
-	/* same mb char data */
-        if (len_left)
-	    goto output;
-
-        /* next mb char data for single shift ? */
-	if (mb_parse_table) {
-	    if ((num = mb_parse_table[ch]) > 0) {
-		parse_info = mb_parse_list[num - 1];
-
-                codeset = parse_info->codeset;
-		length = len_left = codeset->length;
-		mb = 0;
-
-		continue;
-	    }
-        } 
-    
-	/* next mb char data for byteM ? */
-	if ((codeset = byteM_parse_codeset(lcd, (inbufptr - 1))))
-	    goto next_mb_char;
-
-	/* next mb char data for GL or GR side ? */
-	if ((codeset = GLGR_parse_codeset(lcd, ch)))
-	    goto next_mb_char;
-	    
-        /* can't find codeset for the ch */
-        unconv_num = 1;
-        break;
-
-next_mb_char:
-        length = len_left = codeset->length;
-	mb = 0;
-
-output:
-	mb = (mb << 8) | ch;  /* 1 byte left shift */
-	len_left--;
-
-        /* last of one mb char data */
-        if (!len_left) {
-            glyph_index = mb_to_gi(mb, codeset);
-            if (!(charset = gi_parse_charset(glyph_index, codeset))) {
-                unconv_num = length;
-                break;
-            }
-            char_len = charset->char_size;
-	    side = charset->side;
-
-            /* output glyph index */
-            if (codeset->ctconv)
-                glyph_index = conv_to_dest(codeset->ctconv, glyph_index);
-            if (*to_left < char_len) {
-                unconv_num = length;
-                break;
-            }
-
-	    if (outbufptr) {
-	        output_ulong_value(outbufptr, glyph_index, char_len, side);
-	        outbufptr += char_len;
-	    }
-
-            (*to_left) -= char_len;
-
-            break;
-        }
-
-    } /* end of while */
-
-    /* error end */
-    if (unconv_num) {
-        *from = *from + from_size;
-        *from_left = 0;
-        *to = outbufptr;
-	return -1;
-    }
-
-    /* nomal end */
-    *from = inbufptr;
-    *to = outbufptr;
-
-    if (num_args > 0)
-        *((XlcCharSet *) args[0]) = charset;
-
-    return 0;
-}
-
-static int
-mbstocs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    int ret;
-    XlcCharSet charset_old, charset = NULL;
-    XPointer tmp_args[1];
-
-    XPointer inbufptr;
-    int	in_left;
-    XPointer outbufptr;
-    int	out_left;
-    tmp_args[0] = (XPointer) &charset;
-
-    ret = mbtocs(conv, from, from_left, to, to_left, tmp_args, 1);
-    charset_old = charset;
-    inbufptr = *from;
-    in_left = *from_left;
-    outbufptr = *to;
-    out_left = *to_left;
-
-    while ( ret == 0 && *from_left && *to_left && charset_old == charset ) {
-	charset_old = charset;
-	inbufptr = *from;
-	in_left = *from_left;
-	outbufptr = *to;
-	out_left = *to_left;
-        ret = mbtocs(conv, from, from_left, to, to_left, tmp_args, 1);
-    }
-
-    *from = inbufptr;
-    *from_left = in_left;
-    *to = outbufptr;
-    *to_left = out_left;
-
-    if (num_args > 0)
-        *((XlcCharSet *) args[0]) = charset_old;
-
-    /* error end */
-    if (ret != 0)
-	return( -1 );
-
-    return(0);
-}
-
-static int
-wcstostr(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    State state = (State) conv->state;
-    XLCd lcd = state->lcd;
-
-    char *encoding;
-    unsigned long mb, glyph_index;
-    wchar_t wc;
-
-    int length;
-    int unconv_num = 0;
-
-    CodeSet codeset;
-
-    wchar_t *inbufptr = (wchar_t *) *from;
-    XPointer outbufptr = *to;
-    int from_size = *from_left;
-    
-    char *default_string = XLC_PUBLIC(lcd, default_string);
-    int defstr_len = strlen(default_string);
-
-
-    if (*from_left > *to_left)
-        *from_left = *to_left;
-
-    while (*from_left && *to_left) {
-
-        wc = *inbufptr++;
-        (*from_left)--;
-
-        /* null ? */
-        if (!wc) {
-            if (outbufptr) {*outbufptr++ = '\0';}
-            (*to_left)--;
-
-            continue;
-        }
-
-        /* convert */
-	if ( !wc_to_gi(lcd, wc, &glyph_index, &codeset) ) {
-
-	    /* output default_string of XDefaultString() */
-            if (*to_left < defstr_len)
-		break;
-	    if (outbufptr) {strncpy((char *)outbufptr, default_string, defstr_len);}
-
-	    if (outbufptr) {outbufptr += defstr_len;}
-	    (*to_left) -= defstr_len;
-
-            unconv_num++;
-
-        } else {
-            mb = gi_to_mb(glyph_index, codeset);
-	    if (codeset->parse_info) {
-
-		/* output shift sequence */
-		encoding = codeset->parse_info->encoding;
-                length = strlen(encoding);
-                if (*to_left < length)
-		    break;
-	        if (check_string_encoding(codeset)) {
-	            if (outbufptr) {strncpy((char *)outbufptr, encoding, length);}
-	            if (outbufptr) {outbufptr += length;}
-	            (*to_left) -= length;
-                }
-            }
-
-            /* output characters */
-	    length = codeset->length;
-            if (*to_left < length)
-		break;
-            if (check_string_encoding(codeset)) {
-
-	        if (outbufptr) {
-	            output_ulong_value(outbufptr, mb, length, XlcNONE);
-	            outbufptr += length;
-	        }
-
-	        (*to_left) -= length;
-            } else {
-		unconv_num++;
-            }
-        }
-
-    } /* end of while */
-
-    *from = *from + from_size;
-    *from_left = 0;
-    *to = outbufptr;
-
-    return unconv_num;
-}
-
-static int
-stdc_wcstostr(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    XPointer buf = Xmalloc((*from_left) * MB_CUR_MAX);
-    XPointer buf_ptr1 = buf;
-    int buf_left1 = (*from_left) * MB_CUR_MAX;
-    XPointer buf_ptr2 = buf_ptr1;
-    int buf_left2;
-    int unconv_num1 = 0, unconv_num2 = 0;
-
-    unconv_num1 = stdc_wcstombs(conv, 
-		from, from_left, &buf_ptr1, &buf_left1, args, num_args);
-    if (unconv_num1 < 0)
-        goto ret;
-
-    buf_left2 = buf_ptr1 - buf_ptr2;
-
-    unconv_num2 = mbstostr(conv, 
-		&buf_ptr2, &buf_left2, to, to_left, args, num_args);
-    if (unconv_num2 < 0)
-        goto ret;
-
-ret:
-    if (buf)
-	Xfree((char *)buf);
-
-    return (unconv_num1 + unconv_num2);
-}
-
-static int
-wctocs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    State state = (State) conv->state;
-    XLCd lcd = state->lcd;
-
-    wchar_t wc;
-    unsigned long glyph_index;
-
-    int char_len;
-    int unconv_num = 0;
-    XlcSide side;
-
-    CodeSet codeset;
-    XlcCharSet charset;
-
-    wchar_t *inbufptr = (wchar_t *) *from;
-    XPointer outbufptr = *to;
-    int from_size = *from_left;
-
-
-
-    if (*from_left > *to_left)
-        *from_left = *to_left;
-
-    if (*from_left && *to_left) {
-
-        wc = *inbufptr++;
-        (*from_left)--;
-
-        /* null ? */
-        if (!wc) {
-            unconv_num = 1;
-            goto end;
-        }
-
-        /* convert */
-	if ( !wc_to_gi(lcd, wc, &glyph_index, &codeset) ) {
-            unconv_num = 1;
-	    goto end;
-        }
-
-        if ( !(charset = gi_parse_charset(glyph_index, codeset)) ) {
-            unconv_num = 1;
-	    goto end;
-        }
-	char_len = charset->char_size;
-	side = charset->side;
-
-        /* output glyph index */
-	if (codeset->ctconv)
-            glyph_index = conv_to_dest(codeset->ctconv, glyph_index);
-        if (*to_left < char_len) {
-            unconv_num++;
-	    goto end;
-        }
-
-        if (outbufptr) {
-            output_ulong_value(outbufptr, glyph_index, char_len, side);
-            outbufptr += char_len;
-        }
-
-	(*to_left) -= char_len;
-
-    }
-
-end:
-
-     /* error end */
-    if (unconv_num) {
-        *from = *from + from_size;
-        *from_left = 0;
-        *to = outbufptr;
-        return -1;
-    }
-
-    /* nomal end */
-    *from = (XPointer)inbufptr;
-    *to = outbufptr;
-
-    if (num_args > 0)
-        *((XlcCharSet *) args[0]) = charset;
-
-    return 0;
-}
-
-static int
-stdc_wctocs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    wchar_t wch, *src = *((wchar_t **) from);
-    XPointer tmp_from, save_from = *from;
-    char tmp[32];
-    int length, ret, src_left = *from_left;
-    int from_size = *from_left;
-
-    if (src_left > 0 && *to_left > 0) {
-	if ((wch = *src)) {
-	    length = wctomb(tmp, wch);
-	} else {
-	    goto end;
-	}
-		
-	if (length < 0)
-	    goto end;
-
-	tmp_from = (XPointer) tmp;
-	ret = mbtocs(conv, &tmp_from, &length, to, to_left, args, num_args);
-	if (ret < 0)
-	    goto end;
-
-	src++;
-	src_left--;
-    }
-
-end:
-     /* error end */
-    if (save_from == (XPointer) src) {
-        *from = *from + from_size;
-        *from_left = 0;
-	return -1;
-    }
-
-    /* nomal end */
-    *from = (XPointer) src;
-    *from_left = src_left;
-
-    return 0;
-}
-
-static int
-wcstocs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    int ret;
-    XlcCharSet charset_old, charset = NULL;
-    XPointer tmp_args[1];
-
-    wchar_t *inbufptr;
-    int	in_left;
-    XPointer outbufptr;
-    int	out_left;
-    tmp_args[0] = (XPointer) &charset;
-
-    ret = wctocs(conv, from, from_left, to, to_left, tmp_args, 1);
-    charset_old = charset;
-    inbufptr = (wchar_t *)(*from);
-    in_left = *from_left;
-    outbufptr = *to;
-    out_left = *to_left;
-
-    while ( ret == 0 && *from_left && *to_left && charset_old == charset ) {
-	charset_old = charset;
-	inbufptr = (wchar_t *)(*from);
-	in_left = *from_left;
-	outbufptr = *to;
-	out_left = *to_left;
-        ret = wctocs(conv, from, from_left, to, to_left, tmp_args, 1);
-    }
-
-    *from = (XPointer)inbufptr;
-    *from_left = in_left;
-    *to = outbufptr;
-    *to_left = out_left;
-
-    if (num_args > 0)
-        *((XlcCharSet *) args[0]) = charset_old;
-
-    /* error end */
-    if (ret != 0)
-	return( -1 );
-
-    return(0);
-}
-
-static int
-stdc_wcstocs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    int ret;
-    XlcCharSet charset_old, charset = NULL;
-    XPointer tmp_args[1];
-
-    wchar_t *inbufptr;
-    int	in_left;
-    XPointer outbufptr;
-    int	out_left;
-    tmp_args[0] = (XPointer) &charset;
-
-    ret = stdc_wctocs(conv, from, from_left, to, to_left, tmp_args, 1);
-    charset_old = charset;
-    inbufptr = (wchar_t *)(*from);
-    in_left = *from_left;
-    outbufptr = *to;
-    out_left = *to_left;
-
-    while ( ret == 0 && *from_left && *to_left && charset_old == charset ) {
-	charset_old = charset;
-	inbufptr = (wchar_t *)(*from);
-	in_left = *from_left;
-	outbufptr = *to;
-	out_left = *to_left;
-        ret = stdc_wctocs(conv, from, from_left, to, to_left, tmp_args, 1);
-    }
-
-    *from = (XPointer)inbufptr;
-    *from_left = in_left;
-    *to = outbufptr;
-    *to_left = out_left;
-
-    if (num_args > 0)
-        *((XlcCharSet *) args[0]) = charset_old;
-
-    /* error end */
-    if (ret != 0)
-	return( -1 );
-
-    return(0);
-}
-
-static int
-ctstombs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    XPointer buf = Xmalloc((*from_left) * sizeof(wchar_t));
-    XPointer buf_ptr1 = buf;
-    int buf_left1 = (*from_left);
-    XPointer buf_ptr2 = buf_ptr1;
-    int buf_left2;
-    int unconv_num1 = 0, unconv_num2 = 0;
-
-    unconv_num1 = ctstowcs(conv, 
-		from, from_left, &buf_ptr1, &buf_left1, args, num_args);
-    if (unconv_num1 < 0)
-        goto ret;
-
-    buf_left2 = (buf_ptr1 - buf_ptr2) / sizeof(wchar_t);
-
-    unconv_num2 += wcstombs_org(conv, 
-		&buf_ptr2, &buf_left2, to, to_left, args, num_args);
-    if (unconv_num2 < 0)
-        goto ret;
-
-ret:
-    if (buf)
-	Xfree((char *)buf);
-
-    return (unconv_num1 + unconv_num2);
-}
-
-static int
-strtombs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    State state = (State) conv->state;
-    XLCd lcd = state->lcd;
-
-    char *encoding;
-    unsigned long mb, glyph_index;
-    unsigned char ch;
-
-    int length;
-    int unconv_num = 0;
-
-    CodeSet codeset;
-
-    XPointer inbufptr = *from;
-    XPointer outbufptr = *to;
-    int from_size = *from_left;
-
-    if (*from_left > *to_left)
-        *from_left = *to_left;
-
-    while (*from_left && *to_left) {
-
-        ch = *inbufptr++;
-        (*from_left)--;
-
-        /* null ? */
-        if (!ch) {
-            if (outbufptr) {*outbufptr++ = '\0';}
-            (*to_left)--;
-
-            continue;
-        }
-
-        /* convert */
-        if (isleftside(ch)) {
-	    glyph_index = ch;
-	    codeset = _XlcGetCodeSetFromName(lcd, "ISO8859-1:GL");
-	} else {
-	    glyph_index = ch & GL;
-	    codeset = _XlcGetCodeSetFromName(lcd, "ISO8859-1:GR");
-	}
-
-        if (!codeset) {
-	    unconv_num++;
-	    continue;
-        }
-
-        mb = gi_to_mb(glyph_index, codeset);
-	if (codeset->parse_info) {
-
-	    /* output shift sequence */
-	    encoding = codeset->parse_info->encoding;
-            length = strlen(encoding);
-            if (*to_left < length)
-		break;
-	    if (outbufptr) {strncpy((char *)outbufptr, encoding, length);}
-
-	    if (outbufptr) {outbufptr += length;}
-	    (*to_left) -= length;
-        }
-
-        /* output characters */
-	length = codeset->length;
-        if (*to_left < length)
-	    break;
-
-        if (outbufptr) {
-            output_ulong_value(outbufptr, mb, length, XlcNONE);
-            outbufptr += length;
-        }
-
-	(*to_left) -= length;
-
-    } /* end of while */
-
-    *from = *from + from_size;
-    *from_left = 0;
-    *to = outbufptr;
-
-    return unconv_num;
-}
-
-static int
-strtowcs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    State state = (State) conv->state;
-    XLCd lcd = state->lcd;
-
-    unsigned char ch;
-    unsigned long glyph_index;
-    wchar_t wc;
-
-    int unconv_num = 0;
-    CodeSet codeset;
-
-    XPointer inbufptr = *from;
-    wchar_t *outbufptr = (wchar_t *)*to;
-    int from_size = *from_left;
-
-    if (*from_left > *to_left)
-        *from_left = *to_left;
-
-    while (*from_left && *to_left) {
-
-        ch = *inbufptr++;
-        (*from_left)--;
-
-        /* null ? */
-        if (!ch) {
-            if (outbufptr) {*outbufptr++ = L'\0';}
-            (*to_left)--;
-
-            continue;
-        }
-
-        /* convert */
-        if (isleftside(ch)) {
-	    glyph_index = ch;
-	    codeset = _XlcGetCodeSetFromName(lcd, "ISO8859-1:GL");
-	} else {
-	    glyph_index = ch & GL;
-	    codeset = _XlcGetCodeSetFromName(lcd, "ISO8859-1:GR");
-	}
-
-        if (!codeset) {
-	    unconv_num++;
-	    continue;
-        }
-
-        gi_to_wc(lcd, glyph_index, codeset, &wc);
-	if (outbufptr) {*outbufptr++ = wc;}
-	(*to_left)--;
-
-    } /* end of while */
-
-    *from = *from + from_size;
-    *from_left = 0;
-    *to = (XPointer)outbufptr;
-
-    return unconv_num;
-}
-
-static int
-stdc_strtowcs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    XPointer buf = Xmalloc((*from_left) * MB_CUR_MAX);
-    XPointer buf_ptr1 = buf;
-    int buf_left1 = (*from_left) * MB_CUR_MAX;
-    XPointer buf_ptr2 = buf_ptr1;
-    int buf_left2;
-    int unconv_num1 = 0, unconv_num2 = 0;
-
-    unconv_num1 = strtombs(conv, 
-		from, from_left, &buf_ptr1, &buf_left1, args, num_args);
-    if (unconv_num1 < 0)
-        goto ret;
-
-    buf_left2 = buf_ptr1 - buf_ptr2;
-
-    unconv_num2 = stdc_mbstowcs(conv, 
-		&buf_ptr2, &buf_left2, to, to_left, args, num_args);
-    if (unconv_num2 < 0)
-        goto ret;
-
-ret:
-    if (buf)
-	Xfree((char *)buf);
-
-    return (unconv_num1 + unconv_num2);
-}
-
-/* -------------------------------------------------------------------------- */
-/*				Close                                         */
-/* -------------------------------------------------------------------------- */
-
-static void
-close_converter(conv)
-    XlcConv conv;
-{
-    if (conv->state) {
-	Xfree((char *) conv->state);
-    }
-
-    if (conv->methods) {
-	Xfree((char *) conv->methods);
-    }
-
-    Xfree((char *) conv);
-}
-
-/* -------------------------------------------------------------------------- */
-/*				Open                                          */
-/* -------------------------------------------------------------------------- */
-
-static XlcConv
-create_conv(lcd, methods)
-    XLCd lcd;
-    XlcConvMethods methods;
-{
-    XlcConv conv;
-    State state;
-
-    conv = (XlcConv) Xmalloc(sizeof(XlcConvRec));
-    if (conv == NULL)
-	return (XlcConv) NULL;
-    
-    conv->methods = (XlcConvMethods) Xmalloc(sizeof(XlcConvMethodsRec));
-    if (conv->methods == NULL)
-	goto err;
-    *conv->methods = *methods;
-    if (XLC_PUBLIC(lcd, is_state_depend))
-	conv->methods->reset = init_state;
-
-    conv->state = (XPointer) Xmalloc(sizeof(StateRec));
-    if (conv->state == NULL)
-	goto err;
-    bzero((char *) conv->state, sizeof(StateRec));
-    
-    state = (State) conv->state;
-    state->lcd = lcd;
-    init_state(conv);
-    
-    return conv;
-
-err:
-    close_converter(conv);
-
-    return (XlcConv) NULL;
-}
-
-static XlcConvMethodsRec mbstocts_methods = {
-    close_converter,
-    mbstocts,
-    NULL
-} ;
-
-static XlcConv
-open_mbstocts(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &mbstocts_methods);
-}
-
-static XlcConvMethodsRec mbstostr_methods = {
-    close_converter,
-    mbstostr,
-    NULL
-} ;
-
-static XlcConv
-open_mbstostr(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &mbstostr_methods);
-}
-
-static XlcConvMethodsRec mbstocs_methods = {
-    close_converter,
-    mbstocs,
-    NULL
-} ;
-
-static XlcConv
-open_mbstocs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &mbstocs_methods);
-}
-
-static XlcConvMethodsRec mbtocs_methods = {
-    close_converter,
-    mbtocs,
-    NULL
-} ;
-
-static XlcConv
-open_mbtocs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &mbtocs_methods);
-}
-
-static XlcConvMethodsRec ctstombs_methods = {
-    close_converter,
-    ctstombs,
-    NULL
-} ;
-
-static XlcConv
-open_ctstombs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &ctstombs_methods);
-}
-
-static XlcConvMethodsRec strtombs_methods = {
-    close_converter,
-    strtombs,
-    NULL
-} ;
-
-static XlcConv
-open_strtombs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &strtombs_methods);
-}
-
-#ifdef STDCVT
-
-static XlcConvMethodsRec stdc_mbstowcs_methods = {
-    close_converter,
-    stdc_mbstowcs,
-    NULL
-} ;
-
-static XlcConv
-open_stdc_mbstowcs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &stdc_mbstowcs_methods);
-}
-
-static XlcConvMethodsRec stdc_wcstombs_methods = {
-    close_converter,
-    stdc_wcstombs,
-    NULL
-} ;
-
-static XlcConv
-open_stdc_wcstombs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &stdc_wcstombs_methods);
-}
-
-static XlcConvMethodsRec stdc_wcstocts_methods = {
-    close_converter,
-    stdc_wcstocts,
-    NULL
-} ;
-
-static XlcConv
-open_stdc_wcstocts(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &stdc_wcstocts_methods);
-}
-
-static XlcConvMethodsRec stdc_wcstostr_methods = {
-    close_converter,
-    stdc_wcstostr,
-    NULL
-} ;
-
-static XlcConv
-open_stdc_wcstostr(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &stdc_wcstostr_methods);
-}
-
-static XlcConvMethodsRec stdc_wcstocs_methods = {
-    close_converter,
-    stdc_wcstocs,
-    NULL
-} ;
-
-static XlcConv
-open_stdc_wcstocs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &stdc_wcstocs_methods);
-}
-
-static XlcConvMethodsRec stdc_wctocs_methods = {
-    close_converter,
-    stdc_wctocs,
-    NULL
-} ;
-
-static XlcConv
-open_stdc_wctocs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &stdc_wctocs_methods);
-}
-
-static XlcConvMethodsRec stdc_ctstowcs_methods = {
-    close_converter,
-    stdc_ctstowcs,
-    NULL
-} ;
-
-static XlcConv
-open_stdc_ctstowcs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &stdc_ctstowcs_methods);
-}
-
-static XlcConvMethodsRec stdc_strtowcs_methods = {
-    close_converter,
-    stdc_strtowcs,
-    NULL
-} ;
-
-static XlcConv
-open_stdc_strtowcs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &stdc_strtowcs_methods);
-}
-
-#endif /* STDCVT */
-
-static XlcConvMethodsRec mbstowcs_methods = {
-    close_converter,
-    mbstowcs_org,
-    NULL
-} ;
-
-static XlcConv
-open_mbstowcs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &mbstowcs_methods);
-}
-
-static XlcConvMethodsRec wcstombs_methods = {
-    close_converter,
-    wcstombs_org,
-    NULL
-} ;
-
-static XlcConv
-open_wcstombs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &wcstombs_methods);
-}
-
-static XlcConvMethodsRec wcstocts_methods = {
-    close_converter,
-    wcstocts,
-    NULL
-} ;
-
-static XlcConv
-open_wcstocts(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &wcstocts_methods);
-}
-
-static XlcConvMethodsRec wcstostr_methods = {
-    close_converter,
-    wcstostr,
-    NULL
-} ;
-
-static XlcConv
-open_wcstostr(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &wcstostr_methods);
-}
-
-static XlcConvMethodsRec wcstocs_methods = {
-    close_converter,
-    wcstocs,
-    NULL
-} ;
-
-static XlcConv
-open_wcstocs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &wcstocs_methods);
-}
-
-static XlcConvMethodsRec wctocs_methods = {
-    close_converter,
-    wctocs,
-    NULL
-} ;
-
-static XlcConv
-open_wctocs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &wctocs_methods);
-}
-
-static XlcConvMethodsRec ctstowcs_methods = {
-    close_converter,
-    ctstowcs,
-    NULL
-} ;
-
-static XlcConv
-open_ctstowcs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &ctstowcs_methods);
-}
-
-static XlcConvMethodsRec strtowcs_methods = {
-    close_converter,
-    strtowcs,
-    NULL
-} ;
-
-static XlcConv
-open_strtowcs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &strtowcs_methods);
-}
-
-/* -------------------------------------------------------------------------- */
-/*				Loader                                        */
-/* -------------------------------------------------------------------------- */
-
-XLCd
-_XlcGenericLoader(name)
-    _Xconst char *name;
-{
-    XLCd lcd;
-    XLCdGenericPart *gen;
-
-    lcd = _XlcCreateLC(name, _XlcGenericMethods);
-    if (lcd == NULL)
-	return lcd;
-
-    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNCompoundText, open_mbstocts);
-    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNString,       open_mbstostr);
-    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNCharSet,      open_mbstocs);
-    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNChar,         open_mbtocs);
-    _XlcSetConverter(lcd, XlcNCompoundText, lcd, XlcNMultiByte, open_ctstombs);
-    _XlcSetConverter(lcd, XlcNString,    lcd, XlcNMultiByte,    open_strtombs);
-
-#ifdef STDCVT
-     gen = XLC_GENERIC_PART(lcd);
-
-     if (gen->use_stdc_env != True) {
-#endif
-        _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNWideChar,     open_mbstowcs);
-        _XlcSetConverter(lcd, XlcNWideChar,  lcd, XlcNMultiByte,    open_wcstombs);
-        _XlcSetConverter(lcd, XlcNWideChar,  lcd, XlcNCompoundText, open_wcstocts);
-        _XlcSetConverter(lcd, XlcNWideChar,  lcd, XlcNString,       open_wcstostr);
-        _XlcSetConverter(lcd, XlcNWideChar,  lcd, XlcNCharSet,      open_wcstocs);
-        _XlcSetConverter(lcd, XlcNWideChar,  lcd, XlcNChar,         open_wctocs);
-        _XlcSetConverter(lcd, XlcNCompoundText, lcd, XlcNWideChar,  open_ctstowcs);
-        _XlcSetConverter(lcd, XlcNString,    lcd, XlcNWideChar,     open_strtowcs);
-#ifdef STDCVT
-    }
-#endif
-
-#ifdef STDCVT
-    if (gen->use_stdc_env == True) {
-        _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNWideChar,     open_stdc_mbstowcs);
-        _XlcSetConverter(lcd, XlcNWideChar,  lcd, XlcNMultiByte,    open_stdc_wcstombs);
-        _XlcSetConverter(lcd, XlcNWideChar,  lcd, XlcNCompoundText, open_stdc_wcstocts);
-        _XlcSetConverter(lcd, XlcNWideChar,  lcd, XlcNString,       open_stdc_wcstostr);
-        _XlcSetConverter(lcd, XlcNWideChar,  lcd, XlcNCharSet,      open_stdc_wcstocs);
-        _XlcSetConverter(lcd, XlcNWideChar,  lcd, XlcNChar,         open_stdc_wctocs);
-        _XlcSetConverter(lcd, XlcNCompoundText, lcd, XlcNWideChar,  open_stdc_ctstowcs);
-        _XlcSetConverter(lcd, XlcNString,    lcd, XlcNWideChar,     open_stdc_strtowcs);
-    }
-#endif
-
-    return lcd;
-}
-
diff --git a/xc/lib/X11/lcGeneric.c b/xc/lib/X11/lcGeneric.c
deleted file mode 100644
index 95587d4e0..000000000
--- a/xc/lib/X11/lcGeneric.c
+++ /dev/null
@@ -1,1165 +0,0 @@
-/* $TOG: lcGeneric.c /main/12 1998/06/25 16:09:44 kaleb $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-/*
- *  (c) Copyright 1995 FUJITSU LIMITED
- *  This is source code modified by FUJITSU LIMITED under the Joint
- *  Development Agreement for the CDE/Motif PST.
- */
-/* $XFree86: xc/lib/X11/lcGeneric.c,v 3.7 1999/05/09 10:50:40 dawes Exp $ */
-
-#include <stdio.h>
-#include "Xlibint.h"
-#include "XlcGeneric.h"
-
-static XLCd create();
-static Bool initialize();
-static void destroy();
-
-static XLCdPublicMethodsRec genericMethods = {
-    { NULL },                   /* use default methods */
-    {
-	NULL,
-	create,
-	initialize,
-	destroy,
-	NULL
-    }
-};
-
-XLCdMethods _XlcGenericMethods = (XLCdMethods) &genericMethods;
-
-static XLCd
-create(name, methods)
-    char *name;
-    XLCdMethods methods;
-{
-    XLCd lcd;
-    XLCdPublicMethods new;
-
-    lcd = (XLCd) Xmalloc(sizeof(XLCdRec));
-    if (lcd == NULL)
-        return (XLCd) NULL;
-    bzero((char *) lcd, sizeof(XLCdRec));
-
-    lcd->core = (XLCdCore) Xmalloc(sizeof(XLCdGenericRec));
-    if (lcd->core == NULL)
-	goto err;
-    bzero((char *) lcd->core, sizeof(XLCdGenericRec));
-
-    new = (XLCdPublicMethods) Xmalloc(sizeof(XLCdPublicMethodsRec));
-    if (new == NULL)
-	goto err;
-    *new = *((XLCdPublicMethods) methods);
-    lcd->methods = (XLCdMethods) new;
-
-    return lcd;
-
-err:
-    Xfree(lcd);
-    return (XLCd) NULL;
-}
-
-static Bool
-string_to_encoding(str, encoding)
-    char *str;
-    char *encoding;
-{
-    char *next;
-    long value;
-    int base;
-
-    while (*str) {
-	if (*str == '\\') {
-	    switch (*(str + 1)) {
-		case 'x':
-		case 'X':
-		    base = 16;
-		    break;
-		default:
-		    base = 8;
-		    break;
-	    }
-	    value = strtol(str + 2, &next, base);
-	    if (str + 2 != next) {
-		*((unsigned char *) encoding++) = (unsigned char) value;
-		str = next;
-		continue;
-	    }
-	}
-	*encoding++ = *str++;
-    }
-
-    *encoding = '\0';
-
-    return True;
-}
-
-static Bool
-string_to_ulong(str, value)
-char	*str;
-unsigned long	*value;
-{
-     char	*tmp1 = str;
-     int	 base;
-
-     if(*tmp1++ != '\\'){
-	  tmp1--;
-	  base = 10;
-     }else{
-	  switch(*tmp1++){
-	  case 'x':
-	       base = 16;
-	       break;
-	  case 'o':
-	       base = 8;
-	       break;
-	  case 'd':
-	       base = 10;
-	       break;
-	  default:
-	       return(False);
-	  }
-     }
-    *value = (unsigned) strtol(tmp1, NULL, base);
-     return(True);
-}
-
-
-static Bool
-add_charset(codeset, charset)
-    CodeSet codeset;
-    XlcCharSet charset;
-{
-    XlcCharSet *new_list;
-    int num;
-
-    if ((num = codeset->num_charsets))
-        new_list = (XlcCharSet *) Xrealloc(codeset->charset_list,
-                                        (num + 1) * sizeof(XlcCharSet));
-    else
-        new_list = (XlcCharSet *) Xmalloc(sizeof(XlcCharSet));
-
-    if (new_list == NULL)
-	return False;
-
-    new_list[num] = charset;
-    codeset->charset_list = new_list;
-    codeset->num_charsets = num + 1;
-
-    return True;
-}
-
-static CodeSet
-add_codeset(gen)
-    XLCdGenericPart *gen;
-{
-    CodeSet new, *new_list;
-    int num;
-
-    new = (CodeSet) Xmalloc(sizeof(CodeSetRec));
-    if (new == NULL)
-        return NULL;
-    bzero((char *) new, sizeof(CodeSetRec));
-
-    if ((num = gen->codeset_num))
-        new_list = (CodeSet *) Xrealloc(gen->codeset_list,
-                                        (num + 1) * sizeof(CodeSet));
-    else
-        new_list = (CodeSet *) Xmalloc(sizeof(CodeSet));
-
-    if (new_list == NULL)
-        goto err;
-
-    new_list[num] = new;
-    gen->codeset_list = new_list;
-    gen->codeset_num = num + 1;
-
-    return new;
-
-err:
-    Xfree(new);
-
-    return NULL;
-}
-
-static Bool
-add_parse_list(gen, type, encoding, codeset)
-    XLCdGenericPart *gen;
-    EncodingType type;
-    char *encoding;
-    CodeSet codeset;
-{
-    ParseInfo new, *new_list;
-    char *str;
-    unsigned char ch;
-    int num;
-
-    str = (char *) Xmalloc(strlen(encoding) + 1);
-    if (str == NULL)
-        return False;
-    strcpy(str, encoding);
-
-    new = (ParseInfo) Xmalloc(sizeof(ParseInfoRec));
-    if (new == NULL)
-        goto err;
-    bzero((char *) new, sizeof(ParseInfoRec));
-
-    if (gen->mb_parse_table == NULL) {
-        gen->mb_parse_table = (unsigned char *) Xmalloc(256); /* 2^8 */
-        if (gen->mb_parse_table == NULL)
-            goto err;
-        bzero((char *) gen->mb_parse_table, 256);
-    }
-
-    if ((num = gen->mb_parse_list_num))
-        new_list = (ParseInfo *) Xrealloc(gen->mb_parse_list,
-                                          (num + 2) * sizeof(ParseInfo));
-    else {
-        new_list = (ParseInfo *) Xmalloc(2 * sizeof(ParseInfo));
-    }
-
-    if (new_list == NULL)
-        goto err;
-
-    new_list[num] = new;
-    new_list[num + 1] = NULL;
-    gen->mb_parse_list = new_list;
-    gen->mb_parse_list_num = num + 1;
-
-    ch = (unsigned char) *str;
-    if (gen->mb_parse_table[ch] == 0)
-        gen->mb_parse_table[ch] = num + 1;
-
-    new->type = type;
-    new->encoding = str;
-    new->codeset = codeset;
-
-    if (codeset->parse_info == NULL)
-        codeset->parse_info = new;
-
-    return True;
-
-err:
-    Xfree(str);
-    if (new)
-        Xfree(new);
-
-    return False;
-}
-
-static void
-free_charset(lcd)
-    XLCd lcd;
-{
-    XLCdGenericPart *gen = XLC_GENERIC_PART(lcd);
-    ParseInfo *parse_info;
-    int num;
-
-    if (gen->mb_parse_table)
-        Xfree(gen->mb_parse_table);
-    if ((num = gen->mb_parse_list_num)) {
-        for (parse_info = gen->mb_parse_list; num-- > 0; parse_info++) {
-            if ((*parse_info)->encoding)
-                Xfree((*parse_info)->encoding);
-            Xfree(*parse_info);
-        }
-        Xfree(gen->mb_parse_list);
-    }
-
-    if ((num = gen->codeset_num))
-        Xfree(gen->codeset_list);
-}
-/* For VW/UDC */
-
-#define FORWARD  (unsigned long)'+'
-#define BACKWARD (unsigned long)'-'
-
-static char *getscope(str,scp)
-char *str;
-FontScope scp;
-{
-    char* next;
-    unsigned long start=0,end=0,dest=0,shift=0,direction=0;
-    sscanf(str,"[\\x%lx,\\x%lx]->\\x%lx", &start, &end,&dest);
-    if( dest ){
-        if(dest >= start ){
-            shift = dest - start;
-            direction = FORWARD ;
-        } else {
-            shift = start - dest;
-            direction = BACKWARD;
-        }
-    }
-    scp->start = start      ;
-    scp->end   = end        ;
-    scp->shift = shift      ;
-    scp->shift_direction
-               = direction  ;
-    /* .......... */
-    while(*str){
-        if(*str == ',' && *(str+1) == '['){
-            break;
-        }
-        str++;
-    }
-    next = str+1 ;
-    return(next);
-}
-
-static int count_scopemap(str)
-char *str;
-{
-    char *ptr;
-    int num=0;
-    for(ptr=str;*ptr;ptr++){
-        if(*ptr == ']'){
-            num ++;
-        }
-    }
-    return(num);
-}
-
-FontScope _XlcParse_scopemaps(str,size)
-char *str;
-int *size;
-{
-        int num=0,i;
-        FontScope scope,sc_ptr;
-        char *str_sc;
-        num = count_scopemap(str);
-        scope = (FontScope )Xmalloc(num * sizeof(FontScopeRec));
-        if(scope == NULL) {
-                return (NULL);
-        }
-        for (i=0,str_sc=str,sc_ptr=scope;
-                        i < num; i++,sc_ptr++){
-                str_sc = getscope(str_sc,sc_ptr);
-        }
-        *size = num;
-        return (scope);
-}
-
-void _XlcDbg_printValue(str,value,num)
-char *str;
-char **value;
-int num;
-{
-/*
-    int i;
-    for(i=0;i<num;i++){
-        fprintf(stderr,"%s value[%d] = %s\n",str,i,value[i]);
-    }
-*/
-}
-
-static void dmpscope(name,sc,num)
-char* name;
-FontScope sc;
-int num;
-{
-/*
-    int i;
-    fprintf(stderr,"dmpscope %s\n",name);
-    for(i=0;i<num;i++){
-        fprintf(stderr,"%x %x %x %x \n",
-                sc[i].start,
-                sc[i].end,
-                sc[i].shift,
-                sc[i].shift_direction);
-    }
-    fprintf(stderr,"dmpscope end\n");
-*/
-}
-
-static XlcCharSet srch_charset_define(name,new)
-char *name;
-int *new;
-{
-    XlcCharSet charset = NULL;
-    *new = 0;
-    charset = _XlcGetCharSet(name);
-    if (charset == NULL &&
-        (charset = _XlcCreateDefaultCharSet(name, ""))) {
-        _XlcAddCharSet(charset);
-        *new = 1;
-    }
-    return(charset);
-}
-
-static void read_charset_define(lcd,gen)
-XLCd lcd;
-XLCdGenericPart *gen;
-{
-    int i=0;
-    char csd[16],cset_name[256];
-    char name[BUFSIZ];
-    XlcCharSet charsetd;
-    char **value;
-    int num,new;
-    XlcSide side = XlcUnknown;
-    char *tmp;
-
-    for(i=0;;i++){ /* loop start */
-        charsetd = 0;
-        sprintf(csd, "csd%d", i);
-
-        /* charset_name   */
-        sprintf(name, "%s.%s", csd , "charset_name");
-        _XlcGetResource(lcd, "XLC_CHARSET_DEFINE", name, &value, &num);
-        _XlcDbg_printValue(name,value,num);
-        if (num > 0) {
-	    /* hackers will get truncated -- C'est la vie */
-            strncpy(cset_name,value[0], sizeof cset_name - 1);
-	    cset_name[sizeof cset_name - 1] = '\0';
-            sprintf(name, "%s.%s", csd , "side");
-            _XlcGetResource(lcd, "XLC_CHARSET_DEFINE", name, &value, &num);
-            if (num > 0) {
-                _XlcDbg_printValue(name,value,num);
-                if( !_XlcNCompareISOLatin1(value[0], "none", 4) ){
-                    side =  XlcNONE ;
-                    strcat(cset_name,":none");
-                } else
-                if( !_XlcNCompareISOLatin1(value[0], "GL", 2) ){
-                    side =  XlcGL ;
-                    strcat(cset_name,":GL");
-                } else {
-                    side =  XlcGR ;
-                    strcat(cset_name,":GR");
-                }
-                if (charsetd == NULL &&
-                    (charsetd = srch_charset_define(cset_name,&new)) == NULL)
-                    return ;
-            }
-        } else {
-            if(i == 0){
-                continue ;
-            } else {
-                break ;
-            }
-        }
-        if(new){
-            tmp = (char *)Xmalloc(strlen(cset_name)+1);
-            if(tmp == NULL){
-                return ;
-            }
-            strcpy(tmp,cset_name);
-            charsetd->name = tmp;
-        }
-        /* side   */
-        charsetd->side =  side ;
-        /* length */
-        sprintf(name, "%s.%s", csd , "length");
-        _XlcGetResource(lcd, "XLC_CHARSET_DEFINE", name, &value, &num);
-        if (num > 0) {
-            _XlcDbg_printValue(name,value,num);
-            charsetd->char_size = atoi(value[0]);
-        }
-        /* gc_number */
-        sprintf(name, "%s.%s", csd , "gc_number");
-        _XlcGetResource(lcd, "XLC_CHARSET_DEFINE", name, &value, &num);
-        if (num > 0) {
-            _XlcDbg_printValue(name,value,num);
-            charsetd->set_size = atoi(value[0]);
-        }
-        /* string_encoding */
-        sprintf(name, "%s.%s", csd , "string_encoding");
-        _XlcGetResource(lcd, "XLC_CHARSET_DEFINE", name, &value, &num);
-        if (num > 0) {
-            _XlcDbg_printValue(name,value,num);
-            if(!strcmp("False",value[0])){
-                charsetd->string_encoding = False;
-            } else {
-                charsetd->string_encoding = True;
-            }
-        }
-        /* sequence */
-        sprintf(name, "%s.%s", csd , "sequence");
-        _XlcGetResource(lcd, "XLC_CHARSET_DEFINE", name, &value, &num);
-        if (num > 0) {
-            _XlcDbg_printValue(name,value,num);
-/*
-            if(charsetd->ct_sequence){
-                Xfree(charsetd->ct_sequence);
-            }
-*/
-            tmp = (char *)Xmalloc(strlen(value[0])+1);
-            if(tmp == NULL){
-                return;
-            }
-            charsetd->ct_sequence = tmp;
-            string_to_encoding(value[0],tmp);
-        }
-        /* encoding_name */
-        sprintf(name, "%s.%s", csd , "encoding_name");
-        _XlcGetResource(lcd, "XLC_CHARSET_DEFINE", name, &value, &num);
-        if (num > 0) {
-            _XlcDbg_printValue(name,value,num);
-/*
-            if(charsetd->encoding_name){
-                Xfree(charsetd->encoding_name);
-            }
-*/
-            tmp = (char *)Xmalloc(strlen(value[0]+1));
-            strcpy(tmp,value[0]);
-            charsetd->encoding_name = tmp;
-            charsetd->xrm_encoding_name =
-                XrmStringToQuark(tmp);
-        }
-    }
-
-}
-
-SegConv
-add_conversion(gen)
-XLCdGenericPart *gen;
-{
-    SegConv new_list;
-    int num;
-
-    if ((num = gen->segment_conv_num)) {
-        new_list = (SegConv) Xrealloc(gen->segment_conv,
-                                        (num + 1) * sizeof(SegConvRec));
-    } else {
-        new_list = (SegConv) Xmalloc(sizeof(SegConvRec));
-    }
-
-    if (new_list == NULL)
-        return False;
-
-    gen->segment_conv = new_list;
-    gen->segment_conv_num = num + 1;
-
-    return (&new_list[num]);
-
-}
-static void read_segmentconversion(lcd,gen)
-XLCd lcd;
-XLCdGenericPart *gen;
-{
-    int i=0;
-    char conv[16];
-    char name[BUFSIZ];
-    char **value;
-    int num,new;
-    SegConv conversion;
-    for(i=0 ; ; i++){ /* loop start */
-        conversion = 0;
-        sprintf(conv, "conv%d", i);
-
-        /* length                */
-        sprintf(name, "%s.%s", conv , "length");
-        _XlcGetResource(lcd, "XLC_SEGMENTCONVERSION", name, &value, &num);
-        if (num > 0) {
-            if (conversion == NULL &&
-                (conversion = add_conversion(gen)) == NULL) {
-                return ;
-            }
-            _XlcDbg_printValue(name,value,num);
-        } else {
-            if(i == 0){
-                continue;
-            } else {
-                break ;
-            }
-        }
-        conversion->length = atoi(value[0]);
-
-        /* source_encoding       */
-        sprintf(name, "%s.%s", conv , "source_encoding");
-        _XlcGetResource(lcd, "XLC_SEGMENTCONVERSION", name, &value, &num);
-        if (num > 0) {
-            char *tmp;
-            _XlcDbg_printValue(name,value,num);
-            tmp = (char *)Xmalloc(strlen(value[0])+1);
-            if(tmp == NULL){
-                return;
-            }
-            strcpy(tmp,value[0]);
-            conversion->source_encoding = tmp;
-            conversion->source = srch_charset_define(tmp,&new);
-            if(new){
-                tmp = (char *)Xmalloc(strlen(conversion->source_encoding)+1);
-                if(tmp == NULL){
-                    return ;
-                }
-                strcpy(tmp,conversion->source_encoding);
-                conversion->source->name = tmp;
-            }
-        }
-        /* destination_encoding  */
-        sprintf(name, "%s.%s", conv , "destination_encoding");
-        _XlcGetResource(lcd, "XLC_SEGMENTCONVERSION", name, &value, &num);
-        if (num > 0) {
-            char *tmp;
-            _XlcDbg_printValue(name,value,num);
-            tmp = (char *)Xmalloc(strlen(value[0])+1);
-            if(tmp == NULL){
-                return;
-            }
-            strcpy(tmp,value[0]);
-            conversion->destination_encoding = tmp;
-            conversion->dest = srch_charset_define(tmp,&new);
-            if(new){
-                tmp = (char *)Xmalloc(
-                    strlen(conversion->destination_encoding)+1);
-                if(tmp == NULL){
-                    return ;
-                }
-                strcpy(tmp,conversion->destination_encoding);
-                conversion->dest->name = tmp;
-            }
-        }
-        /* range                 */
-        sprintf(name, "%s.%s", conv , "range");
-        _XlcGetResource(lcd, "XLC_SEGMENTCONVERSION", name, &value, &num);
-        if (num > 0) {
-            _XlcDbg_printValue(name,value,num);
-            sscanf(value[0],"\\x%lx,\\x%lx",
-                &(conversion->range.start),
-                &(conversion->range.end));
-        }
-        /* conversion            */
-        sprintf(name, "%s.%s", conv , "conversion");
-        _XlcGetResource(lcd, "XLC_SEGMENTCONVERSION", name, &value, &num);
-        if (num > 0) {
-            _XlcDbg_printValue(name,value,num);
-            conversion->conv =
-                _XlcParse_scopemaps(value[0],&conversion->conv_num);
-        }
-    }  /* loop end */
-}
-
-static ExtdSegment create_ctextseg(value,num)
-char **value;
-int num;
-{
-    ExtdSegment ret;
-    char* ptr;
-    char* cset_name = NULL;
-    int i,new;
-    FontScope scope;
-    ret = (ExtdSegment)Xmalloc(sizeof(ExtdSegmentRec));
-    if(ret == NULL){
-        return NULL;
-    }
-    if(strchr(value[0],':')){
-        ret->name = (char *)Xmalloc(strlen(value[0])+1);
-        if(ret->name == NULL){
-	    Xfree (ret);
-            return NULL;
-        }
-        strcpy(ret->name,value[0]);
-        ptr = strchr(ret->name,':');
-        *ptr = '\0';
-        ptr++;
-	cset_name = (char*) Xmalloc (strlen (ret->name) + 6);
-	if (cset_name == NULL) {
-	    Xfree (ret->name);
-	    Xfree (ret);
-	    return NULL;
-	}
-        if( !_XlcNCompareISOLatin1(ptr, "none", 4) ){
-            ret->side =  XlcNONE ;
-            sprintf(cset_name,"%s:%s",ret->name,"none");
-        } else
-        if( !_XlcNCompareISOLatin1(ptr, "GL", 2) ){
-            ret->side =  XlcGL ;
-            sprintf(cset_name,"%s:%s",ret->name,"GL");
-        } else {
-            ret->side =  XlcGR ;
-            sprintf(cset_name,"%s:%s",ret->name,"GR");
-        }
-    } else {
-        ret->name = (char *)Xmalloc(strlen(value[0])+1);
-        if(ret->name == NULL){
-	    Xfree (ret);
-            return NULL;
-        }
-        strcpy(ret->name,value[0]);
-    }
-    ret->area = (FontScope)Xmalloc((num - 1)*sizeof(FontScopeRec));
-    if(ret->area == NULL){
-	Xfree (ret->name);
-	Xfree (ret);
-        return NULL;
-    }
-    ret->area_num  = num - 1;
-    scope = ret->area ;
-    for(i=1;i<num;i++){
-        sscanf(value[i],"\\x%lx,\\x%lx",
-                &scope[i-1].start,&scope[i-1].end);
-    }
-    ret->charset = srch_charset_define(cset_name,&new);
-    if (new)
-        ret->charset->name = cset_name;
-    else
-	Xfree (cset_name);
-
-    return ret;
-}
-/* For VW/UDC end */
-
-static Bool
-load_generic(lcd)
-    XLCd lcd;
-{
-    XLCdGenericPart *gen = XLC_GENERIC_PART(lcd);
-    char **value;
-    int num;
-    unsigned long l;
-    int i;
-    int M,ii;
-
-    gen->codeset_num = 0;
-
-    /***** wc_encoding_mask *****/
-    _XlcGetResource(lcd, "XLC_XLOCALE", "wc_encoding_mask", &value, &num);
-    if (num > 0) {
-	if (string_to_ulong(value[0], &l) == False) 
-	    goto err;
-	gen->wc_encode_mask = l;
-    }
-    /***** wc_shift_bits *****/
-    _XlcGetResource(lcd, "XLC_XLOCALE", "wc_shift_bits", &value, &num);
-    if (num > 0)
-	gen->wc_shift_bits = atoi(value[0]);
-    if (gen->wc_shift_bits < 1)
-	gen->wc_shift_bits = 8;
-#ifndef X_NOT_STDC_ENV
-    /***** use_stdc_env *****/
-    _XlcGetResource(lcd, "XLC_XLOCALE", "use_stdc_env", &value, &num);
-    if (num > 0 && !_XlcCompareISOLatin1(value[0], "True"))
-	gen->use_stdc_env = True;
-    else
-	gen->use_stdc_env = False;
-    /***** force_convert_to_mb *****/
-    _XlcGetResource(lcd, "XLC_XLOCALE", "force_convert_to_mb", &value, &num);
-    if (num > 0 && !_XlcCompareISOLatin1(value[0], "True"))
-	gen->force_convert_to_mb = True;
-    else
-	gen->force_convert_to_mb = False;
-#endif
-    
-    for (i = 0; ; i++) {
-	CodeSetRec *codeset = NULL;
-	char cs[16];
-	char name[BUFSIZ];
-
-	sprintf(cs, "cs%d", i);
-
-	/***** codeset.side *****/
-	sprintf(name, "%s.%s", cs , "side");
-	_XlcGetResource(lcd, "XLC_XLOCALE", name, &value, &num);
-	if (num > 0) {
-	    char *tmp;
-
-	    if (codeset == NULL && (codeset = add_codeset(gen)) == NULL)
-		goto err;
-
-            /* 3.4.1 side */
-            if( !_XlcNCompareISOLatin1(value[0], "none", 4) ){
-                codeset->side =  XlcNONE ;
-            } else
-            if( !_XlcNCompareISOLatin1(value[0], "GL", 2) ){
-                codeset->side =  XlcGL ;
-            } else {
-                codeset->side =  XlcGR ;
-            }
-
-	    tmp = strrchr(value[0], ':');
-	    if (tmp != NULL && !_XlcCompareISOLatin1(tmp + 1, "Default")) {
-		if (codeset->side == XlcGR)
-		    gen->initial_state_GR = codeset;
-		else
-		    gen->initial_state_GL = codeset;
-	    }
-	}
-
-	/***** codeset.length *****/
-	sprintf(name, "%s.%s", cs , "length");
-	_XlcGetResource(lcd, "XLC_XLOCALE", name, &value, &num);
-	if (num > 0) {
-	    if (codeset == NULL && (codeset = add_codeset(gen)) == NULL)
-		goto err;
-	    codeset->length = atoi(value[0]);
-	    if (codeset->length < 1)
-		codeset->length = 1;
-	}
-
-	/***** codeset.mb_encoding *****/
-	sprintf(name, "%s.%s", cs, "mb_encoding");
-	_XlcGetResource(lcd, "XLC_XLOCALE", name, &value, &num);
-	if (num > 0) {
-	    static struct { 
-		char *str;
-		int type;
-	    } shifts[] = {
-		{"<SS>", E_SS},
-		{"<LSL>", E_LSL},
-		{"<LSR>", E_LSR},
-		{0}
-	    };
-	    int j;
-
-	    if (codeset == NULL && (codeset = add_codeset(gen)) == NULL)
-		goto err;
-	    for ( ; num-- > 0; value++) {
-		char encoding[256];
-		char *tmp = *value;
-		int type = E_SS;    /* for BC */
-		for (j = 0; shifts[j].str; j++) {
-		    if (!_XlcNCompareISOLatin1(tmp, shifts[j].str,
-					       strlen(shifts[j].str))) {
-			type = shifts[j].type;
-			tmp += strlen(shifts[j].str);
-			break;
-		    }
-		}
-		if (strlen (tmp) > sizeof encoding || 
-		    string_to_encoding(tmp, encoding) == False)
-			goto err;
-		add_parse_list(gen, type, encoding, codeset);
-	    }
-	}
-
-	/***** codeset.wc_encoding *****/
-	sprintf(name, "%s.%s", cs, "wc_encoding");
-	_XlcGetResource(lcd, "XLC_XLOCALE", name, &value, &num);
-	if (num > 0) {
-	    if (codeset == NULL && (codeset = add_codeset(gen)) == NULL)
-		goto err;
-	    if (string_to_ulong(value[0], &l) == False) 
-		goto err;
-	    codeset->wc_encoding = l;
-	}
-  
-	/***** codeset.ct_encoding *****/
-	sprintf(name, "%s.%s", cs, "ct_encoding");
-	_XlcGetResource(lcd, "XLC_XLOCALE", name, &value, &num);
-	if (num > 0) {
-	    XlcCharSet charset;
-	    char *encoding;
-
-	    if (codeset == NULL && (codeset = add_codeset(gen)) == NULL)
-		goto err;
-	    for ( ; num-- > 0; value++) {
-		if (strlen (*value) > sizeof name)
-		    goto err;
-		string_to_encoding(*value, name);
-		charset = NULL;
-		if ((encoding = strchr(name, ':')) &&
-		    (encoding = strchr(encoding + 1, ':'))) {
-		    *encoding++ = '\0';
-		    charset = _XlcAddCT(name, encoding);
-		}
-		if (charset == NULL) {
-		    charset = _XlcGetCharSet(name);
-		    if (charset == NULL &&
-			(charset = _XlcCreateDefaultCharSet(name, ""))) {
-			charset->side = codeset->side;
-			charset->char_size = codeset->length;
-			_XlcAddCharSet(charset);
-		    }
-		}
-		if (charset) {
-		    if (add_charset(codeset, charset) == False)
-			goto err;
-		}
-	    }
-	}
-
-	if (codeset == NULL)
-	    break;
-	codeset->cs_num = i;
-        /* For VW/UDC */
-        /***** 3.4.2 byteM (1 <= M <= length)*****/
-        for(M=1; M-1  < codeset->length; M++){
-            long start,end;
-            ByteInfo tmpb;
-
-            sprintf(name,"%s.%s%d",cs,"byte",M);
-            _XlcGetResource(lcd, "XLC_XLOCALE", name, &value, &num);
-
-            if( M == 1){
-                if(num < 1) {
-                    codeset->byteM = NULL ;
-                    break ;
-                }
-                codeset->byteM =
-                    (ByteInfoListRec *)Xmalloc(
-                         (codeset->length)*sizeof(ByteInfoListRec));
-                if(codeset->byteM == NULL){
-                    goto err;
-                }
-            }
-
-            if(num > 0){
-                _XlcDbg_printValue(name,value,num);
-                (codeset->byteM)[M-1].M = M;
-                (codeset->byteM)[M-1].byteinfo_num = num;
-                (codeset->byteM)[M-1].byteinfo =
-                    (ByteInfo)Xmalloc( num * sizeof(ByteInfoRec));
-                for(ii = 0 ; ii < num ; ii++){
-                    tmpb = (codeset->byteM)[M-1].byteinfo ;
-                    /* default 0x00 - 0xff */
-                    sscanf(value[ii],"\\x%lx,\\x%lx",&start,&end);
-                    tmpb[ii].start = (unsigned char)start;
-                    tmpb[ii].end  = (unsigned char)end;
-                }
-            }
-            /* .... */
-        }
-
-
-        /***** codeset.mb_conversion *****/
-        sprintf(name, "%s.%s", cs, "mb_conversion");
-        _XlcGetResource(lcd, "XLC_XLOCALE", name, &value, &num);
-        if (num > 0) {
-                _XlcDbg_printValue(name,value,num);
-                codeset->mbconv = Xmalloc(sizeof(ConversionRec));
-                codeset->mbconv->convlist =
-                _XlcParse_scopemaps(value[0],&(codeset->mbconv->conv_num));
-                dmpscope("mb_conv",codeset->mbconv->convlist,
-                        codeset->mbconv->conv_num);
-                /* [\x%x,\x%x]->\x%x,... */
-        }
-        /***** codeset.ct_conversion *****/
-        sprintf(name, "%s.%s", cs, "ct_conversion");
-        _XlcGetResource(lcd, "XLC_XLOCALE", name, &value, &num);
-        if (num > 0) {
-                _XlcDbg_printValue(name,value,num);
-                codeset->ctconv = Xmalloc(sizeof(ConversionRec));
-                codeset->ctconv->convlist =
-                _XlcParse_scopemaps(value[0],&(codeset->ctconv->conv_num));
-                dmpscope("ctconv",codeset->ctconv->convlist,
-                        codeset->ctconv->conv_num);
-                /* [\x%x,\x%x]->\x%x,... */
-        }
-        /***** codeset.ct_conversion_file *****/
-        sprintf(name, "%s.%s", cs, "ct_conversion_file");
-        _XlcGetResource(lcd, "XLC_XLOCALE", name, &value, &num);
-        if (num > 0) {
-                _XlcDbg_printValue(name,value,num);
-                /* [\x%x,\x%x]->\x%x,... */
-        }
-        /***** codeset.ct_extended_segment *****/
-        sprintf(name, "%s.%s", cs, "ct_extended_segment");
-        _XlcGetResource(lcd, "XLC_XLOCALE", name, &value, &num);
-        if (num > 0) {
-                _XlcDbg_printValue(name,value,num);
-                codeset->ctextseg = create_ctextseg(value,num);
-                /* [\x%x,\x%x]->\x%x,... */
-        }
-        /* For VW/UDC end */
-
-    }
-	 
-    read_charset_define(lcd,gen);       /* For VW/UDC */
-    read_segmentconversion(lcd,gen);    /* For VW/UDC */
-
-    return True;
-
-err:
-    free_charset(lcd);
-
-    return False;
-}
-
-static Bool
-initialize(lcd)
-    XLCd lcd;
-{
-    XLCdPublicMethods superclass = (XLCdPublicMethods) _XlcPublicMethods;
-
-    XLC_PUBLIC_METHODS(lcd)->superclass = superclass;
-
-    if (superclass->pub.initialize) {
-	if ((*superclass->pub.initialize)(lcd) == False)
-	    return False;
-    }
-
-    if(load_generic(lcd) == False)
-	return False;
-
-    return True;
-}
-/* VW/UDC start 95.01.08 */
-static void 
-freeByteM(codeset)
-    CodeSet codeset;
-{
-    int i;
-    ByteInfoList blst;
-    if(codeset->byteM == NULL) {
-	return ;
-    }
-    blst = codeset->byteM;
-    for(i=0;i<codeset->length;i++){
-	if(blst[i].byteinfo){
-	    Xfree(blst[i].byteinfo);
-	    blst[i].byteinfo = NULL;
-	}
-    }
-    Xfree(codeset->byteM); 
-    codeset->byteM = NULL;
-}
-static void 
-freeConversion(codeset)
-    CodeSet codeset;
-{
-    Conversion mbconv,ctconv;
-    if( codeset->mbconv ) {
-	mbconv = codeset->mbconv;
-	/*  ...  */
-	if(mbconv->convlist){
-	    Xfree(mbconv->convlist);
-	    mbconv->convlist = NULL;
-	}
-	Xfree(mbconv);
-	codeset->mbconv = NULL;
-    }
-    if( codeset->ctconv ) {
-	ctconv = codeset->ctconv;
-	/*  ...  */
-	if(ctconv->convlist){
-	    Xfree(ctconv->convlist);
-	    ctconv->convlist = NULL;
-	}
-	Xfree(ctconv);
-	codeset->ctconv = NULL;
-    }
-}
-static void 
-freeExtdSegment(codeset)
-    CodeSet codeset;
-{
-    ExtdSegment ctextseg;
-    if(codeset->ctextseg == NULL) {
-	return ;
-    }
-    ctextseg = codeset->ctextseg;
-    if(ctextseg->name){
-	Xfree(ctextseg->name);
-	ctextseg->name = NULL;
-    }
-    if(ctextseg->area){
-	Xfree(ctextseg->area);
-	ctextseg->area = NULL;
-    }
-    Xfree(codeset->ctextseg); 
-    codeset->ctextseg = NULL;
-}
-static void 
-freeParseInfo(codeset)
-    CodeSet codeset;
-{
-    ParseInfo parse_info;
-    if(codeset->parse_info == NULL) {
-	return ;
-    }
-    parse_info = codeset->parse_info;
-    if(parse_info->encoding){
-	Xfree(parse_info->encoding);
-	parse_info->encoding = NULL;
-    }
-    Xfree(codeset->parse_info); 
-    codeset->parse_info = NULL;
-}
-static void
-destroy_CodeSetList(gen)
-    XLCdGenericPart *gen ;
-{
-    CodeSet *codeset = gen->codeset_list;
-    int i;
-    if(gen->codeset_num == 0) {
-	return;
-    }
-    for(i=0;i<gen->codeset_num;i++){
-        freeByteM(codeset[i]);
-	freeConversion(codeset[i]);
-	freeExtdSegment(codeset[i]);
-	freeParseInfo(codeset[i]);
-	if(codeset[i]->charset_list){
-	    Xfree(codeset[i]->charset_list);
-	    codeset[i]->charset_list = NULL;
-	}
-	Xfree(codeset[i]); codeset[i]=NULL;
-    }
-    Xfree(codeset); gen->codeset_list = NULL;
-}
-/*  */
-static void
-destroy_SegConv(gen)
-    XLCdGenericPart *gen ;
-{
-    SegConv seg = gen->segment_conv;
-    int i;
-    if(gen->segment_conv_num == 0) {
-	return;
-    }
-    for(i=0;i<gen->segment_conv_num;i++){
-	if(seg[i].source_encoding){
-	    Xfree(seg[i].source_encoding);
-	    seg[i].source_encoding = NULL;
-	}
-	if(seg[i].destination_encoding){
-	    Xfree(seg[i].destination_encoding); 
-	    seg[i].destination_encoding = NULL;
-	}
-	if(seg[i].conv){
-	    Xfree(seg[i].conv); seg[i].conv = NULL;
-	}
-    }
-    Xfree(seg); gen->segment_conv = NULL;
-}
-
-static void
-destroy_gen(lcd)
-    XLCd lcd;
-{
-    XLCdGenericPart *gen = XLC_GENERIC_PART(lcd);
-    destroy_SegConv(gen);
-    destroy_CodeSetList(gen);
-    if(gen->mb_parse_table){
-	Xfree(gen->mb_parse_table);
-	gen->mb_parse_table = NULL;
-    }
-    if(gen->mb_parse_list){
-	Xfree(gen->mb_parse_list);
-	gen->mb_parse_list = NULL;
-    }
-}
-/* VW/UDC end 95.01.08 */
-static void
-destroy(lcd)
-    XLCd lcd;
-{
-    XLCdPublicMethods superclass = XLC_PUBLIC_METHODS(lcd)->superclass;
-
-    destroy_gen(lcd); /* ADD 1996.01.08 */
-    if (superclass && superclass->pub.destroy)
-	(*superclass->pub.destroy)(lcd);
-}
diff --git a/xc/lib/X11/lcInit.c b/xc/lib/X11/lcInit.c
deleted file mode 100644
index 7e37b5b5a..000000000
--- a/xc/lib/X11/lcInit.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/* $TOG: lcInit.c /main/5 1997/11/13 18:54:36 kaleb $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-/*
- *  (c) Copyright 1995 FUJITSU LIMITED
- *  This is source code modified by FUJITSU LIMITED under the Joint
- *  Development Agreement for the CDE/Motif PST.
- *
- *   Modifier: Masayoshi Shimamura      FUJITSU LIMITED 
- *
- */
-/* $XFree86: xc/lib/X11/lcInit.c,v 3.4 1997/11/22 12:50:10 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xlcint.h"
-
-#define USE_GENERIC_LOADER
-#define USE_DEFAULT_LOADER
-#ifdef X_LOCALE
-# define USE_EUC_LOADER
-# define USE_SJIS_LOADER
-# define USE_JIS_LOADER
-# define USE_UTF_LOADER
-#endif
-
-extern XLCd _XlcDefaultLoader(
-#if NeedFunctionPrototypes
-    _Xconst char*
-#endif
-);
-
-#ifdef DYNAMIC_LOAD
-#ifdef sun
-extern XLCd _XsunOsDynamicLoad(
-#if NeedFunctionPrototypes
-    _Xconst char*
-#endif
-);
-#endif /* sun */
-
-#ifdef AIXV3
-extern XLCd _XaixOsDynamicLoad(
-#if NeedFunctionPrototypes
-    _Xconst char*
-#endif
-);
-#endif /* AIXV3 */
-#endif
-
-#ifdef USE_GENERIC_LOADER
-extern XLCd _XlcGenericLoader(
-#if NeedFunctionPrototypes
-    _Xconst char*
-#endif
-);
-#endif
-
-#ifdef USE_UTF_LOADER
-extern XLCd _XlcUtfLoader(
-#if NeedFunctionPrototypes
-    _Xconst char*
-#endif
-);
-#endif
-
-#ifdef USE_EUC_LOADER
-extern XLCd _XlcEucLoader(
-#if NeedFunctionPrototypes
-    _Xconst char*
-#endif
-);
-#endif
-
-#ifdef USE_SJIS_LOADER
-extern XLCd _XlcSjisLoader(
-#if NeedFunctionPrototypes
-    _Xconst char*
-#endif
-);
-#endif
-
-#ifdef USE_JIS_LOADER
-extern XLCd _XlcJisLoader(
-#if NeedFunctionPrototypes
-    _Xconst char*
-#endif
-);
-#endif
-
-#ifdef USE_DYNAMIC_LOADER
-extern XLCd _XlcDynamicLoader(
-#if NeedFunctionPrototypes
-    _Xconst char*
-#endif
-);
-#endif
-
-/*
- * The _XlcInitLoader function initializes the locale object loader list
- * with vendor specific manner.
- */
-
-void
-_XlcInitLoader()
-{
-#ifdef USE_GENERIC_LOADER
-    _XlcAddLoader(_XlcGenericLoader, XlcHead);
-#endif
-
-#ifdef USE_DEFAULT_LOADER
-    _XlcAddLoader(_XlcDefaultLoader, XlcHead);
-#endif
-
-#ifdef USE_EUC_LOADER
-    _XlcAddLoader(_XlcEucLoader, XlcHead);
-#endif
-
-#ifdef USE_SJIS_LOADER
-    _XlcAddLoader(_XlcSjisLoader, XlcHead);
-#endif
-
-#ifdef USE_JIS_LOADER
-    _XlcAddLoader(_XlcJisLoader, XlcHead);
-#endif
-
-#ifdef USE_UTF_LOADER
-    _XlcAddLoader(_XlcUtfLoader, XlcHead);
-#endif
-
-#ifdef DYNAMIC_LOAD
-#ifdef sun
-    _XlcAddLoader(_XsunOsDynamicLoad, XlcHead);
-#endif /* sun */
-
-#ifdef AIXV3
-    _XlcAddLoader(_XaixOsDynamicLoad, XlcHead);
-#endif /* AIXV3 */
-#endif /* DYNAMIC_LOAD */
-
-#ifdef USE_DYNAMIC_LOADER
-    _XlcAddLoader(_XlcDynamicLoader, XlcHead);
-#endif
-}
diff --git a/xc/lib/X11/lcJis.c b/xc/lib/X11/lcJis.c
deleted file mode 100644
index 02e965b47..000000000
--- a/xc/lib/X11/lcJis.c
+++ /dev/null
@@ -1,927 +0,0 @@
-/* $TOG: lcJis.c /main/8 1998/04/30 11:02:21 kaleb $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-/* $XFree86: xc/lib/X11/lcJis.c,v 1.4 1998/10/03 08:41:39 dawes Exp $ */
-
-
-#ifdef X_LOCALE
-
-#include "Xlibint.h"
-#include "XlcGeneric.h"
-#include <stdio.h>
-
-#if !defined(X_NOT_STDC_ENV) && !defined(macII) && !defined(X_LOCALE)
-#define STDCVT
-#endif
-
-typedef struct _StateRec {
-    XLCd lcd;
-    XlcCharSet charset;
-    XlcCharSet GL_charset;
-    XlcCharSet GR_charset;
-} StateRec, *State;
-
-static void
-init_state(conv)
-    XlcConv conv;
-{
-    register State state = (State) conv->state;
-    register XLCdGenericPart *gen = XLC_GENERIC_PART(state->lcd);
-    register CodeSet codeset;
-
-    codeset = gen->initial_state_GL;
-    if (codeset && codeset->charset_list)
-	state->GL_charset = *codeset->charset_list;
-    codeset = gen->initial_state_GR;
-    if (codeset && codeset->charset_list)
-	state->GR_charset = *codeset->charset_list;
-
-    if (state->GL_charset == NULL)
-	if (codeset = *gen->codeset_list)
-	    state->GL_charset = *codeset->charset_list;
-}
-
-static int
-compare(src, encoding, length)
-    register char *src;
-    register char *encoding;
-    register int length;
-{
-    char *start = src;
-
-    while (length-- > 0) {
-	if (*src++ != *encoding++)
-	    return 0;
-	if (*encoding == '\0')
-	    return src - start;
-    }
-
-    return 0;
-}
-
-static int
-mbtocs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    State state = (State) conv->state;
-    XLCd lcd = state->lcd;
-    register char *src, *dst;
-    unsigned char ch, *mb_parse_table;
-    ParseInfo *parse_list, parse_info;
-    XlcCharSet charset;
-    int length, number, encoding_len = 0;
-    register int i;
-
-    src = *((char **) from);
-    dst = *((char **) to);
-
-    if (mb_parse_table = XLC_GENERIC(lcd, mb_parse_table)) {
-	number = mb_parse_table[(unsigned char) *src];
-	if (number > 0) {
-	    parse_list = XLC_GENERIC(lcd, mb_parse_list) + number - 1;
-	    for ( ; parse_info = *parse_list; parse_list++) {
-		encoding_len = compare(src, parse_info->encoding, *from_left);
-		if (encoding_len > 0) {
-		    switch (parse_info->type) {
-			case E_SS:
-			    src += encoding_len;
-			    charset = *parse_info->codeset->charset_list;
-			    goto found;
-			case E_LSL:
-			case E_LSR:
-			    src += encoding_len;
-			    charset = *parse_info->codeset->charset_list;
-			    if (parse_info->type == E_LSL)
-			    	state->GL_charset = charset;
-			    else
-			    	state->GR_charset = charset;
-			    length = 0;
-			    goto end;
-			case E_GL:
-			    charset = state->GL_charset;
-			    goto found;
-			case E_GR:
-			    charset = state->GR_charset;
-			    goto found;
-		    }
-		}
-	    }
-	}
-    }
-
-    if ((*src & 0x80) && state->GR_charset)
-	charset = state->GR_charset;
-    else
-	charset = state->GL_charset;
-
-found:
-    if (charset == NULL ||
-	(num_args == 2 && (XlcCharSet) args[1] != charset))
-	return -1;
-
-    length = charset->char_size;
-    if (length > *from_left - encoding_len)
-	return -1;
-
-    if (dst) {
-	if (length > *to_left)
-	    return -1;
-	if (charset->side == XlcGL) {
-	    for (i = 0; i < length; i++)
-		*dst++ = *src++ & 0x7f;
-	} else if (charset->side == XlcGR) {
-	    for (i = 0; i < length; i++)
-		*dst++ = *src++ | 0x80;
-	} else {
-	    for (i = 0; i < length; i++)
-		*dst++ = *src++;
-	}
-	*to = (XPointer) dst;
-	*to_left -= length;
-    }
-end:
-    *from = (XPointer) src;
-    *from_left -= encoding_len + length;
-    state->charset = charset;
-    if (num_args == 1)
-	*((XlcCharSet *) args[0]) = charset;
-
-    return 0;
-}
-
-static int
-mbstocs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    XlcCharSet charset = NULL;
-    XPointer tmp_args[2], save_from = *from;
-    int ret, unconv_num = 0, tmp_num = 1;
-
-    tmp_args[0] = (XPointer) &charset;
-
-    while (*from_left > 0 && *to_left > 0) {
-	ret = mbtocs(conv, from, from_left, to, to_left, tmp_args, tmp_num);
-	if (ret < 0)
-	    break;
-	unconv_num += ret;
-	if (tmp_num == 1 && charset) {
-	    tmp_args[1] = (XPointer) charset;
-	    tmp_num = 2;
-	}
-    }
-
-    if (save_from == *from)
-	return -1;
-
-    if (num_args > 0)
-	*((XlcCharSet *) args[0]) = charset;
-    
-    return unconv_num;
-}
-
-static CodeSet
-wc_parse_codeset(lcd, wcstr)
-    XLCd lcd;
-    wchar_t *wcstr;
-{
-    register CodeSet *codeset;
-    unsigned long wc_encoding;
-    register int num;
-
-    wc_encoding = *wcstr & XLC_GENERIC(lcd, wc_encode_mask);
-    num = XLC_GENERIC(lcd, codeset_num);
-    codeset = XLC_GENERIC(lcd, codeset_list);
-    while (num-- > 0) {
-	if (wc_encoding == (*codeset)->wc_encoding)
-	    return *codeset;
-	codeset++;
-    }
-
-    return NULL;
-}
-
-static int
-wcstocs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    State state = (State) conv->state;
-    XLCd lcd = state->lcd;
-    wchar_t *wcptr;
-    register char *bufptr;
-    register wchar_t wch;
-    char *tmpptr;
-    register int length;
-    CodeSet codeset;
-    unsigned long wc_encoding;
-    int wcstr_len, buf_len;
-
-    if (from == NULL || *from == NULL)
-	return 0;
-
-    wcptr = *((wchar_t **) from);
-    bufptr = *((char **) to);
-    wcstr_len = *from_left;
-    buf_len = *to_left;
-
-    codeset = wc_parse_codeset(lcd, wcptr);
-    if (codeset == NULL)
-	return -1;
-    wc_encoding = codeset->wc_encoding;
-
-    if (wcstr_len < buf_len / codeset->length)
-	buf_len = wcstr_len * codeset->length;
-
-    for ( ; wcstr_len > 0 && buf_len > 0; wcptr++, wcstr_len--) {
-	wch = *wcptr;
-	if ((wch & XLC_GENERIC(lcd, wc_encode_mask)) != wc_encoding)
-	    break;
-	length = codeset->length;
-	buf_len -= length;
-	bufptr += length;
-
-	tmpptr = bufptr - 1;
-	if ((*codeset->charset_list)->side == XlcGL) {
-	    while (length--) {
-		*tmpptr-- = (unsigned char) (wch & 0x7f);
-		wch >>= (wchar_t)XLC_GENERIC(lcd, wc_shift_bits);
-	    }
-	} else if ((*codeset->charset_list)->side == XlcGR) {
-	    while (length--) {
-		*tmpptr-- = (unsigned char) (wch | 0x80);
-		wch >>= (wchar_t)XLC_GENERIC(lcd, wc_shift_bits);
-	    }
-	} else {
-	    while (length--) {
-		*tmpptr-- = (unsigned char) wch;
-		wch >>= (wchar_t)XLC_GENERIC(lcd, wc_shift_bits);
-	    }
-	}
-    }
-
-    if (num_args > 0)
-	*((XlcCharSet *) args[0]) = *codeset->charset_list;
-
-    *from_left -= wcptr - *((wchar_t **) from);
-    *from = (XPointer) wcptr;
-
-    *to_left -= bufptr - *((char **) to);
-    *to = bufptr;
-
-    return 0;
-}
-
-static CodeSet
-GetCodeSetFromCharSet(lcd, charset)
-    XLCd lcd;
-    XlcCharSet charset;
-{
-    register CodeSet *codeset = XLC_GENERIC(lcd, codeset_list);
-    register XlcCharSet *charset_list;
-    register int codeset_num, num_charsets;
-
-    codeset_num = XLC_GENERIC(lcd, codeset_num);
-
-    for ( ; codeset_num-- > 0; codeset++) {
-	num_charsets = (*codeset)->num_charsets;
-	charset_list = (*codeset)->charset_list;
-
-	for ( ; num_charsets-- > 0; charset_list++)
-	    if (*charset_list == charset)
-		return *codeset;
-    }
-
-    return (CodeSet) NULL;
-}
-
-static int
-cstombs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    State state = (State) conv->state;
-    register char *csptr;
-    register char *bufptr;
-    int csstr_len;
-    register int buf_len;
-    int num, encoding_len = 0;
-    CodeSet codeset;
-    XlcCharSet charset;
-    EncodingType type;
-    int cvt_length;
-
-    csptr = *((char **) from);
-    bufptr = *((char **) to);
-    csstr_len = *from_left;
-    buf_len = *to_left;
-
-    if (num_args < 1)
-	return -1;
-    
-    charset = (XlcCharSet) args[0];
-
-    codeset = GetCodeSetFromCharSet(state->lcd, charset);
-    if (codeset == NULL)
-	return -1;
-
-    cvt_length = 0;
-    if (codeset->parse_info) {
-	switch (type = codeset->parse_info->type) {
-	    case E_SS:
-		encoding_len = strlen(codeset->parse_info->encoding);
-		break;
-	    case E_LSL:
-	    case E_LSR:
-		if (type == E_LSL) {
-		    if (charset == state->GL_charset)
-			break;
-		} else {
-		    if (charset == state->GR_charset)
-			break;
-		}
-		encoding_len = strlen(codeset->parse_info->encoding);
-		if (encoding_len > buf_len)
-		    return -1;
-		cvt_length += encoding_len;
-		if (bufptr) {
-		    strcpy(bufptr, codeset->parse_info->encoding);
-		    bufptr += encoding_len;
-		}
-		buf_len -= encoding_len;
-		encoding_len = 0;
-		if (type == E_LSL)
-		    state->GL_charset = charset;
-		else
-		    state->GR_charset = charset;
-		break;
-	}
-    }
-
-    csstr_len /= codeset->length;
-    buf_len /= codeset->length + encoding_len;
-    if (csstr_len < buf_len)
-	buf_len = csstr_len;
-    
-    cvt_length += buf_len * (encoding_len + codeset->length);
-    if (bufptr) {
-	while (buf_len--) {
-	    if (encoding_len) {
-		strcpy(bufptr, codeset->parse_info->encoding);
-		bufptr += encoding_len;
-	    }
-	    num = codeset->length;
-	    if (codeset->side == XlcGL) {
-		while (num--)
-		    *bufptr++ = *csptr++ & 0x7f;
-	    } else if (codeset->side == XlcGR) {
-		while (num--)
-		    *bufptr++ = *csptr++ | 0x80;
-	    } else {
-		while (num--)
-		    *bufptr++ = *csptr++;
-	    }
-    	}
-    }
-
-    *from_left -= csptr - *((char **) from);
-    *from = (XPointer) csptr;
-
-    if (bufptr)
-	*to = (XPointer) bufptr;
-    *to_left -= cvt_length;
-
-    return 0;
-}
-
-static int
-cstowcs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    State state = (State) conv->state;
-    XLCd lcd = state->lcd;
-    register char *csptr;
-    wchar_t *bufptr;
-    int csstr_len;
-    register int buf_len;
-    register wchar_t wch;
-    unsigned long code_mask, wc_encoding;
-    int num, length, wc_shift_bits;
-    CodeSet codeset;
-
-    csptr = *((char **) from);
-    bufptr = *((wchar_t **) to);
-    csstr_len = *from_left;
-    buf_len = *to_left;
-
-    if (num_args < 1)
-	return -1;
-    
-    codeset = GetCodeSetFromCharSet(lcd, (XlcCharSet) args[0]);
-    if (codeset == NULL)
-	return -1;
-
-    length = codeset->length;
-    csstr_len /= length;
-    if (csstr_len < buf_len)
-	buf_len = csstr_len;
-    
-    code_mask = ~XLC_GENERIC(lcd, wc_encode_mask);
-    wc_encoding = codeset->wc_encoding;
-    wc_shift_bits = XLC_GENERIC(lcd, wc_shift_bits);
-
-    *to_left -= buf_len;
-
-    if (bufptr) {
-	while (buf_len--) {
-	    wch = (wchar_t) (*csptr++ & 0x7f);
-	    num = length - 1;
-	    while (num--)
-		wch = (wch << wc_shift_bits) | (*csptr++ & 0x7f);
-
-	    *bufptr++ = (wch & code_mask) | wc_encoding;
-	}
-    }
-
-    *from_left -= csptr - *((char **) from);
-    *from = (XPointer) csptr;
-
-    if (bufptr)
-	*to = (XPointer) bufptr;
-
-    return 0;
-}
-
-
-static void
-close_converter(conv)
-    XlcConv conv;
-{
-    if (conv->state) {
-	Xfree((char *) conv->state);
-    }
-
-    Xfree((char *) conv);
-}
-
-static XlcConv
-create_conv(lcd, methods)
-    XLCd lcd;
-    XlcConvMethods methods;
-{
-    XlcConv conv;
-    State state;
-
-    conv = (XlcConv) Xmalloc(sizeof(XlcConvRec));
-    if (conv == NULL)
-	return (XlcConv) NULL;
-    
-    conv->methods = (XlcConvMethods) Xmalloc(sizeof(XlcConvMethodsRec));
-    if (conv->methods == NULL)
-	goto err;
-    *conv->methods = *methods;
-    if (XLC_PUBLIC(lcd, is_state_depend))
-	conv->methods->reset = init_state;
-
-    conv->state = (XPointer) Xmalloc(sizeof(StateRec));
-    if (conv->state == NULL)
-	goto err;
-    bzero((char *) conv->state, sizeof(StateRec));
-    
-    state = (State) conv->state;
-    state->lcd = lcd;
-    init_state(conv);
-    
-    return conv;
-
-err:
-    close_converter(conv);
-
-    return (XlcConv) NULL;
-}
-
-static XlcConvMethodsRec mbstocs_methods = {
-    close_converter,
-    mbstocs,
-    NULL
-} ;
-
-static XlcConv
-open_mbstocs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &mbstocs_methods);
-}
-
-static XlcConvMethodsRec wcstocs_methods = {
-    close_converter,
-    wcstocs,
-    NULL
-} ;
-
-static XlcConv
-open_wcstocs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &wcstocs_methods);
-}
-
-static XlcConvMethodsRec mbtocs_methods = {
-    close_converter,
-    mbtocs,
-    NULL
-} ;
-
-static XlcConv
-open_mbtocs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &mbtocs_methods);
-}
-
-static XlcConvMethodsRec cstombs_methods = {
-    close_converter,
-    cstombs,
-    NULL
-} ;
-
-static XlcConv
-open_cstombs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &cstombs_methods);
-}
-
-static XlcConvMethodsRec cstowcs_methods = {
-    close_converter,
-    cstowcs,
-    NULL
-} ;
-
-static XlcConv
-open_cstowcs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &cstowcs_methods);
-}
-
-#ifdef STDCVT
-static int
-stdc_mbstowcs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    char *src = *((char **) from);
-    wchar_t *dst = *((wchar_t **) to);
-    int src_left = *from_left;
-    int dst_left = *to_left;
-    int length;
-
-    while (src_left > 0 && dst_left > 0) {
-	length = mbtowc(dst, src, src_left);
-	if (length < 0)
-	    break;
-
-	src += length;
-	src_left -= length;
-	if (dst)
-	    dst++;
-	dst_left--;
-
-	if (length == 0) {
-	    src++;
-	    src_left--;
-	    break;
-	}
-    }
-
-    if (*from_left == src_left)
-	return -1;
-
-    *from = (XPointer) src;
-    if (dst)
-	*to = (XPointer) dst;
-    *from_left = src_left;
-    *to_left = dst_left;
-
-    return 0;
-}
-
-static int
-stdc_wcstombs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    wchar_t *src = *((wchar_t **) from);
-    char *dst = *((char **) to);
-    int src_left = *from_left;
-    int dst_left = *to_left;
-    int length;
-
-    while (src_left > 0 && dst_left > 0) {
-	length = wctomb(dst, *src);		/* XXX */
-	if (length < 0 || dst_left < length)
-	    break;
-
-	src++;
-	src_left--;
-	dst += length;
-	dst_left -= length;
-
-	if (length == 0) {
-	    dst++;
-	    dst_left--;
-	    break;
-	}
-    }
-
-    if (*from_left == src_left)
-	return -1;
-
-    *from = (XPointer) src;
-    *to = (XPointer) dst;
-    *from_left = src_left;
-    *to_left = dst_left;
-
-    return 0;
-}
-
-static int
-stdc_wcstocs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    wchar_t wch, *src = *((wchar_t **) from);
-    XlcCharSet charset = NULL;
-    XPointer tmp_args[2], tmp_from, save_from = *from;
-    char tmp[32];
-    int length, ret, src_left = *from_left;
-    int unconv_num = 0, tmp_num = 1;
-
-    tmp_args[0] = (XPointer) &charset;
-
-    while (src_left > 0 && *to_left > 0) {
-	if (wch = *src) {
-	    length = wctomb(tmp, wch);
-	} else {
-	    length = 1;
-	    *tmp = '\0';
-	}
-		
-	if (length < 0)
-	    break;
-
-	tmp_from = (XPointer) tmp;
-	ret = mbtocs(conv, &tmp_from, &length, to, to_left, tmp_args, tmp_num);
-	if (ret < 0)
-	    break;
-	unconv_num += ret;
-	if (tmp_num == 1 && charset) {
-	    tmp_args[1] = (XPointer) charset;
-	    tmp_num = 2;
-	}
-
-	src++;
-	src_left--;
-    }
-
-    if (save_from == (XPointer) src)
-	return -1;
-
-    *from = (XPointer) src;
-    *from_left = src_left;
-
-    if (num_args > 0)
-	*((XlcCharSet *) args[0]) = charset;
-    
-    return unconv_num;
-}
-
-#define DefineLocalBuf		char local_buf[BUFSIZ]
-#define AllocLocalBuf(length)	(length > BUFSIZ ? (char*) Xmalloc(length) : local_buf)
-#define FreeLocalBuf(ptr)	if (ptr != local_buf) Xfree(ptr)
-
-static int
-stdc_cstowcs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    XLCd lcd = ((State) conv->state)->lcd;
-    DefineLocalBuf;
-    XPointer buf, save_buf;
-    int length, left, ret;
-    
-    left = length = *to_left * XLC_PUBLIC(lcd, mb_cur_max);
-    buf = save_buf = (XPointer) AllocLocalBuf(length);
-    if (buf == NULL)
-	return -1;
-
-    ret = cstombs(conv, from, from_left, &buf, &left, args, num_args);
-    if (ret < 0)
-	goto err;
-    
-    buf = save_buf;
-    length -= left;
-    if (stdc_mbstowcs(conv, &buf, &length, to, to_left, args, num_args) < 0)
-	ret = -1;
-
-err:
-    FreeLocalBuf(save_buf);
-
-    return ret;
-}
-
-static XlcConvMethodsRec stdc_mbstowcs_methods = {
-    close_converter,
-    stdc_mbstowcs,
-    NULL
-} ;
-
-static XlcConv
-open_stdc_mbstowcs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &stdc_mbstowcs_methods);
-}
-
-static XlcConvMethodsRec stdc_wcstombs_methods = {
-    close_converter,
-    stdc_wcstombs,
-    NULL
-} ;
-
-static XlcConv
-open_stdc_wcstombs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &stdc_wcstombs_methods);
-}
-
-static XlcConvMethodsRec stdc_wcstocs_methods = {
-    close_converter,
-    stdc_wcstocs,
-    NULL
-} ;
-
-static XlcConv
-open_stdc_wcstocs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &stdc_wcstocs_methods);
-}
-
-static XlcConvMethodsRec stdc_cstowcs_methods = {
-    close_converter,
-    stdc_cstowcs,
-    NULL
-} ;
-
-static XlcConv
-open_stdc_cstowcs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &stdc_cstowcs_methods);
-}
-#endif /* STDCVT */
-
-XLCd
-_XlcJisLoader(name)
-    _Xconst char *name;
-{
-    XLCd lcd;
-    XLCdGenericPart *gen;
-
-    lcd = _XlcCreateLC(name, _XlcGenericMethods);
-    if (lcd == NULL)
-	return lcd;
-
-    if (!XLC_PUBLIC_PART(lcd)->codeset ||
-	(_XlcCompareISOLatin1(XLC_PUBLIC_PART(lcd)->codeset, "JIS7"))) {
-        _XlcDestroyLC(lcd);
-        return (XLCd) NULL;
-    }
-
-    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNChar, open_mbtocs);
-    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNCharSet, open_mbstocs);
-    _XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNMultiByte, open_cstombs);
-
-#ifdef STDCVT
-    gen = XLC_GENERIC_PART(lcd);
-
-    if (gen->use_stdc_env == True) {
-	_XlcSetConverter(lcd,XlcNMultiByte,lcd,XlcNWideChar,open_stdc_mbstowcs);
-	_XlcSetConverter(lcd,XlcNWideChar,lcd,XlcNMultiByte,open_stdc_wcstombs);
-    }
-    if (gen->force_convert_to_mb == True) {
-	_XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNCharSet,open_stdc_wcstocs);
-	_XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNWideChar,open_stdc_cstowcs);
-    } else {
-#endif
-    _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNCharSet, open_wcstocs);
-    _XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNWideChar, open_cstowcs);
-#ifdef STDCVT
-    }
-#endif
-
-    return lcd;
-}
-
-#else
-typedef int dummy;
-#endif /* X_LOCALE */
diff --git a/xc/lib/X11/lcPrTxt.c b/xc/lib/X11/lcPrTxt.c
deleted file mode 100644
index e96a15078..000000000
--- a/xc/lib/X11/lcPrTxt.c
+++ /dev/null
@@ -1,252 +0,0 @@
-/* $XConsortium: lcPrTxt.c /main/4 1996/01/05 11:23:11 kaleb $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-
-#include "Xlibint.h"
-#include "XlcPubI.h"
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-
-static XPointer *
-alloc_list(is_wide_char, count, nitems)
-    Bool is_wide_char;
-    int count;
-    int nitems;
-{
-    if (is_wide_char) {
-	wchar_t **wstr_list;
-
-	wstr_list = (wchar_t **) Xmalloc(count * sizeof(wchar_t *));
-	if (wstr_list == NULL)
-	    return (XPointer *) NULL;
-
-	*wstr_list = (wchar_t *) Xmalloc(nitems * sizeof(wchar_t));
-	if (*wstr_list == NULL) {
-	    Xfree(wstr_list);
-	    return (XPointer *) NULL;
-	}
-
-	return (XPointer *) wstr_list;
-    } else {
-	char **str_list;
-
-	str_list = (char **) Xmalloc(count * sizeof(char *));
-	if (str_list == NULL)
-	    return (XPointer *) NULL;
-
-	*str_list = (char *) Xmalloc(nitems);
-	if (*str_list == NULL) {
-	    Xfree(str_list);
-	    return (XPointer *) NULL;
-	}
-
-	return (XPointer *) str_list;
-    }
-}
-
-static void
-copy_list(is_wide_char, text, list, count)
-    Bool is_wide_char;
-    XPointer text;
-    XPointer *list;
-    int count;
-{
-    int length;
-
-    if (is_wide_char) {
-	wchar_t *wc_text, *wstr, **wstr_list;
-	
-	wc_text = (wchar_t *) text;
-	wstr_list = (wchar_t **) list;
-
-	for (wstr = *wstr_list; count > 0; count--, wstr_list++) {
-	    _Xwcscpy(wstr, wc_text);
-	    *wstr_list = wstr;
-	    length = _Xwcslen(wstr) + 1;
-	    wstr += length;
-	    wc_text += length;
-	}
-    } else {
-	char *mb_text, *str, **str_list;
-	
-	mb_text = (char *) text;
-	str_list = (char **) list;
-
-	for (str = *str_list; count > 0; count--, str_list++) {
-	    strcpy(str, mb_text);
-	    *str_list = str;
-	    length = strlen(str) + 1;
-	    str += length;
-	    mb_text += length;
-	}
-    }
-}
-
-static int
-_XTextPropertyToTextList(lcd, dpy, text_prop, to_type, list_ret, count_ret)
-    XLCd lcd;
-    Display *dpy;
-    XTextProperty *text_prop;
-    char *to_type;
-    XPointer **list_ret;
-    int *count_ret;
-{
-    XlcConv conv;
-    char *from_type;
-    XPointer from, to, buf;
-    char *str_ptr, *last_ptr;
-    Atom encoding;
-    int from_left, to_left, buf_len, ret;
-    int unconv_num, nitems = text_prop->nitems;
-    Bool is_wide_char = False;
-
-    if (strcmp(XlcNWideChar, to_type) == 0)
-	is_wide_char = True;
-
-    if (nitems <= 0) {
-	*list_ret = NULL;
-	*count_ret = 0;
-	return Success;
-    }
-
-    if (text_prop->format != 8)
-	return XConverterNotFound;
-
-    encoding = text_prop->encoding;
-    if (encoding == XA_STRING)
-	from_type = XlcNString;
-    else if (encoding == XInternAtom(dpy, "COMPOUND_TEXT", False))
-	from_type = XlcNCompoundText;
-    else if (encoding == XInternAtom(dpy, XLC_PUBLIC(lcd, encoding_name), False))
-	from_type = XlcNMultiByte;
-    else
-	return XConverterNotFound;
-
-    if (is_wide_char) {
-	buf_len = text_prop->nitems + 1;
-	buf = (XPointer) Xmalloc(buf_len * sizeof(wchar_t));
-    } else {
-	buf_len = text_prop->nitems * XLC_PUBLIC(lcd, mb_cur_max) + 1;
-	buf = (XPointer) Xmalloc(buf_len);
-    }
-    if (buf == NULL)
-	return XNoMemory;
-    to = buf;
-    to_left = buf_len;
-
-    conv = _XlcOpenConverter(lcd, from_type, lcd, to_type);
-    if (conv == NULL) {
-	Xfree(buf);
-	return XConverterNotFound;
-    }
-
-    last_ptr = str_ptr = (char *) text_prop->value;
-    unconv_num = *count_ret = 0;
-
-    while (1) {
-	if (nitems == 0 || *str_ptr == 0) {
-	    from = (XPointer) last_ptr;
-	    from_left = str_ptr - last_ptr;
-	    last_ptr = str_ptr;
-
-	    ret = _XlcConvert(conv, &from, &from_left, &to, &to_left, NULL, 0);
-
-	    if (ret < 0)
-		continue;
-
-	    unconv_num += ret;
-	    (*count_ret)++;
-
-	    if (nitems == 0)
-		break;
- 	    last_ptr = ++str_ptr;
-	    if (is_wide_char) {
-		*((wchar_t *)to) = (wchar_t) 0;
-		to += sizeof(wchar_t);
-		to_left -= sizeof(wchar_t);
-	    } else {
-		*((char *)to) = '\0';
-		to++;
-		to_left--;
-	    }
-	    _XlcResetConverter(conv);
-	} else
-	    str_ptr++;
-
-	nitems--;
-    }
-
-    _XlcCloseConverter(conv);
-
-    if (is_wide_char)
-	*((wchar_t *) to) = (wchar_t) 0;
-    else
-	*((char *) to) = '\0';
-    to_left--;
-
-    *list_ret = alloc_list(is_wide_char, *count_ret, buf_len - to_left);
-    if (*list_ret)
-	copy_list(is_wide_char, buf, *list_ret, *count_ret);
-
-    Xfree(buf);
-
-    return unconv_num;
-}
-
-int
-_XmbTextPropertyToTextList(lcd, dpy, text_prop, list_ret, count_ret)
-    XLCd lcd;
-    Display *dpy;
-    XTextProperty *text_prop;
-    char ***list_ret;
-    int *count_ret;
-{
-    return _XTextPropertyToTextList(lcd, dpy, text_prop, XlcNMultiByte,
-				    (XPointer **) list_ret, count_ret);
-}
-
-int
-_XwcTextPropertyToTextList(lcd, dpy, text_prop, list_ret, count_ret)
-    XLCd lcd;
-    Display *dpy;
-    XTextProperty *text_prop;
-    wchar_t ***list_ret;
-    int *count_ret;
-{
-    return _XTextPropertyToTextList(lcd, dpy, text_prop, XlcNWideChar,
-				    (XPointer **) list_ret, count_ret);
-}
-
-void
-_XwcFreeStringList(lcd, list)
-    XLCd lcd;
-    wchar_t **list;
-{
-    if (list) {
-        if (*list)
-	     Xfree(*list);
-        Xfree(list);
-    }
-}
diff --git a/xc/lib/X11/lcPubWrap.c b/xc/lib/X11/lcPubWrap.c
deleted file mode 100644
index 3523c5033..000000000
--- a/xc/lib/X11/lcPubWrap.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/* $XConsortium: lcPubWrap.c,v 1.3 94/01/20 18:07:08 rws Exp $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-/* $XFree86: xc/lib/X11/lcPubWrap.c,v 1.2 1997/11/22 12:50:11 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "XlcPubI.h"
-
-#if NeedVarargsPrototypes
-char *
-_XGetLCValues(XLCd lcd, ...)
-#else
-char *
-_XGetLCValues(lcd, va_alist)
-    XLCd lcd;
-    va_dcl
-#endif
-{
-    va_list var;
-    XlcArgList args;
-    char *ret;
-    int num_args;
-    XLCdPublicMethodsPart *methods = XLC_PUBLIC_METHODS(lcd);
-
-    Va_start(var, lcd);
-    _XlcCountVaList(var, &num_args);
-    va_end(var);
-
-    Va_start(var, lcd);
-    _XlcVaToArgList(var, num_args, &args);
-    va_end(var);
-
-    if (args == (XlcArgList) NULL)
-	return (char *) NULL;
-    
-    ret = (*methods->get_values)(lcd, args, num_args);
-
-    Xfree(args);
-
-    return ret;
-}
-
-void
-_XlcDestroyLC(lcd)
-    XLCd lcd;
-{
-    XLCdPublicMethods methods = (XLCdPublicMethods) lcd->methods;
-
-    (*methods->pub.destroy)(lcd);
-}
-
-XLCd
-_XlcCreateLC(name, methods)
-    _Xconst char *name;
-    XLCdMethods methods;
-{
-    XLCdPublicMethods pub_methods = (XLCdPublicMethods) methods;
-    XLCd lcd;
-
-    lcd = (*pub_methods->pub.create)(name, methods);
-    if (lcd == NULL)
-	return (XLCd) NULL;
-
-    if (lcd->core->name == NULL) {
-	lcd->core->name = (char*) Xmalloc(strlen(name) + 1);
-	if (lcd->core->name == NULL) 
-	    goto err;
-	strcpy(lcd->core->name, name);
-    }
-    
-    if (lcd->methods == NULL)
-	lcd->methods = methods;
-
-    if ((*pub_methods->pub.initialize)(lcd) == False)
-	goto err;
-    
-    return lcd;
-
-err:
-    _XlcDestroyLC(lcd);
-
-    return (XLCd) NULL;
-}
diff --git a/xc/lib/X11/lcPublic.c b/xc/lib/X11/lcPublic.c
deleted file mode 100644
index b0a3c1b0d..000000000
--- a/xc/lib/X11/lcPublic.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/* $TOG: lcPublic.c /main/11 1998/06/01 16:15:27 kaleb $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-
-#include <stdio.h>
-#include "Xlibint.h"
-#include "XlcPubI.h"
-
-static char *default_string();
-
-static XLCd create();
-static Bool initialize();
-static void destroy();
-static char *get_values();
-
-static XLCdPublicMethodsRec publicMethods = {
-    {
-	destroy,
-	_XlcDefaultMapModifiers,
-	NULL,
-	NULL,
-	_XrmDefaultInitParseInfo,
-	_XmbTextPropertyToTextList,
-	_XwcTextPropertyToTextList,
-	_XmbTextListToTextProperty,
-	_XwcTextListToTextProperty,
-	_XwcFreeStringList,
-	default_string,
-	NULL,
-	NULL
-    }, 
-    {
-	NULL,
-	create,
-	initialize,
-	destroy,
-	get_values,
-	_XlcGetLocaleDataBase
-    }
-};
-
-XLCdMethods _XlcPublicMethods = (XLCdMethods) &publicMethods;
-
-static char *
-default_string(lcd)
-    XLCd lcd;
-{
-    return XLC_PUBLIC(lcd, default_string);
-}
-
-static XLCd
-create(name, methods)
-    char *name;
-    XLCdMethods methods;
-{
-    XLCd lcd;
-    XLCdPublicMethods new;
-
-    lcd = (XLCd) Xmalloc(sizeof(XLCdRec));
-    if (lcd == NULL)
-        return (XLCd) NULL;
-    bzero((char *) lcd, sizeof(XLCdRec));
-
-    lcd->core = (XLCdCore) Xmalloc(sizeof(XLCdPublicRec));
-    if (lcd->core == NULL)
-	goto err;
-    bzero((char *) lcd->core, sizeof(XLCdPublicRec));
-
-    new = (XLCdPublicMethods) Xmalloc(sizeof(XLCdPublicMethodsRec));
-    if (new == NULL)
-	goto err;
-    *new = *((XLCdPublicMethods) methods);
-    lcd->methods = (XLCdMethods) new;
-
-    return lcd;
-
-err:
-    Xfree(lcd);
-    return (XLCd) NULL;
-}
-
-static Bool
-load_public(lcd)
-    XLCd lcd;
-{
-    XLCdPublicPart *pub = XLC_PUBLIC_PART(lcd);
-    char **values, *str;
-    int num;
-
-    if(_XlcCreateLocaleDataBase(lcd) == NULL)
-	return False;
-
-    _XlcGetResource(lcd, "XLC_XLOCALE", "mb_cur_max", &values, &num);
-    if (num > 0) {
-	pub->mb_cur_max = atoi(values[0]);
-	if (pub->mb_cur_max < 1)
-	    pub->mb_cur_max = 1;
-    } else
-	pub->mb_cur_max = 1;
-
-    _XlcGetResource(lcd, "XLC_XLOCALE", "state_depend_encoding", &values, &num);
-    if (num > 0 && !_XlcCompareISOLatin1(values[0], "True"))
-	pub->is_state_depend = True;
-    else
-	pub->is_state_depend = False;
-
-    _XlcGetResource(lcd, "XLC_XLOCALE", "encoding_name", &values, &num);
-    str = (num > 0) ? values[0] : "STRING";
-    pub->encoding_name = (char*) Xmalloc(strlen(str) + 1);
-    if (pub->encoding_name == NULL)
-	return False;
-    strcpy(pub->encoding_name, str);
-
-    return True;
-}
-
-static Bool
-initialize_core(lcd)
-    XLCd lcd;
-{
-    XLCdMethods methods = lcd->methods;
-    XLCdMethods core = &publicMethods.core;
-
-    if (methods->close == NULL)
-	methods->close = core->close;
-
-    if (methods->map_modifiers == NULL)
-	methods->map_modifiers = core->map_modifiers;
-
-    if (methods->open_om == NULL)
-	_XInitOM(lcd);
-
-    if (methods->open_im == NULL)
-	_XInitIM(lcd);
-
-    if (methods->init_parse_info == NULL)
-	methods->init_parse_info = core->init_parse_info;
-
-    if (methods->mb_text_prop_to_list == NULL)
-	methods->mb_text_prop_to_list = core->mb_text_prop_to_list;
-
-    if (methods->wc_text_prop_to_list == NULL)
-	methods->wc_text_prop_to_list = core->wc_text_prop_to_list;
-
-    if (methods->mb_text_list_to_prop == NULL)
-	methods->mb_text_list_to_prop = core->mb_text_list_to_prop;
-
-    if (methods->wc_text_list_to_prop == NULL)
-	methods->wc_text_list_to_prop = core->wc_text_list_to_prop;
-
-    if (methods->wc_free_string_list == NULL)
-	methods->wc_free_string_list = core->wc_free_string_list;
-
-    if (methods->default_string == NULL)
-	methods->default_string = core->default_string;
-
-    return True;
-}
-
-extern Bool _XlcInitCTInfo();
-
-static Bool
-initialize(lcd)
-    XLCd lcd;
-{
-    XLCdPublicMethodsPart *methods = XLC_PUBLIC_METHODS(lcd);
-    XLCdPublicMethodsPart *pub_methods = &publicMethods.pub;
-    XLCdPublicPart *pub = XLC_PUBLIC_PART(lcd);
-    char *name;
-#if !defined(X_NOT_STDC_ENV) && !defined(X_LOCALE)
-    int len;
-    char sinamebuf[256];
-    char* siname;
-    char *_XlcMapOSLocaleName();
-#endif
-
-    _XlcInitCTInfo();
-
-    if (initialize_core(lcd) == False)
-	return False;
-
-    name = lcd->core->name;
-#if !defined(X_NOT_STDC_ENV) && !defined(X_LOCALE)
-    /* 
-     * _XlMapOSLOcaleName will return the same string or a substring 
-     * of name, so strlen(name) is okay 
-     */
-    if ((len = strlen(name)) < sizeof sinamebuf) siname = sinamebuf;
-    else siname = Xmalloc (len + 1);
-    if (siname == NULL) return False;
-    name = _XlcMapOSLocaleName(name, siname);
-#endif
-    /* _XlcResolveLocaleName will lookup the SI's name for the locale */
-    if (_XlcResolveLocaleName(name, pub) == 0) {
-#if !defined(X_NOT_STDC_ENV) && !defined(X_LOCALE)
-	if (siname != sinamebuf) Xfree (siname);
-#endif
-	return False;
-    }
-#if !defined(X_NOT_STDC_ENV) && !defined(X_LOCALE)
-    if (siname != sinamebuf) Xfree (siname);
-#endif
-
-    if (pub->default_string == NULL)
-	pub->default_string = "";
-
-    if (methods->get_values == NULL)
-	methods->get_values = pub_methods->get_values;
-
-    if (methods->get_resource == NULL)
-	methods->get_resource = pub_methods->get_resource;
-
-    return load_public(lcd);
-}
-
-static void
-destroy_core(lcd)
-	XLCd	lcd;
-{
-    if (lcd->core) {
-	if (lcd->core->name)
-            Xfree(lcd->core->name);
-	Xfree(lcd->core);
-    }
-
-    if (lcd->methods)
-	Xfree(lcd->methods);
-
-    Xfree(lcd);
-}
-
-static void
-destroy(lcd)
-    XLCd lcd;
-{
-    XLCdPublicPart *pub = XLC_PUBLIC_PART(lcd);
-
-    _XlcDestroyLocaleDataBase(lcd);
-
-    if (pub->siname)
-	Xfree(pub->siname);
-    if (pub->encoding_name)
-	Xfree(pub->encoding_name);
-
-    destroy_core(lcd);
-}
-
-static XlcResource resources[] = {
-    { XlcNCodeset, NULLQUARK, sizeof(char *),
-      XOffsetOf(XLCdPublicRec, pub.codeset), XlcGetMask },
-    { XlcNDefaultString, NULLQUARK, sizeof(char *),
-      XOffsetOf(XLCdPublicRec, pub.default_string), XlcGetMask },
-    { XlcNEncodingName, NULLQUARK, sizeof(char *),
-      XOffsetOf(XLCdPublicRec, pub.encoding_name), XlcGetMask },
-    { XlcNLanguage, NULLQUARK, sizeof(char *),
-      XOffsetOf(XLCdPublicRec, pub.language), XlcGetMask },
-    { XlcNMbCurMax, NULLQUARK, sizeof(int),
-      XOffsetOf(XLCdPublicRec, pub.mb_cur_max), XlcGetMask },
-    { XlcNStateDependentEncoding, NULLQUARK, sizeof(Bool),
-      XOffsetOf(XLCdPublicRec, pub.is_state_depend), XlcGetMask },
-    { XlcNTerritory, NULLQUARK, sizeof(char *),
-      XOffsetOf(XLCdPublicRec, pub.territory), XlcGetMask }
-};
-
-static char *
-get_values(lcd, args, num_args)
-    register XLCd lcd;
-    register XlcArgList args;
-    register int num_args;
-{
-    XLCdPublic pub = (XLCdPublic) lcd->core;
-
-    if (resources[0].xrm_name == NULLQUARK)
-	_XlcCompileResourceList(resources, XlcNumber(resources));
-
-    return _XlcGetValues((XPointer) pub, resources, XlcNumber(resources), args,
-			 num_args, XlcGetMask);
-}
diff --git a/xc/lib/X11/lcRM.c b/xc/lib/X11/lcRM.c
deleted file mode 100644
index bea7d3295..000000000
--- a/xc/lib/X11/lcRM.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* $XConsortium: lcRM.c,v 1.3 94/01/20 18:07:18 rws Exp $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-
-#include "Xlibint.h"
-#include "XlcPubI.h"
-#include <stdio.h>
-
-typedef struct _StateRec {
-    XLCd lcd;
-    XlcConv conv;
-} StateRec, *State;
-
-static void
-mbinit(state)
-    XPointer state;
-{
-    _XlcResetConverter(((State) state)->conv);
-}
-
-static char
-mbchar(state, str, lenp)
-    XPointer state;
-    char *str;
-    int *lenp;
-{
-    XlcConv conv = ((State) state)->conv;
-    XlcCharSet charset;
-    char *from, *to, buf[BUFSIZ];
-    int from_left, to_left;
-    XPointer args[1];
-
-    from = str;
-    *lenp = from_left = XLC_PUBLIC(((State) state)->lcd, mb_cur_max);
-    to = buf;
-    to_left = BUFSIZ;
-    args[0] = (XPointer) &charset;
-
-    _XlcConvert(conv, (XPointer *) &from, &from_left, (XPointer *) &to,
-		&to_left, args, 1);
-    
-    *lenp -= from_left;
-
-    /* XXX */
-    return buf[0];
-}
-
-static void
-mbfinish(state)
-    XPointer state;
-{
-}
-
-static char *
-lcname(state)
-    XPointer state;
-{
-    return ((State) state)->lcd->core->name;
-}
-
-static void
-destroy(state)
-    XPointer state;
-{
-    _XlcCloseConverter(((State) state)->conv);
-    _XCloseLC(((State) state)->lcd);
-    Xfree((char *) state);
-}
-
-static XrmMethodsRec rm_methods = {
-    mbinit,
-    mbchar,
-    mbfinish,
-    lcname,
-    destroy
-} ;
-
-XrmMethods
-_XrmDefaultInitParseInfo(lcd, rm_state)
-    XLCd lcd;
-    XPointer *rm_state;
-{
-    State state;
-
-    state = (State) Xmalloc(sizeof(StateRec));
-    if (state == NULL)
-	return (XrmMethods) NULL;
-
-    state->lcd = lcd;
-    state->conv = _XlcOpenConverter(lcd, XlcNMultiByte, lcd, XlcNChar);
-    if (state->conv == NULL) {
-	Xfree((char *) state);
-
-	return (XrmMethods) NULL;
-    }
-    
-    *rm_state = (XPointer) state;
-    
-    return &rm_methods;
-}
diff --git a/xc/lib/X11/lcSjis.c b/xc/lib/X11/lcSjis.c
deleted file mode 100644
index dc97a7563..000000000
--- a/xc/lib/X11/lcSjis.c
+++ /dev/null
@@ -1,1571 +0,0 @@
-/* $TOG: lcSjis.c /main/25 1998/04/30 11:02:27 kaleb $ */
-/****************************************************************
-
-        Copyright 1992, 1993 by FUJITSU LIMITED
-        Copyright 1993 by Fujitsu Open Systems Solutions, Inc.
-	Copyright 1994 by Sony Corporation
-
-Permission to use, copy, modify, distribute and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of FUJITSU LIMITED,
-Fujitsu Open Systems Solutions, Inc. and Sony Corporation  not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-FUJITSU LIMITED, Fujitsu Open Systems Solutions, Inc. and
-Sony Corporation make no representations about the suitability of
-this software for any purpose.  It is provided "as is" without
-express or implied warranty.
-
-FUJITSU LIMITED, FUJITSU OPEN SYSTEMS SOLUTIONS, INC. AND SONY
-CORPORATION DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
-IN NO EVENT SHALL FUJITSU OPEN SYSTEMS SOLUTIONS, INC., FUJITSU LIMITED
-AND SONY CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
-OR PERFORMANCE OF THIS SOFTWARE.
-
-    Authors: Jeffrey Bloomfield		(jeffb@ossi.com)
-	     Shigeru Yamada		(yamada@ossi.com)
-             Yoshiyuki Segawa		(segawa@ossi.com)
-    Modifier:Makoto Wakamatsu   Sony Corporation
-				makoto@sm.sony.co.jp
-
-*****************************************************************/
-/* $XFree86: xc/lib/X11/lcSjis.c,v 3.5 1998/10/03 08:41:40 dawes Exp $ */
-
-
-#ifdef X_LOCALE
-
-#include "Xlibint.h"
-#include "XlcGeneric.h"
-
-#include <ctype.h>
-#ifdef WIN32
-#define isascii __isascii
-#endif
-
-#define CS0	codesets[0]		/* Codeset 0 - 7-bit ASCII	*/
-#define CS1	codesets[1]		/* Codeset 1 - Kanji		*/
-#define CS2	codesets[2]		/* Codeset 2 - Half-Kana	*/
-#define CS3	codesets[3]		/* Codeset 3 - User defined	*/
-
-#define ascii		(codeset->cs_num == 0)
-#define kanji		(codeset->cs_num == 1)
-#define kana		(codeset->cs_num == 2)
-#define userdef		(codeset->cs_num == 3)
-
-#define	ASCII_CODESET	0
-#define KANJI_CODESET	1
-#define KANA_CODESET	2
-#define USERDEF_CODESET	3
-#define MAX_CODESETS	4
-
-#define GR	0x80	/* begins right-side (non-ascii) region */
-#define GL	0x7f    /* ends left-side (ascii) region        */
-
-#define isleftside(c)	(((c) & GR) ? 0 : 1)
-#define isrightside(c)	(!isleftside(c))
-
-typedef unsigned char   Uchar;
-typedef unsigned long	Ulong;
-typedef unsigned int	Uint;
-
-/* Acceptable range for 2nd byte of SJIS multibyte char */
-#define VALID_MULTIBYTE(c) \
-			((0x40<=((Uchar)c) && ((Uchar)c)<=0x7e) \
-			|| (0x80<=((Uchar)c) && ((Uchar)c)<=0xfc))
-
-#ifndef iskanji
-#define iskanji(c)	((0x81<=((Uchar)c) && ((Uchar)c)<=0x9f) \
-			|| (0xe0<=((Uchar)c) && ((Uchar)c)<=0xef))
-#endif /* !iskanji */
-
-#ifndef iskana
-#define iskana(c)	(0xa1<=((Uchar)c) && ((Uchar)c)<=0xdf)
-#endif /* !iskana */
-
-#define	isuserdef(c)	(0xf0<=((Uchar)c) && ((Uchar)c)<=0xfc)
-
-#define BIT8OFF(c)	((c) & GL)
-#define BIT8ON(c)	((c) | GR)
-
-
-static void jis_to_sjis();
-static void sjis_to_jis();
-static CodeSet wc_codeset();
-
-
-/*
- * Notes:
- * 1.  16-bit widechar format is limited to 14 data bits.  Since the 2nd byte
- *     of SJIS multibyte chars are in the ranges of 0x40 - 7E and 0x80 - 0xFC,
- *     SJIS cannot map directly into 16 bit widechar format within the confines
- *     of a single codeset.  Therefore, for SJIS widechar conversion, SJIS Kanji
- *     is mapped into the JIS codeset.  (The algorithms used in jis_to_sjis()
- *     and sjis_to_jis() are from Ken Lunde (lunde@mv.us.adobe.com) and are in
- *     the public domain.)
- * 2.  Defining FORCE_INDIRECT_CONVERTER (see _XlcEucLoader())
- *     forces indirect (charset) conversions (e.g. wcstocs()<->cstombs()).
- * 3.  Using direct converters (e.g. mbstowcs()) decreases conversion
- *     times by 20-40% (depends on specific converter used).
- */
-
-
-static int
-sjis_mbstowcs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-
-    XLCd lcd = (XLCd)conv->state;
-
-    register int chr_len = 0;
-    register int shift_mult = 0;
-    register Uint chrcode = 0;
-
-    Uchar ch, ch2;
-    Uint wc_encode = 0;
-    Uint wc_tmp = 0;
-
-    Bool new_char;
-
-    int firstbyte;
-    int length;
-    int num_conv;
-    int unconv_num = 0;
-
-    XPointer inbufptr = *from;
-    wchar_t *outbufptr = (wchar_t *) *to;
-    wchar_t *outbuf_base = outbufptr;
-
-    CodeSet *codesets = XLC_GENERIC(lcd, codeset_list); 
-    int codeset_num = XLC_GENERIC(lcd, codeset_num);
-    Ulong wc_shift = XLC_GENERIC(lcd, wc_shift_bits);
-
-
-    if (*from_left > *to_left)
-	*from_left = *to_left;
-
-     for (new_char = True, firstbyte = True; *from_left > 0; (*from_left)--) {
-
-	ch = *inbufptr++;
-
-	if (firstbyte) {
-	    if (ASCII_CODESET >= codeset_num) {
-		unconv_num++;
-		(*from_left)--;
-		continue;
-	    }
-	    if (isascii(ch)) {
-		length = CS0->length;
-		*outbufptr++ = (wchar_t)ch;
-		continue;
-	    }
-	    else if (iskanji(ch)) {
-		if (KANJI_CODESET >= codeset_num) {
-		    unconv_num++;
-		    (*from_left)--;
-		    continue;
-		}
-		firstbyte = False;
-		length = CS1->length;
-		if (*from_left < length || *to_left < length)
-		    return -1;
-		wc_encode = CS1->wc_encoding;
-		ch2 = *inbufptr;
-		sjis_to_jis(&ch, &ch2);
-		chrcode = ch;
-	    }
-	    else if (iskana(ch)) {
-		if (KANA_CODESET >= codeset_num) {
-		    unconv_num++;
-		    (*from_left)--;
-		    continue;
-		}
-		length = CS2->length;
-		wc_encode = CS2->wc_encoding;
-		chrcode = BIT8OFF(ch);
-	    }
-	    else if (isuserdef(ch)) {
-		if (USERDEF_CODESET >= codeset_num) {
-		    unconv_num++;
-		    (*from_left)--;
-		    continue;
-		}
-		firstbyte = False;
-		length = CS3->length;
-		if (*from_left < length || *to_left < length)
-		    return -1;
-		wc_encode = CS3->wc_encoding;
-		ch2 = *inbufptr;
-		sjis_to_jis(&ch, &ch2);
-		chrcode = ch;
-	    }
-	    else /* unknown */ {
-		unconv_num++;
-		(*from_left)--;
-		continue;
-	    }
-	} else {	     		/* 2nd byte of multibyte char */
-	    if (!VALID_MULTIBYTE((Uchar) *(inbufptr-1))) {
-		unconv_num++;
-		firstbyte = True;
-	    }
-	    chrcode = ch2;
-	}
-
-	if (new_char) {
-	    chr_len = length;
-	    shift_mult = length - 1;
-	    new_char = False;
-	}
-
-	chrcode <<= (wc_shift * shift_mult);
-	shift_mult--;
-	wc_tmp |= chrcode;
-	if (--chr_len == 0) {
-	    wc_tmp |= wc_encode;
-	    *outbufptr++ = wc_tmp;
-
-	    firstbyte = True;
-	    new_char = True;
-	    wc_tmp = (Uint)0;
-	}
-
-    } /* end for */
-
-    *to = (XPointer)outbufptr;
-
-    if ((num_conv = outbufptr - outbuf_base) > 0)
-	(*to_left) -= num_conv;
-
-    return unconv_num;
-}
-
-
-#define byte1		(length == codeset->length - 1)
-#define byte2		(byte1 == 0)
-
-static int
-sjis_wcstombs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    register wchar_t *inbufptr = (wchar_t *) *from;
-    register XPointer outbufptr = *to;
-    XPointer outbuf_base = outbufptr;
-    wchar_t  wch;
-    register int length;
-    Uchar tmp;
-    Uchar t1, t2;
-    int num_conv;
-    int unconv_num = 0;
-
-    XLCd lcd = (XLCd)conv->state;
-    CodeSet codeset;
-    Ulong wc_shift = XLC_GENERIC(lcd, wc_shift_bits);
-
-
-
-    if (*from_left > *to_left)
-	*from_left = *to_left;
-
-    for (; *from_left > 0 ; (*from_left)-- ) {
-
-	wch = *inbufptr++;
-
-	if (!(codeset = wc_codeset(lcd, wch))) {
-	    unconv_num++;
-	    (*from_left)--;
-	    continue;
-	}
-
-	length = codeset->length;
-	wch ^= (wchar_t)codeset->wc_encoding;
-
-	do {
-	    length--;
-	    tmp = wch>>(wchar_t)( (Ulong)length * wc_shift);
-
-	    if (kana)
-		tmp = BIT8ON(tmp);
-
-	    else if (byte1 && (kanji || userdef)) {
-		t1 = BIT8OFF(tmp);
-		continue;
-	    }
-
-	    else if (byte2 && (kanji || userdef)) {
-		t2 = BIT8OFF(tmp);
-		jis_to_sjis(&t1, &t2);
-		*outbufptr++ = (char)t1;
-		tmp = t2;
-	    }
-
-	    *outbufptr++ = (char)tmp;
-	} while (length); 
-
-    }	/* end for */
-
-    *to = (XPointer)outbufptr;
-
-    if ((num_conv = (int)(outbufptr - outbuf_base)) > 0)
-	(*to_left) -= num_conv;
-
-    return unconv_num;
-}
-#undef byte1
-#undef byte2
-
-/*
- * sjis<->jis conversion for widechar kanji (See Note at top of file)
- */
-static void
-sjis_to_jis(p1, p2)
-    Uchar *p1;
-    Uchar *p2;
-{
-  register Uchar c1 = *p1;
-  register Uchar c2 = *p2;
-  register Uchar adjust = c2 < 0x9f;
-  register Uchar rowOffset = c1 < 0xa0 ? 0x70 : 0xb0;
-  register Uchar cellOffset = adjust ? (0x1f + (c2 > 0x7f)) : 0x7e;
-
-  *p1 = ((c1 - rowOffset) << 1) - adjust;
-  *p2 -= cellOffset;
-}
-
-static void
-jis_to_sjis(p1, p2)
-    Uchar *p1;
-    Uchar *p2;
-{
-  register Uchar c1 = *p1;
-  register Uchar c2 = *p2;
-  register Uchar rowOffset = c1 < 0x5f ? 0x70 : 0xb0;
-  register Uchar cellOffset = c1 % 2 ? 0x1f + (c2 > 0x5f) : 0x7e;
-
-  *p1 = ((Uchar)(c1 + 1) >> 1) + rowOffset;
-  *p2 = c2 + cellOffset;
-}
-
-static CodeSet
-wc_codeset(lcd, wch)
-    XLCd lcd;
-    wchar_t wch;
-{
-    register CodeSet *codesets = XLC_GENERIC(lcd, codeset_list);
-#if !defined(__sony_news)  ||  defined(SVR4)
-    register int end = XLC_GENERIC(lcd, codeset_num);
-    register Ulong widech = (Ulong)(wch & XLC_GENERIC(lcd, wc_encode_mask));
-
-    for (; --end >= 0; codesets++)
-	if ( widech == (*codesets)->wc_encoding )
-	    return *codesets;
-
-    return NULL;
-#else
-    if( iskanji(wch >> 8) )
-	return( codesets[1] );
-    if( iskana(wch & 0xff) )
-	return( codesets[2] );
-    return( codesets[0] );
-#endif
-}
-    
-
-static int
-sjis_mbtocs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    XLCd lcd = (XLCd)conv->state;
-    XlcCharSet charset = NULL;
-    int char_size = 0;
-    int unconv_num = 0;
-    register char *src = *from, *dst = *to;
-    CodeSet *codesets = XLC_GENERIC(lcd, codeset_list);
-    int codeset_num = XLC_GENERIC(lcd, codeset_num);
-
-
-    if (iskanji(*src)) {
-	if (KANJI_CODESET >= codeset_num)
-	    return -1;
-	charset = *CS1->charset_list;
-	char_size = charset->char_size;
-
-	if (*from_left >= char_size && *to_left >= char_size) {
-	    *dst++ = *src++;
-	    *dst++ = *src++; 
-	    if (!VALID_MULTIBYTE((Uchar) *(src-1))) /* check 2nd byte */
-		unconv_num++;
-	    sjis_to_jis((Uchar *)(dst-2), (Uchar *)(dst-1));
-	} else
-	    return -1;
-    }
-    else if (isuserdef(*src)) {
-	if (USERDEF_CODESET >= codeset_num)
-	    return -1;
-	charset = *CS3->charset_list;
-	char_size = charset->char_size;
-	
-	if (*from_left >= char_size && *to_left >= char_size) {
-	    *dst++ = *src++;
-	    *dst++ = *src++; 
-	    if (!VALID_MULTIBYTE((Uchar) *(src-1))) /* check 2nd byte */
-		unconv_num++;
-	    sjis_to_jis((Uchar *)(dst-2), (Uchar *)(dst-1));
-	} else
-	    return -1;
-    }
-    else if (isascii(*src)) {
-	if (ASCII_CODESET >= codeset_num)
-	    return -1;
-	charset = *CS0->charset_list;
-	char_size = charset->char_size;
-
-	if (*from_left >= char_size && *to_left >= char_size)
-	    *dst++ = *src++;
-	else
-	    return -1;
-    }
-    else if (iskana(*src)) {
-	if (KANA_CODESET >= codeset_num)
-	    return  -1;
-	charset = *CS2->charset_list;
-	char_size = charset->char_size;
-
-	if (*from_left >= char_size && *to_left >= char_size)
-	    *dst++ = *src++;
-	else
-	   return -1;
-    }
-    else 	/* unknown */
-	return -1;
-
-    *from_left -= char_size;
-    *to_left -= char_size;
-
-    *to = dst;
-    *from = src;
-
-    if (num_args > 0)
-	*((XlcCharSet *) args[0]) = charset;
-
-    return unconv_num;
-}
-
-
-static int
-sjis_mbstocs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    char *tmp_from, *tmp_to;
-    int tmp_from_left, tmp_to_left;
-    XlcCharSet charset, tmp_charset;
-    XPointer tmp_args[1];
-    int unconv_num = 0, ret;
-
-
-
-/* Determine the charset of the segment and convert one character: */
-
-    tmp_args[0] = (XPointer) &charset; /* charset from sjis_mbtocs() */
-    while
-      ((ret = sjis_mbtocs(conv, from, from_left, to, to_left, tmp_args, 1)) > 0)
-	unconv_num += ret;
-    if ( ret < 0 )
-	return ret;
-
-    tmp_from = *from;
-    tmp_from_left = *from_left;
-    tmp_to_left = *to_left;
-    tmp_to = *to;
-
-/* Convert remainder of the segment: */
-
-    tmp_args[0] = (XPointer) &tmp_charset;
-    while( (ret = sjis_mbtocs(conv, &tmp_from, &tmp_from_left, &tmp_to,
-      &tmp_to_left, tmp_args, 1)) >= 0 ) {
-
-	if (ret > 0) {
-	    unconv_num += ret;
-	    continue;
-	}
-
-	if (tmp_charset != charset)  /* quit on end of segment */
-	    break;
-
-	*from = tmp_from;
-	*from_left = tmp_from_left;
-	*to = tmp_to;
-	*to_left = tmp_to_left;
-    } 
-
-    if (num_args > 0)
-	*((XlcCharSet *) args[0]) = charset;
-    
-    return unconv_num;
-}
-
-static int
-sjis_wcstocs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    XLCd lcd = (XLCd) conv->state;
-    wchar_t *wcptr = *((wchar_t **)from);
-    register char *bufptr = *((char **) to);
-    wchar_t wch;
-    char *tmpptr;
-    register int length;
-    CodeSet codeset;
-    Ulong wc_encoding;
-    int buf_len = *to_left;
-    int wcstr_len = *from_left;
-
-
-    if (!(codeset = wc_codeset(lcd, *wcptr)))
-	return -1;
-
-    if (wcstr_len < buf_len / codeset->length)
-	buf_len = wcstr_len * codeset->length;
-
-#if !defined(__sony_news)  ||  defined(SVR4)
-    wc_encoding = codeset->wc_encoding;
-
-    for ( ; wcstr_len > 0 && buf_len > 0; wcptr++, wcstr_len--) {
-	wch = *wcptr;
-
-	if ((wch & XLC_GENERIC(lcd, wc_encode_mask)) != wc_encoding)
-	    break;
-
-	length = codeset->length;
-
-	buf_len -= length;
-	bufptr += length;
-	tmpptr = bufptr - 1;
-
-	while (length--) {
-	    *tmpptr-- = kana ? BIT8ON(wch) : BIT8OFF(wch);
-	    wch >>= (wchar_t)XLC_GENERIC(lcd, wc_shift_bits);
-	}
-    }
-#else
-    length = codeset->length;
-    for( ; wcstr_len > 0  &&  buf_len > 0; wcptr++, wcstr_len-- ) {
-	wch = *wcptr;
-	if( codeset != wc_codeset( lcd, wch ) )
-	    break;
-
-	buf_len -= length;
-	if( length == 2 ) {
-	    unsigned short	code;
-
-	    code = sjis2jis( wch & 0xffff );
-	    *bufptr++ = code >> 8;
-	    *bufptr++ = code & 0xff;
-	}
-	else
-	    *bufptr++ = wch & 0xff;
-    }
-#endif
-
-    if (num_args > 0)
-	*((XlcCharSet *) args[0]) = *codeset->charset_list;
-
-    *from_left -= wcptr - (wchar_t *) *from;
-    *from = (XPointer) wcptr;
-
-    *to_left -= bufptr - *to;
-    *to = bufptr;
-
-    return 0;
-}
-
-static CodeSet
-GetCodeSetFromCharSet(lcd, charset)
-    XLCd lcd;
-    XlcCharSet charset;
-{
-    register CodeSet *codeset = XLC_GENERIC(lcd, codeset_list);
-    register XlcCharSet *charset_list;
-    register int codeset_num, num_charsets;
-
-    codeset_num = XLC_GENERIC(lcd, codeset_num);
-
-    for ( ; codeset_num-- > 0; codeset++) {
-	num_charsets = (*codeset)->num_charsets;
-	charset_list = (*codeset)->charset_list;
-
-	for ( ; num_charsets-- > 0; charset_list++)
-	    if (*charset_list == charset)
-		return *codeset;
-    }
-
-    return (CodeSet) NULL;
-}
-
-
-static int
-sjis_cstombs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    char **from;
-    int *from_left;
-    char **to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    XLCd lcd = (XLCd) conv->state;
-    register char *csptr = *from;
-    register char *bufptr = *to;
-    int csstr_len = *from_left;
-    register int buf_len = *to_left;
-    int length;
-    CodeSet codeset;
-    EncodingType type;
-    int cvt_length = 0;
-
-
-    if (num_args < 1)
-	return -1;
-    
-    if (!(codeset = GetCodeSetFromCharSet(lcd, (XlcCharSet) args[0])))
-	return -1;
-
-    csstr_len /= codeset->length;
-    buf_len /= codeset->length;
-    if (csstr_len < buf_len)
-	buf_len = csstr_len;
-    
-    cvt_length += buf_len * codeset->length;
-
-    if (bufptr) {
-	while (buf_len--) {
-	    length = codeset->length;
-	    while (length--)
-		*bufptr++ = codeset->length == 1 && codeset->side == XlcGR ?
-		  BIT8ON(*csptr++) : BIT8OFF(*csptr++);
-
-	    if (codeset->length == 2)
-		jis_to_sjis((Uchar *)(bufptr-2), (Uchar *)(bufptr-1));
-	}
-    }
-
-    *from_left -= csptr - *from;
-    *from = csptr;
-
-    if (bufptr)
-	*to += cvt_length;
-    *to_left -= cvt_length;
-
-
-    return 0;
-}
-
-static int
-sjis_cstowcs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    XLCd lcd = (XLCd) conv->state;
-    register char *csptr = (char *) *from;
-    wchar_t *bufptr = (wchar_t *) *to;
-    wchar_t *toptr = (wchar_t *) *to;
-    int csstr_len = *from_left;
-    register int buf_len = *to_left;
-    wchar_t wch;
-    int length;
-    Ulong wc_shift_bits = (int)XLC_GENERIC(lcd, wc_shift_bits);
-    CodeSet codeset;
-
-
-    if (num_args < 1)
-	return -1;
-
-    if (!(codeset = GetCodeSetFromCharSet(lcd, (XlcCharSet) args[0])))
-	return -1;
-
-    csstr_len /= codeset->length;
-    if (csstr_len < buf_len)
-	buf_len = csstr_len;
-
-    *to_left -= buf_len;
-
-    if (bufptr) {
-
-	toptr += buf_len;
-	*to = (XPointer) toptr;
-
-	while (buf_len--) {
-	    wch = (wchar_t) BIT8OFF(*csptr);
-	    csptr++;
-
-	    length = codeset->length - 1;
-	    while (length--) {
-		wch = (wch << wc_shift_bits) | BIT8OFF(*csptr);
-		csptr++;
-	    }
-	    *bufptr++ = wch | codeset->wc_encoding;
-	}
-    }
-
-    *from_left -= csptr - *from;
-    *from = csptr;
-
-    return 0;
-}
-
-
-/*
- *    Stripped down Direct CT converters for SJIS
- *
- */
-
-#define BADCHAR(min_ch, c)  (BIT8OFF(c) < (char)min_ch && BIT8OFF(c) != 0x0 && \
-			     BIT8OFF(c) != '\t' && BIT8OFF(c) != '\n' && \
-			     BIT8OFF(c) != 0x1b)
-
-typedef struct _CTDataRec {
-    int side;
-    int length;
-    char *name;
-    Ulong wc_encoding;
-    char *ct_encoding;
-    int ct_encoding_len;
-    int set_size;
-    Uchar min_ch;
-    Uchar ct_type;
-} CTDataRec, *CTData;
-
-typedef struct _StateRec {
-    CTData GL_charset;
-    CTData GR_charset;
-    CTData charset;
-} StateRec, *State;
-
-#define CT_STD  0
-#define CT_NSTD 1
-#define CT_DIR  2
-#define CT_EXT0 3
-#define CT_EXT1 4
-#define CT_EXT2 5
-#define CT_VER  6
-
-static CTDataRec ctdata[] =
-{
-    { XlcGL,      1, "ISO8859-1:GL",       0, "\033(B"   ,  3, 0, 0, CT_STD  },
-    { XlcGR,      1, "ISO8859-1:GR",       0, "\033-A"   ,  3, 0, 0, CT_STD  },
-    { XlcGL,      1, "JISX0201.1976-0:GL", 0, "\033(J"   ,  3, 0, 0, CT_STD  },
-    { XlcGR,      1, "JISX0201.1976-0:GR", 0, "\033)I"   ,  3, 0, 0, CT_STD  },
-    { XlcGL,      2, "JISX0208.1983-0:GL", 0, "\033$(B"  ,  4, 0, 0, CT_STD  },
-    { XlcGR,      2, "JISX0208.1983-0:GR", 0, "\033$)B"  ,  4, 0, 0, CT_STD  },
-    { XlcGL,      2, "JISX0212.1990-0:GL", 0, "\033$(D"  ,  4, 0, 0, CT_STD  },
-    { XlcGR,      2, "JISX0212.1990-0:GR", 0, "\033$)D"  ,  4, 0, 0, CT_STD  },
-    { XlcUnknown, 0, "Ignore-Ext-Status?", 0, "\033#"    ,  2, 0, 0, CT_VER  },
-    { XlcUnknown, 0, "NonStd-?-OctetChar", 0, "\033%/0"  ,  4, 0, 0, CT_NSTD },
-    { XlcUnknown, 1, "NonStd-1-OctetChar", 0, "\033%/1"  ,  4, 0, 0, CT_NSTD },
-    { XlcUnknown, 2, "NonStd-2-OctetChar", 0, "\033%/2"  ,  4, 0, 0, CT_NSTD },
-    { XlcUnknown, 3, "NonStd-3-OctetChar", 0, "\033%/3"  ,  4, 0, 0, CT_NSTD },
-    { XlcUnknown, 4, "NonStd-4-OctetChar", 0, "\033%/4"  ,  4, 0, 0, CT_NSTD },
-    { XlcUnknown, 0, "Extension-2"       , 0, "\033%/"   ,  3, 0, 0, CT_EXT2 },
-    { XlcUnknown, 0, "Extension-0"       , 0, "\033"     ,  1, 0, 0, CT_EXT0 },
-    { XlcUnknown, 0, "Begin-L-to-R-Text",  0, "\2331]"   ,  3, 0, 0, CT_DIR  },
-    { XlcUnknown, 0, "Begin-R-to-L-Text",  0, "\2332]"   ,  3, 0, 0, CT_DIR  },
-    { XlcUnknown, 0, "End-Of-String",      0, "\233]"    ,  2, 0, 0, CT_DIR  },
-    { XlcUnknown, 0, "Extension-1"       , 0, "\233"     ,  1, 0, 0, CT_EXT1 },
-};
-
-/* Note on above table:  sjis_ctstombs() and sjis_ctstowcs() parser depends on
- * certain table entries occuring in decreasing string length--
- *   1.  CT_EXT2 and CT_EXT0 entries must occur after CT_NSTD entries.
- *   2.  CT_DIR and CT_EXT1 entries must occur after CT_DIR entries.
- */
-
-static CTData ctdptr[sizeof(ctdata) / sizeof(CTDataRec)];
-static CTData ctd_endp = ctdata + ((sizeof(ctdata) / sizeof(CTDataRec))) - 1;
-
-#define Ascii   0
-#define Kanji   1
-#define Kana    2
-#define Userdef 3
-
-/*
- * initCTptr(): Set ctptr[] to point at ctdata[], indexed by codeset_num.
- */
-static void
-initCTptr(lcd)
-    XLCd lcd;
-{
-    int num_codesets = XLC_GENERIC(lcd, codeset_num);
-    int num_charsets;
-    int i, j;
-    CodeSet *codesets = XLC_GENERIC(lcd, codeset_list);
-    CodeSet codeset;
-    XlcCharSet charset;
-    CTData ctdp = ctdata;
-
-    ctdptr[Ascii] = &ctdata[0];         /* failsafe */
-
-    for (i = 0; i < num_codesets; i++) {
-
-	codeset = codesets[i];
-	num_charsets = codeset->num_charsets;
-
-	for (j = 0; j < num_charsets; j++) {
-
-	    charset = codeset->charset_list[j];
-
-	    for (ctdp = ctdata; ctdp <= ctd_endp; ctdp++)
-
-		if (! strcmp(ctdp->name, charset->name)) {
-
-		    ctdptr[codeset->cs_num] = ctdp;
-
-		    ctdptr[codeset->cs_num]->wc_encoding = codeset->wc_encoding;
-
-		    ctdptr[codeset->cs_num]->set_size =
-		      charset->set_size;
-
-		    ctdptr[codeset->cs_num]->min_ch =
-		      charset->set_size == 94 &&
-		      (ctdptr[codeset->cs_num]->length > 1 ||
-		      ctdptr[codeset->cs_num]->side == XlcGR) ? 0x21 : 0x20;
-
-		    break;
-		}
-	}
-    }
-}
-
-
-static int
-sjis_mbstocts(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    register int ct_len = *to_left;
-    int cs_num;
-    int clen;
-    int unconv_num = 0;
-    int num_conv;
-    XPointer inbufptr = *from;
-    register char *ctptr = *to;
-    XPointer ct_base = ctptr;
-
-    StateRec ct_state;
-    CTData charset;
-    XLCd lcd = (XLCd) conv->state;
-    int codeset_num = XLC_GENERIC(lcd, codeset_num);
-
-
-/* Initial State: */
-
-    ct_state.GL_charset = ctdptr[Ascii];
-    ct_state.GR_charset = NULL;
-
-
-    if (*from_left > *to_left)
-        *from_left = *to_left;
-
-    for (;*from_left > 0; (*from_left) -= charset->length) {
-
-	if (iskanji(*inbufptr)) {
-	    if (KANJI_CODESET >= codeset_num) {
-		unconv_num++;
-		(*from_left)--;
-		continue;
-	    }
-	    cs_num = Kanji;
-	    charset = ctdptr[Kanji];
-	    if (!VALID_MULTIBYTE((Uchar) *(inbufptr+1)))
-		unconv_num++;
-	}
-	else if (isuserdef(*inbufptr)) {
-	    if (USERDEF_CODESET >= codeset_num) {
-		unconv_num++;
-		(*from_left)--;
-		continue;
-	    }
-	    cs_num = Userdef;
-	    charset = ctdptr[Userdef];
-	    if (!VALID_MULTIBYTE((Uchar) *(inbufptr+1)))
-		unconv_num++;
-	}
-	else if (isascii(*inbufptr)) {
-	    if (ASCII_CODESET >= codeset_num) {
-		unconv_num++;
-		(*from_left)--;
-		continue;
-	    }
-	    cs_num = Ascii;
-	    charset = ctdptr[Ascii];
-	}
-	else if (iskana(*inbufptr)) {
-	    if (KANA_CODESET >= codeset_num) {
-		unconv_num++;
-		(*from_left)--;
-		continue;
-	    }
-	    cs_num = Kana;
-	    charset = ctdptr[Kana];
-	}
-	else { 		 /* unknown */
-	    unconv_num++;
-	    (*from_left)--;
-	    continue;
-	}
-
-	if ( (charset->side == XlcGR && charset != ct_state.GR_charset) ||
-	     (charset->side == XlcGL && charset != ct_state.GL_charset) ) {
-
-	    ct_len -= ctdptr[cs_num]->ct_encoding_len;
-	    if (ct_len < 0) {
-		unconv_num++;
-		break;
-	    }
-	
-	    if (ctptr) {
-		strcpy(ctptr, ctdptr[cs_num]->ct_encoding);
-		ctptr += ctdptr[cs_num]->ct_encoding_len;
-	    }
-	}
-
-	clen = charset->length;
-	do {
-	    *ctptr++ = *inbufptr++;
-	} while (--clen); 
-
-	if (charset->length >= 2) {
-	    sjis_to_jis((Uchar *)(ctptr-2), (Uchar *)(ctptr-1));
-	    if (BADCHAR(charset->min_ch, *(ctptr-2)) ||
-		  BADCHAR(charset->min_ch, *(ctptr-1))) {
-		unconv_num++;
-		continue;
-	    }
-	}
-	else
-	    if (BADCHAR(charset->min_ch, *(ctptr-1))) {
-		unconv_num++;
-		continue;
-	    }
-
-	if (charset->side == XlcGR)
-	    ct_state.GR_charset = charset;
-	else if (charset->side == XlcGL)
-	    ct_state.GL_charset = charset;
-    }
-
-    *to = (XPointer)ctptr;
-
-    if ((num_conv = (int)(ctptr - ct_base)) > 0)
-	(*to_left) -= num_conv;
-
-    return unconv_num;
-
-}
-
-
-#define byte1		(length == codeset->length - 1)
-#define byte2		(byte1 == 0)
-
-static int
-sjis_wcstocts(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    register int ct_len = *to_left;
-    register wchar_t *inbufptr = (wchar_t *) *from;
-    register char *ctptr = *to;
-    XPointer ct_base = ctptr;
-    wchar_t  wch;
-    register int length;
-    Uchar tmp;
-    Uchar t1 = 0;
-    int num_conv;
-
-    StateRec ct_state;
-    XLCd lcd = (XLCd)conv->state;
-    CTData charset;
-    CodeSet codeset;
-    int unconv_num = 0;
-    Ulong wc_shift = XLC_GENERIC(lcd, wc_shift_bits);
-
-/* Initial State: */
-    ct_state.GL_charset = ctdptr[0]; /* Codeset 0 */
-    ct_state.GR_charset = NULL;
-
-    if (*from_left > *to_left)
-	*from_left = *to_left;
-
-    for (; *from_left > 0 ; (*from_left)-- ) {
-
-	wch = *inbufptr++;
-
-        if (!(codeset = wc_codeset(lcd, wch))) {
-            unconv_num++;
-            (*from_left)--;
-            continue;
-        }
-
-	charset = ctdptr[codeset->cs_num];
-
-	length = codeset->length;
-	wch ^= (wchar_t)codeset->wc_encoding;
-
-	if ( (charset->side == XlcGR && charset != ct_state.GR_charset) ||
-	     (charset->side == XlcGL && charset != ct_state.GL_charset) ) {
-
-	    ct_len -= ctdptr[codeset->cs_num]->ct_encoding_len;
-	    if (ct_len < 0) {
-		unconv_num++;
-		break;
-	    }
-
-	    if (ctptr) {
-		strcpy(ctptr, ctdptr[codeset->cs_num]->ct_encoding);
-		ctptr += ctdptr[codeset->cs_num]->ct_encoding_len;
-	    }
-
-	}
-
-	if (charset->side == XlcGR)
-	    ct_state.GR_charset = charset;
-	else if (charset->side == XlcGL)
-	    ct_state.GL_charset = charset;
-
-	do {
-	    length--;
-	    tmp = wch>>(wchar_t)( (Ulong)length * wc_shift);
-
-	    if (kana) {
-		if (BADCHAR(charset->min_ch, (char)tmp)) {
-		    unconv_num++;
-		    break;
-		}
-		*ctptr++ = (char)BIT8ON(tmp);
-	    }
-
-	    else if (byte1 && (kanji || userdef)) {
-		t1 = tmp;
-	    }
-
-	    else if (byte2 && (kanji || userdef)) {
-		if (BADCHAR(charset->min_ch, (char)t1) ||
-		  BADCHAR(charset->min_ch, (char)tmp)) {
-		    unconv_num++;
-		    break;
-		}
-
-		*ctptr++ = (char)BIT8OFF(t1);
-		*ctptr++ = (char)BIT8OFF(tmp);
-	    }
-
-	    else {
-		if (BADCHAR(charset->min_ch, (char)tmp)) {
-		    unconv_num++;
-		    break;
-		}
-		*ctptr++ = (char)tmp;
-	    }
-	} while (length); 
-
-    }	/* end for */
-
-    *to = (XPointer)ctptr;
-
-    if ((num_conv = (int)(ctptr - ct_base)) > 0)
-	(*to_left) -= num_conv;
-
-    return unconv_num;
-}
-#undef byte1
-#undef byte2
-
-#define SKIP_I(str)	while (*(str) >= 0x20 && *(str) <=  0x2f) (str)++;
-#define SKIP_P(str)	while (*(str) >= 0x30 && *(str) <=  0x3f) (str)++;
-
-static int
-sjis_ctstombs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    register XPointer inbufptr =  *from;
-    register XPointer outbufptr =  *to;
-    XPointer inbuf_base;
-    XPointer outbuf_base = outbufptr;
-    register int clen, length;
-    int unconv_num = 0;
-    int num_conv;
-    unsigned int ct_seglen = 0;
-    Uchar ct_type;
-    CTData ctdp = ctdata;	/* default */
-
-
-    if (*from_left > *to_left)
-	*from_left = *to_left;
-
-    for (length = ctdata[Ascii].length; *from_left > 0 ; (*from_left) -= length)
-    {
-	ct_type = CT_STD;
-	if (*inbufptr == '\033' || *inbufptr == (char)'\233') {
-
-	    for (ctdp = ctdata; ctdp <= ctd_endp ; ctdp++) {
-
-		if(!strncmp(inbufptr, ctdp->ct_encoding, ctdp->ct_encoding_len))
-		{
-		    inbufptr += ctdp->ct_encoding_len;
-		    (*from_left) -= ctdp->ct_encoding_len;
-		    if( ctdp->length ) {
-			length = ctdp->length;
-			if( *from_left < length ) {
-			    *to = (XPointer)outbufptr;
-			    *to_left -= outbufptr - outbuf_base;
-			    return( unconv_num + *from_left );
-			}
-		    }
-		    ct_type = ctdp->ct_type;
-		    break;
-		}
-	    }
-	    if (ctdp > ctd_endp)  	/* failed to match CT sequence */
-		unconv_num++;
-	}
-
-/* The following code insures that non-standard encodings, direction, extension,
- * and version strings are ignored; subject to change in future.
- */
-	switch (ct_type) {
-	  case CT_STD:
-	    break;
-	  case CT_EXT2:
-	    inbufptr++;
-	    (*from_left)--;
-	  case CT_NSTD:
-	    ct_seglen = (BIT8OFF(*inbufptr) << 7) + BIT8OFF(*(inbufptr+1)) + 2;
-	    inbufptr += ct_seglen;
-	    (*from_left) -= ct_seglen;
-	    continue;
-	  case CT_EXT0:
-	    inbuf_base = inbufptr;
-	    SKIP_I(inbufptr);
-	    inbufptr++;
-	    ct_seglen = (unsigned)(inbufptr - inbuf_base);
-	    (*from_left) -= ct_seglen;
-	    continue;
-	  case CT_EXT1:
-	    inbuf_base = inbufptr;
-	    SKIP_P(inbufptr);
-	    SKIP_I(inbufptr);
-	    inbufptr++;
-	    ct_seglen = (unsigned)(inbufptr - inbuf_base);
-	    (*from_left) -= ct_seglen;
-	    continue;
-	  case CT_DIR:
-	    continue;
-	  case CT_VER:
-	    inbufptr += 2;
-	    (*from_left) -= 2;
-	    continue;
-	}
-
-	if (ctdp->side == XlcGL || isrightside (*inbufptr)) {
-	    clen = length;
-	} else {
-	    clen = 1;
-	    *from_left += length - clen;
-	}
-	do {
-	    Uchar mask = (length == 2) ? GL : -1;
-	    *outbufptr++ = *inbufptr++ & mask;
-	} while (--clen);
-
-	if (length >= 2)
-	    jis_to_sjis((Uchar *)(outbufptr-2), (Uchar *)(outbufptr-1));
-    }
-
-    *to = (XPointer)outbufptr;
-
-    if ((num_conv = (int)(outbufptr - outbuf_base)) > 0)
-	(*to_left) -= num_conv;
-
-    return unconv_num;
-}
-
-
-static int
-sjis_ctstowcs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    XLCd lcd = (XLCd)conv->state;
-    Ulong wc_shift_bits = XLC_GENERIC(lcd, wc_shift_bits);
-    register XPointer inbufptr = *from;
-    XPointer inbuf_base;
-    register wchar_t *outbufptr = (wchar_t *) *to;
-    wchar_t *outbuf_base = outbufptr;
-    register int clen, length;
-    int num_conv;
-    int unconv_num = 0;
-    unsigned int ct_seglen = 0;
-    Uchar ct_type = 0;
-    register int shift_mult;
-    wchar_t wc_tmp;
-    wchar_t wch;
-    Ulong wc_encoding;
-    CTData ctdp = ctdata;
-
-
-    if (*from_left > *to_left)
-	*from_left = *to_left;
-  
-    for (length = ctdata[Ascii].length; *from_left > 0; (*from_left) -= length )
-    {
-	ct_type = CT_STD;
-	if (*inbufptr == '\033' || *inbufptr == (char)'\233') {
-	    for (ctdp = ctdata; ctdp <= ctd_endp ; ctdp++) {
-
-		if(!strncmp(inbufptr, ctdp->ct_encoding, ctdp->ct_encoding_len))
-		{
-		    inbufptr += ctdp->ct_encoding_len;
-		    (*from_left) -= ctdp->ct_encoding_len;
-		    if( ctdp->length ) {
-			length = ctdp->length;
-			if( *from_left < length ) {
-			    *to = (XPointer)outbufptr;
-			    *to_left -= outbufptr - outbuf_base;
-			    return( unconv_num + *from_left );
-			}
-		    }
-		    ct_type = ctdp->ct_type;
-		    break;
-		}
-	    }
-	    if (ctdp > ctd_endp)    	/* failed to match CT sequence */
-		unconv_num++;
-	}
-
-/* The following block of code insures that non-standard encodings, direction,
- * extension, and version strings are ignored; subject to change in future.
- */
-	switch (ct_type) {
-	  case CT_STD:
-	    break;
-	  case CT_EXT2:
-	    inbufptr++;
-	    (*from_left)--;
-	  case CT_NSTD:
-	    ct_seglen = (BIT8OFF(*inbufptr) << 7) + BIT8OFF(*(inbufptr+1)) + 2;
-	    inbufptr += ct_seglen;
-	    (*from_left) -= ct_seglen;
-	    continue;
-	  case CT_EXT0:
-	    inbuf_base = inbufptr;
-	    SKIP_I(inbufptr);
-	    inbufptr++;
-	    ct_seglen = (unsigned)(inbufptr - inbuf_base);
-	    (*from_left) -= ct_seglen;
-	    continue;
-	  case CT_EXT1:
-	    inbuf_base = inbufptr;
-	    SKIP_P(inbufptr);
-	    SKIP_I(inbufptr);
-	    inbufptr++;
-	    ct_seglen = (unsigned)(inbufptr - inbuf_base);
-	    (*from_left) -= ct_seglen;
-	    continue;
-	  case CT_DIR:
-	    continue;
-	  case CT_VER:
-	    inbufptr += 2;
-	    (*from_left) -= 2;
-	    continue;
-	}
-#if !defined(__sony_news)  ||  defined(SVR4)
-	if (ctdp->side == XlcGL || isrightside (*inbufptr)) {
-	    clen = length;
-	    wc_encoding = ctdp->wc_encoding;
-	} else {
-	    clen = 1;
-	    *from_left += length - clen;
-	    wc_encoding = ctdptr[Ascii]->wc_encoding;
-	}
-	shift_mult = clen - 1;
-	wch = (wchar_t)0;
-
-	do {
-	    wc_tmp = BIT8OFF(*inbufptr++) << (wc_shift_bits * shift_mult);
-	    wch |= wc_tmp;
-	    shift_mult--;
-	} while (--clen);
-	*outbufptr++ = wch | wc_encoding;
-#else
-	if( length == 1 )
-	    *outbufptr++ = (unsigned char)*inbufptr++;
-	else if( length == 2 ) {
-	    unsigned short	code;
-	    code = (*inbufptr << 8) | *(inbufptr+1);
-	    *outbufptr++ = jis2sjis( code );
-	    inbufptr += 2;
-	}
-#endif
-    }
-    *to = (XPointer)outbufptr;
-
-    if ((num_conv = (int)(outbufptr - outbuf_base)) > 0)
-	(*to_left) -= num_conv ;
-
-    return unconv_num;
-
-}
-#undef BADCHAR
-
-static void
-close_converter(conv)
-    XlcConv conv;
-{
-	Xfree((char *) conv);
-}
-
-
-static XlcConv
-create_conv(lcd, methods)
-    XLCd lcd;
-    XlcConvMethods methods;
-{
-    XlcConv conv;
-
-    conv = (XlcConv) Xmalloc(sizeof(XlcConvRec));
-    if (conv == NULL)
-	return (XlcConv) NULL;
-    
-    conv->methods = methods;
-    conv->state = (XPointer) lcd;
-    return conv;
-}
-
-
-enum { MBSTOCS, WCSTOCS, MBTOCS, CSTOMBS, CSTOWCS, MBSTOWCS, WCSTOMBS,
-       WCSTOCTS, MBSTOCTS, CTSTOMBS, CTSTOWCS };
-
-static XlcConvMethodsRec conv_methods[] = {
-    {close_converter, sjis_mbstocs,  NULL },
-    {close_converter, sjis_wcstocs,  NULL },
-    {close_converter, sjis_mbtocs,   NULL },
-    {close_converter, sjis_cstombs,  NULL },
-    {close_converter, sjis_cstowcs,  NULL },
-    {close_converter, sjis_mbstowcs, NULL },
-    {close_converter, sjis_wcstombs, NULL },
-    {close_converter, sjis_wcstocts, NULL },
-    {close_converter, sjis_mbstocts, NULL },
-    {close_converter, sjis_ctstombs, NULL },
-    {close_converter, sjis_ctstowcs, NULL },
-};
-
-
-static XlcConv
-open_mbstocs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &conv_methods[MBSTOCS]);
-}
-
-static XlcConv
-open_wcstocs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &conv_methods[WCSTOCS]);
-}
-
-static XlcConv
-open_mbtocs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &conv_methods[MBTOCS]);
-}
-
-static XlcConv
-open_cstombs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &conv_methods[CSTOMBS]);
-}
-
-static XlcConv
-open_cstowcs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &conv_methods[CSTOWCS]);
-}
-
-static XlcConv
-open_mbstowcs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &conv_methods[MBSTOWCS]);
-}
-
-static XlcConv
-open_wcstombs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &conv_methods[WCSTOMBS]);
-}
-
-static XlcConv
-open_wcstocts(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &conv_methods[WCSTOCTS]);
-}
-
-static XlcConv
-open_mbstocts(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &conv_methods[MBSTOCTS]);
-}
-
-static XlcConv
-open_ctstombs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &conv_methods[CTSTOMBS]);
-}
-
-static XlcConv
-open_ctstowcs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &conv_methods[CTSTOWCS]);
-}
-
-XLCd
-_XlcSjisLoader(name)
-    _Xconst char *name;
-{
-    XLCd lcd;
-
-    lcd = _XlcCreateLC(name, _XlcGenericMethods);
-    if (lcd == NULL)
-	return lcd;
-
-    if (!XLC_PUBLIC_PART(lcd)->codeset ||
-	(_XlcCompareISOLatin1(XLC_PUBLIC_PART(lcd)->codeset, "SJIS"))) {
-	_XlcDestroyLC(lcd);
-	return (XLCd) NULL;
-    }
-
-    initCTptr(lcd);
-
-    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNCharSet, open_mbstocs);
-    _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNCharSet, open_wcstocs);
-    _XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNMultiByte, open_cstombs);
-    _XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNWideChar, open_cstowcs);
-    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNChar, open_mbtocs);
-
-#ifndef FORCE_INDIRECT_CONVERTER
-    _XlcSetConverter(lcd, XlcNCompoundText, lcd, XlcNMultiByte, open_ctstombs);
-    _XlcSetConverter(lcd, XlcNCompoundText, lcd, XlcNWideChar, open_ctstowcs);
-    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNCompoundText, open_mbstocts);
-    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNWideChar, open_mbstowcs);
-    _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNCompoundText, open_wcstocts);
-    _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNMultiByte, open_wcstombs);
-#endif
-
-
-    return lcd;
-}
-
-#else
-typedef int dummy;
-#endif /* X_LOCALE */
diff --git a/xc/lib/X11/lcStd.c b/xc/lib/X11/lcStd.c
deleted file mode 100644
index 7ef3b34f9..000000000
--- a/xc/lib/X11/lcStd.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/* $XConsortium: lcStd.c /main/5 1996/10/22 17:22:55 kaleb $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-/* $XFree86: xc/lib/X11/lcStd.c,v 1.3 1999/05/09 10:50:41 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "XlcPubI.h"
-
-int
-_Xlcmbtowc(lcd, wstr, str, len)
-    XLCd lcd;
-    wchar_t *wstr;
-    char *str;
-    int len;
-{
-    static XLCd last_lcd = NULL;
-    static XlcConv conv = NULL;
-    XPointer from, to;
-    int from_left, to_left;
-    wchar_t tmp_wc;
-
-    if (lcd == NULL) {
-	lcd = _XlcCurrentLC();
-	if (lcd == NULL)
-	    return -1;
-    }
-    if (str == NULL)
-	return XLC_PUBLIC(lcd, is_state_depend);
-
-    if (conv && lcd != last_lcd) {
-	_XlcCloseConverter(conv);
-	conv = NULL;
-    }
-
-    last_lcd = lcd;
-
-    if (conv == NULL) {
-	conv = _XlcOpenConverter(lcd, XlcNMultiByte, lcd, XlcNWideChar);
-	if (conv == NULL)
-	    return -1;
-    }
-
-    from = (XPointer) str;
-    from_left = len;
-    to = (XPointer) (wstr ? wstr : &tmp_wc);
-    to_left = 1;
-
-    if (_XlcConvert(conv, &from, &from_left, &to, &to_left, NULL, 0) < 0)
-	return -1;
-
-    return (len - from_left);
-}
-
-int
-_Xlcwctomb(lcd, str, wc)
-    XLCd lcd;
-    char *str;
-    wchar_t wc;
-{
-    static XLCd last_lcd = NULL;
-    static XlcConv conv = NULL;
-    XPointer from, to;
-    int from_left, to_left, length;
-
-    if (lcd == NULL) {
-	lcd = _XlcCurrentLC();
-	if (lcd == NULL)
-	    return -1;
-    }
-    if (str == NULL)
-	return XLC_PUBLIC(lcd, is_state_depend);
-
-    if (conv && lcd != last_lcd) {
-	_XlcCloseConverter(conv);
-	conv = NULL;
-    }
-
-    last_lcd = lcd;
-
-    if (conv == NULL) {
-	conv = _XlcOpenConverter(lcd, XlcNWideChar, lcd, XlcNMultiByte);
-	if (conv == NULL)
-	    return -1;
-    }
-
-    from = (XPointer) &wc;
-    from_left = 1;
-    to = (XPointer) str;
-    length = to_left = XLC_PUBLIC(lcd, mb_cur_max);
-
-    if (_XlcConvert(conv, &from, &from_left, &to, &to_left, NULL, 0) < 0)
-	return -1;
-
-    return (length - to_left);
-}
-
-int
-_Xlcmbstowcs(lcd, wstr, str, len)
-    XLCd lcd;
-    wchar_t *wstr;
-    char *str;
-    int len;
-{
-    XlcConv conv;
-    XPointer from, to;
-    int from_left, to_left, ret;
-
-    if (lcd == NULL) {
-	lcd = _XlcCurrentLC();
-	if (lcd == NULL)
-	    return -1;
-    }
-    
-    conv = _XlcOpenConverter(lcd, XlcNMultiByte, lcd, XlcNWideChar);
-    if (conv == NULL)
-	return -1;
-
-    from = (XPointer) str;
-    from_left = strlen(str);
-    to = (XPointer) wstr;
-    to_left = len;
-
-    if (_XlcConvert(conv, &from, &from_left, &to, &to_left, NULL, 0) < 0)
-	ret = -1;
-    else {
-	ret = len - to_left;
-	if (wstr && to_left > 0)
-	    wstr[ret] = (wchar_t) 0;
-    }
-
-    _XlcCloseConverter(conv);
-
-    return ret;
-}
-
-int
-_Xlcwcstombs(lcd, str, wstr, len)
-    XLCd lcd;
-    char *str;
-    wchar_t *wstr;
-    int len;
-{
-    XlcConv conv;
-    XPointer from, to;
-    int from_left, to_left, ret;
-
-    if (lcd == NULL) {
-	lcd = _XlcCurrentLC();
-	if (lcd == NULL)
-	    return -1;
-    }
-
-    conv = _XlcOpenConverter(lcd, XlcNWideChar, lcd, XlcNMultiByte);
-    if (conv == NULL)
-	return -1;
-
-    from = (XPointer) wstr;
-    from_left = _Xwcslen(wstr);
-    to = (XPointer) str;
-    to_left = len;
-
-    if (_XlcConvert(conv, &from, &from_left, &to, &to_left, NULL, 0) < 0)
-	ret = -1;
-    else {
-	ret = len - to_left;
-	if (str && to_left > 0)
-	    str[ret] = '\0';
-    }
-
-    _XlcCloseConverter(conv);
-
-    return ret;
-}
-
-
-int
-_Xmbtowc(wstr, str, len)
-    wchar_t *wstr;
-#ifdef ISC
-    char const *str;
-    size_t len;
-#else
-    char *str;
-    int len;
-#endif
-{
-    return _Xlcmbtowc((XLCd) NULL, wstr, str, len);
-}
-
-int
-_Xmblen(str, len)
-#ifdef ISC
-    char const *str;
-    size_t len;
-#else
-    char *str;
-    int len;
-#endif
-{
-    return _Xmbtowc((wchar_t *) NULL, str, len);
-}
-
-int
-_Xwctomb(str, wc)
-    char *str;
-    wchar_t wc;
-{
-    return _Xlcwctomb((XLCd) NULL, str, wc);
-}
-
-int
-_Xmbstowcs(wstr, str, len)
-    wchar_t *wstr;
-    char *str;
-    int len;
-{
-    return _Xlcmbstowcs((XLCd) NULL, wstr, str, len);
-}
-
-int
-_Xwcstombs(str, wstr, len)
-    char *str;
-    wchar_t *wstr;
-    int len;
-{
-    return _Xlcwcstombs((XLCd) NULL, str, wstr, len);
-}
-
-wchar_t *
-_Xwcscpy(wstr1, wstr2)
-    register wchar_t *wstr1, *wstr2;
-{
-    wchar_t *wstr_tmp = wstr1;
-
-    while ((*wstr1++ = *wstr2++))
-	;
-
-    return wstr_tmp;
-}
-
-wchar_t *
-_Xwcsncpy(wstr1, wstr2, len)
-    register wchar_t *wstr1, *wstr2;
-    register int len;
-{
-    wchar_t *wstr_tmp = wstr1;
-
-    while (len-- > 0)
-	if (!(*wstr1++ = *wstr2++))
-	    break;
-
-    while (len-- > 0)
-	*wstr1++ = (wchar_t) 0;
-
-    return wstr_tmp;
-}
-
-int
-_Xwcslen(wstr)
-    register wchar_t *wstr;
-{
-    register wchar_t *wstr_ptr = wstr;
-
-    while (*wstr_ptr)
-	wstr_ptr++;
-    
-    return wstr_ptr - wstr;
-}
-
-int
-_Xwcscmp(wstr1, wstr2)
-    register wchar_t *wstr1, *wstr2;
-{
-    for ( ; *wstr1 && *wstr2; wstr1++, wstr2++)
-	if (*wstr1 != *wstr2)
-	    break;
-
-    return *wstr1 - *wstr2;
-}
-
-int
-_Xwcsncmp(wstr1, wstr2, len)
-    register wchar_t *wstr1, *wstr2;
-    register int len;
-{
-    for ( ; *wstr1 && *wstr2 && len > 0; wstr1++, wstr2++, len--)
-	if (*wstr1 != *wstr2)
-	    break;
-
-    if (len <= 0)
-	return 0;
-
-    return *wstr1 - *wstr2;
-}
diff --git a/xc/lib/X11/lcTxtPr.c b/xc/lib/X11/lcTxtPr.c
deleted file mode 100644
index ec6ee49dd..000000000
--- a/xc/lib/X11/lcTxtPr.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/* $XConsortium: lcTxtPr.c /main/7 1996/10/22 17:21:47 kaleb $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-
-#include "Xlibint.h"
-#include "XlcPubI.h"
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-#include <stdio.h>
-
-static int
-get_buf_size(is_wide_char, list, count)
-    Bool is_wide_char;
-    XPointer list;
-    int count;
-{
-    register int length = 0;
-    register char **mb_list;
-    register wchar_t **wc_list;
-
-    if (list == NULL)
-	return 0;
-
-    if (is_wide_char) {
-	wc_list = (wchar_t **) list;
-	for ( ; count-- > 0; wc_list++) {
-	    if (*wc_list)
-		length += _Xwcslen(*wc_list) + 1;
-	}
-	length *= 5;	/* XXX */
-    } else {
-	mb_list = (char **) list;
-	for ( ; count-- > 0; mb_list++) {
-	    if (*mb_list)
-		length += strlen(*mb_list) + 1;
-	}
-	length *= 3;	/* XXX */
-    }
-    length = (length / BUFSIZ + 1) * BUFSIZ;	/* XXX */
-
-    return length;
-}
-
-static int
-_XTextListToTextProperty(lcd, dpy, from_type, list, count, style, text_prop)
-    XLCd lcd;
-    Display *dpy;
-    char *from_type;
-    XPointer list;
-    int count;
-    XICCEncodingStyle style;
-    XTextProperty *text_prop;
-{
-    Atom encoding;
-    XlcConv conv;
-    char *to_type;
-    char **mb_list;
-    wchar_t **wc_list;
-    XPointer from;
-    char *to, *buf, *value;
-    int from_left, to_left, buf_len, nitems, unconv_num, ret, i;
-    Bool is_wide_char = False;
-
-    if (strcmp(XlcNWideChar, from_type) == 0)
-	is_wide_char = True;
-
-    buf_len = get_buf_size(is_wide_char, list, count);
-    if ((buf = (char *) Xmalloc(buf_len)) == NULL)
-	return XNoMemory;
-    
-    switch (style) {
-	case XStringStyle:
-	case XStdICCTextStyle:
-	    encoding = XA_STRING;
-	    to_type = XlcNString;
-	    break;
-	case XCompoundTextStyle:
-	    encoding = XInternAtom(dpy, "COMPOUND_TEXT", False);
-	    to_type = XlcNCompoundText;
-	    break;
-	case XTextStyle:
-	    encoding = XInternAtom(dpy, XLC_PUBLIC(lcd, encoding_name), False);
-	    to_type = XlcNMultiByte;
-	    if (is_wide_char == False) {
-		nitems = 0;
-		mb_list = (char **) list;
-		to = buf;
-		for (i = 0; i < count && buf_len > 0; i++) {
-		    if (*mb_list) 
-			strcpy(to, *mb_list);
-		    else
-			*to = '\0';
-		    from_left = (*mb_list ? strlen(*mb_list) : 0) + 1;
-		    nitems += from_left;
-		    to += from_left;
-		    mb_list++;
-		}
-		unconv_num = 0;
-		goto done;
-	    }
-	    break;
-	default:
-	    Xfree(buf);
-	    return XConverterNotFound;
-    }
-
-    if (count < 1) {
-	nitems = 0;
-	goto done;
-    }
-
-retry:
-    conv = _XlcOpenConverter(lcd, from_type, lcd, to_type);
-    if (conv == NULL) {
-	Xfree(buf);
-	return XConverterNotFound;
-    }
-
-    if (is_wide_char)
-	wc_list = (wchar_t **) list;
-    else
-	mb_list = (char **) list;
-
-    to = buf;
-    to_left = buf_len;
-
-    unconv_num = 0;
-
-    for (i = 1; to_left > 0; i++) {
-	if (is_wide_char) {
-	    from = (XPointer) *wc_list;
-	    from_left = _Xwcslen(*wc_list);
-	    wc_list++;
-	} else {
-	    from = (XPointer) *mb_list;
-	    from_left = (*mb_list ? strlen(*mb_list) : 0);
-	    mb_list++;
-	}
-
-	ret = _XlcConvert(conv, &from, &from_left, (XPointer *) &to, &to_left,
-			  NULL, 0);
-
-	if (ret < 0)
-	    continue;
-
-	if (ret > 0 && style == XStdICCTextStyle && encoding == XA_STRING) {
-	    _XlcCloseConverter(conv);
-	    encoding = XInternAtom(dpy, "COMPOUND_TEXT", False);
-	    to_type = XlcNCompoundText;
-	    goto retry;
-	}
-
-	unconv_num += ret;
-	*to++ = '\0';
-	to_left--;
-
-	if (i >= count)
-	    break;
-
-	_XlcResetConverter(conv);
-    }
-
-    _XlcCloseConverter(conv);
-
-    nitems = to - buf;
-done:
-    if (nitems <= 0)
-	nitems = 1;
-    value = (char *) Xmalloc(nitems);
-    if (value == NULL) {
-	Xfree(buf);
-	return XNoMemory;
-    }
-    if (nitems == 1)
-	*value = 0;
-    else
-    	memcpy(value, buf, nitems);
-    nitems--;
-    Xfree(buf);
-
-    text_prop->value = (unsigned char *) value;
-    text_prop->encoding = encoding;
-    text_prop->format = 8;
-    text_prop->nitems = nitems;
-
-    return unconv_num;
-}
-
-int
-_XmbTextListToTextProperty(lcd, dpy, list, count, style, text_prop)
-    XLCd lcd;
-    Display *dpy;
-    char **list;
-    int count;
-    XICCEncodingStyle style;
-    XTextProperty *text_prop;
-{
-    return _XTextListToTextProperty(lcd, dpy, XlcNMultiByte, (XPointer) list,
-				    count, style, text_prop);
-}
-
-int
-_XwcTextListToTextProperty(lcd, dpy, list, count, style, text_prop)
-    XLCd lcd;
-    Display *dpy;
-    wchar_t **list;
-    int count;
-    XICCEncodingStyle style;
-    XTextProperty *text_prop;
-{
-    return _XTextListToTextProperty(lcd, dpy, XlcNWideChar, (XPointer) list,
-				    count, style, text_prop);
-}
diff --git a/xc/lib/X11/lcUTF8.c b/xc/lib/X11/lcUTF8.c
deleted file mode 100644
index 65d81793a..000000000
--- a/xc/lib/X11/lcUTF8.c
+++ /dev/null
@@ -1,1533 +0,0 @@
-/* $TOG:  $ */
-/******************************************************************
-
-              Copyright 1993 by SunSoft, Inc.
-              Copyright 1999-2000 by Bruno Haible
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the names of SunSoft, Inc. and
-Bruno Haible not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.  SunSoft, Inc. and Bruno Haible make no representations
-about the suitability of this software for any purpose.  It is
-provided "as is" without express or implied warranty.
-
-SunSoft Inc. AND Bruno Haible DISCLAIM ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL SunSoft, Inc. OR Bruno Haible BE LIABLE
-FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-******************************************************************/
-/* $XFree86: xc/lib/X11/lcUTF8.c,v 1.1 2000/02/12 02:54:15 dawes Exp $ */
-
-/*
- * This file contains:
- *
- * I. Conversion routines CompoundText/CharSet <--> Unicode/UTF-8.
- *
- *    Used for two purposes:
- *      1. The UTF-8 locales, see below.
- *      2. Unicode aware applications for which the use of 8-bit character
- *         sets is an anachronism.
- *
- * II. An UTF-8 locale loader.
- *     Supports: all locales with codeset UTF-8.
- *     How: Provides converters for UTF-8.
- *     Platforms: all systems.
- */
-
-/*
- * The conversion from UTF-8 to CompoundText is realized in a very
- * conservative way. Recall that CompoundText data is used for inter-client
- * communication purposes. We distinguish three classes of clients:
- * - Clients which accept only those pieces of CompoundText which belong to
- *   the character set understood by the current locale.
- *   (Example: clients which are linked to an older X11 library.)
- * - Clients which accept CompoundText with multiple character sets and parse
- *   it themselves.
- *   (Example: emacs, xemacs.)
- * - Clients which rely entirely on the X{mb,wc}TextPropertyToTextList
- *   functions for the conversion of CompoundText to their current locale's
- *   multi-byte/wide-character format.
- * For best interoperation, the UTF-8 to CompoundText conversion proceeds as
- * follows. For every character, it first tests whether the character is
- * representable in the current locale's original (non-UTF-8) character set.
- * If not, it goes through the list of predefined character sets for
- * CompoundText and tests if the character is representable in that character
- * set. If so, it encodes the character using its code within that character
- * set. If not, it uses an UTF-8-in-CompoundText encapsulation. Since
- * clients of the first and second kind ignore such encapsulated text,
- * this encapsulation is kept to a minimum and terminated as early as possible.
- *
- * In a distant future, when clients of the first and second kind will have
- * disappeared, we will be able to stuff UTF-8 data directly in CompoundText
- * without first going through the list of predefined character sets.
- */
-
-#include "Xlibint.h"
-#include "XlcPubI.h"
-#include "XlcGeneric.h"
-
-static XlcConv
-create_conv(lcd, methods)
-    XLCd lcd;
-    XlcConvMethods methods;
-{
-    XlcConv conv;
-
-    conv = (XlcConv) Xmalloc(sizeof(XlcConvRec));
-    if (conv == (XlcConv) NULL)
-	return (XlcConv) NULL;
-
-    conv->methods = methods;
-    conv->state = NULL;
-
-    return conv;
-}
-
-static void
-close_converter(conv)
-    XlcConv conv;
-{
-    Xfree((char *) conv);
-}
-
-/* Replacement character for invalid multibyte sequence or wide character. */
-#define BAD_WCHAR ((wchar_t) 0xfffd)
-#define BAD_CHAR '?'
-
-/***************************************************************************/
-/* Part I: Conversion routines CompoundText/CharSet <--> Unicode/UTF-8.
- *
- * Note that this code works in any locale. We store Unicode values in
- * `wchar_t' variables, but don't pass them to the user.
- *
- * This code has to support all character sets that are used for CompoundText,
- * nothing more, nothing less. See the table in lcCT.c.
- * Since the conversion _to_ CompoundText is likely to need the tables for all
- * character sets at once, we don't use dynamic loading (of tables or shared
- * libraries through iconv()). Use a fixed set of tables instead.
- *
- * We use statically computed tables, not dynamically allocated arrays,
- * because it's more memory efficient: Different processes using the same
- * libX11 shared library share the "text" and read-only "data" sections.
- */
-
-typedef wchar_t original_wchar_t;
-#define wchar_t unsigned int
-#define conv_t XlcConv
-
-typedef struct _Utf8ConvRec {
-    char *name;
-#if NeedFunctionPrototypes
-    int (* cstowc) (XlcConv, wchar_t *, unsigned char const *, int);
-#else
-    int (* cstowc) ();
-#endif
-#if NeedFunctionPrototypes
-    int (* wctocs) (XlcConv, unsigned char *, wchar_t, int);
-#else
-    int (* wctocs) ();
-#endif
-} Utf8ConvRec, *Utf8Conv;
-
-/*
- * int xxx_cstowc (XlcConv conv, wchar_t *pwc, unsigned char const *s, int n)
- * converts the byte sequence starting at s to a wide character. Up to n bytes
- * are available at s. n is >= 1.
- * Result is number of bytes consumed, or -1 if invalid, or 0 if n too small.
- *
- * int xxx_wctocs (XlcConv conv, unsigned char *r, wchar_t wc, int n)
- * converts the wide character wc to the character set xxx, and stores the
- * result beginning at r. Up to n bytes may be written at r. n is >= 1.
- * Result is number of bytes written, or -1 if invalid, or 0 if n too small.
- */
-
-/* Return code if invalid. (xxx_mbtowc, xxx_wctomb) */
-#define RET_ILSEQ      0
-/* Return code if only a shift sequence of n bytes was read. (xxx_mbtowc) */
-#define RET_TOOFEW(n)  (-1-(n))
-/* Return code if output buffer is too small. (xxx_wctomb, xxx_reset) */
-#define RET_TOOSMALL   -1
-
-/*
- * The tables below are bijective. It would be possible to extend the
- * xxx_wctocs tables to do some transliteration (e.g. U+201C,U+201D -> 0x22)
- * but *only* with characters not contained in any other table, and *only*
- * when the current locale is not an UTF-8 locale.
- */
-
-#ifdef notused
-#include "lcUniConv/ascii.h"
-#endif
-#include "lcUniConv/iso8859_1.h"
-#include "lcUniConv/iso8859_2.h"
-#include "lcUniConv/iso8859_3.h"
-#include "lcUniConv/iso8859_4.h"
-#include "lcUniConv/iso8859_5.h"
-#include "lcUniConv/iso8859_6.h"
-#include "lcUniConv/iso8859_7.h"
-#include "lcUniConv/iso8859_8.h"
-#include "lcUniConv/iso8859_9.h"
-#include "lcUniConv/iso8859_10.h"
-#include "lcUniConv/iso8859_14.h"
-#include "lcUniConv/iso8859_15.h"
-#include "lcUniConv/iso8859_16.h"
-#include "lcUniConv/jisx0201.h"
-#include "lcUniConv/tis620.h"
-#include "lcUniConv/koi8_r.h"
-#include "lcUniConv/koi8_u.h"
-#include "lcUniConv/armscii_8.h"
-#include "lcUniConv/cp1133.h"
-#include "lcUniConv/mulelao.h"
-#include "lcUniConv/viscii.h"
-#include "lcUniConv/tcvn.h"
-#include "lcUniConv/georgian_academy.h"
-#include "lcUniConv/georgian_ps.h"
-
-typedef struct {
-    unsigned short indx; /* index into big table */
-    unsigned short used; /* bitmask of used entries */
-} Summary16;
-
-#include "lcUniConv/gb2312.h"
-#include "lcUniConv/jisx0208.h"
-#include "lcUniConv/jisx0212.h"
-#include "lcUniConv/ksc5601.h"
-#ifdef notdef
-#include "lcUniConv/big5.h"
-#endif
-
-static Utf8ConvRec all_charsets[] = {
-    { "ISO8859-1",
-	iso8859_1_mbtowc, iso8859_1_wctomb
-    },
-    { "ISO8859-2",
-	iso8859_2_mbtowc, iso8859_2_wctomb
-    },
-    { "ISO8859-3",
-	iso8859_3_mbtowc, iso8859_3_wctomb
-    },
-    { "ISO8859-4",
-	iso8859_4_mbtowc, iso8859_4_wctomb
-    },
-    { "ISO8859-5",
-	iso8859_5_mbtowc, iso8859_5_wctomb
-    },
-    { "ISO8859-6",
-	iso8859_6_mbtowc, iso8859_6_wctomb
-    },
-    { "ISO8859-7",
-	iso8859_7_mbtowc, iso8859_7_wctomb
-    },
-    { "ISO8859-8",
-	iso8859_8_mbtowc, iso8859_8_wctomb
-    },
-    { "ISO8859-9",
-	iso8859_9_mbtowc, iso8859_9_wctomb
-    },
-    { "ISO8859-10",
-	iso8859_10_mbtowc, iso8859_10_wctomb
-    },
-    { "ISO8859-14",
-	iso8859_14_mbtowc, iso8859_14_wctomb
-    },
-    { "ISO8859-15",
-	iso8859_15_mbtowc, iso8859_15_wctomb
-    },
-    { "ISO8859-16",
-	iso8859_16_mbtowc, iso8859_16_wctomb
-    },
-    { "JISX0201.1976-0",
-	jisx0201_mbtowc, jisx0201_wctomb
-    },
-    { "GB2312.1980-0",
-	gb2312_mbtowc, gb2312_wctomb
-    },
-    { "JISX0208.1983-0",
-	jisx0208_mbtowc, jisx0208_wctomb
-    },
-    { "JISX0212.1990-0",
-	jisx0212_mbtowc, jisx0212_wctomb
-    },
-    { "KSC5601.1987-0",
-	ksc5601_mbtowc, ksc5601_wctomb
-    },
-    { "TIS620.2533-1",
-	tis620_mbtowc, tis620_wctomb
-    },
-    { "KOI8-R",
-	koi8_r_mbtowc, koi8_r_wctomb
-    },
-    { "KOI8-U",
-	koi8_u_mbtowc, koi8_u_wctomb
-    },
-    { "ARMSCII-8",
-	armscii_8_mbtowc, armscii_8_wctomb
-    },
-    { "IBM-CP1133",
-	cp1133_mbtowc, cp1133_wctomb
-    },
-    { "MULELAO-1",
-	mulelao_mbtowc, mulelao_wctomb
-    },
-    { "VISCII1.1-1",
-	viscii_mbtowc, viscii_wctomb
-    },
-    { "TCVN-5712",
-	tcvn_mbtowc, tcvn_wctomb
-    },
-    { "GEORGIAN-ACADEMY",
-	georgian_academy_mbtowc, georgian_academy_wctomb
-    },
-    { "GEORGIAN-PS",
-	georgian_ps_mbtowc, georgian_ps_wctomb
-    },
-#ifdef notdef
-    { "BIG-5",
-	big5_mbtowc, big5_wctomb
-    },
-#endif
-};
-
-#define all_charsets_count (sizeof(all_charsets)/sizeof(all_charsets[0]))
-
-/*
- * UTF-8 itself
- */
-
-static int
-utf8_cstowc(pwc, src, n)
-    wchar_t *pwc;
-    unsigned char const *src;
-    int n;
-{
-    unsigned char c = src[0];
-
-    if (c < 0x80) {
-	*pwc = c;
-	return 1;
-    } else if (c < 0xc2) {
-	return -1;
-    } else if (c < 0xe0) {
-	if (n < 2)
-	    return 0;
-	if (!((src[1] ^ 0x80) < 0x40))
-	    return -1;
-	*pwc = ((wchar_t) (c & 0x1f) << 6)
-	       | (wchar_t) (src[1] ^ 0x80);
-	return 2;
-    } else if (c < 0xf0) {
-	if (n < 3)
-	    return 0;
-	if (!((src[1] ^ 0x80) < 0x40 && (src[2] ^ 0x80) < 0x40
-              && (c >= 0xe1 || src[1] >= 0xa0)))
-	    return -1;
-	*pwc = ((wchar_t) (c & 0x0f) << 12)
-	       | ((wchar_t) (src[1] ^ 0x80) << 6)
-	       | (wchar_t) (src[2] ^ 0x80);
-	return 3;
-    } else if (c < 0xf8 && sizeof(wchar_t)*8 >= 32) {
-	if (n < 4)
-	    return 0;
-	if (!((src[1] ^ 0x80) < 0x40 && (src[2] ^ 0x80) < 0x40
-	      && (src[3] ^ 0x80) < 0x40
-              && (c >= 0xf1 || src[1] >= 0x90)))
-	    return -1;
-	*pwc = ((wchar_t) (c & 0x07) << 18)
-	       | ((wchar_t) (src[1] ^ 0x80) << 12)
-	       | ((wchar_t) (src[2] ^ 0x80) << 6)
-	       | (wchar_t) (src[3] ^ 0x80);
-	return 4;
-    } else if (c < 0xfc && sizeof(wchar_t)*8 >= 32) {
-	if (n < 5)
-	    return 0;
-	if (!((src[1] ^ 0x80) < 0x40 && (src[2] ^ 0x80) < 0x40
-	      && (src[3] ^ 0x80) < 0x40 && (src[4] ^ 0x80) < 0x40
-              && (c >= 0xf9 || src[1] >= 0x88)))
-	    return -1;
-	*pwc = ((wchar_t) (c & 0x03) << 24)
-	       | ((wchar_t) (src[1] ^ 0x80) << 18)
-	       | ((wchar_t) (src[2] ^ 0x80) << 12)
-	       | ((wchar_t) (src[3] ^ 0x80) << 6)
-	       | (wchar_t) (src[4] ^ 0x80);
-	return 5;
-    } else if (c < 0xfe && sizeof(wchar_t)*8 >= 32) {
-	if (n < 6)
-	    return 0;
-	if (!((src[1] ^ 0x80) < 0x40 && (src[2] ^ 0x80) < 0x40
-	      && (src[3] ^ 0x80) < 0x40 && (src[4] ^ 0x80) < 0x40
-	      && (src[5] ^ 0x80) < 0x40
-              && (c >= 0xfd || src[1] >= 0x84)))
-	    return -1;
-	*pwc = ((wchar_t) (c & 0x01) << 30)
-	       | ((wchar_t) (src[1] ^ 0x80) << 24)
-	       | ((wchar_t) (src[2] ^ 0x80) << 18)
-	       | ((wchar_t) (src[3] ^ 0x80) << 12)
-	       | ((wchar_t) (src[4] ^ 0x80) << 6)
-	       | (wchar_t) (src[5] ^ 0x80);
-	return 6;
-    } else
-	return -1;
-}
-
-static int
-utf8_wctocs(r, wc, n)
-    unsigned char *r;
-    wchar_t wc;
-    int n; /* n == 0 is acceptable */
-{
-    int count;
-    if ((unsigned int) wc < 0x80)
-	count = 1;
-    else if ((unsigned int) wc < 0x800)
-	count = 2;
-    else if ((unsigned int) wc < 0x10000)
-	count = 3;
-    else if ((unsigned int) wc < 0x200000)
-	count = 4;
-    else if ((unsigned int) wc < 0x4000000)
-	count = 5;
-    else if ((unsigned int) wc <= 0x7fffffff)
-	count = 6;
-    else
-	return -1;
-    if (n < count)
-	return 0;
-    switch (count) { /* note: code falls through cases! */
-	case 6: r[5] = 0x80 | (wc & 0x3f); wc = wc >> 6; wc |= 0x4000000;
-	case 5: r[4] = 0x80 | (wc & 0x3f); wc = wc >> 6; wc |= 0x200000;
-	case 4: r[3] = 0x80 | (wc & 0x3f); wc = wc >> 6; wc |= 0x10000;
-	case 3: r[2] = 0x80 | (wc & 0x3f); wc = wc >> 6; wc |= 0x800;
-	case 2: r[1] = 0x80 | (wc & 0x3f); wc = wc >> 6; wc |= 0xc0;
-	case 1: r[0] = wc;
-    }
-    return count;
-}
-
-/* from XlcNCharSet to XlcNUtf8String */
-
-static int
-cstoutf8(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    XlcCharSet charset;
-    char *name;
-    Utf8Conv convptr;
-    int i;
-    unsigned char const *src;
-    unsigned char const *srcend;
-    unsigned char *dst;
-    unsigned char *dstend;
-    int unconv_num;
-
-    if (from == NULL || *from == NULL)
-	return 0;
-
-    if (num_args < 1)
-	return -1;
-
-    charset = (XlcCharSet) args[0];
-    name = charset->encoding_name;
-    /* not charset->name because the latter has a ":GL"/":GR" suffix */
-
-    for (convptr = all_charsets, i = all_charsets_count; i > 0; convptr++, i--)
-	if (!strcmp(convptr->name, name))
-	    break;
-    if (i == 0)
-	return -1;
-
-    src = (unsigned char const *) *from;
-    srcend = src + *from_left;
-    dst = (unsigned char *) *to;
-    dstend = dst + *to_left;
-    unconv_num = 0;
-
-    while (src < srcend) {
-	wchar_t wc;
-	int consumed;
-	int count;
-
-	consumed = convptr->cstowc(conv, &wc, src, srcend-src);
-	if (consumed < 0)
-	    return -1;
-	if (consumed == 0)
-	    break;
-
-	count = utf8_wctocs(dst, wc, dstend-dst);
-	if (count == 0)
-	    break;
-	if (count < 0) {
-	    count = utf8_wctocs(dst, BAD_WCHAR, dstend-dst);
-	    if (count == 0)
-		break;
-	    unconv_num++;
-	}
-	src += consumed;
-	dst += count;
-    }
-
-    *from = (XPointer) src;
-    *from_left = srcend - src;
-    *to = (XPointer) dst;
-    *to_left = dstend - dst;
-
-    return unconv_num;
-}
-
-static XlcConvMethodsRec methods_cstoutf8 = {
-    close_converter,
-    cstoutf8,
-    NULL
-};
-
-static XlcConv
-open_cstoutf8(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &methods_cstoutf8);
-}
-
-/* from XlcNUtf8String to XlcNCharSet */
-
-static XlcConv
-create_tocs_conv(lcd, methods)
-    XLCd lcd;
-    XlcConvMethods methods;
-{
-    XlcConv conv;
-    CodeSet *codeset_list;
-    int codeset_num;
-    int charset_num;
-    int i, j, k;
-    Utf8Conv *preferred;
-
-    conv = (XlcConv) Xmalloc(sizeof(XlcConvRec));
-    if (conv == (XlcConv) NULL)
-	return (XlcConv) NULL;
-
-    codeset_list = XLC_GENERIC(lcd, codeset_list);
-    codeset_num = XLC_GENERIC(lcd, codeset_num);
-
-    charset_num = 0;
-    for (i = 0; i < codeset_num; i++)
-	charset_num += codeset_list[i]->num_charsets;
-    if (charset_num > all_charsets_count)
-	charset_num = all_charsets_count;
-    preferred = (Utf8Conv *) Xmalloc((charset_num + 1) * sizeof(Utf8Conv));
-    if (preferred == (Utf8Conv *) NULL) {
-	Xfree((char *) conv);
-	return (XlcConv) NULL;
-    }
-
-    /* Loop through all codesets mentioned in the locale. */
-    charset_num = 0;
-    for (i = 0; i < codeset_num; i++) {
-	XlcCharSet *charsets = codeset_list[i]->charset_list;
-	int num_charsets = codeset_list[i]->num_charsets;
-	for (j = 0; j < num_charsets; j++) {
-	    char *name = charsets[j]->encoding_name;
-	    /* If it wasn't already encountered... */
-	    for (k = charset_num-1; k >= 0; k--)
-		if (!strcmp(preferred[k]->name, name))
-		    break;
-	    if (k < 0) {
-		/* Look it up in all_charsets[]. */
-		for (k = 0; k < all_charsets_count; k++)
-		    if (!strcmp(all_charsets[k].name, name)) {
-			/* Add it to the preferred set. */
-			preferred[charset_num++] = &all_charsets[k];
-			break;
-		    }
-	    }
-	}
-    }
-    preferred[charset_num] = (Utf8Conv) NULL;
-
-    conv->methods = methods;
-    conv->state = (XPointer) preferred;
-
-    return conv;
-}
-
-static void
-close_tocs_converter(conv)
-    XlcConv conv;
-{
-    Xfree((char *) conv);
-}
-
-/*
- * Converts a Unicode character to an appropriate character set. The NULL
- * terminated array of preferred character sets is passed as first argument.
- * If successful, *charsetp is set to the character set that was used.
- */
-static int
-charset_wctocs(preferred, charsetp, conv, r, wc, n)
-    Utf8Conv *preferred;
-    Utf8Conv *charsetp;
-    XlcConv conv;
-    unsigned char *r;
-    wchar_t wc;
-    int n;
-{
-    int count;
-    Utf8Conv convptr;
-    int i;
-
-    while (*preferred != (Utf8Conv) NULL) {
-	convptr = *preferred;
-	count = convptr->wctocs(conv, r, wc, n);
-	if (count == 0)
-	    return 0;
-	if (count > 0) {
-	    *charsetp = convptr;
-	    return count;
-	}
-    }
-    for (convptr = all_charsets, i = all_charsets_count; i > 0; convptr++, i--) {
-	count = convptr->wctocs(conv, r, wc, n);
-	if (count == 0)
-	    return 0;
-	if (count > 0) {
-	    *charsetp = convptr;
-	    return count;
-	}
-    }
-    return -1;
-}
-
-static int
-utf8tocs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    Utf8Conv *preferred_charsets;
-    Utf8Conv last_charset = NULL;
-    unsigned char const *src;
-    unsigned char const *srcend;
-    unsigned char *dst;
-    unsigned char *dstend;
-    int unconv_num;
-
-    if (from == NULL || *from == NULL)
-	return 0;
-
-    preferred_charsets = (Utf8Conv *) conv->state;
-    src = (unsigned char const *) *from;
-    srcend = src + *from_left;
-    dst = (unsigned char *) *to;
-    dstend = dst + *to_left;
-    unconv_num = 0;
-
-    while (src < srcend && dst < dstend) {
-	Utf8Conv chosen_charset = NULL; /* FIXME: side */
-	wchar_t wc;
-	int consumed;
-	int count;
-
-	consumed = utf8_cstowc(&wc, src, srcend-src);
-	if (consumed == 0)
-	    break;
-	if (consumed < 0) {
-	    src++;
-	    unconv_num++;
-	    continue;
-	}
-
-	count = charset_wctocs(preferred_charsets, &chosen_charset, conv, dst, wc, dstend-dst);
-	if (count == 0)
-	    break;
-	if (count < 0) {
-	    src += consumed;
-	    unconv_num++;
-	    continue;
-	}
-
-	if (last_charset != NULL && chosen_charset != last_charset)
-	    break;
-	src += consumed;
-	dst += count;
-	last_charset = chosen_charset;
-    }
-
-    if (last_charset == NULL)
-	return -1;
-
-    *from = (XPointer) src;
-    *from_left = srcend - src;
-    *to = (XPointer) dst;
-    *to_left = dstend - dst;
-
-    if (num_args >= 1)
-	*((XlcCharSet *)args[0]) = _XlcGetCharSet(last_charset->name);
-
-    return unconv_num;
-}
-
-static XlcConvMethodsRec methods_utf8tocs = {
-    close_tocs_converter,
-    utf8tocs,
-    NULL
-};
-
-static XlcConv
-open_utf8tocs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_tocs_conv(from_lcd, &methods_utf8tocs);
-}
-
-/* from XlcNUtf8String to XlcNChar */
-
-static int
-utf8tocs1(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    Utf8Conv *preferred_charsets;
-    Utf8Conv last_charset = NULL;
-    unsigned char const *src;
-    unsigned char const *srcend;
-    unsigned char *dst;
-    unsigned char *dstend;
-    int unconv_num;
-
-    if (from == NULL || *from == NULL)
-	return 0;
-
-    preferred_charsets = (Utf8Conv *) conv->state;
-    src = (unsigned char const *) *from;
-    srcend = src + *from_left;
-    dst = (unsigned char *) *to;
-    dstend = dst + *to_left;
-    unconv_num = 0;
-
-    while (src < srcend && dst < dstend) {
-	Utf8Conv chosen_charset = NULL; /* FIXME: side */
-	wchar_t wc;
-	int consumed;
-	int count;
-
-	consumed = utf8_cstowc(&wc, src, srcend-src);
-	if (consumed == 0)
-	    break;
-	if (consumed < 0) {
-	    src++;
-	    unconv_num++;
-	    continue;
-	}
-
-	count = charset_wctocs(preferred_charsets, &chosen_charset, conv, dst, wc, dstend-dst);
-	if (count == 0)
-	    break;
-	if (count < 0) {
-	    src += consumed;
-	    unconv_num++;
-	    continue;
-	}
-
-	if (last_charset != NULL && chosen_charset != last_charset)
-	    break;
-	src += consumed;
-	dst += count;
-	last_charset = chosen_charset;
-	break;
-    }
-
-    if (last_charset == NULL)
-	return -1;
-
-    *from = (XPointer) src;
-    *from_left = srcend - src;
-    *to = (XPointer) dst;
-    *to_left = dstend - dst;
-
-    if (num_args >= 1)
-	*((XlcCharSet *)args[0]) = _XlcGetCharSet(last_charset->name);
-
-    return unconv_num;
-}
-
-static XlcConvMethodsRec methods_utf8tocs1 = {
-    close_tocs_converter,
-    utf8tocs1,
-    NULL
-};
-
-static XlcConv
-open_utf8tocs1(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_tocs_conv(from_lcd, &methods_utf8tocs1);
-}
-
-/* from XlcNUtf8String to XlcNString */
-
-static int
-utf8tostr(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    unsigned char const *src;
-    unsigned char const *srcend;
-    unsigned char *dst;
-    unsigned char *dstend;
-    int unconv_num;
-
-    if (from == NULL || *from == NULL)
-	return 0;
-
-    src = (unsigned char const *) *from;
-    srcend = src + *from_left;
-    dst = (unsigned char *) *to;
-    dstend = dst + *to_left;
-    unconv_num = 0;
-
-    while (src < srcend) {
-	unsigned char c;
-	wchar_t wc;
-	int consumed;
-
-	consumed = utf8_cstowc(&wc, src, srcend-src);
-	if (consumed == 0)
-	    break;
-	if (dst == dstend)
-	    break;
-	if (consumed < 0) {
-	    consumed = 1;
-	    c = BAD_CHAR;
-	    unconv_num++;
-	} else {
-	    if ((wc & ~(wchar_t)0xff) != 0) {
-		c = BAD_CHAR;
-		unconv_num++;
-	    } else
-		c = (unsigned char) wc;
-	}
-	*dst++ = c;
-	src += consumed;
-    }
-
-    *from = (XPointer) src;
-    *from_left = srcend - src;
-    *to = (XPointer) dst;
-    *to_left = dstend - dst;
-
-    return unconv_num;
-}
-
-static XlcConvMethodsRec methods_utf8tostr = {
-    close_converter,
-    utf8tostr,
-    NULL
-};
-
-static XlcConv
-open_utf8tostr(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &methods_utf8tostr);
-}
-
-/* from XlcNString to XlcNUtf8String */
-
-static int
-strtoutf8(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    unsigned char const *src;
-    unsigned char const *srcend;
-    unsigned char *dst;
-    unsigned char *dstend;
-
-    if (from == NULL || *from == NULL)
-	return 0;
-
-    src = (unsigned char const *) *from;
-    srcend = src + *from_left;
-    dst = (unsigned char *) *to;
-    dstend = dst + *to_left;
-
-    while (src < srcend) {
-	int count = utf8_wctocs(dst, *src, dstend-dst);
-	if (count == 0)
-	    break;
-	dst += count;
-	src++;
-    }
-
-    *from = (XPointer) src;
-    *from_left = srcend - src;
-    *to = (XPointer) dst;
-    *to_left = dstend - dst;
-
-    return 0;
-}
-
-static XlcConvMethodsRec methods_strtoutf8 = {
-    close_converter,
-    strtoutf8,
-    NULL
-};
-
-static XlcConv
-open_strtoutf8(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &methods_strtoutf8);
-}
-
-/* Registers UTF-8 converters for a non-UTF-8 locale. */
-void
-_XlcAddUtf8Converters(lcd)
-    XLCd lcd;
-{
-    _XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNUtf8String, open_cstoutf8);
-    _XlcSetConverter(lcd, XlcNUtf8String, lcd, XlcNCharSet, open_utf8tocs);
-    _XlcSetConverter(lcd, XlcNUtf8String, lcd, XlcNChar, open_utf8tocs1);
-    _XlcSetConverter(lcd, XlcNString, lcd, XlcNUtf8String, open_strtoutf8);
-    _XlcSetConverter(lcd, XlcNUtf8String, lcd, XlcNString, open_utf8tostr);
-}
-
-#undef wchar_t
-#define wchar_t original_wchar_t
-
-/***************************************************************************/
-/* Part II: An UTF-8 locale loader.
- *
- * Here we can assume that "multi-byte" is UTF-8 and that `wchar_t' is Unicode.
- */
-
-/* from XlcNMultiByte to XlcNWideChar */
-
-static int
-utf8towcs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    unsigned char const *src;
-    unsigned char const *srcend;
-    wchar_t *dst;
-    wchar_t *dstend;
-    int unconv_num;
-
-    if (from == NULL || *from == NULL)
-	return 0;
-
-    src = (unsigned char const *) *from;
-    srcend = src + *from_left;
-    dst = (wchar_t *) *to;
-    dstend = dst + *to_left;
-    unconv_num = 0;
-
-    while (src < srcend && dst < dstend) {
-	int consumed = utf8_cstowc(dst, src, srcend-src);
-	if (consumed < 0) {
-	    src++;
-	    *dst = BAD_WCHAR;
-	    unconv_num++;
-	} else {
-	    src += consumed;
-	}
-	dst++;
-    }
-
-    *from = (XPointer) src;
-    *from_left = srcend - src;
-    *to = (XPointer) dst;
-    *to_left = dstend - dst;
-
-    return unconv_num;
-}
-
-static XlcConvMethodsRec methods_utf8towcs = {
-    close_converter,
-    utf8towcs,
-    NULL
-};
-
-static XlcConv
-open_utf8towcs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &methods_utf8towcs);
-}
-
-/* from XlcNWideChar to XlcNMultiByte */
-
-static int
-wcstoutf8(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    wchar_t const *src;
-    wchar_t const *srcend;
-    unsigned char *dst;
-    unsigned char *dstend;
-    int unconv_num;
-
-    if (from == NULL || *from == NULL)
-	return 0;
-
-    src = (wchar_t const *) *from;
-    srcend = src + *from_left;
-    dst = (unsigned char *) *to;
-    dstend = dst + *to_left;
-    unconv_num = 0;
-
-    while (src < srcend) {
-	int count = utf8_wctocs(dst, *src, dstend-dst);
-	if (count == 0)
-	    break;
-	if (count < 0) {
-	    count = utf8_wctocs(dst, BAD_WCHAR, dstend-dst);
-	    if (count == 0)
-		break;
-	    unconv_num++;
-	}
-	dst += count;
-	src++;
-    }
-
-    *from = (XPointer) src;
-    *from_left = srcend - src;
-    *to = (XPointer) dst;
-    *to_left = dstend - dst;
-
-    return unconv_num;
-}
-
-static XlcConvMethodsRec methods_wcstoutf8 = {
-    close_converter,
-    wcstoutf8,
-    NULL
-};
-
-static XlcConv
-open_wcstoutf8(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &methods_wcstoutf8);
-}
-
-/* from XlcNString to XlcNWideChar */
-
-static int
-our_strtowcs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    unsigned char const *src;
-    unsigned char const *srcend;
-    wchar_t *dst;
-    wchar_t *dstend;
-
-    if (from == NULL || *from == NULL)
-	return 0;
-
-    src = (unsigned char const *) *from;
-    srcend = src + *from_left;
-    dst = (wchar_t *) *to;
-    dstend = dst + *to_left;
-
-    while (src < srcend && dst < dstend)
-	*dst++ = (wchar_t) *src++;
-
-    *from = (XPointer) src;
-    *from_left = srcend - src;
-    *to = (XPointer) dst;
-    *to_left = dstend - dst;
-
-    return 0;
-}
-
-static XlcConvMethodsRec methods_strtowcs = {
-    close_converter,
-    our_strtowcs,
-    NULL
-};
-
-static XlcConv
-open_strtowcs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &methods_strtowcs);
-}
-
-/* from XlcNWideChar to XlcNString */
-
-static int
-our_wcstostr(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    wchar_t const *src;
-    wchar_t const *srcend;
-    unsigned char *dst;
-    unsigned char *dstend;
-    int unconv_num;
-
-    if (from == NULL || *from == NULL)
-	return 0;
-
-    src = (wchar_t const *) *from;
-    srcend = src + *from_left;
-    dst = (unsigned char *) *to;
-    dstend = dst + *to_left;
-    unconv_num = 0;
-
-    while (src < srcend && dst < dstend) {
-	unsigned int wc = *src++;
-	if (wc < 0x80)
-	    *dst = wc;
-	else {
-	    *dst = BAD_CHAR;
-	    unconv_num++;
-	}
-	dst++;
-    }
-
-    *from = (XPointer) src;
-    *from_left = srcend - src;
-    *to = (XPointer) dst;
-    *to_left = dstend - dst;
-
-    return unconv_num;
-}
-
-static XlcConvMethodsRec methods_wcstostr = {
-    close_converter,
-    our_wcstostr,
-    NULL
-};
-
-static XlcConv
-open_wcstostr(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &methods_wcstostr);
-}
-
-/* from XlcNCharSet to XlcNWideChar */
-
-static int
-cstowcs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    XlcCharSet charset;
-    char *name;
-    Utf8Conv convptr;
-    int i;
-    unsigned char const *src;
-    unsigned char const *srcend;
-    wchar_t *dst;
-    wchar_t *dstend;
-    int unconv_num;
-
-    if (from == NULL || *from == NULL)
-	return 0;
-
-    if (num_args < 1)
-	return -1;
-
-    charset = (XlcCharSet) args[0];
-    name = charset->name;
-
-    for (convptr = all_charsets, i = all_charsets_count; i > 0; convptr++, i--)
-	if (!strcmp(convptr->name, name)) /* FIXME: charset->side */
-	    break;
-    if (i == 0)
-	return -1;
-
-    src = (unsigned char const *) *from;
-    srcend = src + *from_left;
-    dst = (wchar_t *) *to;
-    dstend = dst + *to_left;
-    unconv_num = 0;
-
-    while (src < srcend && dst < dstend) {
-	unsigned int wc;
-	int consumed;
-
-	consumed = convptr->cstowc(conv, &wc, src, srcend-src);
-	if (consumed < 0)
-	    return -1;
-	if (consumed == 0)
-	    break;
-
-	*dst++ = wc;
-	src += consumed;
-    }
-
-    *from = (XPointer) src;
-    *from_left = srcend - src;
-    *to = (XPointer) dst;
-    *to_left = dstend - dst;
-
-    return unconv_num;
-}
-
-static XlcConvMethodsRec methods_cstowcs = {
-    close_converter,
-    cstowcs,
-    NULL
-};
-
-static XlcConv
-open_cstowcs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &methods_cstowcs);
-}
-
-/* from XlcNWideChar to XlcNCharSet */
-
-static int
-wcstocs(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    Utf8Conv *preferred_charsets;
-    Utf8Conv last_charset = NULL;
-    wchar_t const *src;
-    wchar_t const *srcend;
-    unsigned char *dst;
-    unsigned char *dstend;
-    int unconv_num;
-
-    if (from == NULL || *from == NULL)
-	return 0;
-
-    preferred_charsets = (Utf8Conv *) conv->state;
-    src = (wchar_t const *) *from;
-    srcend = src + *from_left;
-    dst = (unsigned char *) *to;
-    dstend = dst + *to_left;
-    unconv_num = 0;
-
-    while (src < srcend && dst < dstend) {
-	Utf8Conv chosen_charset = NULL; /* FIXME: side */
-	wchar_t wc = *src;
-	int count;
-
-	count = charset_wctocs(preferred_charsets, &chosen_charset, conv, dst, wc, dstend-dst);
-	if (count == 0)
-	    break;
-	if (count < 0) {
-	    src++;
-	    unconv_num++;
-	    continue;
-	}
-
-	if (last_charset != NULL && chosen_charset != last_charset)
-	    break;
-	src++;
-	dst += count;
-	last_charset = chosen_charset;
-    }
-
-    if (last_charset == NULL)
-	return -1;
-
-    *from = (XPointer) src;
-    *from_left = srcend - src;
-    *to = (XPointer) dst;
-    *to_left = dstend - dst;
-
-    if (num_args >= 1)
-	*((XlcCharSet *)args[0]) = _XlcGetCharSet(last_charset->name);
-
-    return unconv_num;
-}
-
-static XlcConvMethodsRec methods_wcstocs = {
-    close_tocs_converter,
-    wcstocs,
-    NULL
-};
-
-static XlcConv
-open_wcstocs(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_tocs_conv(from_lcd, &methods_wcstocs);
-}
-
-/* from XlcNWideChar to XlcNChar */
-
-static int
-wcstocs1(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    Utf8Conv *preferred_charsets;
-    Utf8Conv last_charset = NULL;
-    wchar_t const *src;
-    wchar_t const *srcend;
-    unsigned char *dst;
-    unsigned char *dstend;
-    int unconv_num;
-
-    if (from == NULL || *from == NULL)
-	return 0;
-
-    preferred_charsets = (Utf8Conv *) conv->state;
-    src = (wchar_t const *) *from;
-    srcend = src + *from_left;
-    dst = (unsigned char *) *to;
-    dstend = dst + *to_left;
-    unconv_num = 0;
-
-    while (src < srcend && dst < dstend) {
-	Utf8Conv chosen_charset = NULL; /* FIXME: side */
-	wchar_t wc = *src;
-	int count;
-
-	count = charset_wctocs(preferred_charsets, &chosen_charset, conv, dst, wc, dstend-dst);
-	if (count == 0)
-	    break;
-	if (count < 0) {
-	    src++;
-	    unconv_num++;
-	    continue;
-	}
-
-	if (last_charset != NULL && chosen_charset != last_charset)
-	    break;
-	src++;
-	dst += count;
-	last_charset = chosen_charset;
-	break;
-    }
-
-    if (last_charset == NULL)
-	return -1;
-
-    *from = (XPointer) src;
-    *from_left = srcend - src;
-    *to = (XPointer) dst;
-    *to_left = dstend - dst;
-
-    if (num_args >= 1)
-	*((XlcCharSet *)args[0]) = _XlcGetCharSet(last_charset->name);
-
-    return unconv_num;
-}
-
-static XlcConvMethodsRec methods_wcstocs1 = {
-    close_tocs_converter,
-    wcstocs1,
-    NULL
-};
-
-static XlcConv
-open_wcstocs1(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_tocs_conv(from_lcd, &methods_wcstocs1);
-}
-
-/* trivial, no conversion */
-
-static int
-identity(conv, from, from_left, to, to_left, args, num_args)
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    unsigned char const *src;
-    unsigned char const *srcend;
-    unsigned char *dst;
-    unsigned char *dstend;
-
-    if (from == NULL || *from == NULL)
-	return 0;
-
-    src = (unsigned char const *) *from;
-    srcend = src + *from_left;
-    dst = (unsigned char *) *to;
-    dstend = dst + *to_left;
-
-    while (src < srcend && dst < dstend)
-	*dst++ = *src++;
-
-    *from = (XPointer) src;
-    *from_left = srcend - src;
-    *to = (XPointer) dst;
-    *to_left = dstend - dst;
-
-    return 0;
-}
-
-static XlcConvMethodsRec methods_identity = {
-    close_converter,
-    identity,
-    NULL
-};
-
-static XlcConv
-open_identity(from_lcd, from_type, to_lcd, to_type)
-    XLCd from_lcd;
-    char *from_type;
-    XLCd to_lcd;
-    char *to_type;
-{
-    return create_conv(from_lcd, &methods_identity);
-}
-
-XLCd
-_XlcUtf8Loader(name)
-    _Xconst char *name;
-{
-    XLCd lcd;
-
-    lcd = _XlcCreateLC(name, _XlcGenericMethods);
-    if (lcd == (XLCd) NULL)
-	return lcd;
-
-    /* The official IANA name for UTF-8 is "UTF-8" in upper case with a dash. */
-    if (!XLC_PUBLIC_PART(lcd)->codeset ||
-	(_XlcCompareISOLatin1(XLC_PUBLIC_PART(lcd)->codeset, "UTF-8"))) {
-	_XlcDestroyLC(lcd);
-	return (XLCd) NULL;
-    }
-
-    /* Register elementary converters. */
-
-    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNWideChar, open_utf8towcs);
-
-    _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNMultiByte, open_wcstoutf8);
-    _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNString, open_wcstostr);
-
-    _XlcSetConverter(lcd, XlcNString, lcd, XlcNWideChar, open_strtowcs);
-
-    /* Register converters for XlcNCharSet. This implicitly provides
-     * converters from and to XlcNCompoundText. */
-
-    _XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNMultiByte, open_cstoutf8);
-    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNCharSet, open_utf8tocs);
-    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNChar, open_utf8tocs1);
-
-    _XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNWideChar, open_cstowcs);
-    _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNCharSet, open_wcstocs);
-    _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNChar, open_wcstocs1);
-
-    _XlcSetConverter(lcd, XlcNString, lcd, XlcNMultiByte, open_strtoutf8);
-    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNString, open_utf8tostr);
-    _XlcSetConverter(lcd, XlcNUtf8String, lcd, XlcNMultiByte, open_identity);
-    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNUtf8String, open_identity);
-
-    _XlcAddUtf8Converters(lcd);
-
-    return lcd;
-}
diff --git a/xc/lib/X11/lcUniConv/8bit_tab_to_h.c b/xc/lib/X11/lcUniConv/8bit_tab_to_h.c
deleted file mode 100644
index 549770d92..000000000
--- a/xc/lib/X11/lcUniConv/8bit_tab_to_h.c
+++ /dev/null
@@ -1,534 +0,0 @@
-/*
- * Generates an 8-bit character set table from a .TXT table as found on
- * ftp.unicode.org or from a table containing the 256 Unicode values as
- * hexadecimal integers.
- * Examples:
- *
- *   ./8bit_tab_to_h ISO-8859-1 iso8859_1 < tab8859_1
- *   ./8bit_tab_to_h ISO-8859-2 iso8859_2 < tab8859_2
- *   ./8bit_tab_to_h ISO-8859-3 iso8859_3 < tab8859_3
- *   ./8bit_tab_to_h ISO-8859-4 iso8859_4 < tab8859_4
- *   ./8bit_tab_to_h ISO-8859-5 iso8859_5 < tab8859_5
- *   ./8bit_tab_to_h ISO-8859-6 iso8859_6 < tab8859_6
- *   ./8bit_tab_to_h ISO-8859-7 iso8859_7 < tab8859_7
- *   ./8bit_tab_to_h ISO-8859-8 iso8859_8 < tab8859_8
- *   ./8bit_tab_to_h ISO-8859-9 iso8859_9 < tab8859_9
- *   ./8bit_tab_to_h ISO-8859-10 iso8859_10 < tab8859_10
- *   ./8bit_tab_to_h ISO-8859-14 iso8859_14 < tab8859_14
- *   ./8bit_tab_to_h ISO-8859-15 iso8859_15 < tab8859_15
- *   ./8bit_tab_to_h JISX0201.1976-0 jisx0201 < jis0201
- *   ./8bit_tab_to_h TIS620.2533-1 tis620 < tabtis620
- *   ./8bit_tab_to_h KOI8-R koi8_r < tabkoi8_r
- *   ./8bit_tab_to_h KOI8-U koi8_u < tabkoi8_u
- *   ./8bit_tab_to_h ARMSCII-8 armscii_8 < tabarmscii_8
- *   ./8bit_tab_to_h CP1133 cp1133 < tabibm_cp1133
- *   ./8bit_tab_to_h MULELAO-1 mulelao < tabmulelao_1
- *   ./8bit_tab_to_h VISCII1.1-1 viscii1 < tabviscii
- *   ./8bit_tab_to_h TCVN-5712 tcvn < tabtcvn
- *   ./8bit_tab_to_h GEORGIAN-ACADEMY georgian_ac < tabgeorgian_academy
- *   ./8bit_tab_to_h GEORGIAN-PS georgian_ps < tabgeorgian_ps
- *
- *   ./8bit_tab_to_h ISO-8859-1 iso8859_1 < 8859-1.TXT
- *   ./8bit_tab_to_h ISO-8859-2 iso8859_2 < 8859-2.TXT
- *   ./8bit_tab_to_h ISO-8859-3 iso8859_3 < 8859-3.TXT
- *   ./8bit_tab_to_h ISO-8859-4 iso8859_4 < 8859-4.TXT
- *   ./8bit_tab_to_h ISO-8859-5 iso8859_5 < 8859-5.TXT
- *   ./8bit_tab_to_h ISO-8859-6 iso8859_6 < 8859-6.TXT
- *   ./8bit_tab_to_h ISO-8859-7 iso8859_7 < 8859-7.TXT
- *   ./8bit_tab_to_h ISO-8859-8 iso8859_8 < 8859-8.TXT
- *   ./8bit_tab_to_h ISO-8859-9 iso8859_9 < 8859-9.TXT
- *   ./8bit_tab_to_h ISO-8859-10 iso8859_10 < 8859-10.TXT
- *   ./8bit_tab_to_h ISO-8859-14 iso8859_14 < 8859-14.TXT
- *   ./8bit_tab_to_h ISO-8859-15 iso8859_15 < 8859-15.TXT
- *   ./8bit_tab_to_h JISX0201.1976-0 jisx0201 < JIS0201.TXT
- *   ./8bit_tab_to_h KOI8-R koi8_r < KOI8-R.TXT
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <string.h>
-
-int main (int argc, char *argv[])
-{
-  const char* charsetname;
-  const char* c_charsetname;
-  const char* filename;
-  const char* directory;
-  int charset2uni[0x100];
-
-  if (argc != 3 && argc != 4 && argc != 5)
-    exit(1);
-  charsetname = argv[1];
-  c_charsetname = argv[2];
-  if (argc > 3) {
-    filename = argv[3];
-  } else {
-    char* s = (char*) malloc(strlen(c_charsetname)+strlen(".h")+1);
-    strcpy(s,c_charsetname); strcat(s,".h");
-    filename = s;
-  }
-  directory = (argc > 4 ? argv[4] : "");
-
-  fprintf(stderr, "Creating %s%s\n", directory, filename);
-
-  {
-    int i, c;
-    c = getc(stdin);
-    ungetc(c,stdin);
-    if (c == '#') {
-      /* Read a unicode.org style .TXT file. */
-      for (i = 0; i < 0x100; i++)
-        charset2uni[i] = 0xfffd;
-      for (;;) {
-        c = getc(stdin);
-        if (c == EOF)
-          break;
-        if (c == '\n' || c == ' ' || c == '\t')
-          continue;
-        if (c == '#') {
-          do { c = getc(stdin); } while (!(c == EOF || c == '\n'));
-          continue;
-        }
-        ungetc(c,stdin);
-        if (scanf("0x%x", &i) != 1 || !(i >= 0 && i < 0x100))
-          exit(1);
-        do { c = getc(stdin); } while (c == ' ' || c == '\t');
-        if (c != EOF)
-          ungetc(c,stdin);
-        if (c == '\n' || c == '#')
-          continue;
-        if (scanf("0x%x", &charset2uni[i]) != 1)
-          exit(1);
-      }
-    } else {
-      /* Read a table of hexadecimal Unicode values. */
-      for (i = 0; i < 0x100; i++) {
-        if (scanf("%x", &charset2uni[i]) != 1)
-          exit(1);
-        if (charset2uni[i] < 0 || charset2uni[i] == 0xffff)
-          charset2uni[i] = 0xfffd;
-      }
-      if (scanf("%x", &i) != EOF)
-        exit(1);
-    }
-  }
-
-  /* Write the output file. */
-  {
-    FILE* f;
-
-    {
-      char* fname = malloc(strlen(directory)+strlen(filename)+1);
-      strcpy(fname,directory); strcat(fname,filename);
-      f = fopen(fname,"w");
-      if (f == NULL)
-        exit(1);
-    }
-
-    fprintf(f, "\n");
-    fprintf(f, "/*\n");
-    fprintf(f, " * %s\n", charsetname);
-    fprintf(f, " */\n");
-    fprintf(f, "\n");
-
-    {
-      int i, i1, i2, i3;
-      int line[16];
-      int tableno;
-      struct { int minline; int maxline; } tables[16];
-      bool some_invalid;
-      bool final_ret_reached;
-
-      for (i1 = 0; i1 < 16; i1++) {
-        bool all_invalid = true;
-        bool all_identity = true;
-        for (i2 = 0; i2 < 16; i2++) {
-          i = 16*i1+i2;
-          if (charset2uni[i] != 0xfffd)
-            all_invalid = false;
-          if (charset2uni[i] != i)
-            all_identity = false;
-        }
-        if (all_invalid)
-          line[i1] = -2;
-        else if (all_identity)
-          line[i1] = -1;
-        else
-          line[i1] = 0;
-      }
-      tableno = 0;
-      for (i1 = 0; i1 < 16; i1++) {
-        if (line[i1] >= 0) {
-          if (i1 > 0 && tableno > 0 && line[i1-1] == tableno-1) {
-            line[i1] = tableno-1;
-            tables[tableno-1].maxline = i1;
-          } else {
-            tableno++;
-            line[i1] = tableno-1;
-            tables[tableno-1].minline = tables[tableno-1].maxline = i1;
-          }
-        }
-      }
-      some_invalid = false;
-      for (i = 0; i < 0x100; i++)
-        if (charset2uni[i] == 0xfffd)
-          some_invalid = true;
-      if (tableno > 0) {
-        int t;
-        for (t = 0; t < tableno; t++) {
-          fprintf(f, "static const unsigned short %s_2uni", c_charsetname);
-          if (tableno > 1)
-            fprintf(f, "_%d", t+1);
-          fprintf(f, "[%d] = {\n", 16*(tables[t].maxline-tables[t].minline+1));
-          for (i1 = tables[t].minline; i1 <= tables[t].maxline; i1++) {
-            fprintf(f, "  /* 0x%02x */\n", 16*i1);
-            for (i2 = 0; i2 < 2; i2++) {
-              fprintf(f, " ");
-              for (i3 = 0; i3 < 8; i3++) {
-                i = 16*i1+8*i2+i3;
-                fprintf(f, " 0x%04x,", charset2uni[i]);
-              }
-              fprintf(f, "\n");
-            }
-          }
-          fprintf(f, "};\n");
-        }
-        fprintf(f, "\n");
-      }
-      final_ret_reached = false;
-      fprintf(f, "static int\n%s_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)\n", c_charsetname);
-      fprintf(f, "{\n");
-      fprintf(f, "  unsigned char c = *s;\n");
-      if (some_invalid) {
-        for (i1 = 0; i1 < 16;) {
-          int t = line[i1];
-          const char* indent;
-          for (i2 = i1; i2 < 16 && line[i2] == t; i2++);
-          indent = (i1 == 0 && i2 == 16 ? "  " : "    ");
-          if (i1 == 0) {
-            if (i2 == 16) {
-            } else {
-              fprintf(f, "  if (c < 0x%02x) {\n", 16*i2);
-            }
-          } else {
-            if (i2 == 16) {
-              fprintf(f, "  else {\n");
-            } else {
-              fprintf(f, "  else if (c < 0x%02x) {\n", 16*i2);
-            }
-          }
-          if (t == -2) {
-            final_ret_reached = true;
-          } else if (t == -1) {
-            fprintf(f, "%s*pwc = (wchar_t) c;\n", indent);
-            fprintf(f, "%sreturn 1;\n", indent);
-          } else {
-            fprintf(f, "%s", indent);
-            some_invalid = false;
-            for (i = 16*i1; i < 16*i2; i++)
-              if (charset2uni[i] == 0xfffd)
-                some_invalid = true;
-            if (some_invalid)
-              fprintf(f, "unsigned short wc = ");
-            else
-              fprintf(f, "*pwc = (wchar_t) ");
-            fprintf(f, "%s_2uni", c_charsetname);
-            if (tableno > 1)
-              fprintf(f, "_%d", t+1);
-            fprintf(f, "[c");
-            if (tables[t].minline > 0)
-              fprintf(f, "-0x%02x", 16*tables[t].minline);
-            fprintf(f, "];\n");
-            if (some_invalid) {
-              fprintf(f, "%sif (wc != 0xfffd) {\n", indent);
-              fprintf(f, "%s  *pwc = (wchar_t) wc;\n", indent);
-              fprintf(f, "%s  return 1;\n", indent);
-              fprintf(f, "%s}\n", indent);
-              final_ret_reached = true;
-            } else {
-              fprintf(f, "%sreturn 1;\n", indent);
-            }
-          }
-          if (!(i1 == 0 && i2 == 16))
-            fprintf(f, "  }\n");
-          i1 = i2;
-        }
-        if (final_ret_reached)
-          fprintf(f, "  return RET_ILSEQ;\n");
-      } else {
-        for (i1 = 0; i1 < 16;) {
-          int t = line[i1];
-          for (i2 = i1; i2 < 16 && line[i2] == t; i2++);
-          if (i1 == 0) {
-            if (i2 == 16) {
-              fprintf(f, "  ");
-            } else {
-              fprintf(f, "  if (c < 0x%02x)\n    ", 16*i2);
-            }
-          } else {
-            if (i2 == 16) {
-              fprintf(f, "  else\n    ");
-            } else {
-              fprintf(f, "  else if (c < 0x%02x)\n    ", 16*i2);
-            }
-          }
-          if (t == -1)
-            fprintf(f, "*pwc = (wchar_t) c;\n");
-          else {
-            fprintf(f, "*pwc = (wchar_t) %s_2uni", c_charsetname);
-            if (tableno > 1)
-              fprintf(f, "_%d", t+1);
-            fprintf(f, "[c");
-            if (tables[t].minline > 0)
-              fprintf(f, "-0x%02x", 16*tables[t].minline);
-            fprintf(f, "];\n");
-          }
-          i1 = i2;
-        }
-        fprintf(f, "  return 1;\n");
-      }
-      fprintf(f, "}\n");
-
-    }
-
-    fprintf(f, "\n");
-
-    {
-      int uni2charset[0x10000];
-      bool pages[0x100];
-      int line[0x2000];
-      int tableno;
-      struct { int minline; int maxline; int usecount; const char* suffix; } tables[0x2000];
-      bool need_c;
-      bool fix_0000;
-      int i, j, p, j1, j2, t;
-
-      for (j = 0; j < 0x10000; j++)
-        uni2charset[j] = 0;
-      for (p = 0; p < 0x100; p++)
-        pages[p] = false;
-      for (i = 0; i < 0x100; i++) {
-        j = charset2uni[i];
-        if (j != 0xfffd) {
-          uni2charset[j] = i;
-          pages[j>>8] = true;
-        }
-      }
-      for (j1 = 0; j1 < 0x2000; j1++) {
-        bool all_invalid = true;
-        bool all_identity = true;
-        for (j2 = 0; j2 < 8; j2++) {
-          j = 8*j1+j2;
-          if (uni2charset[j] != 0)
-            all_invalid = false;
-          if (uni2charset[j] != j)
-            all_identity = false;
-        }
-        if (all_invalid)
-          line[j1] = -2;
-        else if (all_identity)
-          line[j1] = -1;
-        else
-          line[j1] = 0;
-      }
-      tableno = 0;
-      for (j1 = 0; j1 < 0x2000; j1++) {
-        if (line[j1] >= 0) {
-          if (tableno > 0
-              && ((j1 > 0 && line[j1-1] == tableno-1)
-                  || ((tables[tableno-1].maxline >> 5) == (j1 >> 5)
-                      && j1 - tables[tableno-1].maxline <= 8))) {
-            line[j1] = tableno-1;
-            tables[tableno-1].maxline = j1;
-          } else {
-            tableno++;
-            line[j1] = tableno-1;
-            tables[tableno-1].minline = tables[tableno-1].maxline = j1;
-          }
-        }
-      }
-      for (t = 0; t < tableno; t++) {
-        tables[t].usecount = 0;
-        j1 = 8*tables[t].minline;
-        j2 = 8*(tables[t].maxline+1);
-        for (j = j1; j < j2; j++)
-          if (uni2charset[j] != 0)
-            tables[t].usecount++;
-      }
-      for (t = 0, p = -1, i = 0; t < tableno; t++) {
-        if (tables[t].usecount > 1) {
-          char* s;
-          if (p == tables[t].minline >> 5) {
-            s = (char*) malloc(5+1);
-            sprintf(s, "%02x_%d", p, ++i);
-          } else {
-            p = tables[t].minline >> 5;
-            s = (char*) malloc(2+1);
-            sprintf(s, "%02x", p);
-          }
-          tables[t].suffix = s;
-        } else
-          tables[t].suffix = NULL;
-      }
-      {
-        p = -1;
-        for (t = 0; t < tableno; t++)
-          if (tables[t].usecount > 1) {
-            p = 0;
-            fprintf(f, "static const unsigned char %s_page%s[%d] = {\n", c_charsetname, tables[t].suffix, 8*(tables[t].maxline-tables[t].minline+1));
-            for (j1 = tables[t].minline; j1 <= tables[t].maxline; j1++) {
-              if ((j1 % 0x20) == 0 && j1 > tables[t].minline)
-                fprintf(f, "  /* 0x%04x */\n", 8*j1);
-              fprintf(f, " ");
-              for (j2 = 0; j2 < 8; j2++) {
-                j = 8*j1+j2;
-                fprintf(f, " 0x%02x,", uni2charset[j]);
-              }
-              fprintf(f, " /* 0x%02x-0x%02x */\n", 8*(j1 % 0x20), 8*(j1 % 0x20)+7);
-            }
-            fprintf(f, "};\n");
-          }
-        if (p >= 0)
-          fprintf(f, "\n");
-      }
-      need_c = false;
-      for (j1 = 0; j1 < 0x2000;) {
-        t = line[j1];
-        for (j2 = j1; j2 < 0x2000 && line[j2] == t; j2++);
-        if (t >= 0)
-          j2 = tables[t].maxline+1;
-        if (!(t == -2 || (t == -1 && j1 == 0)))
-          need_c = true;
-        j1 = j2;
-      }
-      fix_0000 = false;
-      fprintf(f, "static int\n%s_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)\n", c_charsetname);
-      fprintf(f, "{\n");
-      if (need_c)
-        fprintf(f, "  unsigned char c = 0;\n");
-      for (j1 = 0; j1 < 0x2000;) {
-        t = line[j1];
-        for (j2 = j1; j2 < 0x2000 && line[j2] == t; j2++);
-        if (t >= 0) {
-          if (j1 != tables[t].minline) abort();
-          if (j2 > tables[t].maxline+1) abort();
-          j2 = tables[t].maxline+1;
-        }
-        if (t == -2) {
-        } else {
-          if (j1 == 0)
-            fprintf(f, "  ");
-          else
-            fprintf(f, "  else ");
-          if (t >= 0 && tables[t].usecount == 0) abort();
-          if (t >= 0 && tables[t].usecount == 1) {
-            if (j2 != j1+1) abort();
-            for (j = 8*j1; j < 8*j2; j++)
-              if (uni2charset[j] != 0) {
-                fprintf(f, "if (wc == 0x%04x)\n    c = 0x%02x;\n", j, uni2charset[j]);
-                break;
-              }
-          } else {
-            if (j1 == 0) {
-              fprintf(f, "if (wc < 0x%04x)", 8*j2);
-            } else {
-              fprintf(f, "if (wc >= 0x%04x && wc < 0x%04x)", 8*j1, 8*j2);
-            }
-            if (t == -1) {
-              if (j1 == 0)
-                /* If wc == 0, the function must return 1, not -1. */
-                fprintf(f, " {\n    *r = wc;\n    return 1;\n  }\n");
-              else
-                fprintf(f, "\n    c = wc;\n");
-            } else {
-              fprintf(f, "\n    c = %s_page%s[wc", c_charsetname, tables[t].suffix);
-              if (tables[t].minline > 0)
-                fprintf(f, "-0x%04x", 8*j1);
-              fprintf(f, "];\n");
-              if (j1 == 0 && uni2charset[0] == 0)
-                /* If wc == 0, the function must return 1, not -1. */
-                fix_0000 = true;
-            }
-          }
-        }
-        j1 = j2;
-      }
-      if (need_c) {
-        if (fix_0000)
-          fprintf(f, "  if (c != 0 || wc == 0) {\n");
-        else
-          fprintf(f, "  if (c != 0) {\n");
-        fprintf(f, "    *r = c;\n");
-        fprintf(f, "    return 1;\n");
-        fprintf(f, "  }\n");
-      }
-      fprintf(f, "  return RET_ILSEQ;\n");
-      fprintf(f, "}\n");
-
-    }
-
-    if (ferror(f) || fclose(f))
-      exit(1);
-  }
-
-#if 0
-
-    int i1, i2, i3, i1_min, i1_max, j1, j2;
-
-  i1_min = 16;
-  i1_max = -1;
-  for (i1 = 0; i1 < 16; i1++)
-    for (i2 = 0; i2 < 16; i2++)
-      if (charset2uni[16*i1+i2] != 0xfffd) {
-        if (i1_min > i1) i1_min = i1;
-        if (i1_max < i1) i1_max = i1;
-      }
-  printf("static const unsigned short %s_2uni[%d] = {\n",
-         name, 16*(i1_max-i1_min+1));
-  for (i1 = i1_min; i1 <= i1_max; i1++) {
-    printf("  /""* 0x%02x *""/\n", 16*i1);
-    for (i2 = 0; i2 < 2; i2++) {
-      printf("  ");
-      for (i3 = 0; i3 < 8; i3++) {
-        if (i3 > 0) printf(" ");
-        printf("0x%04x,", charset2uni[16*i1+8*i2+i3]);
-      }
-      printf("\n");
-    }
-  }
-  printf("};\n");
-  printf("\n");
-
-  for (p = 0; p < 0x100; p++)
-    pages[p] = 0;
-  for (i = 0; i < 0x100; i++)
-    if (charset2uni[i] != 0xfffd)
-      pages[charset2uni[i]>>8] = 1;
-  for (p = 0; p < 0x100; p++)
-    if (pages[p]) {
-      int j1_min = 32;
-      int j1_max = -1;
-      for (j1 = 0; j1 < 32; j1++)
-        for (j2 = 0; j2 < 8; j2++)
-          if (uni2charset[256*p+8*j1+j2] != 0) {
-            if (j1_min > j1) j1_min = j1;
-            if (j1_max < j1) j1_max = j1;
-          }
-      printf("static const unsigned char %s_page%02x[%d] = {\n",
-             name, p, 8*(j1_max-j1_min+1));
-      for (j1 = j1_min; j1 <= j1_max; j1++) {
-        printf("  ");
-        for (j2 = 0; j2 < 8; j2++)
-          printf("0x%02x, ", uni2charset[256*p+8*j1+j2]);
-        printf("/""* 0x%02x-0x%02x *""/\n", 8*j1, 8*j1+7);
-      }
-      printf("};\n");
-    }
-  printf("\n");
-
-}
-#endif
-
-  exit(0);
-}
diff --git a/xc/lib/X11/lcUniConv/COPYRIGHT b/xc/lib/X11/lcUniConv/COPYRIGHT
deleted file mode 100644
index ccc162664..000000000
--- a/xc/lib/X11/lcUniConv/COPYRIGHT
+++ /dev/null
@@ -1,39 +0,0 @@
-This notice applies to the files in this directory. They are taken from
-the libiconv-1.1 package, which is covered by the LGPL license. The files
-in this directory have been placed under the following copyright, with
-permission from the Free Software Foundation.
-
-
-Copyright (c) 1999-2000  Free Software Foundation, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-FREE SOFTWARE FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the Free Software Foundation
-shall not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization from the
-Free Software Foundation.
-
-
-Notes:
-
-1. This copyright applies only to the files in this directory, and not to
-the remaining files in libiconv.
-
-2. The Free Software Foundation does not encourage the use of the above
-license for newly written software.
-
diff --git a/xc/lib/X11/lcUniConv/README b/xc/lib/X11/lcUniConv/README
deleted file mode 100644
index 844f090b4..000000000
--- a/xc/lib/X11/lcUniConv/README
+++ /dev/null
@@ -1,10 +0,0 @@
-The files in this directory are taken from the libiconv-1.1 package.
-
-The *.h files were generated from tables (mostly from ftp.unicode.org) using
-the programs '8bit_tab_to_h.c' and 'cjk_tab_to_h.c'. On some of them, further
-optimizations were applied by hand.
-
-If you find a bug in these files, instead of modifying them in XFree86
-and let it diverge from libiconv, please notify the libiconv maintainer
-(currently <haible@clisp.cons.org>) so he can fix both in synch.
-
diff --git a/xc/lib/X11/lcUniConv/armscii_8.h b/xc/lib/X11/lcUniConv/armscii_8.h
deleted file mode 100644
index 4a105151b..000000000
--- a/xc/lib/X11/lcUniConv/armscii_8.h
+++ /dev/null
@@ -1,93 +0,0 @@
-
-/*
- * ARMSCII-8
- */
-
-static const unsigned short armscii_8_2uni[96] = {
-  /* 0xa0 */
-  0x00a0, 0x2741, 0x00a7, 0x0589, 0x0029, 0x0028, 0x00bb, 0x00ab,
-  0x2014, 0x002e, 0x055d, 0x002c, 0x002d, 0x055f, 0x2026, 0x055c,
-  /* 0xb0 */
-  0x055b, 0x055e, 0x0531, 0x0561, 0x0532, 0x0562, 0x0533, 0x0563,
-  0x0534, 0x0564, 0x0535, 0x0565, 0x0536, 0x0566, 0x0537, 0x0567,
-  /* 0xc0 */
-  0x0538, 0x0568, 0x0539, 0x0569, 0x053a, 0x056a, 0x053b, 0x056b,
-  0x053c, 0x056c, 0x053d, 0x056d, 0x053e, 0x056e, 0x053f, 0x056f,
-  /* 0xd0 */
-  0x0540, 0x0570, 0x0541, 0x0571, 0x0542, 0x0572, 0x0543, 0x0573,
-  0x0544, 0x0574, 0x0545, 0x0575, 0x0546, 0x0576, 0x0547, 0x0577,
-  /* 0xe0 */
-  0x0548, 0x0578, 0x0549, 0x0579, 0x054a, 0x057a, 0x054b, 0x057b,
-  0x054c, 0x057c, 0x054d, 0x057d, 0x054e, 0x057e, 0x054f, 0x057f,
-  /* 0xf0 */
-  0x0550, 0x0580, 0x0551, 0x0581, 0x0552, 0x0582, 0x0553, 0x0583,
-  0x0554, 0x0584, 0x0555, 0x0585, 0x0556, 0x0586, 0x2019, 0x0027,
-};
-
-static int
-armscii_8_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c < 0xa0)
-    *pwc = (wchar_t) c;
-  else
-    *pwc = (wchar_t) armscii_8_2uni[c-0xa0];
-  return 1;
-}
-
-static const unsigned char armscii_8_page00[16] = {
-  0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0xff, /* 0x20-0x27 */
-  0xa5, 0xa4, 0x2a, 0x2b, 0xab, 0xac, 0xa9, 0x2f, /* 0x28-0x2f */
-};
-static const unsigned char armscii_8_page00_1[32] = {
-  0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa2, /* 0xa0-0xa7 */
-  0x00, 0x00, 0x00, 0xa7, 0x00, 0x00, 0x00, 0x00, /* 0xa8-0xaf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xb0-0xb7 */
-  0x00, 0x00, 0x00, 0xa6, 0x00, 0x00, 0x00, 0x00, /* 0xb8-0xbf */
-};
-static const unsigned char armscii_8_page05[96] = {
-  0x00, 0xb2, 0xb4, 0xb6, 0xb8, 0xba, 0xbc, 0xbe, /* 0x30-0x37 */
-  0xc0, 0xc2, 0xc4, 0xc6, 0xc8, 0xca, 0xcc, 0xce, /* 0x38-0x3f */
-  0xd0, 0xd2, 0xd4, 0xd6, 0xd8, 0xda, 0xdc, 0xde, /* 0x40-0x47 */
-  0xe0, 0xe2, 0xe4, 0xe6, 0xe8, 0xea, 0xec, 0xee, /* 0x48-0x4f */
-  0xf0, 0xf2, 0xf4, 0xf6, 0xf8, 0xfa, 0xfc, 0x00, /* 0x50-0x57 */
-  0x00, 0x00, 0x00, 0xb0, 0xaf, 0xaa, 0xb1, 0xad, /* 0x58-0x5f */
-  0x00, 0xb3, 0xb5, 0xb7, 0xb9, 0xbb, 0xbd, 0xbf, /* 0x60-0x67 */
-  0xc1, 0xc3, 0xc5, 0xc7, 0xc9, 0xcb, 0xcd, 0xcf, /* 0x68-0x6f */
-  0xd1, 0xd3, 0xd5, 0xd7, 0xd9, 0xdb, 0xdd, 0xdf, /* 0x70-0x77 */
-  0xe1, 0xe3, 0xe5, 0xe7, 0xe9, 0xeb, 0xed, 0xef, /* 0x78-0x7f */
-  0xf1, 0xf3, 0xf5, 0xf7, 0xf9, 0xfb, 0xfd, 0x00, /* 0x80-0x87 */
-  0x00, 0xa3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8f */
-};
-static const unsigned char armscii_8_page20[24] = {
-  0x00, 0x00, 0x00, 0x00, 0xa8, 0x00, 0x00, 0x00, /* 0x10-0x17 */
-  0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xae, 0x00, /* 0x20-0x27 */
-};
-
-static int
-armscii_8_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x0020) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc >= 0x0020 && wc < 0x0030)
-    c = armscii_8_page00[wc-0x0020];
-  else if (wc >= 0x0030 && wc < 0x00a0)
-    c = wc;
-  else if (wc >= 0x00a0 && wc < 0x00c0)
-    c = armscii_8_page00_1[wc-0x00a0];
-  else if (wc >= 0x0530 && wc < 0x0590)
-    c = armscii_8_page05[wc-0x0530];
-  else if (wc >= 0x2010 && wc < 0x2028)
-    c = armscii_8_page20[wc-0x2010];
-  else if (wc == 0x2741)
-    c = 0xa1;
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/ascii.h b/xc/lib/X11/lcUniConv/ascii.h
deleted file mode 100644
index bdad43466..000000000
--- a/xc/lib/X11/lcUniConv/ascii.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-/*
- * ASCII
- */
-
-static int
-ascii_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c < 0x80) {
-    *pwc = (wchar_t) c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
-
-static int
-ascii_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  if (wc < 0x0080) {
-    *r = wc;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/big5.h b/xc/lib/X11/lcUniConv/big5.h
deleted file mode 100644
index 83e5f400a..000000000
--- a/xc/lib/X11/lcUniConv/big5.h
+++ /dev/null
@@ -1,4142 +0,0 @@
-/* $XFree86: xc/lib/X11/lcUniConv/big5.h,v 1.1 2000/11/28 18:50:03 dawes Exp $ */
-
-/*
- * BIG5
- */
-
-static const unsigned short big5_2uni_pagea1[6121] = {
-  /* 0xa1 */
-  0x3000, 0xff0c, 0x3001, 0x3002, 0xff0e, 0x2022, 0xff1b, 0xff1a,
-  0xff1f, 0xff01, 0xfe30, 0x2026, 0x2025, 0xfe50, 0xff64, 0xfe52,
-  0x00b7, 0xfe54, 0xfe55, 0xfe56, 0xfe57, 0xff5c, 0x2013, 0xfe31,
-  0x2014, 0xfe33, 0xfffd, 0xfe34, 0xfe4f, 0xff08, 0xff09, 0xfe35,
-  0xfe36, 0xff5b, 0xff5d, 0xfe37, 0xfe38, 0x3014, 0x3015, 0xfe39,
-  0xfe3a, 0x3010, 0x3011, 0xfe3b, 0xfe3c, 0x300a, 0x300b, 0xfe3d,
-  0xfe3e, 0x3008, 0x3009, 0xfe3f, 0xfe40, 0x300c, 0x300d, 0xfe41,
-  0xfe42, 0x300e, 0x300f, 0xfe43, 0xfe44, 0xfe59, 0xfe5a, 0xfe5b,
-  0xfe5c, 0xfe5d, 0xfe5e, 0x2018, 0x2019, 0x201c, 0x201d, 0x301d,
-  0x301e, 0x2035, 0x2032, 0xff03, 0xff06, 0xff0a, 0x203b, 0x00a7,
-  0x3003, 0x25cb, 0x25cf, 0x25b3, 0x25b2, 0x25ce, 0x2606, 0x2605,
-  0x25c7, 0x25c6, 0x25a1, 0x25a0, 0x25bd, 0x25bc, 0x32a3, 0x2105,
-  0x203e, 0xfffd, 0xff3f, 0xfffd, 0xfe49, 0xfe4a, 0xfe4d, 0xfe4e,
-  0xfe4b, 0xfe4c, 0xfe5f, 0xfe60, 0xfe61, 0xff0b, 0xff0d, 0x00d7,
-  0x00f7, 0x00b1, 0x221a, 0xff1c, 0xff1e, 0xff1d, 0x2266, 0x2267,
-  0x2260, 0x221e, 0x2252, 0x2261, 0xfe62, 0xfe63, 0xfe64, 0xfe65,
-  0xfe66, 0x223c, 0x2229, 0x222a, 0x22a5, 0x2220, 0x221f, 0x22bf,
-  0x33d2, 0x33d1, 0x222b, 0x222e, 0x2235, 0x2234, 0x2640, 0x2642,
-  0x2641, 0x2609, 0x2191, 0x2193, 0x2190, 0x2192, 0x2196, 0x2197,
-  0x2199, 0x2198, 0x2225, 0x2223, 0xfffd,
-  /* 0xa2 */
-  0xfffd, 0xff0f, 0xff3c, 0xff04, 0x00a5, 0x3012, 0x00a2, 0x00a3,
-  0xff05, 0xff20, 0x2103, 0x2109, 0xfe69, 0xfe6a, 0xfe6b, 0x33d5,
-  0x339c, 0x339d, 0x339e, 0x33ce, 0x33a1, 0x338e, 0x338f, 0x33c4,
-  0x00b0, 0x5159, 0x515b, 0x515e, 0x515d, 0x5161, 0x5163, 0x55e7,
-  0x74e9, 0x7cce, 0x2581, 0x2582, 0x2583, 0x2584, 0x2585, 0x2586,
-  0x2587, 0x2588, 0x258f, 0x258e, 0x258d, 0x258c, 0x258b, 0x258a,
-  0x2589, 0x253c, 0x2534, 0x252c, 0x2524, 0x251c, 0x2594, 0x2500,
-  0x2502, 0x2595, 0x250c, 0x2510, 0x2514, 0x2518, 0x256d, 0x256e,
-  0x2570, 0x256f, 0x2550, 0x255e, 0x256a, 0x2561, 0x25e2, 0x25e3,
-  0x25e5, 0x25e4, 0x2571, 0x2572, 0x2573, 0xff10, 0xff11, 0xff12,
-  0xff13, 0xff14, 0xff15, 0xff16, 0xff17, 0xff18, 0xff19, 0x2160,
-  0x2161, 0x2162, 0x2163, 0x2164, 0x2165, 0x2166, 0x2167, 0x2168,
-  0x2169, 0x3021, 0x3022, 0x3023, 0x3024, 0x3025, 0x3026, 0x3027,
-  0x3028, 0x3029, 0xfffd, 0x5344, 0xfffd, 0xff21, 0xff22, 0xff23,
-  0xff24, 0xff25, 0xff26, 0xff27, 0xff28, 0xff29, 0xff2a, 0xff2b,
-  0xff2c, 0xff2d, 0xff2e, 0xff2f, 0xff30, 0xff31, 0xff32, 0xff33,
-  0xff34, 0xff35, 0xff36, 0xff37, 0xff38, 0xff39, 0xff3a, 0xff41,
-  0xff42, 0xff43, 0xff44, 0xff45, 0xff46, 0xff47, 0xff48, 0xff49,
-  0xff4a, 0xff4b, 0xff4c, 0xff4d, 0xff4e, 0xff4f, 0xff50, 0xff51,
-  0xff52, 0xff53, 0xff54, 0xff55, 0xff56,
-  /* 0xa3 */
-  0xff57, 0xff58, 0xff59, 0xff5a, 0x0391, 0x0392, 0x0393, 0x0394,
-  0x0395, 0x0396, 0x0397, 0x0398, 0x0399, 0x039a, 0x039b, 0x039c,
-  0x039d, 0x039e, 0x039f, 0x03a0, 0x03a1, 0x03a3, 0x03a4, 0x03a5,
-  0x03a6, 0x03a7, 0x03a8, 0x03a9, 0x03b1, 0x03b2, 0x03b3, 0x03b4,
-  0x03b5, 0x03b6, 0x03b7, 0x03b8, 0x03b9, 0x03ba, 0x03bb, 0x03bc,
-  0x03bd, 0x03be, 0x03bf, 0x03c0, 0x03c1, 0x03c3, 0x03c4, 0x03c5,
-  0x03c6, 0x03c7, 0x03c8, 0x03c9, 0x3105, 0x3106, 0x3107, 0x3108,
-  0x3109, 0x310a, 0x310b, 0x310c, 0x310d, 0x310e, 0x310f, 0x3110,
-  0x3111, 0x3112, 0x3113, 0x3114, 0x3115, 0x3116, 0x3117, 0x3118,
-  0x3119, 0x311a, 0x311b, 0x311c, 0x311d, 0x311e, 0x311f, 0x3120,
-  0x3121, 0x3122, 0x3123, 0x3124, 0x3125, 0x3126, 0x3127, 0x3128,
-  0x3129, 0x02d9, 0x02c9, 0x02ca, 0x02c7, 0x02cb, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  /* 0xa4 */
-  0x4e00, 0x4e59, 0x4e01, 0x4e03, 0x4e43, 0x4e5d, 0x4e86, 0x4e8c,
-  0x4eba, 0x513f, 0x5165, 0x516b, 0x51e0, 0x5200, 0x5201, 0x529b,
-  0x5315, 0x5341, 0x535c, 0x53c8, 0x4e09, 0x4e0b, 0x4e08, 0x4e0a,
-  0x4e2b, 0x4e38, 0x51e1, 0x4e45, 0x4e48, 0x4e5f, 0x4e5e, 0x4e8e,
-  0x4ea1, 0x5140, 0x5203, 0x52fa, 0x5343, 0x53c9, 0x53e3, 0x571f,
-  0x58eb, 0x5915, 0x5927, 0x5973, 0x5b50, 0x5b51, 0x5b53, 0x5bf8,
-  0x5c0f, 0x5c22, 0x5c38, 0x5c71, 0x5ddd, 0x5de5, 0x5df1, 0x5df2,
-  0x5df3, 0x5dfe, 0x5e72, 0x5efe, 0x5f0b, 0x5f13, 0x624d, 0x4e11,
-  0x4e10, 0x4e0d, 0x4e2d, 0x4e30, 0x4e39, 0x4e4b, 0x5c39, 0x4e88,
-  0x4e91, 0x4e95, 0x4e92, 0x4e94, 0x4ea2, 0x4ec1, 0x4ec0, 0x4ec3,
-  0x4ec6, 0x4ec7, 0x4ecd, 0x4eca, 0x4ecb, 0x4ec4, 0x5143, 0x5141,
-  0x5167, 0x516d, 0x516e, 0x516c, 0x5197, 0x51f6, 0x5206, 0x5207,
-  0x5208, 0x52fb, 0x52fe, 0x52ff, 0x5316, 0x5339, 0x5348, 0x5347,
-  0x5345, 0x535e, 0x5384, 0x53cb, 0x53ca, 0x53cd, 0x58ec, 0x5929,
-  0x592b, 0x592a, 0x592d, 0x5b54, 0x5c11, 0x5c24, 0x5c3a, 0x5c6f,
-  0x5df4, 0x5e7b, 0x5eff, 0x5f14, 0x5f15, 0x5fc3, 0x6208, 0x6236,
-  0x624b, 0x624e, 0x652f, 0x6587, 0x6597, 0x65a4, 0x65b9, 0x65e5,
-  0x66f0, 0x6708, 0x6728, 0x6b20, 0x6b62, 0x6b79, 0x6bcb, 0x6bd4,
-  0x6bdb, 0x6c0f, 0x6c34, 0x706b, 0x722a, 0x7236, 0x723b, 0x7247,
-  0x7259, 0x725b, 0x72ac, 0x738b, 0x4e19,
-  /* 0xa5 */
-  0x4e16, 0x4e15, 0x4e14, 0x4e18, 0x4e3b, 0x4e4d, 0x4e4f, 0x4e4e,
-  0x4ee5, 0x4ed8, 0x4ed4, 0x4ed5, 0x4ed6, 0x4ed7, 0x4ee3, 0x4ee4,
-  0x4ed9, 0x4ede, 0x5145, 0x5144, 0x5189, 0x518a, 0x51ac, 0x51f9,
-  0x51fa, 0x51f8, 0x520a, 0x52a0, 0x529f, 0x5305, 0x5306, 0x5317,
-  0x531d, 0x4edf, 0x534a, 0x5349, 0x5361, 0x5360, 0x536f, 0x536e,
-  0x53bb, 0x53ef, 0x53e4, 0x53f3, 0x53ec, 0x53ee, 0x53e9, 0x53e8,
-  0x53fc, 0x53f8, 0x53f5, 0x53eb, 0x53e6, 0x53ea, 0x53f2, 0x53f1,
-  0x53f0, 0x53e5, 0x53ed, 0x53fb, 0x56db, 0x56da, 0x5916, 0x592e,
-  0x5931, 0x5974, 0x5976, 0x5b55, 0x5b83, 0x5c3c, 0x5de8, 0x5de7,
-  0x5de6, 0x5e02, 0x5e03, 0x5e73, 0x5e7c, 0x5f01, 0x5f18, 0x5f17,
-  0x5fc5, 0x620a, 0x6253, 0x6254, 0x6252, 0x6251, 0x65a5, 0x65e6,
-  0x672e, 0x672c, 0x672a, 0x672b, 0x672d, 0x6b63, 0x6bcd, 0x6c11,
-  0x6c10, 0x6c38, 0x6c41, 0x6c40, 0x6c3e, 0x72af, 0x7384, 0x7389,
-  0x74dc, 0x74e6, 0x7518, 0x751f, 0x7528, 0x7529, 0x7530, 0x7531,
-  0x7532, 0x7533, 0x758b, 0x767d, 0x76ae, 0x76bf, 0x76ee, 0x77db,
-  0x77e2, 0x77f3, 0x793a, 0x79be, 0x7a74, 0x7acb, 0x4e1e, 0x4e1f,
-  0x4e52, 0x4e53, 0x4e69, 0x4e99, 0x4ea4, 0x4ea6, 0x4ea5, 0x4eff,
-  0x4f09, 0x4f19, 0x4f0a, 0x4f15, 0x4f0d, 0x4f10, 0x4f11, 0x4f0f,
-  0x4ef2, 0x4ef6, 0x4efb, 0x4ef0, 0x4ef3, 0x4efd, 0x4f01, 0x4f0b,
-  0x5149, 0x5147, 0x5146, 0x5148, 0x5168,
-  /* 0xa6 */
-  0x5171, 0x518d, 0x51b0, 0x5217, 0x5211, 0x5212, 0x520e, 0x5216,
-  0x52a3, 0x5308, 0x5321, 0x5320, 0x5370, 0x5371, 0x5409, 0x540f,
-  0x540c, 0x540a, 0x5410, 0x5401, 0x540b, 0x5404, 0x5411, 0x540d,
-  0x5408, 0x5403, 0x540e, 0x5406, 0x5412, 0x56e0, 0x56de, 0x56dd,
-  0x5733, 0x5730, 0x5728, 0x572d, 0x572c, 0x572f, 0x5729, 0x5919,
-  0x591a, 0x5937, 0x5938, 0x5984, 0x5978, 0x5983, 0x597d, 0x5979,
-  0x5982, 0x5981, 0x5b57, 0x5b58, 0x5b87, 0x5b88, 0x5b85, 0x5b89,
-  0x5bfa, 0x5c16, 0x5c79, 0x5dde, 0x5e06, 0x5e76, 0x5e74, 0x5f0f,
-  0x5f1b, 0x5fd9, 0x5fd6, 0x620e, 0x620c, 0x620d, 0x6210, 0x6263,
-  0x625b, 0x6258, 0x6536, 0x65e9, 0x65e8, 0x65ec, 0x65ed, 0x66f2,
-  0x66f3, 0x6709, 0x673d, 0x6734, 0x6731, 0x6735, 0x6b21, 0x6b64,
-  0x6b7b, 0x6c16, 0x6c5d, 0x6c57, 0x6c59, 0x6c5f, 0x6c60, 0x6c50,
-  0x6c55, 0x6c61, 0x6c5b, 0x6c4d, 0x6c4e, 0x7070, 0x725f, 0x725d,
-  0x767e, 0x7af9, 0x7c73, 0x7cf8, 0x7f36, 0x7f8a, 0x7fbd, 0x8001,
-  0x8003, 0x800c, 0x8012, 0x8033, 0x807f, 0x8089, 0x808b, 0x808c,
-  0x81e3, 0x81ea, 0x81f3, 0x81fc, 0x820c, 0x821b, 0x821f, 0x826e,
-  0x8272, 0x827e, 0x866b, 0x8840, 0x884c, 0x8863, 0x897f, 0x9621,
-  0x4e32, 0x4ea8, 0x4f4d, 0x4f4f, 0x4f47, 0x4f57, 0x4f5e, 0x4f34,
-  0x4f5b, 0x4f55, 0x4f30, 0x4f50, 0x4f51, 0x4f3d, 0x4f3a, 0x4f38,
-  0x4f43, 0x4f54, 0x4f3c, 0x4f46, 0x4f63,
-  /* 0xa7 */
-  0x4f5c, 0x4f60, 0x4f2f, 0x4f4e, 0x4f36, 0x4f59, 0x4f5d, 0x4f48,
-  0x4f5a, 0x514c, 0x514b, 0x514d, 0x5175, 0x51b6, 0x51b7, 0x5225,
-  0x5224, 0x5229, 0x522a, 0x5228, 0x52ab, 0x52a9, 0x52aa, 0x52ac,
-  0x5323, 0x5373, 0x5375, 0x541d, 0x542d, 0x541e, 0x543e, 0x5426,
-  0x544e, 0x5427, 0x5446, 0x5443, 0x5433, 0x5448, 0x5442, 0x541b,
-  0x5429, 0x544a, 0x5439, 0x543b, 0x5438, 0x542e, 0x5435, 0x5436,
-  0x5420, 0x543c, 0x5440, 0x5431, 0x542b, 0x541f, 0x542c, 0x56ea,
-  0x56f0, 0x56e4, 0x56eb, 0x574a, 0x5751, 0x5740, 0x574d, 0x5747,
-  0x574e, 0x573e, 0x5750, 0x574f, 0x573b, 0x58ef, 0x593e, 0x599d,
-  0x5992, 0x59a8, 0x599e, 0x59a3, 0x5999, 0x5996, 0x598d, 0x59a4,
-  0x5993, 0x598a, 0x59a5, 0x5b5d, 0x5b5c, 0x5b5a, 0x5b5b, 0x5b8c,
-  0x5b8b, 0x5b8f, 0x5c2c, 0x5c40, 0x5c41, 0x5c3f, 0x5c3e, 0x5c90,
-  0x5c91, 0x5c94, 0x5c8c, 0x5deb, 0x5e0c, 0x5e8f, 0x5e87, 0x5e8a,
-  0x5ef7, 0x5f04, 0x5f1f, 0x5f64, 0x5f62, 0x5f77, 0x5f79, 0x5fd8,
-  0x5fcc, 0x5fd7, 0x5fcd, 0x5ff1, 0x5feb, 0x5ff8, 0x5fea, 0x6212,
-  0x6211, 0x6284, 0x6297, 0x6296, 0x6280, 0x6276, 0x6289, 0x626d,
-  0x628a, 0x627c, 0x627e, 0x6279, 0x6273, 0x6292, 0x626f, 0x6298,
-  0x626e, 0x6295, 0x6293, 0x6291, 0x6286, 0x6539, 0x653b, 0x6538,
-  0x65f1, 0x66f4, 0x675f, 0x674e, 0x674f, 0x6750, 0x6751, 0x675c,
-  0x6756, 0x675e, 0x6749, 0x6746, 0x6760,
-  /* 0xa8 */
-  0x6753, 0x6757, 0x6b65, 0x6bcf, 0x6c42, 0x6c5e, 0x6c99, 0x6c81,
-  0x6c88, 0x6c89, 0x6c85, 0x6c9b, 0x6c6a, 0x6c7a, 0x6c90, 0x6c70,
-  0x6c8c, 0x6c68, 0x6c96, 0x6c92, 0x6c7d, 0x6c83, 0x6c72, 0x6c7e,
-  0x6c74, 0x6c86, 0x6c76, 0x6c8d, 0x6c94, 0x6c98, 0x6c82, 0x7076,
-  0x707c, 0x707d, 0x7078, 0x7262, 0x7261, 0x7260, 0x72c4, 0x72c2,
-  0x7396, 0x752c, 0x752b, 0x7537, 0x7538, 0x7682, 0x76ef, 0x77e3,
-  0x79c1, 0x79c0, 0x79bf, 0x7a76, 0x7cfb, 0x7f55, 0x8096, 0x8093,
-  0x809d, 0x8098, 0x809b, 0x809a, 0x80b2, 0x826f, 0x8292, 0x828b,
-  0x828d, 0x898b, 0x89d2, 0x8a00, 0x8c37, 0x8c46, 0x8c55, 0x8c9d,
-  0x8d64, 0x8d70, 0x8db3, 0x8eab, 0x8eca, 0x8f9b, 0x8fb0, 0x8fc2,
-  0x8fc6, 0x8fc5, 0x8fc4, 0x5de1, 0x9091, 0x90a2, 0x90aa, 0x90a6,
-  0x90a3, 0x9149, 0x91c6, 0x91cc, 0x9632, 0x962e, 0x9631, 0x962a,
-  0x962c, 0x4e26, 0x4e56, 0x4e73, 0x4e8b, 0x4e9b, 0x4e9e, 0x4eab,
-  0x4eac, 0x4f6f, 0x4f9d, 0x4f8d, 0x4f73, 0x4f7f, 0x4f6c, 0x4f9b,
-  0x4f8b, 0x4f86, 0x4f83, 0x4f70, 0x4f75, 0x4f88, 0x4f69, 0x4f7b,
-  0x4f96, 0x4f7e, 0x4f8f, 0x4f91, 0x4f7a, 0x5154, 0x5152, 0x5155,
-  0x5169, 0x5177, 0x5176, 0x5178, 0x51bd, 0x51fd, 0x523b, 0x5238,
-  0x5237, 0x523a, 0x5230, 0x522e, 0x5236, 0x5241, 0x52be, 0x52bb,
-  0x5352, 0x5354, 0x5353, 0x5351, 0x5366, 0x5377, 0x5378, 0x5379,
-  0x53d6, 0x53d4, 0x53d7, 0x5473, 0x5475,
-  /* 0xa9 */
-  0x5496, 0x5478, 0x5495, 0x5480, 0x547b, 0x5477, 0x5484, 0x5492,
-  0x5486, 0x547c, 0x5490, 0x5471, 0x5476, 0x548c, 0x549a, 0x5462,
-  0x5468, 0x548b, 0x547d, 0x548e, 0x56fa, 0x5783, 0x5777, 0x576a,
-  0x5769, 0x5761, 0x5766, 0x5764, 0x577c, 0x591c, 0x5949, 0x5947,
-  0x5948, 0x5944, 0x5954, 0x59be, 0x59bb, 0x59d4, 0x59b9, 0x59ae,
-  0x59d1, 0x59c6, 0x59d0, 0x59cd, 0x59cb, 0x59d3, 0x59ca, 0x59af,
-  0x59b3, 0x59d2, 0x59c5, 0x5b5f, 0x5b64, 0x5b63, 0x5b97, 0x5b9a,
-  0x5b98, 0x5b9c, 0x5b99, 0x5b9b, 0x5c1a, 0x5c48, 0x5c45, 0x5c46,
-  0x5cb7, 0x5ca1, 0x5cb8, 0x5ca9, 0x5cab, 0x5cb1, 0x5cb3, 0x5e18,
-  0x5e1a, 0x5e16, 0x5e15, 0x5e1b, 0x5e11, 0x5e78, 0x5e9a, 0x5e97,
-  0x5e9c, 0x5e95, 0x5e96, 0x5ef6, 0x5f26, 0x5f27, 0x5f29, 0x5f80,
-  0x5f81, 0x5f7f, 0x5f7c, 0x5fdd, 0x5fe0, 0x5ffd, 0x5ff5, 0x5fff,
-  0x600f, 0x6014, 0x602f, 0x6035, 0x6016, 0x602a, 0x6015, 0x6021,
-  0x6027, 0x6029, 0x602b, 0x601b, 0x6216, 0x6215, 0x623f, 0x623e,
-  0x6240, 0x627f, 0x62c9, 0x62cc, 0x62c4, 0x62bf, 0x62c2, 0x62b9,
-  0x62d2, 0x62db, 0x62ab, 0x62d3, 0x62d4, 0x62cb, 0x62c8, 0x62a8,
-  0x62bd, 0x62bc, 0x62d0, 0x62d9, 0x62c7, 0x62cd, 0x62b5, 0x62da,
-  0x62b1, 0x62d8, 0x62d6, 0x62d7, 0x62c6, 0x62ac, 0x62ce, 0x653e,
-  0x65a7, 0x65bc, 0x65fa, 0x6614, 0x6613, 0x660c, 0x6606, 0x6602,
-  0x660e, 0x6600, 0x660f, 0x6615, 0x660a,
-  /* 0xaa */
-  0x6607, 0x670d, 0x670b, 0x676d, 0x678b, 0x6795, 0x6771, 0x679c,
-  0x6773, 0x6777, 0x6787, 0x679d, 0x6797, 0x676f, 0x6770, 0x677f,
-  0x6789, 0x677e, 0x6790, 0x6775, 0x679a, 0x6793, 0x677c, 0x676a,
-  0x6772, 0x6b23, 0x6b66, 0x6b67, 0x6b7f, 0x6c13, 0x6c1b, 0x6ce3,
-  0x6ce8, 0x6cf3, 0x6cb1, 0x6ccc, 0x6ce5, 0x6cb3, 0x6cbd, 0x6cbe,
-  0x6cbc, 0x6ce2, 0x6cab, 0x6cd5, 0x6cd3, 0x6cb8, 0x6cc4, 0x6cb9,
-  0x6cc1, 0x6cae, 0x6cd7, 0x6cc5, 0x6cf1, 0x6cbf, 0x6cbb, 0x6ce1,
-  0x6cdb, 0x6cca, 0x6cac, 0x6cef, 0x6cdc, 0x6cd6, 0x6ce0, 0x7095,
-  0x708e, 0x7092, 0x708a, 0x7099, 0x722c, 0x722d, 0x7238, 0x7248,
-  0x7267, 0x7269, 0x72c0, 0x72ce, 0x72d9, 0x72d7, 0x72d0, 0x73a9,
-  0x73a8, 0x739f, 0x73ab, 0x73a5, 0x753d, 0x759d, 0x7599, 0x759a,
-  0x7684, 0x76c2, 0x76f2, 0x76f4, 0x77e5, 0x77fd, 0x793e, 0x7940,
-  0x7941, 0x79c9, 0x79c8, 0x7a7a, 0x7a79, 0x7afa, 0x7cfe, 0x7f54,
-  0x7f8c, 0x7f8b, 0x8005, 0x80ba, 0x80a5, 0x80a2, 0x80b1, 0x80a1,
-  0x80ab, 0x80a9, 0x80b4, 0x80aa, 0x80af, 0x81e5, 0x81fe, 0x820d,
-  0x82b3, 0x829d, 0x8299, 0x82ad, 0x82bd, 0x829f, 0x82b9, 0x82b1,
-  0x82ac, 0x82a5, 0x82af, 0x82b8, 0x82a3, 0x82b0, 0x82be, 0x82b7,
-  0x864e, 0x8671, 0x521d, 0x8868, 0x8ecb, 0x8fce, 0x8fd4, 0x8fd1,
-  0x90b5, 0x90b8, 0x90b1, 0x90b6, 0x91c7, 0x91d1, 0x9577, 0x9580,
-  0x961c, 0x9640, 0x963f, 0x963b, 0x9644,
-  /* 0xab */
-  0x9642, 0x96b9, 0x96e8, 0x9752, 0x975e, 0x4e9f, 0x4ead, 0x4eae,
-  0x4fe1, 0x4fb5, 0x4faf, 0x4fbf, 0x4fe0, 0x4fd1, 0x4fcf, 0x4fdd,
-  0x4fc3, 0x4fb6, 0x4fd8, 0x4fdf, 0x4fca, 0x4fd7, 0x4fae, 0x4fd0,
-  0x4fc4, 0x4fc2, 0x4fda, 0x4fce, 0x4fde, 0x4fb7, 0x5157, 0x5192,
-  0x5191, 0x51a0, 0x524e, 0x5243, 0x524a, 0x524d, 0x524c, 0x524b,
-  0x5247, 0x52c7, 0x52c9, 0x52c3, 0x52c1, 0x530d, 0x5357, 0x537b,
-  0x539a, 0x53db, 0x54ac, 0x54c0, 0x54a8, 0x54ce, 0x54c9, 0x54b8,
-  0x54a6, 0x54b3, 0x54c7, 0x54c2, 0x54bd, 0x54aa, 0x54c1, 0x54c4,
-  0x54c8, 0x54af, 0x54ab, 0x54b1, 0x54bb, 0x54a9, 0x54a7, 0x54bf,
-  0x56ff, 0x5782, 0x578b, 0x57a0, 0x57a3, 0x57a2, 0x57ce, 0x57ae,
-  0x5793, 0x5955, 0x5951, 0x594f, 0x594e, 0x5950, 0x59dc, 0x59d8,
-  0x59ff, 0x59e3, 0x59e8, 0x5a03, 0x59e5, 0x59ea, 0x59da, 0x59e6,
-  0x5a01, 0x59fb, 0x5b69, 0x5ba3, 0x5ba6, 0x5ba4, 0x5ba2, 0x5ba5,
-  0x5c01, 0x5c4e, 0x5c4f, 0x5c4d, 0x5c4b, 0x5cd9, 0x5cd2, 0x5df7,
-  0x5e1d, 0x5e25, 0x5e1f, 0x5e7d, 0x5ea0, 0x5ea6, 0x5efa, 0x5f08,
-  0x5f2d, 0x5f65, 0x5f88, 0x5f85, 0x5f8a, 0x5f8b, 0x5f87, 0x5f8c,
-  0x5f89, 0x6012, 0x601d, 0x6020, 0x6025, 0x600e, 0x6028, 0x604d,
-  0x6070, 0x6068, 0x6062, 0x6046, 0x6043, 0x606c, 0x606b, 0x606a,
-  0x6064, 0x6241, 0x62dc, 0x6316, 0x6309, 0x62fc, 0x62ed, 0x6301,
-  0x62ee, 0x62fd, 0x6307, 0x62f1, 0x62f7,
-  /* 0xac */
-  0x62ef, 0x62ec, 0x62fe, 0x62f4, 0x6311, 0x6302, 0x653f, 0x6545,
-  0x65ab, 0x65bd, 0x65e2, 0x6625, 0x662d, 0x6620, 0x6627, 0x662f,
-  0x661f, 0x6628, 0x6631, 0x6624, 0x66f7, 0x67ff, 0x67d3, 0x67f1,
-  0x67d4, 0x67d0, 0x67ec, 0x67b6, 0x67af, 0x67f5, 0x67e9, 0x67ef,
-  0x67c4, 0x67d1, 0x67b4, 0x67da, 0x67e5, 0x67b8, 0x67cf, 0x67de,
-  0x67f3, 0x67b0, 0x67d9, 0x67e2, 0x67dd, 0x67d2, 0x6b6a, 0x6b83,
-  0x6b86, 0x6bb5, 0x6bd2, 0x6bd7, 0x6c1f, 0x6cc9, 0x6d0b, 0x6d32,
-  0x6d2a, 0x6d41, 0x6d25, 0x6d0c, 0x6d31, 0x6d1e, 0x6d17, 0x6d3b,
-  0x6d3d, 0x6d3e, 0x6d36, 0x6d1b, 0x6cf5, 0x6d39, 0x6d27, 0x6d38,
-  0x6d29, 0x6d2e, 0x6d35, 0x6d0e, 0x6d2b, 0x70ab, 0x70ba, 0x70b3,
-  0x70ac, 0x70af, 0x70ad, 0x70b8, 0x70ae, 0x70a4, 0x7230, 0x7272,
-  0x726f, 0x7274, 0x72e9, 0x72e0, 0x72e1, 0x73b7, 0x73ca, 0x73bb,
-  0x73b2, 0x73cd, 0x73c0, 0x73b3, 0x751a, 0x752d, 0x754f, 0x754c,
-  0x754e, 0x754b, 0x75ab, 0x75a4, 0x75a5, 0x75a2, 0x75a3, 0x7678,
-  0x7686, 0x7687, 0x7688, 0x76c8, 0x76c6, 0x76c3, 0x76c5, 0x7701,
-  0x76f9, 0x76f8, 0x7709, 0x770b, 0x76fe, 0x76fc, 0x7707, 0x77dc,
-  0x7802, 0x7814, 0x780c, 0x780d, 0x7946, 0x7949, 0x7948, 0x7947,
-  0x79b9, 0x79ba, 0x79d1, 0x79d2, 0x79cb, 0x7a7f, 0x7a81, 0x7aff,
-  0x7afd, 0x7c7d, 0x7d02, 0x7d05, 0x7d00, 0x7d09, 0x7d07, 0x7d04,
-  0x7d06, 0x7f38, 0x7f8e, 0x7fbf, 0x8004,
-  /* 0xad */
-  0x8010, 0x800d, 0x8011, 0x8036, 0x80d6, 0x80e5, 0x80da, 0x80c3,
-  0x80c4, 0x80cc, 0x80e1, 0x80db, 0x80ce, 0x80de, 0x80e4, 0x80dd,
-  0x81f4, 0x8222, 0x82e7, 0x8303, 0x8305, 0x82e3, 0x82db, 0x82e6,
-  0x8304, 0x82e5, 0x8302, 0x8309, 0x82d2, 0x82d7, 0x82f1, 0x8301,
-  0x82dc, 0x82d4, 0x82d1, 0x82de, 0x82d3, 0x82df, 0x82ef, 0x8306,
-  0x8650, 0x8679, 0x867b, 0x867a, 0x884d, 0x886b, 0x8981, 0x89d4,
-  0x8a08, 0x8a02, 0x8a03, 0x8c9e, 0x8ca0, 0x8d74, 0x8d73, 0x8db4,
-  0x8ecd, 0x8ecc, 0x8ff0, 0x8fe6, 0x8fe2, 0x8fea, 0x8fe5, 0x8fed,
-  0x8feb, 0x8fe4, 0x8fe8, 0x90ca, 0x90ce, 0x90c1, 0x90c3, 0x914b,
-  0x914a, 0x91cd, 0x9582, 0x9650, 0x964b, 0x964c, 0x964d, 0x9762,
-  0x9769, 0x97cb, 0x97ed, 0x97f3, 0x9801, 0x98a8, 0x98db, 0x98df,
-  0x9996, 0x9999, 0x4e58, 0x4eb3, 0x500c, 0x500d, 0x5023, 0x4fef,
-  0x5026, 0x5025, 0x4ff8, 0x5029, 0x5016, 0x5006, 0x503c, 0x501f,
-  0x501a, 0x5012, 0x5011, 0x4ffa, 0x5000, 0x5014, 0x5028, 0x4ff1,
-  0x5021, 0x500b, 0x5019, 0x5018, 0x4ff3, 0x4fee, 0x502d, 0x502a,
-  0x4ffe, 0x502b, 0x5009, 0x517c, 0x51a4, 0x51a5, 0x51a2, 0x51cd,
-  0x51cc, 0x51c6, 0x51cb, 0x5256, 0x525c, 0x5254, 0x525b, 0x525d,
-  0x532a, 0x537f, 0x539f, 0x539d, 0x53df, 0x54e8, 0x5510, 0x5501,
-  0x5537, 0x54fc, 0x54e5, 0x54f2, 0x5506, 0x54fa, 0x5514, 0x54e9,
-  0x54ed, 0x54e1, 0x5509, 0x54ee, 0x54ea,
-  /* 0xae */
-  0x54e6, 0x5527, 0x5507, 0x54fd, 0x550f, 0x5703, 0x5704, 0x57c2,
-  0x57d4, 0x57cb, 0x57c3, 0x5809, 0x590f, 0x5957, 0x5958, 0x595a,
-  0x5a11, 0x5a18, 0x5a1c, 0x5a1f, 0x5a1b, 0x5a13, 0x59ec, 0x5a20,
-  0x5a23, 0x5a29, 0x5a25, 0x5a0c, 0x5a09, 0x5b6b, 0x5c58, 0x5bb0,
-  0x5bb3, 0x5bb6, 0x5bb4, 0x5bae, 0x5bb5, 0x5bb9, 0x5bb8, 0x5c04,
-  0x5c51, 0x5c55, 0x5c50, 0x5ced, 0x5cfd, 0x5cfb, 0x5cea, 0x5ce8,
-  0x5cf0, 0x5cf6, 0x5d01, 0x5cf4, 0x5dee, 0x5e2d, 0x5e2b, 0x5eab,
-  0x5ead, 0x5ea7, 0x5f31, 0x5f92, 0x5f91, 0x5f90, 0x6059, 0x6063,
-  0x6065, 0x6050, 0x6055, 0x606d, 0x6069, 0x606f, 0x6084, 0x609f,
-  0x609a, 0x608d, 0x6094, 0x608c, 0x6085, 0x6096, 0x6247, 0x62f3,
-  0x6308, 0x62ff, 0x634e, 0x633e, 0x632f, 0x6355, 0x6342, 0x6346,
-  0x634f, 0x6349, 0x633a, 0x6350, 0x633d, 0x632a, 0x632b, 0x6328,
-  0x634d, 0x634c, 0x6548, 0x6549, 0x6599, 0x65c1, 0x65c5, 0x6642,
-  0x6649, 0x664f, 0x6643, 0x6652, 0x664c, 0x6645, 0x6641, 0x66f8,
-  0x6714, 0x6715, 0x6717, 0x6821, 0x6838, 0x6848, 0x6846, 0x6853,
-  0x6839, 0x6842, 0x6854, 0x6829, 0x68b3, 0x6817, 0x684c, 0x6851,
-  0x683d, 0x67f4, 0x6850, 0x6840, 0x683c, 0x6843, 0x682a, 0x6845,
-  0x6813, 0x6818, 0x6841, 0x6b8a, 0x6b89, 0x6bb7, 0x6c23, 0x6c27,
-  0x6c28, 0x6c26, 0x6c24, 0x6cf0, 0x6d6a, 0x6d95, 0x6d88, 0x6d87,
-  0x6d66, 0x6d78, 0x6d77, 0x6d59, 0x6d93,
-  /* 0xaf */
-  0x6d6c, 0x6d89, 0x6d6e, 0x6d5a, 0x6d74, 0x6d69, 0x6d8c, 0x6d8a,
-  0x6d79, 0x6d85, 0x6d65, 0x6d94, 0x70ca, 0x70d8, 0x70e4, 0x70d9,
-  0x70c8, 0x70cf, 0x7239, 0x7279, 0x72fc, 0x72f9, 0x72fd, 0x72f8,
-  0x72f7, 0x7386, 0x73ed, 0x7409, 0x73ee, 0x73e0, 0x73ea, 0x73de,
-  0x7554, 0x755d, 0x755c, 0x755a, 0x7559, 0x75be, 0x75c5, 0x75c7,
-  0x75b2, 0x75b3, 0x75bd, 0x75bc, 0x75b9, 0x75c2, 0x75b8, 0x768b,
-  0x76b0, 0x76ca, 0x76cd, 0x76ce, 0x7729, 0x771f, 0x7720, 0x7728,
-  0x77e9, 0x7830, 0x7827, 0x7838, 0x781d, 0x7834, 0x7837, 0x7825,
-  0x782d, 0x7820, 0x781f, 0x7832, 0x7955, 0x7950, 0x7960, 0x795f,
-  0x7956, 0x795e, 0x795d, 0x7957, 0x795a, 0x79e4, 0x79e3, 0x79e7,
-  0x79df, 0x79e6, 0x79e9, 0x79d8, 0x7a84, 0x7a88, 0x7ad9, 0x7b06,
-  0x7b11, 0x7c89, 0x7d21, 0x7d17, 0x7d0b, 0x7d0a, 0x7d20, 0x7d22,
-  0x7d14, 0x7d10, 0x7d15, 0x7d1a, 0x7d1c, 0x7d0d, 0x7d19, 0x7d1b,
-  0x7f3a, 0x7f5f, 0x7f94, 0x7fc5, 0x7fc1, 0x8006, 0x8018, 0x8015,
-  0x8019, 0x8017, 0x803d, 0x803f, 0x80f1, 0x8102, 0x80f0, 0x8105,
-  0x80ed, 0x80f4, 0x8106, 0x80f8, 0x80f3, 0x8108, 0x80fd, 0x810a,
-  0x80fc, 0x80ef, 0x81ed, 0x81ec, 0x8200, 0x8210, 0x822a, 0x822b,
-  0x8228, 0x822c, 0x82bb, 0x832b, 0x8352, 0x8354, 0x834a, 0x8338,
-  0x8350, 0x8349, 0x8335, 0x8334, 0x834f, 0x8332, 0x8339, 0x8336,
-  0x8317, 0x8340, 0x8331, 0x8328, 0x8343,
-  /* 0xb0 */
-  0x8654, 0x868a, 0x86aa, 0x8693, 0x86a4, 0x86a9, 0x868c, 0x86a3,
-  0x869c, 0x8870, 0x8877, 0x8881, 0x8882, 0x887d, 0x8879, 0x8a18,
-  0x8a10, 0x8a0e, 0x8a0c, 0x8a15, 0x8a0a, 0x8a17, 0x8a13, 0x8a16,
-  0x8a0f, 0x8a11, 0x8c48, 0x8c7a, 0x8c79, 0x8ca1, 0x8ca2, 0x8d77,
-  0x8eac, 0x8ed2, 0x8ed4, 0x8ecf, 0x8fb1, 0x9001, 0x9006, 0x8ff7,
-  0x9000, 0x8ffa, 0x8ff4, 0x9003, 0x8ffd, 0x9005, 0x8ff8, 0x9095,
-  0x90e1, 0x90dd, 0x90e2, 0x9152, 0x914d, 0x914c, 0x91d8, 0x91dd,
-  0x91d7, 0x91dc, 0x91d9, 0x9583, 0x9662, 0x9663, 0x9661, 0x965b,
-  0x965d, 0x9664, 0x9658, 0x965e, 0x96bb, 0x98e2, 0x99ac, 0x9aa8,
-  0x9ad8, 0x9b25, 0x9b32, 0x9b3c, 0x4e7e, 0x507a, 0x507d, 0x505c,
-  0x5047, 0x5043, 0x504c, 0x505a, 0x5049, 0x5065, 0x5076, 0x504e,
-  0x5055, 0x5075, 0x5074, 0x5077, 0x504f, 0x500f, 0x506f, 0x506d,
-  0x515c, 0x5195, 0x51f0, 0x526a, 0x526f, 0x52d2, 0x52d9, 0x52d8,
-  0x52d5, 0x5310, 0x530f, 0x5319, 0x533f, 0x5340, 0x533e, 0x53c3,
-  0x66fc, 0x5546, 0x556a, 0x5566, 0x5544, 0x555e, 0x5561, 0x5543,
-  0x554a, 0x5531, 0x5556, 0x554f, 0x5555, 0x552f, 0x5564, 0x5538,
-  0x552e, 0x555c, 0x552c, 0x5563, 0x5533, 0x5541, 0x5557, 0x5708,
-  0x570b, 0x5709, 0x57df, 0x5805, 0x580a, 0x5806, 0x57e0, 0x57e4,
-  0x57fa, 0x5802, 0x5835, 0x57f7, 0x57f9, 0x5920, 0x5962, 0x5a36,
-  0x5a41, 0x5a49, 0x5a66, 0x5a6a, 0x5a40,
-  /* 0xb1 */
-  0x5a3c, 0x5a62, 0x5a5a, 0x5a46, 0x5a4a, 0x5b70, 0x5bc7, 0x5bc5,
-  0x5bc4, 0x5bc2, 0x5bbf, 0x5bc6, 0x5c09, 0x5c08, 0x5c07, 0x5c60,
-  0x5c5c, 0x5c5d, 0x5d07, 0x5d06, 0x5d0e, 0x5d1b, 0x5d16, 0x5d22,
-  0x5d11, 0x5d29, 0x5d14, 0x5d19, 0x5d24, 0x5d27, 0x5d17, 0x5de2,
-  0x5e38, 0x5e36, 0x5e33, 0x5e37, 0x5eb7, 0x5eb8, 0x5eb6, 0x5eb5,
-  0x5ebe, 0x5f35, 0x5f37, 0x5f57, 0x5f6c, 0x5f69, 0x5f6b, 0x5f97,
-  0x5f99, 0x5f9e, 0x5f98, 0x5fa1, 0x5fa0, 0x5f9c, 0x607f, 0x60a3,
-  0x6089, 0x60a0, 0x60a8, 0x60cb, 0x60b4, 0x60e6, 0x60bd, 0x60c5,
-  0x60bb, 0x60b5, 0x60dc, 0x60bc, 0x60d8, 0x60d5, 0x60c6, 0x60df,
-  0x60b8, 0x60da, 0x60c7, 0x621a, 0x621b, 0x6248, 0x63a0, 0x63a7,
-  0x6372, 0x6396, 0x63a2, 0x63a5, 0x6377, 0x6367, 0x6398, 0x63aa,
-  0x6371, 0x63a9, 0x6389, 0x6383, 0x639b, 0x636b, 0x63a8, 0x6384,
-  0x6388, 0x6399, 0x63a1, 0x63ac, 0x6392, 0x638f, 0x6380, 0x637b,
-  0x6369, 0x6368, 0x637a, 0x655d, 0x6556, 0x6551, 0x6559, 0x6557,
-  0x555f, 0x654f, 0x6558, 0x6555, 0x6554, 0x659c, 0x659b, 0x65ac,
-  0x65cf, 0x65cb, 0x65cc, 0x65ce, 0x665d, 0x665a, 0x6664, 0x6668,
-  0x6666, 0x665e, 0x66f9, 0x52d7, 0x671b, 0x6881, 0x68af, 0x68a2,
-  0x6893, 0x68b5, 0x687f, 0x6876, 0x68b1, 0x68a7, 0x6897, 0x68b0,
-  0x6883, 0x68c4, 0x68ad, 0x6886, 0x6885, 0x6894, 0x689d, 0x68a8,
-  0x689f, 0x68a1, 0x6882, 0x6b32, 0x6bba,
-  /* 0xb2 */
-  0x6beb, 0x6bec, 0x6c2b, 0x6d8e, 0x6dbc, 0x6df3, 0x6dd9, 0x6db2,
-  0x6de1, 0x6dcc, 0x6de4, 0x6dfb, 0x6dfa, 0x6e05, 0x6dc7, 0x6dcb,
-  0x6daf, 0x6dd1, 0x6dae, 0x6dde, 0x6df9, 0x6db8, 0x6df7, 0x6df5,
-  0x6dc5, 0x6dd2, 0x6e1a, 0x6db5, 0x6dda, 0x6deb, 0x6dd8, 0x6dea,
-  0x6df1, 0x6dee, 0x6de8, 0x6dc6, 0x6dc4, 0x6daa, 0x6dec, 0x6dbf,
-  0x6de6, 0x70f9, 0x7109, 0x710a, 0x70fd, 0x70ef, 0x723d, 0x727d,
-  0x7281, 0x731c, 0x731b, 0x7316, 0x7313, 0x7319, 0x7387, 0x7405,
-  0x740a, 0x7403, 0x7406, 0x73fe, 0x740d, 0x74e0, 0x74f6, 0x74f7,
-  0x751c, 0x7522, 0x7565, 0x7566, 0x7562, 0x7570, 0x758f, 0x75d4,
-  0x75d5, 0x75b5, 0x75ca, 0x75cd, 0x768e, 0x76d4, 0x76d2, 0x76db,
-  0x7737, 0x773e, 0x773c, 0x7736, 0x7738, 0x773a, 0x786b, 0x7843,
-  0x784e, 0x7965, 0x7968, 0x796d, 0x79fb, 0x7a92, 0x7a95, 0x7b20,
-  0x7b28, 0x7b1b, 0x7b2c, 0x7b26, 0x7b19, 0x7b1e, 0x7b2e, 0x7c92,
-  0x7c97, 0x7c95, 0x7d46, 0x7d43, 0x7d71, 0x7d2e, 0x7d39, 0x7d3c,
-  0x7d40, 0x7d30, 0x7d33, 0x7d44, 0x7d2f, 0x7d42, 0x7d32, 0x7d31,
-  0x7f3d, 0x7f9e, 0x7f9a, 0x7fcc, 0x7fce, 0x7fd2, 0x801c, 0x804a,
-  0x8046, 0x812f, 0x8116, 0x8123, 0x812b, 0x8129, 0x8130, 0x8124,
-  0x8202, 0x8235, 0x8237, 0x8236, 0x8239, 0x838e, 0x839e, 0x8398,
-  0x8378, 0x83a2, 0x8396, 0x83bd, 0x83ab, 0x8392, 0x838a, 0x8393,
-  0x8389, 0x83a0, 0x8377, 0x837b, 0x837c,
-  /* 0xb3 */
-  0x8386, 0x83a7, 0x8655, 0x5f6a, 0x86c7, 0x86c0, 0x86b6, 0x86c4,
-  0x86b5, 0x86c6, 0x86cb, 0x86b1, 0x86af, 0x86c9, 0x8853, 0x889e,
-  0x8888, 0x88ab, 0x8892, 0x8896, 0x888d, 0x888b, 0x8993, 0x898f,
-  0x8a2a, 0x8a1d, 0x8a23, 0x8a25, 0x8a31, 0x8a2d, 0x8a1f, 0x8a1b,
-  0x8a22, 0x8c49, 0x8c5a, 0x8ca9, 0x8cac, 0x8cab, 0x8ca8, 0x8caa,
-  0x8ca7, 0x8d67, 0x8d66, 0x8dbe, 0x8dba, 0x8edb, 0x8edf, 0x9019,
-  0x900d, 0x901a, 0x9017, 0x9023, 0x901f, 0x901d, 0x9010, 0x9015,
-  0x901e, 0x9020, 0x900f, 0x9022, 0x9016, 0x901b, 0x9014, 0x90e8,
-  0x90ed, 0x90fd, 0x9157, 0x91ce, 0x91f5, 0x91e6, 0x91e3, 0x91e7,
-  0x91ed, 0x91e9, 0x9589, 0x966a, 0x9675, 0x9673, 0x9678, 0x9670,
-  0x9674, 0x9676, 0x9677, 0x966c, 0x96c0, 0x96ea, 0x96e9, 0x7ae0,
-  0x7adf, 0x9802, 0x9803, 0x9b5a, 0x9ce5, 0x9e75, 0x9e7f, 0x9ea5,
-  0x9ebb, 0x50a2, 0x508d, 0x5085, 0x5099, 0x5091, 0x5080, 0x5096,
-  0x5098, 0x509a, 0x6700, 0x51f1, 0x5272, 0x5274, 0x5275, 0x5269,
-  0x52de, 0x52dd, 0x52db, 0x535a, 0x53a5, 0x557b, 0x5580, 0x55a7,
-  0x557c, 0x558a, 0x559d, 0x5598, 0x5582, 0x559c, 0x55aa, 0x5594,
-  0x5587, 0x558b, 0x5583, 0x55b3, 0x55ae, 0x559f, 0x553e, 0x55b2,
-  0x559a, 0x55bb, 0x55ac, 0x55b1, 0x557e, 0x5589, 0x55ab, 0x5599,
-  0x570d, 0x582f, 0x582a, 0x5834, 0x5824, 0x5830, 0x5831, 0x5821,
-  0x581d, 0x5820, 0x58f9, 0x58fa, 0x5960,
-  /* 0xb4 */
-  0x5a77, 0x5a9a, 0x5a7f, 0x5a92, 0x5a9b, 0x5aa7, 0x5b73, 0x5b71,
-  0x5bd2, 0x5bcc, 0x5bd3, 0x5bd0, 0x5c0a, 0x5c0b, 0x5c31, 0x5d4c,
-  0x5d50, 0x5d34, 0x5d47, 0x5dfd, 0x5e45, 0x5e3d, 0x5e40, 0x5e43,
-  0x5e7e, 0x5eca, 0x5ec1, 0x5ec2, 0x5ec4, 0x5f3c, 0x5f6d, 0x5fa9,
-  0x5faa, 0x5fa8, 0x60d1, 0x60e1, 0x60b2, 0x60b6, 0x60e0, 0x611c,
-  0x6123, 0x60fa, 0x6115, 0x60f0, 0x60fb, 0x60f4, 0x6168, 0x60f1,
-  0x610e, 0x60f6, 0x6109, 0x6100, 0x6112, 0x621f, 0x6249, 0x63a3,
-  0x638c, 0x63cf, 0x63c0, 0x63e9, 0x63c9, 0x63c6, 0x63cd, 0x63d2,
-  0x63e3, 0x63d0, 0x63e1, 0x63d6, 0x63ed, 0x63ee, 0x6376, 0x63f4,
-  0x63ea, 0x63db, 0x6452, 0x63da, 0x63f9, 0x655e, 0x6566, 0x6562,
-  0x6563, 0x6591, 0x6590, 0x65af, 0x666e, 0x6670, 0x6674, 0x6676,
-  0x666f, 0x6691, 0x667a, 0x667e, 0x6677, 0x66fe, 0x66ff, 0x671f,
-  0x671d, 0x68fa, 0x68d5, 0x68e0, 0x68d8, 0x68d7, 0x6905, 0x68df,
-  0x68f5, 0x68ee, 0x68e7, 0x68f9, 0x68d2, 0x68f2, 0x68e3, 0x68cb,
-  0x68cd, 0x690d, 0x6912, 0x690e, 0x68c9, 0x68da, 0x696e, 0x68fb,
-  0x6b3e, 0x6b3a, 0x6b3d, 0x6b98, 0x6b96, 0x6bbc, 0x6bef, 0x6c2e,
-  0x6c2f, 0x6c2c, 0x6e2f, 0x6e38, 0x6e54, 0x6e21, 0x6e32, 0x6e67,
-  0x6e4a, 0x6e20, 0x6e25, 0x6e23, 0x6e1b, 0x6e5b, 0x6e58, 0x6e24,
-  0x6e56, 0x6e6e, 0x6e2d, 0x6e26, 0x6e6f, 0x6e34, 0x6e4d, 0x6e3a,
-  0x6e2c, 0x6e43, 0x6e1d, 0x6e3e, 0x6ecb,
-  /* 0xb5 */
-  0x6e89, 0x6e19, 0x6e4e, 0x6e63, 0x6e44, 0x6e72, 0x6e69, 0x6e5f,
-  0x7119, 0x711a, 0x7126, 0x7130, 0x7121, 0x7136, 0x716e, 0x711c,
-  0x724c, 0x7284, 0x7280, 0x7336, 0x7325, 0x7334, 0x7329, 0x743a,
-  0x742a, 0x7433, 0x7422, 0x7425, 0x7435, 0x7436, 0x7434, 0x742f,
-  0x741b, 0x7426, 0x7428, 0x7525, 0x7526, 0x756b, 0x756a, 0x75e2,
-  0x75db, 0x75e3, 0x75d9, 0x75d8, 0x75de, 0x75e0, 0x767b, 0x767c,
-  0x7696, 0x7693, 0x76b4, 0x76dc, 0x774f, 0x77ed, 0x785d, 0x786c,
-  0x786f, 0x7a0d, 0x7a08, 0x7a0b, 0x7a05, 0x7a00, 0x7a98, 0x7a97,
-  0x7a96, 0x7ae5, 0x7ae3, 0x7b49, 0x7b56, 0x7b46, 0x7b50, 0x7b52,
-  0x7b54, 0x7b4d, 0x7b4b, 0x7b4f, 0x7b51, 0x7c9f, 0x7ca5, 0x7d5e,
-  0x7d50, 0x7d68, 0x7d55, 0x7d2b, 0x7d6e, 0x7d72, 0x7d61, 0x7d66,
-  0x7d62, 0x7d70, 0x7d73, 0x5584, 0x7fd4, 0x7fd5, 0x800b, 0x8052,
-  0x8085, 0x8155, 0x8154, 0x814b, 0x8151, 0x814e, 0x8139, 0x8146,
-  0x813e, 0x814c, 0x8153, 0x8174, 0x8212, 0x821c, 0x83e9, 0x8403,
-  0x83f8, 0x840d, 0x83e0, 0x83c5, 0x840b, 0x83c1, 0x83ef, 0x83f1,
-  0x83f4, 0x8457, 0x840a, 0x83f0, 0x840c, 0x83cc, 0x83fd, 0x83f2,
-  0x83ca, 0x8438, 0x840e, 0x8404, 0x83dc, 0x8407, 0x83d4, 0x83df,
-  0x865b, 0x86df, 0x86d9, 0x86ed, 0x86d4, 0x86db, 0x86e4, 0x86d0,
-  0x86de, 0x8857, 0x88c1, 0x88c2, 0x88b1, 0x8983, 0x8996, 0x8a3b,
-  0x8a60, 0x8a55, 0x8a5e, 0x8a3c, 0x8a41,
-  /* 0xb6 */
-  0x8a54, 0x8a5b, 0x8a50, 0x8a46, 0x8a34, 0x8a3a, 0x8a36, 0x8a56,
-  0x8c61, 0x8c82, 0x8caf, 0x8cbc, 0x8cb3, 0x8cbd, 0x8cc1, 0x8cbb,
-  0x8cc0, 0x8cb4, 0x8cb7, 0x8cb6, 0x8cbf, 0x8cb8, 0x8d8a, 0x8d85,
-  0x8d81, 0x8dce, 0x8ddd, 0x8dcb, 0x8dda, 0x8dd1, 0x8dcc, 0x8ddb,
-  0x8dc6, 0x8efb, 0x8ef8, 0x8efc, 0x8f9c, 0x902e, 0x9035, 0x9031,
-  0x9038, 0x9032, 0x9036, 0x9102, 0x90f5, 0x9109, 0x90fe, 0x9163,
-  0x9165, 0x91cf, 0x9214, 0x9215, 0x9223, 0x9209, 0x921e, 0x920d,
-  0x9210, 0x9207, 0x9211, 0x9594, 0x958f, 0x958b, 0x9591, 0x9593,
-  0x9592, 0x958e, 0x968a, 0x968e, 0x968b, 0x967d, 0x9685, 0x9686,
-  0x968d, 0x9672, 0x9684, 0x96c1, 0x96c5, 0x96c4, 0x96c6, 0x96c7,
-  0x96ef, 0x96f2, 0x97cc, 0x9805, 0x9806, 0x9808, 0x98e7, 0x98ea,
-  0x98ef, 0x98e9, 0x98f2, 0x98ed, 0x99ae, 0x99ad, 0x9ec3, 0x9ecd,
-  0x9ed1, 0x4e82, 0x50ad, 0x50b5, 0x50b2, 0x50b3, 0x50c5, 0x50be,
-  0x50ac, 0x50b7, 0x50bb, 0x50af, 0x50c7, 0x527f, 0x5277, 0x527d,
-  0x52df, 0x52e6, 0x52e4, 0x52e2, 0x52e3, 0x532f, 0x55df, 0x55e8,
-  0x55d3, 0x55e6, 0x55ce, 0x55dc, 0x55c7, 0x55d1, 0x55e3, 0x55e4,
-  0x55ef, 0x55da, 0x55e1, 0x55c5, 0x55c6, 0x55e5, 0x55c9, 0x5712,
-  0x5713, 0x585e, 0x5851, 0x5858, 0x5857, 0x585a, 0x5854, 0x586b,
-  0x584c, 0x586d, 0x584a, 0x5862, 0x5852, 0x584b, 0x5967, 0x5ac1,
-  0x5ac9, 0x5acc, 0x5abe, 0x5abd, 0x5abc,
-  /* 0xb7 */
-  0x5ab3, 0x5ac2, 0x5ab2, 0x5d69, 0x5d6f, 0x5e4c, 0x5e79, 0x5ec9,
-  0x5ec8, 0x5f12, 0x5f59, 0x5fac, 0x5fae, 0x611a, 0x610f, 0x6148,
-  0x611f, 0x60f3, 0x611b, 0x60f9, 0x6101, 0x6108, 0x614e, 0x614c,
-  0x6144, 0x614d, 0x613e, 0x6134, 0x6127, 0x610d, 0x6106, 0x6137,
-  0x6221, 0x6222, 0x6413, 0x643e, 0x641e, 0x642a, 0x642d, 0x643d,
-  0x642c, 0x640f, 0x641c, 0x6414, 0x640d, 0x6436, 0x6416, 0x6417,
-  0x6406, 0x656c, 0x659f, 0x65b0, 0x6697, 0x6689, 0x6687, 0x6688,
-  0x6696, 0x6684, 0x6698, 0x668d, 0x6703, 0x6994, 0x696d, 0x695a,
-  0x6977, 0x6960, 0x6954, 0x6975, 0x6930, 0x6982, 0x694a, 0x6968,
-  0x696b, 0x695e, 0x6953, 0x6979, 0x6986, 0x695d, 0x6963, 0x695b,
-  0x6b47, 0x6b72, 0x6bc0, 0x6bbf, 0x6bd3, 0x6bfd, 0x6ea2, 0x6eaf,
-  0x6ed3, 0x6eb6, 0x6ec2, 0x6e90, 0x6e9d, 0x6ec7, 0x6ec5, 0x6ea5,
-  0x6e98, 0x6ebc, 0x6eba, 0x6eab, 0x6ed1, 0x6e96, 0x6e9c, 0x6ec4,
-  0x6ed4, 0x6eaa, 0x6ea7, 0x6eb4, 0x714e, 0x7159, 0x7169, 0x7164,
-  0x7149, 0x7167, 0x715c, 0x716c, 0x7166, 0x714c, 0x7165, 0x715e,
-  0x7146, 0x7168, 0x7156, 0x723a, 0x7252, 0x7337, 0x7345, 0x733f,
-  0x733e, 0x746f, 0x745a, 0x7455, 0x745f, 0x745e, 0x7441, 0x743f,
-  0x7459, 0x745b, 0x745c, 0x7576, 0x7578, 0x7600, 0x75f0, 0x7601,
-  0x75f2, 0x75f1, 0x75fa, 0x75ff, 0x75f4, 0x75f3, 0x76de, 0x76df,
-  0x775b, 0x776b, 0x7766, 0x775e, 0x7763,
-  /* 0xb8 */
-  0x7779, 0x776a, 0x776c, 0x775c, 0x7765, 0x7768, 0x7762, 0x77ee,
-  0x788e, 0x78b0, 0x7897, 0x7898, 0x788c, 0x7889, 0x787c, 0x7891,
-  0x7893, 0x787f, 0x797a, 0x797f, 0x7981, 0x842c, 0x79bd, 0x7a1c,
-  0x7a1a, 0x7a20, 0x7a14, 0x7a1f, 0x7a1e, 0x7a9f, 0x7aa0, 0x7b77,
-  0x7bc0, 0x7b60, 0x7b6e, 0x7b67, 0x7cb1, 0x7cb3, 0x7cb5, 0x7d93,
-  0x7d79, 0x7d91, 0x7d81, 0x7d8f, 0x7d5b, 0x7f6e, 0x7f69, 0x7f6a,
-  0x7f72, 0x7fa9, 0x7fa8, 0x7fa4, 0x8056, 0x8058, 0x8086, 0x8084,
-  0x8171, 0x8170, 0x8178, 0x8165, 0x816e, 0x8173, 0x816b, 0x8179,
-  0x817a, 0x8166, 0x8205, 0x8247, 0x8482, 0x8477, 0x843d, 0x8431,
-  0x8475, 0x8466, 0x846b, 0x8449, 0x846c, 0x845b, 0x843c, 0x8435,
-  0x8461, 0x8463, 0x8469, 0x846d, 0x8446, 0x865e, 0x865c, 0x865f,
-  0x86f9, 0x8713, 0x8708, 0x8707, 0x8700, 0x86fe, 0x86fb, 0x8702,
-  0x8703, 0x8706, 0x870a, 0x8859, 0x88df, 0x88d4, 0x88d9, 0x88dc,
-  0x88d8, 0x88dd, 0x88e1, 0x88ca, 0x88d5, 0x88d2, 0x899c, 0x89e3,
-  0x8a6b, 0x8a72, 0x8a73, 0x8a66, 0x8a69, 0x8a70, 0x8a87, 0x8a7c,
-  0x8a63, 0x8aa0, 0x8a71, 0x8a85, 0x8a6d, 0x8a62, 0x8a6e, 0x8a6c,
-  0x8a79, 0x8a7b, 0x8a3e, 0x8a68, 0x8c62, 0x8c8a, 0x8c89, 0x8cca,
-  0x8cc7, 0x8cc8, 0x8cc4, 0x8cb2, 0x8cc3, 0x8cc2, 0x8cc5, 0x8de1,
-  0x8ddf, 0x8de8, 0x8def, 0x8df3, 0x8dfa, 0x8dea, 0x8de4, 0x8de6,
-  0x8eb2, 0x8f03, 0x8f09, 0x8efe, 0x8f0a,
-  /* 0xb9 */
-  0x8f9f, 0x8fb2, 0x904b, 0x904a, 0x9053, 0x9042, 0x9054, 0x903c,
-  0x9055, 0x9050, 0x9047, 0x904f, 0x904e, 0x904d, 0x9051, 0x903e,
-  0x9041, 0x9112, 0x9117, 0x916c, 0x916a, 0x9169, 0x91c9, 0x9237,
-  0x9257, 0x9238, 0x923d, 0x9240, 0x923e, 0x925b, 0x924b, 0x9264,
-  0x9251, 0x9234, 0x9249, 0x924d, 0x9245, 0x9239, 0x923f, 0x925a,
-  0x9598, 0x9698, 0x9694, 0x9695, 0x96cd, 0x96cb, 0x96c9, 0x96ca,
-  0x96f7, 0x96fb, 0x96f9, 0x96f6, 0x9756, 0x9774, 0x9776, 0x9810,
-  0x9811, 0x9813, 0x980a, 0x9812, 0x980c, 0x98fc, 0x98f4, 0x98fd,
-  0x98fe, 0x99b3, 0x99b1, 0x99b4, 0x9ae1, 0x9ce9, 0x9e82, 0x9f0e,
-  0x9f13, 0x9f20, 0x50e7, 0x50ee, 0x50e5, 0x50d6, 0x50ed, 0x50da,
-  0x50d5, 0x50cf, 0x50d1, 0x50f1, 0x50ce, 0x50e9, 0x5162, 0x51f3,
-  0x5283, 0x5282, 0x5331, 0x53ad, 0x55fe, 0x5600, 0x561b, 0x5617,
-  0x55fd, 0x5614, 0x5606, 0x5609, 0x560d, 0x560e, 0x55f7, 0x5616,
-  0x561f, 0x5608, 0x5610, 0x55f6, 0x5718, 0x5716, 0x5875, 0x587e,
-  0x5883, 0x5893, 0x588a, 0x5879, 0x5885, 0x587d, 0x58fd, 0x5925,
-  0x5922, 0x5924, 0x596a, 0x5969, 0x5ae1, 0x5ae6, 0x5ae9, 0x5ad7,
-  0x5ad6, 0x5ad8, 0x5ae3, 0x5b75, 0x5bde, 0x5be7, 0x5be1, 0x5be5,
-  0x5be6, 0x5be8, 0x5be2, 0x5be4, 0x5bdf, 0x5c0d, 0x5c62, 0x5d84,
-  0x5d87, 0x5e5b, 0x5e63, 0x5e55, 0x5e57, 0x5e54, 0x5ed3, 0x5ed6,
-  0x5f0a, 0x5f46, 0x5f70, 0x5fb9, 0x6147,
-  /* 0xba */
-  0x613f, 0x614b, 0x6177, 0x6162, 0x6163, 0x615f, 0x615a, 0x6158,
-  0x6175, 0x622a, 0x6487, 0x6458, 0x6454, 0x64a4, 0x6478, 0x645f,
-  0x647a, 0x6451, 0x6467, 0x6434, 0x646d, 0x647b, 0x6572, 0x65a1,
-  0x65d7, 0x65d6, 0x66a2, 0x66a8, 0x669d, 0x699c, 0x69a8, 0x6995,
-  0x69c1, 0x69ae, 0x69d3, 0x69cb, 0x699b, 0x69b7, 0x69bb, 0x69ab,
-  0x69b4, 0x69d0, 0x69cd, 0x69ad, 0x69cc, 0x69a6, 0x69c3, 0x69a3,
-  0x6b49, 0x6b4c, 0x6c33, 0x6f33, 0x6f14, 0x6efe, 0x6f13, 0x6ef4,
-  0x6f29, 0x6f3e, 0x6f20, 0x6f2c, 0x6f0f, 0x6f02, 0x6f22, 0x6eff,
-  0x6eef, 0x6f06, 0x6f31, 0x6f38, 0x6f32, 0x6f23, 0x6f15, 0x6f2b,
-  0x6f2f, 0x6f88, 0x6f2a, 0x6eec, 0x6f01, 0x6ef2, 0x6ecc, 0x6ef7,
-  0x7194, 0x7199, 0x717d, 0x718a, 0x7184, 0x7192, 0x723e, 0x7292,
-  0x7296, 0x7344, 0x7350, 0x7464, 0x7463, 0x746a, 0x7470, 0x746d,
-  0x7504, 0x7591, 0x7627, 0x760d, 0x760b, 0x7609, 0x7613, 0x76e1,
-  0x76e3, 0x7784, 0x777d, 0x777f, 0x7761, 0x78c1, 0x789f, 0x78a7,
-  0x78b3, 0x78a9, 0x78a3, 0x798e, 0x798f, 0x798d, 0x7a2e, 0x7a31,
-  0x7aaa, 0x7aa9, 0x7aed, 0x7aef, 0x7ba1, 0x7b95, 0x7b8b, 0x7b75,
-  0x7b97, 0x7b9d, 0x7b94, 0x7b8f, 0x7bb8, 0x7b87, 0x7b84, 0x7cb9,
-  0x7cbd, 0x7cbe, 0x7dbb, 0x7db0, 0x7d9c, 0x7dbd, 0x7dbe, 0x7da0,
-  0x7dca, 0x7db4, 0x7db2, 0x7db1, 0x7dba, 0x7da2, 0x7dbf, 0x7db5,
-  0x7db8, 0x7dad, 0x7dd2, 0x7dc7, 0x7dac,
-  /* 0xbb */
-  0x7f70, 0x7fe0, 0x7fe1, 0x7fdf, 0x805e, 0x805a, 0x8087, 0x8150,
-  0x8180, 0x818f, 0x8188, 0x818a, 0x817f, 0x8182, 0x81e7, 0x81fa,
-  0x8207, 0x8214, 0x821e, 0x824b, 0x84c9, 0x84bf, 0x84c6, 0x84c4,
-  0x8499, 0x849e, 0x84b2, 0x849c, 0x84cb, 0x84b8, 0x84c0, 0x84d3,
-  0x8490, 0x84bc, 0x84d1, 0x84ca, 0x873f, 0x871c, 0x873b, 0x8722,
-  0x8725, 0x8734, 0x8718, 0x8755, 0x8737, 0x8729, 0x88f3, 0x8902,
-  0x88f4, 0x88f9, 0x88f8, 0x88fd, 0x88e8, 0x891a, 0x88ef, 0x8aa6,
-  0x8a8c, 0x8a9e, 0x8aa3, 0x8a8d, 0x8aa1, 0x8a93, 0x8aa4, 0x8aaa,
-  0x8aa5, 0x8aa8, 0x8a98, 0x8a91, 0x8a9a, 0x8aa7, 0x8c6a, 0x8c8d,
-  0x8c8c, 0x8cd3, 0x8cd1, 0x8cd2, 0x8d6b, 0x8d99, 0x8d95, 0x8dfc,
-  0x8f14, 0x8f12, 0x8f15, 0x8f13, 0x8fa3, 0x9060, 0x9058, 0x905c,
-  0x9063, 0x9059, 0x905e, 0x9062, 0x905d, 0x905b, 0x9119, 0x9118,
-  0x911e, 0x9175, 0x9178, 0x9177, 0x9174, 0x9278, 0x9280, 0x9285,
-  0x9298, 0x9296, 0x927b, 0x9293, 0x929c, 0x92a8, 0x927c, 0x9291,
-  0x95a1, 0x95a8, 0x95a9, 0x95a3, 0x95a5, 0x95a4, 0x9699, 0x969c,
-  0x969b, 0x96cc, 0x96d2, 0x9700, 0x977c, 0x9785, 0x97f6, 0x9817,
-  0x9818, 0x98af, 0x98b1, 0x9903, 0x9905, 0x990c, 0x9909, 0x99c1,
-  0x9aaf, 0x9ab0, 0x9ae6, 0x9b41, 0x9b42, 0x9cf4, 0x9cf6, 0x9cf3,
-  0x9ebc, 0x9f3b, 0x9f4a, 0x5104, 0x5100, 0x50fb, 0x50f5, 0x50f9,
-  0x5102, 0x5108, 0x5109, 0x5105, 0x51dc,
-  /* 0xbc */
-  0x5287, 0x5288, 0x5289, 0x528d, 0x528a, 0x52f0, 0x53b2, 0x562e,
-  0x563b, 0x5639, 0x5632, 0x563f, 0x5634, 0x5629, 0x5653, 0x564e,
-  0x5657, 0x5674, 0x5636, 0x562f, 0x5630, 0x5880, 0x589f, 0x589e,
-  0x58b3, 0x589c, 0x58ae, 0x58a9, 0x58a6, 0x596d, 0x5b09, 0x5afb,
-  0x5b0b, 0x5af5, 0x5b0c, 0x5b08, 0x5bee, 0x5bec, 0x5be9, 0x5beb,
-  0x5c64, 0x5c65, 0x5d9d, 0x5d94, 0x5e62, 0x5e5f, 0x5e61, 0x5ee2,
-  0x5eda, 0x5edf, 0x5edd, 0x5ee3, 0x5ee0, 0x5f48, 0x5f71, 0x5fb7,
-  0x5fb5, 0x6176, 0x6167, 0x616e, 0x615d, 0x6155, 0x6182, 0x617c,
-  0x6170, 0x616b, 0x617e, 0x61a7, 0x6190, 0x61ab, 0x618e, 0x61ac,
-  0x619a, 0x61a4, 0x6194, 0x61ae, 0x622e, 0x6469, 0x646f, 0x6479,
-  0x649e, 0x64b2, 0x6488, 0x6490, 0x64b0, 0x64a5, 0x6493, 0x6495,
-  0x64a9, 0x6492, 0x64ae, 0x64ad, 0x64ab, 0x649a, 0x64ac, 0x6499,
-  0x64a2, 0x64b3, 0x6575, 0x6577, 0x6578, 0x66ae, 0x66ab, 0x66b4,
-  0x66b1, 0x6a23, 0x6a1f, 0x69e8, 0x6a01, 0x6a1e, 0x6a19, 0x69fd,
-  0x6a21, 0x6a13, 0x6a0a, 0x69f3, 0x6a02, 0x6a05, 0x69ed, 0x6a11,
-  0x6b50, 0x6b4e, 0x6ba4, 0x6bc5, 0x6bc6, 0x6f3f, 0x6f7c, 0x6f84,
-  0x6f51, 0x6f66, 0x6f54, 0x6f86, 0x6f6d, 0x6f5b, 0x6f78, 0x6f6e,
-  0x6f8e, 0x6f7a, 0x6f70, 0x6f64, 0x6f97, 0x6f58, 0x6ed5, 0x6f6f,
-  0x6f60, 0x6f5f, 0x719f, 0x71ac, 0x71b1, 0x71a8, 0x7256, 0x729b,
-  0x734e, 0x7357, 0x7469, 0x748b, 0x7483,
-  /* 0xbd */
-  0x747e, 0x7480, 0x757f, 0x7620, 0x7629, 0x761f, 0x7624, 0x7626,
-  0x7621, 0x7622, 0x769a, 0x76ba, 0x76e4, 0x778e, 0x7787, 0x778c,
-  0x7791, 0x778b, 0x78cb, 0x78c5, 0x78ba, 0x78ca, 0x78be, 0x78d5,
-  0x78bc, 0x78d0, 0x7a3f, 0x7a3c, 0x7a40, 0x7a3d, 0x7a37, 0x7a3b,
-  0x7aaf, 0x7aae, 0x7bad, 0x7bb1, 0x7bc4, 0x7bb4, 0x7bc6, 0x7bc7,
-  0x7bc1, 0x7ba0, 0x7bcc, 0x7cca, 0x7de0, 0x7df4, 0x7def, 0x7dfb,
-  0x7dd8, 0x7dec, 0x7ddd, 0x7de8, 0x7de3, 0x7dda, 0x7dde, 0x7de9,
-  0x7d9e, 0x7dd9, 0x7df2, 0x7df9, 0x7f75, 0x7f77, 0x7faf, 0x7fe9,
-  0x8026, 0x819b, 0x819c, 0x819d, 0x81a0, 0x819a, 0x8198, 0x8517,
-  0x853d, 0x851a, 0x84ee, 0x852c, 0x852d, 0x8513, 0x8511, 0x8523,
-  0x8521, 0x8514, 0x84ec, 0x8525, 0x84ff, 0x8506, 0x8782, 0x8774,
-  0x8776, 0x8760, 0x8766, 0x8778, 0x8768, 0x8759, 0x8757, 0x874c,
-  0x8753, 0x885b, 0x885d, 0x8910, 0x8907, 0x8912, 0x8913, 0x8915,
-  0x890a, 0x8abc, 0x8ad2, 0x8ac7, 0x8ac4, 0x8a95, 0x8acb, 0x8af8,
-  0x8ab2, 0x8ac9, 0x8ac2, 0x8abf, 0x8ab0, 0x8ad6, 0x8acd, 0x8ab6,
-  0x8ab9, 0x8adb, 0x8c4c, 0x8c4e, 0x8c6c, 0x8ce0, 0x8cde, 0x8ce6,
-  0x8ce4, 0x8cec, 0x8ced, 0x8ce2, 0x8ce3, 0x8cdc, 0x8cea, 0x8ce1,
-  0x8d6d, 0x8d9f, 0x8da3, 0x8e2b, 0x8e10, 0x8e1d, 0x8e22, 0x8e0f,
-  0x8e29, 0x8e1f, 0x8e21, 0x8e1e, 0x8eba, 0x8f1d, 0x8f1b, 0x8f1f,
-  0x8f29, 0x8f26, 0x8f2a, 0x8f1c, 0x8f1e,
-  /* 0xbe */
-  0x8f25, 0x9069, 0x906e, 0x9068, 0x906d, 0x9077, 0x9130, 0x912d,
-  0x9127, 0x9131, 0x9187, 0x9189, 0x918b, 0x9183, 0x92c5, 0x92bb,
-  0x92b7, 0x92ea, 0x92ac, 0x92e4, 0x92c1, 0x92b3, 0x92bc, 0x92d2,
-  0x92c7, 0x92f0, 0x92b2, 0x95ad, 0x95b1, 0x9704, 0x9706, 0x9707,
-  0x9709, 0x9760, 0x978d, 0x978b, 0x978f, 0x9821, 0x982b, 0x981c,
-  0x98b3, 0x990a, 0x9913, 0x9912, 0x9918, 0x99dd, 0x99d0, 0x99df,
-  0x99db, 0x99d1, 0x99d5, 0x99d2, 0x99d9, 0x9ab7, 0x9aee, 0x9aef,
-  0x9b27, 0x9b45, 0x9b44, 0x9b77, 0x9b6f, 0x9d06, 0x9d09, 0x9d03,
-  0x9ea9, 0x9ebe, 0x9ece, 0x58a8, 0x9f52, 0x5112, 0x5118, 0x5114,
-  0x5110, 0x5115, 0x5180, 0x51aa, 0x51dd, 0x5291, 0x5293, 0x52f3,
-  0x5659, 0x566b, 0x5679, 0x5669, 0x5664, 0x5678, 0x566a, 0x5668,
-  0x5665, 0x5671, 0x566f, 0x566c, 0x5662, 0x5676, 0x58c1, 0x58be,
-  0x58c7, 0x58c5, 0x596e, 0x5b1d, 0x5b34, 0x5b78, 0x5bf0, 0x5c0e,
-  0x5f4a, 0x61b2, 0x6191, 0x61a9, 0x618a, 0x61cd, 0x61b6, 0x61be,
-  0x61ca, 0x61c8, 0x6230, 0x64c5, 0x64c1, 0x64cb, 0x64bb, 0x64bc,
-  0x64da, 0x64c4, 0x64c7, 0x64c2, 0x64cd, 0x64bf, 0x64d2, 0x64d4,
-  0x64be, 0x6574, 0x66c6, 0x66c9, 0x66b9, 0x66c4, 0x66c7, 0x66b8,
-  0x6a3d, 0x6a38, 0x6a3a, 0x6a59, 0x6a6b, 0x6a58, 0x6a39, 0x6a44,
-  0x6a62, 0x6a61, 0x6a4b, 0x6a47, 0x6a35, 0x6a5f, 0x6a48, 0x6b59,
-  0x6b77, 0x6c05, 0x6fc2, 0x6fb1, 0x6fa1,
-  /* 0xbf */
-  0x6fc3, 0x6fa4, 0x6fc1, 0x6fa7, 0x6fb3, 0x6fc0, 0x6fb9, 0x6fb6,
-  0x6fa6, 0x6fa0, 0x6fb4, 0x71be, 0x71c9, 0x71d0, 0x71d2, 0x71c8,
-  0x71d5, 0x71b9, 0x71ce, 0x71d9, 0x71dc, 0x71c3, 0x71c4, 0x7368,
-  0x749c, 0x74a3, 0x7498, 0x749f, 0x749e, 0x74e2, 0x750c, 0x750d,
-  0x7634, 0x7638, 0x763a, 0x76e7, 0x76e5, 0x77a0, 0x779e, 0x779f,
-  0x77a5, 0x78e8, 0x78da, 0x78ec, 0x78e7, 0x79a6, 0x7a4d, 0x7a4e,
-  0x7a46, 0x7a4c, 0x7a4b, 0x7aba, 0x7bd9, 0x7c11, 0x7bc9, 0x7be4,
-  0x7bdb, 0x7be1, 0x7be9, 0x7be6, 0x7cd5, 0x7cd6, 0x7e0a, 0x7e11,
-  0x7e08, 0x7e1b, 0x7e23, 0x7e1e, 0x7e1d, 0x7e09, 0x7e10, 0x7f79,
-  0x7fb2, 0x7ff0, 0x7ff1, 0x7fee, 0x8028, 0x81b3, 0x81a9, 0x81a8,
-  0x81fb, 0x8208, 0x8258, 0x8259, 0x854a, 0x8559, 0x8548, 0x8568,
-  0x8569, 0x8543, 0x8549, 0x856d, 0x856a, 0x855e, 0x8783, 0x879f,
-  0x879e, 0x87a2, 0x878d, 0x8861, 0x892a, 0x8932, 0x8925, 0x892b,
-  0x8921, 0x89aa, 0x89a6, 0x8ae6, 0x8afa, 0x8aeb, 0x8af1, 0x8b00,
-  0x8adc, 0x8ae7, 0x8aee, 0x8afe, 0x8b01, 0x8b02, 0x8af7, 0x8aed,
-  0x8af3, 0x8af6, 0x8afc, 0x8c6b, 0x8c6d, 0x8c93, 0x8cf4, 0x8e44,
-  0x8e31, 0x8e34, 0x8e42, 0x8e39, 0x8e35, 0x8f3b, 0x8f2f, 0x8f38,
-  0x8f33, 0x8fa8, 0x8fa6, 0x9075, 0x9074, 0x9078, 0x9072, 0x907c,
-  0x907a, 0x9134, 0x9192, 0x9320, 0x9336, 0x92f8, 0x9333, 0x932f,
-  0x9322, 0x92fc, 0x932b, 0x9304, 0x931a,
-  /* 0xc0 */
-  0x9310, 0x9326, 0x9321, 0x9315, 0x932e, 0x9319, 0x95bb, 0x96a7,
-  0x96a8, 0x96aa, 0x96d5, 0x970e, 0x9711, 0x9716, 0x970d, 0x9713,
-  0x970f, 0x975b, 0x975c, 0x9766, 0x9798, 0x9830, 0x9838, 0x983b,
-  0x9837, 0x982d, 0x9839, 0x9824, 0x9910, 0x9928, 0x991e, 0x991b,
-  0x9921, 0x991a, 0x99ed, 0x99e2, 0x99f1, 0x9ab8, 0x9abc, 0x9afb,
-  0x9aed, 0x9b28, 0x9b91, 0x9d15, 0x9d23, 0x9d26, 0x9d28, 0x9d12,
-  0x9d1b, 0x9ed8, 0x9ed4, 0x9f8d, 0x9f9c, 0x512a, 0x511f, 0x5121,
-  0x5132, 0x52f5, 0x568e, 0x5680, 0x5690, 0x5685, 0x5687, 0x568f,
-  0x58d5, 0x58d3, 0x58d1, 0x58ce, 0x5b30, 0x5b2a, 0x5b24, 0x5b7a,
-  0x5c37, 0x5c68, 0x5dbc, 0x5dba, 0x5dbd, 0x5db8, 0x5e6b, 0x5f4c,
-  0x5fbd, 0x61c9, 0x61c2, 0x61c7, 0x61e6, 0x61cb, 0x6232, 0x6234,
-  0x64ce, 0x64ca, 0x64d8, 0x64e0, 0x64f0, 0x64e6, 0x64ec, 0x64f1,
-  0x64e2, 0x64ed, 0x6582, 0x6583, 0x66d9, 0x66d6, 0x6a80, 0x6a94,
-  0x6a84, 0x6aa2, 0x6a9c, 0x6adb, 0x6aa3, 0x6a7e, 0x6a97, 0x6a90,
-  0x6aa0, 0x6b5c, 0x6bae, 0x6bda, 0x6c08, 0x6fd8, 0x6ff1, 0x6fdf,
-  0x6fe0, 0x6fdb, 0x6fe4, 0x6feb, 0x6fef, 0x6f80, 0x6fec, 0x6fe1,
-  0x6fe9, 0x6fd5, 0x6fee, 0x6ff0, 0x71e7, 0x71df, 0x71ee, 0x71e6,
-  0x71e5, 0x71ed, 0x71ec, 0x71f4, 0x71e0, 0x7235, 0x7246, 0x7370,
-  0x7372, 0x74a9, 0x74b0, 0x74a6, 0x74a8, 0x7646, 0x7642, 0x764c,
-  0x76ea, 0x77b3, 0x77aa, 0x77b0, 0x77ac,
-  /* 0xc1 */
-  0x77a7, 0x77ad, 0x77ef, 0x78f7, 0x78fa, 0x78f4, 0x78ef, 0x7901,
-  0x79a7, 0x79aa, 0x7a57, 0x7abf, 0x7c07, 0x7c0d, 0x7bfe, 0x7bf7,
-  0x7c0c, 0x7be0, 0x7ce0, 0x7cdc, 0x7cde, 0x7ce2, 0x7cdf, 0x7cd9,
-  0x7cdd, 0x7e2e, 0x7e3e, 0x7e46, 0x7e37, 0x7e32, 0x7e43, 0x7e2b,
-  0x7e3d, 0x7e31, 0x7e45, 0x7e41, 0x7e34, 0x7e39, 0x7e48, 0x7e35,
-  0x7e3f, 0x7e2f, 0x7f44, 0x7ff3, 0x7ffc, 0x8071, 0x8072, 0x8070,
-  0x806f, 0x8073, 0x81c6, 0x81c3, 0x81ba, 0x81c2, 0x81c0, 0x81bf,
-  0x81bd, 0x81c9, 0x81be, 0x81e8, 0x8209, 0x8271, 0x85aa, 0x8584,
-  0x857e, 0x859c, 0x8591, 0x8594, 0x85af, 0x859b, 0x8587, 0x85a8,
-  0x858a, 0x8667, 0x87c0, 0x87d1, 0x87b3, 0x87d2, 0x87c6, 0x87ab,
-  0x87bb, 0x87ba, 0x87c8, 0x87cb, 0x893b, 0x8936, 0x8944, 0x8938,
-  0x893d, 0x89ac, 0x8b0e, 0x8b17, 0x8b19, 0x8b1b, 0x8b0a, 0x8b20,
-  0x8b1d, 0x8b04, 0x8b10, 0x8c41, 0x8c3f, 0x8c73, 0x8cfa, 0x8cfd,
-  0x8cfc, 0x8cf8, 0x8cfb, 0x8da8, 0x8e49, 0x8e4b, 0x8e48, 0x8e4a,
-  0x8f44, 0x8f3e, 0x8f42, 0x8f45, 0x8f3f, 0x907f, 0x907d, 0x9084,
-  0x9081, 0x9082, 0x9080, 0x9139, 0x91a3, 0x919e, 0x919c, 0x934d,
-  0x9382, 0x9328, 0x9375, 0x934a, 0x9365, 0x934b, 0x9318, 0x937e,
-  0x936c, 0x935b, 0x9370, 0x935a, 0x9354, 0x95ca, 0x95cb, 0x95cc,
-  0x95c8, 0x95c6, 0x96b1, 0x96b8, 0x96d6, 0x971c, 0x971e, 0x97a0,
-  0x97d3, 0x9846, 0x98b6, 0x9935, 0x9a01,
-  /* 0xc2 */
-  0x99ff, 0x9bae, 0x9bab, 0x9baa, 0x9bad, 0x9d3b, 0x9d3f, 0x9e8b,
-  0x9ecf, 0x9ede, 0x9edc, 0x9edd, 0x9edb, 0x9f3e, 0x9f4b, 0x53e2,
-  0x5695, 0x56ae, 0x58d9, 0x58d8, 0x5b38, 0x5f5d, 0x61e3, 0x6233,
-  0x64f4, 0x64f2, 0x64fe, 0x6506, 0x64fa, 0x64fb, 0x64f7, 0x65b7,
-  0x66dc, 0x6726, 0x6ab3, 0x6aac, 0x6ac3, 0x6abb, 0x6ab8, 0x6ac2,
-  0x6aae, 0x6aaf, 0x6b5f, 0x6b78, 0x6baf, 0x7009, 0x700b, 0x6ffe,
-  0x7006, 0x6ffa, 0x7011, 0x700f, 0x71fb, 0x71fc, 0x71fe, 0x71f8,
-  0x7377, 0x7375, 0x74a7, 0x74bf, 0x7515, 0x7656, 0x7658, 0x7652,
-  0x77bd, 0x77bf, 0x77bb, 0x77bc, 0x790e, 0x79ae, 0x7a61, 0x7a62,
-  0x7a60, 0x7ac4, 0x7ac5, 0x7c2b, 0x7c27, 0x7c2a, 0x7c1e, 0x7c23,
-  0x7c21, 0x7ce7, 0x7e54, 0x7e55, 0x7e5e, 0x7e5a, 0x7e61, 0x7e52,
-  0x7e59, 0x7f48, 0x7ff9, 0x7ffb, 0x8077, 0x8076, 0x81cd, 0x81cf,
-  0x820a, 0x85cf, 0x85a9, 0x85cd, 0x85d0, 0x85c9, 0x85b0, 0x85ba,
-  0x85b9, 0x85a6, 0x87ef, 0x87ec, 0x87f2, 0x87e0, 0x8986, 0x89b2,
-  0x89f4, 0x8b28, 0x8b39, 0x8b2c, 0x8b2b, 0x8c50, 0x8d05, 0x8e59,
-  0x8e63, 0x8e66, 0x8e64, 0x8e5f, 0x8e55, 0x8ec0, 0x8f49, 0x8f4d,
-  0x9087, 0x9083, 0x9088, 0x91ab, 0x91ac, 0x91d0, 0x9394, 0x938a,
-  0x9396, 0x93a2, 0x93b3, 0x93ae, 0x93ac, 0x93b0, 0x9398, 0x939a,
-  0x9397, 0x95d4, 0x95d6, 0x95d0, 0x95d5, 0x96e2, 0x96dc, 0x96d9,
-  0x96db, 0x96de, 0x9724, 0x97a3, 0x97a6,
-  /* 0xc3 */
-  0x97ad, 0x97f9, 0x984d, 0x984f, 0x984c, 0x984e, 0x9853, 0x98ba,
-  0x993e, 0x993f, 0x993d, 0x992e, 0x99a5, 0x9a0e, 0x9ac1, 0x9b03,
-  0x9b06, 0x9b4f, 0x9b4e, 0x9b4d, 0x9bca, 0x9bc9, 0x9bfd, 0x9bc8,
-  0x9bc0, 0x9d51, 0x9d5d, 0x9d60, 0x9ee0, 0x9f15, 0x9f2c, 0x5133,
-  0x56a5, 0x58de, 0x58df, 0x58e2, 0x5bf5, 0x9f90, 0x5eec, 0x61f2,
-  0x61f7, 0x61f6, 0x61f5, 0x6500, 0x650f, 0x66e0, 0x66dd, 0x6ae5,
-  0x6add, 0x6ada, 0x6ad3, 0x701b, 0x701f, 0x7028, 0x701a, 0x701d,
-  0x7015, 0x7018, 0x7206, 0x720d, 0x7258, 0x72a2, 0x7378, 0x737a,
-  0x74bd, 0x74ca, 0x74e3, 0x7587, 0x7586, 0x765f, 0x7661, 0x77c7,
-  0x7919, 0x79b1, 0x7a6b, 0x7a69, 0x7c3e, 0x7c3f, 0x7c38, 0x7c3d,
-  0x7c37, 0x7c40, 0x7e6b, 0x7e6d, 0x7e79, 0x7e69, 0x7e6a, 0x7f85,
-  0x7e73, 0x7fb6, 0x7fb9, 0x7fb8, 0x81d8, 0x85e9, 0x85dd, 0x85ea,
-  0x85d5, 0x85e4, 0x85e5, 0x85f7, 0x87fb, 0x8805, 0x880d, 0x87f9,
-  0x87fe, 0x8960, 0x895f, 0x8956, 0x895e, 0x8b41, 0x8b5c, 0x8b58,
-  0x8b49, 0x8b5a, 0x8b4e, 0x8b4f, 0x8b46, 0x8b59, 0x8d08, 0x8d0a,
-  0x8e7c, 0x8e72, 0x8e87, 0x8e76, 0x8e6c, 0x8e7a, 0x8e74, 0x8f54,
-  0x8f4e, 0x8fad, 0x908a, 0x908b, 0x91b1, 0x91ae, 0x93e1, 0x93d1,
-  0x93df, 0x93c3, 0x93c8, 0x93dc, 0x93dd, 0x93d6, 0x93e2, 0x93cd,
-  0x93d8, 0x93e4, 0x93d7, 0x93e8, 0x95dc, 0x96b4, 0x96e3, 0x972a,
-  0x9727, 0x9761, 0x97dc, 0x97fb, 0x985e,
-  /* 0xc4 */
-  0x9858, 0x985b, 0x98bc, 0x9945, 0x9949, 0x9a16, 0x9a19, 0x9b0d,
-  0x9be8, 0x9be7, 0x9bd6, 0x9bdb, 0x9d89, 0x9d61, 0x9d72, 0x9d6a,
-  0x9d6c, 0x9e92, 0x9e97, 0x9e93, 0x9eb4, 0x52f8, 0x56a8, 0x56b7,
-  0x56b6, 0x56b4, 0x56bc, 0x58e4, 0x5b40, 0x5b43, 0x5b7d, 0x5bf6,
-  0x5dc9, 0x61f8, 0x61fa, 0x6518, 0x6514, 0x6519, 0x66e6, 0x6727,
-  0x6aec, 0x703e, 0x7030, 0x7032, 0x7210, 0x737b, 0x74cf, 0x7662,
-  0x7665, 0x7926, 0x792a, 0x792c, 0x792b, 0x7ac7, 0x7af6, 0x7c4c,
-  0x7c43, 0x7c4d, 0x7cef, 0x7cf0, 0x8fae, 0x7e7d, 0x7e7c, 0x7e82,
-  0x7f4c, 0x8000, 0x81da, 0x8266, 0x85fb, 0x85f9, 0x8611, 0x85fa,
-  0x8606, 0x860b, 0x8607, 0x860a, 0x8814, 0x8815, 0x8964, 0x89ba,
-  0x89f8, 0x8b70, 0x8b6c, 0x8b66, 0x8b6f, 0x8b5f, 0x8b6b, 0x8d0f,
-  0x8d0d, 0x8e89, 0x8e81, 0x8e85, 0x8e82, 0x91b4, 0x91cb, 0x9418,
-  0x9403, 0x93fd, 0x95e1, 0x9730, 0x98c4, 0x9952, 0x9951, 0x99a8,
-  0x9a2b, 0x9a30, 0x9a37, 0x9a35, 0x9c13, 0x9c0d, 0x9e79, 0x9eb5,
-  0x9ee8, 0x9f2f, 0x9f5f, 0x9f63, 0x9f61, 0x5137, 0x5138, 0x56c1,
-  0x56c0, 0x56c2, 0x5914, 0x5c6c, 0x5dcd, 0x61fc, 0x61fe, 0x651d,
-  0x651c, 0x6595, 0x66e9, 0x6afb, 0x6b04, 0x6afa, 0x6bb2, 0x704c,
-  0x721b, 0x72a7, 0x74d6, 0x74d4, 0x7669, 0x77d3, 0x7c50, 0x7e8f,
-  0x7e8c, 0x7fbc, 0x8617, 0x862d, 0x861a, 0x8823, 0x8822, 0x8821,
-  0x881f, 0x896a, 0x896c, 0x89bd, 0x8b74,
-  /* 0xc5 */
-  0x8b77, 0x8b7d, 0x8d13, 0x8e8a, 0x8e8d, 0x8e8b, 0x8f5f, 0x8faf,
-  0x91ba, 0x942e, 0x9433, 0x9435, 0x943a, 0x9438, 0x9432, 0x942b,
-  0x95e2, 0x9738, 0x9739, 0x9732, 0x97ff, 0x9867, 0x9865, 0x9957,
-  0x9a45, 0x9a43, 0x9a40, 0x9a3e, 0x9acf, 0x9b54, 0x9b51, 0x9c2d,
-  0x9c25, 0x9daf, 0x9db4, 0x9dc2, 0x9db8, 0x9e9d, 0x9eef, 0x9f19,
-  0x9f5c, 0x9f66, 0x9f67, 0x513c, 0x513b, 0x56c8, 0x56ca, 0x56c9,
-  0x5b7f, 0x5dd4, 0x5dd2, 0x5f4e, 0x61ff, 0x6524, 0x6b0a, 0x6b61,
-  0x7051, 0x7058, 0x7380, 0x74e4, 0x758a, 0x766e, 0x766c, 0x79b3,
-  0x7c60, 0x7c5f, 0x807e, 0x807d, 0x81df, 0x8972, 0x896f, 0x89fc,
-  0x8b80, 0x8d16, 0x8d17, 0x8e91, 0x8e93, 0x8f61, 0x9148, 0x9444,
-  0x9451, 0x9452, 0x973d, 0x973e, 0x97c3, 0x97c1, 0x986b, 0x9955,
-  0x9a55, 0x9a4d, 0x9ad2, 0x9b1a, 0x9c49, 0x9c31, 0x9c3e, 0x9c3b,
-  0x9dd3, 0x9dd7, 0x9f34, 0x9f6c, 0x9f6a, 0x9f94, 0x56cc, 0x5dd6,
-  0x6200, 0x6523, 0x652b, 0x652a, 0x66ec, 0x6b10, 0x74da, 0x7aca,
-  0x7c64, 0x7c63, 0x7c65, 0x7e93, 0x7e96, 0x7e94, 0x81e2, 0x8638,
-  0x863f, 0x8831, 0x8b8a, 0x9090, 0x908f, 0x9463, 0x9460, 0x9464,
-  0x9768, 0x986f, 0x995c, 0x9a5a, 0x9a5b, 0x9a57, 0x9ad3, 0x9ad4,
-  0x9ad1, 0x9c54, 0x9c57, 0x9c56, 0x9de5, 0x9e9f, 0x9ef4, 0x56d1,
-  0x58e9, 0x652c, 0x705e, 0x7671, 0x7672, 0x77d7, 0x7f50, 0x7f88,
-  0x8836, 0x8839, 0x8862, 0x8b93, 0x8b92,
-  /* 0xc6 */
-  0x8b96, 0x8277, 0x8d1b, 0x91c0, 0x946a, 0x9742, 0x9748, 0x9744,
-  0x97c6, 0x9870, 0x9a5f, 0x9b22, 0x9b58, 0x9c5f, 0x9df9, 0x9dfa,
-  0x9e7c, 0x9e7d, 0x9f07, 0x9f77, 0x9f72, 0x5ef3, 0x6b16, 0x7063,
-  0x7c6c, 0x7c6e, 0x883b, 0x89c0, 0x8ea1, 0x91c1, 0x9472, 0x9470,
-  0x9871, 0x995e, 0x9ad6, 0x9b23, 0x9ecc, 0x7064, 0x77da, 0x8b9a,
-  0x9477, 0x97c9, 0x9a62, 0x9a65, 0x7e9c, 0x8b9c, 0x8eaa, 0x91c5,
-  0x947d, 0x947e, 0x947c, 0x9c77, 0x9c78, 0x9ef7, 0x8c54, 0x947f,
-  0x9e1a, 0x7228, 0x9a6a, 0x9b31, 0x9e1b, 0x9e1e, 0x7c72, 0x30fe,
-  0x309d, 0x309e, 0x3005, 0x3041, 0x3042, 0x3043, 0x3044, 0x3045,
-  0x3046, 0x3047, 0x3048, 0x3049, 0x304a, 0x304b, 0x304c, 0x304d,
-  0x304e, 0x304f, 0x3050, 0x3051, 0x3052, 0x3053, 0x3054, 0x3055,
-  0x3056, 0x3057, 0x3058, 0x3059, 0x305a, 0x305b, 0x305c, 0x305d,
-  0x305e, 0x305f, 0x3060, 0x3061, 0x3062, 0x3063, 0x3064, 0x3065,
-  0x3066, 0x3067, 0x3068, 0x3069, 0x306a, 0x306b, 0x306c, 0x306d,
-  0x306e, 0x306f, 0x3070, 0x3071, 0x3072, 0x3073, 0x3074, 0x3075,
-  0x3076, 0x3077, 0x3078, 0x3079, 0x307a, 0x307b, 0x307c, 0x307d,
-  0x307e, 0x307f, 0x3080, 0x3081, 0x3082, 0x3083, 0x3084, 0x3085,
-  0x3086, 0x3087, 0x3088, 0x3089, 0x308a, 0x308b, 0x308c, 0x308d,
-  0x308e, 0x308f, 0x3090, 0x3091, 0x3092, 0x3093, 0x30a1, 0x30a2,
-  0x30a3, 0x30a4, 0x30a5, 0x30a6, 0x30a7,
-  /* 0xc7 */
-  0x30a8, 0x30a9, 0x30aa, 0x30ab, 0x30ac, 0x30ad, 0x30ae, 0x30af,
-  0x30b0, 0x30b1, 0x30b2, 0x30b3, 0x30b4, 0x30b5, 0x30b6, 0x30b7,
-  0x30b8, 0x30b9, 0x30ba, 0x30bb, 0x30bc, 0x30bd, 0x30be, 0x30bf,
-  0x30c0, 0x30c1, 0x30c2, 0x30c3, 0x30c4, 0x30c5, 0x30c6, 0x30c7,
-  0x30c8, 0x30c9, 0x30ca, 0x30cb, 0x30cc, 0x30cd, 0x30ce, 0x30cf,
-  0x30d0, 0x30d1, 0x30d2, 0x30d3, 0x30d4, 0x30d5, 0x30d6, 0x30d7,
-  0x30d8, 0x30d9, 0x30da, 0x30db, 0x30dc, 0x30dd, 0x30de, 0x30df,
-  0x30e0, 0x30e1, 0x30e2, 0x30e3, 0x30e4, 0x30e5, 0x30e6, 0x30e7,
-  0x30e8, 0x30e9, 0x30ea, 0x30eb, 0x30ec, 0x30ed, 0x30ee, 0x30ef,
-  0x30f0, 0x30f1, 0x30f2, 0x30f3, 0x30f4, 0x30f5, 0x30f6, 0x0414,
-  0x0415, 0x0401, 0x0416, 0x0417, 0x0418, 0x0419, 0x041a, 0x041b,
-  0x041c, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429,
-  0x042a, 0x042b, 0x042c, 0x042d, 0x042e, 0x042f, 0x0430, 0x0431,
-  0x0432, 0x0433, 0x0434, 0x0435, 0x0451, 0x0436, 0x0437, 0x0438,
-  0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, 0x043f, 0x0440,
-  0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, 0x0448,
-  0x0449, 0x044a, 0x044b, 0x044c, 0x044d, 0x044e, 0x044f, 0x2460,
-  0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467, 0x2468,
-  0x2469, 0x2474, 0x2475, 0x2476, 0x2477, 0x2478, 0x2479, 0x247a,
-  0x247b, 0x247c, 0x247d,
-};
-static const unsigned short big5_2uni_pagec9[7652] = {
-  /* 0xc9 */
-  0x4e42, 0x4e5c, 0x51f5, 0x531a, 0x5382, 0x4e07, 0x4e0c, 0x4e47,
-  0x4e8d, 0x56d7, 0xfa0c, 0x5c6e, 0x5f73, 0x4e0f, 0x5187, 0x4e0e,
-  0x4e2e, 0x4e93, 0x4ec2, 0x4ec9, 0x4ec8, 0x5198, 0x52fc, 0x536c,
-  0x53b9, 0x5720, 0x5903, 0x592c, 0x5c10, 0x5dff, 0x65e1, 0x6bb3,
-  0x6bcc, 0x6c14, 0x723f, 0x4e31, 0x4e3c, 0x4ee8, 0x4edc, 0x4ee9,
-  0x4ee1, 0x4edd, 0x4eda, 0x520c, 0x531c, 0x534c, 0x5722, 0x5723,
-  0x5917, 0x592f, 0x5b81, 0x5b84, 0x5c12, 0x5c3b, 0x5c74, 0x5c73,
-  0x5e04, 0x5e80, 0x5e82, 0x5fc9, 0x6209, 0x6250, 0x6c15, 0x6c36,
-  0x6c43, 0x6c3f, 0x6c3b, 0x72ae, 0x72b0, 0x738a, 0x79b8, 0x808a,
-  0x961e, 0x4f0e, 0x4f18, 0x4f2c, 0x4ef5, 0x4f14, 0x4ef1, 0x4f00,
-  0x4ef7, 0x4f08, 0x4f1d, 0x4f02, 0x4f05, 0x4f22, 0x4f13, 0x4f04,
-  0x4ef4, 0x4f12, 0x51b1, 0x5213, 0x5209, 0x5210, 0x52a6, 0x5322,
-  0x531f, 0x534d, 0x538a, 0x5407, 0x56e1, 0x56df, 0x572e, 0x572a,
-  0x5734, 0x593c, 0x5980, 0x597c, 0x5985, 0x597b, 0x597e, 0x5977,
-  0x597f, 0x5b56, 0x5c15, 0x5c25, 0x5c7c, 0x5c7a, 0x5c7b, 0x5c7e,
-  0x5ddf, 0x5e75, 0x5e84, 0x5f02, 0x5f1a, 0x5f74, 0x5fd5, 0x5fd4,
-  0x5fcf, 0x625c, 0x625e, 0x6264, 0x6261, 0x6266, 0x6262, 0x6259,
-  0x6260, 0x625a, 0x6265, 0x65ef, 0x65ee, 0x673e, 0x6739, 0x6738,
-  0x673b, 0x673a, 0x673f, 0x673c, 0x6733, 0x6c18, 0x6c46, 0x6c52,
-  0x6c5c, 0x6c4f, 0x6c4a, 0x6c54, 0x6c4b,
-  /* 0xca */
-  0x6c4c, 0x7071, 0x725e, 0x72b4, 0x72b5, 0x738e, 0x752a, 0x767f,
-  0x7a75, 0x7f51, 0x8278, 0x827c, 0x8280, 0x827d, 0x827f, 0x864d,
-  0x897e, 0x9099, 0x9097, 0x9098, 0x909b, 0x9094, 0x9622, 0x9624,
-  0x9620, 0x9623, 0x4f56, 0x4f3b, 0x4f62, 0x4f49, 0x4f53, 0x4f64,
-  0x4f3e, 0x4f67, 0x4f52, 0x4f5f, 0x4f41, 0x4f58, 0x4f2d, 0x4f33,
-  0x4f3f, 0x4f61, 0x518f, 0x51b9, 0x521c, 0x521e, 0x5221, 0x52ad,
-  0x52ae, 0x5309, 0x5363, 0x5372, 0x538e, 0x538f, 0x5430, 0x5437,
-  0x542a, 0x5454, 0x5445, 0x5419, 0x541c, 0x5425, 0x5418, 0x543d,
-  0x544f, 0x5441, 0x5428, 0x5424, 0x5447, 0x56ee, 0x56e7, 0x56e5,
-  0x5741, 0x5745, 0x574c, 0x5749, 0x574b, 0x5752, 0x5906, 0x5940,
-  0x59a6, 0x5998, 0x59a0, 0x5997, 0x598e, 0x59a2, 0x5990, 0x598f,
-  0x59a7, 0x59a1, 0x5b8e, 0x5b92, 0x5c28, 0x5c2a, 0x5c8d, 0x5c8f,
-  0x5c88, 0x5c8b, 0x5c89, 0x5c92, 0x5c8a, 0x5c86, 0x5c93, 0x5c95,
-  0x5de0, 0x5e0a, 0x5e0e, 0x5e8b, 0x5e89, 0x5e8c, 0x5e88, 0x5e8d,
-  0x5f05, 0x5f1d, 0x5f78, 0x5f76, 0x5fd2, 0x5fd1, 0x5fd0, 0x5fed,
-  0x5fe8, 0x5fee, 0x5ff3, 0x5fe1, 0x5fe4, 0x5fe3, 0x5ffa, 0x5fef,
-  0x5ff7, 0x5ffb, 0x6000, 0x5ff4, 0x623a, 0x6283, 0x628c, 0x628e,
-  0x628f, 0x6294, 0x6287, 0x6271, 0x627b, 0x627a, 0x6270, 0x6281,
-  0x6288, 0x6277, 0x627d, 0x6272, 0x6274, 0x6537, 0x65f0, 0x65f4,
-  0x65f3, 0x65f2, 0x65f5, 0x6745, 0x6747,
-  /* 0xcb */
-  0x6759, 0x6755, 0x674c, 0x6748, 0x675d, 0x674d, 0x675a, 0x674b,
-  0x6bd0, 0x6c19, 0x6c1a, 0x6c78, 0x6c67, 0x6c6b, 0x6c84, 0x6c8b,
-  0x6c8f, 0x6c71, 0x6c6f, 0x6c69, 0x6c9a, 0x6c6d, 0x6c87, 0x6c95,
-  0x6c9c, 0x6c66, 0x6c73, 0x6c65, 0x6c7b, 0x6c8e, 0x7074, 0x707a,
-  0x7263, 0x72bf, 0x72bd, 0x72c3, 0x72c6, 0x72c1, 0x72ba, 0x72c5,
-  0x7395, 0x7397, 0x7393, 0x7394, 0x7392, 0x753a, 0x7539, 0x7594,
-  0x7595, 0x7681, 0x793d, 0x8034, 0x8095, 0x8099, 0x8090, 0x8092,
-  0x809c, 0x8290, 0x828f, 0x8285, 0x828e, 0x8291, 0x8293, 0x828a,
-  0x8283, 0x8284, 0x8c78, 0x8fc9, 0x8fbf, 0x909f, 0x90a1, 0x90a5,
-  0x909e, 0x90a7, 0x90a0, 0x9630, 0x9628, 0x962f, 0x962d, 0x4e33,
-  0x4f98, 0x4f7c, 0x4f85, 0x4f7d, 0x4f80, 0x4f87, 0x4f76, 0x4f74,
-  0x4f89, 0x4f84, 0x4f77, 0x4f4c, 0x4f97, 0x4f6a, 0x4f9a, 0x4f79,
-  0x4f81, 0x4f78, 0x4f90, 0x4f9c, 0x4f94, 0x4f9e, 0x4f92, 0x4f82,
-  0x4f95, 0x4f6b, 0x4f6e, 0x519e, 0x51bc, 0x51be, 0x5235, 0x5232,
-  0x5233, 0x5246, 0x5231, 0x52bc, 0x530a, 0x530b, 0x533c, 0x5392,
-  0x5394, 0x5487, 0x547f, 0x5481, 0x5491, 0x5482, 0x5488, 0x546b,
-  0x547a, 0x547e, 0x5465, 0x546c, 0x5474, 0x5466, 0x548d, 0x546f,
-  0x5461, 0x5460, 0x5498, 0x5463, 0x5467, 0x5464, 0x56f7, 0x56f9,
-  0x576f, 0x5772, 0x576d, 0x576b, 0x5771, 0x5770, 0x5776, 0x5780,
-  0x5775, 0x577b, 0x5773, 0x5774, 0x5762,
-  /* 0xcc */
-  0x5768, 0x577d, 0x590c, 0x5945, 0x59b5, 0x59ba, 0x59cf, 0x59ce,
-  0x59b2, 0x59cc, 0x59c1, 0x59b6, 0x59bc, 0x59c3, 0x59d6, 0x59b1,
-  0x59bd, 0x59c0, 0x59c8, 0x59b4, 0x59c7, 0x5b62, 0x5b65, 0x5b93,
-  0x5b95, 0x5c44, 0x5c47, 0x5cae, 0x5ca4, 0x5ca0, 0x5cb5, 0x5caf,
-  0x5ca8, 0x5cac, 0x5c9f, 0x5ca3, 0x5cad, 0x5ca2, 0x5caa, 0x5ca7,
-  0x5c9d, 0x5ca5, 0x5cb6, 0x5cb0, 0x5ca6, 0x5e17, 0x5e14, 0x5e19,
-  0x5f28, 0x5f22, 0x5f23, 0x5f24, 0x5f54, 0x5f82, 0x5f7e, 0x5f7d,
-  0x5fde, 0x5fe5, 0x602d, 0x6026, 0x6019, 0x6032, 0x600b, 0x6034,
-  0x600a, 0x6017, 0x6033, 0x601a, 0x601e, 0x602c, 0x6022, 0x600d,
-  0x6010, 0x602e, 0x6013, 0x6011, 0x600c, 0x6009, 0x601c, 0x6214,
-  0x623d, 0x62ad, 0x62b4, 0x62d1, 0x62be, 0x62aa, 0x62b6, 0x62ca,
-  0x62ae, 0x62b3, 0x62af, 0x62bb, 0x62a9, 0x62b0, 0x62b8, 0x653d,
-  0x65a8, 0x65bb, 0x6609, 0x65fc, 0x6604, 0x6612, 0x6608, 0x65fb,
-  0x6603, 0x660b, 0x660d, 0x6605, 0x65fd, 0x6611, 0x6610, 0x66f6,
-  0x670a, 0x6785, 0x676c, 0x678e, 0x6792, 0x6776, 0x677b, 0x6798,
-  0x6786, 0x6784, 0x6774, 0x678d, 0x678c, 0x677a, 0x679f, 0x6791,
-  0x6799, 0x6783, 0x677d, 0x6781, 0x6778, 0x6779, 0x6794, 0x6b25,
-  0x6b80, 0x6b7e, 0x6bde, 0x6c1d, 0x6c93, 0x6cec, 0x6ceb, 0x6cee,
-  0x6cd9, 0x6cb6, 0x6cd4, 0x6cad, 0x6ce7, 0x6cb7, 0x6cd0, 0x6cc2,
-  0x6cba, 0x6cc3, 0x6cc6, 0x6ced, 0x6cf2,
-  /* 0xcd */
-  0x6cd2, 0x6cdd, 0x6cb4, 0x6c8a, 0x6c9d, 0x6c80, 0x6cde, 0x6cc0,
-  0x6d30, 0x6ccd, 0x6cc7, 0x6cb0, 0x6cf9, 0x6ccf, 0x6ce9, 0x6cd1,
-  0x7094, 0x7098, 0x7085, 0x7093, 0x7086, 0x7084, 0x7091, 0x7096,
-  0x7082, 0x709a, 0x7083, 0x726a, 0x72d6, 0x72cb, 0x72d8, 0x72c9,
-  0x72dc, 0x72d2, 0x72d4, 0x72da, 0x72cc, 0x72d1, 0x73a4, 0x73a1,
-  0x73ad, 0x73a6, 0x73a2, 0x73a0, 0x73ac, 0x739d, 0x74dd, 0x74e8,
-  0x753f, 0x7540, 0x753e, 0x758c, 0x7598, 0x76af, 0x76f3, 0x76f1,
-  0x76f0, 0x76f5, 0x77f8, 0x77fc, 0x77f9, 0x77fb, 0x77fa, 0x77f7,
-  0x7942, 0x793f, 0x79c5, 0x7a78, 0x7a7b, 0x7afb, 0x7c75, 0x7cfd,
-  0x8035, 0x808f, 0x80ae, 0x80a3, 0x80b8, 0x80b5, 0x80ad, 0x8220,
-  0x82a0, 0x82c0, 0x82ab, 0x829a, 0x8298, 0x829b, 0x82b5, 0x82a7,
-  0x82ae, 0x82bc, 0x829e, 0x82ba, 0x82b4, 0x82a8, 0x82a1, 0x82a9,
-  0x82c2, 0x82a4, 0x82c3, 0x82b6, 0x82a2, 0x8670, 0x866f, 0x866d,
-  0x866e, 0x8c56, 0x8fd2, 0x8fcb, 0x8fd3, 0x8fcd, 0x8fd6, 0x8fd5,
-  0x8fd7, 0x90b2, 0x90b4, 0x90af, 0x90b3, 0x90b0, 0x9639, 0x963d,
-  0x963c, 0x963a, 0x9643, 0x4fcd, 0x4fc5, 0x4fd3, 0x4fb2, 0x4fc9,
-  0x4fcb, 0x4fc1, 0x4fd4, 0x4fdc, 0x4fd9, 0x4fbb, 0x4fb3, 0x4fdb,
-  0x4fc7, 0x4fd6, 0x4fba, 0x4fc0, 0x4fb9, 0x4fec, 0x5244, 0x5249,
-  0x52c0, 0x52c2, 0x533d, 0x537c, 0x5397, 0x5396, 0x5399, 0x5398,
-  0x54ba, 0x54a1, 0x54ad, 0x54a5, 0x54cf,
-  /* 0xce */
-  0x54c3, 0x830d, 0x54b7, 0x54ae, 0x54d6, 0x54b6, 0x54c5, 0x54c6,
-  0x54a0, 0x5470, 0x54bc, 0x54a2, 0x54be, 0x5472, 0x54de, 0x54b0,
-  0x57b5, 0x579e, 0x579f, 0x57a4, 0x578c, 0x5797, 0x579d, 0x579b,
-  0x5794, 0x5798, 0x578f, 0x5799, 0x57a5, 0x579a, 0x5795, 0x58f4,
-  0x590d, 0x5953, 0x59e1, 0x59de, 0x59ee, 0x5a00, 0x59f1, 0x59dd,
-  0x59fa, 0x59fd, 0x59fc, 0x59f6, 0x59e4, 0x59f2, 0x59f7, 0x59db,
-  0x59e9, 0x59f3, 0x59f5, 0x59e0, 0x59fe, 0x59f4, 0x59ed, 0x5ba8,
-  0x5c4c, 0x5cd0, 0x5cd8, 0x5ccc, 0x5cd7, 0x5ccb, 0x5cdb, 0x5cde,
-  0x5cda, 0x5cc9, 0x5cc7, 0x5cca, 0x5cd6, 0x5cd3, 0x5cd4, 0x5ccf,
-  0x5cc8, 0x5cc6, 0x5cce, 0x5cdf, 0x5cf8, 0x5df9, 0x5e21, 0x5e22,
-  0x5e23, 0x5e20, 0x5e24, 0x5eb0, 0x5ea4, 0x5ea2, 0x5e9b, 0x5ea3,
-  0x5ea5, 0x5f07, 0x5f2e, 0x5f56, 0x5f86, 0x6037, 0x6039, 0x6054,
-  0x6072, 0x605e, 0x6045, 0x6053, 0x6047, 0x6049, 0x605b, 0x604c,
-  0x6040, 0x6042, 0x605f, 0x6024, 0x6044, 0x6058, 0x6066, 0x606e,
-  0x6242, 0x6243, 0x62cf, 0x630d, 0x630b, 0x62f5, 0x630e, 0x6303,
-  0x62eb, 0x62f9, 0x630f, 0x630c, 0x62f8, 0x62f6, 0x6300, 0x6313,
-  0x6314, 0x62fa, 0x6315, 0x62fb, 0x62f0, 0x6541, 0x6543, 0x65aa,
-  0x65bf, 0x6636, 0x6621, 0x6632, 0x6635, 0x661c, 0x6626, 0x6622,
-  0x6633, 0x662b, 0x663a, 0x661d, 0x6634, 0x6639, 0x662e, 0x670f,
-  0x6710, 0x67c1, 0x67f2, 0x67c8, 0x67ba,
-  /* 0xcf */
-  0x67dc, 0x67bb, 0x67f8, 0x67d8, 0x67c0, 0x67b7, 0x67c5, 0x67eb,
-  0x67e4, 0x67df, 0x67b5, 0x67cd, 0x67b3, 0x67f7, 0x67f6, 0x67ee,
-  0x67e3, 0x67c2, 0x67b9, 0x67ce, 0x67e7, 0x67f0, 0x67b2, 0x67fc,
-  0x67c6, 0x67ed, 0x67cc, 0x67ae, 0x67e6, 0x67db, 0x67fa, 0x67c9,
-  0x67ca, 0x67c3, 0x67ea, 0x67cb, 0x6b28, 0x6b82, 0x6b84, 0x6bb6,
-  0x6bd6, 0x6bd8, 0x6be0, 0x6c20, 0x6c21, 0x6d28, 0x6d34, 0x6d2d,
-  0x6d1f, 0x6d3c, 0x6d3f, 0x6d12, 0x6d0a, 0x6cda, 0x6d33, 0x6d04,
-  0x6d19, 0x6d3a, 0x6d1a, 0x6d11, 0x6d00, 0x6d1d, 0x6d42, 0x6d01,
-  0x6d18, 0x6d37, 0x6d03, 0x6d0f, 0x6d40, 0x6d07, 0x6d20, 0x6d2c,
-  0x6d08, 0x6d22, 0x6d09, 0x6d10, 0x70b7, 0x709f, 0x70be, 0x70b1,
-  0x70b0, 0x70a1, 0x70b4, 0x70b5, 0x70a9, 0x7241, 0x7249, 0x724a,
-  0x726c, 0x7270, 0x7273, 0x726e, 0x72ca, 0x72e4, 0x72e8, 0x72eb,
-  0x72df, 0x72ea, 0x72e6, 0x72e3, 0x7385, 0x73cc, 0x73c2, 0x73c8,
-  0x73c5, 0x73b9, 0x73b6, 0x73b5, 0x73b4, 0x73eb, 0x73bf, 0x73c7,
-  0x73be, 0x73c3, 0x73c6, 0x73b8, 0x73cb, 0x74ec, 0x74ee, 0x752e,
-  0x7547, 0x7548, 0x75a7, 0x75aa, 0x7679, 0x76c4, 0x7708, 0x7703,
-  0x7704, 0x7705, 0x770a, 0x76f7, 0x76fb, 0x76fa, 0x77e7, 0x77e8,
-  0x7806, 0x7811, 0x7812, 0x7805, 0x7810, 0x780f, 0x780e, 0x7809,
-  0x7803, 0x7813, 0x794a, 0x794c, 0x794b, 0x7945, 0x7944, 0x79d5,
-  0x79cd, 0x79cf, 0x79d6, 0x79ce, 0x7a80,
-  /* 0xd0 */
-  0x7a7e, 0x7ad1, 0x7b00, 0x7b01, 0x7c7a, 0x7c78, 0x7c79, 0x7c7f,
-  0x7c80, 0x7c81, 0x7d03, 0x7d08, 0x7d01, 0x7f58, 0x7f91, 0x7f8d,
-  0x7fbe, 0x8007, 0x800e, 0x800f, 0x8014, 0x8037, 0x80d8, 0x80c7,
-  0x80e0, 0x80d1, 0x80c8, 0x80c2, 0x80d0, 0x80c5, 0x80e3, 0x80d9,
-  0x80dc, 0x80ca, 0x80d5, 0x80c9, 0x80cf, 0x80d7, 0x80e6, 0x80cd,
-  0x81ff, 0x8221, 0x8294, 0x82d9, 0x82fe, 0x82f9, 0x8307, 0x82e8,
-  0x8300, 0x82d5, 0x833a, 0x82eb, 0x82d6, 0x82f4, 0x82ec, 0x82e1,
-  0x82f2, 0x82f5, 0x830c, 0x82fb, 0x82f6, 0x82f0, 0x82ea, 0x82e4,
-  0x82e0, 0x82fa, 0x82f3, 0x82ed, 0x8677, 0x8674, 0x867c, 0x8673,
-  0x8841, 0x884e, 0x8867, 0x886a, 0x8869, 0x89d3, 0x8a04, 0x8a07,
-  0x8d72, 0x8fe3, 0x8fe1, 0x8fee, 0x8fe0, 0x90f1, 0x90bd, 0x90bf,
-  0x90d5, 0x90c5, 0x90be, 0x90c7, 0x90cb, 0x90c8, 0x91d4, 0x91d3,
-  0x9654, 0x964f, 0x9651, 0x9653, 0x964a, 0x964e, 0x501e, 0x5005,
-  0x5007, 0x5013, 0x5022, 0x5030, 0x501b, 0x4ff5, 0x4ff4, 0x5033,
-  0x5037, 0x502c, 0x4ff6, 0x4ff7, 0x5017, 0x501c, 0x5020, 0x5027,
-  0x5035, 0x502f, 0x5031, 0x500e, 0x515a, 0x5194, 0x5193, 0x51ca,
-  0x51c4, 0x51c5, 0x51c8, 0x51ce, 0x5261, 0x525a, 0x5252, 0x525e,
-  0x525f, 0x5255, 0x5262, 0x52cd, 0x530e, 0x539e, 0x5526, 0x54e2,
-  0x5517, 0x5512, 0x54e7, 0x54f3, 0x54e4, 0x551a, 0x54ff, 0x5504,
-  0x5508, 0x54eb, 0x5511, 0x5505, 0x54f1,
-  /* 0xd1 */
-  0x550a, 0x54fb, 0x54f7, 0x54f8, 0x54e0, 0x550e, 0x5503, 0x550b,
-  0x5701, 0x5702, 0x57cc, 0x5832, 0x57d5, 0x57d2, 0x57ba, 0x57c6,
-  0x57bd, 0x57bc, 0x57b8, 0x57b6, 0x57bf, 0x57c7, 0x57d0, 0x57b9,
-  0x57c1, 0x590e, 0x594a, 0x5a19, 0x5a16, 0x5a2d, 0x5a2e, 0x5a15,
-  0x5a0f, 0x5a17, 0x5a0a, 0x5a1e, 0x5a33, 0x5b6c, 0x5ba7, 0x5bad,
-  0x5bac, 0x5c03, 0x5c56, 0x5c54, 0x5cec, 0x5cff, 0x5cee, 0x5cf1,
-  0x5cf7, 0x5d00, 0x5cf9, 0x5e29, 0x5e28, 0x5ea8, 0x5eae, 0x5eaa,
-  0x5eac, 0x5f33, 0x5f30, 0x5f67, 0x605d, 0x605a, 0x6067, 0x6041,
-  0x60a2, 0x6088, 0x6080, 0x6092, 0x6081, 0x609d, 0x6083, 0x6095,
-  0x609b, 0x6097, 0x6087, 0x609c, 0x608e, 0x6219, 0x6246, 0x62f2,
-  0x6310, 0x6356, 0x632c, 0x6344, 0x6345, 0x6336, 0x6343, 0x63e4,
-  0x6339, 0x634b, 0x634a, 0x633c, 0x6329, 0x6341, 0x6334, 0x6358,
-  0x6354, 0x6359, 0x632d, 0x6347, 0x6333, 0x635a, 0x6351, 0x6338,
-  0x6357, 0x6340, 0x6348, 0x654a, 0x6546, 0x65c6, 0x65c3, 0x65c4,
-  0x65c2, 0x664a, 0x665f, 0x6647, 0x6651, 0x6712, 0x6713, 0x681f,
-  0x681a, 0x6849, 0x6832, 0x6833, 0x683b, 0x684b, 0x684f, 0x6816,
-  0x6831, 0x681c, 0x6835, 0x682b, 0x682d, 0x682f, 0x684e, 0x6844,
-  0x6834, 0x681d, 0x6812, 0x6814, 0x6826, 0x6828, 0x682e, 0x684d,
-  0x683a, 0x6825, 0x6820, 0x6b2c, 0x6b2f, 0x6b2d, 0x6b31, 0x6b34,
-  0x6b6d, 0x8082, 0x6b88, 0x6be6, 0x6be4,
-  /* 0xd2 */
-  0x6be8, 0x6be3, 0x6be2, 0x6be7, 0x6c25, 0x6d7a, 0x6d63, 0x6d64,
-  0x6d76, 0x6d0d, 0x6d61, 0x6d92, 0x6d58, 0x6d62, 0x6d6d, 0x6d6f,
-  0x6d91, 0x6d8d, 0x6def, 0x6d7f, 0x6d86, 0x6d5e, 0x6d67, 0x6d60,
-  0x6d97, 0x6d70, 0x6d7c, 0x6d5f, 0x6d82, 0x6d98, 0x6d2f, 0x6d68,
-  0x6d8b, 0x6d7e, 0x6d80, 0x6d84, 0x6d16, 0x6d83, 0x6d7b, 0x6d7d,
-  0x6d75, 0x6d90, 0x70dc, 0x70d3, 0x70d1, 0x70dd, 0x70cb, 0x7f39,
-  0x70e2, 0x70d7, 0x70d2, 0x70de, 0x70e0, 0x70d4, 0x70cd, 0x70c5,
-  0x70c6, 0x70c7, 0x70da, 0x70ce, 0x70e1, 0x7242, 0x7278, 0x7277,
-  0x7276, 0x7300, 0x72fa, 0x72f4, 0x72fe, 0x72f6, 0x72f3, 0x72fb,
-  0x7301, 0x73d3, 0x73d9, 0x73e5, 0x73d6, 0x73bc, 0x73e7, 0x73e3,
-  0x73e9, 0x73dc, 0x73d2, 0x73db, 0x73d4, 0x73dd, 0x73da, 0x73d7,
-  0x73d8, 0x73e8, 0x74de, 0x74df, 0x74f4, 0x74f5, 0x7521, 0x755b,
-  0x755f, 0x75b0, 0x75c1, 0x75bb, 0x75c4, 0x75c0, 0x75bf, 0x75b6,
-  0x75ba, 0x768a, 0x76c9, 0x771d, 0x771b, 0x7710, 0x7713, 0x7712,
-  0x7723, 0x7711, 0x7715, 0x7719, 0x771a, 0x7722, 0x7727, 0x7823,
-  0x782c, 0x7822, 0x7835, 0x782f, 0x7828, 0x782e, 0x782b, 0x7821,
-  0x7829, 0x7833, 0x782a, 0x7831, 0x7954, 0x795b, 0x794f, 0x795c,
-  0x7953, 0x7952, 0x7951, 0x79eb, 0x79ec, 0x79e0, 0x79ee, 0x79ed,
-  0x79ea, 0x79dc, 0x79de, 0x79dd, 0x7a86, 0x7a89, 0x7a85, 0x7a8b,
-  0x7a8c, 0x7a8a, 0x7a87, 0x7ad8, 0x7b10,
-  /* 0xd3 */
-  0x7b04, 0x7b13, 0x7b05, 0x7b0f, 0x7b08, 0x7b0a, 0x7b0e, 0x7b09,
-  0x7b12, 0x7c84, 0x7c91, 0x7c8a, 0x7c8c, 0x7c88, 0x7c8d, 0x7c85,
-  0x7d1e, 0x7d1d, 0x7d11, 0x7d0e, 0x7d18, 0x7d16, 0x7d13, 0x7d1f,
-  0x7d12, 0x7d0f, 0x7d0c, 0x7f5c, 0x7f61, 0x7f5e, 0x7f60, 0x7f5d,
-  0x7f5b, 0x7f96, 0x7f92, 0x7fc3, 0x7fc2, 0x7fc0, 0x8016, 0x803e,
-  0x8039, 0x80fa, 0x80f2, 0x80f9, 0x80f5, 0x8101, 0x80fb, 0x8100,
-  0x8201, 0x822f, 0x8225, 0x8333, 0x832d, 0x8344, 0x8319, 0x8351,
-  0x8325, 0x8356, 0x833f, 0x8341, 0x8326, 0x831c, 0x8322, 0x8342,
-  0x834e, 0x831b, 0x832a, 0x8308, 0x833c, 0x834d, 0x8316, 0x8324,
-  0x8320, 0x8337, 0x832f, 0x8329, 0x8347, 0x8345, 0x834c, 0x8353,
-  0x831e, 0x832c, 0x834b, 0x8327, 0x8348, 0x8653, 0x8652, 0x86a2,
-  0x86a8, 0x8696, 0x868d, 0x8691, 0x869e, 0x8687, 0x8697, 0x8686,
-  0x868b, 0x869a, 0x8685, 0x86a5, 0x8699, 0x86a1, 0x86a7, 0x8695,
-  0x8698, 0x868e, 0x869d, 0x8690, 0x8694, 0x8843, 0x8844, 0x886d,
-  0x8875, 0x8876, 0x8872, 0x8880, 0x8871, 0x887f, 0x886f, 0x8883,
-  0x887e, 0x8874, 0x887c, 0x8a12, 0x8c47, 0x8c57, 0x8c7b, 0x8ca4,
-  0x8ca3, 0x8d76, 0x8d78, 0x8db5, 0x8db7, 0x8db6, 0x8ed1, 0x8ed3,
-  0x8ffe, 0x8ff5, 0x9002, 0x8fff, 0x8ffb, 0x9004, 0x8ffc, 0x8ff6,
-  0x90d6, 0x90e0, 0x90d9, 0x90da, 0x90e3, 0x90df, 0x90e5, 0x90d8,
-  0x90db, 0x90d7, 0x90dc, 0x90e4, 0x9150,
-  /* 0xd4 */
-  0x914e, 0x914f, 0x91d5, 0x91e2, 0x91da, 0x965c, 0x965f, 0x96bc,
-  0x98e3, 0x9adf, 0x9b2f, 0x4e7f, 0x5070, 0x506a, 0x5061, 0x505e,
-  0x5060, 0x5053, 0x504b, 0x505d, 0x5072, 0x5048, 0x504d, 0x5041,
-  0x505b, 0x504a, 0x5062, 0x5015, 0x5045, 0x505f, 0x5069, 0x506b,
-  0x5063, 0x5064, 0x5046, 0x5040, 0x506e, 0x5073, 0x5057, 0x5051,
-  0x51d0, 0x526b, 0x526d, 0x526c, 0x526e, 0x52d6, 0x52d3, 0x532d,
-  0x539c, 0x5575, 0x5576, 0x553c, 0x554d, 0x5550, 0x5534, 0x552a,
-  0x5551, 0x5562, 0x5536, 0x5535, 0x5530, 0x5552, 0x5545, 0x550c,
-  0x5532, 0x5565, 0x554e, 0x5539, 0x5548, 0x552d, 0x553b, 0x5540,
-  0x554b, 0x570a, 0x5707, 0x57fb, 0x5814, 0x57e2, 0x57f6, 0x57dc,
-  0x57f4, 0x5800, 0x57ed, 0x57fd, 0x5808, 0x57f8, 0x580b, 0x57f3,
-  0x57cf, 0x5807, 0x57ee, 0x57e3, 0x57f2, 0x57e5, 0x57ec, 0x57e1,
-  0x580e, 0x57fc, 0x5810, 0x57e7, 0x5801, 0x580c, 0x57f1, 0x57e9,
-  0x57f0, 0x580d, 0x5804, 0x595c, 0x5a60, 0x5a58, 0x5a55, 0x5a67,
-  0x5a5e, 0x5a38, 0x5a35, 0x5a6d, 0x5a50, 0x5a5f, 0x5a65, 0x5a6c,
-  0x5a53, 0x5a64, 0x5a57, 0x5a43, 0x5a5d, 0x5a52, 0x5a44, 0x5a5b,
-  0x5a48, 0x5a8e, 0x5a3e, 0x5a4d, 0x5a39, 0x5a4c, 0x5a70, 0x5a69,
-  0x5a47, 0x5a51, 0x5a56, 0x5a42, 0x5a5c, 0x5b72, 0x5b6e, 0x5bc1,
-  0x5bc0, 0x5c59, 0x5d1e, 0x5d0b, 0x5d1d, 0x5d1a, 0x5d20, 0x5d0c,
-  0x5d28, 0x5d0d, 0x5d26, 0x5d25, 0x5d0f,
-  /* 0xd5 */
-  0x5d30, 0x5d12, 0x5d23, 0x5d1f, 0x5d2e, 0x5e3e, 0x5e34, 0x5eb1,
-  0x5eb4, 0x5eb9, 0x5eb2, 0x5eb3, 0x5f36, 0x5f38, 0x5f9b, 0x5f96,
-  0x5f9f, 0x608a, 0x6090, 0x6086, 0x60be, 0x60b0, 0x60ba, 0x60d3,
-  0x60d4, 0x60cf, 0x60e4, 0x60d9, 0x60dd, 0x60c8, 0x60b1, 0x60db,
-  0x60b7, 0x60ca, 0x60bf, 0x60c3, 0x60cd, 0x60c0, 0x6332, 0x6365,
-  0x638a, 0x6382, 0x637d, 0x63bd, 0x639e, 0x63ad, 0x639d, 0x6397,
-  0x63ab, 0x638e, 0x636f, 0x6387, 0x6390, 0x636e, 0x63af, 0x6375,
-  0x639c, 0x636d, 0x63ae, 0x637c, 0x63a4, 0x633b, 0x639f, 0x6378,
-  0x6385, 0x6381, 0x6391, 0x638d, 0x6370, 0x6553, 0x65cd, 0x6665,
-  0x6661, 0x665b, 0x6659, 0x665c, 0x6662, 0x6718, 0x6879, 0x6887,
-  0x6890, 0x689c, 0x686d, 0x686e, 0x68ae, 0x68ab, 0x6956, 0x686f,
-  0x68a3, 0x68ac, 0x68a9, 0x6875, 0x6874, 0x68b2, 0x688f, 0x6877,
-  0x6892, 0x687c, 0x686b, 0x6872, 0x68aa, 0x6880, 0x6871, 0x687e,
-  0x689b, 0x6896, 0x688b, 0x68a0, 0x6889, 0x68a4, 0x6878, 0x687b,
-  0x6891, 0x688c, 0x688a, 0x687d, 0x6b36, 0x6b33, 0x6b37, 0x6b38,
-  0x6b91, 0x6b8f, 0x6b8d, 0x6b8e, 0x6b8c, 0x6c2a, 0x6dc0, 0x6dab,
-  0x6db4, 0x6db3, 0x6e74, 0x6dac, 0x6de9, 0x6de2, 0x6db7, 0x6df6,
-  0x6dd4, 0x6e00, 0x6dc8, 0x6de0, 0x6ddf, 0x6dd6, 0x6dbe, 0x6de5,
-  0x6ddc, 0x6ddd, 0x6ddb, 0x6df4, 0x6dca, 0x6dbd, 0x6ded, 0x6df0,
-  0x6dba, 0x6dd5, 0x6dc2, 0x6dcf, 0x6dc9,
-  /* 0xd6 */
-  0x6dd0, 0x6df2, 0x6dd3, 0x6dfd, 0x6dd7, 0x6dcd, 0x6de3, 0x6dbb,
-  0x70fa, 0x710d, 0x70f7, 0x7117, 0x70f4, 0x710c, 0x70f0, 0x7104,
-  0x70f3, 0x7110, 0x70fc, 0x70ff, 0x7106, 0x7113, 0x7100, 0x70f8,
-  0x70f6, 0x710b, 0x7102, 0x710e, 0x727e, 0x727b, 0x727c, 0x727f,
-  0x731d, 0x7317, 0x7307, 0x7311, 0x7318, 0x730a, 0x7308, 0x72ff,
-  0x730f, 0x731e, 0x7388, 0x73f6, 0x73f8, 0x73f5, 0x7404, 0x7401,
-  0x73fd, 0x7407, 0x7400, 0x73fa, 0x73fc, 0x73ff, 0x740c, 0x740b,
-  0x73f4, 0x7408, 0x7564, 0x7563, 0x75ce, 0x75d2, 0x75cf, 0x75cb,
-  0x75cc, 0x75d1, 0x75d0, 0x768f, 0x7689, 0x76d3, 0x7739, 0x772f,
-  0x772d, 0x7731, 0x7732, 0x7734, 0x7733, 0x773d, 0x7725, 0x773b,
-  0x7735, 0x7848, 0x7852, 0x7849, 0x784d, 0x784a, 0x784c, 0x7826,
-  0x7845, 0x7850, 0x7964, 0x7967, 0x7969, 0x796a, 0x7963, 0x796b,
-  0x7961, 0x79bb, 0x79fa, 0x79f8, 0x79f6, 0x79f7, 0x7a8f, 0x7a94,
-  0x7a90, 0x7b35, 0x7b47, 0x7b34, 0x7b25, 0x7b30, 0x7b22, 0x7b24,
-  0x7b33, 0x7b18, 0x7b2a, 0x7b1d, 0x7b31, 0x7b2b, 0x7b2d, 0x7b2f,
-  0x7b32, 0x7b38, 0x7b1a, 0x7b23, 0x7c94, 0x7c98, 0x7c96, 0x7ca3,
-  0x7d35, 0x7d3d, 0x7d38, 0x7d36, 0x7d3a, 0x7d45, 0x7d2c, 0x7d29,
-  0x7d41, 0x7d47, 0x7d3e, 0x7d3f, 0x7d4a, 0x7d3b, 0x7d28, 0x7f63,
-  0x7f95, 0x7f9c, 0x7f9d, 0x7f9b, 0x7fca, 0x7fcb, 0x7fcd, 0x7fd0,
-  0x7fd1, 0x7fc7, 0x7fcf, 0x7fc9, 0x801f,
-  /* 0xd7 */
-  0x801e, 0x801b, 0x8047, 0x8043, 0x8048, 0x8118, 0x8125, 0x8119,
-  0x811b, 0x812d, 0x811f, 0x812c, 0x811e, 0x8121, 0x8115, 0x8127,
-  0x811d, 0x8122, 0x8211, 0x8238, 0x8233, 0x823a, 0x8234, 0x8232,
-  0x8274, 0x8390, 0x83a3, 0x83a8, 0x838d, 0x837a, 0x8373, 0x83a4,
-  0x8374, 0x838f, 0x8381, 0x8395, 0x8399, 0x8375, 0x8394, 0x83a9,
-  0x837d, 0x8383, 0x838c, 0x839d, 0x839b, 0x83aa, 0x838b, 0x837e,
-  0x83a5, 0x83af, 0x8388, 0x8397, 0x83b0, 0x837f, 0x83a6, 0x8387,
-  0x83ae, 0x8376, 0x839a, 0x8659, 0x8656, 0x86bf, 0x86b7, 0x86c2,
-  0x86c1, 0x86c5, 0x86ba, 0x86b0, 0x86c8, 0x86b9, 0x86b3, 0x86b8,
-  0x86cc, 0x86b4, 0x86bb, 0x86bc, 0x86c3, 0x86bd, 0x86be, 0x8852,
-  0x8889, 0x8895, 0x88a8, 0x88a2, 0x88aa, 0x889a, 0x8891, 0x88a1,
-  0x889f, 0x8898, 0x88a7, 0x8899, 0x889b, 0x8897, 0x88a4, 0x88ac,
-  0x888c, 0x8893, 0x888e, 0x8982, 0x89d6, 0x89d9, 0x89d5, 0x8a30,
-  0x8a27, 0x8a2c, 0x8a1e, 0x8c39, 0x8c3b, 0x8c5c, 0x8c5d, 0x8c7d,
-  0x8ca5, 0x8d7d, 0x8d7b, 0x8d79, 0x8dbc, 0x8dc2, 0x8db9, 0x8dbf,
-  0x8dc1, 0x8ed8, 0x8ede, 0x8edd, 0x8edc, 0x8ed7, 0x8ee0, 0x8ee1,
-  0x9024, 0x900b, 0x9011, 0x901c, 0x900c, 0x9021, 0x90ef, 0x90ea,
-  0x90f0, 0x90f4, 0x90f2, 0x90f3, 0x90d4, 0x90eb, 0x90ec, 0x90e9,
-  0x9156, 0x9158, 0x915a, 0x9153, 0x9155, 0x91ec, 0x91f4, 0x91f1,
-  0x91f3, 0x91f8, 0x91e4, 0x91f9, 0x91ea,
-  /* 0xd8 */
-  0x91eb, 0x91f7, 0x91e8, 0x91ee, 0x957a, 0x9586, 0x9588, 0x967c,
-  0x966d, 0x966b, 0x9671, 0x966f, 0x96bf, 0x976a, 0x9804, 0x98e5,
-  0x9997, 0x509b, 0x5095, 0x5094, 0x509e, 0x508b, 0x50a3, 0x5083,
-  0x508c, 0x508e, 0x509d, 0x5068, 0x509c, 0x5092, 0x5082, 0x5087,
-  0x515f, 0x51d4, 0x5312, 0x5311, 0x53a4, 0x53a7, 0x5591, 0x55a8,
-  0x55a5, 0x55ad, 0x5577, 0x5645, 0x55a2, 0x5593, 0x5588, 0x558f,
-  0x55b5, 0x5581, 0x55a3, 0x5592, 0x55a4, 0x557d, 0x558c, 0x55a6,
-  0x557f, 0x5595, 0x55a1, 0x558e, 0x570c, 0x5829, 0x5837, 0x5819,
-  0x581e, 0x5827, 0x5823, 0x5828, 0x57f5, 0x5848, 0x5825, 0x581c,
-  0x581b, 0x5833, 0x583f, 0x5836, 0x582e, 0x5839, 0x5838, 0x582d,
-  0x582c, 0x583b, 0x5961, 0x5aaf, 0x5a94, 0x5a9f, 0x5a7a, 0x5aa2,
-  0x5a9e, 0x5a78, 0x5aa6, 0x5a7c, 0x5aa5, 0x5aac, 0x5a95, 0x5aae,
-  0x5a37, 0x5a84, 0x5a8a, 0x5a97, 0x5a83, 0x5a8b, 0x5aa9, 0x5a7b,
-  0x5a7d, 0x5a8c, 0x5a9c, 0x5a8f, 0x5a93, 0x5a9d, 0x5bea, 0x5bcd,
-  0x5bcb, 0x5bd4, 0x5bd1, 0x5bca, 0x5bce, 0x5c0c, 0x5c30, 0x5d37,
-  0x5d43, 0x5d6b, 0x5d41, 0x5d4b, 0x5d3f, 0x5d35, 0x5d51, 0x5d4e,
-  0x5d55, 0x5d33, 0x5d3a, 0x5d52, 0x5d3d, 0x5d31, 0x5d59, 0x5d42,
-  0x5d39, 0x5d49, 0x5d38, 0x5d3c, 0x5d32, 0x5d36, 0x5d40, 0x5d45,
-  0x5e44, 0x5e41, 0x5f58, 0x5fa6, 0x5fa5, 0x5fab, 0x60c9, 0x60b9,
-  0x60cc, 0x60e2, 0x60ce, 0x60c4, 0x6114,
-  /* 0xd9 */
-  0x60f2, 0x610a, 0x6116, 0x6105, 0x60f5, 0x6113, 0x60f8, 0x60fc,
-  0x60fe, 0x60c1, 0x6103, 0x6118, 0x611d, 0x6110, 0x60ff, 0x6104,
-  0x610b, 0x624a, 0x6394, 0x63b1, 0x63b0, 0x63ce, 0x63e5, 0x63e8,
-  0x63ef, 0x63c3, 0x649d, 0x63f3, 0x63ca, 0x63e0, 0x63f6, 0x63d5,
-  0x63f2, 0x63f5, 0x6461, 0x63df, 0x63be, 0x63dd, 0x63dc, 0x63c4,
-  0x63d8, 0x63d3, 0x63c2, 0x63c7, 0x63cc, 0x63cb, 0x63c8, 0x63f0,
-  0x63d7, 0x63d9, 0x6532, 0x6567, 0x656a, 0x6564, 0x655c, 0x6568,
-  0x6565, 0x658c, 0x659d, 0x659e, 0x65ae, 0x65d0, 0x65d2, 0x667c,
-  0x666c, 0x667b, 0x6680, 0x6671, 0x6679, 0x666a, 0x6672, 0x6701,
-  0x690c, 0x68d3, 0x6904, 0x68dc, 0x692a, 0x68ec, 0x68ea, 0x68f1,
-  0x690f, 0x68d6, 0x68f7, 0x68eb, 0x68e4, 0x68f6, 0x6913, 0x6910,
-  0x68f3, 0x68e1, 0x6907, 0x68cc, 0x6908, 0x6970, 0x68b4, 0x6911,
-  0x68ef, 0x68c6, 0x6914, 0x68f8, 0x68d0, 0x68fd, 0x68fc, 0x68e8,
-  0x690b, 0x690a, 0x6917, 0x68ce, 0x68c8, 0x68dd, 0x68de, 0x68e6,
-  0x68f4, 0x68d1, 0x6906, 0x68d4, 0x68e9, 0x6915, 0x6925, 0x68c7,
-  0x6b39, 0x6b3b, 0x6b3f, 0x6b3c, 0x6b94, 0x6b97, 0x6b99, 0x6b95,
-  0x6bbd, 0x6bf0, 0x6bf2, 0x6bf3, 0x6c30, 0x6dfc, 0x6e46, 0x6e47,
-  0x6e1f, 0x6e49, 0x6e88, 0x6e3c, 0x6e3d, 0x6e45, 0x6e62, 0x6e2b,
-  0x6e3f, 0x6e41, 0x6e5d, 0x6e73, 0x6e1c, 0x6e33, 0x6e4b, 0x6e40,
-  0x6e51, 0x6e3b, 0x6e03, 0x6e2e, 0x6e5e,
-  /* 0xda */
-  0x6e68, 0x6e5c, 0x6e61, 0x6e31, 0x6e28, 0x6e60, 0x6e71, 0x6e6b,
-  0x6e39, 0x6e22, 0x6e30, 0x6e53, 0x6e65, 0x6e27, 0x6e78, 0x6e64,
-  0x6e77, 0x6e55, 0x6e79, 0x6e52, 0x6e66, 0x6e35, 0x6e36, 0x6e5a,
-  0x7120, 0x711e, 0x712f, 0x70fb, 0x712e, 0x7131, 0x7123, 0x7125,
-  0x7122, 0x7132, 0x711f, 0x7128, 0x713a, 0x711b, 0x724b, 0x725a,
-  0x7288, 0x7289, 0x7286, 0x7285, 0x728b, 0x7312, 0x730b, 0x7330,
-  0x7322, 0x7331, 0x7333, 0x7327, 0x7332, 0x732d, 0x7326, 0x7323,
-  0x7335, 0x730c, 0x742e, 0x742c, 0x7430, 0x742b, 0x7416, 0x741a,
-  0x7421, 0x742d, 0x7431, 0x7424, 0x7423, 0x741d, 0x7429, 0x7420,
-  0x7432, 0x74fb, 0x752f, 0x756f, 0x756c, 0x75e7, 0x75da, 0x75e1,
-  0x75e6, 0x75dd, 0x75df, 0x75e4, 0x75d7, 0x7695, 0x7692, 0x76da,
-  0x7746, 0x7747, 0x7744, 0x774d, 0x7745, 0x774a, 0x774e, 0x774b,
-  0x774c, 0x77de, 0x77ec, 0x7860, 0x7864, 0x7865, 0x785c, 0x786d,
-  0x7871, 0x786a, 0x786e, 0x7870, 0x7869, 0x7868, 0x785e, 0x7862,
-  0x7974, 0x7973, 0x7972, 0x7970, 0x7a02, 0x7a0a, 0x7a03, 0x7a0c,
-  0x7a04, 0x7a99, 0x7ae6, 0x7ae4, 0x7b4a, 0x7b3b, 0x7b44, 0x7b48,
-  0x7b4c, 0x7b4e, 0x7b40, 0x7b58, 0x7b45, 0x7ca2, 0x7c9e, 0x7ca8,
-  0x7ca1, 0x7d58, 0x7d6f, 0x7d63, 0x7d53, 0x7d56, 0x7d67, 0x7d6a,
-  0x7d4f, 0x7d6d, 0x7d5c, 0x7d6b, 0x7d52, 0x7d54, 0x7d69, 0x7d51,
-  0x7d5f, 0x7d4e, 0x7f3e, 0x7f3f, 0x7f65,
-  /* 0xdb */
-  0x7f66, 0x7fa2, 0x7fa0, 0x7fa1, 0x7fd7, 0x8051, 0x804f, 0x8050,
-  0x80fe, 0x80d4, 0x8143, 0x814a, 0x8152, 0x814f, 0x8147, 0x813d,
-  0x814d, 0x813a, 0x81e6, 0x81ee, 0x81f7, 0x81f8, 0x81f9, 0x8204,
-  0x823c, 0x823d, 0x823f, 0x8275, 0x833b, 0x83cf, 0x83f9, 0x8423,
-  0x83c0, 0x83e8, 0x8412, 0x83e7, 0x83e4, 0x83fc, 0x83f6, 0x8410,
-  0x83c6, 0x83c8, 0x83eb, 0x83e3, 0x83bf, 0x8401, 0x83dd, 0x83e5,
-  0x83d8, 0x83ff, 0x83e1, 0x83cb, 0x83ce, 0x83d6, 0x83f5, 0x83c9,
-  0x8409, 0x840f, 0x83de, 0x8411, 0x8406, 0x83c2, 0x83f3, 0x83d5,
-  0x83fa, 0x83c7, 0x83d1, 0x83ea, 0x8413, 0x83c3, 0x83ec, 0x83ee,
-  0x83c4, 0x83fb, 0x83d7, 0x83e2, 0x841b, 0x83db, 0x83fe, 0x86d8,
-  0x86e2, 0x86e6, 0x86d3, 0x86e3, 0x86da, 0x86ea, 0x86dd, 0x86eb,
-  0x86dc, 0x86ec, 0x86e9, 0x86d7, 0x86e8, 0x86d1, 0x8848, 0x8856,
-  0x8855, 0x88ba, 0x88d7, 0x88b9, 0x88b8, 0x88c0, 0x88be, 0x88b6,
-  0x88bc, 0x88b7, 0x88bd, 0x88b2, 0x8901, 0x88c9, 0x8995, 0x8998,
-  0x8997, 0x89dd, 0x89da, 0x89db, 0x8a4e, 0x8a4d, 0x8a39, 0x8a59,
-  0x8a40, 0x8a57, 0x8a58, 0x8a44, 0x8a45, 0x8a52, 0x8a48, 0x8a51,
-  0x8a4a, 0x8a4c, 0x8a4f, 0x8c5f, 0x8c81, 0x8c80, 0x8cba, 0x8cbe,
-  0x8cb0, 0x8cb9, 0x8cb5, 0x8d84, 0x8d80, 0x8d89, 0x8dd8, 0x8dd3,
-  0x8dcd, 0x8dc7, 0x8dd6, 0x8ddc, 0x8dcf, 0x8dd5, 0x8dd9, 0x8dc8,
-  0x8dd7, 0x8dc5, 0x8eef, 0x8ef7, 0x8efa,
-  /* 0xdc */
-  0x8ef9, 0x8ee6, 0x8eee, 0x8ee5, 0x8ef5, 0x8ee7, 0x8ee8, 0x8ef6,
-  0x8eeb, 0x8ef1, 0x8eec, 0x8ef4, 0x8ee9, 0x902d, 0x9034, 0x902f,
-  0x9106, 0x912c, 0x9104, 0x90ff, 0x90fc, 0x9108, 0x90f9, 0x90fb,
-  0x9101, 0x9100, 0x9107, 0x9105, 0x9103, 0x9161, 0x9164, 0x915f,
-  0x9162, 0x9160, 0x9201, 0x920a, 0x9225, 0x9203, 0x921a, 0x9226,
-  0x920f, 0x920c, 0x9200, 0x9212, 0x91ff, 0x91fd, 0x9206, 0x9204,
-  0x9227, 0x9202, 0x921c, 0x9224, 0x9219, 0x9217, 0x9205, 0x9216,
-  0x957b, 0x958d, 0x958c, 0x9590, 0x9687, 0x967e, 0x9688, 0x9689,
-  0x9683, 0x9680, 0x96c2, 0x96c8, 0x96c3, 0x96f1, 0x96f0, 0x976c,
-  0x9770, 0x976e, 0x9807, 0x98a9, 0x98eb, 0x9ce6, 0x9ef9, 0x4e83,
-  0x4e84, 0x4eb6, 0x50bd, 0x50bf, 0x50c6, 0x50ae, 0x50c4, 0x50ca,
-  0x50b4, 0x50c8, 0x50c2, 0x50b0, 0x50c1, 0x50ba, 0x50b1, 0x50cb,
-  0x50c9, 0x50b6, 0x50b8, 0x51d7, 0x527a, 0x5278, 0x527b, 0x527c,
-  0x55c3, 0x55db, 0x55cc, 0x55d0, 0x55cb, 0x55ca, 0x55dd, 0x55c0,
-  0x55d4, 0x55c4, 0x55e9, 0x55bf, 0x55d2, 0x558d, 0x55cf, 0x55d5,
-  0x55e2, 0x55d6, 0x55c8, 0x55f2, 0x55cd, 0x55d9, 0x55c2, 0x5714,
-  0x5853, 0x5868, 0x5864, 0x584f, 0x584d, 0x5849, 0x586f, 0x5855,
-  0x584e, 0x585d, 0x5859, 0x5865, 0x585b, 0x583d, 0x5863, 0x5871,
-  0x58fc, 0x5ac7, 0x5ac4, 0x5acb, 0x5aba, 0x5ab8, 0x5ab1, 0x5ab5,
-  0x5ab0, 0x5abf, 0x5ac8, 0x5abb, 0x5ac6,
-  /* 0xdd */
-  0x5ab7, 0x5ac0, 0x5aca, 0x5ab4, 0x5ab6, 0x5acd, 0x5ab9, 0x5a90,
-  0x5bd6, 0x5bd8, 0x5bd9, 0x5c1f, 0x5c33, 0x5d71, 0x5d63, 0x5d4a,
-  0x5d65, 0x5d72, 0x5d6c, 0x5d5e, 0x5d68, 0x5d67, 0x5d62, 0x5df0,
-  0x5e4f, 0x5e4e, 0x5e4a, 0x5e4d, 0x5e4b, 0x5ec5, 0x5ecc, 0x5ec6,
-  0x5ecb, 0x5ec7, 0x5f40, 0x5faf, 0x5fad, 0x60f7, 0x6149, 0x614a,
-  0x612b, 0x6145, 0x6136, 0x6132, 0x612e, 0x6146, 0x612f, 0x614f,
-  0x6129, 0x6140, 0x6220, 0x9168, 0x6223, 0x6225, 0x6224, 0x63c5,
-  0x63f1, 0x63eb, 0x6410, 0x6412, 0x6409, 0x6420, 0x6424, 0x6433,
-  0x6443, 0x641f, 0x6415, 0x6418, 0x6439, 0x6437, 0x6422, 0x6423,
-  0x640c, 0x6426, 0x6430, 0x6428, 0x6441, 0x6435, 0x642f, 0x640a,
-  0x641a, 0x6440, 0x6425, 0x6427, 0x640b, 0x63e7, 0x641b, 0x642e,
-  0x6421, 0x640e, 0x656f, 0x6592, 0x65d3, 0x6686, 0x668c, 0x6695,
-  0x6690, 0x668b, 0x668a, 0x6699, 0x6694, 0x6678, 0x6720, 0x6966,
-  0x695f, 0x6938, 0x694e, 0x6962, 0x6971, 0x693f, 0x6945, 0x696a,
-  0x6939, 0x6942, 0x6957, 0x6959, 0x697a, 0x6948, 0x6949, 0x6935,
-  0x696c, 0x6933, 0x693d, 0x6965, 0x68f0, 0x6978, 0x6934, 0x6969,
-  0x6940, 0x696f, 0x6944, 0x6976, 0x6958, 0x6941, 0x6974, 0x694c,
-  0x693b, 0x694b, 0x6937, 0x695c, 0x694f, 0x6951, 0x6932, 0x6952,
-  0x692f, 0x697b, 0x693c, 0x6b46, 0x6b45, 0x6b43, 0x6b42, 0x6b48,
-  0x6b41, 0x6b9b, 0xfa0d, 0x6bfb, 0x6bfc,
-  /* 0xde */
-  0x6bf9, 0x6bf7, 0x6bf8, 0x6e9b, 0x6ed6, 0x6ec8, 0x6e8f, 0x6ec0,
-  0x6e9f, 0x6e93, 0x6e94, 0x6ea0, 0x6eb1, 0x6eb9, 0x6ec6, 0x6ed2,
-  0x6ebd, 0x6ec1, 0x6e9e, 0x6ec9, 0x6eb7, 0x6eb0, 0x6ecd, 0x6ea6,
-  0x6ecf, 0x6eb2, 0x6ebe, 0x6ec3, 0x6edc, 0x6ed8, 0x6e99, 0x6e92,
-  0x6e8e, 0x6e8d, 0x6ea4, 0x6ea1, 0x6ebf, 0x6eb3, 0x6ed0, 0x6eca,
-  0x6e97, 0x6eae, 0x6ea3, 0x7147, 0x7154, 0x7152, 0x7163, 0x7160,
-  0x7141, 0x715d, 0x7162, 0x7172, 0x7178, 0x716a, 0x7161, 0x7142,
-  0x7158, 0x7143, 0x714b, 0x7170, 0x715f, 0x7150, 0x7153, 0x7144,
-  0x714d, 0x715a, 0x724f, 0x728d, 0x728c, 0x7291, 0x7290, 0x728e,
-  0x733c, 0x7342, 0x733b, 0x733a, 0x7340, 0x734a, 0x7349, 0x7444,
-  0x744a, 0x744b, 0x7452, 0x7451, 0x7457, 0x7440, 0x744f, 0x7450,
-  0x744e, 0x7442, 0x7446, 0x744d, 0x7454, 0x74e1, 0x74ff, 0x74fe,
-  0x74fd, 0x751d, 0x7579, 0x7577, 0x6983, 0x75ef, 0x760f, 0x7603,
-  0x75f7, 0x75fe, 0x75fc, 0x75f9, 0x75f8, 0x7610, 0x75fb, 0x75f6,
-  0x75ed, 0x75f5, 0x75fd, 0x7699, 0x76b5, 0x76dd, 0x7755, 0x775f,
-  0x7760, 0x7752, 0x7756, 0x775a, 0x7769, 0x7767, 0x7754, 0x7759,
-  0x776d, 0x77e0, 0x7887, 0x789a, 0x7894, 0x788f, 0x7884, 0x7895,
-  0x7885, 0x7886, 0x78a1, 0x7883, 0x7879, 0x7899, 0x7880, 0x7896,
-  0x787b, 0x797c, 0x7982, 0x797d, 0x7979, 0x7a11, 0x7a18, 0x7a19,
-  0x7a12, 0x7a17, 0x7a15, 0x7a22, 0x7a13,
-  /* 0xdf */
-  0x7a1b, 0x7a10, 0x7aa3, 0x7aa2, 0x7a9e, 0x7aeb, 0x7b66, 0x7b64,
-  0x7b6d, 0x7b74, 0x7b69, 0x7b72, 0x7b65, 0x7b73, 0x7b71, 0x7b70,
-  0x7b61, 0x7b78, 0x7b76, 0x7b63, 0x7cb2, 0x7cb4, 0x7caf, 0x7d88,
-  0x7d86, 0x7d80, 0x7d8d, 0x7d7f, 0x7d85, 0x7d7a, 0x7d8e, 0x7d7b,
-  0x7d83, 0x7d7c, 0x7d8c, 0x7d94, 0x7d84, 0x7d7d, 0x7d92, 0x7f6d,
-  0x7f6b, 0x7f67, 0x7f68, 0x7f6c, 0x7fa6, 0x7fa5, 0x7fa7, 0x7fdb,
-  0x7fdc, 0x8021, 0x8164, 0x8160, 0x8177, 0x815c, 0x8169, 0x815b,
-  0x8162, 0x8172, 0x6721, 0x815e, 0x8176, 0x8167, 0x816f, 0x8144,
-  0x8161, 0x821d, 0x8249, 0x8244, 0x8240, 0x8242, 0x8245, 0x84f1,
-  0x843f, 0x8456, 0x8476, 0x8479, 0x848f, 0x848d, 0x8465, 0x8451,
-  0x8440, 0x8486, 0x8467, 0x8430, 0x844d, 0x847d, 0x845a, 0x8459,
-  0x8474, 0x8473, 0x845d, 0x8507, 0x845e, 0x8437, 0x843a, 0x8434,
-  0x847a, 0x8443, 0x8478, 0x8432, 0x8445, 0x8429, 0x83d9, 0x844b,
-  0x842f, 0x8442, 0x842d, 0x845f, 0x8470, 0x8439, 0x844e, 0x844c,
-  0x8452, 0x846f, 0x84c5, 0x848e, 0x843b, 0x8447, 0x8436, 0x8433,
-  0x8468, 0x847e, 0x8444, 0x842b, 0x8460, 0x8454, 0x846e, 0x8450,
-  0x870b, 0x8704, 0x86f7, 0x870c, 0x86fa, 0x86d6, 0x86f5, 0x874d,
-  0x86f8, 0x870e, 0x8709, 0x8701, 0x86f6, 0x870d, 0x8705, 0x88d6,
-  0x88cb, 0x88cd, 0x88ce, 0x88de, 0x88db, 0x88da, 0x88cc, 0x88d0,
-  0x8985, 0x899b, 0x89df, 0x89e5, 0x89e4,
-  /* 0xe0 */
-  0x89e1, 0x89e0, 0x89e2, 0x89dc, 0x89e6, 0x8a76, 0x8a86, 0x8a7f,
-  0x8a61, 0x8a3f, 0x8a77, 0x8a82, 0x8a84, 0x8a75, 0x8a83, 0x8a81,
-  0x8a74, 0x8a7a, 0x8c3c, 0x8c4b, 0x8c4a, 0x8c65, 0x8c64, 0x8c66,
-  0x8c86, 0x8c84, 0x8c85, 0x8ccc, 0x8d68, 0x8d69, 0x8d91, 0x8d8c,
-  0x8d8e, 0x8d8f, 0x8d8d, 0x8d93, 0x8d94, 0x8d90, 0x8d92, 0x8df0,
-  0x8de0, 0x8dec, 0x8df1, 0x8dee, 0x8dd0, 0x8de9, 0x8de3, 0x8de2,
-  0x8de7, 0x8df2, 0x8deb, 0x8df4, 0x8f06, 0x8eff, 0x8f01, 0x8f00,
-  0x8f05, 0x8f07, 0x8f08, 0x8f02, 0x8f0b, 0x9052, 0x903f, 0x9044,
-  0x9049, 0x903d, 0x9110, 0x910d, 0x910f, 0x9111, 0x9116, 0x9114,
-  0x910b, 0x910e, 0x916e, 0x916f, 0x9248, 0x9252, 0x9230, 0x923a,
-  0x9266, 0x9233, 0x9265, 0x925e, 0x9283, 0x922e, 0x924a, 0x9246,
-  0x926d, 0x926c, 0x924f, 0x9260, 0x9267, 0x926f, 0x9236, 0x9261,
-  0x9270, 0x9231, 0x9254, 0x9263, 0x9250, 0x9272, 0x924e, 0x9253,
-  0x924c, 0x9256, 0x9232, 0x959f, 0x959c, 0x959e, 0x959b, 0x9692,
-  0x9693, 0x9691, 0x9697, 0x96ce, 0x96fa, 0x96fd, 0x96f8, 0x96f5,
-  0x9773, 0x9777, 0x9778, 0x9772, 0x980f, 0x980d, 0x980e, 0x98ac,
-  0x98f6, 0x98f9, 0x99af, 0x99b2, 0x99b0, 0x99b5, 0x9aad, 0x9aab,
-  0x9b5b, 0x9cea, 0x9ced, 0x9ce7, 0x9e80, 0x9efd, 0x50e6, 0x50d4,
-  0x50d7, 0x50e8, 0x50f3, 0x50db, 0x50ea, 0x50dd, 0x50e4, 0x50d3,
-  0x50ec, 0x50f0, 0x50ef, 0x50e3, 0x50e0,
-  /* 0xe1 */
-  0x51d8, 0x5280, 0x5281, 0x52e9, 0x52eb, 0x5330, 0x53ac, 0x5627,
-  0x5615, 0x560c, 0x5612, 0x55fc, 0x560f, 0x561c, 0x5601, 0x5613,
-  0x5602, 0x55fa, 0x561d, 0x5604, 0x55ff, 0x55f9, 0x5889, 0x587c,
-  0x5890, 0x5898, 0x5886, 0x5881, 0x587f, 0x5874, 0x588b, 0x587a,
-  0x5887, 0x5891, 0x588e, 0x5876, 0x5882, 0x5888, 0x587b, 0x5894,
-  0x588f, 0x58fe, 0x596b, 0x5adc, 0x5aee, 0x5ae5, 0x5ad5, 0x5aea,
-  0x5ada, 0x5aed, 0x5aeb, 0x5af3, 0x5ae2, 0x5ae0, 0x5adb, 0x5aec,
-  0x5ade, 0x5add, 0x5ad9, 0x5ae8, 0x5adf, 0x5b77, 0x5be0, 0x5be3,
-  0x5c63, 0x5d82, 0x5d80, 0x5d7d, 0x5d86, 0x5d7a, 0x5d81, 0x5d77,
-  0x5d8a, 0x5d89, 0x5d88, 0x5d7e, 0x5d7c, 0x5d8d, 0x5d79, 0x5d7f,
-  0x5e58, 0x5e59, 0x5e53, 0x5ed8, 0x5ed1, 0x5ed7, 0x5ece, 0x5edc,
-  0x5ed5, 0x5ed9, 0x5ed2, 0x5ed4, 0x5f44, 0x5f43, 0x5f6f, 0x5fb6,
-  0x612c, 0x6128, 0x6141, 0x615e, 0x6171, 0x6173, 0x6152, 0x6153,
-  0x6172, 0x616c, 0x6180, 0x6174, 0x6154, 0x617a, 0x615b, 0x6165,
-  0x613b, 0x616a, 0x6161, 0x6156, 0x6229, 0x6227, 0x622b, 0x642b,
-  0x644d, 0x645b, 0x645d, 0x6474, 0x6476, 0x6472, 0x6473, 0x647d,
-  0x6475, 0x6466, 0x64a6, 0x644e, 0x6482, 0x645e, 0x645c, 0x644b,
-  0x6453, 0x6460, 0x6450, 0x647f, 0x643f, 0x646c, 0x646b, 0x6459,
-  0x6465, 0x6477, 0x6573, 0x65a0, 0x66a1, 0x66a0, 0x669f, 0x6705,
-  0x6704, 0x6722, 0x69b1, 0x69b6, 0x69c9,
-  /* 0xe2 */
-  0x69a0, 0x69ce, 0x6996, 0x69b0, 0x69ac, 0x69bc, 0x6991, 0x6999,
-  0x698e, 0x69a7, 0x698d, 0x69a9, 0x69be, 0x69af, 0x69bf, 0x69c4,
-  0x69bd, 0x69a4, 0x69d4, 0x69b9, 0x69ca, 0x699a, 0x69cf, 0x69b3,
-  0x6993, 0x69aa, 0x69a1, 0x699e, 0x69d9, 0x6997, 0x6990, 0x69c2,
-  0x69b5, 0x69a5, 0x69c6, 0x6b4a, 0x6b4d, 0x6b4b, 0x6b9e, 0x6b9f,
-  0x6ba0, 0x6bc3, 0x6bc4, 0x6bfe, 0x6ece, 0x6ef5, 0x6ef1, 0x6f03,
-  0x6f25, 0x6ef8, 0x6f37, 0x6efb, 0x6f2e, 0x6f09, 0x6f4e, 0x6f19,
-  0x6f1a, 0x6f27, 0x6f18, 0x6f3b, 0x6f12, 0x6eed, 0x6f0a, 0x6f36,
-  0x6f73, 0x6ef9, 0x6eee, 0x6f2d, 0x6f40, 0x6f30, 0x6f3c, 0x6f35,
-  0x6eeb, 0x6f07, 0x6f0e, 0x6f43, 0x6f05, 0x6efd, 0x6ef6, 0x6f39,
-  0x6f1c, 0x6efc, 0x6f3a, 0x6f1f, 0x6f0d, 0x6f1e, 0x6f08, 0x6f21,
-  0x7187, 0x7190, 0x7189, 0x7180, 0x7185, 0x7182, 0x718f, 0x717b,
-  0x7186, 0x7181, 0x7197, 0x7244, 0x7253, 0x7297, 0x7295, 0x7293,
-  0x7343, 0x734d, 0x7351, 0x734c, 0x7462, 0x7473, 0x7471, 0x7475,
-  0x7472, 0x7467, 0x746e, 0x7500, 0x7502, 0x7503, 0x757d, 0x7590,
-  0x7616, 0x7608, 0x760c, 0x7615, 0x7611, 0x760a, 0x7614, 0x76b8,
-  0x7781, 0x777c, 0x7785, 0x7782, 0x776e, 0x7780, 0x776f, 0x777e,
-  0x7783, 0x78b2, 0x78aa, 0x78b4, 0x78ad, 0x78a8, 0x787e, 0x78ab,
-  0x789e, 0x78a5, 0x78a0, 0x78ac, 0x78a2, 0x78a4, 0x7998, 0x798a,
-  0x798b, 0x7996, 0x7995, 0x7994, 0x7993,
-  /* 0xe3 */
-  0x7997, 0x7988, 0x7992, 0x7990, 0x7a2b, 0x7a4a, 0x7a30, 0x7a2f,
-  0x7a28, 0x7a26, 0x7aa8, 0x7aab, 0x7aac, 0x7aee, 0x7b88, 0x7b9c,
-  0x7b8a, 0x7b91, 0x7b90, 0x7b96, 0x7b8d, 0x7b8c, 0x7b9b, 0x7b8e,
-  0x7b85, 0x7b98, 0x5284, 0x7b99, 0x7ba4, 0x7b82, 0x7cbb, 0x7cbf,
-  0x7cbc, 0x7cba, 0x7da7, 0x7db7, 0x7dc2, 0x7da3, 0x7daa, 0x7dc1,
-  0x7dc0, 0x7dc5, 0x7d9d, 0x7dce, 0x7dc4, 0x7dc6, 0x7dcb, 0x7dcc,
-  0x7daf, 0x7db9, 0x7d96, 0x7dbc, 0x7d9f, 0x7da6, 0x7dae, 0x7da9,
-  0x7da1, 0x7dc9, 0x7f73, 0x7fe2, 0x7fe3, 0x7fe5, 0x7fde, 0x8024,
-  0x805d, 0x805c, 0x8189, 0x8186, 0x8183, 0x8187, 0x818d, 0x818c,
-  0x818b, 0x8215, 0x8497, 0x84a4, 0x84a1, 0x849f, 0x84ba, 0x84ce,
-  0x84c2, 0x84ac, 0x84ae, 0x84ab, 0x84b9, 0x84b4, 0x84c1, 0x84cd,
-  0x84aa, 0x849a, 0x84b1, 0x84d0, 0x849d, 0x84a7, 0x84bb, 0x84a2,
-  0x8494, 0x84c7, 0x84cc, 0x849b, 0x84a9, 0x84af, 0x84a8, 0x84d6,
-  0x8498, 0x84b6, 0x84cf, 0x84a0, 0x84d7, 0x84d4, 0x84d2, 0x84db,
-  0x84b0, 0x8491, 0x8661, 0x8733, 0x8723, 0x8728, 0x876b, 0x8740,
-  0x872e, 0x871e, 0x8721, 0x8719, 0x871b, 0x8743, 0x872c, 0x8741,
-  0x873e, 0x8746, 0x8720, 0x8732, 0x872a, 0x872d, 0x873c, 0x8712,
-  0x873a, 0x8731, 0x8735, 0x8742, 0x8726, 0x8727, 0x8738, 0x8724,
-  0x871a, 0x8730, 0x8711, 0x88f7, 0x88e7, 0x88f1, 0x88f2, 0x88fa,
-  0x88fe, 0x88ee, 0x88fc, 0x88f6, 0x88fb,
-  /* 0xe4 */
-  0x88f0, 0x88ec, 0x88eb, 0x899d, 0x89a1, 0x899f, 0x899e, 0x89e9,
-  0x89eb, 0x89e8, 0x8aab, 0x8a99, 0x8a8b, 0x8a92, 0x8a8f, 0x8a96,
-  0x8c3d, 0x8c68, 0x8c69, 0x8cd5, 0x8ccf, 0x8cd7, 0x8d96, 0x8e09,
-  0x8e02, 0x8dff, 0x8e0d, 0x8dfd, 0x8e0a, 0x8e03, 0x8e07, 0x8e06,
-  0x8e05, 0x8dfe, 0x8e00, 0x8e04, 0x8f10, 0x8f11, 0x8f0e, 0x8f0d,
-  0x9123, 0x911c, 0x9120, 0x9122, 0x911f, 0x911d, 0x911a, 0x9124,
-  0x9121, 0x911b, 0x917a, 0x9172, 0x9179, 0x9173, 0x92a5, 0x92a4,
-  0x9276, 0x929b, 0x927a, 0x92a0, 0x9294, 0x92aa, 0x928d, 0x92a6,
-  0x929a, 0x92ab, 0x9279, 0x9297, 0x927f, 0x92a3, 0x92ee, 0x928e,
-  0x9282, 0x9295, 0x92a2, 0x927d, 0x9288, 0x92a1, 0x928a, 0x9286,
-  0x928c, 0x9299, 0x92a7, 0x927e, 0x9287, 0x92a9, 0x929d, 0x928b,
-  0x922d, 0x969e, 0x96a1, 0x96ff, 0x9758, 0x977d, 0x977a, 0x977e,
-  0x9783, 0x9780, 0x9782, 0x977b, 0x9784, 0x9781, 0x977f, 0x97ce,
-  0x97cd, 0x9816, 0x98ad, 0x98ae, 0x9902, 0x9900, 0x9907, 0x999d,
-  0x999c, 0x99c3, 0x99b9, 0x99bb, 0x99ba, 0x99c2, 0x99bd, 0x99c7,
-  0x9ab1, 0x9ae3, 0x9ae7, 0x9b3e, 0x9b3f, 0x9b60, 0x9b61, 0x9b5f,
-  0x9cf1, 0x9cf2, 0x9cf5, 0x9ea7, 0x50ff, 0x5103, 0x5130, 0x50f8,
-  0x5106, 0x5107, 0x50f6, 0x50fe, 0x510b, 0x510c, 0x50fd, 0x510a,
-  0x528b, 0x528c, 0x52f1, 0x52ef, 0x5648, 0x5642, 0x564c, 0x5635,
-  0x5641, 0x564a, 0x5649, 0x5646, 0x5658,
-  /* 0xe5 */
-  0x565a, 0x5640, 0x5633, 0x563d, 0x562c, 0x563e, 0x5638, 0x562a,
-  0x563a, 0x571a, 0x58ab, 0x589d, 0x58b1, 0x58a0, 0x58a3, 0x58af,
-  0x58ac, 0x58a5, 0x58a1, 0x58ff, 0x5aff, 0x5af4, 0x5afd, 0x5af7,
-  0x5af6, 0x5b03, 0x5af8, 0x5b02, 0x5af9, 0x5b01, 0x5b07, 0x5b05,
-  0x5b0f, 0x5c67, 0x5d99, 0x5d97, 0x5d9f, 0x5d92, 0x5da2, 0x5d93,
-  0x5d95, 0x5da0, 0x5d9c, 0x5da1, 0x5d9a, 0x5d9e, 0x5e69, 0x5e5d,
-  0x5e60, 0x5e5c, 0x7df3, 0x5edb, 0x5ede, 0x5ee1, 0x5f49, 0x5fb2,
-  0x618b, 0x6183, 0x6179, 0x61b1, 0x61b0, 0x61a2, 0x6189, 0x619b,
-  0x6193, 0x61af, 0x61ad, 0x619f, 0x6192, 0x61aa, 0x61a1, 0x618d,
-  0x6166, 0x61b3, 0x622d, 0x646e, 0x6470, 0x6496, 0x64a0, 0x6485,
-  0x6497, 0x649c, 0x648f, 0x648b, 0x648a, 0x648c, 0x64a3, 0x649f,
-  0x6468, 0x64b1, 0x6498, 0x6576, 0x657a, 0x6579, 0x657b, 0x65b2,
-  0x65b3, 0x66b5, 0x66b0, 0x66a9, 0x66b2, 0x66b7, 0x66aa, 0x66af,
-  0x6a00, 0x6a06, 0x6a17, 0x69e5, 0x69f8, 0x6a15, 0x69f1, 0x69e4,
-  0x6a20, 0x69ff, 0x69ec, 0x69e2, 0x6a1b, 0x6a1d, 0x69fe, 0x6a27,
-  0x69f2, 0x69ee, 0x6a14, 0x69f7, 0x69e7, 0x6a40, 0x6a08, 0x69e6,
-  0x69fb, 0x6a0d, 0x69fc, 0x69eb, 0x6a09, 0x6a04, 0x6a18, 0x6a25,
-  0x6a0f, 0x69f6, 0x6a26, 0x6a07, 0x69f4, 0x6a16, 0x6b51, 0x6ba5,
-  0x6ba3, 0x6ba2, 0x6ba6, 0x6c01, 0x6c00, 0x6bff, 0x6c02, 0x6f41,
-  0x6f26, 0x6f7e, 0x6f87, 0x6fc6, 0x6f92,
-  /* 0xe6 */
-  0x6f8d, 0x6f89, 0x6f8c, 0x6f62, 0x6f4f, 0x6f85, 0x6f5a, 0x6f96,
-  0x6f76, 0x6f6c, 0x6f82, 0x6f55, 0x6f72, 0x6f52, 0x6f50, 0x6f57,
-  0x6f94, 0x6f93, 0x6f5d, 0x6f00, 0x6f61, 0x6f6b, 0x6f7d, 0x6f67,
-  0x6f90, 0x6f53, 0x6f8b, 0x6f69, 0x6f7f, 0x6f95, 0x6f63, 0x6f77,
-  0x6f6a, 0x6f7b, 0x71b2, 0x71af, 0x719b, 0x71b0, 0x71a0, 0x719a,
-  0x71a9, 0x71b5, 0x719d, 0x71a5, 0x719e, 0x71a4, 0x71a1, 0x71aa,
-  0x719c, 0x71a7, 0x71b3, 0x7298, 0x729a, 0x7358, 0x7352, 0x735e,
-  0x735f, 0x7360, 0x735d, 0x735b, 0x7361, 0x735a, 0x7359, 0x7362,
-  0x7487, 0x7489, 0x748a, 0x7486, 0x7481, 0x747d, 0x7485, 0x7488,
-  0x747c, 0x7479, 0x7508, 0x7507, 0x757e, 0x7625, 0x761e, 0x7619,
-  0x761d, 0x761c, 0x7623, 0x761a, 0x7628, 0x761b, 0x769c, 0x769d,
-  0x769e, 0x769b, 0x778d, 0x778f, 0x7789, 0x7788, 0x78cd, 0x78bb,
-  0x78cf, 0x78cc, 0x78d1, 0x78ce, 0x78d4, 0x78c8, 0x78c3, 0x78c4,
-  0x78c9, 0x799a, 0x79a1, 0x79a0, 0x799c, 0x79a2, 0x799b, 0x6b76,
-  0x7a39, 0x7ab2, 0x7ab4, 0x7ab3, 0x7bb7, 0x7bcb, 0x7bbe, 0x7bac,
-  0x7bce, 0x7baf, 0x7bb9, 0x7bca, 0x7bb5, 0x7cc5, 0x7cc8, 0x7ccc,
-  0x7ccb, 0x7df7, 0x7ddb, 0x7dea, 0x7de7, 0x7dd7, 0x7de1, 0x7e03,
-  0x7dfa, 0x7de6, 0x7df6, 0x7df1, 0x7df0, 0x7dee, 0x7ddf, 0x7f76,
-  0x7fac, 0x7fb0, 0x7fad, 0x7fed, 0x7feb, 0x7fea, 0x7fec, 0x7fe6,
-  0x7fe8, 0x8064, 0x8067, 0x81a3, 0x819f,
-  /* 0xe7 */
-  0x819e, 0x8195, 0x81a2, 0x8199, 0x8197, 0x8216, 0x824f, 0x8253,
-  0x8252, 0x8250, 0x824e, 0x8251, 0x8524, 0x853b, 0x850f, 0x8500,
-  0x8529, 0x850e, 0x8509, 0x850d, 0x851f, 0x850a, 0x8527, 0x851c,
-  0x84fb, 0x852b, 0x84fa, 0x8508, 0x850c, 0x84f4, 0x852a, 0x84f2,
-  0x8515, 0x84f7, 0x84eb, 0x84f3, 0x84fc, 0x8512, 0x84ea, 0x84e9,
-  0x8516, 0x84fe, 0x8528, 0x851d, 0x852e, 0x8502, 0x84fd, 0x851e,
-  0x84f6, 0x8531, 0x8526, 0x84e7, 0x84e8, 0x84f0, 0x84ef, 0x84f9,
-  0x8518, 0x8520, 0x8530, 0x850b, 0x8519, 0x852f, 0x8662, 0x8756,
-  0x8763, 0x8764, 0x8777, 0x87e1, 0x8773, 0x8758, 0x8754, 0x875b,
-  0x8752, 0x8761, 0x875a, 0x8751, 0x875e, 0x876d, 0x876a, 0x8750,
-  0x874e, 0x875f, 0x875d, 0x876f, 0x876c, 0x877a, 0x876e, 0x875c,
-  0x8765, 0x874f, 0x877b, 0x8775, 0x8762, 0x8767, 0x8769, 0x885a,
-  0x8905, 0x890c, 0x8914, 0x890b, 0x8917, 0x8918, 0x8919, 0x8906,
-  0x8916, 0x8911, 0x890e, 0x8909, 0x89a2, 0x89a4, 0x89a3, 0x89ed,
-  0x89f0, 0x89ec, 0x8acf, 0x8ac6, 0x8ab8, 0x8ad3, 0x8ad1, 0x8ad4,
-  0x8ad5, 0x8abb, 0x8ad7, 0x8abe, 0x8ac0, 0x8ac5, 0x8ad8, 0x8ac3,
-  0x8aba, 0x8abd, 0x8ad9, 0x8c3e, 0x8c4d, 0x8c8f, 0x8ce5, 0x8cdf,
-  0x8cd9, 0x8ce8, 0x8cda, 0x8cdd, 0x8ce7, 0x8da0, 0x8d9c, 0x8da1,
-  0x8d9b, 0x8e20, 0x8e23, 0x8e25, 0x8e24, 0x8e2e, 0x8e15, 0x8e1b,
-  0x8e16, 0x8e11, 0x8e19, 0x8e26, 0x8e27,
-  /* 0xe8 */
-  0x8e14, 0x8e12, 0x8e18, 0x8e13, 0x8e1c, 0x8e17, 0x8e1a, 0x8f2c,
-  0x8f24, 0x8f18, 0x8f1a, 0x8f20, 0x8f23, 0x8f16, 0x8f17, 0x9073,
-  0x9070, 0x906f, 0x9067, 0x906b, 0x912f, 0x912b, 0x9129, 0x912a,
-  0x9132, 0x9126, 0x912e, 0x9185, 0x9186, 0x918a, 0x9181, 0x9182,
-  0x9184, 0x9180, 0x92d0, 0x92c3, 0x92c4, 0x92c0, 0x92d9, 0x92b6,
-  0x92cf, 0x92f1, 0x92df, 0x92d8, 0x92e9, 0x92d7, 0x92dd, 0x92cc,
-  0x92ef, 0x92c2, 0x92e8, 0x92ca, 0x92c8, 0x92ce, 0x92e6, 0x92cd,
-  0x92d5, 0x92c9, 0x92e0, 0x92de, 0x92e7, 0x92d1, 0x92d3, 0x92b5,
-  0x92e1, 0x92c6, 0x92b4, 0x957c, 0x95ac, 0x95ab, 0x95ae, 0x95b0,
-  0x96a4, 0x96a2, 0x96d3, 0x9705, 0x9708, 0x9702, 0x975a, 0x978a,
-  0x978e, 0x9788, 0x97d0, 0x97cf, 0x981e, 0x981d, 0x9826, 0x9829,
-  0x9828, 0x9820, 0x981b, 0x9827, 0x98b2, 0x9908, 0x98fa, 0x9911,
-  0x9914, 0x9916, 0x9917, 0x9915, 0x99dc, 0x99cd, 0x99cf, 0x99d3,
-  0x99d4, 0x99ce, 0x99c9, 0x99d6, 0x99d8, 0x99cb, 0x99d7, 0x99cc,
-  0x9ab3, 0x9aec, 0x9aeb, 0x9af3, 0x9af2, 0x9af1, 0x9b46, 0x9b43,
-  0x9b67, 0x9b74, 0x9b71, 0x9b66, 0x9b76, 0x9b75, 0x9b70, 0x9b68,
-  0x9b64, 0x9b6c, 0x9cfc, 0x9cfa, 0x9cfd, 0x9cff, 0x9cf7, 0x9d07,
-  0x9d00, 0x9cf9, 0x9cfb, 0x9d08, 0x9d05, 0x9d04, 0x9e83, 0x9ed3,
-  0x9f0f, 0x9f10, 0x511c, 0x5113, 0x5117, 0x511a, 0x5111, 0x51de,
-  0x5334, 0x53e1, 0x5670, 0x5660, 0x566e,
-  /* 0xe9 */
-  0x5673, 0x5666, 0x5663, 0x566d, 0x5672, 0x565e, 0x5677, 0x571c,
-  0x571b, 0x58c8, 0x58bd, 0x58c9, 0x58bf, 0x58ba, 0x58c2, 0x58bc,
-  0x58c6, 0x5b17, 0x5b19, 0x5b1b, 0x5b21, 0x5b14, 0x5b13, 0x5b10,
-  0x5b16, 0x5b28, 0x5b1a, 0x5b20, 0x5b1e, 0x5bef, 0x5dac, 0x5db1,
-  0x5da9, 0x5da7, 0x5db5, 0x5db0, 0x5dae, 0x5daa, 0x5da8, 0x5db2,
-  0x5dad, 0x5daf, 0x5db4, 0x5e67, 0x5e68, 0x5e66, 0x5e6f, 0x5ee9,
-  0x5ee7, 0x5ee6, 0x5ee8, 0x5ee5, 0x5f4b, 0x5fbc, 0x619d, 0x61a8,
-  0x6196, 0x61c5, 0x61b4, 0x61c6, 0x61c1, 0x61cc, 0x61ba, 0x61bf,
-  0x61b8, 0x618c, 0x64d7, 0x64d6, 0x64d0, 0x64cf, 0x64c9, 0x64bd,
-  0x6489, 0x64c3, 0x64db, 0x64f3, 0x64d9, 0x6533, 0x657f, 0x657c,
-  0x65a2, 0x66c8, 0x66be, 0x66c0, 0x66ca, 0x66cb, 0x66cf, 0x66bd,
-  0x66bb, 0x66ba, 0x66cc, 0x6723, 0x6a34, 0x6a66, 0x6a49, 0x6a67,
-  0x6a32, 0x6a68, 0x6a3e, 0x6a5d, 0x6a6d, 0x6a76, 0x6a5b, 0x6a51,
-  0x6a28, 0x6a5a, 0x6a3b, 0x6a3f, 0x6a41, 0x6a6a, 0x6a64, 0x6a50,
-  0x6a4f, 0x6a54, 0x6a6f, 0x6a69, 0x6a60, 0x6a3c, 0x6a5e, 0x6a56,
-  0x6a55, 0x6a4d, 0x6a4e, 0x6a46, 0x6b55, 0x6b54, 0x6b56, 0x6ba7,
-  0x6baa, 0x6bab, 0x6bc8, 0x6bc7, 0x6c04, 0x6c03, 0x6c06, 0x6fad,
-  0x6fcb, 0x6fa3, 0x6fc7, 0x6fbc, 0x6fce, 0x6fc8, 0x6f5e, 0x6fc4,
-  0x6fbd, 0x6f9e, 0x6fca, 0x6fa8, 0x7004, 0x6fa5, 0x6fae, 0x6fba,
-  0x6fac, 0x6faa, 0x6fcf, 0x6fbf, 0x6fb8,
-  /* 0xea */
-  0x6fa2, 0x6fc9, 0x6fab, 0x6fcd, 0x6faf, 0x6fb2, 0x6fb0, 0x71c5,
-  0x71c2, 0x71bf, 0x71b8, 0x71d6, 0x71c0, 0x71c1, 0x71cb, 0x71d4,
-  0x71ca, 0x71c7, 0x71cf, 0x71bd, 0x71d8, 0x71bc, 0x71c6, 0x71da,
-  0x71db, 0x729d, 0x729e, 0x7369, 0x7366, 0x7367, 0x736c, 0x7365,
-  0x736b, 0x736a, 0x747f, 0x749a, 0x74a0, 0x7494, 0x7492, 0x7495,
-  0x74a1, 0x750b, 0x7580, 0x762f, 0x762d, 0x7631, 0x763d, 0x7633,
-  0x763c, 0x7635, 0x7632, 0x7630, 0x76bb, 0x76e6, 0x779a, 0x779d,
-  0x77a1, 0x779c, 0x779b, 0x77a2, 0x77a3, 0x7795, 0x7799, 0x7797,
-  0x78dd, 0x78e9, 0x78e5, 0x78ea, 0x78de, 0x78e3, 0x78db, 0x78e1,
-  0x78e2, 0x78ed, 0x78df, 0x78e0, 0x79a4, 0x7a44, 0x7a48, 0x7a47,
-  0x7ab6, 0x7ab8, 0x7ab5, 0x7ab1, 0x7ab7, 0x7bde, 0x7be3, 0x7be7,
-  0x7bdd, 0x7bd5, 0x7be5, 0x7bda, 0x7be8, 0x7bf9, 0x7bd4, 0x7bea,
-  0x7be2, 0x7bdc, 0x7beb, 0x7bd8, 0x7bdf, 0x7cd2, 0x7cd4, 0x7cd7,
-  0x7cd0, 0x7cd1, 0x7e12, 0x7e21, 0x7e17, 0x7e0c, 0x7e1f, 0x7e20,
-  0x7e13, 0x7e0e, 0x7e1c, 0x7e15, 0x7e1a, 0x7e22, 0x7e0b, 0x7e0f,
-  0x7e16, 0x7e0d, 0x7e14, 0x7e25, 0x7e24, 0x7f43, 0x7f7b, 0x7f7c,
-  0x7f7a, 0x7fb1, 0x7fef, 0x802a, 0x8029, 0x806c, 0x81b1, 0x81a6,
-  0x81ae, 0x81b9, 0x81b5, 0x81ab, 0x81b0, 0x81ac, 0x81b4, 0x81b2,
-  0x81b7, 0x81a7, 0x81f2, 0x8255, 0x8256, 0x8257, 0x8556, 0x8545,
-  0x856b, 0x854d, 0x8553, 0x8561, 0x8558,
-  /* 0xeb */
-  0x8540, 0x8546, 0x8564, 0x8541, 0x8562, 0x8544, 0x8551, 0x8547,
-  0x8563, 0x853e, 0x855b, 0x8571, 0x854e, 0x856e, 0x8575, 0x8555,
-  0x8567, 0x8560, 0x858c, 0x8566, 0x855d, 0x8554, 0x8565, 0x856c,
-  0x8663, 0x8665, 0x8664, 0x879b, 0x878f, 0x8797, 0x8793, 0x8792,
-  0x8788, 0x8781, 0x8796, 0x8798, 0x8779, 0x8787, 0x87a3, 0x8785,
-  0x8790, 0x8791, 0x879d, 0x8784, 0x8794, 0x879c, 0x879a, 0x8789,
-  0x891e, 0x8926, 0x8930, 0x892d, 0x892e, 0x8927, 0x8931, 0x8922,
-  0x8929, 0x8923, 0x892f, 0x892c, 0x891f, 0x89f1, 0x8ae0, 0x8ae2,
-  0x8af2, 0x8af4, 0x8af5, 0x8add, 0x8b14, 0x8ae4, 0x8adf, 0x8af0,
-  0x8ac8, 0x8ade, 0x8ae1, 0x8ae8, 0x8aff, 0x8aef, 0x8afb, 0x8c91,
-  0x8c92, 0x8c90, 0x8cf5, 0x8cee, 0x8cf1, 0x8cf0, 0x8cf3, 0x8d6c,
-  0x8d6e, 0x8da5, 0x8da7, 0x8e33, 0x8e3e, 0x8e38, 0x8e40, 0x8e45,
-  0x8e36, 0x8e3c, 0x8e3d, 0x8e41, 0x8e30, 0x8e3f, 0x8ebd, 0x8f36,
-  0x8f2e, 0x8f35, 0x8f32, 0x8f39, 0x8f37, 0x8f34, 0x9076, 0x9079,
-  0x907b, 0x9086, 0x90fa, 0x9133, 0x9135, 0x9136, 0x9193, 0x9190,
-  0x9191, 0x918d, 0x918f, 0x9327, 0x931e, 0x9308, 0x931f, 0x9306,
-  0x930f, 0x937a, 0x9338, 0x933c, 0x931b, 0x9323, 0x9312, 0x9301,
-  0x9346, 0x932d, 0x930e, 0x930d, 0x92cb, 0x931d, 0x92fa, 0x9325,
-  0x9313, 0x92f9, 0x92f7, 0x9334, 0x9302, 0x9324, 0x92ff, 0x9329,
-  0x9339, 0x9335, 0x932a, 0x9314, 0x930c,
-  /* 0xec */
-  0x930b, 0x92fe, 0x9309, 0x9300, 0x92fb, 0x9316, 0x95bc, 0x95cd,
-  0x95be, 0x95b9, 0x95ba, 0x95b6, 0x95bf, 0x95b5, 0x95bd, 0x96a9,
-  0x96d4, 0x970b, 0x9712, 0x9710, 0x9799, 0x9797, 0x9794, 0x97f0,
-  0x97f8, 0x9835, 0x982f, 0x9832, 0x9924, 0x991f, 0x9927, 0x9929,
-  0x999e, 0x99ee, 0x99ec, 0x99e5, 0x99e4, 0x99f0, 0x99e3, 0x99ea,
-  0x99e9, 0x99e7, 0x9ab9, 0x9abf, 0x9ab4, 0x9abb, 0x9af6, 0x9afa,
-  0x9af9, 0x9af7, 0x9b33, 0x9b80, 0x9b85, 0x9b87, 0x9b7c, 0x9b7e,
-  0x9b7b, 0x9b82, 0x9b93, 0x9b92, 0x9b90, 0x9b7a, 0x9b95, 0x9b7d,
-  0x9b88, 0x9d25, 0x9d17, 0x9d20, 0x9d1e, 0x9d14, 0x9d29, 0x9d1d,
-  0x9d18, 0x9d22, 0x9d10, 0x9d19, 0x9d1f, 0x9e88, 0x9e86, 0x9e87,
-  0x9eae, 0x9ead, 0x9ed5, 0x9ed6, 0x9efa, 0x9f12, 0x9f3d, 0x5126,
-  0x5125, 0x5122, 0x5124, 0x5120, 0x5129, 0x52f4, 0x5693, 0x568c,
-  0x568d, 0x5686, 0x5684, 0x5683, 0x567e, 0x5682, 0x567f, 0x5681,
-  0x58d6, 0x58d4, 0x58cf, 0x58d2, 0x5b2d, 0x5b25, 0x5b32, 0x5b23,
-  0x5b2c, 0x5b27, 0x5b26, 0x5b2f, 0x5b2e, 0x5b7b, 0x5bf1, 0x5bf2,
-  0x5db7, 0x5e6c, 0x5e6a, 0x5fbe, 0x5fbb, 0x61c3, 0x61b5, 0x61bc,
-  0x61e7, 0x61e0, 0x61e5, 0x61e4, 0x61e8, 0x61de, 0x64ef, 0x64e9,
-  0x64e3, 0x64eb, 0x64e4, 0x64e8, 0x6581, 0x6580, 0x65b6, 0x65da,
-  0x66d2, 0x6a8d, 0x6a96, 0x6a81, 0x6aa5, 0x6a89, 0x6a9f, 0x6a9b,
-  0x6aa1, 0x6a9e, 0x6a87, 0x6a93, 0x6a8e,
-  /* 0xed */
-  0x6a95, 0x6a83, 0x6aa8, 0x6aa4, 0x6a91, 0x6a7f, 0x6aa6, 0x6a9a,
-  0x6a85, 0x6a8c, 0x6a92, 0x6b5b, 0x6bad, 0x6c09, 0x6fcc, 0x6fa9,
-  0x6ff4, 0x6fd4, 0x6fe3, 0x6fdc, 0x6fed, 0x6fe7, 0x6fe6, 0x6fde,
-  0x6ff2, 0x6fdd, 0x6fe2, 0x6fe8, 0x71e1, 0x71f1, 0x71e8, 0x71f2,
-  0x71e4, 0x71f0, 0x71e2, 0x7373, 0x736e, 0x736f, 0x7497, 0x74b2,
-  0x74ab, 0x7490, 0x74aa, 0x74ad, 0x74b1, 0x74a5, 0x74af, 0x7510,
-  0x7511, 0x7512, 0x750f, 0x7584, 0x7643, 0x7648, 0x7649, 0x7647,
-  0x76a4, 0x76e9, 0x77b5, 0x77ab, 0x77b2, 0x77b7, 0x77b6, 0x77b4,
-  0x77b1, 0x77a8, 0x77f0, 0x78f3, 0x78fd, 0x7902, 0x78fb, 0x78fc,
-  0x78f2, 0x7905, 0x78f9, 0x78fe, 0x7904, 0x79ab, 0x79a8, 0x7a5c,
-  0x7a5b, 0x7a56, 0x7a58, 0x7a54, 0x7a5a, 0x7abe, 0x7ac0, 0x7ac1,
-  0x7c05, 0x7c0f, 0x7bf2, 0x7c00, 0x7bff, 0x7bfb, 0x7c0e, 0x7bf4,
-  0x7c0b, 0x7bf3, 0x7c02, 0x7c09, 0x7c03, 0x7c01, 0x7bf8, 0x7bfd,
-  0x7c06, 0x7bf0, 0x7bf1, 0x7c10, 0x7c0a, 0x7ce8, 0x7e2d, 0x7e3c,
-  0x7e42, 0x7e33, 0x9848, 0x7e38, 0x7e2a, 0x7e49, 0x7e40, 0x7e47,
-  0x7e29, 0x7e4c, 0x7e30, 0x7e3b, 0x7e36, 0x7e44, 0x7e3a, 0x7f45,
-  0x7f7f, 0x7f7e, 0x7f7d, 0x7ff4, 0x7ff2, 0x802c, 0x81bb, 0x81c4,
-  0x81cc, 0x81ca, 0x81c5, 0x81c7, 0x81bc, 0x81e9, 0x825b, 0x825a,
-  0x825c, 0x8583, 0x8580, 0x858f, 0x85a7, 0x8595, 0x85a0, 0x858b,
-  0x85a3, 0x857b, 0x85a4, 0x859a, 0x859e,
-  /* 0xee */
-  0x8577, 0x857c, 0x8589, 0x85a1, 0x857a, 0x8578, 0x8557, 0x858e,
-  0x8596, 0x8586, 0x858d, 0x8599, 0x859d, 0x8581, 0x85a2, 0x8582,
-  0x8588, 0x8585, 0x8579, 0x8576, 0x8598, 0x8590, 0x859f, 0x8668,
-  0x87be, 0x87aa, 0x87ad, 0x87c5, 0x87b0, 0x87ac, 0x87b9, 0x87b5,
-  0x87bc, 0x87ae, 0x87c9, 0x87c3, 0x87c2, 0x87cc, 0x87b7, 0x87af,
-  0x87c4, 0x87ca, 0x87b4, 0x87b6, 0x87bf, 0x87b8, 0x87bd, 0x87de,
-  0x87b2, 0x8935, 0x8933, 0x893c, 0x893e, 0x8941, 0x8952, 0x8937,
-  0x8942, 0x89ad, 0x89af, 0x89ae, 0x89f2, 0x89f3, 0x8b1e, 0x8b18,
-  0x8b16, 0x8b11, 0x8b05, 0x8b0b, 0x8b22, 0x8b0f, 0x8b12, 0x8b15,
-  0x8b07, 0x8b0d, 0x8b08, 0x8b06, 0x8b1c, 0x8b13, 0x8b1a, 0x8c4f,
-  0x8c70, 0x8c72, 0x8c71, 0x8c6f, 0x8c95, 0x8c94, 0x8cf9, 0x8d6f,
-  0x8e4e, 0x8e4d, 0x8e53, 0x8e50, 0x8e4c, 0x8e47, 0x8f43, 0x8f40,
-  0x9085, 0x907e, 0x9138, 0x919a, 0x91a2, 0x919b, 0x9199, 0x919f,
-  0x91a1, 0x919d, 0x91a0, 0x93a1, 0x9383, 0x93af, 0x9364, 0x9356,
-  0x9347, 0x937c, 0x9358, 0x935c, 0x9376, 0x9349, 0x9350, 0x9351,
-  0x9360, 0x936d, 0x938f, 0x934c, 0x936a, 0x9379, 0x9357, 0x9355,
-  0x9352, 0x934f, 0x9371, 0x9377, 0x937b, 0x9361, 0x935e, 0x9363,
-  0x9367, 0x9380, 0x934e, 0x9359, 0x95c7, 0x95c0, 0x95c9, 0x95c3,
-  0x95c5, 0x95b7, 0x96ae, 0x96b0, 0x96ac, 0x9720, 0x971f, 0x9718,
-  0x971d, 0x9719, 0x979a, 0x97a1, 0x979c,
-  /* 0xef */
-  0x979e, 0x979d, 0x97d5, 0x97d4, 0x97f1, 0x9841, 0x9844, 0x984a,
-  0x9849, 0x9845, 0x9843, 0x9925, 0x992b, 0x992c, 0x992a, 0x9933,
-  0x9932, 0x992f, 0x992d, 0x9931, 0x9930, 0x9998, 0x99a3, 0x99a1,
-  0x9a02, 0x99fa, 0x99f4, 0x99f7, 0x99f9, 0x99f8, 0x99f6, 0x99fb,
-  0x99fd, 0x99fe, 0x99fc, 0x9a03, 0x9abe, 0x9afe, 0x9afd, 0x9b01,
-  0x9afc, 0x9b48, 0x9b9a, 0x9ba8, 0x9b9e, 0x9b9b, 0x9ba6, 0x9ba1,
-  0x9ba5, 0x9ba4, 0x9b86, 0x9ba2, 0x9ba0, 0x9baf, 0x9d33, 0x9d41,
-  0x9d67, 0x9d36, 0x9d2e, 0x9d2f, 0x9d31, 0x9d38, 0x9d30, 0x9d45,
-  0x9d42, 0x9d43, 0x9d3e, 0x9d37, 0x9d40, 0x9d3d, 0x7ff5, 0x9d2d,
-  0x9e8a, 0x9e89, 0x9e8d, 0x9eb0, 0x9ec8, 0x9eda, 0x9efb, 0x9eff,
-  0x9f24, 0x9f23, 0x9f22, 0x9f54, 0x9fa0, 0x5131, 0x512d, 0x512e,
-  0x5698, 0x569c, 0x5697, 0x569a, 0x569d, 0x5699, 0x5970, 0x5b3c,
-  0x5c69, 0x5c6a, 0x5dc0, 0x5e6d, 0x5e6e, 0x61d8, 0x61df, 0x61ed,
-  0x61ee, 0x61f1, 0x61ea, 0x61f0, 0x61eb, 0x61d6, 0x61e9, 0x64ff,
-  0x6504, 0x64fd, 0x64f8, 0x6501, 0x6503, 0x64fc, 0x6594, 0x65db,
-  0x66da, 0x66db, 0x66d8, 0x6ac5, 0x6ab9, 0x6abd, 0x6ae1, 0x6ac6,
-  0x6aba, 0x6ab6, 0x6ab7, 0x6ac7, 0x6ab4, 0x6aad, 0x6b5e, 0x6bc9,
-  0x6c0b, 0x7007, 0x700c, 0x700d, 0x7001, 0x7005, 0x7014, 0x700e,
-  0x6fff, 0x7000, 0x6ffb, 0x7026, 0x6ffc, 0x6ff7, 0x700a, 0x7201,
-  0x71ff, 0x71f9, 0x7203, 0x71fd, 0x7376,
-  /* 0xf0 */
-  0x74b8, 0x74c0, 0x74b5, 0x74c1, 0x74be, 0x74b6, 0x74bb, 0x74c2,
-  0x7514, 0x7513, 0x765c, 0x7664, 0x7659, 0x7650, 0x7653, 0x7657,
-  0x765a, 0x76a6, 0x76bd, 0x76ec, 0x77c2, 0x77ba, 0x78ff, 0x790c,
-  0x7913, 0x7914, 0x7909, 0x7910, 0x7912, 0x7911, 0x79ad, 0x79ac,
-  0x7a5f, 0x7c1c, 0x7c29, 0x7c19, 0x7c20, 0x7c1f, 0x7c2d, 0x7c1d,
-  0x7c26, 0x7c28, 0x7c22, 0x7c25, 0x7c30, 0x7e5c, 0x7e50, 0x7e56,
-  0x7e63, 0x7e58, 0x7e62, 0x7e5f, 0x7e51, 0x7e60, 0x7e57, 0x7e53,
-  0x7fb5, 0x7fb3, 0x7ff7, 0x7ff8, 0x8075, 0x81d1, 0x81d2, 0x81d0,
-  0x825f, 0x825e, 0x85b4, 0x85c6, 0x85c0, 0x85c3, 0x85c2, 0x85b3,
-  0x85b5, 0x85bd, 0x85c7, 0x85c4, 0x85bf, 0x85cb, 0x85ce, 0x85c8,
-  0x85c5, 0x85b1, 0x85b6, 0x85d2, 0x8624, 0x85b8, 0x85b7, 0x85be,
-  0x8669, 0x87e7, 0x87e6, 0x87e2, 0x87db, 0x87eb, 0x87ea, 0x87e5,
-  0x87df, 0x87f3, 0x87e4, 0x87d4, 0x87dc, 0x87d3, 0x87ed, 0x87d8,
-  0x87e3, 0x87a4, 0x87d7, 0x87d9, 0x8801, 0x87f4, 0x87e8, 0x87dd,
-  0x8953, 0x894b, 0x894f, 0x894c, 0x8946, 0x8950, 0x8951, 0x8949,
-  0x8b2a, 0x8b27, 0x8b23, 0x8b33, 0x8b30, 0x8b35, 0x8b47, 0x8b2f,
-  0x8b3c, 0x8b3e, 0x8b31, 0x8b25, 0x8b37, 0x8b26, 0x8b36, 0x8b2e,
-  0x8b24, 0x8b3b, 0x8b3d, 0x8b3a, 0x8c42, 0x8c75, 0x8c99, 0x8c98,
-  0x8c97, 0x8cfe, 0x8d04, 0x8d02, 0x8d00, 0x8e5c, 0x8e62, 0x8e60,
-  0x8e57, 0x8e56, 0x8e5e, 0x8e65, 0x8e67,
-  /* 0xf1 */
-  0x8e5b, 0x8e5a, 0x8e61, 0x8e5d, 0x8e69, 0x8e54, 0x8f46, 0x8f47,
-  0x8f48, 0x8f4b, 0x9128, 0x913a, 0x913b, 0x913e, 0x91a8, 0x91a5,
-  0x91a7, 0x91af, 0x91aa, 0x93b5, 0x938c, 0x9392, 0x93b7, 0x939b,
-  0x939d, 0x9389, 0x93a7, 0x938e, 0x93aa, 0x939e, 0x93a6, 0x9395,
-  0x9388, 0x9399, 0x939f, 0x938d, 0x93b1, 0x9391, 0x93b2, 0x93a4,
-  0x93a8, 0x93b4, 0x93a3, 0x93a5, 0x95d2, 0x95d3, 0x95d1, 0x96b3,
-  0x96d7, 0x96da, 0x5dc2, 0x96df, 0x96d8, 0x96dd, 0x9723, 0x9722,
-  0x9725, 0x97ac, 0x97ae, 0x97a8, 0x97ab, 0x97a4, 0x97aa, 0x97a2,
-  0x97a5, 0x97d7, 0x97d9, 0x97d6, 0x97d8, 0x97fa, 0x9850, 0x9851,
-  0x9852, 0x98b8, 0x9941, 0x993c, 0x993a, 0x9a0f, 0x9a0b, 0x9a09,
-  0x9a0d, 0x9a04, 0x9a11, 0x9a0a, 0x9a05, 0x9a07, 0x9a06, 0x9ac0,
-  0x9adc, 0x9b08, 0x9b04, 0x9b05, 0x9b29, 0x9b35, 0x9b4a, 0x9b4c,
-  0x9b4b, 0x9bc7, 0x9bc6, 0x9bc3, 0x9bbf, 0x9bc1, 0x9bb5, 0x9bb8,
-  0x9bd3, 0x9bb6, 0x9bc4, 0x9bb9, 0x9bbd, 0x9d5c, 0x9d53, 0x9d4f,
-  0x9d4a, 0x9d5b, 0x9d4b, 0x9d59, 0x9d56, 0x9d4c, 0x9d57, 0x9d52,
-  0x9d54, 0x9d5f, 0x9d58, 0x9d5a, 0x9e8e, 0x9e8c, 0x9edf, 0x9f01,
-  0x9f00, 0x9f16, 0x9f25, 0x9f2b, 0x9f2a, 0x9f29, 0x9f28, 0x9f4c,
-  0x9f55, 0x5134, 0x5135, 0x5296, 0x52f7, 0x53b4, 0x56ab, 0x56ad,
-  0x56a6, 0x56a7, 0x56aa, 0x56ac, 0x58da, 0x58dd, 0x58db, 0x5912,
-  0x5b3d, 0x5b3e, 0x5b3f, 0x5dc3, 0x5e70,
-  /* 0xf2 */
-  0x5fbf, 0x61fb, 0x6507, 0x6510, 0x650d, 0x6509, 0x650c, 0x650e,
-  0x6584, 0x65de, 0x65dd, 0x66de, 0x6ae7, 0x6ae0, 0x6acc, 0x6ad1,
-  0x6ad9, 0x6acb, 0x6adf, 0x6adc, 0x6ad0, 0x6aeb, 0x6acf, 0x6acd,
-  0x6ade, 0x6b60, 0x6bb0, 0x6c0c, 0x7019, 0x7027, 0x7020, 0x7016,
-  0x702b, 0x7021, 0x7022, 0x7023, 0x7029, 0x7017, 0x7024, 0x701c,
-  0x702a, 0x720c, 0x720a, 0x7207, 0x7202, 0x7205, 0x72a5, 0x72a6,
-  0x72a4, 0x72a3, 0x72a1, 0x74cb, 0x74c5, 0x74b7, 0x74c3, 0x7516,
-  0x7660, 0x77c9, 0x77ca, 0x77c4, 0x77f1, 0x791d, 0x791b, 0x7921,
-  0x791c, 0x7917, 0x791e, 0x79b0, 0x7a67, 0x7a68, 0x7c33, 0x7c3c,
-  0x7c39, 0x7c2c, 0x7c3b, 0x7cec, 0x7cea, 0x7e76, 0x7e75, 0x7e78,
-  0x7e70, 0x7e77, 0x7e6f, 0x7e7a, 0x7e72, 0x7e74, 0x7e68, 0x7f4b,
-  0x7f4a, 0x7f83, 0x7f86, 0x7fb7, 0x7ffd, 0x7ffe, 0x8078, 0x81d7,
-  0x81d5, 0x8264, 0x8261, 0x8263, 0x85eb, 0x85f1, 0x85ed, 0x85d9,
-  0x85e1, 0x85e8, 0x85da, 0x85d7, 0x85ec, 0x85f2, 0x85f8, 0x85d8,
-  0x85df, 0x85e3, 0x85dc, 0x85d1, 0x85f0, 0x85e6, 0x85ef, 0x85de,
-  0x85e2, 0x8800, 0x87fa, 0x8803, 0x87f6, 0x87f7, 0x8809, 0x880c,
-  0x880b, 0x8806, 0x87fc, 0x8808, 0x87ff, 0x880a, 0x8802, 0x8962,
-  0x895a, 0x895b, 0x8957, 0x8961, 0x895c, 0x8958, 0x895d, 0x8959,
-  0x8988, 0x89b7, 0x89b6, 0x89f6, 0x8b50, 0x8b48, 0x8b4a, 0x8b40,
-  0x8b53, 0x8b56, 0x8b54, 0x8b4b, 0x8b55,
-  /* 0xf3 */
-  0x8b51, 0x8b42, 0x8b52, 0x8b57, 0x8c43, 0x8c77, 0x8c76, 0x8c9a,
-  0x8d06, 0x8d07, 0x8d09, 0x8dac, 0x8daa, 0x8dad, 0x8dab, 0x8e6d,
-  0x8e78, 0x8e73, 0x8e6a, 0x8e6f, 0x8e7b, 0x8ec2, 0x8f52, 0x8f51,
-  0x8f4f, 0x8f50, 0x8f53, 0x8fb4, 0x9140, 0x913f, 0x91b0, 0x91ad,
-  0x93de, 0x93c7, 0x93cf, 0x93c2, 0x93da, 0x93d0, 0x93f9, 0x93ec,
-  0x93cc, 0x93d9, 0x93a9, 0x93e6, 0x93ca, 0x93d4, 0x93ee, 0x93e3,
-  0x93d5, 0x93c4, 0x93ce, 0x93c0, 0x93d2, 0x93e7, 0x957d, 0x95da,
-  0x95db, 0x96e1, 0x9729, 0x972b, 0x972c, 0x9728, 0x9726, 0x97b3,
-  0x97b7, 0x97b6, 0x97dd, 0x97de, 0x97df, 0x985c, 0x9859, 0x985d,
-  0x9857, 0x98bf, 0x98bd, 0x98bb, 0x98be, 0x9948, 0x9947, 0x9943,
-  0x99a6, 0x99a7, 0x9a1a, 0x9a15, 0x9a25, 0x9a1d, 0x9a24, 0x9a1b,
-  0x9a22, 0x9a20, 0x9a27, 0x9a23, 0x9a1e, 0x9a1c, 0x9a14, 0x9ac2,
-  0x9b0b, 0x9b0a, 0x9b0e, 0x9b0c, 0x9b37, 0x9bea, 0x9beb, 0x9be0,
-  0x9bde, 0x9be4, 0x9be6, 0x9be2, 0x9bf0, 0x9bd4, 0x9bd7, 0x9bec,
-  0x9bdc, 0x9bd9, 0x9be5, 0x9bd5, 0x9be1, 0x9bda, 0x9d77, 0x9d81,
-  0x9d8a, 0x9d84, 0x9d88, 0x9d71, 0x9d80, 0x9d78, 0x9d86, 0x9d8b,
-  0x9d8c, 0x9d7d, 0x9d6b, 0x9d74, 0x9d75, 0x9d70, 0x9d69, 0x9d85,
-  0x9d73, 0x9d7b, 0x9d82, 0x9d6f, 0x9d79, 0x9d7f, 0x9d87, 0x9d68,
-  0x9e94, 0x9e91, 0x9ec0, 0x9efc, 0x9f2d, 0x9f40, 0x9f41, 0x9f4d,
-  0x9f56, 0x9f57, 0x9f58, 0x5337, 0x56b2,
-  /* 0xf4 */
-  0x56b5, 0x56b3, 0x58e3, 0x5b45, 0x5dc6, 0x5dc7, 0x5eee, 0x5eef,
-  0x5fc0, 0x5fc1, 0x61f9, 0x6517, 0x6516, 0x6515, 0x6513, 0x65df,
-  0x66e8, 0x66e3, 0x66e4, 0x6af3, 0x6af0, 0x6aea, 0x6ae8, 0x6af9,
-  0x6af1, 0x6aee, 0x6aef, 0x703c, 0x7035, 0x702f, 0x7037, 0x7034,
-  0x7031, 0x7042, 0x7038, 0x703f, 0x703a, 0x7039, 0x7040, 0x703b,
-  0x7033, 0x7041, 0x7213, 0x7214, 0x72a8, 0x737d, 0x737c, 0x74ba,
-  0x76ab, 0x76aa, 0x76be, 0x76ed, 0x77cc, 0x77ce, 0x77cf, 0x77cd,
-  0x77f2, 0x7925, 0x7923, 0x7927, 0x7928, 0x7924, 0x7929, 0x79b2,
-  0x7a6e, 0x7a6c, 0x7a6d, 0x7af7, 0x7c49, 0x7c48, 0x7c4a, 0x7c47,
-  0x7c45, 0x7cee, 0x7e7b, 0x7e7e, 0x7e81, 0x7e80, 0x7fba, 0x7fff,
-  0x8079, 0x81db, 0x81d9, 0x820b, 0x8268, 0x8269, 0x8622, 0x85ff,
-  0x8601, 0x85fe, 0x861b, 0x8600, 0x85f6, 0x8604, 0x8609, 0x8605,
-  0x860c, 0x85fd, 0x8819, 0x8810, 0x8811, 0x8817, 0x8813, 0x8816,
-  0x8963, 0x8966, 0x89b9, 0x89f7, 0x8b60, 0x8b6a, 0x8b5d, 0x8b68,
-  0x8b63, 0x8b65, 0x8b67, 0x8b6d, 0x8dae, 0x8e86, 0x8e88, 0x8e84,
-  0x8f59, 0x8f56, 0x8f57, 0x8f55, 0x8f58, 0x8f5a, 0x908d, 0x9143,
-  0x9141, 0x91b7, 0x91b5, 0x91b2, 0x91b3, 0x940b, 0x9413, 0x93fb,
-  0x9420, 0x940f, 0x9414, 0x93fe, 0x9415, 0x9410, 0x9428, 0x9419,
-  0x940d, 0x93f5, 0x9400, 0x93f7, 0x9407, 0x940e, 0x9416, 0x9412,
-  0x93fa, 0x9409, 0x93f8, 0x940a, 0x93ff,
-  /* 0xf5 */
-  0x93fc, 0x940c, 0x93f6, 0x9411, 0x9406, 0x95de, 0x95e0, 0x95df,
-  0x972e, 0x972f, 0x97b9, 0x97bb, 0x97fd, 0x97fe, 0x9860, 0x9862,
-  0x9863, 0x985f, 0x98c1, 0x98c2, 0x9950, 0x994e, 0x9959, 0x994c,
-  0x994b, 0x9953, 0x9a32, 0x9a34, 0x9a31, 0x9a2c, 0x9a2a, 0x9a36,
-  0x9a29, 0x9a2e, 0x9a38, 0x9a2d, 0x9ac7, 0x9aca, 0x9ac6, 0x9b10,
-  0x9b12, 0x9b11, 0x9c0b, 0x9c08, 0x9bf7, 0x9c05, 0x9c12, 0x9bf8,
-  0x9c40, 0x9c07, 0x9c0e, 0x9c06, 0x9c17, 0x9c14, 0x9c09, 0x9d9f,
-  0x9d99, 0x9da4, 0x9d9d, 0x9d92, 0x9d98, 0x9d90, 0x9d9b, 0x9da0,
-  0x9d94, 0x9d9c, 0x9daa, 0x9d97, 0x9da1, 0x9d9a, 0x9da2, 0x9da8,
-  0x9d9e, 0x9da3, 0x9dbf, 0x9da9, 0x9d96, 0x9da6, 0x9da7, 0x9e99,
-  0x9e9b, 0x9e9a, 0x9ee5, 0x9ee4, 0x9ee7, 0x9ee6, 0x9f30, 0x9f2e,
-  0x9f5b, 0x9f60, 0x9f5e, 0x9f5d, 0x9f59, 0x9f91, 0x513a, 0x5139,
-  0x5298, 0x5297, 0x56c3, 0x56bd, 0x56be, 0x5b48, 0x5b47, 0x5dcb,
-  0x5dcf, 0x5ef1, 0x61fd, 0x651b, 0x6b02, 0x6afc, 0x6b03, 0x6af8,
-  0x6b00, 0x7043, 0x7044, 0x704a, 0x7048, 0x7049, 0x7045, 0x7046,
-  0x721d, 0x721a, 0x7219, 0x737e, 0x7517, 0x766a, 0x77d0, 0x792d,
-  0x7931, 0x792f, 0x7c54, 0x7c53, 0x7cf2, 0x7e8a, 0x7e87, 0x7e88,
-  0x7e8b, 0x7e86, 0x7e8d, 0x7f4d, 0x7fbb, 0x8030, 0x81dd, 0x8618,
-  0x862a, 0x8626, 0x861f, 0x8623, 0x861c, 0x8619, 0x8627, 0x862e,
-  0x8621, 0x8620, 0x8629, 0x861e, 0x8625,
-  /* 0xf6 */
-  0x8829, 0x881d, 0x881b, 0x8820, 0x8824, 0x881c, 0x882b, 0x884a,
-  0x896d, 0x8969, 0x896e, 0x896b, 0x89fa, 0x8b79, 0x8b78, 0x8b45,
-  0x8b7a, 0x8b7b, 0x8d10, 0x8d14, 0x8daf, 0x8e8e, 0x8e8c, 0x8f5e,
-  0x8f5b, 0x8f5d, 0x9146, 0x9144, 0x9145, 0x91b9, 0x943f, 0x943b,
-  0x9436, 0x9429, 0x943d, 0x943c, 0x9430, 0x9439, 0x942a, 0x9437,
-  0x942c, 0x9440, 0x9431, 0x95e5, 0x95e4, 0x95e3, 0x9735, 0x973a,
-  0x97bf, 0x97e1, 0x9864, 0x98c9, 0x98c6, 0x98c0, 0x9958, 0x9956,
-  0x9a39, 0x9a3d, 0x9a46, 0x9a44, 0x9a42, 0x9a41, 0x9a3a, 0x9a3f,
-  0x9acd, 0x9b15, 0x9b17, 0x9b18, 0x9b16, 0x9b3a, 0x9b52, 0x9c2b,
-  0x9c1d, 0x9c1c, 0x9c2c, 0x9c23, 0x9c28, 0x9c29, 0x9c24, 0x9c21,
-  0x9db7, 0x9db6, 0x9dbc, 0x9dc1, 0x9dc7, 0x9dca, 0x9dcf, 0x9dbe,
-  0x9dc5, 0x9dc3, 0x9dbb, 0x9db5, 0x9dce, 0x9db9, 0x9dba, 0x9dac,
-  0x9dc8, 0x9db1, 0x9dad, 0x9dcc, 0x9db3, 0x9dcd, 0x9db2, 0x9e7a,
-  0x9e9c, 0x9eeb, 0x9eee, 0x9eed, 0x9f1b, 0x9f18, 0x9f1a, 0x9f31,
-  0x9f4e, 0x9f65, 0x9f64, 0x9f92, 0x4eb9, 0x56c6, 0x56c5, 0x56cb,
-  0x5971, 0x5b4b, 0x5b4c, 0x5dd5, 0x5dd1, 0x5ef2, 0x6521, 0x6520,
-  0x6526, 0x6522, 0x6b0b, 0x6b08, 0x6b09, 0x6c0d, 0x7055, 0x7056,
-  0x7057, 0x7052, 0x721e, 0x721f, 0x72a9, 0x737f, 0x74d8, 0x74d5,
-  0x74d9, 0x74d7, 0x766d, 0x76ad, 0x7935, 0x79b4, 0x7a70, 0x7a71,
-  0x7c57, 0x7c5c, 0x7c59, 0x7c5b, 0x7c5a,
-  /* 0xf7 */
-  0x7cf4, 0x7cf1, 0x7e91, 0x7f4f, 0x7f87, 0x81de, 0x826b, 0x8634,
-  0x8635, 0x8633, 0x862c, 0x8632, 0x8636, 0x882c, 0x8828, 0x8826,
-  0x882a, 0x8825, 0x8971, 0x89bf, 0x89be, 0x89fb, 0x8b7e, 0x8b84,
-  0x8b82, 0x8b86, 0x8b85, 0x8b7f, 0x8d15, 0x8e95, 0x8e94, 0x8e9a,
-  0x8e92, 0x8e90, 0x8e96, 0x8e97, 0x8f60, 0x8f62, 0x9147, 0x944c,
-  0x9450, 0x944a, 0x944b, 0x944f, 0x9447, 0x9445, 0x9448, 0x9449,
-  0x9446, 0x973f, 0x97e3, 0x986a, 0x9869, 0x98cb, 0x9954, 0x995b,
-  0x9a4e, 0x9a53, 0x9a54, 0x9a4c, 0x9a4f, 0x9a48, 0x9a4a, 0x9a49,
-  0x9a52, 0x9a50, 0x9ad0, 0x9b19, 0x9b2b, 0x9b3b, 0x9b56, 0x9b55,
-  0x9c46, 0x9c48, 0x9c3f, 0x9c44, 0x9c39, 0x9c33, 0x9c41, 0x9c3c,
-  0x9c37, 0x9c34, 0x9c32, 0x9c3d, 0x9c36, 0x9ddb, 0x9dd2, 0x9dde,
-  0x9dda, 0x9dcb, 0x9dd0, 0x9ddc, 0x9dd1, 0x9ddf, 0x9de9, 0x9dd9,
-  0x9dd8, 0x9dd6, 0x9df5, 0x9dd5, 0x9ddd, 0x9eb6, 0x9ef0, 0x9f35,
-  0x9f33, 0x9f32, 0x9f42, 0x9f6b, 0x9f95, 0x9fa2, 0x513d, 0x5299,
-  0x58e8, 0x58e7, 0x5972, 0x5b4d, 0x5dd8, 0x882f, 0x5f4f, 0x6201,
-  0x6203, 0x6204, 0x6529, 0x6525, 0x6596, 0x66eb, 0x6b11, 0x6b12,
-  0x6b0f, 0x6bca, 0x705b, 0x705a, 0x7222, 0x7382, 0x7381, 0x7383,
-  0x7670, 0x77d4, 0x7c67, 0x7c66, 0x7e95, 0x826c, 0x863a, 0x8640,
-  0x8639, 0x863c, 0x8631, 0x863b, 0x863e, 0x8830, 0x8832, 0x882e,
-  0x8833, 0x8976, 0x8974, 0x8973, 0x89fe,
-  /* 0xf8 */
-  0x8b8c, 0x8b8e, 0x8b8b, 0x8b88, 0x8c45, 0x8d19, 0x8e98, 0x8f64,
-  0x8f63, 0x91bc, 0x9462, 0x9455, 0x945d, 0x9457, 0x945e, 0x97c4,
-  0x97c5, 0x9800, 0x9a56, 0x9a59, 0x9b1e, 0x9b1f, 0x9b20, 0x9c52,
-  0x9c58, 0x9c50, 0x9c4a, 0x9c4d, 0x9c4b, 0x9c55, 0x9c59, 0x9c4c,
-  0x9c4e, 0x9dfb, 0x9df7, 0x9def, 0x9de3, 0x9deb, 0x9df8, 0x9de4,
-  0x9df6, 0x9de1, 0x9dee, 0x9de6, 0x9df2, 0x9df0, 0x9de2, 0x9dec,
-  0x9df4, 0x9df3, 0x9de8, 0x9ded, 0x9ec2, 0x9ed0, 0x9ef2, 0x9ef3,
-  0x9f06, 0x9f1c, 0x9f38, 0x9f37, 0x9f36, 0x9f43, 0x9f4f, 0x9f71,
-  0x9f70, 0x9f6e, 0x9f6f, 0x56d3, 0x56cd, 0x5b4e, 0x5c6d, 0x652d,
-  0x66ed, 0x66ee, 0x6b13, 0x705f, 0x7061, 0x705d, 0x7060, 0x7223,
-  0x74db, 0x74e5, 0x77d5, 0x7938, 0x79b7, 0x79b6, 0x7c6a, 0x7e97,
-  0x7f89, 0x826d, 0x8643, 0x8838, 0x8837, 0x8835, 0x884b, 0x8b94,
-  0x8b95, 0x8e9e, 0x8e9f, 0x8ea0, 0x8e9d, 0x91be, 0x91bd, 0x91c2,
-  0x946b, 0x9468, 0x9469, 0x96e5, 0x9746, 0x9743, 0x9747, 0x97c7,
-  0x97e5, 0x9a5e, 0x9ad5, 0x9b59, 0x9c63, 0x9c67, 0x9c66, 0x9c62,
-  0x9c5e, 0x9c60, 0x9e02, 0x9dfe, 0x9e07, 0x9e03, 0x9e06, 0x9e05,
-  0x9e00, 0x9e01, 0x9e09, 0x9dff, 0x9dfd, 0x9e04, 0x9ea0, 0x9f1e,
-  0x9f46, 0x9f74, 0x9f75, 0x9f76, 0x56d4, 0x652e, 0x65b8, 0x6b18,
-  0x6b19, 0x6b17, 0x6b1a, 0x7062, 0x7226, 0x72aa, 0x77d8, 0x77d9,
-  0x7939, 0x7c69, 0x7c6b, 0x7cf6, 0x7e9a,
-  /* 0xf9 */
-  0x7e98, 0x7e9b, 0x7e99, 0x81e0, 0x81e1, 0x8646, 0x8647, 0x8648,
-  0x8979, 0x897a, 0x897c, 0x897b, 0x89ff, 0x8b98, 0x8b99, 0x8ea5,
-  0x8ea4, 0x8ea3, 0x946e, 0x946d, 0x946f, 0x9471, 0x9473, 0x9749,
-  0x9872, 0x995f, 0x9c68, 0x9c6e, 0x9c6d, 0x9e0b, 0x9e0d, 0x9e10,
-  0x9e0f, 0x9e12, 0x9e11, 0x9ea1, 0x9ef5, 0x9f09, 0x9f47, 0x9f78,
-  0x9f7b, 0x9f7a, 0x9f79, 0x571e, 0x7066, 0x7c6f, 0x883c, 0x8db2,
-  0x8ea6, 0x91c3, 0x9474, 0x9478, 0x9476, 0x9475, 0x9a60, 0x9c74,
-  0x9c73, 0x9c71, 0x9c75, 0x9e14, 0x9e13, 0x9ef6, 0x9f0a, 0x9fa4,
-  0x7068, 0x7065, 0x7cf7, 0x866a, 0x883e, 0x883d, 0x883f, 0x8b9e,
-  0x8c9c, 0x8ea9, 0x8ec9, 0x974b, 0x9873, 0x9874, 0x98cc, 0x9961,
-  0x99ab, 0x9a64, 0x9a66, 0x9a67, 0x9b24, 0x9e15, 0x9e17, 0x9f48,
-  0x6207, 0x6b1e, 0x7227, 0x864c, 0x8ea8, 0x9482, 0x9480, 0x9481,
-  0x9a69, 0x9a68, 0x9b2e, 0x9e19, 0x7229, 0x864b, 0x8b9f, 0x9483,
-  0x9c79, 0x9eb7, 0x7675, 0x9a6b, 0x9c7a, 0x9e1d, 0x7069, 0x706a,
-  0x9ea4, 0x9f7e, 0x9f49, 0x9f98,
-};
-
-static int
-big5_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c1 = s[0];
-  if ((c1 >= 0xa1 && c1 <= 0xc7) || (c1 >= 0xc9 && c1 <= 0xf9)) {
-    if (n >= 2) {
-      unsigned char c2 = s[1];
-      if ((c2 >= 0x40 && c2 < 0x7f) || (c2 >= 0xa1 && c2 < 0xff)) {
-        unsigned int i = 157 * (c1 - 0xa1) + (c2 - (c2 >= 0xa1 ? 0x62 : 0x40));
-        unsigned short wc = 0xfffd;
-        if (i < 6280) {
-          if (i < 6121)
-            wc = big5_2uni_pagea1[i];
-        } else {
-          if (i < 13932)
-            wc = big5_2uni_pagec9[i-6280];
-        }
-        if (wc != 0xfffd) {
-          *pwc = (ucs4_t) wc;
-          return 2;
-        }
-      }
-      return RET_ILSEQ;
-    }
-    return RET_TOOFEW(0);
-  }
-  return RET_ILSEQ;
-}
-
-static const unsigned short big5_2charset[13703] = {
-  0xa246, 0xa247, 0xa244, 0xa1b1, 0xa258, 0xa1d3, 0xa150, 0xa1d1,
-  0xa1d2, 0xa3be, 0xa3bc, 0xa3bd, 0xa3bf, 0xa3bb, 0xa344, 0xa345,
-  0xa346, 0xa347, 0xa348, 0xa349, 0xa34a, 0xa34b, 0xa34c, 0xa34d,
-  0xa34e, 0xa34f, 0xa350, 0xa351, 0xa352, 0xa353, 0xa354, 0xa355,
-  0xa356, 0xa357, 0xa358, 0xa359, 0xa35a, 0xa35b, 0xa35c, 0xa35d,
-  0xa35e, 0xa35f, 0xa360, 0xa361, 0xa362, 0xa363, 0xa364, 0xa365,
-  0xa366, 0xa367, 0xa368, 0xa369, 0xa36a, 0xa36b, 0xa36c, 0xa36d,
-  0xa36e, 0xa36f, 0xa370, 0xa371, 0xa372, 0xa373, 0xc7b3, 0xc7b1,
-  0xc7b2, 0xc7b4, 0xc7b5, 0xc7b6, 0xc7b7, 0xc7b8, 0xc7b9, 0xc7ba,
-  0xc7bb, 0xc7bc, 0xc7bd, 0xc7be, 0xc7bf, 0xc7c0, 0xc7c1, 0xc7c2,
-  0xc7c3, 0xc7c4, 0xc7c5, 0xc7c6, 0xc7c7, 0xc7c8, 0xc7c9, 0xc7ca,
-  0xc7cb, 0xc7cc, 0xc7cd, 0xc7cf, 0xc7d0, 0xc7d1, 0xc7d2, 0xc7d3,
-  0xc7d4, 0xc7d5, 0xc7d6, 0xc7d7, 0xc7d8, 0xc7d9, 0xc7da, 0xc7db,
-  0xc7dc, 0xc7dd, 0xc7de, 0xc7df, 0xc7e0, 0xc7e1, 0xc7e2, 0xc7e3,
-  0xc7e4, 0xc7e5, 0xc7e6, 0xc7e7, 0xc7e8, 0xc7ce, 0xa156, 0xa158,
-  0xa1a5, 0xa1a6, 0xa1a7, 0xa1a8, 0xa145, 0xa14c, 0xa14b, 0xa1ac,
-  0xa1ab, 0xa1b0, 0xa1c2, 0xa24a, 0xa1c1, 0xa24b, 0xa2b9, 0xa2ba,
-  0xa2bb, 0xa2bc, 0xa2bd, 0xa2be, 0xa2bf, 0xa2c0, 0xa2c1, 0xa2c2,
-  0xa1f6, 0xa1f4, 0xa1f7, 0xa1f5, 0xa1f8, 0xa1f9, 0xa1fb, 0xa1fa,
-  0xa1d4, 0xa1db, 0xa1e8, 0xa1e7, 0xa1fd, 0xa1fc, 0xa1e4, 0xa1e5,
-  0xa1ec, 0xa1ed, 0xa1ef, 0xa1ee, 0xa1e3, 0xa1dc, 0xa1da, 0xa1dd,
-  0xa1d8, 0xa1d9, 0xa1e6, 0xa1e9, 0xc7e9, 0xc7ea, 0xc7eb, 0xc7ec,
-  0xc7ed, 0xc7ee, 0xc7ef, 0xc7f0, 0xc7f1, 0xc7f2, 0xc7f3, 0xc7f4,
-  0xc7f5, 0xc7f6, 0xc7f7, 0xc7f8, 0xc7f9, 0xc7fa, 0xc7fb, 0xc7fc,
-  0xa277, 0xa278, 0xa27a, 0xa27b, 0xa27c, 0xa27d, 0xa275, 0xa274,
-  0xa273, 0xa272, 0xa271, 0xa2a4, 0xa2a5, 0xa2a7, 0xa2a6, 0xa27e,
-  0xa2a1, 0xa2a3, 0xa2a2, 0xa2ac, 0xa2ad, 0xa2ae, 0xa262, 0xa263,
-  0xa264, 0xa265, 0xa266, 0xa267, 0xa268, 0xa269, 0xa270, 0xa26f,
-  0xa26e, 0xa26d, 0xa26c, 0xa26b, 0xa26a, 0xa276, 0xa279, 0xa1bd,
-  0xa1bc, 0xa1b6, 0xa1b5, 0xa1bf, 0xa1be, 0xa1bb, 0xa1ba, 0xa1b3,
-  0xa1b7, 0xa1b4, 0xa2a8, 0xa2a9, 0xa2ab, 0xa2aa, 0xa1b9, 0xa1b8,
-  0xa1f3, 0xa1f0, 0xa1f2, 0xa1f1, 0xa140, 0xa142, 0xa143, 0xa1b2,
-  0xc6a4, 0xa171, 0xa172, 0xa16d, 0xa16e, 0xa175, 0xa176, 0xa179,
-  0xa17a, 0xa169, 0xa16a, 0xa245, 0xa165, 0xa166, 0xa1a9, 0xa1aa,
-  0xa2c3, 0xa2c4, 0xa2c5, 0xa2c6, 0xa2c7, 0xa2c8, 0xa2c9, 0xa2ca,
-  0xa2cb, 0xc6a5, 0xc6a6, 0xc6a7, 0xc6a8, 0xc6a9, 0xc6aa, 0xc6ab,
-  0xc6ac, 0xc6ad, 0xc6ae, 0xc6af, 0xc6b0, 0xc6b1, 0xc6b2, 0xc6b3,
-  0xc6b4, 0xc6b5, 0xc6b6, 0xc6b7, 0xc6b8, 0xc6b9, 0xc6ba, 0xc6bb,
-  0xc6bc, 0xc6bd, 0xc6be, 0xc6bf, 0xc6c0, 0xc6c1, 0xc6c2, 0xc6c3,
-  0xc6c4, 0xc6c5, 0xc6c6, 0xc6c7, 0xc6c8, 0xc6c9, 0xc6ca, 0xc6cb,
-  0xc6cc, 0xc6cd, 0xc6ce, 0xc6cf, 0xc6d0, 0xc6d1, 0xc6d2, 0xc6d3,
-  0xc6d4, 0xc6d5, 0xc6d6, 0xc6d7, 0xc6d8, 0xc6d9, 0xc6da, 0xc6db,
-  0xc6dc, 0xc6dd, 0xc6de, 0xc6df, 0xc6e0, 0xc6e1, 0xc6e2, 0xc6e3,
-  0xc6e4, 0xc6e5, 0xc6e6, 0xc6e7, 0xc6e8, 0xc6e9, 0xc6ea, 0xc6eb,
-  0xc6ec, 0xc6ed, 0xc6ee, 0xc6ef, 0xc6f0, 0xc6f1, 0xc6f2, 0xc6f3,
-  0xc6f4, 0xc6f5, 0xc6f6, 0xc6f7, 0xc6a2, 0xc6a3, 0xc6f8, 0xc6f9,
-  0xc6fa, 0xc6fb, 0xc6fc, 0xc6fd, 0xc6fe, 0xc740, 0xc741, 0xc742,
-  0xc743, 0xc744, 0xc745, 0xc746, 0xc747, 0xc748, 0xc749, 0xc74a,
-  0xc74b, 0xc74c, 0xc74d, 0xc74e, 0xc74f, 0xc750, 0xc751, 0xc752,
-  0xc753, 0xc754, 0xc755, 0xc756, 0xc757, 0xc758, 0xc759, 0xc75a,
-  0xc75b, 0xc75c, 0xc75d, 0xc75e, 0xc75f, 0xc760, 0xc761, 0xc762,
-  0xc763, 0xc764, 0xc765, 0xc766, 0xc767, 0xc768, 0xc769, 0xc76a,
-  0xc76b, 0xc76c, 0xc76d, 0xc76e, 0xc76f, 0xc770, 0xc771, 0xc772,
-  0xc773, 0xc774, 0xc775, 0xc776, 0xc777, 0xc778, 0xc779, 0xc77a,
-  0xc77b, 0xc77c, 0xc77d, 0xc77e, 0xc7a1, 0xc7a2, 0xc7a3, 0xc7a4,
-  0xc7a5, 0xc7a6, 0xc7a7, 0xc7a8, 0xc7a9, 0xc7aa, 0xc7ab, 0xc7ac,
-  0xc7ad, 0xc7ae, 0xc7af, 0xc7b0, 0xc6a1, 0xa374, 0xa375, 0xa376,
-  0xa377, 0xa378, 0xa379, 0xa37a, 0xa37b, 0xa37c, 0xa37d, 0xa37e,
-  0xa3a1, 0xa3a2, 0xa3a3, 0xa3a4, 0xa3a5, 0xa3a6, 0xa3a7, 0xa3a8,
-  0xa3a9, 0xa3aa, 0xa3ab, 0xa3ac, 0xa3ad, 0xa3ae, 0xa3af, 0xa3b0,
-  0xa3b1, 0xa3b2, 0xa3b3, 0xa3b4, 0xa3b5, 0xa3b6, 0xa3b7, 0xa3b8,
-  0xa3b9, 0xa3ba, 0xa1c0, 0xa255, 0xa256, 0xa250, 0xa251, 0xa252,
-  0xa254, 0xa257, 0xa253, 0xa1eb, 0xa1ea, 0xa24f, 0xa440, 0xa442,
-  0xa443, 0xc945, 0xa456, 0xa454, 0xa457, 0xa455, 0xc946, 0xa4a3,
-  0xc94f, 0xc94d, 0xa4a2, 0xa4a1, 0xa542, 0xa541, 0xa540, 0xa543,
-  0xa4fe, 0xa5e0, 0xa5e1, 0xa8c3, 0xa458, 0xa4a4, 0xc950, 0xa4a5,
-  0xc963, 0xa6ea, 0xcbb1, 0xa459, 0xa4a6, 0xa544, 0xc964, 0xc940,
-  0xa444, 0xa45b, 0xc947, 0xa45c, 0xa4a7, 0xa545, 0xa547, 0xa546,
-  0xa5e2, 0xa5e3, 0xa8c4, 0xadbc, 0xa441, 0xc941, 0xa445, 0xa45e,
-  0xa45d, 0xa5e4, 0xa8c5, 0xb0ae, 0xd44b, 0xb6c3, 0xdcb1, 0xdcb2,
-  0xa446, 0xa4a9, 0xa8c6, 0xa447, 0xc948, 0xa45f, 0xa4aa, 0xa4ac,
-  0xc951, 0xa4ad, 0xa4ab, 0xa5e5, 0xa8c7, 0xa8c8, 0xab45, 0xa460,
-  0xa4ae, 0xa5e6, 0xa5e8, 0xa5e7, 0xa6eb, 0xa8c9, 0xa8ca, 0xab46,
-  0xab47, 0xadbd, 0xdcb3, 0xf6d6, 0xa448, 0xa4b0, 0xa4af, 0xc952,
-  0xa4b1, 0xa4b7, 0xa4b2, 0xa4b3, 0xc954, 0xc953, 0xa4b5, 0xa4b6,
-  0xa4b4, 0xa54a, 0xa54b, 0xa54c, 0xa54d, 0xa549, 0xa550, 0xc96a,
-  0xc966, 0xc969, 0xa551, 0xa561, 0xc968, 0xa54e, 0xa54f, 0xa548,
-  0xc965, 0xc967, 0xa5f5, 0xc9b0, 0xa5f2, 0xa5f6, 0xc9ba, 0xc9ae,
-  0xa5f3, 0xc9b2, 0xa5f4, 0xa5f7, 0xa5e9, 0xc9b1, 0xa5f8, 0xc9b5,
-  0xc9b9, 0xc9b6, 0xc9b3, 0xa5ea, 0xa5ec, 0xa5f9, 0xa5ee, 0xc9ab,
-  0xa5f1, 0xa5ef, 0xa5f0, 0xc9bb, 0xc9b8, 0xc9af, 0xa5ed, 0xc9ac,
-  0xa5eb, 0xc9b4, 0xc9b7, 0xc9ad, 0xca66, 0xa742, 0xa6f4, 0xca67,
-  0xa6f1, 0xa744, 0xa6f9, 0xa6f8, 0xca5b, 0xa6fc, 0xa6f7, 0xca60,
-  0xca68, 0xca64, 0xa6fa, 0xa6fd, 0xa6ee, 0xa747, 0xca5d, 0xcbbd,
-  0xa6ec, 0xa743, 0xa6ed, 0xa6f5, 0xa6f6, 0xca62, 0xca5e, 0xa6fb,
-  0xa6f3, 0xca5a, 0xa6ef, 0xca65, 0xa745, 0xa748, 0xa6f2, 0xa740,
-  0xa746, 0xa6f0, 0xca63, 0xa741, 0xca69, 0xca5c, 0xa6fe, 0xca5f,
-  0xca61, 0xa8d8, 0xcbbf, 0xcbcb, 0xa8d0, 0xcbcc, 0xa8cb, 0xa8d5,
-  0xa8ce, 0xcbb9, 0xa8d6, 0xcbb8, 0xcbbc, 0xcbc3, 0xcbc1, 0xa8de,
-  0xa8d9, 0xcbb3, 0xcbb5, 0xa8db, 0xa8cf, 0xcbb6, 0xcbc2, 0xcbc9,
-  0xa8d4, 0xcbbb, 0xcbb4, 0xa8d3, 0xcbb7, 0xa8d7, 0xcbba, 0xa8d2,
-  0xa8cd, 0xa8dc, 0xcbc4, 0xa8dd, 0xcbc8, 0xcbc6, 0xcbca, 0xa8da,
-  0xcbbe, 0xcbb2, 0xcbc0, 0xa8d1, 0xcbc5, 0xa8cc, 0xcbc7, 0xab56,
-  0xab4a, 0xcde0, 0xcde8, 0xab49, 0xab51, 0xab5d, 0xcdee, 0xcdec,
-  0xcde7, 0xab4b, 0xcded, 0xcde3, 0xab59, 0xab50, 0xab58, 0xcdde,
-  0xcdea, 0xcde1, 0xab54, 0xcde2, 0xcddd, 0xab5b, 0xab4e, 0xab57,
-  0xab4d, 0xcddf, 0xcde4, 0xcdeb, 0xab55, 0xab52, 0xcde6, 0xab5a,
-  0xcde9, 0xcde5, 0xab4f, 0xab5c, 0xab53, 0xab4c, 0xab48, 0xcdef,
-  0xadd7, 0xadc1, 0xadd1, 0xadd6, 0xd0d0, 0xd0cf, 0xd0d4, 0xd0d5,
-  0xadc4, 0xadcd, 0xadda, 0xadce, 0xd0c9, 0xadc7, 0xd0ca, 0xaddc,
-  0xadd3, 0xadbe, 0xadbf, 0xd0dd, 0xb0bf, 0xadcc, 0xadcb, 0xd0cb,
-  0xadcf, 0xd45b, 0xadc6, 0xd0d6, 0xadd5, 0xadd4, 0xadca, 0xd0ce,
-  0xd0d7, 0xd0c8, 0xadc9, 0xd0d8, 0xadd2, 0xd0cc, 0xadc0, 0xadc3,
-  0xadc2, 0xd0d9, 0xadd0, 0xadc5, 0xadd9, 0xaddb, 0xd0d3, 0xadd8,
-  0xd0db, 0xd0cd, 0xd0dc, 0xd0d1, 0xd0da, 0xd0d2, 0xadc8, 0xd463,
-  0xd457, 0xb0b3, 0xd45c, 0xd462, 0xb0b2, 0xd455, 0xb0b6, 0xd459,
-  0xd452, 0xb0b4, 0xd456, 0xb0b9, 0xb0be, 0xd467, 0xd451, 0xb0ba,
-  0xd466, 0xb0b5, 0xd458, 0xb0b1, 0xd453, 0xd44f, 0xd45d, 0xd450,
-  0xd44e, 0xd45a, 0xd460, 0xd461, 0xb0b7, 0xd85b, 0xd45e, 0xd44d,
-  0xd45f, 0xb0c1, 0xd464, 0xb0c0, 0xd44c, 0xd454, 0xd465, 0xb0bc,
-  0xb0bb, 0xb0b8, 0xb0bd, 0xb0af, 0xb0b0, 0xb3c8, 0xd85e, 0xd857,
-  0xb3c5, 0xd85f, 0xd855, 0xd858, 0xb3c4, 0xd859, 0xb3c7, 0xd85d,
-  0xd853, 0xd852, 0xb3c9, 0xb3ca, 0xb3c6, 0xb3cb, 0xd851, 0xd85c,
-  0xd85a, 0xd854, 0xb3c3, 0xd856, 0xb6ca, 0xb6c4, 0xdcb7, 0xb6cd,
-  0xdcbd, 0xdcc0, 0xb6c6, 0xb6c7, 0xdcba, 0xb6c5, 0xdcc3, 0xb6cb,
-  0xdcc4, 0xdcbf, 0xb6cc, 0xdcb4, 0xb6c9, 0xdcb5, 0xdcbe, 0xdcbc,
-  0xdcb8, 0xb6c8, 0xdcb6, 0xb6ce, 0xdcbb, 0xdcc2, 0xdcb9, 0xdcc1,
-  0xb9b6, 0xb9b3, 0xb9b4, 0xe0f9, 0xe0f1, 0xb9b2, 0xb9af, 0xe0f2,
-  0xb9b1, 0xe0f5, 0xe0f7, 0xe0fe, 0xe0fd, 0xe0f8, 0xb9ae, 0xe0f0,
-  0xb9ac, 0xe0f3, 0xb9b7, 0xe0f6, 0xe0fa, 0xb9b0, 0xb9ad, 0xe0fc,
-  0xe0fb, 0xb9b5, 0xe0f4, 0xbbf8, 0xe4ec, 0xe4e9, 0xbbf9, 0xbbf7,
-  0xe4f0, 0xe4ed, 0xe4e6, 0xbbf6, 0xbbfa, 0xe4e7, 0xbbf5, 0xbbfd,
-  0xe4ea, 0xe4eb, 0xbbfb, 0xbbfc, 0xe4f1, 0xe4ee, 0xe4ef, 0xbeaa,
-  0xe8f8, 0xbea7, 0xe8f5, 0xbea9, 0xbeab, 0xe8f6, 0xbea8, 0xe8f7,
-  0xe8f4, 0xc076, 0xecbd, 0xc077, 0xecbb, 0xecbc, 0xecba, 0xecb9,
-  0xecbe, 0xc075, 0xefb8, 0xefb9, 0xe4e8, 0xefb7, 0xc078, 0xc35f,
-  0xf1eb, 0xf1ec, 0xc4d7, 0xc4d8, 0xf5c1, 0xf5c0, 0xc56c, 0xc56b,
-  0xf7d0, 0xa449, 0xa461, 0xa4b9, 0xa4b8, 0xa553, 0xa552, 0xa5fc,
-  0xa5fb, 0xa5fd, 0xa5fa, 0xa74a, 0xa749, 0xa74b, 0xa8e0, 0xa8df,
-  0xa8e1, 0xab5e, 0xa259, 0xd0de, 0xa25a, 0xb0c2, 0xa25c, 0xa25b,
-  0xd860, 0xa25d, 0xb9b8, 0xa25e, 0xa44a, 0xa4ba, 0xa5fe, 0xa8e2,
-  0xa44b, 0xa4bd, 0xa4bb, 0xa4bc, 0xa640, 0xa74c, 0xa8e4, 0xa8e3,
-  0xa8e5, 0xaddd, 0xbeac, 0xc94e, 0xa554, 0xa555, 0xa641, 0xca6a,
-  0xab60, 0xab5f, 0xd0e0, 0xd0df, 0xb0c3, 0xa4be, 0xc955, 0xcbcd,
-  0xab61, 0xade0, 0xadde, 0xaddf, 0xbead, 0xa556, 0xa642, 0xc9bc,
-  0xa74d, 0xa74e, 0xca6b, 0xcbce, 0xa8e6, 0xcbcf, 0xd0e2, 0xd0e3,
-  0xade3, 0xd0e4, 0xd0e1, 0xade4, 0xade2, 0xade1, 0xd0e5, 0xd468,
-  0xd861, 0xdcc5, 0xe140, 0xbbfe, 0xbeae, 0xe8f9, 0xa44c, 0xa45a,
-  0xb0c4, 0xb3cd, 0xb9b9, 0xc942, 0xa4bf, 0xa559, 0xa557, 0xa558,
-  0xa8e7, 0xa44d, 0xa44e, 0xa462, 0xa4c0, 0xa4c1, 0xa4c2, 0xc9be,
-  0xa55a, 0xc96b, 0xa646, 0xc9bf, 0xa644, 0xa645, 0xc9bd, 0xa647,
-  0xa643, 0xca6c, 0xaaec, 0xca6d, 0xca6e, 0xa750, 0xa74f, 0xa753,
-  0xa751, 0xa752, 0xa8ed, 0xa8ec, 0xcbd4, 0xcbd1, 0xcbd2, 0xcbd0,
-  0xa8ee, 0xa8ea, 0xa8e9, 0xa8eb, 0xa8e8, 0xa8ef, 0xab63, 0xcdf0,
-  0xcbd3, 0xab68, 0xcdf1, 0xab64, 0xab67, 0xab66, 0xab65, 0xab62,
-  0xd0e8, 0xade7, 0xd0eb, 0xade5, 0xd0e7, 0xade8, 0xade6, 0xade9,
-  0xd0e9, 0xd0ea, 0xd0e6, 0xd0ec, 0xb3d1, 0xb0c5, 0xd469, 0xd46b,
-  0xd46a, 0xd46c, 0xb0c6, 0xb3ce, 0xb3cf, 0xb3d0, 0xb6d0, 0xdcc7,
-  0xdcc6, 0xdcc8, 0xdcc9, 0xb6d1, 0xb6cf, 0xe141, 0xe142, 0xb9bb,
-  0xb9ba, 0xe35a, 0xbc40, 0xbc41, 0xbc42, 0xbc44, 0xe4f2, 0xe4f3,
-  0xbc43, 0xbeaf, 0xbeb0, 0xf1ed, 0xf5c3, 0xf5c2, 0xf7d1, 0xa44f,
-  0xa55c, 0xa55b, 0xa648, 0xc9c0, 0xa755, 0xa756, 0xa754, 0xa757,
-  0xca6f, 0xca70, 0xa8f1, 0xcbd5, 0xa8f0, 0xcdf2, 0xab6c, 0xcdf3,
-  0xab6b, 0xab69, 0xab6a, 0xd0ed, 0xb0c7, 0xd46e, 0xb0ca, 0xd46d,
-  0xb1e5, 0xb0c9, 0xb0c8, 0xb3d4, 0xb3d3, 0xb3d2, 0xb6d2, 0xb6d5,
-  0xb6d6, 0xb6d4, 0xb6d3, 0xe143, 0xe144, 0xe4f5, 0xbc45, 0xe4f4,
-  0xbeb1, 0xecbf, 0xc079, 0xf1ee, 0xc455, 0xa463, 0xa4c3, 0xc956,
-  0xa4c4, 0xa4c5, 0xa55d, 0xa55e, 0xa649, 0xca71, 0xcbd6, 0xcbd7,
-  0xab6d, 0xd0ee, 0xb0cc, 0xb0cb, 0xd863, 0xd862, 0xa450, 0xa4c6,
-  0xa55f, 0xb0cd, 0xc943, 0xc96c, 0xa560, 0xc9c2, 0xa64b, 0xa64a,
-  0xc9c1, 0xa758, 0xadea, 0xd46f, 0xb6d7, 0xe145, 0xb9bc, 0xe8fa,
-  0xf3fd, 0xa4c7, 0xcbd8, 0xcdf4, 0xb0d0, 0xb0ce, 0xb0cf, 0xa451,
-  0xa464, 0xa2cd, 0xa4ca, 0xa4c9, 0xa4c8, 0xa563, 0xa562, 0xc96d,
-  0xc9c3, 0xa8f5, 0xa8f2, 0xa8f4, 0xa8f3, 0xab6e, 0xb3d5, 0xa452,
-  0xa4cb, 0xa565, 0xa564, 0xca72, 0xa8f6, 0xc957, 0xa567, 0xa566,
-  0xa64c, 0xa64d, 0xca73, 0xa759, 0xa75a, 0xa8f7, 0xa8f8, 0xa8f9,
-  0xab6f, 0xcdf5, 0xadeb, 0xc944, 0xa4cc, 0xc9c4, 0xca74, 0xca75,
-  0xcbd9, 0xcbda, 0xcdf7, 0xcdf6, 0xcdf9, 0xcdf8, 0xab70, 0xd470,
-  0xaded, 0xd0ef, 0xadec, 0xd864, 0xb3d6, 0xd865, 0xe146, 0xb9bd,
-  0xbc46, 0xf1ef, 0xc958, 0xa568, 0xb0d1, 0xa453, 0xa465, 0xa4ce,
-  0xa4cd, 0xa4cf, 0xa8fb, 0xa8fa, 0xa8fc, 0xab71, 0xadee, 0xe8fb,
-  0xc24f, 0xa466, 0xa56a, 0xa579, 0xa574, 0xa56f, 0xa56e, 0xa575,
-  0xa573, 0xa56c, 0xa57a, 0xa56d, 0xa569, 0xa578, 0xa577, 0xa576,
-  0xa56b, 0xa572, 0xa571, 0xa57b, 0xa570, 0xa653, 0xa659, 0xa655,
-  0xa65b, 0xc9c5, 0xa658, 0xa64e, 0xa651, 0xa654, 0xa650, 0xa657,
-  0xa65a, 0xa64f, 0xa652, 0xa656, 0xa65c, 0xca7e, 0xca7b, 0xa767,
-  0xca7c, 0xa75b, 0xa75d, 0xa775, 0xa770, 0xcaa5, 0xca7d, 0xa75f,
-  0xa761, 0xcaa4, 0xa768, 0xca78, 0xa774, 0xa776, 0xa75c, 0xa76d,
-  0xca76, 0xa773, 0xa764, 0xa76e, 0xa76f, 0xca77, 0xa76c, 0xa76a,
-  0xa76b, 0xa771, 0xcaa1, 0xa75e, 0xa772, 0xcaa3, 0xa766, 0xa763,
-  0xca7a, 0xa762, 0xcaa6, 0xa765, 0xa769, 0xa760, 0xcaa2, 0xca79,
-  0xcbeb, 0xcbea, 0xa94f, 0xcbed, 0xcbef, 0xcbe4, 0xcbe7, 0xcbee,
-  0xa950, 0xcbe1, 0xcbe5, 0xcbe9, 0xce49, 0xa94b, 0xce4d, 0xa8fd,
-  0xcbe6, 0xa8fe, 0xa94c, 0xa945, 0xa941, 0xcbe2, 0xa944, 0xa949,
-  0xa952, 0xcbe3, 0xcbdc, 0xa943, 0xcbdd, 0xcbdf, 0xa946, 0xa948,
-  0xcbdb, 0xcbe0, 0xa951, 0xa94d, 0xcbe8, 0xa953, 0xa94a, 0xcbde,
-  0xa947, 0xa942, 0xa940, 0xcbec, 0xa94e, 0xce48, 0xcdfb, 0xce4b,
-  0xcdfd, 0xab78, 0xaba8, 0xab74, 0xaba7, 0xab7d, 0xaba4, 0xab72,
-  0xcdfc, 0xce43, 0xaba3, 0xce4f, 0xaba5, 0xab79, 0xce45, 0xce42,
-  0xab77, 0xcdfa, 0xaba6, 0xce4a, 0xab7c, 0xce4c, 0xaba9, 0xab73,
-  0xab7e, 0xab7b, 0xce40, 0xaba1, 0xce46, 0xce47, 0xab7a, 0xaba2,
-  0xab76, 0xab75, 0xcdfe, 0xce44, 0xce4e, 0xd144, 0xadfb, 0xd0f1,
-  0xd0f6, 0xadf4, 0xae40, 0xd0f4, 0xadef, 0xadf9, 0xadfe, 0xd0fb,
-  0xadfa, 0xadfd, 0xd0fe, 0xadf5, 0xd0f5, 0xd142, 0xd143, 0xadf7,
-  0xd141, 0xadf3, 0xae43, 0xd0f8, 0xadf1, 0xd146, 0xd0f9, 0xd0fd,
-  0xadf6, 0xae42, 0xd0fa, 0xadfc, 0xd140, 0xd147, 0xd4a1, 0xd145,
-  0xae44, 0xadf0, 0xd0fc, 0xd0f3, 0xadf8, 0xd0f2, 0xd0f7, 0xd0f0,
-  0xae41, 0xd477, 0xb0e4, 0xd4a7, 0xb0e2, 0xb0df, 0xd47c, 0xb0db,
-  0xd4a2, 0xb0e6, 0xd476, 0xd47b, 0xd47a, 0xadf2, 0xb0e1, 0xd4a5,
-  0xd4a8, 0xd473, 0xb3e8, 0xd4a9, 0xb0e7, 0xb0d9, 0xb0d6, 0xd47e,
-  0xb0d3, 0xd4a6, 0xb0da, 0xd4aa, 0xd474, 0xd4a4, 0xb0dd, 0xd475,
-  0xd478, 0xd47d, 0xb0de, 0xb0dc, 0xb0e8, 0xb0e3, 0xb0d7, 0xb1d2,
-  0xb0d8, 0xd479, 0xb0e5, 0xb0e0, 0xd4a3, 0xb0d5, 0xb0d4, 0xd471,
-  0xd472, 0xd86a, 0xb3d7, 0xb3da, 0xd875, 0xb3ee, 0xd878, 0xb3d8,
-  0xd871, 0xb3de, 0xb3e4, 0xb5bd, 0xb3e2, 0xd86e, 0xb3ef, 0xb3db,
-  0xb3e3, 0xd876, 0xdcd7, 0xd87b, 0xd86f, 0xd866, 0xd873, 0xd86d,
-  0xb3e1, 0xd879, 0xb3dd, 0xb3f1, 0xb3ea, 0xb3df, 0xb3dc, 0xb3e7,
-  0xd87a, 0xd86c, 0xd872, 0xd874, 0xd868, 0xd877, 0xb3d9, 0xd867,
-  0xb3e0, 0xb3f0, 0xb3ec, 0xd869, 0xb3e6, 0xb3ed, 0xb3e9, 0xb3e5,
-  0xd870, 0xb3eb, 0xdcd5, 0xdcd1, 0xdce0, 0xdcca, 0xdcd3, 0xb6e5,
-  0xb6e6, 0xb6de, 0xdcdc, 0xb6e8, 0xdccf, 0xdcce, 0xdccc, 0xdcde,
-  0xb6dc, 0xdcd8, 0xdccd, 0xb6df, 0xdcd6, 0xb6da, 0xdcd2, 0xdcd9,
-  0xdcdb, 0xdcdf, 0xb6e3, 0xdccb, 0xb6dd, 0xdcd0, 0xb6d8, 0xb6e4,
-  0xdcda, 0xb6e0, 0xb6e1, 0xb6e7, 0xb6db, 0xa25f, 0xb6d9, 0xdcd4,
-  0xb6e2, 0xdcdd, 0xb9cd, 0xb9c8, 0xe155, 0xe151, 0xe14b, 0xb9c2,
-  0xb9be, 0xe154, 0xb9bf, 0xe14e, 0xe150, 0xe153, 0xb9c4, 0xb9cb,
-  0xb9c5, 0xe149, 0xb9c6, 0xb9c7, 0xe14c, 0xb9cc, 0xe14a, 0xe14f,
-  0xb9c3, 0xe148, 0xb9c9, 0xb9c1, 0xb9c0, 0xe14d, 0xe152, 0xb9ca,
-  0xe147, 0xbc4d, 0xe547, 0xe544, 0xbc47, 0xbc53, 0xbc54, 0xbc4a,
-  0xe542, 0xbc4c, 0xe4f9, 0xbc52, 0xe546, 0xbc49, 0xe548, 0xbc48,
-  0xe543, 0xe545, 0xbc4b, 0xe541, 0xe4fa, 0xe4f7, 0xd86b, 0xe4fd,
-  0xe4f6, 0xe4fc, 0xe4fb, 0xe4f8, 0xbc4f, 0xbc4e, 0xbc50, 0xe4fe,
-  0xbeb2, 0xe540, 0xe945, 0xe8fd, 0xbebe, 0xe942, 0xbeb6, 0xbeba,
-  0xe941, 0xbeb9, 0xbeb5, 0xbeb8, 0xbeb3, 0xbebd, 0xe943, 0xe8fe,
-  0xbebc, 0xe8fc, 0xbebb, 0xe944, 0xe940, 0xbc51, 0xbebf, 0xe946,
-  0xbeb7, 0xbeb4, 0xecc6, 0xecc8, 0xc07b, 0xecc9, 0xecc7, 0xecc5,
-  0xecc4, 0xc07d, 0xecc3, 0xc07e, 0xecc1, 0xecc2, 0xc07a, 0xc0a1,
-  0xc07c, 0xecc0, 0xc250, 0xefbc, 0xefba, 0xefbf, 0xefbd, 0xefbb,
-  0xefbe, 0xc360, 0xf1f2, 0xf1f3, 0xc456, 0xf1f4, 0xf1f0, 0xf1f5,
-  0xf1f1, 0xc251, 0xf3fe, 0xf441, 0xc459, 0xf440, 0xc458, 0xc457,
-  0xc45a, 0xf5c5, 0xf5c6, 0xc4da, 0xc4d9, 0xc4db, 0xf5c4, 0xf6d8,
-  0xf6d7, 0xc56d, 0xc56f, 0xc56e, 0xf6d9, 0xc5c8, 0xf8a6, 0xc5f1,
-  0xf8a5, 0xf8ee, 0xc949, 0xa57d, 0xa57c, 0xa65f, 0xa65e, 0xc9c7,
-  0xa65d, 0xc9c6, 0xa779, 0xcaa9, 0xcaa8, 0xa777, 0xa77a, 0xcaa7,
-  0xa778, 0xcbf0, 0xcbf1, 0xa954, 0xabaa, 0xd148, 0xd149, 0xae45,
-  0xae46, 0xd4ac, 0xb0e9, 0xb0eb, 0xd4ab, 0xb0ea, 0xd87c, 0xb3f2,
-  0xb6e9, 0xb6ea, 0xdce1, 0xb9cf, 0xb9ce, 0xe549, 0xe948, 0xe947,
-  0xf96b, 0xa467, 0xc959, 0xc96e, 0xc96f, 0xa662, 0xa666, 0xc9c9,
-  0xa664, 0xa663, 0xc9c8, 0xa665, 0xa661, 0xa660, 0xc9ca, 0xa7a6,
-  0xa7a3, 0xa77d, 0xcaaa, 0xcaab, 0xa7a1, 0xcaad, 0xa77b, 0xcaae,
-  0xcaac, 0xa77e, 0xa7a2, 0xa7a5, 0xa7a4, 0xa77c, 0xcaaf, 0xa959,
-  0xcbfe, 0xa95b, 0xa95a, 0xcc40, 0xa958, 0xa957, 0xcbf5, 0xcbf4,
-  0xcbf2, 0xcbf7, 0xcbf6, 0xcbf3, 0xcbfc, 0xcbfd, 0xcbfa, 0xcbf8,
-  0xa956, 0xcbfb, 0xa95c, 0xcc41, 0xcbf9, 0xabab, 0xa955, 0xabac,
-  0xce54, 0xce5a, 0xabb2, 0xce58, 0xce5e, 0xce55, 0xce59, 0xce5b,
-  0xce5d, 0xce57, 0xce56, 0xce51, 0xce52, 0xabad, 0xabaf, 0xabae,
-  0xce53, 0xce5c, 0xabb1, 0xce50, 0xd153, 0xd152, 0xd157, 0xd14e,
-  0xd151, 0xd150, 0xd154, 0xd158, 0xae47, 0xae4a, 0xd14f, 0xd155,
-  0xae49, 0xd14a, 0xabb0, 0xd4ba, 0xd156, 0xd14d, 0xae48, 0xd14c,
-  0xd4b1, 0xb0ec, 0xb0f0, 0xd4c1, 0xd4af, 0xd4bd, 0xb0f1, 0xd4bf,
-  0xd4c5, 0xd4c9, 0xd4c0, 0xd4b4, 0xd4bc, 0xd4ca, 0xd4c8, 0xd4be,
-  0xd4b9, 0xd4b2, 0xd8a6, 0xd4b0, 0xb0f5, 0xd4b7, 0xb0f6, 0xb0f2,
-  0xd4ad, 0xd4c3, 0xd4b5, 0xd4b3, 0xd4c6, 0xb0f3, 0xd4cc, 0xb0ed,
-  0xb0ef, 0xd4bb, 0xd4b6, 0xae4b, 0xb0ee, 0xd4b8, 0xd4c7, 0xd4cb,
-  0xd4c2, 0xd4c4, 0xd4ae, 0xd8a1, 0xd8aa, 0xd8a9, 0xb3fa, 0xd8a2,
-  0xb3fb, 0xb3f9, 0xd8a4, 0xb3f6, 0xd8a8, 0xd8a3, 0xd8a5, 0xd87d,
-  0xb3f4, 0xd8b2, 0xd8b1, 0xd8ae, 0xb3f3, 0xb3f7, 0xb3f8, 0xd14b,
-  0xd8ab, 0xb3f5, 0xb0f4, 0xd8ad, 0xd87e, 0xd8b0, 0xd8af, 0xd8b3,
-  0xdcef, 0xd8ac, 0xd8a7, 0xdce7, 0xb6f4, 0xb6f7, 0xb6f2, 0xdce6,
-  0xdcea, 0xdce5, 0xb6ec, 0xb6f6, 0xdce2, 0xb6f0, 0xdce9, 0xb6ee,
-  0xb6ed, 0xdcec, 0xb6ef, 0xdcee, 0xdceb, 0xb6eb, 0xb6f5, 0xdcf0,
-  0xdce4, 0xdced, 0xdce3, 0xb6f1, 0xb6f3, 0xdce8, 0xdcf1, 0xe15d,
-  0xb9d0, 0xe163, 0xb9d5, 0xe15f, 0xe166, 0xe157, 0xb9d7, 0xb9d1,
-  0xe15c, 0xbc55, 0xe15b, 0xe164, 0xb9d2, 0xb9d6, 0xe15a, 0xe160,
-  0xe165, 0xe156, 0xb9d4, 0xe15e, 0xe162, 0xe168, 0xe158, 0xe161,
-  0xb9d3, 0xe167, 0xe159, 0xbc59, 0xe54b, 0xbc57, 0xbc56, 0xe54d,
-  0xe552, 0xe54e, 0xe551, 0xbc5c, 0xbea5, 0xbc5b, 0xe54a, 0xe550,
-  0xbc5a, 0xe54f, 0xe54c, 0xbc58, 0xe94d, 0xe94f, 0xe94a, 0xbec1,
-  0xe94c, 0xbec0, 0xe94e, 0xbec3, 0xe950, 0xbec2, 0xe949, 0xe94b,
-  0xc0a5, 0xeccc, 0xc0a4, 0xeccd, 0xc0a3, 0xeccb, 0xc0a2, 0xecca,
-  0xc253, 0xc252, 0xf1f6, 0xf1f8, 0xf1f7, 0xc361, 0xc362, 0xc363,
-  0xf442, 0xc45b, 0xf7d3, 0xf7d2, 0xc5f2, 0xa468, 0xa4d0, 0xa7a7,
-  0xce5f, 0xb3fc, 0xb3fd, 0xdcf2, 0xb9d8, 0xe169, 0xe553, 0xc95a,
-  0xcab0, 0xcc42, 0xce60, 0xd159, 0xae4c, 0xf1f9, 0xc4dc, 0xa469,
-  0xa57e, 0xc970, 0xa667, 0xa668, 0xa95d, 0xb0f7, 0xb9da, 0xb9db,
-  0xb9d9, 0xa46a, 0xa4d1, 0xa4d3, 0xa4d2, 0xc95b, 0xa4d4, 0xa5a1,
-  0xc971, 0xa5a2, 0xa669, 0xa66a, 0xc9cb, 0xa7a8, 0xcab1, 0xa961,
-  0xcc43, 0xa95f, 0xa960, 0xa95e, 0xd15a, 0xabb6, 0xabb5, 0xabb7,
-  0xabb4, 0xce61, 0xa962, 0xabb3, 0xae4d, 0xae4e, 0xae4f, 0xd4cd,
-  0xb3fe, 0xd8b4, 0xb0f8, 0xb6f8, 0xb9dd, 0xb9dc, 0xe16a, 0xbc5d,
-  0xbec4, 0xefc0, 0xf6da, 0xf7d4, 0xa46b, 0xa5a3, 0xa5a4, 0xc9d1,
-  0xa66c, 0xa66f, 0xc9cf, 0xc9cd, 0xa66e, 0xc9d0, 0xc9d2, 0xc9cc,
-  0xa671, 0xa670, 0xa66d, 0xa66b, 0xc9ce, 0xa7b3, 0xa7b0, 0xcab6,
-  0xcab9, 0xcab8, 0xa7aa, 0xa7b2, 0xa7af, 0xcab5, 0xcab3, 0xa7ae,
-  0xa7a9, 0xa7ac, 0xcab4, 0xcabb, 0xcab7, 0xa7ad, 0xa7b1, 0xa7b4,
-  0xcab2, 0xcaba, 0xa7ab, 0xa967, 0xa96f, 0xcc4f, 0xcc48, 0xa970,
-  0xcc53, 0xcc44, 0xcc4b, 0xa966, 0xcc45, 0xa964, 0xcc4c, 0xcc50,
-  0xa963, 0xcc51, 0xcc4a, 0xcc4d, 0xa972, 0xa969, 0xcc54, 0xcc52,
-  0xa96e, 0xa96c, 0xcc49, 0xa96b, 0xcc47, 0xcc46, 0xa96a, 0xa968,
-  0xa971, 0xa96d, 0xa965, 0xcc4e, 0xabb9, 0xabc0, 0xce6f, 0xabb8,
-  0xce67, 0xce63, 0xce73, 0xce62, 0xabbb, 0xce6c, 0xabbe, 0xabc1,
-  0xabbc, 0xce70, 0xabbf, 0xae56, 0xce76, 0xce64, 0xce66, 0xce6d,
-  0xce71, 0xce75, 0xce72, 0xce6b, 0xce6e, 0xce68, 0xabc3, 0xce6a,
-  0xce69, 0xce74, 0xabba, 0xce65, 0xabc2, 0xabbd, 0xae5c, 0xd162,
-  0xae5b, 0xd160, 0xae50, 0xae55, 0xd15f, 0xd15c, 0xd161, 0xae51,
-  0xd15b, 0xae54, 0xae52, 0xd163, 0xae53, 0xae57, 0xae58, 0xae5a,
-  0xae59, 0xd15d, 0xd15e, 0xd164, 0xd4d4, 0xb0f9, 0xd8c2, 0xd4d3,
-  0xd4e6, 0xb140, 0xd4e4, 0xb0fe, 0xb0fa, 0xd4ed, 0xd4dd, 0xd4e0,
-  0xb143, 0xd4ea, 0xd4e2, 0xb0fb, 0xb144, 0xd4e7, 0xd4e5, 0xd4d6,
-  0xd4eb, 0xd4df, 0xd4da, 0xd4d0, 0xd4ec, 0xd4dc, 0xd4cf, 0xb142,
-  0xd4e1, 0xd4ee, 0xd4de, 0xd4d2, 0xd4d7, 0xd4ce, 0xb141, 0xd4db,
-  0xd4d8, 0xb0fc, 0xd4d1, 0xd4e9, 0xb0fd, 0xd4d9, 0xd4d5, 0xd4e8,
-  0xb440, 0xd8bb, 0xd8b8, 0xd8c9, 0xd8bd, 0xd8ca, 0xb442, 0xd8c6,
-  0xd8c3, 0xd8c4, 0xd8c7, 0xd8cb, 0xd4e3, 0xd8cd, 0xdd47, 0xb443,
-  0xd8ce, 0xd8b6, 0xd8c0, 0xd8c5, 0xb441, 0xb444, 0xd8cc, 0xd8cf,
-  0xd8ba, 0xd8b7, 0xd8b9, 0xd8be, 0xd8bc, 0xb445, 0xd8c8, 0xd8bf,
-  0xd8c1, 0xd8b5, 0xdcfa, 0xdcf8, 0xb742, 0xb740, 0xdd43, 0xdcf9,
-  0xdd44, 0xdd40, 0xdcf7, 0xdd46, 0xdcf6, 0xdcfd, 0xb6fe, 0xb6fd,
-  0xb6fc, 0xdcfb, 0xdd41, 0xb6f9, 0xb741, 0xdcf4, 0xdcfe, 0xdcf3,
-  0xdcfc, 0xb6fa, 0xdd42, 0xdcf5, 0xb6fb, 0xdd45, 0xe16e, 0xb9e2,
-  0xb9e1, 0xb9e3, 0xe17a, 0xe170, 0xe176, 0xe16b, 0xe179, 0xe178,
-  0xe17c, 0xe175, 0xb9de, 0xe174, 0xb9e4, 0xe16d, 0xb9df, 0xe17b,
-  0xb9e0, 0xe16f, 0xe172, 0xe177, 0xe171, 0xe16c, 0xe173, 0xe555,
-  0xbc61, 0xe558, 0xe557, 0xe55a, 0xe55c, 0xbc5f, 0xe556, 0xe554,
-  0xe55d, 0xe55b, 0xe559, 0xe55f, 0xe55e, 0xbc63, 0xbc5e, 0xbc60,
-  0xbc62, 0xe560, 0xe957, 0xe956, 0xe955, 0xe958, 0xe951, 0xe952,
-  0xe95a, 0xe953, 0xbec5, 0xe95c, 0xe95b, 0xe954, 0xecd1, 0xc0a8,
-  0xeccf, 0xecd4, 0xecd3, 0xe959, 0xc0a7, 0xecd2, 0xecce, 0xecd6,
-  0xecd5, 0xc0a6, 0xecd0, 0xbec6, 0xc254, 0xefc1, 0xf1fa, 0xf1fb,
-  0xf1fc, 0xc45c, 0xc45d, 0xf443, 0xf5c8, 0xf5c7, 0xf6db, 0xf6dc,
-  0xf7d5, 0xf8a7, 0xa46c, 0xa46d, 0xa46e, 0xa4d5, 0xa5a5, 0xc9d3,
-  0xa672, 0xa673, 0xa7b7, 0xa7b8, 0xa7b6, 0xa7b5, 0xa973, 0xcc55,
-  0xa975, 0xa974, 0xcc56, 0xabc4, 0xae5d, 0xd165, 0xd4f0, 0xb145,
-  0xb447, 0xd4ef, 0xb446, 0xb9e5, 0xe17d, 0xbec7, 0xc0a9, 0xecd7,
-  0xc45e, 0xc570, 0xc972, 0xa5a6, 0xc973, 0xa676, 0xa674, 0xa675,
-  0xa677, 0xa7ba, 0xa7b9, 0xcabc, 0xa7bb, 0xcabd, 0xcc57, 0xcc58,
-  0xa976, 0xa978, 0xa97a, 0xa977, 0xa97b, 0xa979, 0xabc8, 0xabc5,
-  0xabc7, 0xabc9, 0xabc6, 0xd166, 0xce77, 0xd168, 0xd167, 0xae63,
-  0xae5f, 0xae60, 0xae62, 0xae64, 0xae61, 0xae66, 0xae65, 0xb14a,
-  0xd4f2, 0xd4f1, 0xb149, 0xb148, 0xb147, 0xb14b, 0xb146, 0xd8d5,
-  0xd8d2, 0xb449, 0xd8d1, 0xd8d6, 0xb44b, 0xd8d4, 0xb448, 0xb44a,
-  0xd8d3, 0xdd48, 0xdd49, 0xdd4a, 0xb9e6, 0xb9ee, 0xe17e, 0xb9e8,
-  0xb9ec, 0xe1a1, 0xb9ed, 0xb9e9, 0xb9ea, 0xb9e7, 0xb9eb, 0xbc66,
-  0xd8d0, 0xbc67, 0xbc65, 0xbc64, 0xe95d, 0xbec8, 0xecd8, 0xecd9,
-  0xc364, 0xc45f, 0xa46f, 0xa678, 0xabca, 0xd169, 0xae67, 0xb14e,
-  0xb14d, 0xb14c, 0xb44c, 0xb44d, 0xd8d7, 0xb9ef, 0xbec9, 0xa470,
-  0xc95c, 0xa4d6, 0xc974, 0xc9d4, 0xa679, 0xa97c, 0xdd4b, 0xa471,
-  0xa4d7, 0xc9d5, 0xcabe, 0xcabf, 0xa7bc, 0xd8d8, 0xb44e, 0xdd4c,
-  0xc0aa, 0xa472, 0xa4a8, 0xa4d8, 0xc975, 0xa5a7, 0xa7c0, 0xa7bf,
-  0xa7bd, 0xa7be, 0xcc59, 0xa97e, 0xa9a1, 0xcc5a, 0xa97d, 0xabce,
-  0xce78, 0xabcd, 0xabcb, 0xabcc, 0xae6a, 0xae68, 0xd16b, 0xae69,
-  0xd16a, 0xae5e, 0xd4f3, 0xb150, 0xb151, 0xb14f, 0xb9f0, 0xe1a2,
-  0xbc68, 0xbc69, 0xe561, 0xc0ab, 0xefc2, 0xefc3, 0xc4dd, 0xf8a8,
-  0xc94b, 0xa4d9, 0xa473, 0xc977, 0xc976, 0xa67a, 0xc9d7, 0xc9d8,
-  0xc9d6, 0xc9d9, 0xcac7, 0xcac2, 0xcac4, 0xcac6, 0xcac3, 0xa7c4,
-  0xcac0, 0xcac1, 0xa7c1, 0xa7c2, 0xcac5, 0xcac8, 0xa7c3, 0xcac9,
-  0xcc68, 0xcc62, 0xcc5d, 0xa9a3, 0xcc65, 0xcc63, 0xcc5c, 0xcc69,
-  0xcc6c, 0xcc67, 0xcc60, 0xa9a5, 0xcc66, 0xa9a6, 0xcc61, 0xcc64,
-  0xcc5b, 0xcc5f, 0xcc6b, 0xa9a7, 0xa9a8, 0xcc5e, 0xcc6a, 0xa9a2,
-  0xa9a4, 0xceab, 0xcea4, 0xceaa, 0xcea3, 0xcea5, 0xce7d, 0xce7b,
-  0xceac, 0xcea9, 0xce79, 0xabd0, 0xcea7, 0xcea8, 0xcea6, 0xce7c,
-  0xce7a, 0xabcf, 0xcea2, 0xce7e, 0xcea1, 0xcead, 0xae6f, 0xae6e,
-  0xd16c, 0xae6b, 0xd16e, 0xae70, 0xd16f, 0xae73, 0xae71, 0xd170,
-  0xceae, 0xd172, 0xae6d, 0xae6c, 0xd16d, 0xd171, 0xae72, 0xb153,
-  0xb152, 0xd4f5, 0xd4f9, 0xd4fb, 0xb154, 0xd4fe, 0xb158, 0xd541,
-  0xb15a, 0xb156, 0xb15e, 0xb15b, 0xd4f7, 0xb155, 0xd4f6, 0xd4f4,
-  0xd543, 0xd4f8, 0xb157, 0xd542, 0xb15c, 0xd4fd, 0xd4fc, 0xb15d,
-  0xd4fa, 0xb159, 0xd544, 0xd540, 0xd8e7, 0xd8ee, 0xd8e3, 0xb451,
-  0xd8df, 0xd8ef, 0xd8d9, 0xd8ec, 0xd8ea, 0xd8e4, 0xd8ed, 0xd8e6,
-  0xd8de, 0xd8f0, 0xd8dc, 0xd8e9, 0xd8da, 0xd8f1, 0xb452, 0xd8eb,
-  0xdd4f, 0xd8dd, 0xb44f, 0xd8e1, 0xb450, 0xd8e0, 0xd8e5, 0xd8e2,
-  0xd8e8, 0xdd53, 0xdd56, 0xdd4e, 0xdd50, 0xdd55, 0xdd54, 0xb743,
-  0xd8db, 0xdd52, 0xb744, 0xdd4d, 0xdd51, 0xe1a9, 0xe1b0, 0xe1a7,
-  0xe1ae, 0xe1a5, 0xe1ad, 0xe1b1, 0xe1a4, 0xe1a8, 0xe1a3, 0xb9f1,
-  0xe1a6, 0xb9f2, 0xe1ac, 0xe1ab, 0xe1aa, 0xe1af, 0xe565, 0xe567,
-  0xbc6b, 0xe568, 0xe563, 0xe562, 0xe56c, 0xe56a, 0xbc6a, 0xe56d,
-  0xe564, 0xe569, 0xe56b, 0xe566, 0xe961, 0xe966, 0xe960, 0xe965,
-  0xe95e, 0xe968, 0xe964, 0xe969, 0xe963, 0xe95f, 0xe967, 0xe96a,
-  0xe962, 0xecda, 0xc0af, 0xc0ad, 0xc0ac, 0xc0ae, 0xefc4, 0xf172,
-  0xf1fd, 0xf444, 0xf445, 0xc460, 0xf5c9, 0xc4de, 0xf5ca, 0xf6de,
-  0xc572, 0xc571, 0xf6dd, 0xc5c9, 0xf7d6, 0xa474, 0xa67b, 0xc9da,
-  0xcaca, 0xa8b5, 0xb15f, 0xa475, 0xa5aa, 0xa5a9, 0xa5a8, 0xa7c5,
-  0xae74, 0xdd57, 0xa476, 0xa477, 0xa478, 0xa4da, 0xabd1, 0xceaf,
-  0xb453, 0xa479, 0xc95d, 0xa5ab, 0xa5ac, 0xc978, 0xa67c, 0xcacb,
-  0xa7c6, 0xcacc, 0xa9ae, 0xcc6e, 0xa9ac, 0xa9ab, 0xcc6d, 0xa9a9,
-  0xcc6f, 0xa9aa, 0xa9ad, 0xabd2, 0xabd4, 0xceb3, 0xceb0, 0xceb1,
-  0xceb2, 0xceb4, 0xabd3, 0xd174, 0xd173, 0xae76, 0xae75, 0xb162,
-  0xd546, 0xb161, 0xb163, 0xb160, 0xb455, 0xd545, 0xb456, 0xd8f3,
-  0xb457, 0xd8f2, 0xb454, 0xdd5a, 0xdd5c, 0xb745, 0xdd5b, 0xdd59,
-  0xdd58, 0xe1b4, 0xb9f7, 0xb9f5, 0xb9f6, 0xe1b2, 0xe1b3, 0xb9f3,
-  0xe571, 0xe56f, 0xbc6d, 0xe570, 0xbc6e, 0xbc6c, 0xb9f4, 0xe96d,
-  0xe96b, 0xe96c, 0xe56e, 0xecdc, 0xc0b0, 0xecdb, 0xefc5, 0xefc6,
-  0xe96e, 0xf1fe, 0xa47a, 0xa5ad, 0xa67e, 0xc9db, 0xa67d, 0xa9af,
-  0xb746, 0xa4db, 0xa5ae, 0xabd5, 0xb458, 0xc979, 0xc97a, 0xc9dc,
-  0xa7c8, 0xcad0, 0xcace, 0xa7c9, 0xcacd, 0xcacf, 0xcad1, 0xa7c7,
-  0xa9b3, 0xa9b4, 0xa9b1, 0xa9b0, 0xceb8, 0xa9b2, 0xabd6, 0xceb7,
-  0xceb9, 0xceb6, 0xceba, 0xabd7, 0xae79, 0xd175, 0xd177, 0xae77,
-  0xd178, 0xae78, 0xd176, 0xceb5, 0xd547, 0xd54a, 0xd54b, 0xd548,
-  0xb167, 0xb166, 0xb164, 0xb165, 0xd549, 0xb168, 0xb45a, 0xb45b,
-  0xb45c, 0xdd5d, 0xdd5f, 0xdd61, 0xb748, 0xb747, 0xb459, 0xdd60,
-  0xdd5e, 0xe1b8, 0xe1b6, 0xe1bc, 0xb9f8, 0xe1bd, 0xe1ba, 0xb9f9,
-  0xe1b7, 0xe1b5, 0xe1bb, 0xbc70, 0xe573, 0xe1b9, 0xbc72, 0xe574,
-  0xbc71, 0xbc74, 0xe575, 0xbc6f, 0xbc73, 0xe973, 0xe971, 0xe970,
-  0xe972, 0xe96f, 0xc366, 0xf446, 0xf447, 0xf5cb, 0xf6df, 0xc655,
-  0xa9b5, 0xa7ca, 0xabd8, 0xa47b, 0xa4dc, 0xa5af, 0xc9dd, 0xa7cb,
-  0xcad2, 0xcebb, 0xabd9, 0xb9fa, 0xa47c, 0xa6a1, 0xb749, 0xa47d,
-  0xa4dd, 0xa4de, 0xa5b1, 0xa5b0, 0xc9de, 0xa6a2, 0xcad3, 0xa7cc,
-  0xcc71, 0xcc72, 0xcc73, 0xa9b6, 0xa9b7, 0xcc70, 0xa9b8, 0xabda,
-  0xcebc, 0xd17a, 0xae7a, 0xd179, 0xb169, 0xd54c, 0xb16a, 0xd54d,
-  0xb45d, 0xdd62, 0xe1bf, 0xe1be, 0xb9fb, 0xbc75, 0xe576, 0xbeca,
-  0xe974, 0xc0b1, 0xc573, 0xf7d8, 0xcc74, 0xcebd, 0xb16b, 0xd8f4,
-  0xb74a, 0xc255, 0xa7ce, 0xa7cd, 0xabdb, 0xd17b, 0xb16d, 0xb343,
-  0xb16e, 0xb16c, 0xb45e, 0xe1c0, 0xb9fc, 0xbc76, 0xc94c, 0xc9df,
-  0xcad5, 0xa7cf, 0xcad4, 0xa7d0, 0xa9bc, 0xcc77, 0xcc76, 0xa9bb,
-  0xa9b9, 0xa9ba, 0xcc75, 0xabdd, 0xcebe, 0xabe0, 0xabdc, 0xabe2,
-  0xabde, 0xabdf, 0xabe1, 0xae7d, 0xae7c, 0xae7b, 0xd54f, 0xb16f,
-  0xb172, 0xb170, 0xd54e, 0xb175, 0xb171, 0xd550, 0xb174, 0xb173,
-  0xd8f6, 0xd8f5, 0xb461, 0xb45f, 0xb460, 0xd8f7, 0xb74b, 0xdd64,
-  0xb74c, 0xdd63, 0xe577, 0xbc78, 0xe1c1, 0xbc77, 0xb9fd, 0xecde,
-  0xe975, 0xc0b2, 0xecdd, 0xf240, 0xf448, 0xf449, 0xa4df, 0xa5b2,
-  0xc97b, 0xa7d2, 0xa7d4, 0xc9e2, 0xcad8, 0xcad7, 0xcad6, 0xc9e1,
-  0xc9e0, 0xa6a4, 0xa7d3, 0xa7d1, 0xa6a3, 0xa9bd, 0xcc78, 0xa9be,
-  0xcadd, 0xcadf, 0xcade, 0xcc79, 0xcada, 0xa7d8, 0xa7d6, 0xcad9,
-  0xcadb, 0xcae1, 0xa7d5, 0xcadc, 0xcae5, 0xa9c0, 0xcae2, 0xa7d7,
-  0xcae0, 0xcae3, 0xa9bf, 0xa9c1, 0xcae4, 0xccaf, 0xcca2, 0xcc7e,
-  0xccae, 0xcca9, 0xabe7, 0xa9c2, 0xccaa, 0xccad, 0xabe3, 0xccac,
-  0xa9c3, 0xa9c8, 0xa9c6, 0xcca3, 0xcc7c, 0xcca5, 0xa9cd, 0xccb0,
-  0xabe4, 0xcca6, 0xabe5, 0xa9c9, 0xcca8, 0xcecd, 0xabe6, 0xcc7b,
-  0xa9ca, 0xabe8, 0xa9cb, 0xa9c7, 0xa9cc, 0xcca7, 0xcc7a, 0xccab,
-  0xa9c4, 0xcc7d, 0xcca4, 0xcca1, 0xa9c5, 0xcebf, 0xcec0, 0xceca,
-  0xd1a1, 0xcecb, 0xabee, 0xcece, 0xcec4, 0xabed, 0xcec6, 0xcec7,
-  0xcec9, 0xabe9, 0xaea3, 0xcec5, 0xcec1, 0xaea4, 0xcecf, 0xae7e,
-  0xd17d, 0xcec8, 0xd17c, 0xcec3, 0xcecc, 0xabec, 0xaea1, 0xabf2,
-  0xaea2, 0xced0, 0xd17e, 0xabeb, 0xaea6, 0xabf1, 0xabf0, 0xabef,
-  0xaea5, 0xced1, 0xaea7, 0xabea, 0xcec2, 0xb176, 0xd1a4, 0xd1a6,
-  0xd1a8, 0xaea8, 0xaeae, 0xd553, 0xd1ac, 0xd1a3, 0xb178, 0xd551,
-  0xaead, 0xaeab, 0xd1ae, 0xd552, 0xd1a5, 0xaeac, 0xd1a9, 0xaeaf,
-  0xd1ab, 0xaeaa, 0xd1aa, 0xd1ad, 0xd1a7, 0xaea9, 0xb179, 0xd1a2,
-  0xb177, 0xb17a, 0xd555, 0xd55e, 0xb464, 0xb17c, 0xb1a3, 0xb465,
-  0xd560, 0xb1aa, 0xd8f9, 0xd556, 0xb1a2, 0xb1a5, 0xb17e, 0xd554,
-  0xd562, 0xd565, 0xd949, 0xd563, 0xd8fd, 0xb1a1, 0xb1a8, 0xb1ac,
-  0xd55d, 0xd8f8, 0xd561, 0xb17b, 0xd8fa, 0xd564, 0xd8fc, 0xd559,
-  0xb462, 0xd557, 0xd558, 0xb1a7, 0xb1a6, 0xd55b, 0xb1ab, 0xd55f,
-  0xb1a4, 0xd55c, 0xb1a9, 0xb466, 0xb463, 0xd8fb, 0xd55a, 0xb17d,
-  0xb46b, 0xb46f, 0xd940, 0xb751, 0xb46d, 0xd944, 0xb471, 0xdd65,
-  0xd946, 0xb753, 0xb469, 0xb46c, 0xd947, 0xd948, 0xd94e, 0xb473,
-  0xb754, 0xd94a, 0xd94f, 0xd943, 0xb75e, 0xb755, 0xb472, 0xd941,
-  0xd950, 0xb75d, 0xb470, 0xb74e, 0xd94d, 0xb474, 0xd945, 0xd8fe,
-  0xb46a, 0xd942, 0xd94b, 0xb74d, 0xb752, 0xb467, 0xd94c, 0xb750,
-  0xb468, 0xb75c, 0xe1c3, 0xdd70, 0xdd68, 0xe1c2, 0xdd6c, 0xdd6e,
-  0xdd6b, 0xb75b, 0xdd6a, 0xb75f, 0xe1d2, 0xb75a, 0xba40, 0xdd71,
-  0xe1c4, 0xb758, 0xdd69, 0xdd6d, 0xb9fe, 0xb74f, 0xdd66, 0xdd67,
-  0xba41, 0xb757, 0xb759, 0xb756, 0xdd6f, 0xe1c8, 0xe1c9, 0xe1ce,
-  0xbc7d, 0xe1d5, 0xba47, 0xba46, 0xe1d0, 0xbc7c, 0xe1c5, 0xba45,
-  0xe1d4, 0xba43, 0xba44, 0xe1d1, 0xe5aa, 0xbc7a, 0xb46e, 0xe1d3,
-  0xbca3, 0xe1cb, 0xbc7b, 0xbca2, 0xe1c6, 0xe1ca, 0xe1c7, 0xe1cd,
-  0xba48, 0xbc79, 0xba42, 0xe57a, 0xe1cf, 0xbca1, 0xbca4, 0xe1cc,
-  0xbc7e, 0xe579, 0xe57e, 0xbece, 0xe578, 0xe9a3, 0xe5a9, 0xbca8,
-  0xbca6, 0xbecc, 0xe5a6, 0xe5a2, 0xbcac, 0xe978, 0xbcaa, 0xe5a1,
-  0xe976, 0xe5a5, 0xe5a8, 0xe57d, 0xbcab, 0xbca5, 0xe977, 0xbecd,
-  0xe5a7, 0xbca7, 0xbca9, 0xe5a4, 0xbcad, 0xe5a3, 0xe57c, 0xe57b,
-  0xbecb, 0xe5ab, 0xe97a, 0xece0, 0xbed0, 0xe9a2, 0xe97e, 0xece1,
-  0xbed1, 0xe9a1, 0xe97c, 0xc0b4, 0xecdf, 0xe979, 0xe97b, 0xc0b5,
-  0xbed3, 0xc0b3, 0xbed2, 0xc0b7, 0xe97d, 0xbecf, 0xefcf, 0xefc7,
-  0xece7, 0xefc8, 0xece3, 0xc256, 0xece5, 0xece4, 0xc0b6, 0xece2,
-  0xece6, 0xefd0, 0xefcc, 0xefce, 0xefc9, 0xefca, 0xefcd, 0xefcb,
-  0xc367, 0xc36a, 0xc369, 0xc368, 0xc461, 0xf44a, 0xc462, 0xf241,
-  0xc4df, 0xf5cc, 0xc4e0, 0xc574, 0xc5ca, 0xf7d9, 0xf7da, 0xf7db,
-  0xf9ba, 0xa4e0, 0xc97c, 0xa5b3, 0xa6a6, 0xa6a7, 0xa6a5, 0xa6a8,
-  0xa7da, 0xa7d9, 0xccb1, 0xa9cf, 0xa9ce, 0xd1af, 0xb1ad, 0xb1ae,
-  0xb475, 0xdd72, 0xb760, 0xb761, 0xdd74, 0xdd76, 0xdd75, 0xe1d7,
-  0xe1d6, 0xba49, 0xe1d8, 0xe5ac, 0xbcae, 0xbed4, 0xc0b8, 0xc257,
-  0xc0b9, 0xa4e1, 0xcae6, 0xccb2, 0xa9d1, 0xa9d0, 0xa9d2, 0xabf3,
-  0xced2, 0xced3, 0xd1b0, 0xaeb0, 0xb1af, 0xb476, 0xd951, 0xa4e2,
-  0xa47e, 0xa4e3, 0xc97d, 0xa5b7, 0xa5b6, 0xa5b4, 0xa5b5, 0xa6ab,
-  0xc9e9, 0xc9eb, 0xa6aa, 0xc9e3, 0xc9e4, 0xc9ea, 0xc9e6, 0xc9e8,
-  0xa6a9, 0xc9e5, 0xc9ec, 0xc9e7, 0xa7e1, 0xa7ea, 0xa7e8, 0xcaf0,
-  0xcaed, 0xcaf5, 0xa7e6, 0xcaf6, 0xa7df, 0xcaf3, 0xa7e5, 0xcaef,
-  0xcaee, 0xa7e3, 0xcaf4, 0xa7e4, 0xa9d3, 0xa7de, 0xcaf1, 0xcae7,
-  0xa7db, 0xa7ee, 0xcaec, 0xcaf2, 0xa7e0, 0xa7e2, 0xcae8, 0xcae9,
-  0xcaea, 0xa7ed, 0xa7e7, 0xa7ec, 0xcaeb, 0xa7eb, 0xa7dd, 0xa7dc,
-  0xa7e9, 0xa9e1, 0xccbe, 0xccb7, 0xa9dc, 0xa9ef, 0xccb3, 0xccba,
-  0xccbc, 0xccbf, 0xa9ea, 0xccbb, 0xccb4, 0xa9e8, 0xccb8, 0xccc0,
-  0xa9d9, 0xccbd, 0xa9e3, 0xa9e2, 0xccb6, 0xa9d7, 0xa9d8, 0xa9d6,
-  0xa9ee, 0xa9e6, 0xa9e0, 0xa9d4, 0xccb9, 0xa9df, 0xa9d5, 0xa9e7,
-  0xa9f0, 0xced4, 0xa9e4, 0xccb5, 0xa9da, 0xa9dd, 0xa9de, 0xa9ec,
-  0xa9ed, 0xa9eb, 0xa9e5, 0xa9e9, 0xa9db, 0xabf4, 0xceda, 0xac41,
-  0xabf8, 0xabfa, 0xac40, 0xcee6, 0xabfd, 0xd1b1, 0xaeb1, 0xac43,
-  0xced7, 0xcedf, 0xabfe, 0xcede, 0xcedb, 0xcee3, 0xcee5, 0xabf7,
-  0xabfb, 0xac42, 0xaeb3, 0xcee0, 0xabf9, 0xac45, 0xced9, 0xabfc,
-  0xaeb2, 0xabf6, 0xced6, 0xcedd, 0xced5, 0xced8, 0xcedc, 0xd1b2,
-  0xac44, 0xcee1, 0xcee2, 0xcee4, 0xabf5, 0xaec1, 0xd1be, 0xaebf,
-  0xaec0, 0xd1b4, 0xd1c4, 0xaeb6, 0xd566, 0xd1c6, 0xd1c0, 0xd1b7,
-  0xd1c9, 0xd1ba, 0xaebc, 0xd57d, 0xd1bd, 0xaebe, 0xaeb5, 0xd1cb,
-  0xd1bf, 0xaeb8, 0xd1b8, 0xd1b5, 0xd1b6, 0xaeb9, 0xd1c5, 0xd1cc,
-  0xaebb, 0xd1bc, 0xd1bb, 0xaec3, 0xaec2, 0xaeb4, 0xaeba, 0xaebd,
-  0xd1c8, 0xd1c2, 0xaeb7, 0xd1b3, 0xd1ca, 0xd1c1, 0xd1c3, 0xd1c7,
-  0xd567, 0xb1b7, 0xb1cb, 0xb1ca, 0xb1bf, 0xd579, 0xd575, 0xd572,
-  0xd5a6, 0xb1ba, 0xb1b2, 0xd577, 0xb4a8, 0xb1b6, 0xd5a1, 0xb1cc,
-  0xb1c9, 0xd57b, 0xd56a, 0xb1c8, 0xd5a3, 0xd569, 0xb1bd, 0xb1c1,
-  0xd5a2, 0xd573, 0xb1c2, 0xb1bc, 0xd568, 0xb478, 0xd5a5, 0xd571,
-  0xb1c7, 0xd574, 0xd5a4, 0xb1c6, 0xd952, 0xb1b3, 0xd56f, 0xb1b8,
-  0xb1c3, 0xb1be, 0xd578, 0xd56e, 0xd56c, 0xd57e, 0xb1b0, 0xb1c4,
-  0xb1b4, 0xb477, 0xd57c, 0xb1b5, 0xb1b1, 0xb1c0, 0xb1bb, 0xb1b9,
-  0xd570, 0xb1c5, 0xd56d, 0xd57a, 0xd576, 0xd954, 0xd953, 0xd56b,
-  0xd964, 0xb47a, 0xd96a, 0xd959, 0xd967, 0xdd77, 0xb47d, 0xd96b,
-  0xd96e, 0xb47c, 0xd95c, 0xd96d, 0xd96c, 0xb47e, 0xd955, 0xb479,
-  0xb4a3, 0xb4a1, 0xd969, 0xd95f, 0xb4a5, 0xd970, 0xd968, 0xd971,
-  0xb4ad, 0xb4ab, 0xd966, 0xd965, 0xd963, 0xd95d, 0xb4a4, 0xb4a2,
-  0xd1b9, 0xd956, 0xddb7, 0xd957, 0xb47b, 0xb4aa, 0xdd79, 0xb4a6,
-  0xb4a7, 0xd958, 0xd96f, 0xdd78, 0xd960, 0xd95b, 0xb4a9, 0xd961,
-  0xd95e, 0xb4ae, 0xb770, 0xdd7c, 0xddb1, 0xddb6, 0xddaa, 0xb76c,
-  0xddbb, 0xb769, 0xdd7a, 0xdd7b, 0xb762, 0xb76b, 0xdda4, 0xb76e,
-  0xb76f, 0xdda5, 0xddb2, 0xddb8, 0xb76a, 0xb764, 0xdda3, 0xdd7d,
-  0xddba, 0xdda8, 0xdda9, 0xdd7e, 0xddb4, 0xddab, 0xddb5, 0xddad,
-  0xb765, 0xe1d9, 0xb768, 0xb766, 0xddb9, 0xddb0, 0xddac, 0xdda1,
-  0xba53, 0xddaf, 0xb76d, 0xdda7, 0xdda6, 0xb767, 0xb763, 0xe1ee,
-  0xddb3, 0xddae, 0xdda2, 0xe1e9, 0xe1da, 0xe1e5, 0xe1ec, 0xba51,
-  0xb4ac, 0xe1ea, 0xba4c, 0xba4b, 0xe1f1, 0xe1db, 0xe1e8, 0xe1dc,
-  0xe1e7, 0xba4f, 0xe1eb, 0xd962, 0xe1f2, 0xe1e3, 0xba52, 0xe5ba,
-  0xbcaf, 0xe1f0, 0xe1ef, 0xba54, 0xe5ad, 0xbcb0, 0xe5ae, 0xe1df,
-  0xe1e0, 0xe1dd, 0xe1e2, 0xe1de, 0xe1f3, 0xba4e, 0xbcb1, 0xba50,
-  0xba55, 0xe1e1, 0xe1ed, 0xe1e6, 0xe5b1, 0xba4a, 0xbcb4, 0xe9aa,
-  0xe5b6, 0xe5b5, 0xe5b7, 0xe5b4, 0xbcb5, 0xbcbb, 0xbcb8, 0xbcb9,
-  0xe5af, 0xe5b2, 0xe5bc, 0xbcc1, 0xbcbf, 0xe5b3, 0xd95a, 0xbcb2,
-  0xe5b9, 0xe5b0, 0xbcc2, 0xe5b8, 0xba4d, 0xbcb7, 0xe1e4, 0xbcba,
-  0xbcbe, 0xbcc0, 0xbcbd, 0xbcbc, 0xbcb6, 0xe5bb, 0xbcb3, 0xbcc3,
-  0xbed8, 0xbed9, 0xe9a9, 0xbee2, 0xbedf, 0xbed6, 0xbedd, 0xe9ab,
-  0xbedb, 0xbed5, 0xbedc, 0xe9a8, 0xc0bb, 0xbed7, 0xbede, 0xc0ba,
-  0xe9a7, 0xe9a6, 0xbee0, 0xbee1, 0xe9a5, 0xe9a4, 0xc0bc, 0xe9ae,
-  0xbeda, 0xe9ac, 0xc0bd, 0xc0c2, 0xecea, 0xecec, 0xc0bf, 0xeced,
-  0xece9, 0xeceb, 0xc0c0, 0xc0c3, 0xece8, 0xc0be, 0xc0c1, 0xc259,
-  0xe9ad, 0xc258, 0xc25e, 0xefd4, 0xc25c, 0xc25d, 0xefd7, 0xefd3,
-  0xc25a, 0xefd1, 0xc36b, 0xefd5, 0xefd6, 0xefd2, 0xc25b, 0xf242,
-  0xf245, 0xf246, 0xf244, 0xf247, 0xc36c, 0xf243, 0xf44e, 0xc464,
-  0xf44d, 0xf44c, 0xf44b, 0xc463, 0xc465, 0xf5cd, 0xc4e2, 0xc4e1,
-  0xf6e1, 0xf6e0, 0xf6e3, 0xc5cb, 0xc575, 0xf7dd, 0xf6e2, 0xf7dc,
-  0xc5cd, 0xc5cc, 0xc5f3, 0xf8a9, 0xf8ef, 0xa4e4, 0xd972, 0xe9af,
-  0xa6ac, 0xcaf7, 0xa7f1, 0xa7ef, 0xa7f0, 0xccc1, 0xa9f1, 0xac46,
-  0xcee7, 0xcee8, 0xac47, 0xd1ce, 0xaec4, 0xaec5, 0xd1cd, 0xb1d3,
-  0xb1cf, 0xd5a7, 0xb1d6, 0xb1d5, 0xb1ce, 0xb1d1, 0xb1d4, 0xb1d0,
-  0xd976, 0xb1cd, 0xb4af, 0xb4b1, 0xb4b2, 0xd975, 0xd978, 0xb4b0,
-  0xd973, 0xd977, 0xd974, 0xb771, 0xddbc, 0xba56, 0xe1f4, 0xbee3,
-  0xbcc4, 0xe5bd, 0xbcc5, 0xbcc6, 0xe5bf, 0xe5be, 0xe5c0, 0xe9b1,
-  0xe9b0, 0xecef, 0xecee, 0xc0c4, 0xc0c5, 0xf248, 0xa4e5, 0xd979,
-  0xb4b4, 0xb4b3, 0xddbd, 0xefd8, 0xc4e3, 0xf7de, 0xa4e6, 0xaec6,
-  0xb1d8, 0xb1d7, 0xd97a, 0xd97b, 0xb772, 0xe1f5, 0xba57, 0xe9b2,
-  0xa4e7, 0xa5b8, 0xa9f2, 0xccc2, 0xcee9, 0xac48, 0xb1d9, 0xd97c,
-  0xb4b5, 0xb773, 0xe5c1, 0xe5c2, 0xecf0, 0xc25f, 0xf8f0, 0xa4e8,
-  0xccc3, 0xa9f3, 0xac49, 0xceea, 0xaec7, 0xd1d2, 0xd1d0, 0xd1d1,
-  0xaec8, 0xd1cf, 0xb1db, 0xb1dc, 0xd5a8, 0xb1dd, 0xb1da, 0xd97d,
-  0xd97e, 0xddbe, 0xba59, 0xba58, 0xecf1, 0xefd9, 0xf24a, 0xf249,
-  0xf44f, 0xc95e, 0xac4a, 0xa4e9, 0xa5b9, 0xa6ae, 0xa6ad, 0xa6af,
-  0xa6b0, 0xc9ee, 0xc9ed, 0xcaf8, 0xa7f2, 0xcafb, 0xcafa, 0xcaf9,
-  0xcafc, 0xa9f4, 0xccc9, 0xccc5, 0xccce, 0xa9fb, 0xa9f9, 0xccca,
-  0xccc6, 0xcccd, 0xa9f8, 0xaa40, 0xccc8, 0xccc4, 0xa9fe, 0xcccb,
-  0xa9f7, 0xcccc, 0xa9fa, 0xa9fc, 0xccd0, 0xcccf, 0xccc7, 0xa9f6,
-  0xa9f5, 0xa9fd, 0xceef, 0xcef5, 0xac50, 0xac4d, 0xceec, 0xcef1,
-  0xac53, 0xac4b, 0xcef0, 0xac4e, 0xac51, 0xcef3, 0xac4c, 0xcef8,
-  0xac4f, 0xac52, 0xceed, 0xcef2, 0xcef6, 0xceee, 0xceeb, 0xcef7,
-  0xcef4, 0xaed0, 0xaec9, 0xaecc, 0xaecf, 0xd1d5, 0xaeca, 0xd1d3,
-  0xaece, 0xaecb, 0xd1d6, 0xaecd, 0xd5ac, 0xb1df, 0xd5ab, 0xd5ad,
-  0xb1de, 0xb1e3, 0xd1d4, 0xd5aa, 0xd5ae, 0xb1e0, 0xd5a9, 0xb1e2,
-  0xb1e1, 0xd9a7, 0xd9a2, 0xb4b6, 0xb4ba, 0xb4b7, 0xd9a5, 0xd9a8,
-  0xb4b8, 0xb4b9, 0xb4be, 0xddc7, 0xd9a6, 0xb4bc, 0xd9a3, 0xd9a1,
-  0xb4bd, 0xd9a4, 0xb779, 0xddbf, 0xb776, 0xb777, 0xb775, 0xddc4,
-  0xddc3, 0xddc0, 0xb77b, 0xddc2, 0xb4bb, 0xddc6, 0xddc1, 0xb778,
-  0xb774, 0xb77a, 0xddc5, 0xba5c, 0xe1f8, 0xe1f7, 0xe1f6, 0xba5a,
-  0xba5b, 0xe5c5, 0xe5c8, 0xbcc8, 0xbcc7, 0xe5c9, 0xe5c4, 0xbcca,
-  0xe5c6, 0xbcc9, 0xe5c3, 0xe5c7, 0xbee9, 0xbee6, 0xe9bb, 0xe9ba,
-  0xe9b9, 0xe9b4, 0xe9b5, 0xbee7, 0xbee4, 0xbee8, 0xe9b3, 0xbee5,
-  0xe9b6, 0xe9b7, 0xe9bc, 0xe9b8, 0xecf2, 0xc0c7, 0xefdc, 0xc0c6,
-  0xefda, 0xefdb, 0xc260, 0xc36e, 0xf24b, 0xc36d, 0xf451, 0xf452,
-  0xc466, 0xf450, 0xc4e4, 0xf7df, 0xc5ce, 0xf8aa, 0xf8ab, 0xa4ea,
-  0xa6b1, 0xa6b2, 0xa7f3, 0xccd1, 0xac54, 0xaed1, 0xb1e4, 0xb0d2,
-  0xb4bf, 0xb4c0, 0xb3cc, 0xd9a9, 0xb77c, 0xe1fa, 0xe1f9, 0xa4eb,
-  0xa6b3, 0xccd2, 0xaa42, 0xaa41, 0xcef9, 0xcefa, 0xd1d7, 0xd1d8,
-  0xaed2, 0xaed3, 0xaed4, 0xd5af, 0xb1e6, 0xb4c2, 0xb4c1, 0xddc8,
-  0xdf7a, 0xe1fb, 0xe9bd, 0xc261, 0xc467, 0xa4ec, 0xa5bc, 0xa5bd,
-  0xa5bb, 0xa5be, 0xa5ba, 0xa6b6, 0xc9f6, 0xa6b5, 0xa6b7, 0xc9f1,
-  0xc9f0, 0xc9f3, 0xc9f2, 0xc9f5, 0xa6b4, 0xc9ef, 0xc9f4, 0xcafd,
-  0xa7fd, 0xcafe, 0xcb43, 0xa7fc, 0xcb47, 0xcb42, 0xcb45, 0xa7f5,
-  0xa7f6, 0xa7f7, 0xa7f8, 0xa840, 0xcb41, 0xa7fa, 0xa841, 0xcb40,
-  0xcb46, 0xa7f9, 0xcb44, 0xa7fb, 0xa7f4, 0xa7fe, 0xaa57, 0xccd4,
-  0xaa43, 0xaa4d, 0xaa4e, 0xaa46, 0xaa58, 0xaa48, 0xccdc, 0xaa53,
-  0xccd7, 0xaa49, 0xcce6, 0xcce7, 0xccdf, 0xccd8, 0xaa56, 0xcce4,
-  0xaa51, 0xaa4f, 0xcce5, 0xcce3, 0xccdb, 0xccd3, 0xccda, 0xaa4a,
-  0xaa50, 0xaa44, 0xccde, 0xccdd, 0xccd5, 0xaa52, 0xcce1, 0xccd6,
-  0xaa55, 0xcce8, 0xaa45, 0xaa4c, 0xccd9, 0xcce2, 0xaa54, 0xaa47,
-  0xaa4b, 0xcce0, 0xcf5b, 0xac5c, 0xac69, 0xcf56, 0xcf4c, 0xac62,
-  0xcf4a, 0xac5b, 0xcf45, 0xac65, 0xcf52, 0xcefe, 0xcf41, 0xcf44,
-  0xcefb, 0xcf51, 0xcf61, 0xac60, 0xcf46, 0xcf58, 0xcefd, 0xcf5f,
-  0xcf60, 0xcf63, 0xcf5a, 0xcf4b, 0xcf53, 0xac66, 0xac59, 0xac61,
-  0xac6d, 0xac56, 0xac58, 0xcf43, 0xac6a, 0xac63, 0xcf5d, 0xcf40,
-  0xac6c, 0xac67, 0xcf49, 0xac6b, 0xcf50, 0xcf48, 0xac64, 0xcf5c,
-  0xcf54, 0xac5e, 0xcf62, 0xcf47, 0xac5a, 0xcf59, 0xcf4f, 0xac5f,
-  0xcf55, 0xac57, 0xcefc, 0xac68, 0xaee3, 0xac5d, 0xcf4e, 0xcf4d,
-  0xcf42, 0xcf5e, 0xcf57, 0xac55, 0xd1ec, 0xaeea, 0xd1ed, 0xd1e1,
-  0xaedf, 0xaeeb, 0xd1da, 0xd1e3, 0xd1eb, 0xd1d9, 0xd1f4, 0xaed5,
-  0xd1f3, 0xd1ee, 0xd1ef, 0xaedd, 0xaee8, 0xd1e5, 0xd1e6, 0xd1f0,
-  0xd1e7, 0xd1e2, 0xd1dc, 0xd1dd, 0xd1ea, 0xd1e4, 0xaed6, 0xaeda,
-  0xd1f2, 0xd1de, 0xaee6, 0xaee2, 0xaee5, 0xaeec, 0xaedb, 0xaee7,
-  0xd1e9, 0xaee9, 0xaed8, 0xaed7, 0xd1db, 0xd1df, 0xaee0, 0xd1f1,
-  0xd1e8, 0xd1e0, 0xaee4, 0xaee1, 0xaed9, 0xaedc, 0xd5c4, 0xd5b4,
-  0xd5b5, 0xd5b9, 0xd5c8, 0xd5c5, 0xd5be, 0xd5bd, 0xb1ed, 0xd5c1,
-  0xd5d0, 0xd5b0, 0xd5d1, 0xd5c3, 0xd5d5, 0xd5c9, 0xb1ec, 0xd5c7,
-  0xb1e7, 0xb1fc, 0xb1f2, 0xb1f6, 0xb1f5, 0xd5b1, 0xd5ce, 0xd5d4,
-  0xd5cc, 0xd5d3, 0xd5c0, 0xd5b2, 0xd5d2, 0xd5c2, 0xb1ea, 0xb1f7,
-  0xd5cb, 0xb1f0, 0xd5ca, 0xd5b3, 0xb1f8, 0xb1fa, 0xd5cd, 0xb1fb,
-  0xb1e9, 0xd5ba, 0xd5cf, 0xb1ef, 0xb1f9, 0xd5bc, 0xd5c6, 0xd5b7,
-  0xd5bb, 0xb1f4, 0xd5b6, 0xb1e8, 0xb1f1, 0xb1ee, 0xd5bf, 0xaede,
-  0xd9c0, 0xb1eb, 0xb1f3, 0xd9c3, 0xd9d9, 0xd9ce, 0xb4d6, 0xb4d1,
-  0xd9bd, 0xb4d2, 0xd9cd, 0xd9c6, 0xd9d3, 0xb4ce, 0xd9ab, 0xd9d5,
-  0xb4c4, 0xd9b3, 0xb4c7, 0xb4c6, 0xb4d7, 0xd9ad, 0xd9cf, 0xd9d0,
-  0xb4c9, 0xb4c5, 0xd9bb, 0xb4d0, 0xd9b6, 0xd9d1, 0xb4cc, 0xd9c9,
-  0xd9d6, 0xd9b0, 0xd9b5, 0xd9af, 0xb4cb, 0xd9c2, 0xddde, 0xd9b1,
-  0xb4cf, 0xd9ba, 0xd9d2, 0xb4ca, 0xd9b7, 0xd9b4, 0xd9c5, 0xb4cd,
-  0xb4c3, 0xb4d9, 0xd9c8, 0xd9c7, 0xd9ac, 0xb4c8, 0xd9d4, 0xd9bc,
-  0xd9be, 0xd9cb, 0xd9ca, 0xd9aa, 0xb4d3, 0xb4d5, 0xd9b2, 0xd9b9,
-  0xd9c1, 0xb4d4, 0xd9b8, 0xd9c4, 0xd9d7, 0xd9cc, 0xd9d8, 0xd9ae,
-  0xddf2, 0xb7a6, 0xddf0, 0xdddb, 0xdde0, 0xddd9, 0xddec, 0xddcb,
-  0xddd2, 0xddea, 0xddf4, 0xdddc, 0xddcf, 0xdde2, 0xdde7, 0xddd3,
-  0xdde4, 0xddd0, 0xddd7, 0xddd8, 0xb7a8, 0xddeb, 0xdde9, 0xddcc,
-  0xddee, 0xddef, 0xddf1, 0xb7ac, 0xb7a4, 0xd5b8, 0xddd4, 0xdde6,
-  0xddd5, 0xb7a1, 0xb7b1, 0xdded, 0xb7af, 0xb7ab, 0xddca, 0xb7a3,
-  0xddcd, 0xb7b0, 0xdddd, 0xddc9, 0xb7a9, 0xdde1, 0xddd1, 0xb7aa,
-  0xddda, 0xb77e, 0xb4d8, 0xdde3, 0xd9bf, 0xddce, 0xdde8, 0xb7a5,
-  0xdde5, 0xb7a2, 0xdddf, 0xb7ad, 0xddd6, 0xddf3, 0xb7a7, 0xdec6,
-  0xb7ae, 0xe24a, 0xe248, 0xe25e, 0xe246, 0xe258, 0xb77d, 0xba5f,
-  0xe242, 0xe25d, 0xe247, 0xe255, 0xba64, 0xba5d, 0xe25b, 0xe240,
-  0xe25a, 0xba6f, 0xe251, 0xe261, 0xba6d, 0xe249, 0xba5e, 0xe24b,
-  0xe259, 0xba67, 0xe244, 0xba6b, 0xba61, 0xe24d, 0xe243, 0xe1fc,
-  0xe257, 0xba68, 0xe260, 0xe1fd, 0xba65, 0xe253, 0xba66, 0xe245,
-  0xe250, 0xe24c, 0xe24e, 0xba60, 0xe25f, 0xba6e, 0xe24f, 0xe262,
-  0xe1fe, 0xe254, 0xba63, 0xba6c, 0xba6a, 0xe241, 0xe256, 0xba69,
-  0xba62, 0xe252, 0xe25c, 0xe5d5, 0xe5d1, 0xe5cd, 0xe5e1, 0xe5de,
-  0xbccd, 0xe5e5, 0xe5d4, 0xbcd8, 0xe5db, 0xe5d0, 0xe5da, 0xbcd5,
-  0xe5ee, 0xe5eb, 0xe5dd, 0xe5ce, 0xe5e2, 0xe5e4, 0xbcd1, 0xe5d8,
-  0xe5d3, 0xe5ca, 0xbcce, 0xbcd6, 0xe5e7, 0xbcd7, 0xe5cb, 0xe5ed,
-  0xe5e0, 0xe5e6, 0xbcd4, 0xe5e3, 0xe5ea, 0xbcd9, 0xbcd3, 0xe5dc,
-  0xe5cf, 0xe5ef, 0xe5cc, 0xe5e8, 0xbcd0, 0xe5d6, 0xe5d7, 0xbccf,
-  0xbccc, 0xe5d2, 0xbcd2, 0xbccb, 0xe5e9, 0xe5ec, 0xe5d9, 0xe9ca,
-  0xe9c2, 0xe9be, 0xbef6, 0xbeeb, 0xbef0, 0xbeec, 0xe9cc, 0xe9d7,
-  0xbeea, 0xe9c4, 0xe9cd, 0xe5df, 0xe9ce, 0xbef1, 0xe9dd, 0xbef5,
-  0xbef8, 0xe9c0, 0xbef4, 0xe9db, 0xe9dc, 0xe9d2, 0xe9d1, 0xe9c9,
-  0xe9d3, 0xe9da, 0xe9d9, 0xbeef, 0xbeed, 0xe9cb, 0xe9c8, 0xe9c5,
-  0xe9d8, 0xbef7, 0xe9d6, 0xbef3, 0xbef2, 0xe9d0, 0xe9bf, 0xe9c1,
-  0xe9c3, 0xe9d5, 0xe9cf, 0xbeee, 0xe9c6, 0xe9d4, 0xe9c7, 0xc0cf,
-  0xed45, 0xc0c8, 0xecf5, 0xed41, 0xc0ca, 0xed48, 0xecfc, 0xecf7,
-  0xed49, 0xecf3, 0xecfe, 0xc0d1, 0xed44, 0xed4a, 0xecfd, 0xc0c9,
-  0xed40, 0xecf4, 0xc0d0, 0xed47, 0xecf9, 0xc0cc, 0xecfb, 0xecf8,
-  0xc0d2, 0xecfa, 0xc0cb, 0xc0ce, 0xed43, 0xecf6, 0xed46, 0xed42,
-  0xc263, 0xefe7, 0xc268, 0xc269, 0xc262, 0xefe6, 0xefe3, 0xefe4,
-  0xc266, 0xefde, 0xefe2, 0xc265, 0xefdf, 0xc267, 0xc264, 0xefdd,
-  0xefe1, 0xefe5, 0xf251, 0xf24e, 0xf257, 0xf256, 0xf254, 0xf24f,
-  0xc372, 0xf250, 0xc371, 0xc0cd, 0xf253, 0xc370, 0xf258, 0xf252,
-  0xf24d, 0xefe0, 0xc36f, 0xf24c, 0xf456, 0xf455, 0xf255, 0xc468,
-  0xf459, 0xf45a, 0xf454, 0xf458, 0xf453, 0xf5d1, 0xf457, 0xc4e7,
-  0xc4e5, 0xf5cf, 0xf5d2, 0xf5ce, 0xf5d0, 0xc4e6, 0xf6e5, 0xf6e6,
-  0xc576, 0xf6e4, 0xf7e2, 0xc5cf, 0xf7e0, 0xf7e1, 0xf8ac, 0xc656,
-  0xf8f3, 0xf8f1, 0xf8f2, 0xf8f4, 0xf9bb, 0xa4ed, 0xa6b8, 0xaa59,
-  0xcce9, 0xcf64, 0xd1f5, 0xd1f7, 0xd1f6, 0xd1f8, 0xb1fd, 0xd5d7,
-  0xd1f9, 0xd5d6, 0xd5d8, 0xd5d9, 0xd9da, 0xb4db, 0xd9db, 0xd9dd,
-  0xb4dc, 0xb4da, 0xd9dc, 0xddfa, 0xddf8, 0xddf7, 0xddf6, 0xddf5,
-  0xb7b2, 0xddf9, 0xba70, 0xe263, 0xe265, 0xba71, 0xe264, 0xbcdb,
-  0xbcda, 0xe5f0, 0xe9df, 0xe9de, 0xe9e0, 0xbef9, 0xed4b, 0xc0d3,
-  0xefe8, 0xc26a, 0xf259, 0xc577, 0xa4ee, 0xa5bf, 0xa6b9, 0xa842,
-  0xaa5a, 0xaa5b, 0xac6e, 0xd1fa, 0xb7b3, 0xe6d1, 0xbefa, 0xc26b,
-  0xa4ef, 0xa6ba, 0xcceb, 0xaa5c, 0xccea, 0xcf65, 0xac6f, 0xcf66,
-  0xac70, 0xd1fc, 0xaeee, 0xaeed, 0xd5de, 0xd5dc, 0xd5dd, 0xd5db,
-  0xd5da, 0xd9de, 0xd9e1, 0xb4de, 0xd9df, 0xb4dd, 0xd9e0, 0xddfb,
-  0xe266, 0xe267, 0xe268, 0xe5f3, 0xe5f2, 0xbcdc, 0xe5f1, 0xe5f4,
-  0xe9e1, 0xe9e2, 0xe9e3, 0xed4c, 0xc0d4, 0xc26c, 0xf25a, 0xc4e8,
-  0xc95f, 0xac71, 0xcf67, 0xaeef, 0xb1fe, 0xb4df, 0xd9e2, 0xb7b5,
-  0xb7b4, 0xe269, 0xe26a, 0xbcdd, 0xbcde, 0xe9e5, 0xe9e4, 0xefe9,
-  0xf7e3, 0xa4f0, 0xc960, 0xa5c0, 0xa843, 0xcb48, 0xac72, 0xb7b6,
-  0xa4f1, 0xcf68, 0xac73, 0xcf69, 0xc0d5, 0xa4f2, 0xccec, 0xcf6a,
-  0xd242, 0xd241, 0xd1fe, 0xd1fd, 0xd243, 0xd240, 0xb240, 0xb241,
-  0xb4e0, 0xd9e3, 0xd9e4, 0xd9e5, 0xde41, 0xde42, 0xde40, 0xddfd,
-  0xddfe, 0xb7b7, 0xe26b, 0xe5f7, 0xe5f6, 0xe5f5, 0xe5f8, 0xe9e7,
-  0xe9e6, 0xbefb, 0xe9e8, 0xc0d6, 0xed4d, 0xefea, 0xf25b, 0xf6e7,
-  0xa4f3, 0xa5c2, 0xa5c1, 0xaa5d, 0xc961, 0xc97e, 0xa6bb, 0xc9f7,
-  0xcb49, 0xcb4a, 0xaa5e, 0xcced, 0xac74, 0xcf6b, 0xcf6c, 0xaef0,
-  0xaef4, 0xd244, 0xaef3, 0xaef1, 0xaef2, 0xd5df, 0xb242, 0xb4e3,
-  0xb4e1, 0xb4e2, 0xd9e6, 0xba72, 0xa4f4, 0xc9a1, 0xa5c3, 0xc9a4,
-  0xa5c6, 0xc9a3, 0xa5c5, 0xa5c4, 0xa844, 0xc9a2, 0xc9f8, 0xc9fc,
-  0xc9fe, 0xca40, 0xa6c5, 0xa6c6, 0xc9fb, 0xa6c1, 0xc9f9, 0xc9fd,
-  0xa6c2, 0xa6bd, 0xa6be, 0xa6c4, 0xc9fa, 0xa6bc, 0xa845, 0xa6bf,
-  0xa6c0, 0xa6c3, 0xcb5b, 0xcb59, 0xcb4c, 0xa851, 0xcb53, 0xa84c,
-  0xcb4d, 0xcb55, 0xcb52, 0xa84f, 0xcb51, 0xa856, 0xcb5a, 0xa858,
-  0xa85a, 0xcb4b, 0xa84d, 0xcb5c, 0xa854, 0xa857, 0xcd45, 0xa847,
-  0xa85e, 0xa855, 0xcb4e, 0xa84a, 0xa859, 0xcb56, 0xa848, 0xa849,
-  0xcd43, 0xcb4f, 0xa850, 0xa85b, 0xcb5d, 0xcb50, 0xa84e, 0xa853,
-  0xccee, 0xa85c, 0xcb57, 0xa852, 0xa85d, 0xa846, 0xcb54, 0xa84b,
-  0xcb58, 0xcd44, 0xaa6a, 0xaa7a, 0xccf5, 0xaa71, 0xcd4b, 0xaa62,
-  0xaa65, 0xcd42, 0xccf3, 0xccf7, 0xaa6d, 0xaa6f, 0xccfa, 0xaa76,
-  0xaa68, 0xaa66, 0xaa67, 0xaa75, 0xcd47, 0xaa70, 0xccf9, 0xccfb,
-  0xaa6e, 0xaa73, 0xccfc, 0xcd4a, 0xac75, 0xaa79, 0xaa63, 0xcd49,
-  0xcd4d, 0xccf8, 0xcd4f, 0xcd40, 0xaa6c, 0xccf4, 0xaa6b, 0xaa7d,
-  0xaa72, 0xccf2, 0xcf75, 0xaa78, 0xaa7c, 0xcd41, 0xcd46, 0xaa7e,
-  0xaa77, 0xaa69, 0xaa5f, 0xaa64, 0xccf6, 0xaa60, 0xcd4e, 0xccf0,
-  0xccef, 0xccfd, 0xccf1, 0xaa7b, 0xaef5, 0xaa74, 0xccfe, 0xaa61,
-  0xaca6, 0xcd4c, 0xcf7c, 0xcfa1, 0xcfa4, 0xcf77, 0xcfa7, 0xcfaa,
-  0xcfac, 0xcf74, 0xac76, 0xac7b, 0xd249, 0xacad, 0xcfa5, 0xcfad,
-  0xcf7b, 0xcf73, 0xd264, 0xac7e, 0xcfa2, 0xcf78, 0xcf7a, 0xaca5,
-  0xcf7d, 0xac7d, 0xcf70, 0xcfa8, 0xcfab, 0xac7a, 0xaca8, 0xcf6d,
-  0xacaa, 0xac78, 0xacae, 0xcfa9, 0xcf6f, 0xacab, 0xd25e, 0xcd48,
-  0xac7c, 0xac77, 0xcf76, 0xcf6e, 0xacac, 0xaca4, 0xcfa3, 0xaca9,
-  0xaca7, 0xcf79, 0xaca1, 0xcf71, 0xaca2, 0xaca3, 0xcf72, 0xcfa6,
-  0xac79, 0xcf7e, 0xd24c, 0xaefd, 0xaf43, 0xd255, 0xd25b, 0xd257,
-  0xd24a, 0xd24d, 0xd246, 0xd247, 0xaf4a, 0xaefa, 0xd256, 0xd25f,
-  0xaf45, 0xaef6, 0xaf40, 0xd24e, 0xaf42, 0xd24f, 0xd259, 0xaf44,
-  0xd268, 0xd248, 0xaefc, 0xaefb, 0xaf48, 0xd245, 0xd266, 0xd25a,
-  0xd267, 0xd261, 0xd253, 0xd262, 0xd25c, 0xd265, 0xd263, 0xaf49,
-  0xd254, 0xaef9, 0xaef8, 0xaf41, 0xaf47, 0xd260, 0xaf46, 0xd251,
-  0xb243, 0xd269, 0xd250, 0xd24b, 0xaefe, 0xaf4b, 0xaef7, 0xd258,
-  0xd25d, 0xb265, 0xd5e1, 0xd5e5, 0xb252, 0xb250, 0xb247, 0xd5e3,
-  0xd5e2, 0xb25b, 0xd5e8, 0xb255, 0xd5fa, 0xd647, 0xb244, 0xd5f7,
-  0xd5f0, 0xb267, 0xd5e0, 0xd5fc, 0xb264, 0xb258, 0xb263, 0xb24e,
-  0xd5ec, 0xd5fe, 0xd5f6, 0xb24f, 0xb249, 0xd645, 0xd5fd, 0xd640,
-  0xb251, 0xb259, 0xd642, 0xd5ea, 0xd5fb, 0xd5ef, 0xd644, 0xb25e,
-  0xb246, 0xb25c, 0xd5f4, 0xd5f2, 0xd5f3, 0xb253, 0xd5ee, 0xd5ed,
-  0xb248, 0xd5e7, 0xd646, 0xb24a, 0xd5f1, 0xb268, 0xb262, 0xd5e6,
-  0xb25f, 0xb25d, 0xb266, 0xd5f8, 0xb261, 0xd252, 0xd5f9, 0xb260,
-  0xd641, 0xb245, 0xd5f5, 0xb257, 0xd5e9, 0xb256, 0xb254, 0xb24c,
-  0xb24b, 0xd9e7, 0xd643, 0xd5eb, 0xd9fc, 0xb24d, 0xb541, 0xb25a,
-  0xb4ee, 0xd9f6, 0xb4fc, 0xd9ea, 0xb4eb, 0xb4e7, 0xda49, 0xb4ed,
-  0xb4f1, 0xb4ec, 0xb4f5, 0xda4d, 0xda44, 0xd9f1, 0xb4fa, 0xb4f4,
-  0xd9fd, 0xb4e4, 0xda4a, 0xda43, 0xb4e8, 0xd9f7, 0xb4f7, 0xda55,
-  0xda56, 0xb4e5, 0xda48, 0xb4f9, 0xd9fb, 0xd9ed, 0xd9ee, 0xb4fd,
-  0xd9f2, 0xd9f9, 0xd9f3, 0xb4fb, 0xb544, 0xd9ef, 0xd9e8, 0xd9e9,
-  0xd9eb, 0xb4ea, 0xd9f8, 0xb4f8, 0xb542, 0xd9fa, 0xda53, 0xda4b,
-  0xb4e6, 0xda51, 0xb4f2, 0xb4f0, 0xda57, 0xb4ef, 0xda41, 0xd9f4,
-  0xd9fe, 0xb547, 0xda45, 0xda42, 0xd9f0, 0xb543, 0xda4f, 0xda4c,
-  0xda54, 0xb4e9, 0xda40, 0xb546, 0xda47, 0xb4f3, 0xb4f6, 0xda46,
-  0xb545, 0xd9f5, 0xd5e4, 0xda50, 0xda4e, 0xda52, 0xd9ec, 0xb540,
-  0xde61, 0xde60, 0xde46, 0xb7bd, 0xde5f, 0xde49, 0xde4a, 0xb7c7,
-  0xde68, 0xb7c2, 0xde5e, 0xde43, 0xb7c8, 0xb7be, 0xde52, 0xde48,
-  0xde4b, 0xde63, 0xb7b8, 0xde6a, 0xde62, 0xb7c1, 0xde57, 0xb7cc,
-  0xb7cb, 0xb7c5, 0xde69, 0xb7b9, 0xde55, 0xde4c, 0xde59, 0xde65,
-  0xb7cd, 0xb7bb, 0xde54, 0xde4d, 0xb7c4, 0xb7c3, 0xde50, 0xde5a,
-  0xde64, 0xde47, 0xde51, 0xb7bc, 0xde5b, 0xb7c9, 0xb7c0, 0xde4e,
-  0xb7bf, 0xde45, 0xde53, 0xde67, 0xb4fe, 0xbab0, 0xde56, 0xe26c,
-  0xde58, 0xde66, 0xb7c6, 0xde4f, 0xb7ba, 0xb7ca, 0xbcf0, 0xde44,
-  0xde5d, 0xde5c, 0xe2aa, 0xbaad, 0xe27d, 0xe2a4, 0xbaa2, 0xe26e,
-  0xbaaf, 0xba77, 0xe26d, 0xe2b0, 0xbab1, 0xe271, 0xe2a3, 0xe273,
-  0xe2b3, 0xe2af, 0xba75, 0xbaa1, 0xe653, 0xbaae, 0xba7d, 0xe26f,
-  0xe2ae, 0xbaa3, 0xe2ab, 0xe2b8, 0xe275, 0xe27e, 0xe2b6, 0xe2ac,
-  0xba7c, 0xe27c, 0xba76, 0xba74, 0xbaa8, 0xe27a, 0xe277, 0xe278,
-  0xe2b2, 0xe2b7, 0xe2b5, 0xba7a, 0xe2b9, 0xba7e, 0xbaa7, 0xe270,
-  0xe5fa, 0xe279, 0xba78, 0xbaac, 0xbaa9, 0xba7b, 0xe2a5, 0xe274,
-  0xbaaa, 0xe2a7, 0xbaa4, 0xbaa6, 0xba73, 0xe2a9, 0xe2a1, 0xe272,
-  0xbaa5, 0xe2b1, 0xe2b4, 0xe27b, 0xe2a8, 0xba79, 0xbcdf, 0xe2a6,
-  0xe5f9, 0xe2ad, 0xe276, 0xe644, 0xe64e, 0xbce2, 0xe64d, 0xe659,
-  0xbce4, 0xe64b, 0xe64f, 0xbcef, 0xe646, 0xbce7, 0xe652, 0xe9f0,
-  0xbcf3, 0xbcf2, 0xe654, 0xe643, 0xe65e, 0xbced, 0xbce3, 0xe657,
-  0xe65b, 0xe660, 0xe655, 0xe649, 0xbce6, 0xbce9, 0xbcf1, 0xbcec,
-  0xe64c, 0xe2a2, 0xe648, 0xe65f, 0xbce8, 0xbceb, 0xe661, 0xbce0,
-  0xe656, 0xe5fb, 0xe65c, 0xc0df, 0xe64a, 0xbce1, 0xe645, 0xbce5,
-  0xe5fc, 0xbaab, 0xe641, 0xe65a, 0xe642, 0xe640, 0xbcea, 0xe658,
-  0xe5fe, 0xe651, 0xe650, 0xe65d, 0xe647, 0xbcee, 0xe9f3, 0xbf49,
-  0xbefe, 0xea40, 0xe9eb, 0xbf41, 0xe9f7, 0xbf48, 0xbf43, 0xe9f5,
-  0xed4f, 0xe9fb, 0xea42, 0xe9fa, 0xe9e9, 0xe9f8, 0xea44, 0xea46,
-  0xbefd, 0xea45, 0xbf44, 0xbf4a, 0xbf47, 0xe9fe, 0xbf46, 0xe9f9,
-  0xe9ed, 0xe9f2, 0xe9fd, 0xbf45, 0xbf42, 0xbefc, 0xbf40, 0xe9f1,
-  0xe5fd, 0xe9ec, 0xe9ef, 0xea41, 0xe9f4, 0xe9ea, 0xed4e, 0xea43,
-  0xe9ee, 0xe9fc, 0xed51, 0xc0e3, 0xc0d7, 0xc0db, 0xed53, 0xed59,
-  0xed57, 0xc0d9, 0xc0da, 0xc0e1, 0xed5a, 0xed52, 0xc0dc, 0xed56,
-  0xed55, 0xed5b, 0xc0e2, 0xc0dd, 0xc0e0, 0xed54, 0xc0e4, 0xc0de,
-  0xc0e5, 0xc0d8, 0xed58, 0xed50, 0xeff7, 0xc271, 0xeff4, 0xeff6,
-  0xc26f, 0xeff2, 0xeff3, 0xefee, 0xe9f6, 0xefef, 0xc270, 0xefeb,
-  0xc26d, 0xeff8, 0xc26e, 0xefec, 0xefed, 0xeff1, 0xc273, 0xc272,
-  0xeff0, 0xc378, 0xf25f, 0xf265, 0xc379, 0xf25c, 0xc376, 0xc373,
-  0xf267, 0xc377, 0xc374, 0xf25e, 0xf261, 0xf262, 0xf263, 0xf266,
-  0xeff5, 0xf25d, 0xc375, 0xf264, 0xf268, 0xf260, 0xf45d, 0xc46a,
-  0xf460, 0xc46b, 0xf468, 0xf45f, 0xf45c, 0xf45e, 0xf462, 0xf465,
-  0xf464, 0xf467, 0xf45b, 0xc469, 0xf463, 0xf466, 0xf469, 0xf461,
-  0xf5d3, 0xf5d4, 0xf5d8, 0xf5d9, 0xf5d6, 0xf5d7, 0xf5d5, 0xc4e9,
-  0xc578, 0xf6eb, 0xf6e8, 0xf6e9, 0xf6ea, 0xc579, 0xf7e5, 0xf7e4,
-  0xf8af, 0xc5f4, 0xf8ad, 0xf8b0, 0xf8ae, 0xf8f5, 0xc657, 0xc665,
-  0xf9a3, 0xf96c, 0xf9a2, 0xf9d0, 0xf9d1, 0xa4f5, 0xa6c7, 0xca41,
-  0xcb5e, 0xa85f, 0xa862, 0xcb5f, 0xa860, 0xa861, 0xcd58, 0xcd5a,
-  0xcd55, 0xcd52, 0xcd54, 0xaaa4, 0xaaa2, 0xcd56, 0xaaa3, 0xcd53,
-  0xcd50, 0xaaa1, 0xcd57, 0xcd51, 0xaaa5, 0xcd59, 0xcfaf, 0xcfb3,
-  0xacb7, 0xcfb6, 0xacaf, 0xacb2, 0xacb4, 0xacb6, 0xacb3, 0xcfb2,
-  0xcfb1, 0xacb1, 0xcfb4, 0xcfb5, 0xcfae, 0xacb5, 0xacb0, 0xcfb0,
-  0xd277, 0xd278, 0xd279, 0xaf50, 0xaf4c, 0xd26e, 0xd276, 0xd27b,
-  0xaf51, 0xd26c, 0xd272, 0xd26b, 0xd275, 0xd271, 0xaf4d, 0xaf4f,
-  0xd27a, 0xd26a, 0xd26d, 0xd273, 0xd274, 0xd27c, 0xd270, 0xaf4e,
-  0xb26d, 0xd64e, 0xd650, 0xd64c, 0xd658, 0xd64a, 0xd657, 0xb269,
-  0xd648, 0xda5b, 0xd652, 0xb26c, 0xd653, 0xd656, 0xd65a, 0xd64f,
-  0xd654, 0xb26a, 0xb26b, 0xd659, 0xd64d, 0xd649, 0xd65b, 0xd651,
-  0xd655, 0xd64b, 0xb548, 0xb549, 0xda65, 0xb54f, 0xda59, 0xda62,
-  0xda58, 0xb54c, 0xda60, 0xda5e, 0xda5f, 0xb54a, 0xda63, 0xda5c,
-  0xda5a, 0xb54b, 0xda5d, 0xda61, 0xb54d, 0xda64, 0xde70, 0xde77,
-  0xde79, 0xdea1, 0xb7da, 0xde6b, 0xb7d2, 0xde7a, 0xb7d7, 0xdea2,
-  0xb7ce, 0xde7d, 0xde6d, 0xde7e, 0xde6c, 0xb7dc, 0xde78, 0xb7cf,
-  0xdea3, 0xb7d4, 0xde71, 0xb7d9, 0xde7c, 0xde6f, 0xde76, 0xde72,
-  0xde6e, 0xb7d1, 0xb7d8, 0xb7d6, 0xb7d3, 0xb7db, 0xb7d0, 0xde75,
-  0xb7d5, 0xb54e, 0xde7b, 0xde73, 0xde74, 0xe2c1, 0xbab4, 0xe2bd,
-  0xe2c3, 0xe2bf, 0xbab6, 0xe2be, 0xe2c2, 0xe2ba, 0xe2bc, 0xbab5,
-  0xe2c0, 0xe2bb, 0xbab7, 0xbab2, 0xe2c4, 0xbab3, 0xe667, 0xe664,
-  0xe670, 0xe66a, 0xe66c, 0xbcf4, 0xe666, 0xe66e, 0xe66d, 0xe66b,
-  0xe671, 0xbcf7, 0xe668, 0xe66f, 0xbcf5, 0xe663, 0xe665, 0xbcf6,
-  0xe662, 0xe672, 0xe669, 0xea4a, 0xbf51, 0xea55, 0xea53, 0xbf4b,
-  0xea49, 0xea4c, 0xea4d, 0xea48, 0xbf55, 0xbf56, 0xea47, 0xea56,
-  0xea51, 0xbf4f, 0xbf4c, 0xea50, 0xea4e, 0xbf52, 0xea52, 0xbf4d,
-  0xbf4e, 0xea4f, 0xbf50, 0xea4b, 0xea54, 0xbf53, 0xea57, 0xea58,
-  0xbf54, 0xc0e7, 0xc0ee, 0xed5c, 0xed62, 0xed60, 0xc0ea, 0xc0e9,
-  0xc0e6, 0xed5e, 0xc0ec, 0xc0eb, 0xc0e8, 0xed61, 0xed5d, 0xed5f,
-  0xc0ed, 0xc277, 0xeffb, 0xc274, 0xc275, 0xeffd, 0xc276, 0xeffa,
-  0xeff9, 0xf26c, 0xeffc, 0xf26d, 0xc37a, 0xf26b, 0xf26a, 0xf269,
-  0xc37b, 0xc46c, 0xf46a, 0xf46b, 0xf5dc, 0xf5db, 0xc4ea, 0xf5da,
-  0xf6ec, 0xf6ed, 0xf7e6, 0xf8b1, 0xf8f6, 0xf9bc, 0xc679, 0xf9c6,
-  0xa4f6, 0xaaa6, 0xaaa7, 0xacb8, 0xc0ef, 0xa4f7, 0xaaa8, 0xaf52,
-  0xb7dd, 0xa4f8, 0xb26e, 0xbab8, 0xc962, 0xcfb7, 0xd27d, 0xe2c5,
-  0xc0f0, 0xa4f9, 0xaaa9, 0xcfb8, 0xcfb9, 0xda66, 0xb550, 0xdea4,
-  0xb7de, 0xe2c6, 0xbcf8, 0xc37c, 0xa4fa, 0xda67, 0xa4fb, 0xa6c9,
-  0xca42, 0xa6c8, 0xa865, 0xa864, 0xa863, 0xcb60, 0xaaaa, 0xaaab,
-  0xcd5b, 0xcfba, 0xcfbd, 0xacba, 0xcfbb, 0xacb9, 0xcfbc, 0xacbb,
-  0xd2a2, 0xd2a1, 0xd27e, 0xaf53, 0xd65d, 0xd65e, 0xb26f, 0xd65c,
-  0xd65f, 0xb552, 0xb270, 0xb551, 0xda6b, 0xda6a, 0xda68, 0xda69,
-  0xda6c, 0xdea6, 0xdea5, 0xdea9, 0xdea8, 0xdea7, 0xbab9, 0xe2c9,
-  0xe2c8, 0xbaba, 0xe2c7, 0xe673, 0xe674, 0xbcf9, 0xea59, 0xea5a,
-  0xf272, 0xc37d, 0xf271, 0xf270, 0xf26e, 0xf26f, 0xc4eb, 0xf46c,
-  0xf6ee, 0xf8f7, 0xa4fc, 0xc9a5, 0xa5c7, 0xc9a6, 0xca43, 0xca44,
-  0xcb66, 0xcb62, 0xcb61, 0xaaac, 0xcb65, 0xa867, 0xcb63, 0xa866,
-  0xcb67, 0xcb64, 0xcd5f, 0xcfbe, 0xcd5d, 0xcd64, 0xaaad, 0xaab0,
-  0xcd65, 0xcd61, 0xcd62, 0xcd5c, 0xaaaf, 0xcd5e, 0xaaae, 0xcd63,
-  0xcd60, 0xcfc2, 0xacbd, 0xacbe, 0xcfc5, 0xcfbf, 0xcfc4, 0xcfc0,
-  0xacbc, 0xcfc3, 0xcfc1, 0xd2a8, 0xd2a5, 0xd2a7, 0xaf58, 0xaf57,
-  0xaf55, 0xd2a4, 0xd2a9, 0xaf54, 0xaf56, 0xd2a6, 0xd667, 0xd2a3,
-  0xd2aa, 0xd662, 0xd666, 0xd665, 0xda6e, 0xda79, 0xd668, 0xd663,
-  0xda6d, 0xb274, 0xb273, 0xd661, 0xd664, 0xb275, 0xb272, 0xb271,
-  0xd660, 0xd669, 0xda70, 0xda77, 0xb554, 0xda76, 0xda73, 0xb556,
-  0xda75, 0xda6f, 0xda71, 0xda74, 0xda72, 0xb555, 0xda78, 0xb553,
-  0xb7df, 0xdead, 0xdeac, 0xdeaa, 0xb7e2, 0xb7e1, 0xdeae, 0xdeab,
-  0xe2ca, 0xbabb, 0xb7e0, 0xdeb0, 0xdeaf, 0xe2cd, 0xe2cb, 0xbcfa,
-  0xbabc, 0xe2cc, 0xe676, 0xbcfb, 0xe675, 0xe67e, 0xe67d, 0xe67b,
-  0xe67a, 0xe677, 0xe678, 0xe679, 0xe67c, 0xe6a1, 0xea5f, 0xea5c,
-  0xea5d, 0xbf57, 0xea5b, 0xea61, 0xea60, 0xea5e, 0xed64, 0xed65,
-  0xc0f1, 0xc0f2, 0xed63, 0xc279, 0xeffe, 0xc278, 0xc37e, 0xc3a1,
-  0xc46d, 0xf46e, 0xf46d, 0xf5dd, 0xf6ef, 0xc57a, 0xf7e8, 0xf7e7,
-  0xf7e9, 0xa5c8, 0xcfc6, 0xaf59, 0xb276, 0xd66a, 0xa5c9, 0xc9a7,
-  0xa4fd, 0xca45, 0xcb6c, 0xcb6a, 0xcb6b, 0xcb68, 0xa868, 0xcb69,
-  0xcd6d, 0xaab3, 0xcd6b, 0xcd67, 0xcd6a, 0xcd66, 0xaab5, 0xcd69,
-  0xaab2, 0xaab1, 0xaab4, 0xcd6c, 0xcd68, 0xacc2, 0xacc5, 0xcfce,
-  0xcfcd, 0xcfcc, 0xacbf, 0xcfd5, 0xcfcb, 0xacc1, 0xd2af, 0xcfd2,
-  0xcfd0, 0xacc4, 0xcfc8, 0xcfd3, 0xcfca, 0xcfd4, 0xcfd1, 0xcfc9,
-  0xacc0, 0xcfd6, 0xcfc7, 0xacc3, 0xd2b4, 0xd2ab, 0xd2b6, 0xd2ae,
-  0xd2b9, 0xd2ba, 0xd2ac, 0xd2b8, 0xd2b5, 0xd2b3, 0xd2b7, 0xaf5f,
-  0xaf5d, 0xd2b1, 0xd2ad, 0xd2b0, 0xd2bb, 0xd2b2, 0xaf5e, 0xcfcf,
-  0xaf5a, 0xaf5c, 0xd678, 0xd66d, 0xd66b, 0xd66c, 0xd673, 0xd674,
-  0xd670, 0xb27b, 0xd675, 0xd672, 0xd66f, 0xb279, 0xd66e, 0xb277,
-  0xb27a, 0xd671, 0xd679, 0xaf5b, 0xb278, 0xd677, 0xd676, 0xb27c,
-  0xda7e, 0xdaa1, 0xb560, 0xdaa7, 0xdaa9, 0xdaa2, 0xb55a, 0xdaa6,
-  0xdaa5, 0xb55b, 0xb561, 0xb562, 0xdaa8, 0xb558, 0xda7d, 0xda7b,
-  0xdaa3, 0xda7a, 0xb55f, 0xda7c, 0xdaa4, 0xdaaa, 0xb559, 0xb55e,
-  0xb55c, 0xb55d, 0xb557, 0xb7e9, 0xdeb7, 0xb7e8, 0xdebb, 0xdeb1,
-  0xdebc, 0xdeb2, 0xdeb3, 0xdebd, 0xdeba, 0xdeb8, 0xdeb9, 0xdeb5,
-  0xdeb4, 0xdebe, 0xb7e5, 0xdeb6, 0xb7ea, 0xb7e4, 0xb7eb, 0xb7ec,
-  0xb7e7, 0xb7e6, 0xe2ce, 0xbabe, 0xbabd, 0xe2d3, 0xbcfc, 0xbabf,
-  0xbac1, 0xe2d4, 0xb7e3, 0xbac0, 0xe2d0, 0xe2d2, 0xe2cf, 0xe2d1,
-  0xe6ab, 0xe6aa, 0xe6a7, 0xbd40, 0xea62, 0xbd41, 0xe6a6, 0xbcfe,
-  0xe6a8, 0xe6a5, 0xe6a2, 0xe6a9, 0xe6a3, 0xe6a4, 0xbcfd, 0xed69,
-  0xea66, 0xea65, 0xea67, 0xed66, 0xbf5a, 0xea63, 0xbf58, 0xbf5c,
-  0xbf5b, 0xea64, 0xea68, 0xbf59, 0xed6d, 0xc0f5, 0xc27a, 0xc0f6,
-  0xc0f3, 0xed6a, 0xed68, 0xed6b, 0xed6e, 0xc0f4, 0xed6c, 0xed67,
-  0xf042, 0xf045, 0xf275, 0xf040, 0xf46f, 0xf046, 0xc3a2, 0xf044,
-  0xc27b, 0xf041, 0xf043, 0xf047, 0xf276, 0xf274, 0xc3a3, 0xf273,
-  0xc46e, 0xc4ed, 0xf6f1, 0xc4ec, 0xf6f3, 0xf6f0, 0xf6f2, 0xc5d0,
-  0xf8b2, 0xa5ca, 0xcd6e, 0xd2bc, 0xd2bd, 0xb27d, 0xdebf, 0xbf5d,
-  0xc3a4, 0xc57b, 0xf8b3, 0xa5cb, 0xcd6f, 0xa260, 0xcfd7, 0xcfd8,
-  0xd2be, 0xd2bf, 0xb27e, 0xb2a1, 0xdaab, 0xdec2, 0xdec1, 0xdec0,
-  0xe2d5, 0xe2d6, 0xe2d7, 0xbac2, 0xe6ad, 0xe6ac, 0xea69, 0xbf5e,
-  0xbf5f, 0xed72, 0xed6f, 0xed70, 0xed71, 0xf049, 0xf048, 0xc27c,
-  0xf277, 0xf5de, 0xa5cc, 0xacc6, 0xb2a2, 0xdec3, 0xa5cd, 0xd2c0,
-  0xb2a3, 0xb563, 0xb564, 0xa5ce, 0xa5cf, 0xca46, 0xa86a, 0xa869,
-  0xacc7, 0xcfd9, 0xdaac, 0xa5d0, 0xa5d1, 0xa5d2, 0xa5d3, 0xa86b,
-  0xa86c, 0xcb6e, 0xcb6d, 0xaab6, 0xcd72, 0xcd70, 0xcd71, 0xcfda,
-  0xcfdb, 0xaccb, 0xacc9, 0xacca, 0xacc8, 0xaf60, 0xaf64, 0xaf63,
-  0xd2c1, 0xaf62, 0xaf61, 0xd2c2, 0xb2a6, 0xd67b, 0xd67a, 0xb2a4,
-  0xb2a5, 0xb566, 0xb565, 0xdaae, 0xdaad, 0xb2a7, 0xb7ed, 0xdec5,
-  0xb7ee, 0xdec4, 0xe2d8, 0xe6ae, 0xbd42, 0xea6a, 0xed73, 0xc3a6,
-  0xc3a5, 0xc57c, 0xa5d4, 0xcd73, 0xb2a8, 0xe2d9, 0xbac3, 0xcb6f,
-  0xcb70, 0xcd74, 0xaab8, 0xaab9, 0xaab7, 0xaccf, 0xacd0, 0xaccd,
-  0xacce, 0xcfdc, 0xcfdd, 0xaccc, 0xd2c3, 0xaf68, 0xaf69, 0xb2ab,
-  0xd2c9, 0xaf6e, 0xaf6c, 0xd2ca, 0xd2c5, 0xaf6b, 0xaf6a, 0xaf65,
-  0xd2c8, 0xd2c7, 0xd2c4, 0xaf6d, 0xd2c6, 0xaf66, 0xaf67, 0xb2ac,
-  0xd6a1, 0xd6a2, 0xb2ad, 0xd67c, 0xd67e, 0xd6a4, 0xd6a3, 0xd67d,
-  0xb2a9, 0xb2aa, 0xdab6, 0xb56b, 0xb56a, 0xdab0, 0xb568, 0xdab3,
-  0xb56c, 0xdab4, 0xb56d, 0xdab1, 0xb567, 0xb569, 0xdab5, 0xdab2,
-  0xdaaf, 0xded2, 0xdec7, 0xb7f0, 0xb7f3, 0xb7f2, 0xb7f7, 0xb7f6,
-  0xded3, 0xded1, 0xdeca, 0xdece, 0xdecd, 0xb7f4, 0xded0, 0xdecc,
-  0xded4, 0xdecb, 0xb7f5, 0xb7ef, 0xb7f1, 0xdec9, 0xe2db, 0xbac7,
-  0xe2df, 0xbac6, 0xe2dc, 0xbac5, 0xdec8, 0xdecf, 0xe2de, 0xbac8,
-  0xe2e0, 0xe2dd, 0xe2da, 0xe6b1, 0xe6b5, 0xe6b7, 0xe6b3, 0xe6b2,
-  0xe6b0, 0xbd45, 0xbd43, 0xbd48, 0xbd49, 0xe6b4, 0xbd46, 0xe6af,
-  0xbd47, 0xbac4, 0xe6b6, 0xbd44, 0xea6c, 0xea6b, 0xea73, 0xea6d,
-  0xea72, 0xea6f, 0xbf60, 0xea71, 0xbf61, 0xbf62, 0xea70, 0xea6e,
-  0xc0f8, 0xed74, 0xc0f7, 0xed77, 0xed75, 0xed76, 0xc0f9, 0xf04d,
-  0xc2a1, 0xf04e, 0xc27d, 0xf04f, 0xc27e, 0xf04c, 0xf050, 0xf04a,
-  0xc3a7, 0xf278, 0xc3a8, 0xc46f, 0xf04b, 0xc470, 0xc4ee, 0xf5df,
-  0xc57e, 0xf6f4, 0xc57d, 0xf7ea, 0xc5f5, 0xc5f6, 0xf9cc, 0xacd1,
-  0xcfde, 0xb56e, 0xb56f, 0xa5d5, 0xa6ca, 0xca47, 0xcb71, 0xa86d,
-  0xaaba, 0xacd2, 0xacd3, 0xacd4, 0xd6a6, 0xd2cb, 0xaf6f, 0xb2ae,
-  0xd6a5, 0xdab8, 0xb571, 0xdab7, 0xb570, 0xded5, 0xbd4a, 0xe6bb,
-  0xe6b8, 0xe6b9, 0xe6ba, 0xed78, 0xf051, 0xf471, 0xf470, 0xf6f5,
-  0xa5d6, 0xcd75, 0xaf70, 0xb572, 0xded6, 0xe2e1, 0xbd4b, 0xea74,
-  0xf052, 0xf472, 0xa5d7, 0xaabb, 0xacd7, 0xcfdf, 0xacd8, 0xacd6,
-  0xacd5, 0xd2cc, 0xaf71, 0xaf72, 0xaf73, 0xb2b0, 0xd6a7, 0xb2af,
-  0xdab9, 0xb2b1, 0xb573, 0xded7, 0xb7f8, 0xb7f9, 0xbac9, 0xbaca,
-  0xbd4c, 0xbf64, 0xea75, 0xbf63, 0xed79, 0xc0fa, 0xf053, 0xf473,
-  0xa5d8, 0xa86e, 0xcd78, 0xcd77, 0xaabc, 0xcd76, 0xaabd, 0xcd79,
-  0xcfe5, 0xacdb, 0xacda, 0xcfe7, 0xcfe6, 0xacdf, 0xacde, 0xacd9,
-  0xcfe1, 0xcfe2, 0xcfe3, 0xace0, 0xcfe0, 0xacdc, 0xcfe4, 0xacdd,
-  0xd2cf, 0xd2d3, 0xd2d1, 0xd2d0, 0xd2d4, 0xd2d5, 0xd2d6, 0xd2ce,
-  0xd2cd, 0xaf75, 0xaf76, 0xd2d7, 0xd2d2, 0xd6b0, 0xd2d8, 0xaf77,
-  0xaf74, 0xd6aa, 0xd6a9, 0xd6ab, 0xd6ac, 0xd6ae, 0xd6ad, 0xd6b2,
-  0xb2b5, 0xb2b2, 0xb2b6, 0xd6a8, 0xb2b7, 0xd6b1, 0xb2b4, 0xd6af,
-  0xb2b3, 0xdabc, 0xdabe, 0xdaba, 0xdabb, 0xdabf, 0xdac1, 0xdac2,
-  0xdabd, 0xdac0, 0xb574, 0xdedb, 0xdee0, 0xded8, 0xdedc, 0xdee1,
-  0xdedd, 0xb7fa, 0xb843, 0xb7fd, 0xded9, 0xdeda, 0xbace, 0xb846,
-  0xb7fe, 0xb844, 0xb7fc, 0xdedf, 0xb845, 0xdede, 0xb841, 0xb7fb,
-  0xb842, 0xdee2, 0xe2e6, 0xe2e8, 0xb840, 0xe2e3, 0xbacc, 0xe2e9,
-  0xbacd, 0xe2e7, 0xe2e2, 0xe2e5, 0xe2ea, 0xbacb, 0xe2e4, 0xbd4e,
-  0xe6bf, 0xe6be, 0xbd51, 0xbd4f, 0xe6bc, 0xbd4d, 0xe6bd, 0xbd50,
-  0xea7d, 0xeaa1, 0xea7e, 0xea76, 0xea7a, 0xea79, 0xea77, 0xbf66,
-  0xbf67, 0xbf65, 0xea78, 0xea7b, 0xea7c, 0xbf68, 0xc140, 0xeda3,
-  0xc0fc, 0xed7b, 0xc0fe, 0xc141, 0xc0fd, 0xeda2, 0xed7c, 0xc0fb,
-  0xeda1, 0xed7a, 0xed7e, 0xed7d, 0xf055, 0xc2a4, 0xc2a5, 0xc2a2,
-  0xc2a3, 0xf054, 0xf27b, 0xc3a9, 0xf279, 0xf27a, 0xf474, 0xf477,
-  0xf475, 0xf476, 0xf5e0, 0xc4ef, 0xf7eb, 0xf8b4, 0xc5f7, 0xf8f8,
-  0xf8f9, 0xc666, 0xa5d9, 0xace1, 0xdac3, 0xdee3, 0xa5da, 0xa86f,
-  0xaabe, 0xcfe8, 0xcfe9, 0xaf78, 0xdac4, 0xb575, 0xb847, 0xc142,
-  0xeda4, 0xf27c, 0xf478, 0xa5db, 0xcda1, 0xcd7a, 0xcd7c, 0xcd7e,
-  0xcd7d, 0xcd7b, 0xaabf, 0xace2, 0xcff2, 0xcfed, 0xcfea, 0xcff1,
-  0xace4, 0xace5, 0xcff0, 0xcfef, 0xcfee, 0xcfeb, 0xcfec, 0xcff3,
-  0xace3, 0xaf7c, 0xafa4, 0xafa3, 0xd2e1, 0xd2db, 0xd2d9, 0xafa1,
-  0xd6b9, 0xaf7a, 0xd2de, 0xd2e2, 0xd2e4, 0xd2e0, 0xd2da, 0xafa2,
-  0xd2df, 0xd2dd, 0xaf79, 0xd2e5, 0xafa5, 0xd2e3, 0xaf7d, 0xd2dc,
-  0xaf7e, 0xaf7b, 0xb2b9, 0xd6ba, 0xd6b3, 0xd6b5, 0xd6b7, 0xd6b8,
-  0xd6b6, 0xb2ba, 0xd6bb, 0xd6b4, 0xdac8, 0xb576, 0xdad0, 0xdac5,
-  0xdad1, 0xdac6, 0xdac7, 0xdacf, 0xdace, 0xdacb, 0xb2b8, 0xb577,
-  0xdac9, 0xdacc, 0xb578, 0xdacd, 0xdaca, 0xdeee, 0xdef2, 0xb84e,
-  0xe2f0, 0xb851, 0xdef0, 0xdeed, 0xdee8, 0xdeea, 0xdeeb, 0xdee4,
-  0xb84d, 0xb84c, 0xb848, 0xdee7, 0xb84f, 0xb850, 0xdee6, 0xdee9,
-  0xdef1, 0xb84a, 0xb84b, 0xdeef, 0xdee5, 0xe2f2, 0xbad0, 0xe2f4,
-  0xdeec, 0xe2f6, 0xbad4, 0xe2f7, 0xe2f3, 0xbad1, 0xe2ef, 0xbad3,
-  0xe2ec, 0xe2f1, 0xe2f5, 0xe2ee, 0xb849, 0xe2eb, 0xbad2, 0xe2ed,
-  0xbd54, 0xe6c1, 0xbd58, 0xbd56, 0xbacf, 0xe6c8, 0xe6c9, 0xbd53,
-  0xe6c7, 0xe6ca, 0xbd55, 0xbd52, 0xe6c3, 0xe6c0, 0xe6c5, 0xe6c2,
-  0xbd59, 0xe6c4, 0xe6c6, 0xbd57, 0xbf6a, 0xeaa8, 0xeaa2, 0xeaa6,
-  0xeaac, 0xeaad, 0xeaa9, 0xeaaa, 0xeaa7, 0xeaa4, 0xbf6c, 0xbf69,
-  0xeaa3, 0xeaa5, 0xbf6b, 0xeaab, 0xc146, 0xedaa, 0xeda5, 0xc145,
-  0xc143, 0xedac, 0xc144, 0xeda8, 0xeda9, 0xeda6, 0xedad, 0xf056,
-  0xc147, 0xeda7, 0xedae, 0xedab, 0xf05a, 0xf057, 0xc2a6, 0xf05b,
-  0xf05d, 0xf05c, 0xf058, 0xf059, 0xf2a3, 0xc3aa, 0xf27e, 0xf2a2,
-  0xf27d, 0xf2a4, 0xf2a1, 0xf47a, 0xf47d, 0xf479, 0xc471, 0xf47b,
-  0xf47c, 0xf47e, 0xc472, 0xc474, 0xc473, 0xf5e1, 0xf5e3, 0xf5e2,
-  0xf6f6, 0xf8b5, 0xf8fa, 0xa5dc, 0xcb72, 0xaac0, 0xcda3, 0xaac1,
-  0xaac2, 0xcda2, 0xcff8, 0xcff7, 0xace6, 0xace9, 0xace8, 0xace7,
-  0xcff4, 0xcff6, 0xcff5, 0xd2e8, 0xafa7, 0xd2ec, 0xd2eb, 0xd2ea,
-  0xd2e6, 0xafa6, 0xafaa, 0xafad, 0xafae, 0xd2e7, 0xd2e9, 0xafac,
-  0xafab, 0xafa9, 0xafa8, 0xd6c2, 0xd6c0, 0xd6bc, 0xb2bb, 0xd6bd,
-  0xb2bc, 0xd6be, 0xd6bf, 0xd6c1, 0xb2bd, 0xdad5, 0xdad4, 0xdad3,
-  0xdad2, 0xdef6, 0xb852, 0xdef3, 0xdef5, 0xb853, 0xb854, 0xdef4,
-  0xe341, 0xe2f9, 0xe2fa, 0xbad7, 0xbad5, 0xbad6, 0xe343, 0xe342,
-  0xe2fe, 0xe2fd, 0xe2fc, 0xe2fb, 0xe340, 0xe2f8, 0xe6cb, 0xe6d0,
-  0xe6ce, 0xe6cd, 0xe6cc, 0xe6cf, 0xeaae, 0xbf6d, 0xc148, 0xedb0,
-  0xc149, 0xedaf, 0xf05f, 0xf05e, 0xc2a7, 0xf2a5, 0xc3ab, 0xf4a1,
-  0xc5a1, 0xf6f7, 0xf8b7, 0xf8b6, 0xc9a8, 0xacea, 0xaceb, 0xd6c3,
-  0xb856, 0xa5dd, 0xa872, 0xa871, 0xa870, 0xcda4, 0xaac4, 0xaac3,
-  0xacee, 0xcffa, 0xcffd, 0xcffb, 0xacec, 0xaced, 0xcff9, 0xcffc,
-  0xafb5, 0xd2f3, 0xd2f5, 0xd2f4, 0xafb2, 0xd2ef, 0xafb0, 0xafaf,
-  0xafb3, 0xafb1, 0xafb4, 0xd2f2, 0xd2ed, 0xd2ee, 0xd2f1, 0xd2f0,
-  0xd6c6, 0xd6c7, 0xd6c5, 0xd6c4, 0xb2be, 0xb57d, 0xdad6, 0xdad8,
-  0xdada, 0xb57c, 0xb57a, 0xdad7, 0xb57b, 0xdad9, 0xb579, 0xdf41,
-  0xdef7, 0xdefa, 0xdefe, 0xb85a, 0xdefc, 0xdefb, 0xdef8, 0xdef9,
-  0xb858, 0xdf40, 0xb857, 0xb85c, 0xb85b, 0xb859, 0xdefd, 0xe349,
-  0xe348, 0xe344, 0xbad8, 0xe347, 0xe346, 0xbad9, 0xbd5e, 0xe6d2,
-  0xbd5f, 0xbd5b, 0xbd5d, 0xbd5a, 0xbd5c, 0xeaaf, 0xbf70, 0xeab1,
-  0xeab0, 0xe345, 0xbf72, 0xbf71, 0xbf6e, 0xbf6f, 0xedb5, 0xedb3,
-  0xc14a, 0xedb4, 0xedb6, 0xedb2, 0xedb1, 0xf060, 0xc2aa, 0xc2a8,
-  0xc2a9, 0xf2a6, 0xf2a7, 0xc3ad, 0xc3ac, 0xf4a3, 0xf4a4, 0xf4a2,
-  0xf6f8, 0xf6f9, 0xa5de, 0xca48, 0xa873, 0xcda5, 0xaac6, 0xaac5,
-  0xcda6, 0xd040, 0xacef, 0xcffe, 0xacf0, 0xafb6, 0xd2f8, 0xd2f6,
-  0xd2fc, 0xafb7, 0xd2f7, 0xd2fb, 0xd2f9, 0xd2fa, 0xd6c8, 0xd6ca,
-  0xb2bf, 0xd6c9, 0xb2c0, 0xb5a2, 0xb5a1, 0xb57e, 0xdadb, 0xdf44,
-  0xb85d, 0xb85e, 0xdf43, 0xdf42, 0xe34a, 0xbadb, 0xbada, 0xe34b,
-  0xe34c, 0xbd61, 0xbd60, 0xeab5, 0xe6d3, 0xe6d5, 0xe6d4, 0xeab4,
-  0xeab2, 0xeab6, 0xeab3, 0xbf73, 0xedb7, 0xc14b, 0xedb8, 0xedb9,
-  0xc2ab, 0xc2ac, 0xc475, 0xc5d1, 0xa5df, 0xd041, 0xd2fd, 0xafb8,
-  0xb3ba, 0xb3b9, 0xb5a4, 0xdadd, 0xb5a3, 0xdadc, 0xdf45, 0xbadc,
-  0xe34d, 0xbadd, 0xc476, 0xf4a5, 0xa6cb, 0xaac7, 0xcda7, 0xacf2,
-  0xacf1, 0xd042, 0xd043, 0xd340, 0xd342, 0xafb9, 0xd344, 0xd347,
-  0xd345, 0xd346, 0xd343, 0xd2fe, 0xafba, 0xd348, 0xd341, 0xd6d3,
-  0xb2c6, 0xd6dc, 0xb2c3, 0xd6d5, 0xb2c7, 0xb2c1, 0xd6d0, 0xd6dd,
-  0xd6d1, 0xd6ce, 0xb2c5, 0xb2c2, 0xd6d4, 0xd6d7, 0xb2c4, 0xd6d8,
-  0xb2c8, 0xd6d9, 0xd6cf, 0xd6d6, 0xd6da, 0xd6d2, 0xd6cd, 0xd6cb,
-  0xd6db, 0xdadf, 0xdae4, 0xdae0, 0xdae6, 0xb5a7, 0xd6cc, 0xdae1,
-  0xb5a5, 0xdade, 0xb5ac, 0xdae2, 0xb5ab, 0xdae3, 0xb5ad, 0xb5a8,
-  0xb5ae, 0xb5a9, 0xb5aa, 0xb5a6, 0xdae5, 0xb861, 0xdf50, 0xdf53,
-  0xdf47, 0xdf4c, 0xdf46, 0xb863, 0xdf4a, 0xdf48, 0xb862, 0xdf4f,
-  0xdf4e, 0xdf4b, 0xdf4d, 0xdf49, 0xbae1, 0xdf52, 0xb85f, 0xdf51,
-  0xe35d, 0xbae8, 0xe358, 0xbae7, 0xe34e, 0xe350, 0xbae0, 0xe355,
-  0xe354, 0xe357, 0xbae5, 0xe352, 0xe351, 0xbae4, 0xbadf, 0xe353,
-  0xbae2, 0xe359, 0xe35b, 0xe356, 0xe34f, 0xbae3, 0xbd69, 0xbade,
-  0xe35c, 0xe6d9, 0xbd62, 0xe6db, 0xbd63, 0xbd65, 0xe6de, 0xe6d6,
-  0xbae6, 0xe6dc, 0xe6d8, 0xb860, 0xbd68, 0xbd64, 0xbd66, 0xbd67,
-  0xbf76, 0xe6dd, 0xe6d7, 0xbd6a, 0xe6da, 0xeac0, 0xeabb, 0xeac5,
-  0xbf74, 0xeabd, 0xbf78, 0xeac3, 0xeaba, 0xeab7, 0xeac6, 0xc151,
-  0xbf79, 0xeac2, 0xeab8, 0xbf77, 0xeabc, 0xbf7b, 0xeab9, 0xeabe,
-  0xbf7a, 0xeac1, 0xeac4, 0xedcb, 0xedcc, 0xedbc, 0xedc3, 0xedc1,
-  0xc14f, 0xedc8, 0xeabf, 0xedbf, 0xedc9, 0xc14e, 0xedbe, 0xedbd,
-  0xedc7, 0xedc4, 0xedc6, 0xedba, 0xedca, 0xc14c, 0xedc5, 0xedce,
-  0xedc2, 0xc150, 0xc14d, 0xedc0, 0xedbb, 0xedcd, 0xbf75, 0xf063,
-  0xf061, 0xf067, 0xc2b0, 0xf065, 0xf064, 0xc2b2, 0xf06a, 0xc2b1,
-  0xf06b, 0xf068, 0xc2ae, 0xf069, 0xf062, 0xc2af, 0xc2ad, 0xf2ab,
-  0xf066, 0xf06c, 0xf2a8, 0xc3b2, 0xc3b0, 0xf2aa, 0xf2ac, 0xf2a9,
-  0xc3b1, 0xc3ae, 0xc3af, 0xc3b3, 0xc478, 0xf4aa, 0xf4a9, 0xf4a7,
-  0xf4a6, 0xf4a8, 0xc477, 0xc479, 0xc4f0, 0xf5e5, 0xf5e4, 0xf6fa,
-  0xf6fc, 0xf6fe, 0xf6fd, 0xf6fb, 0xc5a3, 0xc5a2, 0xc5d3, 0xc5d2,
-  0xc5d4, 0xf7ed, 0xf7ec, 0xf8fb, 0xf8b8, 0xf8fc, 0xc658, 0xc659,
-  0xf96d, 0xc67e, 0xa6cc, 0xcda8, 0xd045, 0xd046, 0xd044, 0xacf3,
-  0xd047, 0xd048, 0xd049, 0xd349, 0xd34f, 0xd34d, 0xafbb, 0xd34b,
-  0xd34c, 0xd34e, 0xd34a, 0xb2c9, 0xd6de, 0xb2cb, 0xd6e0, 0xb2ca,
-  0xd6df, 0xdae8, 0xb5af, 0xdaea, 0xdae7, 0xd6e1, 0xb5b0, 0xdae9,
-  0xdf56, 0xb864, 0xdf54, 0xb865, 0xdf55, 0xb866, 0xbae9, 0xe361,
-  0xe35e, 0xe360, 0xbaea, 0xbaeb, 0xe35f, 0xe6df, 0xe6e0, 0xbd6b,
-  0xe6e2, 0xe6e1, 0xa261, 0xeaca, 0xeacb, 0xeac7, 0xeac8, 0xbf7c,
-  0xbf7d, 0xeac9, 0xc157, 0xc153, 0xc158, 0xc154, 0xc156, 0xc152,
-  0xc155, 0xc2b3, 0xedcf, 0xf2ae, 0xf2ad, 0xf4ab, 0xc47a, 0xc47b,
-  0xf741, 0xf5e6, 0xf740, 0xf8fd, 0xf9a4, 0xa6cd, 0xa874, 0xcda9,
-  0xaac8, 0xacf6, 0xd04c, 0xacf4, 0xd04a, 0xacf9, 0xacf5, 0xacfa,
-  0xacf8, 0xd04b, 0xacf7, 0xafbf, 0xafbe, 0xd35a, 0xafc7, 0xd353,
-  0xd359, 0xafc3, 0xd352, 0xd358, 0xd356, 0xafc2, 0xafc4, 0xd355,
-  0xafbd, 0xd354, 0xafc8, 0xafc5, 0xafc9, 0xafc6, 0xd351, 0xd350,
-  0xd357, 0xafc0, 0xafbc, 0xafc1, 0xd6f0, 0xd6e9, 0xb5b5, 0xd6e8,
-  0xb2cf, 0xb2d6, 0xb2d3, 0xb2d9, 0xb2d8, 0xb2d4, 0xd6e2, 0xd6e5,
-  0xd6e4, 0xb2d0, 0xd6e6, 0xd6ef, 0xb2d1, 0xd6e3, 0xd6ec, 0xd6ed,
-  0xb2d2, 0xd6ea, 0xb2d7, 0xb2cd, 0xb2d5, 0xd6e7, 0xb2cc, 0xd6eb,
-  0xd6ee, 0xdafb, 0xdaf2, 0xb5b2, 0xdaf9, 0xdaf6, 0xdaee, 0xdaf7,
-  0xb5b4, 0xdaef, 0xdaeb, 0xb86c, 0xdaf4, 0xb5b1, 0xdafa, 0xb5b8,
-  0xb5ba, 0xdaed, 0xb5b9, 0xdaf0, 0xb5b3, 0xdaf8, 0xdaf1, 0xdaf5,
-  0xdaf3, 0xb5b6, 0xdaec, 0xb5bb, 0xb2ce, 0xb5b7, 0xb5bc, 0xb868,
-  0xdf5d, 0xdf5f, 0xdf61, 0xdf65, 0xdf5b, 0xdf59, 0xb86a, 0xdf60,
-  0xdf64, 0xdf5c, 0xdf58, 0xdf57, 0xdf62, 0xdf5a, 0xdf5e, 0xb86b,
-  0xb869, 0xdf66, 0xb867, 0xdf63, 0xe372, 0xbaee, 0xe36a, 0xbd78,
-  0xe374, 0xbaf1, 0xe378, 0xbaf7, 0xe365, 0xe375, 0xe362, 0xe377,
-  0xe366, 0xbafe, 0xbafb, 0xe376, 0xe370, 0xbaed, 0xbaf5, 0xbaf4,
-  0xbaf3, 0xbaf9, 0xe363, 0xbafa, 0xe371, 0xbaf6, 0xbaec, 0xe373,
-  0xbaef, 0xbaf0, 0xbaf8, 0xe368, 0xe367, 0xe364, 0xe36c, 0xe369,
-  0xe36d, 0xbafd, 0xe379, 0xbaf2, 0xe36e, 0xe36f, 0xe36b, 0xbafc,
-  0xe6e7, 0xbd70, 0xbd79, 0xbd75, 0xe6e4, 0xbd72, 0xbd76, 0xe6f0,
-  0xbd6c, 0xe6e8, 0xbd74, 0xe6eb, 0xe6e6, 0xbd73, 0xbd77, 0xe6e5,
-  0xbd71, 0xe6ef, 0xbd6e, 0xe6ee, 0xe6ed, 0xbd7a, 0xe572, 0xbd6d,
-  0xe6ec, 0xe6e3, 0xbd7b, 0xe6ea, 0xbd6f, 0xe6e9, 0xbfa2, 0xbfa7,
-  0xbf7e, 0xead8, 0xeacf, 0xeadb, 0xead3, 0xead9, 0xbfa8, 0xbfa1,
-  0xeacc, 0xead2, 0xeadc, 0xead5, 0xeada, 0xeace, 0xead6, 0xbfa3,
-  0xead4, 0xbfa6, 0xbfa5, 0xead0, 0xead1, 0xeacd, 0xead7, 0xbfa4,
-  0xeade, 0xeadd, 0xedda, 0xedd6, 0xc15f, 0xedd0, 0xc159, 0xc169,
-  0xeddc, 0xc161, 0xc15d, 0xedd3, 0xc164, 0xc167, 0xedde, 0xc15c,
-  0xedd5, 0xc165, 0xede0, 0xeddd, 0xedd1, 0xc160, 0xc15a, 0xc168,
-  0xedd8, 0xc163, 0xedd2, 0xc15e, 0xeddf, 0xc162, 0xc15b, 0xedd9,
-  0xc166, 0xedd7, 0xeddb, 0xf06e, 0xf074, 0xc2b9, 0xf077, 0xc2b4,
-  0xc2b5, 0xf06f, 0xf076, 0xf071, 0xc2ba, 0xc2b7, 0xf06d, 0xc2b6,
-  0xf073, 0xf075, 0xc2b8, 0xf072, 0xf070, 0xf2b8, 0xc3b7, 0xc3b8,
-  0xc3b4, 0xc3b5, 0xf2b4, 0xf2b2, 0xf2b6, 0xc3ba, 0xf2b7, 0xf2b0,
-  0xf2af, 0xf2b3, 0xf2b1, 0xc3b6, 0xf2b5, 0xf4ac, 0xc47e, 0xc47d,
-  0xf4ad, 0xf4af, 0xf4ae, 0xc4a1, 0xf5eb, 0xf5e8, 0xf5e9, 0xf5e7,
-  0xf5ea, 0xc4f2, 0xf5ec, 0xc4f1, 0xf742, 0xc5d5, 0xc5d7, 0xf7ee,
-  0xc5d6, 0xf8b9, 0xf940, 0xf942, 0xf8fe, 0xf941, 0xc66c, 0xa6ce,
-  0xacfb, 0xd26f, 0xafca, 0xb2da, 0xdafc, 0xdafd, 0xeadf, 0xc16a,
-  0xede1, 0xc2bb, 0xf2ba, 0xf2b9, 0xc4a2, 0xf5ed, 0xf743, 0xc5f8,
-  0xca49, 0xaac9, 0xa875, 0xd04d, 0xd360, 0xd35b, 0xd35f, 0xd35d,
-  0xafcb, 0xd35e, 0xd35c, 0xd6f1, 0xdafe, 0xdb40, 0xdf69, 0xdf6a,
-  0xb86e, 0xb86f, 0xdf68, 0xdf6b, 0xdf67, 0xb86d, 0xbb40, 0xb870,
-  0xe37a, 0xbd7c, 0xe6f1, 0xbd7d, 0xbfa9, 0xeae2, 0xeae0, 0xeae1,
-  0xede4, 0xede3, 0xede2, 0xf2bb, 0xc3b9, 0xf2bc, 0xf744, 0xc5f9,
-  0xf8ba, 0xa6cf, 0xaacb, 0xaaca, 0xd04f, 0xacfc, 0xd04e, 0xd362,
-  0xafcc, 0xd6f2, 0xd361, 0xb2dc, 0xd6f5, 0xd6f3, 0xd6f4, 0xb2db,
-  0xdb42, 0xdb43, 0xdb41, 0xb873, 0xdf6d, 0xdf6c, 0xdf6e, 0xb872,
-  0xb871, 0xe6f2, 0xe6f4, 0xbd7e, 0xe6f3, 0xeae3, 0xbfaa, 0xf079,
-  0xf078, 0xc3bb, 0xf2bd, 0xc3bd, 0xc3bc, 0xf4b0, 0xf5ee, 0xc4f3,
-  0xa6d0, 0xd050, 0xacfd, 0xd365, 0xafce, 0xd364, 0xd363, 0xafcd,
-  0xd6fb, 0xd6fd, 0xd6f6, 0xd6f7, 0xb2dd, 0xd6f8, 0xb2de, 0xd6fc,
-  0xd6f9, 0xd6fa, 0xb2df, 0xb5be, 0xb5bf, 0xdb44, 0xdf6f, 0xdf70,
-  0xe37e, 0xbb43, 0xbb41, 0xbb42, 0xe37b, 0xe37c, 0xe37d, 0xe6f9,
-  0xe6fa, 0xbda1, 0xe6f7, 0xe6f6, 0xe6f8, 0xe6f5, 0xbfad, 0xeae4,
-  0xbfab, 0xbfac, 0xede6, 0xc16b, 0xede5, 0xefa8, 0xf07a, 0xf07b,
-  0xc2bc, 0xc2bd, 0xc16c, 0xf2be, 0xf2bf, 0xf4b1, 0xc4a3, 0xa6d1,
-  0xa6d2, 0xacfe, 0xaacc, 0xafcf, 0xd051, 0xb5c0, 0xa6d3, 0xad41,
-  0xd052, 0xd053, 0xad40, 0xad42, 0xa6d4, 0xd054, 0xafd1, 0xd366,
-  0xafd3, 0xafd0, 0xafd2, 0xd741, 0xb2e0, 0xd740, 0xd6fe, 0xdf71,
-  0xe3a1, 0xbda2, 0xbfae, 0xeae6, 0xeae5, 0xede7, 0xf5ef, 0xa6d5,
-  0xcb73, 0xcdaa, 0xad43, 0xd055, 0xd368, 0xafd4, 0xd367, 0xafd5,
-  0xd743, 0xb2e2, 0xd742, 0xd744, 0xb2e1, 0xdb46, 0xdb47, 0xdb45,
-  0xb5c1, 0xb874, 0xb875, 0xbb45, 0xe3a3, 0xe3a2, 0xbb44, 0xe6fb,
-  0xe6fc, 0xeae7, 0xc170, 0xc16f, 0xc16d, 0xc16e, 0xc171, 0xf07c,
-  0xc2bf, 0xc2be, 0xf2c0, 0xf4b2, 0xc5a5, 0xc5a4, 0xa6d6, 0xd1fb,
-  0xb877, 0xb5c2, 0xb876, 0xbb46, 0xa6d7, 0xc9a9, 0xa6d8, 0xa6d9,
-  0xcdab, 0xcb76, 0xcb77, 0xa877, 0xcb74, 0xa876, 0xa879, 0xcb75,
-  0xa87b, 0xa87a, 0xcb78, 0xa878, 0xaad1, 0xaacf, 0xcdad, 0xaace,
-  0xaad3, 0xaad5, 0xaad2, 0xcdb0, 0xcdac, 0xaad6, 0xaad0, 0xa87c,
-  0xaad4, 0xcdaf, 0xcdae, 0xaacd, 0xd05b, 0xad47, 0xad48, 0xd05d,
-  0xd057, 0xd05a, 0xd063, 0xd061, 0xad49, 0xd067, 0xad4c, 0xd064,
-  0xd05c, 0xd059, 0xdb49, 0xd062, 0xad44, 0xd065, 0xd056, 0xd05f,
-  0xad46, 0xad4b, 0xd060, 0xad4f, 0xad4d, 0xd058, 0xad4a, 0xd05e,
-  0xad4e, 0xad45, 0xd066, 0xafda, 0xafe3, 0xafd8, 0xafd6, 0xd36a,
-  0xafde, 0xafdb, 0xd36c, 0xafdd, 0xd36b, 0xd369, 0xd36e, 0xafe2,
-  0xafe0, 0xdb48, 0xd36f, 0xd36d, 0xafd7, 0xafd9, 0xafdc, 0xafdf,
-  0xafe1, 0xd74e, 0xb2e4, 0xd745, 0xd747, 0xd748, 0xd750, 0xd74c,
-  0xd74a, 0xd74d, 0xd751, 0xb2e5, 0xb2e9, 0xd746, 0xd74f, 0xb2e7,
-  0xb2e6, 0xd74b, 0xd749, 0xb2e3, 0xb2e8, 0xb5c8, 0xdb51, 0xdb4f,
-  0xb5ca, 0xdb4a, 0xdfa1, 0xb5c9, 0xdb4e, 0xdb4b, 0xb5c5, 0xb5cb,
-  0xdb50, 0xb5c7, 0xdb4d, 0xbb47, 0xb5c6, 0xdb4c, 0xb5cc, 0xb5c4,
-  0xb5c3, 0xdf77, 0xdf75, 0xdf7b, 0xdf73, 0xdfa2, 0xdf78, 0xdf72,
-  0xb87b, 0xb8a3, 0xdf7d, 0xdf76, 0xb87e, 0xb87c, 0xdf7e, 0xb879,
-  0xb878, 0xdf79, 0xb87d, 0xb5cd, 0xdf7c, 0xdf74, 0xb87a, 0xb8a1,
-  0xb8a2, 0xbb4c, 0xbb48, 0xbb4d, 0xe3a6, 0xe3a5, 0xe3a7, 0xbb4a,
-  0xe3a4, 0xbb4b, 0xe3aa, 0xe3a9, 0xe3a8, 0xbb49, 0xe741, 0xe744,
-  0xbda8, 0xe743, 0xbda7, 0xbda3, 0xbda4, 0xbda5, 0xe740, 0xe6fe,
-  0xbda6, 0xe742, 0xe6fd, 0xeae9, 0xeaf3, 0xbfb1, 0xbfb0, 0xeaed,
-  0xeaef, 0xeaea, 0xeaee, 0xeae8, 0xeaf1, 0xbfaf, 0xeaf0, 0xeaec,
-  0xeaf2, 0xeaeb, 0xc174, 0xede8, 0xedee, 0xc178, 0xc17a, 0xc177,
-  0xc176, 0xc175, 0xc173, 0xede9, 0xedec, 0xc172, 0xeded, 0xc179,
-  0xedeb, 0xedea, 0xc2c0, 0xc2c1, 0xf0a1, 0xf07d, 0xf07e, 0xf2c2,
-  0xf2c1, 0xc3be, 0xf4b4, 0xc4a4, 0xf4b3, 0xf5f0, 0xf745, 0xc5a6,
-  0xf943, 0xf944, 0xc5d8, 0xa6da, 0xaad7, 0xdb52, 0xbb4e, 0xc17b,
-  0xedef, 0xa6db, 0xafe5, 0xafe4, 0xdb53, 0xeaf4, 0xa6dc, 0xad50,
-  0xdb54, 0xdb55, 0xdb56, 0xbb4f, 0xbfb2, 0xa6dd, 0xaad8, 0xd068,
-  0xafe6, 0xd370, 0xb2ea, 0xdb57, 0xb8a4, 0xbb50, 0xbfb3, 0xc17c,
-  0xc2c2, 0xf4b5, 0xa6de, 0xaad9, 0xafe7, 0xd752, 0xb5ce, 0xbb51,
-  0xe3ab, 0xe745, 0xa6df, 0xb5cf, 0xdfa3, 0xbb52, 0xa6e0, 0xcdb1,
-  0xd069, 0xad51, 0xd372, 0xafea, 0xafe8, 0xafe9, 0xafeb, 0xd371,
-  0xd757, 0xd754, 0xd756, 0xb2eb, 0xb2ed, 0xb2ec, 0xd753, 0xb2ee,
-  0xd755, 0xdb58, 0xdb59, 0xdb5a, 0xdfa6, 0xdfa7, 0xdfa5, 0xdfa8,
-  0xb8a5, 0xdfa4, 0xbb53, 0xe74a, 0xe746, 0xe749, 0xe74b, 0xe748,
-  0xe747, 0xeaf5, 0xeaf6, 0xeaf7, 0xbfb4, 0xbfb5, 0xedf1, 0xedf0,
-  0xedf2, 0xf0a3, 0xf0a2, 0xf2c4, 0xf2c5, 0xf2c3, 0xc4a5, 0xf4b6,
-  0xf4b7, 0xf746, 0xf7ef, 0xf8bb, 0xa6e1, 0xa87d, 0xc17d, 0xa6e2,
-  0xd758, 0xdb5b, 0xc641, 0xca4a, 0xca4b, 0xca4d, 0xa6e3, 0xca4e,
-  0xca4c, 0xcba2, 0xcba3, 0xcb7b, 0xcba1, 0xa8a1, 0xa8a2, 0xcb7c,
-  0xcb7a, 0xcb79, 0xcb7d, 0xa87e, 0xcb7e, 0xd06a, 0xcdb6, 0xaadc,
-  0xcdb5, 0xcdb7, 0xaadb, 0xcdbc, 0xaadf, 0xcdb2, 0xcdc0, 0xcdc6,
-  0xaae6, 0xcdc3, 0xaae3, 0xcdb9, 0xcdbf, 0xcdc1, 0xcdb4, 0xaae2,
-  0xaadd, 0xcdba, 0xaae4, 0xaae7, 0xaae1, 0xaada, 0xcdbe, 0xcdb8,
-  0xcdc5, 0xaae9, 0xaae5, 0xaae0, 0xcdbd, 0xafec, 0xcdbb, 0xaade,
-  0xaae8, 0xcdb3, 0xcdc2, 0xcdc4, 0xad62, 0xad5c, 0xad64, 0xad61,
-  0xd071, 0xd074, 0xad5d, 0xd06b, 0xad56, 0xad60, 0xad63, 0xad65,
-  0xd0a2, 0xd077, 0xad55, 0xd0a1, 0xad59, 0xad57, 0xad52, 0xd06f,
-  0xd07e, 0xd073, 0xd076, 0xd0a5, 0xad66, 0xd07d, 0xad5e, 0xd078,
-  0xd0a4, 0xd075, 0xd079, 0xd07c, 0xd06d, 0xd0a3, 0xd07b, 0xd06c,
-  0xd070, 0xad5f, 0xad5a, 0xad53, 0xad58, 0xad54, 0xad67, 0xd06e,
-  0xd3a5, 0xad5b, 0xd07a, 0xce41, 0xd3a8, 0xaffa, 0xd376, 0xd3a3,
-  0xd37d, 0xd3b2, 0xd3aa, 0xd37e, 0xd3a9, 0xd378, 0xd37c, 0xd3b5,
-  0xaffd, 0xd3ad, 0xd3a4, 0xafed, 0xd3b3, 0xd374, 0xd3ac, 0xaffc,
-  0xaff7, 0xd373, 0xaff5, 0xaff4, 0xaff9, 0xd3ab, 0xaff1, 0xaff8,
-  0xd072, 0xdb5c, 0xd3a6, 0xd37a, 0xaffb, 0xd37b, 0xd3a1, 0xaffe,
-  0xd375, 0xd3af, 0xd3ae, 0xd3b6, 0xaff3, 0xaff0, 0xd3b4, 0xd3b0,
-  0xd3a7, 0xd3a2, 0xaff6, 0xaff2, 0xd377, 0xafee, 0xd3b1, 0xafef,
-  0xd379, 0xd75e, 0xd760, 0xd765, 0xd779, 0xb2fc, 0xb2f2, 0xd75d,
-  0xb2fd, 0xb2fe, 0xd768, 0xd76f, 0xd775, 0xd762, 0xd769, 0xb340,
-  0xd777, 0xd772, 0xb2fa, 0xb2f8, 0xd76e, 0xd76a, 0xd75c, 0xb2ef,
-  0xd761, 0xd759, 0xb2f7, 0xb2f9, 0xd766, 0xd763, 0xb2f4, 0xd773,
-  0xb2f1, 0xd764, 0xd77a, 0xd76c, 0xd76b, 0xb2f0, 0xb2fb, 0xb2f3,
-  0xd75a, 0xd75f, 0xd770, 0xd776, 0xb341, 0xd75b, 0xd767, 0xd76d,
-  0xb2f6, 0xd778, 0xd771, 0xd774, 0xb2f5, 0xdb6c, 0xdb60, 0xb5d7,
-  0xdb7d, 0xdba7, 0xdbaa, 0xb5d5, 0xdb68, 0xdba3, 0xdb69, 0xdb77,
-  0xb5e2, 0xdb73, 0xb5df, 0xdb74, 0xdb5d, 0xdba4, 0xb5e8, 0xdba1,
-  0xdb75, 0xdbac, 0xdb70, 0xdfc8, 0xdbaf, 0xb5e6, 0xdb6e, 0xdb7a,
-  0xb5e9, 0xb5d4, 0xdb72, 0xdbad, 0xdb6b, 0xdb64, 0xdb6f, 0xdb63,
-  0xdb61, 0xb5d0, 0xdba5, 0xdb6a, 0xdba8, 0xdba9, 0xb5d8, 0xb5dd,
-  0xb5d9, 0xb5e1, 0xdb7e, 0xb5da, 0xdb76, 0xdb66, 0xb5d2, 0xdb5e,
-  0xdba2, 0xdbab, 0xdb65, 0xb5e0, 0xdbb0, 0xdb71, 0xdb6d, 0xb5d1,
-  0xb5e5, 0xdb7c, 0xb5e7, 0xdb78, 0xb5dc, 0xb5d6, 0xb5de, 0xb5d3,
-  0xb5e4, 0xdb79, 0xdb67, 0xdb7b, 0xdb62, 0xdba6, 0xdbae, 0xdb5f,
-  0xdfc7, 0xdfdd, 0xb855, 0xdfcc, 0xdfca, 0xdfb5, 0xb8a9, 0xdfc5,
-  0xdfd9, 0xdfc1, 0xb8b1, 0xdfd8, 0xdfbf, 0xb5e3, 0xdfcf, 0xdfc0,
-  0xdfd6, 0xb8b0, 0xb8a8, 0xdfaa, 0xdfb2, 0xdfcb, 0xdfc3, 0xdfdc,
-  0xdfc6, 0xb8b6, 0xdfd7, 0xb8ad, 0xdfc9, 0xdfd1, 0xdfb6, 0xdfd0,
-  0xdfe1, 0xdfb1, 0xdfd2, 0xdfdf, 0xdfab, 0xb5db, 0xdfb9, 0xdfb8,
-  0xb8af, 0xdfbc, 0xdfbe, 0xdfcd, 0xdfde, 0xb8b2, 0xb8b3, 0xdfb0,
-  0xb8ab, 0xdfb4, 0xdfda, 0xb8b4, 0xb8ac, 0xb8ae, 0xb8b5, 0xdfe0,
-  0xdfd3, 0xdfce, 0xdfbb, 0xdfba, 0xb8aa, 0xdfac, 0xb8a7, 0xdfc4,
-  0xdfad, 0xdfc2, 0xdfb7, 0xdfdb, 0xb8a6, 0xdfb3, 0xdfaf, 0xdfd5,
-  0xdfae, 0xbb60, 0xe3d3, 0xe3c2, 0xe3ac, 0xe3ca, 0xbb58, 0xe3bb,
-  0xe3c5, 0xbb5b, 0xe3be, 0xbb59, 0xe3af, 0xe3cd, 0xe3ae, 0xe3c1,
-  0xe3ad, 0xe3bf, 0xe3c8, 0xe3c6, 0xe3ba, 0xe3b5, 0xe3b3, 0xe3b4,
-  0xe3c7, 0xe3d2, 0xe3bc, 0xbb5a, 0xe3b7, 0xe3cb, 0xbb5d, 0xe3b6,
-  0xe3b0, 0xe3c0, 0xbb61, 0xbb55, 0xbb5e, 0xe3b8, 0xe3b2, 0xbb57,
-  0xdfd4, 0xbb56, 0xe3c3, 0xbb54, 0xbb63, 0xbb5c, 0xe3c4, 0xe3b9,
-  0xe3b1, 0xe3cc, 0xe3bd, 0xbb62, 0xe3d0, 0xbb5f, 0xe3cf, 0xe3c9,
-  0xe3ce, 0xe3d1, 0xe773, 0xe774, 0xe767, 0xe766, 0xe762, 0xbdb4,
-  0xbdac, 0xe776, 0xe775, 0xdfa9, 0xe75f, 0xe763, 0xe75d, 0xe770,
-  0xe761, 0xe777, 0xe75a, 0xe758, 0xe764, 0xe76e, 0xe769, 0xbdb6,
-  0xe74f, 0xe76d, 0xbdb7, 0xdfbd, 0xe75b, 0xe752, 0xe755, 0xe77b,
-  0xe75c, 0xe753, 0xe751, 0xe74e, 0xbdb0, 0xe765, 0xbdaf, 0xbdb3,
-  0xe760, 0xe768, 0xbda9, 0xe778, 0xe77c, 0xbdab, 0xe757, 0xe76b,
-  0xe76f, 0xe754, 0xe779, 0xbdb2, 0xbdb1, 0xe74c, 0xbdb5, 0xe772,
-  0xe756, 0xe76a, 0xe750, 0xe75e, 0xe759, 0xbdad, 0xbdae, 0xe76c,
-  0xe77d, 0xe77a, 0xe771, 0xe74d, 0xbdaa, 0xeb49, 0xeb40, 0xeb43,
-  0xbfbb, 0xeb45, 0xeaf9, 0xeb41, 0xeb47, 0xbfb8, 0xbfbc, 0xbfb6,
-  0xeafb, 0xeb4c, 0xeb46, 0xeafc, 0xeb55, 0xeb4f, 0xeaf8, 0xee46,
-  0xeafe, 0xbfb7, 0xeb4a, 0xeb54, 0xbfbf, 0xeb51, 0xeafd, 0xeb44,
-  0xeb48, 0xeb42, 0xeb56, 0xeb53, 0xeb50, 0xbfb9, 0xbfba, 0xbfbe,
-  0xeafa, 0xeb57, 0xbfbd, 0xeb4d, 0xeb4b, 0xeb4e, 0xee53, 0xee40,
-  0xee45, 0xee52, 0xee44, 0xedfb, 0xee41, 0xc1a2, 0xedf4, 0xee4d,
-  0xee4f, 0xedf3, 0xc1a1, 0xee51, 0xee49, 0xc1a8, 0xee50, 0xee42,
-  0xc1aa, 0xedf9, 0xeb52, 0xee4a, 0xee47, 0xedf5, 0xee55, 0xc1a4,
-  0xc1a5, 0xedf7, 0xee48, 0xee54, 0xee4b, 0xedfd, 0xc1a7, 0xc1a3,
-  0xee4c, 0xedfe, 0xee56, 0xedf8, 0xee43, 0xee4e, 0xedfa, 0xedfc,
-  0xc2cb, 0xedf6, 0xc1a9, 0xc2c4, 0xc17e, 0xc1a6, 0xc2c8, 0xf0b3,
-  0xf0a9, 0xf0a4, 0xf0aa, 0xf0b4, 0xf0b8, 0xf0b7, 0xc2ca, 0xc2c9,
-  0xf0ab, 0xf0b9, 0xf0ae, 0xf0a6, 0xf0a8, 0xf0a7, 0xf0ad, 0xf0b2,
-  0xf0a5, 0xf0ac, 0xf0b1, 0xc2c7, 0xf0af, 0xc2c5, 0xf0b0, 0xc2c3,
-  0xc2c6, 0xf2d5, 0xf0b5, 0xc3c2, 0xf2cd, 0xf2d1, 0xf2c9, 0xf2cc,
-  0xf2d4, 0xc3c0, 0xf2d9, 0xf2d2, 0xf2ca, 0xf2da, 0xf2d3, 0xc3c3,
-  0xc3c4, 0xf2d7, 0xf2cb, 0xc3bf, 0xc3c1, 0xf2c6, 0xf2ce, 0xf2c8,
-  0xf2d8, 0xf2d6, 0xf2c7, 0xf2cf, 0xf4be, 0xc3c5, 0xf2d0, 0xc4a7,
-  0xc4a9, 0xc4a6, 0xf4c3, 0xf4bb, 0xf4b9, 0xf4bd, 0xf4ba, 0xf4bf,
-  0xf4c1, 0xc4aa, 0xc4ac, 0xf4c0, 0xc4ad, 0xc4ab, 0xf4c2, 0xc4a8,
-  0xc4f4, 0xf5f1, 0xf5f7, 0xc4f6, 0xf4bc, 0xf5f6, 0xf5fd, 0xf5f4,
-  0xf5fb, 0xf5fa, 0xf4b8, 0xf5f5, 0xf0b6, 0xf5fe, 0xf5f3, 0xf5f8,
-  0xf5fc, 0xf5f2, 0xf74a, 0xc4f5, 0xf5f9, 0xf7f4, 0xf74b, 0xf749,
-  0xf747, 0xf748, 0xf74c, 0xc5d9, 0xf7f2, 0xf7f0, 0xf7f5, 0xf7f3,
-  0xf7f6, 0xc5da, 0xf7f1, 0xf8bc, 0xf945, 0xf946, 0xf947, 0xf9c7,
-  0xf9bd, 0xca4f, 0xaaea, 0xad68, 0xd3b8, 0xd3b7, 0xb040, 0xb342,
-  0xd77c, 0xd77b, 0xb5ea, 0xb8b8, 0xb8b7, 0xb8b9, 0xe3d4, 0xe77e,
-  0xeb58, 0xeb5a, 0xeb59, 0xc1ab, 0xee57, 0xf0ba, 0xf9a5, 0xa6e4,
-  0xcdc9, 0xcdca, 0xcdc8, 0xcdc7, 0xaaeb, 0xd0a9, 0xd0a7, 0xd0a6,
-  0xad69, 0xad6b, 0xad6a, 0xd0a8, 0xd3c4, 0xd3c1, 0xd3bf, 0xb041,
-  0xd3c2, 0xb046, 0xd3bc, 0xd3cb, 0xd3cd, 0xd3bd, 0xb043, 0xd3ce,
-  0xd3c9, 0xd3bb, 0xd3c0, 0xd3ca, 0xd3c6, 0xd3c3, 0xb048, 0xd3cc,
-  0xd3be, 0xd3c7, 0xd3b9, 0xb047, 0xb044, 0xd3c5, 0xd3c8, 0xd3ba,
-  0xb045, 0xb042, 0xb34c, 0xd7a5, 0xb34b, 0xd7a8, 0xd7ab, 0xb348,
-  0xb346, 0xd77e, 0xd7a9, 0xd7a7, 0xd7a4, 0xd7ac, 0xd7ad, 0xd7af,
-  0xd7b0, 0xd77d, 0xb345, 0xd7a2, 0xd7a1, 0xd7ae, 0xb347, 0xd7a3,
-  0xb349, 0xb344, 0xd7a6, 0xb34d, 0xb34a, 0xd7aa, 0xb5f1, 0xdbbf,
-  0xdbb4, 0xb5ee, 0xdfe7, 0xdbbd, 0xdbb1, 0xb5ec, 0xdbb6, 0xb5ef,
-  0xdbba, 0xdbb8, 0xb5f2, 0xb5eb, 0xdbb2, 0xdbb5, 0xb5f0, 0xdbb3,
-  0xdbbe, 0xdbbc, 0xdbb7, 0xdbb9, 0xdbbb, 0xb5ed, 0xdfe8, 0xdfee,
-  0xdfe4, 0xdfea, 0xb8ba, 0xdfe6, 0xb8c0, 0xb8bf, 0xb8be, 0xdfed,
-  0xb8c1, 0xb8c2, 0xdfe3, 0xdff0, 0xb8c3, 0xb8bd, 0xb8bc, 0xdfec,
-  0xb8c4, 0xdfe2, 0xdfe5, 0xdfef, 0xdfeb, 0xe3f4, 0xe3e9, 0xb8bb,
-  0xbb6a, 0xe3dd, 0xe3f2, 0xe3de, 0xbb65, 0xe3db, 0xe3e4, 0xe3dc,
-  0xbb67, 0xe3d6, 0xe3f1, 0xbb68, 0xe3ee, 0xe3ef, 0xe3d7, 0xbb6d,
-  0xe3e6, 0xe3e0, 0xe3e7, 0xe3da, 0xe3f3, 0xe3eb, 0xe3e5, 0xe3d5,
-  0xbb69, 0xe3ec, 0xbb6c, 0xe3f0, 0xe3ea, 0xbb66, 0xe3e8, 0xe3e2,
-  0xbb64, 0xe3d9, 0xe3e1, 0xe3ed, 0xe3df, 0xe3e3, 0xbdc1, 0xdfe9,
-  0xe7b2, 0xe7bb, 0xe7b1, 0xe7ad, 0xe7aa, 0xbdc2, 0xe7a8, 0xbb6b,
-  0xe7a1, 0xbdc0, 0xe7a7, 0xbdbf, 0xe7ac, 0xe7a9, 0xe7b9, 0xe7b4,
-  0xe7ae, 0xe7b3, 0xbdbb, 0xe7ab, 0xe7be, 0xe7a2, 0xe7a3, 0xe7ba,
-  0xbdbc, 0xe7bf, 0xbdbe, 0xe7c0, 0xe7b0, 0xe3d8, 0xe7b6, 0xe7af,
-  0xe7b8, 0xe7b5, 0xe7a6, 0xbdb9, 0xe7bd, 0xbdba, 0xe7a4, 0xbdbd,
-  0xeb64, 0xe7b7, 0xe7bc, 0xeb61, 0xbdb8, 0xbfc0, 0xeb6b, 0xeb67,
-  0xeb65, 0xeb60, 0xeb6f, 0xbfc4, 0xeb5c, 0xeb68, 0xeb69, 0xeb5f,
-  0xeb5e, 0xeb6c, 0xeb62, 0xeb5d, 0xeb63, 0xeb6e, 0xeb5b, 0xeb6d,
-  0xeb6a, 0xbfc2, 0xbfc1, 0xbfc3, 0xeb66, 0xf0cb, 0xee59, 0xc1b1,
-  0xee5d, 0xee5a, 0xee61, 0xee67, 0xee5c, 0xee70, 0xc1ae, 0xee6a,
-  0xee5f, 0xee6b, 0xee66, 0xee6d, 0xee5e, 0xc1b3, 0xc1b2, 0xee60,
-  0xee6e, 0xee58, 0xee6c, 0xc1ac, 0xee64, 0xee63, 0xee68, 0xee5b,
-  0xc1b0, 0xc1b4, 0xee62, 0xee69, 0xc1b5, 0xee65, 0xc1ad, 0xc1af,
-  0xf0c7, 0xf0c5, 0xf0cc, 0xf0c9, 0xf0cd, 0xf0be, 0xf0c6, 0xf0d1,
-  0xee6f, 0xf0c2, 0xc2cf, 0xe7a5, 0xf0bd, 0xf0ca, 0xf0c4, 0xf0c1,
-  0xf0bc, 0xf0bb, 0xf0d0, 0xf0c0, 0xf0bf, 0xc2cd, 0xf0c8, 0xc2cc,
-  0xc2ce, 0xf0c3, 0xf0cf, 0xf2de, 0xf2df, 0xc3c9, 0xf2dc, 0xc3c6,
-  0xf2e4, 0xc3ca, 0xf2e6, 0xf2db, 0xf0ce, 0xf2e8, 0xf2dd, 0xc3c7,
-  0xf2e3, 0xf2e5, 0xf2e0, 0xf2e7, 0xf2e2, 0xf2e1, 0xc3c8, 0xf4c5,
-  0xf4c6, 0xf4c8, 0xc4ae, 0xc4af, 0xf4c9, 0xf4c7, 0xf4c4, 0xf642,
-  0xf645, 0xf641, 0xc4fa, 0xf643, 0xc4f9, 0xc4f8, 0xc4f7, 0xf644,
-  0xf751, 0xf74f, 0xf74e, 0xf640, 0xf750, 0xf646, 0xf74d, 0xf7f9,
-  0xf7d7, 0xf7f7, 0xc5db, 0xf7f8, 0xf7fa, 0xf8bf, 0xc5fa, 0xf8be,
-  0xf8bd, 0xc5fb, 0xc65a, 0xf96e, 0xf9a7, 0xf9a6, 0xf9a8, 0xa6e5,
-  0xd0aa, 0xd3cf, 0xd3d0, 0xdbc0, 0xf647, 0xf8c0, 0xa6e6, 0xad6c,
-  0xd0ab, 0xd7b1, 0xb34e, 0xdbc2, 0xdbc1, 0xb5f3, 0xb8c5, 0xe7c1,
-  0xbdc3, 0xbdc4, 0xbfc5, 0xc5fc, 0xa6e7, 0xd0ac, 0xaaed, 0xd0ae,
-  0xd0ad, 0xad6d, 0xd3d1, 0xd3d8, 0xb049, 0xd3d6, 0xd3d4, 0xd3db,
-  0xd3d2, 0xd3d3, 0xb04a, 0xb04e, 0xd3dc, 0xb04d, 0xd3da, 0xd3d7,
-  0xd3d5, 0xb04b, 0xb04c, 0xd3d9, 0xb350, 0xd7b2, 0xb355, 0xd7c2,
-  0xb354, 0xd7c4, 0xd7b8, 0xb352, 0xd7c3, 0xd7b3, 0xb353, 0xd7bf,
-  0xd7bb, 0xd7bd, 0xd7b7, 0xd7be, 0xb34f, 0xd7ba, 0xd7b9, 0xd7b5,
-  0xd7c0, 0xd7bc, 0xd7b4, 0xd7b6, 0xb351, 0xd7c1, 0xb5f6, 0xdbcd,
-  0xdbc9, 0xdbcb, 0xdbc6, 0xdbc5, 0xdbc3, 0xdbca, 0xdbcc, 0xdbc8,
-  0xdbc7, 0xb5f4, 0xb5f5, 0xdbcf, 0xb8cd, 0xdff2, 0xdff8, 0xdff3,
-  0xdff4, 0xdff9, 0xb8cf, 0xb8c7, 0xb8ce, 0xdff1, 0xdbc4, 0xb8ca,
-  0xb8c8, 0xdff7, 0xdff6, 0xb8c9, 0xb8cb, 0xdff5, 0xb8c6, 0xb8cc,
-  0xe3f6, 0xbb74, 0xe442, 0xe441, 0xe3fb, 0xbb76, 0xe440, 0xe3f7,
-  0xe3f8, 0xbb6e, 0xbb70, 0xe3fd, 0xe3f5, 0xbb72, 0xbb71, 0xe3f9,
-  0xe3fe, 0xe3fc, 0xbb73, 0xe3fa, 0xdbce, 0xbb6f, 0xe7c2, 0xe7c9,
-  0xbdc6, 0xe7cd, 0xbdca, 0xe7c5, 0xe7c3, 0xe7cc, 0xbdc5, 0xe7cb,
-  0xbdc7, 0xbdc8, 0xe7c4, 0xbdc9, 0xe7ca, 0xe7c6, 0xe7c7, 0xe7c8,
-  0xbb75, 0xeb70, 0xeb7c, 0xbfca, 0xeb77, 0xeb79, 0xbfc8, 0xeb71,
-  0xeb75, 0xeb78, 0xbfc6, 0xbfc9, 0xeb7b, 0xeb73, 0xeb74, 0xeb7a,
-  0xeb72, 0xeb76, 0xbfc7, 0xee72, 0xee71, 0xc1b7, 0xee77, 0xc1b9,
-  0xc1b6, 0xee73, 0xc1ba, 0xee74, 0xee75, 0xee78, 0xc1b8, 0xf0d6,
-  0xf0d9, 0xf0d3, 0xf0d5, 0xf0d4, 0xf0d7, 0xf0d8, 0xee76, 0xf0d2,
-  0xc3cd, 0xf2ec, 0xf2ef, 0xf2f1, 0xf2ea, 0xf2eb, 0xf2ee, 0xf2f0,
-  0xc3ce, 0xc3cc, 0xc3cb, 0xf2ed, 0xf2e9, 0xf4ca, 0xc4b0, 0xf4cb,
-  0xf649, 0xc4fb, 0xf64b, 0xc4fc, 0xf648, 0xf64a, 0xc5a8, 0xf752,
-  0xc5a7, 0xf7fd, 0xf7fc, 0xf7fb, 0xf948, 0xf949, 0xf94b, 0xf94a,
-  0xca50, 0xa6e8, 0xad6e, 0xd7c5, 0xb5f7, 0xdffa, 0xc2d0, 0xf2f2,
-  0xa8a3, 0xb357, 0xb356, 0xdbd0, 0xb5f8, 0xdbd2, 0xdbd1, 0xdffb,
-  0xb8d0, 0xe443, 0xe446, 0xe445, 0xe444, 0xe7ce, 0xe7d0, 0xe7cf,
-  0xbfcc, 0xbfcb, 0xc1bb, 0xee79, 0xee7b, 0xee7a, 0xc2d1, 0xf2f4,
-  0xf2f3, 0xf4cc, 0xc4b1, 0xc4fd, 0xf754, 0xf753, 0xc65b, 0xa8a4,
-  0xd0af, 0xad6f, 0xd7c8, 0xd7c6, 0xd7c7, 0xdbd4, 0xdbd5, 0xe043,
-  0xdbd3, 0xdffc, 0xe041, 0xe040, 0xe042, 0xb8d1, 0xdffe, 0xdffd,
-  0xe044, 0xe449, 0xe447, 0xe448, 0xe7d3, 0xe7d1, 0xe7d2, 0xeb7d,
-  0xee7c, 0xee7d, 0xc2d2, 0xf2f5, 0xf4cd, 0xc4b2, 0xf64c, 0xf755,
-  0xc5a9, 0xf7fe, 0xf94c, 0xa8a5, 0xad71, 0xad72, 0xd0b0, 0xd0b1,
-  0xad70, 0xb054, 0xb052, 0xb051, 0xb058, 0xb050, 0xb059, 0xd3dd,
-  0xb056, 0xb053, 0xb057, 0xb055, 0xb04f, 0xb35f, 0xb359, 0xd7cc,
-  0xb35e, 0xb360, 0xb35a, 0xb35b, 0xd7ca, 0xb358, 0xd7cb, 0xb35d,
-  0xd7c9, 0xb35c, 0xb644, 0xb646, 0xdbd8, 0xb645, 0xb5f9, 0xb5fd,
-  0xb8e4, 0xe049, 0xdbda, 0xb5fe, 0xdbdd, 0xdbde, 0xb643, 0xdbe0,
-  0xdbe2, 0xdbe3, 0xdbd7, 0xdbd6, 0xdbe4, 0xb642, 0xdbe1, 0xdbdf,
-  0xb640, 0xb5fb, 0xb647, 0xdbdb, 0xdbdc, 0xdbd9, 0xb641, 0xb5fc,
-  0xb5fa, 0xe048, 0xb8df, 0xb8da, 0xb8d5, 0xb8e5, 0xb8d6, 0xb8d2,
-  0xb8e1, 0xb8de, 0xb8e0, 0xb8d7, 0xb8dc, 0xb8d3, 0xb8d4, 0xe050,
-  0xe04d, 0xe045, 0xe04a, 0xb8e2, 0xe051, 0xb8e3, 0xb8d9, 0xe047,
-  0xe04f, 0xe04b, 0xe04e, 0xe04c, 0xb8dd, 0xe046, 0xb8d8, 0xe44c,
-  0xbb78, 0xbb7b, 0xe44e, 0xbba5, 0xe44d, 0xbb7d, 0xbdcf, 0xe44f,
-  0xbba4, 0xe44b, 0xbba6, 0xbb79, 0xb8db, 0xbb7c, 0xbb7a, 0xbb7e,
-  0xbba2, 0xbb77, 0xbba7, 0xbba3, 0xbba1, 0xe44a, 0xbdd6, 0xbdd2,
-  0xbdd9, 0xe7d6, 0xbdda, 0xe7e2, 0xe7db, 0xbdcb, 0xe7e3, 0xe7dd,
-  0xbdd5, 0xe7de, 0xbdd4, 0xe7e1, 0xbdce, 0xe7df, 0xe7d5, 0xbdcd,
-  0xebaa, 0xbdd3, 0xbdd0, 0xbdd8, 0xe7d4, 0xe7d8, 0xbdcc, 0xe7d7,
-  0xe7d9, 0xe7da, 0xbdd7, 0xe7dc, 0xe7e0, 0xe7e4, 0xbddb, 0xbfd2,
-  0xeba5, 0xebab, 0xeba8, 0xeb7e, 0xebac, 0xeba1, 0xeba7, 0xbfcd,
-  0xbfd3, 0xebad, 0xbfcf, 0xbfd9, 0xbfd4, 0xebaf, 0xeba9, 0xbfd0,
-  0xeba2, 0xbfda, 0xeba3, 0xeba4, 0xbfdb, 0xbfd8, 0xbdd1, 0xbfce,
-  0xebb0, 0xbfdc, 0xbfd5, 0xebae, 0xbfd1, 0xbfd6, 0xbfd7, 0xc1c3,
-  0xeea4, 0xeead, 0xeeaa, 0xeeac, 0xc1c0, 0xeea5, 0xeeab, 0xc1bc,
-  0xeea7, 0xc1c4, 0xeea3, 0xeea8, 0xeeaf, 0xeba6, 0xeea9, 0xeea2,
-  0xc1bd, 0xeea1, 0xc1be, 0xeeb0, 0xc1bf, 0xeeae, 0xc1c2, 0xee7e,
-  0xc1c1, 0xeea6, 0xf0dc, 0xf0ea, 0xf0e5, 0xf0e7, 0xf0db, 0xc2d3,
-  0xf0da, 0xc2d6, 0xc2d5, 0xf0e9, 0xf0e1, 0xf0de, 0xf0e4, 0xf0dd,
-  0xf0df, 0xf0e8, 0xf0e6, 0xc2d4, 0xf0ed, 0xf0eb, 0xf0e2, 0xf0ec,
-  0xf0e3, 0xf2f9, 0xc3cf, 0xf341, 0xf64f, 0xc3d6, 0xf0e0, 0xf2f7,
-  0xc3d2, 0xf2f8, 0xf2fd, 0xc3d4, 0xc3d5, 0xf2f6, 0xf340, 0xf342,
-  0xf2fa, 0xf2fc, 0xf2fe, 0xf2fb, 0xf343, 0xc3d1, 0xc3d7, 0xc3d3,
-  0xc3d0, 0xf4d0, 0xc4b7, 0xf4ce, 0xf4d2, 0xf4d3, 0xc4b5, 0xf4d4,
-  0xf4d1, 0xf4cf, 0xc4b8, 0xc4b4, 0xf4d5, 0xc4b6, 0xc4b3, 0xc4fe,
-  0xc540, 0xf64e, 0xf64d, 0xf650, 0xf651, 0xc541, 0xf756, 0xf75b,
-  0xc5aa, 0xf758, 0xf757, 0xf75a, 0xf759, 0xf843, 0xc5dc, 0xf842,
-  0xf840, 0xf841, 0xc5fe, 0xc5fd, 0xf8c1, 0xf8c2, 0xc640, 0xf94d,
-  0xf94e, 0xc667, 0xc66d, 0xf9a9, 0xf9c8, 0xa8a6, 0xd7cd, 0xd7ce,
-  0xe052, 0xe450, 0xe7e5, 0xc1c6, 0xc1c5, 0xf0ee, 0xf344, 0xf844,
-  0xa8a7, 0xd3de, 0xb05a, 0xb361, 0xe054, 0xe053, 0xbddc, 0xe7e6,
-  0xbddd, 0xeeb1, 0xc2d7, 0xc676, 0xa8a8, 0xcdcb, 0xd3df, 0xb362,
-  0xd7cf, 0xd7d0, 0xdbe5, 0xb648, 0xb8e6, 0xe056, 0xe055, 0xe057,
-  0xe451, 0xe452, 0xbba8, 0xbfdd, 0xbdde, 0xbfde, 0xeeb5, 0xeeb2,
-  0xeeb4, 0xeeb3, 0xc1c7, 0xf0ef, 0xf346, 0xf345, 0xcba4, 0xb05c,
-  0xb05b, 0xd3e0, 0xd7d1, 0xdbe7, 0xdbe6, 0xb649, 0xe059, 0xe05a,
-  0xe058, 0xb8e8, 0xb8e7, 0xbbaa, 0xbba9, 0xe7e7, 0xebb3, 0xebb1,
-  0xebb2, 0xbfdf, 0xeeb7, 0xeeb6, 0xf0f2, 0xf0f1, 0xf0f0, 0xf347,
-  0xf9aa, 0xa8a9, 0xad73, 0xad74, 0xb05d, 0xb05e, 0xd3e2, 0xd3e1,
-  0xd7d2, 0xb368, 0xb366, 0xb363, 0xb367, 0xb365, 0xb364, 0xb64a,
-  0xdbea, 0xb8ed, 0xb64c, 0xb651, 0xdbec, 0xb653, 0xb652, 0xb655,
-  0xdbeb, 0xdbe8, 0xb64f, 0xb64b, 0xb64d, 0xdbe9, 0xb654, 0xb650,
-  0xb64e, 0xb8ef, 0xb8ee, 0xb8ec, 0xb8f0, 0xb8ea, 0xb8eb, 0xb8e9,
-  0xe05b, 0xe454, 0xbbac, 0xbbad, 0xbbab, 0xe453, 0xe455, 0xe7ea,
-  0xe7ec, 0xbde7, 0xe7ed, 0xbde0, 0xe7e9, 0xbddf, 0xbde9, 0xbde5,
-  0xbde6, 0xbde2, 0xe7e8, 0xbde1, 0xe7ee, 0xe7eb, 0xbde8, 0xbde3,
-  0xbde4, 0xebb5, 0xebb7, 0xebb6, 0xebb8, 0xbfe0, 0xebb4, 0xc1cb,
-  0xeeb8, 0xc1c8, 0xc1cc, 0xc1ca, 0xc1c9, 0xf0f3, 0xf0f6, 0xf0f5,
-  0xf0f4, 0xc2d8, 0xf348, 0xf349, 0xc3d8, 0xf34a, 0xc3d9, 0xc4ba,
-  0xc4b9, 0xf652, 0xc542, 0xf653, 0xf75c, 0xc5ab, 0xc5ac, 0xf845,
-  0xc642, 0xa8aa, 0xb36a, 0xb369, 0xe05c, 0xe05d, 0xbbae, 0xebb9,
-  0xbdea, 0xebba, 0xeeb9, 0xa8ab, 0xd0b2, 0xad76, 0xad75, 0xd3e3,
-  0xb05f, 0xd3e4, 0xd7d5, 0xd7d4, 0xd7d3, 0xdbee, 0xb658, 0xdbed,
-  0xb657, 0xdbef, 0xb656, 0xe05f, 0xe062, 0xe060, 0xe061, 0xe065,
-  0xe05e, 0xe066, 0xe063, 0xe064, 0xbbb0, 0xe456, 0xbbaf, 0xe7f2,
-  0xe7f0, 0xbdeb, 0xe7ef, 0xe7f1, 0xbdec, 0xebbb, 0xebbc, 0xc1cd,
-  0xf34c, 0xf34e, 0xf34b, 0xf34d, 0xf4d6, 0xf654, 0xf96f, 0xa8ac,
-  0xad77, 0xd3e5, 0xd3e7, 0xd3e6, 0xd7d8, 0xb36c, 0xd7d6, 0xb36b,
-  0xd7d9, 0xd7da, 0xd7d7, 0xdbfb, 0xb660, 0xdbf3, 0xdbf9, 0xb65b,
-  0xb65e, 0xdbf2, 0xb659, 0xdbf6, 0xe06c, 0xb65d, 0xdbf1, 0xdbf7,
-  0xdbf4, 0xdbfa, 0xdbf0, 0xdbf8, 0xb65c, 0xb65f, 0xdbf5, 0xb65a,
-  0xb8f2, 0xe068, 0xb8f1, 0xe06f, 0xe06e, 0xb8f8, 0xb8f9, 0xe070,
-  0xb8f3, 0xe06d, 0xb8f7, 0xe072, 0xe069, 0xe06b, 0xb8f4, 0xe067,
-  0xe06a, 0xe071, 0xb8f5, 0xe073, 0xb8f6, 0xbbb1, 0xe45b, 0xe461,
-  0xe459, 0xe462, 0xe458, 0xe45d, 0xe463, 0xe460, 0xe45f, 0xe45e,
-  0xe457, 0xe45c, 0xe45a, 0xbdf1, 0xbdee, 0xe7fb, 0xe841, 0xe843,
-  0xe840, 0xe7f8, 0xe7fa, 0xe845, 0xe842, 0xe7fc, 0xe846, 0xe7f9,
-  0xe844, 0xbdef, 0xbdf5, 0xbdf3, 0xe7f3, 0xbdf4, 0xbdf0, 0xe7f4,
-  0xe7f6, 0xe7f5, 0xe7fd, 0xe7fe, 0xbdf2, 0xbded, 0xe7f7, 0xebc6,
-  0xbfe2, 0xebbd, 0xbfe3, 0xbfe6, 0xebc2, 0xebbf, 0xbfe5, 0xebc3,
-  0xebc4, 0xebbe, 0xebc7, 0xebc0, 0xebc5, 0xbfe4, 0xbfe1, 0xebc1,
-  0xeebf, 0xc1d0, 0xc1ce, 0xc1d1, 0xc1cf, 0xeebe, 0xeebb, 0xeeba,
-  0xeebd, 0xeebc, 0xf145, 0xc2de, 0xf0fb, 0xf0fa, 0xc2d9, 0xf141,
-  0xf140, 0xf0f7, 0xf143, 0xf0fc, 0xc2dd, 0xf0f9, 0xf142, 0xf0f8,
-  0xc2da, 0xc2dc, 0xf0fd, 0xc2db, 0xf0fe, 0xf144, 0xf352, 0xc3de,
-  0xf34f, 0xf353, 0xc3db, 0xf351, 0xc3e0, 0xc3dd, 0xf350, 0xc3df,
-  0xf354, 0xc3da, 0xc4bc, 0xc4be, 0xf4d9, 0xc4bd, 0xf4d7, 0xc3dc,
-  0xf4d8, 0xc4bb, 0xc543, 0xc545, 0xf656, 0xc544, 0xf655, 0xf761,
-  0xc5ad, 0xf760, 0xc5ae, 0xf75e, 0xf75d, 0xf762, 0xf763, 0xf846,
-  0xf75f, 0xf8c6, 0xf8c3, 0xf8c4, 0xf8c5, 0xc65c, 0xf951, 0xf950,
-  0xf94f, 0xf970, 0xf9be, 0xf9ab, 0xc66e, 0xa8ad, 0xb060, 0xb8fa,
-  0xbdf6, 0xebc8, 0xc2df, 0xf355, 0xf9ac, 0xa8ae, 0xaaee, 0xad79,
-  0xad78, 0xb063, 0xd3e8, 0xb061, 0xd3e9, 0xb062, 0xd7df, 0xd7db,
-  0xb36d, 0xd7de, 0xd7dd, 0xd7dc, 0xb36e, 0xd7e0, 0xd7e1, 0xdc43,
-  0xdc41, 0xdc45, 0xdc46, 0xdc4c, 0xdc48, 0xdc4a, 0xdc42, 0xdbfc,
-  0xdc49, 0xdc4b, 0xdc44, 0xdc47, 0xdbfd, 0xb662, 0xdc40, 0xdbfe,
-  0xb661, 0xb663, 0xb8fd, 0xe075, 0xe077, 0xe076, 0xe07b, 0xb8fb,
-  0xe078, 0xe074, 0xe079, 0xe07a, 0xb8fc, 0xb8fe, 0xe07c, 0xe467,
-  0xe466, 0xe464, 0xe465, 0xbbb3, 0xbbb5, 0xbbb2, 0xbbb4, 0xe84d,
-  0xe84e, 0xe849, 0xe84a, 0xbdf8, 0xbdfd, 0xbdf7, 0xbdfe, 0xbdf9,
-  0xe84b, 0xe84c, 0xe848, 0xbe40, 0xbdfb, 0xbdfa, 0xbdfc, 0xe847,
-  0xebca, 0xbfe8, 0xebcc, 0xbfea, 0xebcf, 0xebcb, 0xebc9, 0xebce,
-  0xbfe9, 0xebcd, 0xbfe7, 0xc1d3, 0xc1d6, 0xeec1, 0xc1d4, 0xeec0,
-  0xc1d2, 0xc1d5, 0xf146, 0xf147, 0xf148, 0xc2e0, 0xf149, 0xc2e1,
-  0xc3e2, 0xf358, 0xf359, 0xf357, 0xf356, 0xf35a, 0xc3e1, 0xf4dd,
-  0xf4db, 0xf4dc, 0xf4de, 0xf4da, 0xf4df, 0xf658, 0xf659, 0xf657,
-  0xc546, 0xf764, 0xc5af, 0xf765, 0xf848, 0xf847, 0xa8af, 0xb664,
-  0xb940, 0xbbb6, 0xbfec, 0xbfeb, 0xc3e3, 0xc47c, 0xc547, 0xa8b0,
-  0xb064, 0xb941, 0xf35b, 0xcba6, 0xa8b1, 0xa8b4, 0xa8b3, 0xa8b2,
-  0xcba5, 0xcdcd, 0xcdcf, 0xaaef, 0xaaf1, 0xcdcc, 0xcdce, 0xaaf0,
-  0xcdd1, 0xcdd0, 0xcdd2, 0xd0b6, 0xd0b4, 0xad7c, 0xd0b3, 0xada3,
-  0xad7e, 0xad7b, 0xada4, 0xad7d, 0xada2, 0xada1, 0xd0b5, 0xad7a,
-  0xb06a, 0xd3eb, 0xd3f1, 0xb067, 0xb06e, 0xb069, 0xd3ee, 0xd3f0,
-  0xb06c, 0xd3ea, 0xd3ed, 0xb068, 0xb065, 0xd3ec, 0xb06b, 0xd3ef,
-  0xb06d, 0xb066, 0xd7e3, 0xd7e6, 0xb370, 0xb37a, 0xb376, 0xd7e4,
-  0xb37e, 0xb377, 0xb37c, 0xb372, 0xb36f, 0xb371, 0xb37d, 0xd7e5,
-  0xb375, 0xb378, 0xb374, 0xb379, 0xd7e7, 0xb37b, 0xb373, 0xd7e2,
-  0xdc4d, 0xb665, 0xdc4f, 0xb667, 0xb669, 0xdc4e, 0xb666, 0xb66a,
-  0xb668, 0xb947, 0xe0a3, 0xb94f, 0xe07e, 0xb950, 0xb945, 0xe0a1,
-  0xb94a, 0xe0a2, 0xb943, 0xb942, 0xb94d, 0xb94c, 0xb94b, 0xb949,
-  0xb94e, 0xe07d, 0xb944, 0xb946, 0xb948, 0xbbb8, 0xbbbb, 0xbbbf,
-  0xbbb9, 0xbbbe, 0xbbbc, 0xbbb7, 0xbbbd, 0xbbba, 0xe852, 0xbe43,
-  0xbe41, 0xe853, 0xbe44, 0xbe42, 0xe851, 0xe850, 0xbff0, 0xe84f,
-  0xbfee, 0xbfed, 0xebd0, 0xbe45, 0xbfef, 0xebd1, 0xbff2, 0xebd2,
-  0xbff1, 0xc1d8, 0xeec3, 0xc1d7, 0xc1dc, 0xc1da, 0xc1db, 0xc2e3,
-  0xc1d9, 0xeec2, 0xebd3, 0xc2e2, 0xc2e4, 0xc3e4, 0xc3e5, 0xf4e0,
-  0xc5de, 0xc5dd, 0xa8b6, 0xca55, 0xb06f, 0xca52, 0xca53, 0xca51,
-  0xca54, 0xcbaa, 0xcba7, 0xcbac, 0xcba8, 0xa8b7, 0xa8ba, 0xcba9,
-  0xa8b9, 0xcbab, 0xa8b8, 0xcdd5, 0xcdd7, 0xaaf4, 0xcdd3, 0xcdd6,
-  0xcdd4, 0xaaf2, 0xaaf5, 0xaaf3, 0xd0b8, 0xd0bc, 0xd0b9, 0xada7,
-  0xada8, 0xd0bb, 0xd0bd, 0xd0bf, 0xada5, 0xd0be, 0xada6, 0xd7ee,
-  0xd0ba, 0xd3f2, 0xd3fb, 0xd3f9, 0xd3f4, 0xd3f5, 0xd3fa, 0xd3fc,
-  0xb071, 0xd3f7, 0xd3f3, 0xb070, 0xb072, 0xd3f6, 0xd3fd, 0xd3f8,
-  0xb3a1, 0xd7f1, 0xd7e9, 0xd7ef, 0xd7f0, 0xb3a2, 0xd7e8, 0xd7ea,
-  0xd0b7, 0xd7ec, 0xd7ed, 0xd7eb, 0xb66c, 0xdc56, 0xebd4, 0xdc57,
-  0xdc54, 0xb3a3, 0xb66e, 0xdc53, 0xdc59, 0xdc58, 0xb66b, 0xdc5c,
-  0xdc52, 0xdc5b, 0xdc50, 0xdc5a, 0xdc55, 0xb66d, 0xe0aa, 0xe0a5,
-  0xe0ab, 0xe0a6, 0xe0a4, 0xe0a7, 0xb951, 0xe0a9, 0xe0a8, 0xb952,
-  0xbbc1, 0xbbc0, 0xe46e, 0xe471, 0xe469, 0xe46d, 0xbbc2, 0xe46c,
-  0xe46a, 0xe470, 0xe46b, 0xe468, 0xe46f, 0xe859, 0xbe48, 0xf14a,
-  0xe856, 0xe857, 0xe855, 0xdc51, 0xbe47, 0xe85a, 0xe854, 0xbe46,
-  0xbe49, 0xe858, 0xebd5, 0xbff3, 0xebd6, 0xebd7, 0xeec4, 0xc1dd,
-  0xf14b, 0xf14c, 0xf14d, 0xf35d, 0xf35c, 0xf4e2, 0xf4e1, 0xf65b,
-  0xf65c, 0xf65a, 0xf766, 0xc5b0, 0xa8bb, 0xadaa, 0xada9, 0xb075,
-  0xb074, 0xd440, 0xd441, 0xd3fe, 0xb073, 0xd7f5, 0xd7f6, 0xd7f2,
-  0xb3a4, 0xd7f3, 0xd7f4, 0xdc5f, 0xdc61, 0xdc5d, 0xdc60, 0xb66f,
-  0xdc5e, 0xb670, 0xdd73, 0xb955, 0xb954, 0xb953, 0xe0ac, 0xe0ad,
-  0xe473, 0xe475, 0xbbc6, 0xbbc3, 0xbbc5, 0xbbc4, 0xe474, 0xe472,
-  0xe861, 0xe85e, 0xe85f, 0xbe4d, 0xe860, 0xe85b, 0xe85c, 0xbe4a,
-  0xbe4b, 0xe85d, 0xbe4c, 0xebdb, 0xebdc, 0xebd9, 0xebda, 0xbff4,
-  0xebd8, 0xeec8, 0xeec5, 0xeec7, 0xc1e0, 0xeecb, 0xc1df, 0xeec9,
-  0xeecc, 0xeeca, 0xeec6, 0xc1de, 0xf14f, 0xf150, 0xf14e, 0xf152,
-  0xc2e5, 0xc2e6, 0xf35f, 0xc3e7, 0xf151, 0xf35e, 0xc3e6, 0xf4e5,
-  0xf4e6, 0xc4bf, 0xf4e4, 0xf4e3, 0xf65d, 0xc548, 0xf849, 0xf8c8,
-  0xf8c7, 0xc643, 0xc65d, 0xf8c9, 0xf971, 0xc66f, 0xa8bc, 0xaaf6,
-  0xb956, 0xc4c0, 0xa8bd, 0xadab, 0xb3a5, 0xb671, 0xc2e7, 0xaaf7,
-  0xd0c1, 0xd0c0, 0xd442, 0xb078, 0xb076, 0xb07a, 0xd444, 0xb079,
-  0xb077, 0xd443, 0xb3a8, 0xd7fc, 0xb3a7, 0xb3a9, 0xd842, 0xb3ab,
-  0xd7fe, 0xd840, 0xd7f7, 0xb3aa, 0xd843, 0xd7f9, 0xd7fa, 0xd7f8,
-  0xb3a6, 0xd841, 0xd7fb, 0xd7fd, 0xdc6d, 0xdc6c, 0xdc6a, 0xdc62,
-  0xdc71, 0xdc65, 0xdc6f, 0xdc76, 0xdc6e, 0xb679, 0xb675, 0xdc63,
-  0xdc69, 0xb677, 0xdc68, 0xb678, 0xb67a, 0xdc6b, 0xb672, 0xb673,
-  0xdc77, 0xdc75, 0xdc74, 0xdc66, 0xdc72, 0xb676, 0xb674, 0xdc73,
-  0xdc64, 0xdc67, 0xdc70, 0xe4ba, 0xe0b7, 0xe0b0, 0xe0c3, 0xe0cc,
-  0xe0b3, 0xb961, 0xe0c0, 0xb957, 0xb959, 0xb965, 0xe0b1, 0xb95a,
-  0xb95c, 0xb966, 0xb95b, 0xb964, 0xe0b9, 0xe0ae, 0xb962, 0xe0b8,
-  0xb95e, 0xe0ca, 0xb963, 0xe0c8, 0xe0bc, 0xe0c6, 0xb960, 0xe0af,
-  0xe0c9, 0xe0c4, 0xe0cb, 0xb958, 0xb967, 0xb95d, 0xe0b5, 0xe0bd,
-  0xe0c1, 0xe0c5, 0xb95f, 0xe0b4, 0xe0b2, 0xe0be, 0xe0bb, 0xe0ba,
-  0xe0bf, 0xe0c2, 0xe0c7, 0xe478, 0xbbc7, 0xe4a4, 0xe47a, 0xbbcc,
-  0xbbd0, 0xe4ad, 0xe4b5, 0xe4a6, 0xbbc8, 0xe4aa, 0xe0b6, 0xbbc9,
-  0xe4b1, 0xe4b6, 0xe4ae, 0xe4b0, 0xe4b9, 0xe4b2, 0xe47e, 0xe4a9,
-  0xbbd1, 0xbbcd, 0xe47c, 0xe4ab, 0xbbcb, 0xe4a5, 0xbbca, 0xe4b3,
-  0xe4a2, 0xe479, 0xbbce, 0xe4b8, 0xe47b, 0xe4af, 0xe4ac, 0xe4a7,
-  0xe477, 0xe476, 0xe4a1, 0xe4b4, 0xbbcf, 0xe4b7, 0xe47d, 0xe4a3,
-  0xbe52, 0xbe5a, 0xbe55, 0xe8a4, 0xe8a1, 0xe867, 0xbe50, 0xbe4f,
-  0xbe56, 0xe865, 0xbe54, 0xe871, 0xe863, 0xe864, 0xbe4e, 0xe8a3,
-  0xbe58, 0xe874, 0xe879, 0xe873, 0xebee, 0xe86f, 0xe877, 0xe875,
-  0xe868, 0xe862, 0xe87d, 0xbe57, 0xe87e, 0xe878, 0xe86d, 0xe86b,
-  0xe866, 0xe86e, 0xe87b, 0xe86a, 0xe87a, 0xe8a2, 0xbe53, 0xe876,
-  0xe87c, 0xe872, 0xe86c, 0xbe51, 0xe4a8, 0xe870, 0xbe59, 0xe869,
-  0xebf4, 0xbff7, 0xebf3, 0xebf0, 0xec44, 0xbffb, 0xec41, 0xebf8,
-  0xec43, 0xebe9, 0xebf6, 0xbffd, 0xebe1, 0xebdf, 0xec42, 0xec40,
-  0xebfe, 0xebed, 0xebec, 0xebe2, 0xc040, 0xebe8, 0xebf2, 0xebfd,
-  0xc043, 0xec45, 0xc1e8, 0xc045, 0xbffe, 0xebe6, 0xebef, 0xebde,
-  0xebe0, 0xbff5, 0xc042, 0xbffa, 0xebe7, 0xebf7, 0xebf1, 0xc041,
-  0xebdd, 0xc1e3, 0xebf9, 0xebfc, 0xbffc, 0xebeb, 0xc044, 0xbff9,
-  0xbff8, 0xebf5, 0xebfb, 0xbff6, 0xebe4, 0xebfa, 0xebe5, 0xebea,
-  0xeed2, 0xeed7, 0xc1e5, 0xc1e7, 0xeedd, 0xc1e1, 0xeeec, 0xeee3,
-  0xeed8, 0xeed9, 0xeee2, 0xc1ee, 0xeee1, 0xeed1, 0xeee0, 0xeed4,
-  0xeeed, 0xc1ed, 0xc1eb, 0xeed5, 0xeee8, 0xeeda, 0xeee7, 0xeee9,
-  0xeed0, 0xc1e6, 0xeeea, 0xeede, 0xc1ea, 0xeedb, 0xc1ec, 0xeee4,
-  0xc1e4, 0xeed6, 0xeee5, 0xeedf, 0xebe3, 0xeee6, 0xeed3, 0xc1e9,
-  0xeeeb, 0xc1e2, 0xeece, 0xf160, 0xf159, 0xc2e9, 0xf154, 0xf163,
-  0xf15b, 0xeedc, 0xf165, 0xf155, 0xc2e8, 0xf15f, 0xc2ea, 0xc2f2,
-  0xc2f0, 0xf161, 0xc2f1, 0xf157, 0xf158, 0xf15d, 0xf162, 0xeecd,
-  0xc2eb, 0xf16a, 0xf167, 0xf16b, 0xf15e, 0xf15a, 0xf168, 0xf36a,
-  0xf15c, 0xc2ee, 0xc2ed, 0xeecf, 0xc2ef, 0xf164, 0xf166, 0xc2ec,
-  0xf169, 0xf153, 0xf156, 0xf373, 0xf363, 0xc3eb, 0xf371, 0xf361,
-  0xc3ec, 0xf36c, 0xf368, 0xc3f1, 0xf372, 0xf362, 0xf365, 0xc3e9,
-  0xf374, 0xf36d, 0xf370, 0xc3ef, 0xc3f4, 0xc3f2, 0xf369, 0xf364,
-  0xc3ed, 0xc3ee, 0xf360, 0xc3ea, 0xc3e8, 0xc3f0, 0xf36f, 0xc3f3,
-  0xf36b, 0xf375, 0xc3f5, 0xf367, 0xf36e, 0xf4f3, 0xf542, 0xf4f5,
-  0xf4fc, 0xf366, 0xf4fa, 0xf4e9, 0xf540, 0xc4c3, 0xf4ed, 0xf4fe,
-  0xf4f4, 0xc4c2, 0xf544, 0xf4f6, 0xf4fb, 0xf4fd, 0xf4e7, 0xf541,
-  0xf4f2, 0xf4f7, 0xf4eb, 0xf4ef, 0xf543, 0xf4f9, 0xf4e8, 0xf4ec,
-  0xf4ee, 0xf4f8, 0xc4c1, 0xf4f1, 0xf4ea, 0xf4f0, 0xf661, 0xf666,
-  0xc54f, 0xf668, 0xc549, 0xf664, 0xf66a, 0xc54e, 0xc54a, 0xc54b,
-  0xf660, 0xf667, 0xc54d, 0xf665, 0xc54c, 0xf65f, 0xf663, 0xf662,
-  0xf65e, 0xf669, 0xc5b1, 0xf76d, 0xf770, 0xf76c, 0xf76e, 0xf76f,
-  0xf769, 0xf76a, 0xf767, 0xf76b, 0xf768, 0xc5b2, 0xc5b3, 0xf84b,
-  0xf84d, 0xf84c, 0xf84e, 0xc5e0, 0xf84a, 0xc5df, 0xc5e1, 0xf8cb,
-  0xf8cc, 0xc644, 0xf8ca, 0xf953, 0xf952, 0xf954, 0xc65f, 0xf955,
-  0xc65e, 0xf956, 0xf972, 0xf975, 0xf974, 0xc668, 0xf973, 0xc672,
-  0xc670, 0xc671, 0xc677, 0xf9c0, 0xf9c1, 0xf9bf, 0xf9c9, 0xaaf8,
-  0xd844, 0xdc78, 0xe8a5, 0xf376, 0xaaf9, 0xadac, 0xb07b, 0xd845,
-  0xd846, 0xb3ac, 0xb67d, 0xdc7a, 0xdc79, 0xb6a3, 0xb67c, 0xdc7b,
-  0xb67e, 0xb6a2, 0xb6a1, 0xb67b, 0xb968, 0xe0d0, 0xe0ce, 0xe0cf,
-  0xe0cd, 0xbbd2, 0xbbd5, 0xbbd7, 0xbbd6, 0xbbd3, 0xbbd4, 0xe8a7,
-  0xe8a6, 0xbe5b, 0xe8a8, 0xe8a9, 0xbe5c, 0xec4d, 0xec4b, 0xeef3,
-  0xec49, 0xec4a, 0xc046, 0xec46, 0xec4e, 0xec48, 0xec4c, 0xeeef,
-  0xeef1, 0xeef2, 0xc1f3, 0xeeee, 0xc1f2, 0xeef0, 0xc1ef, 0xc1f0,
-  0xc1f1, 0xec47, 0xc2f5, 0xf16e, 0xf16c, 0xf16d, 0xc2f3, 0xc2f6,
-  0xc2f4, 0xf377, 0xf378, 0xc3f6, 0xf545, 0xf547, 0xf546, 0xc4c4,
-  0xc550, 0xf66d, 0xf66c, 0xf66b, 0xaafa, 0xc9aa, 0xca58, 0xa6e9,
-  0xca56, 0xca59, 0xca57, 0xcbae, 0xa8c1, 0xa8c2, 0xcbb0, 0xa8bf,
-  0xcbaf, 0xcbad, 0xa8c0, 0xa8be, 0xcdd8, 0xcddb, 0xaafd, 0xcdda,
-  0xcdd9, 0xaafc, 0xaafb, 0xab40, 0xcddc, 0xaafe, 0xd0c6, 0xadae,
-  0xadaf, 0xadb0, 0xd0c7, 0xd0c3, 0xadad, 0xd0c4, 0xd0c5, 0xd0c2,
-  0xb0a4, 0xb0a1, 0xd445, 0xb0a2, 0xb0a5, 0xd446, 0xb07e, 0xb07c,
-  0xb07d, 0xb0a3, 0xb3ad, 0xd849, 0xb3b5, 0xd848, 0xd84b, 0xb3b1,
-  0xd84a, 0xb6ab, 0xb3af, 0xb3b2, 0xb3ae, 0xb3b3, 0xb3b4, 0xb3b0,
-  0xd847, 0xb6a7, 0xdc7d, 0xdca3, 0xdca2, 0xb6ac, 0xb6a8, 0xb6a9,
-  0xdc7c, 0xdc7e, 0xdca1, 0xb6a4, 0xb6a6, 0xb6aa, 0xb6a5, 0xe0d3,
-  0xe0d1, 0xe0d2, 0xb96a, 0xb96b, 0xe0d4, 0xb969, 0xbbd8, 0xbbda,
-  0xbbd9, 0xe4bb, 0xe4bc, 0xe8ab, 0xe8aa, 0xc047, 0xc048, 0xec4f,
-  0xc049, 0xeef6, 0xeef4, 0xeef5, 0xc1f4, 0xf16f, 0xc3f7, 0xc1f5,
-  0xab41, 0xb0a6, 0xd447, 0xd84c, 0xb3b6, 0xb6ad, 0xdca4, 0xdca6,
-  0xb6af, 0xb6ae, 0xb6b0, 0xb6b1, 0xdca5, 0xb96e, 0xb96f, 0xb96d,
-  0xbbdb, 0xb96c, 0xe0d5, 0xbbdc, 0xe8ac, 0xec50, 0xc04a, 0xc1f6,
-  0xf170, 0xf174, 0xc2f9, 0xf171, 0xc2fa, 0xc2f8, 0xf175, 0xc2fb,
-  0xf173, 0xf379, 0xc2f7, 0xc3f8, 0xf8cd, 0xab42, 0xb3b8, 0xb3b7,
-  0xb6b2, 0xdca8, 0xdca7, 0xb6b3, 0xe0d9, 0xb973, 0xb970, 0xe0d8,
-  0xb972, 0xe0d6, 0xb971, 0xe0d7, 0xe4bd, 0xbbdd, 0xe8af, 0xbe5d,
-  0xe8ad, 0xbe5e, 0xbe5f, 0xe8ae, 0xbe60, 0xec51, 0xc04e, 0xc04b,
-  0xc050, 0xec53, 0xc04c, 0xec52, 0xc04f, 0xc04d, 0xeef9, 0xeefb,
-  0xc1f7, 0xeefa, 0xc1f8, 0xeef8, 0xeef7, 0xf177, 0xf176, 0xc2fc,
-  0xf178, 0xf37e, 0xc3fa, 0xf37d, 0xf37a, 0xc3f9, 0xf37b, 0xf37c,
-  0xf548, 0xf549, 0xc4c5, 0xc553, 0xf66e, 0xc551, 0xc552, 0xf66f,
-  0xc5b4, 0xc5b5, 0xf771, 0xc645, 0xf8cf, 0xc647, 0xf8ce, 0xf8d0,
-  0xc646, 0xf957, 0xf9ad, 0xab43, 0xb974, 0xe4be, 0xe8b0, 0xc051,
-  0xc052, 0xab44, 0xbe61, 0xc3fb, 0xadb1, 0xc053, 0xc5e2, 0xadb2,
-  0xd84d, 0xdca9, 0xdcab, 0xdcaa, 0xe0dd, 0xe0da, 0xb975, 0xb976,
-  0xe0db, 0xe0dc, 0xe4c0, 0xe4c5, 0xbbde, 0xe4bf, 0xe4c1, 0xe4c8,
-  0xe4c3, 0xe4c7, 0xe4c4, 0xe4c2, 0xe4c6, 0xbbdf, 0xe8b3, 0xe8b1,
-  0xbe63, 0xbe62, 0xe8b2, 0xbe64, 0xec56, 0xec55, 0xc054, 0xec54,
-  0xeefc, 0xeefe, 0xef41, 0xef40, 0xc1f9, 0xeefd, 0xf1a1, 0xc2fd,
-  0xf17d, 0xf1a2, 0xc2fe, 0xf17b, 0xf17e, 0xf17c, 0xf179, 0xc340,
-  0xf17a, 0xf3a1, 0xf3a3, 0xf3a2, 0xf54a, 0xf54b, 0xf670, 0xc5b7,
-  0xc5b6, 0xf84f, 0xf850, 0xc648, 0xf8d1, 0xc669, 0xadb3, 0xb6b4,
-  0xe4ca, 0xe4c9, 0xe8b5, 0xe8b4, 0xc1fa, 0xef43, 0xef42, 0xf1a5,
-  0xf1a3, 0xf1a6, 0xf1a4, 0xc3fc, 0xf3a4, 0xf3a5, 0xf3a6, 0xf671,
-  0xf772, 0xf8d2, 0xadb4, 0xec57, 0xef44, 0xadb5, 0xbbe0, 0xec58,
-  0xc341, 0xf1a7, 0xc3fd, 0xf54c, 0xf54d, 0xc554, 0xf851, 0xadb6,
-  0xb3bb, 0xb3bc, 0xd84e, 0xb6b5, 0xb6b6, 0xdcac, 0xb6b7, 0xb97a,
-  0xb97c, 0xe0df, 0xe0e0, 0xe0de, 0xb977, 0xb978, 0xb97b, 0xb979,
-  0xe4cb, 0xbbe1, 0xbbe2, 0xe8bc, 0xbe67, 0xe8b7, 0xe8b6, 0xe8bb,
-  0xbe65, 0xc05b, 0xe8b8, 0xe8bd, 0xe8ba, 0xe8b9, 0xbe66, 0xc059,
-  0xec5a, 0xc055, 0xec5b, 0xec59, 0xc058, 0xc056, 0xc05a, 0xc057,
-  0xef45, 0xef4a, 0xef46, 0xef49, 0xc1fb, 0xedd4, 0xef48, 0xef47,
-  0xc344, 0xc342, 0xc345, 0xc343, 0xf1a8, 0xf1a9, 0xf1aa, 0xc346,
-  0xf3aa, 0xc440, 0xf3a8, 0xc441, 0xf3a7, 0xf3a9, 0xc3fe, 0xf551,
-  0xf54e, 0xf54f, 0xf550, 0xf672, 0xc556, 0xc555, 0xf774, 0xf773,
-  0xc5b8, 0xc5e3, 0xc649, 0xc660, 0xf958, 0xf9ae, 0xf9af, 0xadb7,
-  0xdcad, 0xe0e1, 0xe4cc, 0xe4cd, 0xbbe3, 0xbbe4, 0xe8be, 0xbe68,
-  0xc1fc, 0xf1ab, 0xc347, 0xf3ad, 0xc442, 0xf3ac, 0xf3ae, 0xf3ab,
-  0xf675, 0xf552, 0xf553, 0xc4c6, 0xf674, 0xf673, 0xf775, 0xf9b0,
-  0xadb8, 0xadb9, 0xb0a7, 0xd448, 0xd84f, 0xb6b8, 0xb6bb, 0xb6b9,
-  0xdcae, 0xb6bd, 0xb6ba, 0xb6bc, 0xb97e, 0xe0e2, 0xe0e3, 0xe8c0,
-  0xb97d, 0xb9a1, 0xb9a2, 0xe4cf, 0xe4ce, 0xbbe5, 0xbbe6, 0xe4d0,
-  0xe8bf, 0xbbe8, 0xbe69, 0xbbe7, 0xc05c, 0xe8c1, 0xbe6b, 0xbe6a,
-  0xe8c2, 0xe8c5, 0xe8c3, 0xe8c4, 0xbe6c, 0xc061, 0xc05f, 0xc05e,
-  0xec5d, 0xc060, 0xec5c, 0xef4b, 0xec5e, 0xc05d, 0xec5f, 0xef4e,
-  0xef4c, 0xef4d, 0xef52, 0xc34b, 0xef51, 0xef54, 0xef53, 0xef50,
-  0xef4f, 0xc1fd, 0xf1ae, 0xf1ad, 0xc34a, 0xc348, 0xc349, 0xf1ac,
-  0xf3b1, 0xc443, 0xf3b0, 0xf3af, 0xc444, 0xf558, 0xf557, 0xf555,
-  0xf554, 0xc4c8, 0xc4c7, 0xf559, 0xf776, 0xc5b9, 0xf677, 0xc557,
-  0xf676, 0xf556, 0xf777, 0xc5e4, 0xc661, 0xf959, 0xf9b1, 0xadba,
-  0xd850, 0xef55, 0xadbb, 0xe4d2, 0xe4d1, 0xec60, 0xef57, 0xef56,
-  0xc34c, 0xf3b2, 0xf3b3, 0xc4c9, 0xf9b2, 0xb0a8, 0xb6bf, 0xb6be,
-  0xe0e4, 0xe0e6, 0xb9a4, 0xe0e5, 0xb9a3, 0xb9a5, 0xe0e7, 0xe4d4,
-  0xe4d6, 0xe4d5, 0xe4d8, 0xbbe9, 0xe4d7, 0xe4d3, 0xe4d9, 0xe8cc,
-  0xe8cf, 0xe8d1, 0xe8c7, 0xe8cb, 0xe8c8, 0xbe6e, 0xbe71, 0xbe73,
-  0xe8c9, 0xe8ca, 0xbe72, 0xe8cd, 0xe8d0, 0xe8ce, 0xbe74, 0xbe70,
-  0xe8c6, 0xbe6d, 0xbe6f, 0xc063, 0xec66, 0xec64, 0xec63, 0xec69,
-  0xec68, 0xec67, 0xec62, 0xc062, 0xec61, 0xec65, 0xc064, 0xef5a,
-  0xef5e, 0xef5b, 0xef5d, 0xef5c, 0xef59, 0xef5f, 0xef62, 0xef60,
-  0xef61, 0xc240, 0xc1fe, 0xef58, 0xef63, 0xf1b3, 0xf1b6, 0xf1b8,
-  0xf1b7, 0xf1b1, 0xf1b5, 0xf1b0, 0xf1b2, 0xc34d, 0xf1af, 0xf1b4,
-  0xf3c0, 0xf3b5, 0xc445, 0xc446, 0xf3b4, 0xf3b9, 0xf3bf, 0xf3b7,
-  0xf3be, 0xf3bb, 0xf3ba, 0xf3bd, 0xf3b8, 0xf3b6, 0xf3bc, 0xf560,
-  0xf55e, 0xc4ca, 0xf55d, 0xf563, 0xf561, 0xc4cb, 0xf55c, 0xf55a,
-  0xf55b, 0xc4cd, 0xf55f, 0xc4cc, 0xf562, 0xf678, 0xf67e, 0xf679,
-  0xc55b, 0xf6a1, 0xc55a, 0xf67d, 0xf67c, 0xc559, 0xf67b, 0xc558,
-  0xf67a, 0xf77d, 0xf7a1, 0xf77e, 0xf77b, 0xc5bb, 0xf778, 0xf77c,
-  0xf7a3, 0xf7a2, 0xf779, 0xf77a, 0xc5ba, 0xf852, 0xc5e7, 0xf853,
-  0xc5e5, 0xc5e6, 0xf8d3, 0xc64a, 0xf976, 0xc66a, 0xf9b3, 0xc66b,
-  0xf9b4, 0xf9b5, 0xf9c3, 0xf9c2, 0xc67a, 0xf9cd, 0xb0a9, 0xe0e9,
-  0xe0e8, 0xbbea, 0xbbeb, 0xe4da, 0xe8d2, 0xec6c, 0xbe75, 0xc065,
-  0xec6a, 0xec6d, 0xc066, 0xef64, 0xec6b, 0xf1b9, 0xc34e, 0xf3c1,
-  0xf566, 0xf564, 0xf565, 0xf6a2, 0xc55c, 0xf7a4, 0xc5ea, 0xc5bc,
-  0xc5e8, 0xc5e9, 0xf8d4, 0xc662, 0xb0aa, 0xf1ba, 0xd449, 0xb9a6,
-  0xe4db, 0xbbec, 0xe4dc, 0xe8d4, 0xe8d3, 0xc068, 0xbe76, 0xbe77,
-  0xe8d7, 0xe8d6, 0xe8d5, 0xec6e, 0xec71, 0xec70, 0xec6f, 0xc067,
-  0xef68, 0xef66, 0xef65, 0xef67, 0xc34f, 0xf1bc, 0xf1bd, 0xc350,
-  0xf1bb, 0xf3c3, 0xf3c2, 0xf3c5, 0xc447, 0xf3c4, 0xf567, 0xf569,
-  0xf568, 0xf6a3, 0xf6a6, 0xf6a4, 0xf6a5, 0xf7a5, 0xc5bd, 0xf854,
-  0xf855, 0xf856, 0xc64b, 0xc663, 0xf9b6, 0xb0ab, 0xbe78, 0xc069,
-  0xf1be, 0xf7a6, 0xf9c4, 0xd44a, 0xc67b, 0xb0ac, 0xec72, 0xf1bf,
-  0xf3c6, 0xf6a7, 0xf7a7, 0xb0ad, 0xe4dd, 0xe4de, 0xbbed, 0xbbee,
-  0xe8d9, 0xbe7a, 0xbe79, 0xe8d8, 0xef69, 0xf1c0, 0xf1c2, 0xf1c1,
-  0xc353, 0xc352, 0xc351, 0xc55e, 0xf6a8, 0xc55d, 0xf7a9, 0xf7a8,
-  0xc64c, 0xf8d5, 0xb3bd, 0xe0ea, 0xe4e1, 0xe4df, 0xe4e0, 0xe8e2,
-  0xe8dd, 0xe8da, 0xe8e1, 0xe8e3, 0xbe7c, 0xe8e0, 0xe8dc, 0xe8db,
-  0xe8df, 0xe8de, 0xbe7b, 0xec7d, 0xec78, 0xec76, 0xeca1, 0xec77,
-  0xec73, 0xec79, 0xec74, 0xef72, 0xec75, 0xeca2, 0xec7c, 0xc06a,
-  0xec7b, 0xec7a, 0xec7e, 0xef6a, 0xef6d, 0xef6c, 0xef74, 0xef6f,
-  0xef73, 0xef71, 0xef70, 0xef6e, 0xef6b, 0xc243, 0xc242, 0xc244,
-  0xc241, 0xef75, 0xf1c8, 0xf1cb, 0xf1c9, 0xf1cd, 0xf1ce, 0xf1c6,
-  0xc358, 0xf1c7, 0xf1c5, 0xf1cc, 0xf1c4, 0xf1c3, 0xc357, 0xc355,
-  0xc354, 0xf1ca, 0xf3cf, 0xf3d5, 0xc44a, 0xf3d0, 0xf3d3, 0xf3d7,
-  0xc44b, 0xf3d2, 0xf3ca, 0xf3c9, 0xf3d6, 0xf3cd, 0xf3cb, 0xf3d4,
-  0xf3cc, 0xc449, 0xc448, 0xf3c7, 0xf3c8, 0xf3d1, 0xf3ce, 0xf56c,
-  0xf56f, 0xc356, 0xf56d, 0xf573, 0xf571, 0xf56b, 0xf576, 0xf56a,
-  0xc4cf, 0xf572, 0xf56e, 0xc4ce, 0xf575, 0xf574, 0xf6ab, 0xf6aa,
-  0xf6b1, 0xf6ad, 0xf6b0, 0xc560, 0xf6ae, 0xf6af, 0xf6a9, 0xf6ac,
-  0xc55f, 0xc5bf, 0xf7b4, 0xf7af, 0xf7b3, 0xf7b6, 0xf7b2, 0xf7ae,
-  0xc5c1, 0xf7b1, 0xf7b5, 0xc5c0, 0xf7ac, 0xf570, 0xf7b0, 0xf7ad,
-  0xf7aa, 0xf7ab, 0xc5be, 0xf85a, 0xf85c, 0xf85f, 0xf85b, 0xf860,
-  0xf859, 0xf857, 0xc5eb, 0xf85d, 0xc5ed, 0xc5ec, 0xf858, 0xf85e,
-  0xf8da, 0xc64d, 0xf8db, 0xf8d9, 0xf8d6, 0xf8d8, 0xf8d7, 0xf95a,
-  0xf95c, 0xf95b, 0xf979, 0xf978, 0xf977, 0xf97a, 0xc673, 0xc674,
-  0xf9ca, 0xf9ce, 0xb3be, 0xdcaf, 0xe0ed, 0xb9a7, 0xe0eb, 0xe0ec,
-  0xe4e2, 0xe4e3, 0xbbf1, 0xbbef, 0xe4e4, 0xbbf0, 0xe8e8, 0xe8eb,
-  0xe8e5, 0xe8ec, 0xe8e4, 0xe8e6, 0xe8e7, 0xe8ea, 0xbea1, 0xe8ef,
-  0xe8ee, 0xbe7d, 0xe8e9, 0xe8ed, 0xbe7e, 0xecac, 0xc06f, 0xeca7,
-  0xc06b, 0xeca4, 0xecaa, 0xecad, 0xc070, 0xeca9, 0xeca6, 0xecae,
-  0xeca5, 0xecab, 0xc06c, 0xeca3, 0xc06d, 0xc06e, 0xeca8, 0xefa9,
-  0xef7a, 0xef7b, 0xef7e, 0xef7c, 0xef76, 0xef79, 0xefa5, 0xef7d,
-  0xc245, 0xefa7, 0xefa4, 0xc246, 0xefa6, 0xef77, 0xefa2, 0xefa3,
-  0xefa1, 0xf1d2, 0xf1d4, 0xf1d7, 0xf1d1, 0xc359, 0xf1d9, 0xf1d0,
-  0xf1da, 0xf1d6, 0xf1d8, 0xf1dc, 0xf1d5, 0xf1dd, 0xf1d3, 0xf1cf,
-  0xc35a, 0xf1db, 0xc35b, 0xc44d, 0xef78, 0xf3f1, 0xf3e8, 0xc44f,
-  0xf3e4, 0xc450, 0xf3ed, 0xf3e7, 0xf3dd, 0xc44e, 0xf3ea, 0xf3e5,
-  0xf3e6, 0xf3d8, 0xf3df, 0xf3ee, 0xf3eb, 0xf3e3, 0xf3ef, 0xf3de,
-  0xf3d9, 0xf3ec, 0xf3db, 0xf3e9, 0xf3e0, 0xf3f0, 0xf3dc, 0xc44c,
-  0xf3da, 0xf3e1, 0xf3e2, 0xf57d, 0xf57b, 0xf5a2, 0xf5ae, 0xf5a5,
-  0xf57c, 0xf578, 0xf5a7, 0xf57e, 0xf5a3, 0xf57a, 0xf5aa, 0xf577,
-  0xf5a1, 0xf5a6, 0xf5a8, 0xf5ab, 0xf579, 0xf5af, 0xf5b0, 0xf5a9,
-  0xf5ad, 0xf5a4, 0xf6c1, 0xf6c4, 0xc561, 0xf6c3, 0xf6c8, 0xf6c6,
-  0xc562, 0xf6bd, 0xf6b3, 0xf6b2, 0xc564, 0xf6bf, 0xf6c0, 0xf6bc,
-  0xf6b4, 0xf6b9, 0xf5ac, 0xf6b5, 0xc563, 0xf6bb, 0xf6ba, 0xf6b6,
-  0xf6c2, 0xf6b7, 0xf7bb, 0xf6c5, 0xf6c7, 0xf6be, 0xf6b8, 0xf7bc,
-  0xf7be, 0xf7b8, 0xc5c2, 0xf7c5, 0xf7c3, 0xc5c3, 0xf7c2, 0xf7c1,
-  0xf7ba, 0xf7b7, 0xf7bd, 0xf7c6, 0xf7b9, 0xf7bf, 0xf869, 0xf86e,
-  0xf864, 0xf867, 0xc5ee, 0xf86b, 0xf872, 0xf7c0, 0xf865, 0xf86f,
-  0xf873, 0xf86a, 0xf863, 0xf86d, 0xf86c, 0xf871, 0xf870, 0xf7c4,
-  0xf868, 0xf862, 0xf866, 0xc64e, 0xc64f, 0xf861, 0xf8e6, 0xf8dd,
-  0xf8e5, 0xf8e2, 0xf8e3, 0xf8dc, 0xf8df, 0xf8e7, 0xf8e1, 0xf8e0,
-  0xf8de, 0xf8e4, 0xf95d, 0xf95e, 0xf960, 0xf95f, 0xf962, 0xf961,
-  0xf97c, 0xf97b, 0xf9b7, 0xf9b8, 0xf9c5, 0xc678, 0xc67c, 0xf9cf,
-  0xc67d, 0xb3bf, 0xc4d0, 0xf6c9, 0xc650, 0xc651, 0xb3c0, 0xe0ee,
-  0xb9a8, 0xe8f0, 0xecb0, 0xecb1, 0xecaf, 0xefab, 0xefaa, 0xc247,
-  0xf1df, 0xefac, 0xf1de, 0xf3f3, 0xc451, 0xc453, 0xf3f2, 0xc452,
-  0xf5b1, 0xf5b3, 0xf5b2, 0xf6ca, 0xc565, 0xc5ef, 0xf8e8, 0xf963,
-  0xf9d2, 0xb3c1, 0xe4e5, 0xbea2, 0xecb3, 0xecb2, 0xefad, 0xc454,
-  0xc4d1, 0xf7c7, 0xf9cb, 0xb3c2, 0xbbf2, 0xbea3, 0xf3f4, 0xf874,
-  0xb6c0, 0xefae, 0xc664, 0xb6c1, 0xbea4, 0xc248, 0xf875, 0xb6c2,
-  0xe8f1, 0xc072, 0xecb4, 0xecb5, 0xc071, 0xefaf, 0xc24c, 0xc24a,
-  0xc24b, 0xc249, 0xf1e0, 0xc35c, 0xf5b5, 0xf5b4, 0xf5b7, 0xf5b6,
-  0xc4d2, 0xf6cb, 0xf6cd, 0xf6cc, 0xc566, 0xf7c8, 0xf876, 0xf877,
-  0xc5f0, 0xf964, 0xf97d, 0xc675, 0xdcb0, 0xecb6, 0xefb0, 0xf3f5,
-  0xe0ef, 0xefb1, 0xf1e2, 0xf1e1, 0xf878, 0xc652, 0xf965, 0xf97e,
-  0xb9a9, 0xe8f2, 0xe8f3, 0xecb7, 0xb9aa, 0xc35d, 0xf1e3, 0xf6cf,
-  0xc567, 0xf6d0, 0xf6ce, 0xf879, 0xf8e9, 0xb9ab, 0xefb4, 0xefb3,
-  0xefb2, 0xf1e4, 0xf1e8, 0xf1e7, 0xf1e6, 0xf1e5, 0xc35e, 0xf3f6,
-  0xf5b9, 0xc4d3, 0xf5b8, 0xf6d1, 0xf7cb, 0xf7ca, 0xc5c4, 0xf7c9,
-  0xf87c, 0xf87b, 0xf87a, 0xbbf3, 0xecb8, 0xc24d, 0xf3f7, 0xf3f8,
-  0xf7cc, 0xf87d, 0xf8ea, 0xf966, 0xf9b9, 0xf9d4, 0xbbf4, 0xc24e,
-  0xf1e9, 0xf3f9, 0xf6d2, 0xf87e, 0xbea6, 0xefb5, 0xf1ea, 0xf3fa,
-  0xf3fb, 0xf3fc, 0xf5be, 0xf5ba, 0xc568, 0xf5bd, 0xf5bc, 0xc4d4,
-  0xf5bb, 0xc4d6, 0xc4d5, 0xf6d4, 0xf6d3, 0xc569, 0xc56a, 0xc5c6,
-  0xf7cd, 0xc5c5, 0xf8a3, 0xf8a4, 0xf8a2, 0xf8a1, 0xc654, 0xf8eb,
-  0xf8ec, 0xf8ed, 0xc653, 0xf967, 0xf96a, 0xf969, 0xf968, 0xf9d3,
-  0xc073, 0xc365, 0xf5bf, 0xf6d5, 0xc5c7, 0xf7ce, 0xf9d5, 0xc074,
-  0xefb6, 0xf7cf, 0xf9a1, 0xc94a, 0xddfc, 0xa14a, 0xa157, 0xa159,
-  0xa15b, 0xa15f, 0xa160, 0xa163, 0xa164, 0xa167, 0xa168, 0xa16b,
-  0xa16c, 0xa16f, 0xa170, 0xa173, 0xa174, 0xa177, 0xa178, 0xa17b,
-  0xa17c, 0xa1c6, 0xa1c7, 0xa1ca, 0xa1cb, 0xa1c8, 0xa1c9, 0xa15c,
-  0xa14d, 0xa14f, 0xa151, 0xa152, 0xa153, 0xa154, 0xa17d, 0xa17e,
-  0xa1a1, 0xa1a2, 0xa1a3, 0xa1a4, 0xa1cc, 0xa1cd, 0xa1ce, 0xa1de,
-  0xa1df, 0xa1e0, 0xa1e1, 0xa1e2, 0xa24c, 0xa24d, 0xa24e, 0xa149,
-  0xa1ad, 0xa243, 0xa248, 0xa1ae, 0xa15d, 0xa15e, 0xa1af, 0xa1cf,
-  0xa141, 0xa1d0, 0xa144, 0xa241, 0xa2af, 0xa2b0, 0xa2b1, 0xa2b2,
-  0xa2b3, 0xa2b4, 0xa2b5, 0xa2b6, 0xa2b7, 0xa2b8, 0xa147, 0xa146,
-  0xa1d5, 0xa1d7, 0xa1d6, 0xa148, 0xa249, 0xa2cf, 0xa2d0, 0xa2d1,
-  0xa2d2, 0xa2d3, 0xa2d4, 0xa2d5, 0xa2d6, 0xa2d7, 0xa2d8, 0xa2d9,
-  0xa2da, 0xa2db, 0xa2dc, 0xa2dd, 0xa2de, 0xa2df, 0xa2e0, 0xa2e1,
-  0xa2e2, 0xa2e3, 0xa2e4, 0xa2e5, 0xa2e6, 0xa2e7, 0xa2e8, 0xa242,
-  0xa1c4, 0xa2e9, 0xa2ea, 0xa2eb, 0xa2ec, 0xa2ed, 0xa2ee, 0xa2ef,
-  0xa2f0, 0xa2f1, 0xa2f2, 0xa2f3, 0xa2f4, 0xa2f5, 0xa2f6, 0xa2f7,
-  0xa2f8, 0xa2f9, 0xa2fa, 0xa2fb, 0xa2fc, 0xa2fd, 0xa2fe, 0xa340,
-  0xa341, 0xa342, 0xa343, 0xa161, 0xa155, 0xa162, 0xa14e,
-};
-
-static const Summary16 big5_uni2indx_page00[16] = {
-  /* 0x0000 */
-  {    0, 0x0000 }, {    0, 0x0000 }, {    0, 0x0000 }, {    0, 0x0000 },
-  {    0, 0x0000 }, {    0, 0x0000 }, {    0, 0x0000 }, {    0, 0x0000 },
-  {    0, 0x0000 }, {    0, 0x0000 }, {    0, 0x00ac }, {    4, 0x0083 },
-  {    7, 0x0000 }, {    7, 0x0080 }, {    8, 0x0000 }, {    8, 0x0080 },
-};
-static const Summary16 big5_uni2indx_page02[38] = {
-  /* 0x0200 */
-  {    9, 0x0000 }, {    9, 0x0000 }, {    9, 0x0000 }, {    9, 0x0000 },
-  {    9, 0x0000 }, {    9, 0x0000 }, {    9, 0x0000 }, {    9, 0x0000 },
-  {    9, 0x0000 }, {    9, 0x0000 }, {    9, 0x0000 }, {    9, 0x0000 },
-  {    9, 0x0e80 }, {   13, 0x0200 }, {   14, 0x0000 }, {   14, 0x0000 },
-  /* 0x0300 */
-  {   14, 0x0000 }, {   14, 0x0000 }, {   14, 0x0000 }, {   14, 0x0000 },
-  {   14, 0x0000 }, {   14, 0x0000 }, {   14, 0x0000 }, {   14, 0x0000 },
-  {   14, 0x0000 }, {   14, 0xfffe }, {   29, 0x03fb }, {   38, 0xfffe },
-  {   53, 0x03fb }, {   62, 0x0000 }, {   62, 0x0000 }, {   62, 0x0000 },
-  /* 0x0400 */
-  {   62, 0x0002 }, {   63, 0x1ff0 }, {   72, 0xfff8 }, {   85, 0xffff },
-  {  101, 0xffff }, {  117, 0x0002 },
-};
-static const Summary16 big5_uni2indx_page20[44] = {
-  /* 0x2000 */
-  {  118, 0x0000 }, {  118, 0x3318 }, {  124, 0x0064 }, {  127, 0x4824 },
-  {  131, 0x0000 }, {  131, 0x0000 }, {  131, 0x0000 }, {  131, 0x0000 },
-  {  131, 0x0000 }, {  131, 0x0000 }, {  131, 0x0000 }, {  131, 0x0000 },
-  {  131, 0x0000 }, {  131, 0x0000 }, {  131, 0x0000 }, {  131, 0x0000 },
-  /* 0x2100 */
-  {  131, 0x0228 }, {  134, 0x0000 }, {  134, 0x0000 }, {  134, 0x0000 },
-  {  134, 0x0000 }, {  134, 0x0000 }, {  134, 0x03ff }, {  144, 0x0000 },
-  {  144, 0x0000 }, {  144, 0x03cf }, {  152, 0x0000 }, {  152, 0x0000 },
-  {  152, 0x0000 }, {  152, 0x0000 }, {  152, 0x0000 }, {  152, 0x0000 },
-  /* 0x2200 */
-  {  152, 0x0000 }, {  152, 0xc400 }, {  155, 0x4e29 }, {  162, 0x1030 },
-  {  165, 0x0000 }, {  165, 0x0004 }, {  166, 0x00c3 }, {  170, 0x0000 },
-  {  170, 0x0000 }, {  170, 0x0000 }, {  170, 0x0020 }, {  171, 0x8000 },
-};
-static const Summary16 big5_uni2indx_page24[37] = {
-  /* 0x2400 */
-  {  172, 0x0000 }, {  172, 0x0000 }, {  172, 0x0000 }, {  172, 0x0000 },
-  {  172, 0x0000 }, {  172, 0x0000 }, {  172, 0x03ff }, {  182, 0x3ff0 },
-  {  192, 0x0000 }, {  192, 0x0000 }, {  192, 0x0000 }, {  192, 0x0000 },
-  {  192, 0x0000 }, {  192, 0x0000 }, {  192, 0x0000 }, {  192, 0x0000 },
-  /* 0x2500 */
-  {  192, 0x1005 }, {  195, 0x1111 }, {  199, 0x1010 }, {  201, 0x1010 },
-  {  203, 0x0000 }, {  203, 0x4001 }, {  205, 0xe402 }, {  210, 0x000f },
-  {  214, 0xfffe }, {  229, 0x0030 }, {  231, 0x0003 }, {  233, 0x300c },
-  {  237, 0xc8c0 }, {  242, 0x0000 }, {  242, 0x003c }, {  246, 0x0000 },
-  /* 0x2600 */
-  {  246, 0x0260 }, {  249, 0x0000 }, {  249, 0x0000 }, {  249, 0x0000 },
-  {  249, 0x0007 },
-};
-static const Summary16 big5_uni2indx_page30[62] = {
-  /* 0x3000 */
-  {  252, 0xff2f }, {  265, 0x6037 }, {  272, 0x03fe }, {  281, 0x0000 },
-  {  281, 0xfffe }, {  296, 0xffff }, {  312, 0xffff }, {  328, 0xffff },
-  {  344, 0xffff }, {  360, 0x600f }, {  366, 0xfffe }, {  381, 0xffff },
-  {  397, 0xffff }, {  413, 0xffff }, {  429, 0xffff }, {  445, 0x407f },
-  /* 0x3100 */
-  {  453, 0xffe0 }, {  464, 0xffff }, {  480, 0x03ff }, {  490, 0x0000 },
-  {  490, 0x0000 }, {  490, 0x0000 }, {  490, 0x0000 }, {  490, 0x0000 },
-  {  490, 0x0000 }, {  490, 0x0000 }, {  490, 0x0000 }, {  490, 0x0000 },
-  {  490, 0x0000 }, {  490, 0x0000 }, {  490, 0x0000 }, {  490, 0x0000 },
-  /* 0x3200 */
-  {  490, 0x0000 }, {  490, 0x0000 }, {  490, 0x0000 }, {  490, 0x0000 },
-  {  490, 0x0000 }, {  490, 0x0000 }, {  490, 0x0000 }, {  490, 0x0000 },
-  {  490, 0x0000 }, {  490, 0x0000 }, {  490, 0x0008 }, {  491, 0x0000 },
-  {  491, 0x0000 }, {  491, 0x0000 }, {  491, 0x0000 }, {  491, 0x0000 },
-  /* 0x3300 */
-  {  491, 0x0000 }, {  491, 0x0000 }, {  491, 0x0000 }, {  491, 0x0000 },
-  {  491, 0x0000 }, {  491, 0x0000 }, {  491, 0x0000 }, {  491, 0x0000 },
-  {  491, 0xc000 }, {  493, 0x7000 }, {  496, 0x0002 }, {  497, 0x0000 },
-  {  497, 0x4010 }, {  499, 0x0026 },
-};
-static const Summary16 big5_uni2indx_page4e[1307] = {
-  /* 0x4e00 */
-  {  502, 0xff8b }, {  514, 0xc373 }, {  523, 0x6840 }, {  527, 0x1b0f },
-  {  535, 0xe9ac }, {  544, 0xf34c }, {  553, 0x0200 }, {  554, 0xc008 },
-  {  557, 0x795c }, {  566, 0xca3e }, {  575, 0x7976 }, {  585, 0x0648 },
-  {  589, 0x2fdf }, {  601, 0xf7f0 }, {  612, 0x033a }, {  618, 0xa8ff },
-  /* 0x4f00 */
-  {  629, 0xef37 }, {  641, 0x233f }, {  650, 0xb004 }, {  654, 0xfd59 },
-  {  665, 0xf3ca }, {  675, 0xffff }, {  691, 0xde9f }, {  703, 0xfff9 },
-  {  717, 0xabff }, {  730, 0x7df7 }, {  743, 0xc000 }, {  745, 0x8eec },
-  {  754, 0xeebf }, {  767, 0xffdb }, {  781, 0xd003 }, {  786, 0x45fa },
-  /* 0x5000 */
-  {  795, 0xfae1 }, {  805, 0xdffe }, {  819, 0xbfef }, {  833, 0x10ab },
-  {  839, 0xffeb }, {  853, 0xfcaa }, {  863, 0xef3f }, {  876, 0x24fd },
-  {  885, 0x78ad }, {  894, 0x7f76 }, {  906, 0xf00c }, {  912, 0xedff },
-  {  926, 0xcff6 }, {  938, 0x2cfa }, {  947, 0xf7f9 }, {  960, 0xeb6b },
-  /* 0x5100 */
-  {  971, 0x1ffd }, {  983, 0x95bf }, {  994, 0x6677 }, { 1004, 0xbfbf },
-  { 1018, 0x3bfb }, { 1030, 0xfeb4 }, { 1041, 0x7bae }, { 1052, 0x11e2 },
-  { 1058, 0xa681 }, { 1064, 0x41be }, { 1072, 0x1435 }, { 1078, 0x72c3 },
-  { 1086, 0x7d70 }, { 1095, 0x7191 }, { 1102, 0x0003 }, { 1104, 0x276b },
-  /* 0x5200 */
-  { 1113, 0x57cb }, { 1123, 0x70cf }, { 1132, 0x4732 }, { 1139, 0x0def },
-  { 1149, 0x7eda }, { 1160, 0xfc74 }, { 1170, 0xfe06 }, { 1179, 0xbdb4 },
-  { 1189, 0x3f9f }, { 1201, 0x8bca }, { 1209, 0x7e49 }, { 1218, 0x5800 },
-  { 1221, 0x228f }, { 1228, 0xebec }, { 1239, 0x8a5c }, { 1246, 0xddbb },
-  /* 0x5300 */
-  { 1258, 0xef60 }, { 1267, 0xb6e7 }, { 1278, 0xa40f }, { 1285, 0xf293 },
-  { 1294, 0x37bb }, { 1305, 0x549e }, { 1313, 0xd04b }, { 1320, 0x9baf },
-  { 1331, 0xc414 }, { 1336, 0xf7d4 }, { 1347, 0x30b0 }, { 1352, 0x0a14 },
-  { 1356, 0x2f08 }, { 1362, 0x88d0 }, { 1367, 0xff7e }, { 1381, 0x192f },
-  /* 0x5400 */
-  { 1389, 0xffda }, { 1402, 0xfb07 }, { 1412, 0x7ff1 }, { 1424, 0x7beb },
-  { 1436, 0xc5ef }, { 1447, 0x0010 }, { 1448, 0x99ff }, { 1460, 0xfdff },
-  { 1475, 0x79d7 }, { 1486, 0x0567 }, { 1493, 0xffe7 }, { 1507, 0xfdcb },
-  { 1519, 0xc3ff }, { 1531, 0x4040 }, { 1533, 0x6ff7 }, { 1546, 0xbd8e },
-  /* 0x5500 */
-  { 1556, 0xdffa }, { 1569, 0x0497 }, { 1575, 0xf4c0 }, { 1582, 0x5bff },
-  { 1595, 0xed7b }, { 1607, 0xd0e7 }, { 1616, 0x047e }, { 1623, 0xf8e0 },
-  { 1631, 0xff9f }, { 1645, 0xb73e }, { 1656, 0x7dfe }, { 1669, 0x882e },
-  { 1675, 0xfffd }, { 1690, 0xbe7f }, { 1703, 0x83fe }, { 1713, 0xf6c4 },
-  /* 0x5600 */
-  { 1722, 0xf357 }, { 1733, 0xb8fd }, { 1744, 0xd680 }, { 1750, 0xef7d },
-  { 1763, 0x5767 }, { 1773, 0x4788 }, { 1779, 0xff7d }, { 1793, 0xc3df },
-  { 1804, 0xf0ff }, { 1816, 0x37a9 }, { 1825, 0x7de0 }, { 1834, 0x70fc },
-  { 1843, 0x3f6f }, { 1855, 0xec9a }, { 1864, 0x4cb3 }, { 1872, 0x8681 },
-  /* 0x5700 */
-  { 1877, 0x3f9e }, { 1888, 0xdd5c }, { 1898, 0xf70d }, { 1908, 0x4819 },
-  { 1913, 0xfea3 }, { 1924, 0x0007 }, { 1927, 0xaf56 }, { 1937, 0x38ff },
-  { 1948, 0x980d }, { 1954, 0xefb8 }, { 1965, 0x403d }, { 1971, 0xb760 },
-  { 1979, 0xd8ce }, { 1988, 0x9035 }, { 1994, 0x72bf }, { 2005, 0x3fff },
-  /* 0x5800 */
-  { 2019, 0x7ff7 }, { 2033, 0x7a11 }, { 2040, 0xf7bb }, { 2053, 0xabff },
-  { 2066, 0xff00 }, { 2074, 0x6fbe }, { 2086, 0xa93c }, { 2094, 0xfe72 },
-  { 2105, 0xcfef }, { 2118, 0xf11b }, { 2127, 0xdb6b }, { 2138, 0xf40a },
-  { 2145, 0xc3e6 }, { 2154, 0xef7e }, { 2167, 0x9b9c }, { 2176, 0xf610 },
-  /* 0x5900 */
-  { 2183, 0xf048 }, { 2189, 0x16f4 }, { 2197, 0xfeb5 }, { 2209, 0x5182 },
-  { 2214, 0xc7b1 }, { 2223, 0x15bb }, { 2232, 0x6e87 }, { 2241, 0xfbdf },
-  { 2255, 0xe43f }, { 2265, 0x63cd }, { 2274, 0xc1ff }, { 2285, 0x7e7e },
-  { 2297, 0xfdeb }, { 2310, 0x7d5f }, { 2322, 0x777b }, { 2334, 0xfcfe },
-  /* 0x5a00 */
-  { 2347, 0x960b }, { 2354, 0xdbea }, { 2365, 0x6229 }, { 2371, 0x53e8 },
-  { 2379, 0x37df }, { 2391, 0xfdef }, { 2405, 0x36f5 }, { 2415, 0xbd81 },
-  { 2423, 0xdc18 }, { 2430, 0xfcbd }, { 2442, 0xd2e4 }, { 2450, 0xffff },
-  { 2466, 0x3fd7 }, { 2478, 0xffe0 }, { 2489, 0x7f6f }, { 2502, 0xabf8 },
-  /* 0x5b00 */
-  { 2512, 0x9bae }, { 2522, 0x6ed9 }, { 2532, 0xf5fb }, { 2545, 0xf115 },
-  { 2553, 0x79a9 }, { 2562, 0xbdfb }, { 2575, 0x5a3c }, { 2583, 0xadaf },
-  { 2594, 0xdbba }, { 2605, 0x1fac }, { 2614, 0x71fc }, { 2624, 0x8379 },
-  { 2632, 0x7cf7 }, { 2644, 0xc35f }, { 2654, 0xdfff }, { 2669, 0x0567 },
-  /* 0x5c00 */
-  { 2676, 0xff9a }, { 2688, 0x8467 }, { 2695, 0x1534 }, { 2701, 0xdf8b },
-  { 2712, 0xf9f3 }, { 2724, 0x3373 }, { 2733, 0xf7bd }, { 2746, 0x5e1a },
-  { 2754, 0xbf40 }, { 2762, 0xa03f }, { 2770, 0xffff }, { 2786, 0x01eb },
-  { 2793, 0xdfc0 }, { 2802, 0xcfdd }, { 2814, 0x7500 }, { 2819, 0xabd3 },
-  /* 0x5d00 */
-  { 2829, 0xf8c3 }, { 2838, 0xeed6 }, { 2849, 0x43fd }, { 2859, 0xb7ff },
-  { 2873, 0x5eaf }, { 2884, 0x4227 }, { 2890, 0x9bac }, { 2899, 0xf686 },
-  { 2908, 0x27d7 }, { 2918, 0xf6bc }, { 2929, 0xf787 }, { 2940, 0x35b7 },
-  { 2950, 0xaacd }, { 2959, 0xe176 }, { 2968, 0x49e7 }, { 2977, 0xe29f },
-  /* 0x5e00 */
-  { 2987, 0x545c }, { 2994, 0xaff2 }, { 3005, 0x2b3f }, { 3015, 0x61d8 },
-  { 3022, 0xfc3b }, { 3033, 0xbbb8 }, { 3043, 0xffcf }, { 3057, 0x7b7d },
-  { 3069, 0xbf95 }, { 3080, 0x1ce0 }, { 3086, 0x7dfd }, { 3099, 0x43ff },
-  { 3110, 0x5ff6 }, { 3122, 0xfffe }, { 3137, 0xd3ef }, { 3149, 0xc4ce },
-  /* 0x5f00 */
-  { 3157, 0x8db6 }, { 3166, 0xadbc }, { 3176, 0x63dc }, { 3185, 0x11eb },
-  { 3193, 0xdf59 }, { 3204, 0x23d0 }, { 3210, 0xbeb4 }, { 3220, 0xf3db },
-  { 3232, 0x1fe7 }, { 3243, 0xdbc7 }, { 3254, 0xff63 }, { 3266, 0xfae4 },
-  { 3276, 0xb22b }, { 3284, 0x63f7 }, { 3295, 0xed3b }, { 3306, 0xadba },
-  /* 0x6000 */
-  { 3316, 0xfe01 }, { 3324, 0x7eff }, { 3338, 0xfff7 }, { 3353, 0x02bc },
-  { 3359, 0x32ff }, { 3370, 0xef39 }, { 3381, 0xfffc }, { 3395, 0x8005 },
-  { 3398, 0x77fb }, { 3411, 0xbcf5 }, { 3422, 0x010d }, { 3426, 0xfff7 },
-  { 3441, 0xfffb }, { 3456, 0xbf3a }, { 3467, 0x0057 }, { 3472, 0xdfff },
-  /* 0x6100 */
-  { 3487, 0xef7b }, { 3500, 0xbd7d }, { 3512, 0xdb88 }, { 3520, 0xc8d4 },
-  { 3527, 0xfff3 }, { 3541, 0xed7c }, { 3552, 0x5dee }, { 3563, 0x56ff },
-  { 3575, 0x7e0d }, { 3584, 0xac5f }, { 3594, 0xff96 }, { 3606, 0xd57f },
-  { 3618, 0x3fee }, { 3630, 0xc140 }, { 3634, 0x6ff9 }, { 3646, 0xffe7 },
-  /* 0x6200 */
-  { 3660, 0x779b }, { 3671, 0x8e77 }, { 3681, 0x6ebf }, { 3693, 0xe45d },
-  { 3702, 0x6fcf }, { 3714, 0x5f1f }, { 3725, 0xe07f }, { 3735, 0xfedf },
-  { 3749, 0xd7db }, { 3761, 0x01fe }, { 3769, 0xff00 }, { 3777, 0xfb7b },
-  { 3790, 0xffd4 }, { 3802, 0x1fdf }, { 3814, 0xf800 }, { 3819, 0xffff },
-  /* 0x6300 */
-  { 3835, 0xfb8f }, { 3847, 0x007b }, { 3853, 0xbf00 }, { 3860, 0x7f5c },
-  { 3871, 0xffff }, { 3887, 0x07f3 }, { 3896, 0xeba0 }, { 3904, 0x3de7 },
-  { 3915, 0xf7bf }, { 3929, 0xfbd7 }, { 3942, 0xffbf }, { 3957, 0x6003 },
-  { 3961, 0xfffd }, { 3976, 0xbfed }, { 3989, 0xefbb }, { 4002, 0x027f },
-  /* 0x6400 */
-  { 4010, 0xfe40 }, { 4018, 0xddfd }, { 4031, 0xfdff }, { 4046, 0xe2f9 },
-  { 4056, 0x680b }, { 4062, 0xfb1f }, { 4074, 0xfbe3 }, { 4086, 0xaffd },
-  { 4099, 0x9fa4 }, { 4108, 0xf7ed }, { 4121, 0x7a7d }, { 4132, 0xf80f },
-  { 4141, 0xeebe }, { 4153, 0x0fd5 }, { 4162, 0xbb5d }, { 4173, 0xfd9f },
-  /* 0x6500 */
-  { 4186, 0xf2db }, { 4197, 0x3bf9 }, { 4208, 0xfe7f }, { 4222, 0xebcc },
-  { 4232, 0x876a }, { 4240, 0x73fa }, { 4251, 0x95fc }, { 4261, 0x9ffc },
-  { 4273, 0x109f }, { 4280, 0xfaf7 }, { 4293, 0xddb7 }, { 4305, 0xbbcd },
-  { 4316, 0xf87e }, { 4327, 0xeccd }, { 4337, 0xf366 }, { 4347, 0x3c3f },
-  /* 0x6600 */
-  { 4357, 0xfffd }, { 4372, 0xb03f }, { 4381, 0xe9f7 }, { 4393, 0x067e },
-  { 4401, 0x96ae }, { 4410, 0xfe06 }, { 4419, 0xd576 }, { 4429, 0x5fd7 },
-  { 4441, 0x3fd1 }, { 4451, 0xa3f3 }, { 4461, 0xcf07 }, { 4470, 0x6fb7 },
-  { 4482, 0x9fd1 }, { 4492, 0x7f44 }, { 4501, 0x7b59 }, { 4511, 0xd3dd },
-  /* 0x6700 */
-  { 4522, 0xaf3b }, { 4533, 0xa9bd }, { 4543, 0x7dcf }, { 4555, 0xff3a },
-  { 4567, 0xfbe0 }, { 4577, 0xf6eb }, { 4589, 0xb401 }, { 4594, 0xffff },
-  { 4610, 0x7afa }, { 4621, 0xb7bf }, { 4634, 0xc000 }, { 4636, 0x0ffd },
-  { 4647, 0xff7f }, { 4662, 0xff1f }, { 4675, 0xfefc }, { 4688, 0x95ff },
-  /* 0x6800 */
-  { 4700, 0x0000 }, { 4700, 0xb5dc }, { 4710, 0xef63 }, { 4721, 0x3f3e },
-  { 4732, 0xfb7f }, { 4746, 0x001b }, { 4750, 0xe800 }, { 4754, 0xfbf6 },
-  { 4767, 0x9eef }, { 4779, 0xb8df }, { 4790, 0xff9f }, { 4804, 0x003f },
-  { 4810, 0x7bd0 }, { 4819, 0xf5ff }, { 4833, 0xdfdb }, { 4846, 0x3fff },
-  /* 0x6900 */
-  { 4860, 0xfdf0 }, { 4871, 0x00bf }, { 4878, 0x8420 }, { 4881, 0xbbbd },
-  { 4893, 0xdf37 }, { 4905, 0xffde }, { 4919, 0xff6d }, { 4932, 0x0ff3 },
-  { 4942, 0x604c }, { 4947, 0x5efb }, { 4959, 0xfffb }, { 4974, 0xfafb },
-  { 4987, 0xfe5e }, { 4999, 0x0219 }, { 5003, 0x79f4 }, { 5013, 0xf9de },
-  /* 0x6a00 */
-  { 5025, 0xa7f7 }, { 5037, 0xebfa }, { 5049, 0x01eb }, { 5056, 0xff34 },
-  { 5067, 0xebd3 }, { 5078, 0xef73 }, { 5090, 0xafd7 }, { 5102, 0xc040 },
-  { 5105, 0x72bb }, { 5115, 0xdcff }, { 5128, 0xf17f }, { 5140, 0x2fd8 },
-  { 5149, 0xb8ec }, { 5158, 0xfe0b }, { 5168, 0xdda3 }, { 5178, 0x1f0b },
-  /* 0x6b00 */
-  { 5186, 0x8f1d }, { 5195, 0x47cf }, { 5205, 0xb12b }, { 5213, 0xffde },
-  { 5227, 0x7fee }, { 5240, 0xda73 }, { 5250, 0x24ff }, { 5260, 0xcbc4 },
-  { 5268, 0xf75d }, { 5280, 0xcbf2 }, { 5290, 0xecfd }, { 5302, 0xb4ed },
-  { 5312, 0xbff9 }, { 5325, 0x4ddd }, { 5335, 0x99dd }, { 5345, 0xfb8d },
-  /* 0x6c00 */
-  { 5356, 0xbb7f }, { 5369, 0xaf7b }, { 5381, 0xddfb }, { 5394, 0xc959 },
-  { 5402, 0xfc4f }, { 5413, 0xfab5 }, { 5424, 0xafe3 }, { 5435, 0x6d5f },
-  { 5446, 0xffff }, { 5462, 0x3f7d }, { 5474, 0x7800 }, { 5478, 0xffdb },
-  { 5492, 0xb6ff }, { 5505, 0x7eff }, { 5519, 0xfbaf }, { 5532, 0x022f },
-  /* 0x6d00 */
-  { 5538, 0xff9b }, { 5551, 0xefc7 }, { 5563, 0xffa5 }, { 5575, 0xffff },
-  { 5591, 0x0007 }, { 5594, 0xc700 }, { 5599, 0xf7ff }, { 5614, 0xfff1 },
-  { 5627, 0x7ffd }, { 5641, 0x01bf }, { 5649, 0xdc00 }, { 5654, 0xfdbc },
-  { 5666, 0xbff5 }, { 5679, 0xffff }, { 5695, 0xff7f }, { 5710, 0x3eff },
-  /* 0x6e00 */
-  { 5723, 0x0029 }, { 5726, 0xbe00 }, { 5732, 0xf9ff }, { 5746, 0xff7f },
-  { 5761, 0x6efb }, { 5773, 0xfd7e }, { 5786, 0xcbff }, { 5799, 0x039e },
-  { 5806, 0xe300 }, { 5811, 0xfbdd }, { 5824, 0xccff }, { 5836, 0xf6df },
-  { 5849, 0xffff }, { 5865, 0x117f }, { 5874, 0xf800 }, { 5879, 0xfbf6 },
-  /* 0x6f00 */
-  { 5892, 0xe7ef }, { 5905, 0xd73c }, { 5915, 0xfeef }, { 5929, 0xdfef },
-  { 5943, 0xc00b }, { 5948, 0xedbf }, { 5961, 0xfedf }, { 5975, 0xfdcd },
-  { 5987, 0x7bf5 }, { 5999, 0x40fd }, { 6007, 0xffff }, { 6023, 0xb75f },
-  { 6035, 0xffdf }, { 6050, 0xf930 }, { 6058, 0xfbdf }, { 6072, 0xdc97 },
-  /* 0x7000 */
-  { 6082, 0xfef3 }, { 6095, 0xbff2 }, { 6107, 0x8fdf }, { 6119, 0xdfbf },
-  { 6133, 0x177f }, { 6144, 0xede6 }, { 6155, 0x0f7f }, { 6166, 0x3553 },
-  { 6174, 0x447c }, { 6181, 0x877e }, { 6191, 0xfa12 }, { 6199, 0x45bb },
-  { 6208, 0xede0 }, { 6217, 0x779e }, { 6228, 0x8017 }, { 6233, 0xbfd9 },
-  /* 0x7100 */
-  { 6245, 0x7e55 }, { 6255, 0xde89 }, { 6264, 0xc16f }, { 6273, 0x0447 },
-  { 6278, 0x7ade }, { 6289, 0xf75d }, { 6301, 0x57ff }, { 6314, 0x2905 },
-  { 6319, 0x86f7 }, { 6329, 0xfe95 }, { 6340, 0x97b3 }, { 6350, 0xf32f },
-  { 6361, 0xcfff }, { 6375, 0x9f75 }, { 6386, 0x71f7 }, { 6397, 0xfb17 },
-  /* 0x7200 */
-  { 6408, 0x34ee }, { 6417, 0xee19 }, { 6426, 0x37cc }, { 6435, 0xef61 },
-  { 6445, 0x9fd6 }, { 6456, 0xef4c }, { 6466, 0xd68f }, { 6476, 0xfbdd },
-  { 6489, 0x7b73 }, { 6500, 0x6def }, { 6512, 0xd7fe }, { 6525, 0xa431 },
-  { 6531, 0x5e7f }, { 6543, 0x97d7 }, { 6554, 0x0f5b }, { 6563, 0xffd8 },
-  /* 0x7300 */
-  { 6575, 0x9d83 }, { 6583, 0x7bce }, { 6594, 0x22ec }, { 6601, 0xdcff },
-  { 6614, 0x763d }, { 6624, 0xef87 }, { 6635, 0xdfe7 }, { 6648, 0xfded },
-  { 6661, 0x4fff }, { 6674, 0xa0fc }, { 6682, 0x3b77 }, { 6693, 0xdbfc },
-  { 6705, 0x3ded }, { 6716, 0x7fdc }, { 6728, 0x6fa9 }, { 6738, 0xf570 },
-  /* 0x7400 */
-  { 6747, 0x3ffb }, { 6760, 0x2c40 }, { 6764, 0xff7f }, { 6779, 0x847f },
-  { 6788, 0xec57 }, { 6798, 0xdeb7 }, { 6810, 0xe69c }, { 6819, 0xf22f },
-  { 6829, 0x0feb }, { 6839, 0xd5b5 }, { 6849, 0xafeb }, { 6861, 0xede7 },
-  { 6873, 0x8c2f }, { 6881, 0xfff0 }, { 6893, 0x537f }, { 6904, 0xe8f0 },
-  /* 0x7500 */
-  { 6912, 0xb99d }, { 6922, 0xb5ff }, { 6935, 0xff66 }, { 6947, 0xe78f },
-  { 6958, 0xd981 }, { 6965, 0xbe10 }, { 6972, 0x9c7c }, { 6981, 0xe3c1 },
-  { 6989, 0x9cd1 }, { 6997, 0x2733 }, { 7005, 0x0cbc }, { 7012, 0xff6d },
-  { 7025, 0xfcb7 }, { 7037, 0xefb7 }, { 7050, 0xa0df }, { 7059, 0xffff },
-  /* 0x7600 */
-  { 7075, 0xbf0b }, { 7085, 0xfe7b }, { 7098, 0xa3ff }, { 7110, 0x353f },
-  { 7120, 0x13cc }, { 7127, 0x97cd }, { 7137, 0x7637 }, { 7147, 0xfb27 },
-  { 7158, 0xcfd6 }, { 7169, 0x7e6c }, { 7179, 0xec50 }, { 7186, 0xed31 },
-  { 7195, 0x677c }, { 7205, 0xfc1c }, { 7214, 0xf6fa }, { 7226, 0x5fbf },
-  /* 0x7700 */
-  { 7239, 0x0fba }, { 7248, 0xae2f }, { 7258, 0xa3ad }, { 7267, 0x7ffe },
-  { 7281, 0xfcf0 }, { 7291, 0xde74 }, { 7301, 0xffef }, { 7316, 0xf200 },
-  { 7321, 0xfbbf }, { 7335, 0xfea2 }, { 7345, 0x3daf }, { 7356, 0xbcff },
-  { 7369, 0xf694 }, { 7378, 0x5fb9 }, { 7389, 0xf3ad }, { 7400, 0x3f8f },
-  /* 0x7800 */
-  { 7411, 0xf26c }, { 7420, 0xa01f }, { 7427, 0xffef }, { 7442, 0x01bf },
-  { 7450, 0x7728 }, { 7458, 0x7005 }, { 7463, 0xff35 }, { 7475, 0xda03 },
-  { 7482, 0xd2f9 }, { 7492, 0xc7fa }, { 7503, 0x3fbf }, { 7516, 0x5c1d },
-  { 7524, 0xff3a }, { 7536, 0xec33 }, { 7545, 0xb7af }, { 7557, 0xfe9c },
-  /* 0x7900 */
-  { 7568, 0x5236 }, { 7575, 0x7a9f }, { 7586, 0xbffa }, { 7599, 0xe722 },
-  { 7607, 0x9ff7 }, { 7620, 0xfcff }, { 7634, 0x2fbb }, { 7645, 0xb61d },
-  { 7654, 0xed06 }, { 7662, 0x1dfd }, { 7673, 0x7dd7 }, { 7685, 0xefdf },
-  { 7699, 0xeb23 }, { 7708, 0xf166 }, { 7717, 0x7ed9 }, { 7728, 0x0dc0 },
-  /* 0x7a00 */
-  { 7733, 0x3d3d }, { 7743, 0xdfbf }, { 7757, 0xc945 }, { 7764, 0xba83 },
-  { 7772, 0x7dd1 }, { 7782, 0x9dd0 }, { 7790, 0x7b87 }, { 7800, 0xcf73 },
-  { 7811, 0x9ff3 }, { 7823, 0xc3f5 }, { 7833, 0xdf0d }, { 7843, 0xc5fe },
-  { 7854, 0x0cb3 }, { 7861, 0x8302 }, { 7865, 0xe879 }, { 7874, 0xaec0 },
-  /* 0x7b00 */
-  { 7881, 0xc773 }, { 7891, 0x6f0f }, { 7901, 0xfd7d }, { 7914, 0x093f },
-  { 7922, 0xfff1 }, { 7935, 0x0157 }, { 7941, 0x62fb }, { 7951, 0x01ff },
-  { 7960, 0xfdb4 }, { 7971, 0x3bf3 }, { 7982, 0xb013 }, { 7988, 0x43b2 },
-  { 7995, 0x5ed3 }, { 8005, 0xff30 }, { 8015, 0x0fff }, { 8027, 0xeb9f },
-  /* 0x7c00 */
-  { 8039, 0xfeef }, { 8053, 0xf203 }, { 8060, 0x3fef }, { 8073, 0xfb89 },
-  { 8083, 0x37a9 }, { 8092, 0x9e99 }, { 8101, 0xdef9 }, { 8113, 0xa72c },
-  { 8121, 0x3733 }, { 8130, 0xc1f6 }, { 8139, 0x812e }, { 8145, 0xfe3e },
-  { 8157, 0x5d20 }, { 8163, 0xf2f7 }, { 8175, 0xd585 }, { 8183, 0x69d7 },
-  /* 0x7d00 */
-  { 8193, 0xffff }, { 8209, 0xffff }, { 8225, 0xdb07 }, { 8234, 0xff6f },
-  { 8248, 0xc4ff }, { 8259, 0xd97f }, { 8271, 0xefce }, { 8283, 0xbe0f },
-  { 8293, 0xf17b }, { 8304, 0xf05e }, { 8313, 0xf6cf }, { 8325, 0xffb7 },
-  { 8339, 0x5ef7 }, { 8351, 0xef84 }, { 8360, 0xd7cb }, { 8371, 0x0edf },
-  /* 0x7e00 */
-  { 8381, 0xff08 }, { 8390, 0xfcff }, { 8404, 0xee3f }, { 8416, 0xffff },
-  { 8432, 0x13ff }, { 8443, 0xd7ff }, { 8457, 0xaf0f }, { 8467, 0x7ffd },
-  { 8481, 0xbdc7 }, { 8492, 0x1ffa }, { 8503, 0x0000 }, { 8503, 0x0000 },
-  { 8503, 0x0000 }, { 8503, 0x0000 }, { 8503, 0x0000 }, { 8503, 0x0000 },
-  /* 0x7f00 */
-  { 8503, 0x0000 }, { 8503, 0x0000 }, { 8503, 0x0000 }, { 8503, 0xe740 },
-  { 8510, 0xbd38 }, { 8519, 0xf933 }, { 8529, 0x7feb }, { 8542, 0xfeed },
-  { 8555, 0x7fe8 }, { 8566, 0x7c76 }, { 8576, 0xb3f7 }, { 8588, 0xffef },
-  { 8603, 0xfeaf }, { 8616, 0xd8b7 }, { 8626, 0xff6f }, { 8640, 0xfbbf },
-  /* 0x8000 */
-  { 8654, 0xf8fb }, { 8666, 0xdbf7 }, { 8679, 0x1752 }, { 8686, 0xe2f9 },
-  { 8696, 0x85c8 }, { 8702, 0x7547 }, { 8711, 0x9090 }, { 8715, 0xe3ef },
-  { 8727, 0x9ef4 }, { 8737, 0x3f6d }, { 8748, 0xee2e }, { 8758, 0x0536 },
-  { 8764, 0xf7bc }, { 8776, 0x7ff3 }, { 8789, 0xa07b }, { 8797, 0x7f3f },
-  /* 0x8100 */
-  { 8810, 0x0567 }, { 8817, 0xeb60 }, { 8825, 0xbabe }, { 8836, 0x6601 },
-  { 8841, 0xfcd8 }, { 8851, 0x583f }, { 8860, 0xcaf7 }, { 8871, 0x87df },
-  { 8882, 0xbfcd }, { 8894, 0xffa0 }, { 8904, 0x5bcd }, { 8914, 0xfebf },
-  { 8928, 0xb6fd }, { 8940, 0xefa7 }, { 8952, 0x77ef }, { 8965, 0xdf9c },
-  /* 0x8200 */
-  { 8976, 0x3fb7 }, { 8988, 0xf877 }, { 8999, 0x9d27 }, { 9008, 0xb7fc },
-  { 9020, 0xcab5 }, { 9029, 0xdfef }, { 9043, 0xfb5a }, { 9054, 0xf1b6 },
-  { 9064, 0xec39 }, { 9073, 0xef1f }, { 9085, 0xfbbf }, { 9099, 0x7ffb },
-  { 9113, 0x000d }, { 9116, 0xdafe }, { 9128, 0xbdfb }, { 9141, 0x4e7f },
-  /* 0x8300 */
-  { 9152, 0x33ff }, { 9164, 0x5ac0 }, { 9170, 0xbff5 }, { 9183, 0x9ffe },
-  { 9196, 0xffbf }, { 9211, 0x005f }, { 9217, 0x0000 }, { 9217, 0xfdf8 },
-  { 9229, 0xffca }, { 9241, 0x6ffd }, { 9254, 0xcffd }, { 9267, 0xa001 },
-  { 9270, 0xdfff }, { 9285, 0xfbf2 }, { 9297, 0xdfbf }, { 9311, 0xff7f },
-  /* 0x8400 */
-  { 9326, 0xfeda }, { 9338, 0x080f }, { 9343, 0xba08 }, { 9349, 0xbfff },
-  { 9364, 0x7afd }, { 9376, 0xeed7 }, { 9388, 0xfbeb }, { 9401, 0x67f9 },
-  { 9412, 0xe044 }, { 9417, 0xff93 }, { 9429, 0xdf97 }, { 9441, 0x9f57 },
-  { 9452, 0xfef7 }, { 9466, 0x08df }, { 9474, 0xdf80 }, { 9482, 0xfedf },
-  /* 0x8500 */
-  { 9496, 0xffc5 }, { 9508, 0xf7fe }, { 9522, 0xfffb }, { 9537, 0x6803 },
-  { 9542, 0x67fb }, { 9554, 0x6bfa }, { 9565, 0x7fff }, { 9580, 0x5fe2 },
-  { 9590, 0xffff }, { 9606, 0xff73 }, { 9619, 0x87df }, { 9630, 0xe7fb },
-  { 9643, 0xebfd }, { 9656, 0xf7a7 }, { 9668, 0xbf7e }, { 9681, 0xefc7 },
-  /* 0x8600 */
-  { 9693, 0x1ef3 }, { 9703, 0xdf82 }, { 9712, 0x76ff }, { 9725, 0xdf7e },
-  { 9738, 0x79c9 }, { 9747, 0xda7d }, { 9758, 0xefbe }, { 9771, 0x1e9b },
-  { 9780, 0x7ce0 }, { 9788, 0x77fb }, { 9801, 0x87be }, { 9811, 0xfffb },
-  { 9826, 0x1bff }, { 9838, 0xffdb }, { 9852, 0x3f5c }, { 9862, 0x4fe0 },
-  /* 0x8700 */
-  { 9870, 0x7fff }, { 9885, 0x5f0e }, { 9894, 0x77ff }, { 9908, 0xddbf },
-  { 9921, 0xf04f }, { 9930, 0xffff }, { 9946, 0xffff }, { 9962, 0x0ff8 },
-  { 9971, 0xa3be }, { 9981, 0xfddf }, { 9995, 0xfc1c }, { 10004, 0xfffd },
-  { 10019, 0x1f7d }, { 10030, 0xfb9e }, { 10042, 0xbdff }, { 10056, 0xdedc },
-  /* 0x8800 */
-  { 10067, 0x3f6f }, { 10079, 0xbafb }, { 10091, 0xdf7f }, { 10105, 0xfbef },
-  { 10119, 0x7d1b }, { 10129, 0x2eec }, { 10138, 0xaf8e }, { 10148, 0xf2f7 },
-  { 10160, 0x7b0f }, { 10170, 0xcfee }, { 10182, 0x1d96 }, { 10190, 0x77c6 },
-  { 10200, 0x7e07 }, { 10209, 0xfff5 }, { 10223, 0xd982 }, { 10230, 0x7fdf },
-  /* 0x8900 */
-  { 10244, 0x5ee6 }, { 10254, 0xc7ff }, { 10267, 0xfeee }, { 10280, 0x79ef },
-  { 10292, 0x9a56 }, { 10300, 0xffcf }, { 10314, 0xfe5f }, { 10327, 0xde5e },
-  { 10338, 0x896e }, { 10346, 0xf9e8 }, { 10356, 0xf45e }, { 10366, 0xe6c4 },
-  { 10374, 0x0001 }, { 10375, 0xbe7c }, { 10386, 0x3b7f }, { 10398, 0xdddf },
-  /* 0x8a00 */
-  { 10411, 0xd59d }, { 10421, 0xe9ef }, { 10433, 0x34ac }, { 10440, 0xde53 },
-  { 10450, 0xf573 }, { 10461, 0x4bf7 }, { 10472, 0x7b4f }, { 10483, 0x9eff },
-  { 10496, 0xb8fe }, { 10507, 0x476e }, { 10516, 0x0dfb }, { 10526, 0xff45 },
-  { 10537, 0xabfd }, { 10549, 0xfbfe }, { 10563, 0xe9d7 }, { 10574, 0xddff },
-  /* 0x8b00 */
-  { 10588, 0xedf7 }, { 10601, 0x7fff }, { 10616, 0xddfd }, { 10629, 0x7eeb },
-  { 10641, 0xcfe7 }, { 10653, 0xb7ff }, { 10667, 0xbde9 }, { 10678, 0xef91 },
-  { 10688, 0x5d75 }, { 10698, 0xd77c }, { 10709, 0x0000 }, { 10709, 0x0000 },
-  { 10709, 0x0000 }, { 10709, 0x0000 }, { 10709, 0x0000 }, { 10709, 0x0000 },
-  /* 0x8c00 */
-  { 10709, 0x0000 }, { 10709, 0x0000 }, { 10709, 0x0000 }, { 10709, 0xfa80 },
-  { 10716, 0xffee }, { 10730, 0xb4f1 }, { 10739, 0xbf76 }, { 10751, 0x2fef },
-  { 10763, 0xb677 }, { 10774, 0x77bf }, { 10787, 0x9fbf }, { 10800, 0xfffd },
-  { 10815, 0x95bf }, { 10826, 0xf6ae }, { 10837, 0x75ff }, { 10850, 0x7f3b },
-  /* 0x8d00 */
-  { 10862, 0xa7f5 }, { 10873, 0x0af9 }, { 10881, 0x0000 }, { 10881, 0x0000 },
-  { 10881, 0x0000 }, { 10881, 0x0000 }, { 10881, 0xfbd0 }, { 10891, 0x2bdd },
-  { 10901, 0xf633 }, { 10911, 0x9a7f }, { 10922, 0xfdab }, { 10934, 0xd6fc },
-  { 10945, 0xf9e6 }, { 10956, 0xbfeb }, { 10969, 0xdfdf }, { 10983, 0xf41f },
-  /* 0x8e00 */
-  { 10993, 0xa6fd }, { 11004, 0xffff }, { 11020, 0x4aff }, { 11031, 0xf37b },
-  { 11043, 0x7fb7 }, { 11056, 0xfef9 }, { 11069, 0xb6ff }, { 11082, 0x1d5c },
-  { 11090, 0x7ff6 }, { 11103, 0xe5ff }, { 11116, 0x1f7b }, { 11127, 0x2404 },
-  { 11130, 0xbe05 }, { 11138, 0xf99e }, { 11149, 0xdbe3 }, { 11160, 0xdff2 },
-  /* 0x8f00 */
-  { 11172, 0x6fef }, { 11185, 0xfdff }, { 11200, 0xd679 }, { 11210, 0xcbfc },
-  { 11221, 0xebfd }, { 11234, 0xefff }, { 11249, 0x001f }, { 11254, 0x0000 },
-  { 11254, 0x0000 }, { 11254, 0x9800 }, { 11257, 0xe148 }, { 11263, 0x8017 },
-  { 11268, 0x6a74 }, { 11276, 0x00fe }, { 11283, 0x6d7f }, { 11295, 0xfdf1 },
-  /* 0x9000 */
-  { 11307, 0xb87f }, { 11318, 0xfef3 }, { 11331, 0xe01f }, { 11339, 0xf176 },
-  { 11349, 0xee96 }, { 11359, 0x7b3f }, { 11371, 0xeb8d }, { 11381, 0xfffd },
-  { 11396, 0xadff }, { 11409, 0xcbb3 }, { 11419, 0x84ef }, { 11428, 0xe17f },
-  { 11439, 0x4daa }, { 11447, 0xbff0 }, { 11458, 0xbf3f }, { 11471, 0xfe3f },
-  /* 0x9100 */
-  { 11484, 0xebff }, { 11498, 0xffd7 }, { 11512, 0xffdf }, { 11527, 0xcf7f },
-  { 11540, 0xfffb }, { 11555, 0x85ed }, { 11564, 0xd73f }, { 11576, 0x07bc },
-  { 11584, 0xaeff }, { 11597, 0xfe0f }, { 11608, 0xfdaf }, { 11621, 0x76bf },
-  { 11633, 0xfaef }, { 11646, 0x37bb }, { 11657, 0x7fdc }, { 11669, 0xa3ba },
-  /* 0x9200 */
-  { 11678, 0xb6ff }, { 11691, 0x56f7 }, { 11702, 0x60f8 }, { 11709, 0xe7df },
-  { 11722, 0xff61 }, { 11733, 0x4cdf }, { 11743, 0xb0fb }, { 11753, 0xff45 },
-  { 11764, 0x7ded }, { 11776, 0x3ffa }, { 11788, 0x1fff }, { 11801, 0x18fc },
-  { 11809, 0xffff }, { 11825, 0xe3af }, { 11836, 0xc7d3 }, { 11846, 0xdf83 },
-  /* 0x9300 */
-  { 11856, 0xfb57 }, { 11868, 0xef7d }, { 11881, 0xefff }, { 11896, 0x1378 },
-  { 11903, 0xfec0 }, { 11912, 0x5ff7 }, { 11925, 0x34bb }, { 11934, 0x5ee3 },
-  { 11944, 0xf70d }, { 11954, 0xeff6 }, { 11967, 0xd7fe }, { 11980, 0x00bf },
-  { 11987, 0xf59d }, { 11998, 0xf7f7 }, { 12012, 0x51de }, { 12021, 0xffe0 },
-  /* 0x9400 */
-  { 12032, 0xfec9 }, { 12043, 0x037f }, { 12052, 0x5f01 }, { 12059, 0xbfef },
-  { 12073, 0x9ff1 }, { 12084, 0x60a7 }, { 12091, 0xef1d }, { 12102, 0xf1ff },
-  { 12115, 0x000f }, { 12119, 0x0000 }, { 12119, 0x0000 }, { 12119, 0x0000 },
-  { 12119, 0x0000 }, { 12119, 0x0000 }, { 12119, 0x0000 }, { 12119, 0x0000 },
-  /* 0x9500 */
-  { 12119, 0x0000 }, { 12119, 0x0000 }, { 12119, 0x0000 }, { 12119, 0x0000 },
-  { 12119, 0x0000 }, { 12119, 0x0000 }, { 12119, 0x0000 }, { 12119, 0x3c80 },
-  { 12124, 0xfb4d }, { 12135, 0xd91f }, { 12145, 0x7b3a }, { 12155, 0xfee3 },
-  { 12167, 0x3fe9 }, { 12178, 0xdc7f }, { 12190, 0x003f }, { 12196, 0x0000 },
-  /* 0x9600 */
-  { 12196, 0x0000 }, { 12196, 0x5000 }, { 12198, 0xf51f }, { 12209, 0xbe07 },
-  { 12218, 0xfc1d }, { 12228, 0xf91b }, { 12238, 0xbc1e }, { 12247, 0x71ff },
-  { 12259, 0x6ff9 }, { 12271, 0x5bbe }, { 12282, 0x5796 }, { 12291, 0x9b1b },
-  { 12300, 0x7fff }, { 12315, 0xfffc }, { 12329, 0x872e }, { 12337, 0xafe7 },
-  /* 0x9700 */
-  { 12349, 0xebf5 }, { 12361, 0xf34f }, { 12372, 0xdffd }, { 12386, 0xe725 },
-  { 12395, 0x0bdc }, { 12403, 0x5d44 }, { 12410, 0x5747 }, { 12419, 0xfddd },
-  { 12432, 0xed3f }, { 12444, 0x7790 }, { 12452, 0x7d7f }, { 12465, 0x8ac8 },
-  { 12471, 0xfafa }, { 12483, 0xf3f9 }, { 12495, 0x202a }, { 12499, 0xef4b },
-  /* 0x9800 */
-  { 12510, 0xf5ff }, { 12524, 0x79cf }, { 12535, 0xabd3 }, { 12545, 0x0ba5 },
-  { 12552, 0xf77a }, { 12564, 0xfb8f }, { 12576, 0x8ebd }, { 12586, 0x001f },
-  { 12591, 0x0000 }, { 12591, 0x0000 }, { 12591, 0xf300 }, { 12597, 0xfd4e },
-  { 12608, 0x1a57 }, { 12616, 0x8800 }, { 12618, 0xaeac }, { 12627, 0x7654 },
-  /* 0x9900 */
-  { 12635, 0x17ad }, { 12644, 0xcdff }, { 12657, 0xffb2 }, { 12669, 0xf42f },
-  { 12679, 0x5baa }, { 12688, 0xdbff }, { 12702, 0x0002 }, { 12703, 0x0000 },
-  { 12703, 0x0000 }, { 12703, 0x73c0 }, { 12710, 0xf9ea }, { 12721, 0x2e3f },
-  { 12731, 0xfa8e }, { 12741, 0xbbff }, { 12755, 0x76bc }, { 12765, 0xffd3 },
-  /* 0x9a00 */
-  { 12778, 0xeefe }, { 12791, 0x7e72 }, { 12801, 0x7ebd }, { 12813, 0xe7f7 },
-  { 12826, 0xf77f }, { 12840, 0xcefd }, { 12852, 0x0ff5 }, { 12862, 0x0000 },
-  { 12862, 0x0000 }, { 12862, 0x0000 }, { 12862, 0xa900 }, { 12866, 0xdb9b },
-  { 12877, 0xa4c7 }, { 12885, 0x917f }, { 12895, 0xf8ca }, { 12904, 0x7ece },
-  /* 0x9b00 */
-  { 12915, 0x7d7a }, { 12926, 0xc7e7 }, { 12937, 0xcbbd }, { 12948, 0xdcae },
-  { 12958, 0xfd7e }, { 12971, 0x8f76 }, { 12981, 0x91d3 }, { 12989, 0x7cf3 },
-  { 13000, 0x01e5 }, { 13006, 0x4c2f }, { 13014, 0xed77 }, { 13026, 0xa360 },
-  { 13032, 0x07db }, { 13041, 0x5ef8 }, { 13051, 0x1df7 }, { 13062, 0x2181 },
-  /* 0x9c00 */
-  { 13066, 0x6be0 }, { 13074, 0x309c }, { 13080, 0x3b3a }, { 13089, 0xfade },
-  { 13101, 0x7f53 }, { 13112, 0xc3f5 }, { 13122, 0x61cd }, { 13130, 0x07ba },
-  { 13138, 0x0000 }, { 13138, 0x0000 }, { 13138, 0x0000 }, { 13138, 0x0000 },
-  { 13138, 0x0000 }, { 13138, 0x0000 }, { 13138, 0x26e0 }, { 13144, 0xbefe },
-  /* 0x9d00 */
-  { 13157, 0x03f9 }, { 13165, 0xebb5 }, { 13176, 0xe36d }, { 13186, 0xe9cb },
-  { 13196, 0x9c2f }, { 13205, 0xbfde }, { 13218, 0x9f83 }, { 13227, 0xabbf },
-  { 13239, 0x1ff7 }, { 13251, 0xffd5 }, { 13264, 0xb7df }, { 13277, 0xdffe },
-  { 13291, 0xfdae }, { 13303, 0xffef }, { 13318, 0xfb7e }, { 13331, 0xeffd },
-  /* 0x9e00 */
-  { 13345, 0xaaff }, { 13357, 0x6ebf }, { 13369, 0x0000 }, { 13369, 0x0000 },
-  { 13369, 0x0000 }, { 13369, 0x0000 }, { 13369, 0x0000 }, { 13369, 0xb620 },
-  { 13375, 0x7fcd }, { 13387, 0xbe9e }, { 13398, 0x62b3 }, { 13406, 0x58f1 },
-  { 13414, 0xf10d }, { 13422, 0xfd7b }, { 13435, 0xe9f1 }, { 13445, 0xbefd },
-  /* 0x9f00 */
-  { 13458, 0xc6c3 }, { 13466, 0x5f6d }, { 13477, 0xff3d }, { 13490, 0x69ff },
-  { 13502, 0xffcf }, { 13516, 0xfbf4 }, { 13528, 0xdcfb }, { 13540, 0x4ff7 },
-  { 13552, 0x2000 }, { 13553, 0x1137 }, { 13560, 0x0015 },
-};
-static const Summary16 big5_uni2indx_pagefa[1] = {
-  /* 0xfa00 */
-  { 13563, 0x3000 },
-};
-static const Summary16 big5_uni2indx_pagefe[23] = {
-  /* 0xfe00 */
-  { 13565, 0x0000 }, { 13565, 0x0000 }, { 13565, 0x0000 }, { 13565, 0xfffb },
-  { 13580, 0xfe1f }, { 13592, 0xfef5 }, { 13605, 0x0e7f }, { 13615, 0x0000 },
-  { 13615, 0x0000 }, { 13615, 0x0000 }, { 13615, 0x0000 }, { 13615, 0x0000 },
-  { 13615, 0x0000 }, { 13615, 0x0000 }, { 13615, 0x0000 }, { 13615, 0x0000 },
-  /* 0xff00 */
-  { 13615, 0xff7a }, { 13628, 0xffff }, { 13644, 0xffff }, { 13660, 0x97ff },
-  { 13673, 0xfffe }, { 13688, 0x3fff }, { 13702, 0x0010 },
-};
-
-static int
-big5_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n)
-{
-  if (n >= 2) {
-    const Summary16 *summary = NULL;
-    if (wc >= 0x0000 && wc < 0x0100)
-      summary = &big5_uni2indx_page00[(wc>>4)];
-    else if (wc >= 0x0200 && wc < 0x0460)
-      summary = &big5_uni2indx_page02[(wc>>4)-0x020];
-    else if (wc >= 0x2000 && wc < 0x22c0)
-      summary = &big5_uni2indx_page20[(wc>>4)-0x200];
-    else if (wc >= 0x2400 && wc < 0x2650)
-      summary = &big5_uni2indx_page24[(wc>>4)-0x240];
-    else if (wc >= 0x3000 && wc < 0x33e0)
-      summary = &big5_uni2indx_page30[(wc>>4)-0x300];
-    else if (wc >= 0x4e00 && wc < 0x9fb0)
-      summary = &big5_uni2indx_page4e[(wc>>4)-0x4e0];
-    else if (wc >= 0xfa00 && wc < 0xfa10)
-      summary = &big5_uni2indx_pagefa[(wc>>4)-0xfa0];
-    else if (wc >= 0xfe00 && wc < 0xff70)
-      summary = &big5_uni2indx_pagefe[(wc>>4)-0xfe0];
-    if (summary) {
-      unsigned short used = summary->used;
-      unsigned int i = wc & 0x0f;
-      if (used & ((unsigned short) 1 << i)) {
-        unsigned short c;
-        /* Keep in `used' only the bits 0..i-1. */
-        used &= ((unsigned short) 1 << i) - 1;
-        /* Add `summary->indx' and the number of bits set in `used'. */
-        used = (used & 0x5555) + ((used & 0xaaaa) >> 1);
-        used = (used & 0x3333) + ((used & 0xcccc) >> 2);
-        used = (used & 0x0f0f) + ((used & 0xf0f0) >> 4);
-        used = (used & 0x00ff) + (used >> 8);
-        c = big5_2charset[summary->indx + used];
-        r[0] = (c >> 8); r[1] = (c & 0xff);
-        return 2;
-      }
-    }
-    return RET_ILSEQ;
-  }
-  return RET_TOOSMALL;
-}
diff --git a/xc/lib/X11/lcUniConv/big5_emacs.h b/xc/lib/X11/lcUniConv/big5_emacs.h
deleted file mode 100644
index 914755399..000000000
--- a/xc/lib/X11/lcUniConv/big5_emacs.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/* $XFree86: xc/lib/X11/lcUniConv/big5_emacs.h,v 1.1 2000/11/28 18:50:06 dawes Exp $ */
-
-/*
- * BIG5-0 and BIG5-1
- */
-
-/*
-   BIG5 with its 13494 characters doesn't fit in a single 94x94 or 96x96
-   block. Therefore Emacs/Mule developers, in a typically Japanese way of
-   thinking, have developed an alternative encoding of BIG5 in two 94x94
-   planes, very similar to the SHIFT_JIS encoding for JISX0208.
-
-   Conversion between BIG5 codes (s1,s2) and BIG5-0 codes (c1,c2):
-   Example. (s1,s2) = 0xA140, (c1,c2) = 0x2121.
-   0xA1 <= s1 <= 0xC7, 0x40 <= s2 <= 0x7E || 0xA1 <= s2 <= 0xFE,
-   0x21 <= c1 <= 0x62, 0x21 <= c2 <= 0x7E.
-   Invariant:
-     157*(s1-0xA1) + (s2 < 0x80 ? s2-0x40 : s2-0x62)
-     = 94*(c1-0x21)+(c2-0x21)
-   Conversion (s1,s2) -> (c1,c2):
-     t := 157*(s1-0xA1) + (s2 < 0x80 ? s2-0x40 : s2-0x62)
-     c1 := (t div 94) + 0x21
-     c2 := (t mod 94) + 0x21
-   Conversion (c1,c2) -> (s1,s2):
-     t := 94*(c1-0x21)+(c2-0x21)
-     t2 := t mod 157
-     s1 := (t div 157) + 0xA1
-     s2 := (t2 < 0x3F ? t2+0x40 : t2+0x62)
-
-   Conversion between BIG5 codes (s1,s2) and BIG5-1 codes (c1,c2):
-   Example. (s1,s2) = 0xC940, (c1,c2) = 0x2121.
-   0xC9 <= s1 <= 0xF9, 0x40 <= s2 <= 0x7E || 0xA1 <= s2 <= 0xFE,
-   0x21 <= c1 <= 0x72, 0x21 <= c2 <= 0x7E.
-   Invariant:
-     157*(s1-0xC9) + (s2 < 0x80 ? s2-0x40 : s2-0x62)
-     = 94*(c1-0x21)+(c2-0x21)
-   Conversion (s1,s2) -> (c1,c2):
-     t := 157*(s1-0xC9) + (s2 < 0x80 ? s2-0x40 : s2-0x62)
-     c1 := (t div 94) + 0x21
-     c2 := (t mod 94) + 0x21
-   Conversion (c1,c2) -> (s1,s2):
-     t := 94*(c1-0x21)+(c2-0x21)
-     t2 := t mod 157
-     s1 := (t div 157) + 0xC9
-     s2 := (t2 < 0x3F ? t2+0x40 : t2+0x62)
- */
-
-static int
-big5_0_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c1 = s[0];
-  if (c1 >= 0x21 && c1 <= 0x62) {
-    if (n >= 2) {
-      unsigned char c2 = s[1];
-      if (c2 >= 0x21 && c2 <= 0x7e) {
-        unsigned int i = 94 * (c1 - 0x21) + (c2 - 0x21);
-        if (0) {
-          /* Unoptimized. */
-          unsigned char buf[2];
-          buf[0] = (i / 157) + 0xa1;
-          i = i % 157;
-          buf[1] = i + (i < 0x3f ? 0x40 : 0x62);
-          return big5_mbtowc(conv,pwc,buf,2);
-        } else {
-          /* Inline the implementation of big5_mbtowc. */
-          if (i < 6121) {
-            unsigned short wc = big5_2uni_pagea1[i];
-            if (wc != 0xfffd) {
-              *pwc = (ucs4_t) wc;
-              return 2;
-            }
-          }
-        }
-      }
-      return RET_ILSEQ;
-    }
-    return RET_TOOFEW(0);
-  }
-  return RET_ILSEQ;
-}
-
-static int
-big5_1_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c1 = s[0];
-  if (c1 >= 0x21 && c1 <= 0x72) {
-    if (n >= 2) {
-      unsigned char c2 = s[1];
-      if (c2 >= 0x21 && c2 <= 0x7e) {
-        unsigned int i = 94 * (c1 - 0x21) + (c2 - 0x21);
-        if (0) {
-          /* Unoptimized. */
-          unsigned char buf[2];
-          buf[0] = (i / 157) + 0xc9;
-          i = i % 157;
-          buf[1] = i + (i < 0x3f ? 0x40 : 0x62);
-          return big5_mbtowc(conv,pwc,buf,2);
-        } else {
-          /* Inline the implementation of big5_mbtowc. */
-          if (i < 7652) {
-            unsigned short wc = big5_2uni_pagec9[i];
-            if (wc != 0xfffd) {
-              *pwc = (ucs4_t) wc;
-              return 2;
-            }
-          }
-        }
-      }
-      return RET_ILSEQ;
-    }
-    return RET_TOOFEW(0);
-  }
-  return RET_ILSEQ;
-}
-
-static int
-big5_0_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n)
-{
-  if (n >= 2) {
-    unsigned char buf[2];
-    int ret = big5_wctomb(conv,buf,wc,2);
-    if (ret != RET_ILSEQ) {
-      unsigned char s1, s2;
-      if (ret != 2) abort();
-      s1 = buf[0];
-      s2 = buf[1];
-      if (!(s1 >= 0xa1)) abort();
-      if (!((s2 >= 0x40 && s2 <= 0x7e) || (s2 >= 0xa1 && s2 <= 0xfe))) abort();
-      if (s1 < 0xc9) {
-        unsigned int t = 157 * (s1 - 0xa1) + s2 - (s2 < 0x80 ? 0x40 : 0x62);
-        r[0] = (t / 94) + 0x21;
-        r[1] = (t % 94) + 0x21;
-        return 2;
-      }
-    }
-    return RET_ILSEQ;
-  }
-  return RET_TOOSMALL;
-}
-
-static int
-big5_1_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n)
-{
-  if (n >= 2) {
-    unsigned char buf[2];
-    int ret = big5_wctomb(conv,buf,wc,2);
-    if (ret != RET_ILSEQ) {
-      unsigned char s1, s2;
-      if (ret != 2) abort();
-      s1 = buf[0];
-      s2 = buf[1];
-      if (!(s1 <= 0xf9)) abort();
-      if (!((s2 >= 0x40 && s2 <= 0x7e) || (s2 >= 0xa1 && s2 <= 0xfe))) abort();
-      if (s1 >= 0xc9) {
-        unsigned int t = 157 * (s1 - 0xc9) + s2 - (s2 < 0x80 ? 0x40 : 0x62);
-        r[0] = (t / 94) + 0x21;
-        r[1] = (t % 94) + 0x21;
-        return 2;
-      }
-    }
-    return RET_ILSEQ;
-  }
-  return RET_TOOSMALL;
-}
diff --git a/xc/lib/X11/lcUniConv/cjk_tab_to_h.c b/xc/lib/X11/lcUniConv/cjk_tab_to_h.c
deleted file mode 100644
index 2955a63c5..000000000
--- a/xc/lib/X11/lcUniConv/cjk_tab_to_h.c
+++ /dev/null
@@ -1,1023 +0,0 @@
-/*
- * Generates a CJK character set table from a .TXT table as found on
- * ftp.unicode.org or in the X nls directory.
- * Examples:
- *
- *   ./cjk_tab_to_h GB2312.1980-0 gb2312 > gb2312.h < gb2312
- *   ./cjk_tab_to_h JISX0208.1983-0 jisx0208 > jisx0208.h < jis0208
- *   ./cjk_tab_to_h KSC5601.1987-0 ksc5601 > ksc5601.h < ksc5601
- *
- *   ./cjk_tab_to_h GB2312.1980-0 gb2312 > gb2312.h < GB2312.TXT
- *   ./cjk_tab_to_h JISX0208.1983-0 jisx0208 > jisx0208.h < JIS0208.TXT
- *   ./cjk_tab_to_h JISX0212.1990-0 jisx0212 > jisx0212.h < JIS0212.TXT
- *   ./cjk_tab_to_h KSC5601.1987-0 ksc5601 > ksc5601.h < KSC5601.TXT
- *   ./cjk_tab_to_h KSX1001.1992-0 ksc5601 > ksc5601.h < KSX1001.TXT
- *
- *   ./cjk_tab_to_h BIG5 big5 > big5.h < BIG5.TXT
- *
- *   ./cjk_tab_to_h JOHAB johab > johab.h < JOHAB.TXT
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <string.h>
-
-typedef struct {
-  int start;
-  int end;
-} Block;
-
-typedef struct {
-  int rows;    /* number of possible values for the 1st byte */
-  int cols;    /* number of possible values for the 2nd byte */
-  int (*row_byte) (int row); /* returns the 1st byte value for a given row */
-  int (*col_byte) (int col); /* returns the 2nd byte value for a given col */
-  int (*byte_row) (int byte); /* converts a 1st byte value to a row, else -1 */
-  int (*byte_col) (int byte); /* converts a 2nd byte value to a col, else -1 */
-  const char* check_row_expr; /* format string for 1st byte value checking */
-  const char* check_col_expr; /* format string for 2nd byte value checking */
-  const char* byte_row_expr; /* format string for 1st byte value to row */
-  const char* byte_col_expr; /* format string for 2nd byte value to col */
-  int** charset2uni; /* charset2uni[0..rows-1][0..cols-1] is valid */
-  /* You'll understand the terms "row" and "col" when you buy Ken Lunde's book.
-     Once a row is fixed, choosing a "col" is the same as choosing a "cell". */
-  int* charsetpage; /* charsetpage[0..rows]: how large is a page for a row */
-  int ncharsetblocks;
-  Block* charsetblocks; /* blocks[0..nblocks-1] */
-  int* uni2charset; /* uni2charset[0x0000..0xffff] */
-} Encoding;
-
-/*
- * Outputs the file title.
- */
-static void output_title (const char *charsetname)
-{
-  printf("\n");
-  printf("/*\n");
-  printf(" * %s\n", charsetname);
-  printf(" */\n");
-  printf("\n");
-}
-
-/*
- * Reads the charset2uni table from standard input.
- */
-static void read_table (Encoding* enc)
-{
-  int row, col, i, i1, i2, c, j;
-
-  enc->charset2uni = (int**) malloc(enc->rows*sizeof(int*));
-  for (row = 0; row < enc->rows; row++)
-    enc->charset2uni[row] = (int*) malloc(enc->cols*sizeof(int));
-
-  for (row = 0; row < enc->rows; row++)
-    for (col = 0; col < enc->cols; col++)
-      enc->charset2uni[row][col] = 0xfffd;
-
-  c = getc(stdin);
-  ungetc(c,stdin);
-  if (c == '#') {
-    /* Read a unicode.org style .TXT file. */
-    for (;;) {
-      c = getc(stdin);
-      if (c == EOF)
-        break;
-      if (c == '\n' || c == ' ' || c == '\t')
-        continue;
-      if (c == '#') {
-        do { c = getc(stdin); } while (!(c == EOF || c == '\n'));
-        continue;
-      }
-      ungetc(c,stdin);
-      if (scanf("0x%x", &j) != 1)
-        exit(1);
-      i1 = j >> 8;
-      i2 = j & 0xff;
-      row = enc->byte_row(i1);
-      col = enc->byte_col(i2);
-      if (row < 0 || col < 0) {
-        fprintf(stderr, "lost entry for %02x %02x\n", i1, i2);
-        exit(1);
-      }
-      if (scanf(" 0x%x", &enc->charset2uni[row][col]) != 1)
-        exit(1);
-    }
-  } else {
-    /* Read a table of hexadecimal Unicode values. */
-    for (i1 = 32; i1 < 132; i1++)
-      for (i2 = 32; i2 < 132; i2++) {
-        i = scanf("%x", &j);
-        if (i == EOF)
-          goto read_done;
-        if (i != 1)
-          exit(1);
-        if (j < 0 || j == 0xffff)
-          j = 0xfffd;
-        if (j != 0xfffd) {
-          if (enc->byte_row(i1) < 0 || enc->byte_col(i2) < 0) {
-            fprintf(stderr, "lost entry at %02x %02x\n", i1, i2);
-            exit (1);
-          }
-          enc->charset2uni[enc->byte_row(i1)][enc->byte_col(i2)] = j;
-        }
-      }
-   read_done: ;
-  }
-}
-
-/*
- * Computes the charsetpage[0..rows] array.
- */
-static void find_charset2uni_pages (Encoding* enc)
-{
-  int row, col;
-
-  enc->charsetpage = (int*) malloc((enc->rows+1)*sizeof(int));
-
-  for (row = 0; row <= enc->rows; row++)
-    enc->charsetpage[row] = 0;
-
-  for (row = 0; row < enc->rows; row++) {
-    int used = 0;
-    for (col = 0; col < enc->cols; col++)
-      if (enc->charset2uni[row][col] != 0xfffd)
-        used = col+1;
-    enc->charsetpage[row] = used;
-  }
-}
-
-/*
- * Fills in nblocks and blocks.
- */
-static void find_charset2uni_blocks (Encoding* enc)
-{
-  int n, row, lastrow;
-
-  enc->charsetblocks = (Block*) malloc(enc->rows*sizeof(Block));
-
-  n = 0;
-  for (row = 0; row < enc->rows; row++)
-    if (enc->charsetpage[row] > 0 && (row == 0 || enc->charsetpage[row-1] == 0)) {
-      for (lastrow = row; enc->charsetpage[lastrow+1] > 0; lastrow++);
-      enc->charsetblocks[n].start = row * enc->cols;
-      enc->charsetblocks[n].end = lastrow * enc->cols + enc->charsetpage[lastrow];
-      n++;
-    }
-  enc->ncharsetblocks = n;
-}
-
-/*
- * Outputs the charset to unicode table and function.
- */
-static void output_charset2uni (const char* name, Encoding* enc)
-{
-  int row, col, lastrow, col_max, i, i1_min, i1_max;
-
-  find_charset2uni_pages(enc);
-
-  find_charset2uni_blocks(enc);
-
-  for (row = 0; row < enc->rows; row++)
-    if (enc->charsetpage[row] > 0) {
-      if (row == 0 || enc->charsetpage[row-1] == 0) {
-        /* Start a new block. */
-        for (lastrow = row; enc->charsetpage[lastrow+1] > 0; lastrow++);
-        printf("static const unsigned short %s_2uni_page%02x[%d] = {\n",
-               name, enc->row_byte(row),
-               (lastrow-row) * enc->cols + enc->charsetpage[lastrow]);
-      }
-      printf("  /""* 0x%02x *""/\n ", enc->row_byte(row));
-      col_max = (enc->charsetpage[row+1] > 0 ? enc->cols : enc->charsetpage[row]);
-      for (col = 0; col < col_max; col++) {
-        printf(" 0x%04x,", enc->charset2uni[row][col]);
-        if ((col % 8) == 7 && (col+1 < col_max)) printf("\n ");
-      }
-      printf("\n");
-      if (enc->charsetpage[row+1] == 0) {
-        /* End a block. */
-        printf("};\n");
-      }
-    }
-  printf("\n");
-
-  printf("static int\n");
-  printf("%s_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)\n", name);
-  printf("{\n");
-  printf("  unsigned char c1 = s[0];\n");
-  printf("  if (");
-  for (i = 0; i < enc->ncharsetblocks; i++) {
-    i1_min = enc->row_byte(enc->charsetblocks[i].start / enc->cols);
-    i1_max = enc->row_byte((enc->charsetblocks[i].end-1) / enc->cols);
-    if (i > 0)
-      printf(" || ");
-    if (i1_min == i1_max)
-      printf("(c1 == 0x%02x)", i1_min);
-    else
-      printf("(c1 >= 0x%02x && c1 <= 0x%02x)", i1_min, i1_max);
-  }
-  printf(") {\n");
-  printf("    if (n >= 2) {\n");
-  printf("      unsigned char c2 = s[1];\n");
-  printf("      if (");
-  printf(enc->check_col_expr, "c2");
-  printf(") {\n");
-  printf("        unsigned int i = %d * (", enc->cols);
-  printf(enc->byte_row_expr, "c1");
-  printf(") + (");
-  printf(enc->byte_col_expr, "c2");
-  printf(");\n");
-  printf("        unsigned short wc = 0xfffd;\n");
-  for (i = 0; i < enc->ncharsetblocks; i++) {
-    printf("        ");
-    if (i > 0)
-      printf("} else ");
-    if (i < enc->ncharsetblocks-1)
-      printf("if (i < %d) ", enc->charsetblocks[i+1].start);
-    printf("{\n");
-    printf("          if (i < %d)\n", enc->charsetblocks[i].end);
-    printf("            wc = %s_2uni_page%02x[i", name, enc->row_byte(enc->charsetblocks[i].start / enc->cols));
-    if (enc->charsetblocks[i].start > 0)
-      printf("-%d", enc->charsetblocks[i].start);
-    printf("];\n");
-  }
-  printf("        }\n");
-  printf("        if (wc != 0xfffd) {\n");
-  printf("          *pwc = (wchar_t) wc;\n");
-  printf("          return 2;\n");
-  printf("        }\n");
-  printf("      }\n");
-  printf("      return RET_ILSEQ;\n");
-  printf("    }\n");
-  printf("    return RET_TOOFEW(0);\n");
-  printf("  }\n");
-  printf("  return RET_ILSEQ;\n");
-  printf("}\n");
-  printf("\n");
-}
-
-/*
- * Computes the uni2charset[0x0000..0xffff] array.
- */
-static void invert (Encoding* enc)
-{
-  int row, col, j;
-
-  enc->uni2charset = (int*) malloc(0x10000*sizeof(int));
-
-  for (j = 0; j < 0x10000; j++)
-    enc->uni2charset[j] = 0;
-
-  for (row = 0; row < enc->rows; row++)
-    for (col = 0; col < enc->cols; col++) {
-      j = enc->charset2uni[row][col];
-      if (j != 0xfffd)
-        enc->uni2charset[j] = 0x100 * enc->row_byte(row) + enc->col_byte(col);
-    }
-}
-
-/*
- * Outputs the unicode to charset table and function, using a linear array.
- * (Suitable if the table is dense.)
- */
-static void output_uni2charset_dense (const char* name, Encoding* enc)
-{
-  /* Like in 8bit_tab_to_h.c */
-  bool pages[0x100];
-  int line[0x2000];
-  int tableno;
-  struct { int minline; int maxline; int usecount; } tables[0x2000];
-  bool first;
-  int row, col, j, p, j1, j2, t;
-
-  for (p = 0; p < 0x100; p++)
-    pages[p] = false;
-  for (row = 0; row < enc->rows; row++)
-    for (col = 0; col < enc->cols; col++) {
-      j = enc->charset2uni[row][col];
-      if (j != 0xfffd)
-        pages[j>>8] = true;
-    }
-  for (j1 = 0; j1 < 0x2000; j1++) {
-    bool all_invalid = true;
-    for (j2 = 0; j2 < 8; j2++) {
-      j = 8*j1+j2;
-      if (enc->uni2charset[j] != 0)
-        all_invalid = false;
-    }
-    if (all_invalid)
-      line[j1] = -1;
-    else
-      line[j1] = 0;
-  }
-  tableno = 0;
-  for (j1 = 0; j1 < 0x2000; j1++) {
-    if (line[j1] >= 0) {
-      if (tableno > 0
-          && ((j1 > 0 && line[j1-1] == tableno-1)
-              || ((tables[tableno-1].maxline >> 5) == (j1 >> 5)
-                  && j1 - tables[tableno-1].maxline <= 8))) {
-        line[j1] = tableno-1;
-        tables[tableno-1].maxline = j1;
-      } else {
-        tableno++;
-        line[j1] = tableno-1;
-        tables[tableno-1].minline = tables[tableno-1].maxline = j1;
-      }
-    }
-  }
-  for (t = 0; t < tableno; t++) {
-    tables[t].usecount = 0;
-    j1 = 8*tables[t].minline;
-    j2 = 8*(tables[t].maxline+1);
-    for (j = j1; j < j2; j++)
-      if (enc->uni2charset[j] != 0)
-        tables[t].usecount++;
-  }
-  {
-    p = -1;
-    for (t = 0; t < tableno; t++)
-      if (tables[t].usecount > 1) {
-        p = tables[t].minline >> 5;
-        printf("static const unsigned short %s_page%02x[%d] = {\n", name, p, 8*(tables[t].maxline-tables[t].minline+1));
-        for (j1 = tables[t].minline; j1 <= tables[t].maxline; j1++) {
-          if ((j1 % 0x20) == 0 && j1 > tables[t].minline)
-            printf("  /* 0x%04x */\n", 8*j1);
-          printf(" ");
-          for (j2 = 0; j2 < 8; j2++) {
-            j = 8*j1+j2;
-            printf(" 0x%04x,", enc->uni2charset[j]);
-          }
-          printf(" /*0x%02x-0x%02x*/\n", 8*(j1 % 0x20), 8*(j1 % 0x20)+7);
-        }
-        printf("};\n");
-      }
-    if (p >= 0)
-      printf("\n");
-  }
-  printf("static int\n%s_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)\n", name);
-  printf("{\n");
-  printf("  if (n >= 2) {\n");
-  printf("    unsigned short c = 0;\n");
-  first = true;
-  for (j1 = 0; j1 < 0x2000;) {
-    t = line[j1];
-    for (j2 = j1; j2 < 0x2000 && line[j2] == t; j2++);
-    if (t >= 0) {
-      if (j1 != tables[t].minline) abort();
-      if (j2 > tables[t].maxline+1) abort();
-      j2 = tables[t].maxline+1;
-      if (first)
-        printf("    ");
-      else
-        printf("    else ");
-      first = false;
-      if (tables[t].usecount == 0) abort();
-      if (tables[t].usecount == 1) {
-        if (j2 != j1+1) abort();
-        for (j = 8*j1; j < 8*j2; j++)
-          if (enc->uni2charset[j] != 0) {
-            printf("if (wc == 0x%04x)\n      c = 0x%02x;\n", j, enc->uni2charset[j]);
-            break;
-          }
-      } else {
-        if (j1 == 0) {
-          printf("if (wc < 0x%04x)", 8*j2);
-        } else {
-          printf("if (wc >= 0x%04x && wc < 0x%04x)", 8*j1, 8*j2);
-        }
-        printf("\n      c = %s_page%02x[wc", name, j1 >> 5);
-        if (tables[t].minline > 0)
-          printf("-0x%04x", 8*j1);
-        printf("];\n");
-      }
-    }
-    j1 = j2;
-  }
-  printf("    if (c != 0) {\n");
-  printf("      r[0] = (c >> 8); r[1] = (c & 0xff);\n");
-  printf("      return 2;\n");
-  printf("    }\n");
-  printf("    return RET_ILSEQ;\n");
-  printf("  }\n");
-  printf("  return RET_TOOSMALL;\n");
-  printf("}\n");
-}
-
-/*
- * Outputs the unicode to charset table and function, using a packed array.
- * (Suitable if the table is sparse.)
- */
-static void output_uni2charset_sparse (const char* name, Encoding* enc)
-{
-  bool pages[0x100];
-  Block pageblocks[0x100]; int npageblocks;
-  int indx2charset[0x10000];
-  int summary_indx[0x1000];
-  int summary_used[0x1000];
-  int i, row, col, j, p, j1, j2, indx;
-
-  /* Fill pages[0x100]. */
-  for (p = 0; p < 0x100; p++)
-    pages[p] = false;
-  for (row = 0; row < enc->rows; row++)
-    for (col = 0; col < enc->cols; col++) {
-      j = enc->charset2uni[row][col];
-      if (j != 0xfffd)
-        pages[j>>8] = true;
-    }
-
-#if 0
-  for (p = 0; p < 0x100; p++)
-    if (pages[p]) {
-      printf("static const unsigned short %s_page%02x[256] = {\n", name, p);
-      for (j1 = 0; j1 < 32; j1++) {
-        printf("  ");
-        for (j2 = 0; j2 < 8; j2++)
-          printf("0x%04x, ", enc->uni2charset[256*p+8*j1+j2]);
-        printf("/""*0x%02x-0x%02x*""/\n", 8*j1, 8*j1+7);
-      }
-      printf("};\n");
-    }
-  printf("\n");
-#endif
-
-  /* Fill summary_indx[] and summary_used[]. */
-  indx = 0;
-  for (j1 = 0; j1 < 0x1000; j1++) {
-    summary_indx[j1] = indx;
-    summary_used[j1] = 0;
-    for (j2 = 0; j2 < 16; j2++) {
-      j = 16*j1+j2;
-      if (enc->uni2charset[j] != 0) {
-        indx2charset[indx++] = enc->uni2charset[j];
-        summary_used[j1] |= (1 << j2);
-      }
-    }
-  }
-
-  /* Fill npageblocks and pageblocks[]. */
-  npageblocks = 0;
-  for (p = 0; p < 0x100; ) {
-    if (pages[p] && (p == 0 || !pages[p-1])) {
-      pageblocks[npageblocks].start = 16*p;
-      do p++; while (p < 0x100 && pages[p]);
-      j1 = 16*p;
-      while (summary_used[j1-1] == 0) j1--;
-      pageblocks[npageblocks].end = j1;
-      npageblocks++;
-    } else
-      p++;
-  }
-
-  printf("static const unsigned short %s_2charset[%d] = {\n", name, indx);
-  for (i = 0; i < indx; ) {
-    if ((i % 8) == 0) printf(" ");
-    printf(" 0x%04x,", indx2charset[i]);
-    i++;
-    if ((i % 8) == 0 || i == indx) printf("\n");
-  }
-  printf("};\n");
-  printf("\n");
-  for (i = 0; i < npageblocks; i++) {
-    printf("static const Summary16 %s_uni2indx_page%02x[%d] = {\n", name,
-           pageblocks[i].start/16, pageblocks[i].end-pageblocks[i].start);
-    for (j1 = pageblocks[i].start; j1 < pageblocks[i].end; ) {
-      if (((16*j1) % 0x100) == 0) printf("  /""* 0x%04x *""/\n", 16*j1);
-      if ((j1 % 4) == 0) printf(" ");
-      printf(" { %4d, 0x%04x },", summary_indx[j1], summary_used[j1]);
-      j1++;
-      if ((j1 % 4) == 0 || j1 == pageblocks[i].end) printf("\n");
-    }
-    printf("};\n");
-  }
-  printf("\n");
-
-  printf("static int\n");
-  printf("%s_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)\n", name);
-  printf("{\n");
-  printf("  if (n >= 2) {\n");
-  printf("    const Summary16 *summary = NULL;\n");
-  for (i = 0; i < npageblocks; i++) {
-    printf("    ");
-    if (i > 0)
-      printf("else ");
-    printf("if (wc >= 0x%04x && wc < 0x%04x)\n",
-           16*pageblocks[i].start, 16*pageblocks[i].end);
-    printf("      summary = &%s_uni2indx_page%02x[(wc>>4)", name,
-           pageblocks[i].start/16);
-    if (pageblocks[i].start > 0)
-      printf("-0x%03x", pageblocks[i].start);
-    printf("];\n");
-  }
-  printf("    if (summary) {\n");
-  printf("      unsigned short used = summary->used;\n");
-  printf("      unsigned int i = wc & 0x0f;\n");
-  printf("      if (used & ((unsigned short) 1 << i)) {\n");
-  printf("        unsigned short c;\n");
-  printf("        /* Keep in `used' only the bits 0..i-1. */\n");
-  printf("        used &= ((unsigned short) 1 << i) - 1;\n");
-  printf("        /* Add `summary->indx' and the number of bits set in `used'. */\n");
-  printf("        used = (used & 0x5555) + ((used & 0xaaaa) >> 1);\n");
-  printf("        used = (used & 0x3333) + ((used & 0xcccc) >> 2);\n");
-  printf("        used = (used & 0x0f0f) + ((used & 0xf0f0) >> 4);\n");
-  printf("        used = (used & 0x00ff) + (used >> 8);\n");
-  printf("        c = %s_2charset[summary->indx + used];\n", name);
-  printf("        r[0] = (c >> 8); r[1] = (c & 0xff);\n");
-  printf("        return 2;\n");
-  printf("      }\n");
-  printf("    }\n");
-  printf("    return RET_ILSEQ;\n");
-  printf("  }\n");
-  printf("  return RET_TOOSMALL;\n");
-  printf("}\n");
-}
-
-/* ISO-2022/EUC specifics */
-
-static int row_byte_normal (int row) { return 0x21+row; }
-static int col_byte_normal (int col) { return 0x21+col; }
-static int byte_row_normal (int byte) { return byte-0x21; }
-static int byte_col_normal (int byte) { return byte-0x21; }
-
-static void do_normal (const char* name)
-{
-  Encoding enc;
-
-  enc.rows = 94;
-  enc.cols = 94;
-  enc.row_byte = row_byte_normal;
-  enc.col_byte = col_byte_normal;
-  enc.byte_row = byte_row_normal;
-  enc.byte_col = byte_col_normal;
-  enc.check_row_expr = "%1$s >= 0x21 && %1$s < 0x7f";
-  enc.check_col_expr = "%1$s >= 0x21 && %1$s < 0x7f";
-  enc.byte_row_expr = "%1$s - 0x21";
-  enc.byte_col_expr = "%1$s - 0x21";
-
-  read_table(&enc);
-  output_charset2uni(name,&enc);
-  invert(&enc); output_uni2charset_sparse(name,&enc);
-}
-
-/* Note: On first sight, the jisx0212_2charset[] table seems to be in order,
-   starting from the charset=0x3021/uni=0x4e02 pair. But it's only mostly in
-   order. There are 75 out-of-order values, scattered all throughout the table.
- */
-
-static void do_normal_only_charset2uni (const char* name)
-{
-  Encoding enc;
-
-  enc.rows = 94;
-  enc.cols = 94;
-  enc.row_byte = row_byte_normal;
-  enc.col_byte = col_byte_normal;
-  enc.byte_row = byte_row_normal;
-  enc.byte_col = byte_col_normal;
-  enc.check_row_expr = "%1$s >= 0x21 && %1$s < 0x7f";
-  enc.check_col_expr = "%1$s >= 0x21 && %1$s < 0x7f";
-  enc.byte_row_expr = "%1$s - 0x21";
-  enc.byte_col_expr = "%1$s - 0x21";
-
-  read_table(&enc);
-  output_charset2uni(name,&enc);
-}
-
-/* CNS 11643 specifics - trick to put two tables into one */
-
-static int row_byte_cns11643 (int row) {
-  return 0x100 * (row / 94) + (row % 94) + 0x21;
-}
-static int byte_row_cns11643 (int byte) {
-  return (byte >= 0x100 && byte < 0x200 ? byte-0x121 :
-          byte >= 0x200 && byte < 0x300 ? byte-0x221+94 :
-          byte >= 0x300 && byte < 0x400 ? byte-0x321+2*94 :
-          -1);
-}
-
-static void do_cns11643_only_uni2charset (const char* name)
-{
-  Encoding enc;
-  int j, x;
-
-  enc.rows = 3*94;
-  enc.cols = 94;
-  enc.row_byte = row_byte_cns11643;
-  enc.col_byte = col_byte_normal;
-  enc.byte_row = byte_row_cns11643;
-  enc.byte_col = byte_col_normal;
-  enc.check_row_expr = "%1$s >= 0x21 && %1$s < 0x7f";
-  enc.check_col_expr = "%1$s >= 0x21 && %1$s < 0x7f";
-  enc.byte_row_expr = "%1$s - 0x21";
-  enc.byte_col_expr = "%1$s - 0x21";
-
-  read_table(&enc);
-  invert(&enc);
-  /* Move the 2 plane bits into the unused bits 15 and 7. */
-  for (j = 0; j < 0x10000; j++) {
-    x = enc.uni2charset[j];
-    if (x != 0) {
-      if (x & 0x8080) abort();
-      switch (x >> 16) {
-        case 0: /* plane 1 */ x = (x & 0xffff) | 0x0000; break;
-        case 1: /* plane 2 */ x = (x & 0xffff) | 0x0080; break;
-        case 2: /* plane 3 */ x = (x & 0xffff) | 0x8000; break;
-        default: abort();
-      }
-      enc.uni2charset[j] = x;
-    }
-  }
-  output_uni2charset_sparse(name,&enc);
-}
-
-/* GBK specifics */
-
-static int row_byte_gbk1 (int row) {
-  return 0x81+row;
-}
-static int col_byte_gbk1 (int col) {
-  return (col >= 0x3f ? 0x41 : 0x40) + col;
-}
-static int byte_row_gbk1 (int byte) {
-  if (byte >= 0x81 && byte < 0xff)
-    return byte-0x81;
-  else
-    return -1;
-}
-static int byte_col_gbk1 (int byte) {
-  if (byte >= 0x40 && byte < 0x7f)
-    return byte-0x40;
-  else if (byte >= 0x80 && byte < 0xff)
-    return byte-0x41;
-  else
-    return -1;
-}
-
-static void do_gbk1 (const char* name)
-{
-  Encoding enc;
-
-  enc.rows = 126;
-  enc.cols = 190;
-  enc.row_byte = row_byte_gbk1;
-  enc.col_byte = col_byte_gbk1;
-  enc.byte_row = byte_row_gbk1;
-  enc.byte_col = byte_col_gbk1;
-  enc.check_row_expr = "%1$s >= 0x81 && %1$s < 0xff";
-  enc.check_col_expr = "(%1$s >= 0x40 && %1$s < 0x7f) || (%1$s >= 0x80 && %1$s < 0xff)";
-  enc.byte_row_expr = "%1$s - 0x81";
-  enc.byte_col_expr = "%1$s - (%1$s >= 0x80 ? 0x41 : 0x40)";
-
-  read_table(&enc);
-  output_charset2uni(name,&enc);
-  invert(&enc); output_uni2charset_dense(name,&enc);
-}
-
-static void do_gbk1_only_charset2uni (const char* name)
-{
-  Encoding enc;
-
-  enc.rows = 126;
-  enc.cols = 190;
-  enc.row_byte = row_byte_gbk1;
-  enc.col_byte = col_byte_gbk1;
-  enc.byte_row = byte_row_gbk1;
-  enc.byte_col = byte_col_gbk1;
-  enc.check_row_expr = "%1$s >= 0x81 && %1$s < 0xff";
-  enc.check_col_expr = "(%1$s >= 0x40 && %1$s < 0x7f) || (%1$s >= 0x80 && %1$s < 0xff)";
-  enc.byte_row_expr = "%1$s - 0x81";
-  enc.byte_col_expr = "%1$s - (%1$s >= 0x80 ? 0x41 : 0x40)";
-
-  read_table(&enc);
-  output_charset2uni(name,&enc);
-}
-
-static int row_byte_gbk2 (int row) {
-  return 0x81+row;
-}
-static int col_byte_gbk2 (int col) {
-  return (col >= 0x3f ? 0x41 : 0x40) + col;
-}
-static int byte_row_gbk2 (int byte) {
-  if (byte >= 0x81 && byte < 0xff)
-    return byte-0x81;
-  else
-    return -1;
-}
-static int byte_col_gbk2 (int byte) {
-  if (byte >= 0x40 && byte < 0x7f)
-    return byte-0x40;
-  else if (byte >= 0x80 && byte < 0xa1)
-    return byte-0x41;
-  else
-    return -1;
-}
-
-static void do_gbk2_only_charset2uni (const char* name)
-{
-  Encoding enc;
-
-  enc.rows = 126;
-  enc.cols = 96;
-  enc.row_byte = row_byte_gbk2;
-  enc.col_byte = col_byte_gbk2;
-  enc.byte_row = byte_row_gbk2;
-  enc.byte_col = byte_col_gbk2;
-  enc.check_row_expr = "%1$s >= 0x81 && %1$s < 0xff";
-  enc.check_col_expr = "(%1$s >= 0x40 && %1$s < 0x7f) || (%1$s >= 0x80 && %1$s < 0xa1)";
-  enc.byte_row_expr = "%1$s - 0x81";
-  enc.byte_col_expr = "%1$s - (%1$s >= 0x80 ? 0x41 : 0x40)";
-
-  read_table(&enc);
-  output_charset2uni(name,&enc);
-}
-
-static void do_gbk1_only_uni2charset (const char* name)
-{
-  Encoding enc;
-
-  enc.rows = 126;
-  enc.cols = 190;
-  enc.row_byte = row_byte_gbk1;
-  enc.col_byte = col_byte_gbk1;
-  enc.byte_row = byte_row_gbk1;
-  enc.byte_col = byte_col_gbk1;
-  enc.check_row_expr = "%1$s >= 0x81 && %1$s < 0xff";
-  enc.check_col_expr = "(%1$s >= 0x40 && %1$s < 0x7f) || (%1$s >= 0x80 && %1$s < 0xff)";
-  enc.byte_row_expr = "%1$s - 0x81";
-  enc.byte_col_expr = "%1$s - (%1$s >= 0x80 ? 0x41 : 0x40)";
-
-  read_table(&enc);
-  invert(&enc); output_uni2charset_sparse(name,&enc);
-}
-
-/* KSC 5601 specifics */
-
-/*
- * Reads the charset2uni table from standard input.
- */
-static void read_table_ksc5601 (Encoding* enc)
-{
-  int row, col, i, i1, i2, c, j;
-
-  enc->charset2uni = (int**) malloc(enc->rows*sizeof(int*));
-  for (row = 0; row < enc->rows; row++)
-    enc->charset2uni[row] = (int*) malloc(enc->cols*sizeof(int));
-
-  for (row = 0; row < enc->rows; row++)
-    for (col = 0; col < enc->cols; col++)
-      enc->charset2uni[row][col] = 0xfffd;
-
-  c = getc(stdin);
-  ungetc(c,stdin);
-  if (c == '#') {
-    /* Read a unicode.org style .TXT file. */
-    for (;;) {
-      c = getc(stdin);
-      if (c == EOF)
-        break;
-      if (c == '\n' || c == ' ' || c == '\t')
-        continue;
-      if (c == '#') {
-        do { c = getc(stdin); } while (!(c == EOF || c == '\n'));
-        continue;
-      }
-      ungetc(c,stdin);
-      if (scanf("0x%x", &j) != 1)
-        exit(1);
-      i1 = j >> 8;
-      i2 = j & 0xff;
-      if (scanf(" 0x%x", &j) != 1)
-        exit(1);
-      /* Take only the range covered by KS C 5601.1987-0 = KS C 5601.1989-0
-         = KS X 1001.1992, ignore the rest. */
-      if (!(i1 >= 128+33 && i1 < 128+127 && i2 >= 128+33 && i2 < 128+127))
-        continue;  /* KSC5601 specific */
-      i1 &= 0x7f;  /* KSC5601 specific */
-      i2 &= 0x7f;  /* KSC5601 specific */
-      row = enc->byte_row(i1);
-      col = enc->byte_col(i2);
-      if (row < 0 || col < 0) {
-        fprintf(stderr, "lost entry for %02x %02x\n", i1, i2);
-        exit(1);
-      }
-      enc->charset2uni[row][col] = j;
-    }
-  } else {
-    /* Read a table of hexadecimal Unicode values. */
-    for (i1 = 33; i1 < 127; i1++)
-      for (i2 = 33; i2 < 127; i2++) {
-        i = scanf("%x", &j);
-        if (i == EOF)
-          goto read_done;
-        if (i != 1)
-          exit(1);
-        if (j < 0 || j == 0xffff)
-          j = 0xfffd;
-        if (j != 0xfffd) {
-          if (enc->byte_row(i1) < 0 || enc->byte_col(i2) < 0) {
-            fprintf(stderr, "lost entry at %02x %02x\n", i1, i2);
-            exit (1);
-          }
-          enc->charset2uni[enc->byte_row(i1)][enc->byte_col(i2)] = j;
-        }
-      }
-   read_done: ;
-  }
-}
-
-static void do_ksc5601 (const char* name)
-{
-  Encoding enc;
-
-  enc.rows = 94;
-  enc.cols = 94;
-  enc.row_byte = row_byte_normal;
-  enc.col_byte = col_byte_normal;
-  enc.byte_row = byte_row_normal;
-  enc.byte_col = byte_col_normal;
-  enc.check_row_expr = "%1$s >= 0x21 && %1$s < 0x7f";
-  enc.check_col_expr = "%1$s >= 0x21 && %1$s < 0x7f";
-  enc.byte_row_expr = "%1$s - 0x21";
-  enc.byte_col_expr = "%1$s - 0x21";
-
-  read_table_ksc5601(&enc);
-  output_charset2uni(name,&enc);
-  invert(&enc); output_uni2charset_sparse(name,&enc);
-}
-
-/* Big5 specifics */
-
-static int row_byte_big5 (int row) {
-  return 0xa1+row;
-}
-static int col_byte_big5 (int col) {
-  return (col >= 0x3f ? 0x62 : 0x40) + col;
-}
-static int byte_row_big5 (int byte) {
-  if (byte >= 0xa1 && byte < 0xff)
-    return byte-0xa1;
-  else
-    return -1;
-}
-static int byte_col_big5 (int byte) {
-  if (byte >= 0x40 && byte < 0x7f)
-    return byte-0x40;
-  else if (byte >= 0xa1 && byte < 0xff)
-    return byte-0x62;
-  else
-    return -1;
-}
-
-static void do_big5 (const char* name)
-{
-  Encoding enc;
-
-  enc.rows = 94;
-  enc.cols = 157;
-  enc.row_byte = row_byte_big5;
-  enc.col_byte = col_byte_big5;
-  enc.byte_row = byte_row_big5;
-  enc.byte_col = byte_col_big5;
-  enc.check_row_expr = "%1$s >= 0xa1 && %1$s < 0xff";
-  enc.check_col_expr = "(%1$s >= 0x40 && %1$s < 0x7f) || (%1$s >= 0xa1 && %1$s < 0xff)";
-  enc.byte_row_expr = "%1$s - 0xa1";
-  enc.byte_col_expr = "%1$s - (%1$s >= 0xa1 ? 0x62 : 0x40)";
-
-  read_table(&enc);
-  output_charset2uni(name,&enc);
-  invert(&enc); output_uni2charset_sparse(name,&enc);
-}
-
-/* Johab Hangul specifics */
-
-static int row_byte_johab_hangul (int row) {
-  return 0x84+row;
-}
-static int col_byte_johab_hangul (int col) {
-  return (col >= 0x3e ? 0x43 : 0x41) + col;
-}
-static int byte_row_johab_hangul (int byte) {
-  if (byte >= 0x84 && byte < 0xd4)
-    return byte-0x84;
-  else
-    return -1;
-}
-static int byte_col_johab_hangul (int byte) {
-  if (byte >= 0x41 && byte < 0x7f)
-    return byte-0x41;
-  else if (byte >= 0x81 && byte < 0xff)
-    return byte-0x43;
-  else
-    return -1;
-}
-
-static void do_johab_hangul (const char* name)
-{
-  Encoding enc;
-
-  enc.rows = 80;
-  enc.cols = 188;
-  enc.row_byte = row_byte_johab_hangul;
-  enc.col_byte = col_byte_johab_hangul;
-  enc.byte_row = byte_row_johab_hangul;
-  enc.byte_col = byte_col_johab_hangul;
-  enc.check_row_expr = "%1$s >= 0x84 && %1$s < 0xd4";
-  enc.check_col_expr = "(%1$s >= 0x41 && %1$s < 0x7f) || (%1$s >= 0x81 && %1$s < 0xff)";
-  enc.byte_row_expr = "%1$s - 0x84";
-  enc.byte_col_expr = "%1$s - (%1$s >= 0x81 ? 0x43 : 0x41)";
-
-  read_table(&enc);
-  output_charset2uni(name,&enc);
-  invert(&enc); output_uni2charset_dense(name,&enc);
-}
-
-/* SJIS specifics */
-
-static int row_byte_sjis (int row) {
-  return (row >= 0x1f ? 0xc1 : 0x81) + row;
-}
-static int col_byte_sjis (int col) {
-  return (col >= 0x3f ? 0x41 : 0x40) + col;
-}
-static int byte_row_sjis (int byte) {
-  if (byte >= 0x81 && byte < 0xa0)
-    return byte-0x81;
-  else if (byte >= 0xe0)
-    return byte-0xc1;
-  else
-    return -1;
-}
-static int byte_col_sjis (int byte) {
-  if (byte >= 0x40 && byte < 0x7f)
-    return byte-0x40;
-  else if (byte >= 0x80 && byte < 0xfd)
-    return byte-0x41;
-  else
-    return -1;
-}
-
-static void do_sjis (const char* name)
-{
-  Encoding enc;
-
-  enc.rows = 94;
-  enc.cols = 188;
-  enc.row_byte = row_byte_sjis;
-  enc.col_byte = col_byte_sjis;
-  enc.byte_row = byte_row_sjis;
-  enc.byte_col = byte_col_sjis;
-  enc.check_row_expr = "(%1$s >= 0x81 && %1$s < 0xa0) || (%1$s >= 0xe0)";
-  enc.check_col_expr = "(%1$s >= 0x40 && %1$s < 0x7f) || (%1$s >= 0x80 && %1$s < 0xfd)";
-  enc.byte_row_expr = "%1$s - (%1$s >= 0xe0 ? 0xc1 : 0x81)";
-  enc.byte_col_expr = "%1$s - (%1$s >= 0x80 ? 0x41 : 0x40)";
-
-  read_table(&enc);
-  output_charset2uni(name,&enc);
-  invert(&enc); output_uni2charset_sparse(name,&enc);
-}
-
-/* Main program */
-
-int main (int argc, char *argv[])
-{
-  const char* charsetname;
-  const char* name;
-
-  if (argc != 3)
-    exit(1);
-  charsetname = argv[1];
-  name = argv[2];
-
-  output_title(charsetname);
-
-  if (!strcmp(name,"gb2312") || !strcmp(name,"gb12345ext")
-      || !strcmp(name,"jisx0208") || !strcmp(name,"jisx0212"))
-    do_normal(name);
-  else if (!strcmp(name,"cns11643_1") || !strcmp(name,"cns11643_2")
-           || !strcmp(name,"cns11643_3"))
-    do_normal_only_charset2uni(name);
-  else if (!strcmp(name,"cns11643_inv"))
-    do_cns11643_only_uni2charset(name);
-  else if (!strcmp(name,"gbkext1"))
-    do_gbk1_only_charset2uni(name);
-  else if (!strcmp(name,"gbkext2"))
-    do_gbk2_only_charset2uni(name);
-  else if (!strcmp(name,"gbkext_inv"))
-    do_gbk1_only_uni2charset(name);
-  else if (!strcmp(name,"cp936ext"))
-    do_gbk1(name);
-  else if (!strcmp(name,"ksc5601"))
-    do_ksc5601(name);
-  else if (!strcmp(name,"big5") || !strcmp(name,"cp950ext"))
-    do_big5(name);
-  else if (!strcmp(name,"johab_hangul"))
-    do_johab_hangul(name);
-  else if (!strcmp(name,"cp932ext"))
-    do_sjis(name);
-  else
-    exit(1);
-
-  return 0;
-}
diff --git a/xc/lib/X11/lcUniConv/cp1133.h b/xc/lib/X11/lcUniConv/cp1133.h
deleted file mode 100644
index 4dc408ff4..000000000
--- a/xc/lib/X11/lcUniConv/cp1133.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-/*
- * IBM-CP1133
- */
-
-static const unsigned short cp1133_2uni_1[64] = {
-  /* 0xa0 */
-  0x00a0, 0x0e81, 0x0e82, 0x0e84, 0x0e87, 0x0e88, 0x0eaa, 0x0e8a,
-  0x0e8d, 0x0e94, 0x0e95, 0x0e96, 0x0e97, 0x0e99, 0x0e9a, 0x0e9b,
-  /* 0xb0 */
-  0x0e9c, 0x0e9d, 0x0e9e, 0x0e9f, 0x0ea1, 0x0ea2, 0x0ea3, 0x0ea5,
-  0x0ea7, 0x0eab, 0x0ead, 0x0eae, 0xfffd, 0xfffd, 0xfffd, 0x0eaf,
-  /* 0xc0 */
-  0x0eb0, 0x0eb2, 0x0eb3, 0x0eb4, 0x0eb5, 0x0eb6, 0x0eb7, 0x0eb8,
-  0x0eb9, 0x0ebc, 0x0eb1, 0x0ebb, 0x0ebd, 0xfffd, 0xfffd, 0xfffd,
-  /* 0xd0 */
-  0x0ec0, 0x0ec1, 0x0ec2, 0x0ec3, 0x0ec4, 0x0ec8, 0x0ec9, 0x0eca,
-  0x0ecb, 0x0ecc, 0x0ecd, 0x0ec6, 0xfffd, 0x0edc, 0x0edd, 0x20ad,
-};
-static const unsigned short cp1133_2uni_2[16] = {
-  /* 0xf0 */
-  0x0ed0, 0x0ed1, 0x0ed2, 0x0ed3, 0x0ed4, 0x0ed5, 0x0ed6, 0x0ed7,
-  0x0ed8, 0x0ed9, 0xfffd, 0xfffd, 0x00a2, 0x00ac, 0x00a6, 0xfffd,
-};
-
-static int
-cp1133_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c < 0xa0) {
-    *pwc = (wchar_t) c;
-    return 1;
-  }
-  else if (c < 0xe0) {
-    unsigned short wc = cp1133_2uni_1[c-0xa0];
-    if (wc != 0xfffd) {
-      *pwc = (wchar_t) wc;
-      return 1;
-    }
-  }
-  else if (c < 0xf0) {
-  }
-  else {
-    unsigned short wc = cp1133_2uni_2[c-0xf0];
-    if (wc != 0xfffd) {
-      *pwc = (wchar_t) wc;
-      return 1;
-    }
-  }
-  return RET_ILSEQ;
-}
-
-static const unsigned char cp1133_page00[16] = {
-  0xa0, 0x00, 0xfc, 0x00, 0x00, 0x00, 0xfe, 0x00, /* 0xa0-0xa7 */
-  0x00, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x00, 0x00, /* 0xa8-0xaf */
-};
-static const unsigned char cp1133_page0e[96] = {
-  0x00, 0xa1, 0xa2, 0x00, 0xa3, 0x00, 0x00, 0xa4, /* 0x80-0x87 */
-  0xa5, 0x00, 0xa7, 0x00, 0x00, 0xa8, 0x00, 0x00, /* 0x88-0x8f */
-  0x00, 0x00, 0x00, 0x00, 0xa9, 0xaa, 0xab, 0xac, /* 0x90-0x97 */
-  0x00, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, /* 0x98-0x9f */
-  0x00, 0xb4, 0xb5, 0xb6, 0x00, 0xb7, 0x00, 0xb8, /* 0xa0-0xa7 */
-  0x00, 0x00, 0xa6, 0xb9, 0x00, 0xba, 0xbb, 0xbf, /* 0xa8-0xaf */
-  0xc0, 0xca, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, /* 0xb0-0xb7 */
-  0xc7, 0xc8, 0x00, 0xcb, 0xc9, 0xcc, 0x00, 0x00, /* 0xb8-0xbf */
-  0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0x00, 0xdb, 0x00, /* 0xc0-0xc7 */
-  0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0x00, 0x00, /* 0xc8-0xcf */
-  0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, /* 0xd0-0xd7 */
-  0xf8, 0xf9, 0x00, 0x00, 0xdd, 0xde, 0x00, 0x00, /* 0xd8-0xdf */
-};
-
-static int
-cp1133_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x00a0) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc >= 0x00a0 && wc < 0x00b0)
-    c = cp1133_page00[wc-0x00a0];
-  else if (wc >= 0x0e80 && wc < 0x0ee0)
-    c = cp1133_page0e[wc-0x0e80];
-  else if (wc == 0x20ad)
-    c = 0xdf;
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/cp1251.h b/xc/lib/X11/lcUniConv/cp1251.h
deleted file mode 100644
index f3f7577f1..000000000
--- a/xc/lib/X11/lcUniConv/cp1251.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* $XFree86: xc/lib/X11/lcUniConv/cp1251.h,v 1.1 2000/12/04 18:49:32 dawes Exp $ */
-
-/*
- * CP1251
- */
-
-static const unsigned short cp1251_2uni[128] = {
-  /* 0x80 */
-  0x0402, 0x0403, 0x201a, 0x0453, 0x201e, 0x2026, 0x2020, 0x2021,
-  0x20ac, 0x2030, 0x0409, 0x2039, 0x040a, 0x040c, 0x040b, 0x040f,
-  /* 0x90 */
-  0x0452, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014,
-  0xfffd, 0x2122, 0x0459, 0x203a, 0x045a, 0x045c, 0x045b, 0x045f,
-  /* 0xa0 */
-  0x00a0, 0x040e, 0x045e, 0x0408, 0x00a4, 0x0490, 0x00a6, 0x00a7,
-  0x0401, 0x00a9, 0x0404, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x0407,
-  /* 0xb0 */
-  0x00b0, 0x00b1, 0x0406, 0x0456, 0x0491, 0x00b5, 0x00b6, 0x00b7,
-  0x0451, 0x2116, 0x0454, 0x00bb, 0x0458, 0x0405, 0x0455, 0x0457,
-  /* 0xc0 */
-  0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
-  0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, 0x041f,
-  /* 0xd0 */
-  0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,
-  0x0428, 0x0429, 0x042a, 0x042b, 0x042c, 0x042d, 0x042e, 0x042f,
-  /* 0xe0 */
-  0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,
-  0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, 0x043f,
-  /* 0xf0 */
-  0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
-  0x0448, 0x0449, 0x044a, 0x044b, 0x044c, 0x044d, 0x044e, 0x044f,
-};
-
-static int
-cp1251_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c < 0x80) {
-    *pwc = (ucs4_t) c;
-    return 1;
-  }
-  else {
-    unsigned short wc = cp1251_2uni[c-0x80];
-    if (wc != 0xfffd) {
-      *pwc = (ucs4_t) wc;
-      return 1;
-    }
-  }
-  return RET_ILSEQ;
-}
-
-static const unsigned char cp1251_page00[32] = {
-  0xa0, 0x00, 0x00, 0x00, 0xa4, 0x00, 0xa6, 0xa7, /* 0xa0-0xa7 */
-  0x00, 0xa9, 0x00, 0xab, 0xac, 0xad, 0xae, 0x00, /* 0xa8-0xaf */
-  0xb0, 0xb1, 0x00, 0x00, 0x00, 0xb5, 0xb6, 0xb7, /* 0xb0-0xb7 */
-  0x00, 0x00, 0x00, 0xbb, 0x00, 0x00, 0x00, 0x00, /* 0xb8-0xbf */
-};
-static const unsigned char cp1251_page04[152] = {
-  0x00, 0xa8, 0x80, 0x81, 0xaa, 0xbd, 0xb2, 0xaf, /* 0x00-0x07 */
-  0xa3, 0x8a, 0x8c, 0x8e, 0x8d, 0x00, 0xa1, 0x8f, /* 0x08-0x0f */
-  0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, /* 0x10-0x17 */
-  0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, /* 0x18-0x1f */
-  0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, /* 0x20-0x27 */
-  0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, /* 0x28-0x2f */
-  0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, /* 0x30-0x37 */
-  0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, /* 0x38-0x3f */
-  0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, /* 0x40-0x47 */
-  0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff, /* 0x48-0x4f */
-  0x00, 0xb8, 0x90, 0x83, 0xba, 0xbe, 0xb3, 0xbf, /* 0x50-0x57 */
-  0xbc, 0x9a, 0x9c, 0x9e, 0x9d, 0x00, 0xa2, 0x9f, /* 0x58-0x5f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x67 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x77 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x87 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8f */
-  0xa5, 0xb4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x97 */
-};
-static const unsigned char cp1251_page20[48] = {
-  0x00, 0x00, 0x00, 0x96, 0x97, 0x00, 0x00, 0x00, /* 0x10-0x17 */
-  0x91, 0x92, 0x82, 0x00, 0x93, 0x94, 0x84, 0x00, /* 0x18-0x1f */
-  0x86, 0x87, 0x95, 0x00, 0x00, 0x00, 0x85, 0x00, /* 0x20-0x27 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2f */
-  0x89, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x37 */
-  0x00, 0x8b, 0x9b, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3f */
-};
-
-static int
-cp1251_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x0080) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc >= 0x00a0 && wc < 0x00c0)
-    c = cp1251_page00[wc-0x00a0];
-  else if (wc >= 0x0400 && wc < 0x0498)
-    c = cp1251_page04[wc-0x0400];
-  else if (wc >= 0x2010 && wc < 0x2040)
-    c = cp1251_page20[wc-0x2010];
-  else if (wc == 0x20ac)
-    c = 0x88;
-  else if (wc == 0x2116)
-    c = 0xb9;
-  else if (wc == 0x2122)
-    c = 0x99;
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/cp1255.h b/xc/lib/X11/lcUniConv/cp1255.h
deleted file mode 100644
index 17b843ee3..000000000
--- a/xc/lib/X11/lcUniConv/cp1255.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* $XFree86: xc/lib/X11/lcUniConv/cp1255.h,v 1.1 2000/12/04 18:49:33 dawes Exp $ */
-
-/*
- * CP1255
- */
-
-static const unsigned short cp1255_2uni[128] = {
-  /* 0x80 */
-  0x20ac, 0xfffd, 0x201a, 0x0192, 0x201e, 0x2026, 0x2020, 0x2021,
-  0x02c6, 0x2030, 0xfffd, 0x2039, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  /* 0x90 */
-  0xfffd, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014,
-  0x02dc, 0x2122, 0xfffd, 0x203a, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  /* 0xa0 */
-  0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x20aa, 0x00a5, 0x00a6, 0x00a7,
-  0x00a8, 0x00a9, 0x00d7, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af,
-  /* 0xb0 */
-  0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7,
-  0x00b8, 0x00b9, 0x00f7, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf,
-  /* 0xc0 */
-  0x05b0, 0x05b1, 0x05b2, 0x05b3, 0x05b4, 0x05b5, 0x05b6, 0x05b7,
-  0x05b8, 0x05b9, 0xfffd, 0x05bb, 0x05bc, 0x05bd, 0x05be, 0x05bf,
-  /* 0xd0 */
-  0x05c0, 0x05c1, 0x05c2, 0x05c3, 0x05f0, 0x05f1, 0x05f2, 0x05f3,
-  0x05f4, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  /* 0xe0 */
-  0x05d0, 0x05d1, 0x05d2, 0x05d3, 0x05d4, 0x05d5, 0x05d6, 0x05d7,
-  0x05d8, 0x05d9, 0x05da, 0x05db, 0x05dc, 0x05dd, 0x05de, 0x05df,
-  /* 0xf0 */
-  0x05e0, 0x05e1, 0x05e2, 0x05e3, 0x05e4, 0x05e5, 0x05e6, 0x05e7,
-  0x05e8, 0x05e9, 0x05ea, 0xfffd, 0xfffd, 0x200e, 0x200f, 0xfffd,
-};
-
-static int
-cp1255_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c < 0x80) {
-    *pwc = (ucs4_t) c;
-    return 1;
-  }
-  else {
-    unsigned short wc = cp1255_2uni[c-0x80];
-    if (wc != 0xfffd) {
-      *pwc = (ucs4_t) wc;
-      return 1;
-    }
-  }
-  return RET_ILSEQ;
-}
-
-static const unsigned char cp1255_page00[88] = {
-  0xa0, 0xa1, 0xa2, 0xa3, 0x00, 0xa5, 0xa6, 0xa7, /* 0xa0-0xa7 */
-  0xa8, 0xa9, 0x00, 0xab, 0xac, 0xad, 0xae, 0xaf, /* 0xa8-0xaf */
-  0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, /* 0xb0-0xb7 */
-  0xb8, 0xb9, 0x00, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, /* 0xb8-0xbf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc0-0xc7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc8-0xcf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, /* 0xd0-0xd7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd8-0xdf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xe0-0xe7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xe8-0xef */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xba, /* 0xf0-0xf7 */
-};
-static const unsigned char cp1255_page02[32] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x00, /* 0xc0-0xc7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc8-0xcf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd0-0xd7 */
-  0x00, 0x00, 0x00, 0x00, 0x98, 0x00, 0x00, 0x00, /* 0xd8-0xdf */
-};
-static const unsigned char cp1255_page05[72] = {
-  0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, /* 0xb0-0xb7 */
-  0xc8, 0xc9, 0x00, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, /* 0xb8-0xbf */
-  0xd0, 0xd1, 0xd2, 0xd3, 0x00, 0x00, 0x00, 0x00, /* 0xc0-0xc7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc8-0xcf */
-  0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, /* 0xd0-0xd7 */
-  0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, /* 0xd8-0xdf */
-  0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, /* 0xe0-0xe7 */
-  0xf8, 0xf9, 0xfa, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xe8-0xef */
-  0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0x00, 0x00, 0x00, /* 0xf0-0xf7 */
-};
-static const unsigned char cp1255_page20[56] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfd, 0xfe, /* 0x08-0x0f */
-  0x00, 0x00, 0x00, 0x96, 0x97, 0x00, 0x00, 0x00, /* 0x10-0x17 */
-  0x91, 0x92, 0x82, 0x00, 0x93, 0x94, 0x84, 0x00, /* 0x18-0x1f */
-  0x86, 0x87, 0x95, 0x00, 0x00, 0x00, 0x85, 0x00, /* 0x20-0x27 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2f */
-  0x89, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x37 */
-  0x00, 0x8b, 0x9b, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3f */
-};
-
-static int
-cp1255_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x0080) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc >= 0x00a0 && wc < 0x00f8)
-    c = cp1255_page00[wc-0x00a0];
-  else if (wc == 0x0192)
-    c = 0x83;
-  else if (wc >= 0x02c0 && wc < 0x02e0)
-    c = cp1255_page02[wc-0x02c0];
-  else if (wc >= 0x05b0 && wc < 0x05f8)
-    c = cp1255_page05[wc-0x05b0];
-  else if (wc >= 0x2008 && wc < 0x2040)
-    c = cp1255_page20[wc-0x2008];
-  else if (wc == 0x20aa)
-    c = 0xa4;
-  else if (wc == 0x20ac)
-    c = 0x80;
-  else if (wc == 0x2122)
-    c = 0x99;
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/cp1256.h b/xc/lib/X11/lcUniConv/cp1256.h
deleted file mode 100644
index 5d4051bfe..000000000
--- a/xc/lib/X11/lcUniConv/cp1256.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/* $XFree86: xc/lib/X11/lcUniConv/cp1256.h,v 1.1 2000/12/04 18:49:34 dawes Exp $ */
-
-/*
- * CP1256
- */
-
-static const unsigned short cp1256_2uni[128] = {
-  /* 0x80 */
-  0x20ac, 0x067e, 0x201a, 0x0192, 0x201e, 0x2026, 0x2020, 0x2021,
-  0x02c6, 0x2030, 0x0679, 0x2039, 0x0152, 0x0686, 0x0698, 0x0688,
-  /* 0x90 */
-  0x06af, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014,
-  0x06a9, 0x2122, 0x0691, 0x203a, 0x0153, 0x200c, 0x200d, 0x06ba,
-  /* 0xa0 */
-  0x00a0, 0x060c, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6, 0x00a7,
-  0x00a8, 0x00a9, 0x06be, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af,
-  /* 0xb0 */
-  0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7,
-  0x00b8, 0x00b9, 0x061b, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x061f,
-  /* 0xc0 */
-  0x06c1, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627,
-  0x0628, 0x0629, 0x062a, 0x062b, 0x062c, 0x062d, 0x062e, 0x062f,
-  /* 0xd0 */
-  0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x00d7,
-  0x0637, 0x0638, 0x0639, 0x063a, 0x0640, 0x0641, 0x0642, 0x0643,
-  /* 0xe0 */
-  0x00e0, 0x0644, 0x00e2, 0x0645, 0x0646, 0x0647, 0x0648, 0x00e7,
-  0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x0649, 0x064a, 0x00ee, 0x00ef,
-  /* 0xf0 */
-  0x064b, 0x064c, 0x064d, 0x064e, 0x00f4, 0x064f, 0x0650, 0x00f7,
-  0x0651, 0x00f9, 0x0652, 0x00fb, 0x00fc, 0x200e, 0x200f, 0x06d2,
-};
-
-static int
-cp1256_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c < 0x80)
-    *pwc = (ucs4_t) c;
-  else
-    *pwc = (ucs4_t) cp1256_2uni[c-0x80];
-  return 1;
-}
-
-static const unsigned char cp1256_page00[96] = {
-  0xa0, 0x00, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, /* 0xa0-0xa7 */
-  0xa8, 0xa9, 0x00, 0xab, 0xac, 0xad, 0xae, 0xaf, /* 0xa8-0xaf */
-  0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, /* 0xb0-0xb7 */
-  0xb8, 0xb9, 0x00, 0xbb, 0xbc, 0xbd, 0xbe, 0x00, /* 0xb8-0xbf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc0-0xc7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc8-0xcf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd7, /* 0xd0-0xd7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd8-0xdf */
-  0xe0, 0x00, 0xe2, 0x00, 0x00, 0x00, 0x00, 0xe7, /* 0xe0-0xe7 */
-  0xe8, 0xe9, 0xea, 0xeb, 0x00, 0x00, 0xee, 0xef, /* 0xe8-0xef */
-  0x00, 0x00, 0x00, 0x00, 0xf4, 0x00, 0x00, 0xf7, /* 0xf0-0xf7 */
-  0x00, 0xf9, 0x00, 0xfb, 0xfc, 0x00, 0x00, 0x00, /* 0xf8-0xff */
-};
-static const unsigned char cp1256_page01[72] = {
-  0x00, 0x00, 0x8c, 0x9c, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x57 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x67 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x77 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x87 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8f */
-  0x00, 0x00, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x97 */
-};
-static const unsigned char cp1256_page06[208] = {
-  0x00, 0x00, 0x00, 0x00, 0xa1, 0x00, 0x00, 0x00, /* 0x08-0x0f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x17 */
-  0x00, 0x00, 0x00, 0xba, 0x00, 0x00, 0x00, 0xbf, /* 0x18-0x1f */
-  0x00, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, /* 0x20-0x27 */
-  0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, /* 0x28-0x2f */
-  0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd8, /* 0x30-0x37 */
-  0xd9, 0xda, 0xdb, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3f */
-  0xdc, 0xdd, 0xde, 0xdf, 0xe1, 0xe3, 0xe4, 0xe5, /* 0x40-0x47 */
-  0xe6, 0xec, 0xed, 0xf0, 0xf1, 0xf2, 0xf3, 0xf5, /* 0x48-0x4f */
-  0xf6, 0xf8, 0xfa, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x57 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x67 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x77 */
-  0x00, 0x8a, 0x00, 0x00, 0x00, 0x00, 0x81, 0x00, /* 0x78-0x7f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8d, 0x00, /* 0x80-0x87 */
-  0x8f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8f */
-  0x00, 0x9a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x97 */
-  0x8e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa0-0xa7 */
-  0x00, 0x98, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, /* 0xa8-0xaf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xb0-0xb7 */
-  0x00, 0x00, 0x9f, 0x00, 0x00, 0x00, 0xaa, 0x00, /* 0xb8-0xbf */
-  0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc0-0xc7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc8-0xcf */
-  0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd0-0xd7 */
-};
-static const unsigned char cp1256_page20[56] = {
-  0x00, 0x00, 0x00, 0x00, 0x9d, 0x9e, 0xfd, 0xfe, /* 0x08-0x0f */
-  0x00, 0x00, 0x00, 0x96, 0x97, 0x00, 0x00, 0x00, /* 0x10-0x17 */
-  0x91, 0x92, 0x82, 0x00, 0x93, 0x94, 0x84, 0x00, /* 0x18-0x1f */
-  0x86, 0x87, 0x95, 0x00, 0x00, 0x00, 0x85, 0x00, /* 0x20-0x27 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2f */
-  0x89, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x37 */
-  0x00, 0x8b, 0x9b, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3f */
-};
-
-static int
-cp1256_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x0080) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc >= 0x00a0 && wc < 0x0100)
-    c = cp1256_page00[wc-0x00a0];
-  else if (wc >= 0x0150 && wc < 0x0198)
-    c = cp1256_page01[wc-0x0150];
-  else if (wc == 0x02c6)
-    c = 0x88;
-  else if (wc >= 0x0608 && wc < 0x06d8)
-    c = cp1256_page06[wc-0x0608];
-  else if (wc >= 0x2008 && wc < 0x2040)
-    c = cp1256_page20[wc-0x2008];
-  else if (wc == 0x20ac)
-    c = 0x80;
-  else if (wc == 0x2122)
-    c = 0x99;
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/gb2312.h b/xc/lib/X11/lcUniConv/gb2312.h
deleted file mode 100644
index 251c664b4..000000000
--- a/xc/lib/X11/lcUniConv/gb2312.h
+++ /dev/null
@@ -1,2552 +0,0 @@
-
-/*
- * GB2312.1980-0
- */
-
-static const unsigned short gb2312_2uni_page21[831] = {
-  /* 0x21 */
-  0x3000, 0x3001, 0x3002, 0x30fb, 0x02c9, 0x02c7, 0x00a8, 0x3003,
-  0x3005, 0x2015, 0xff5e, 0x2016, 0x2026, 0x2018, 0x2019, 0x201c,
-  0x201d, 0x3014, 0x3015, 0x3008, 0x3009, 0x300a, 0x300b, 0x300c,
-  0x300d, 0x300e, 0x300f, 0x3016, 0x3017, 0x3010, 0x3011, 0x00b1,
-  0x00d7, 0x00f7, 0x2236, 0x2227, 0x2228, 0x2211, 0x220f, 0x222a,
-  0x2229, 0x2208, 0x2237, 0x221a, 0x22a5, 0x2225, 0x2220, 0x2312,
-  0x2299, 0x222b, 0x222e, 0x2261, 0x224c, 0x2248, 0x223d, 0x221d,
-  0x2260, 0x226e, 0x226f, 0x2264, 0x2265, 0x221e, 0x2235, 0x2234,
-  0x2642, 0x2640, 0x00b0, 0x2032, 0x2033, 0x2103, 0xff04, 0x00a4,
-  0xffe0, 0xffe1, 0x2030, 0x00a7, 0x2116, 0x2606, 0x2605, 0x25cb,
-  0x25cf, 0x25ce, 0x25c7, 0x25c6, 0x25a1, 0x25a0, 0x25b3, 0x25b2,
-  0x203b, 0x2192, 0x2190, 0x2191, 0x2193, 0x3013,
-  /* 0x22 */
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0x2488, 0x2489, 0x248a, 0x248b, 0x248c, 0x248d, 0x248e, 0x248f,
-  0x2490, 0x2491, 0x2492, 0x2493, 0x2494, 0x2495, 0x2496, 0x2497,
-  0x2498, 0x2499, 0x249a, 0x249b, 0x2474, 0x2475, 0x2476, 0x2477,
-  0x2478, 0x2479, 0x247a, 0x247b, 0x247c, 0x247d, 0x247e, 0x247f,
-  0x2480, 0x2481, 0x2482, 0x2483, 0x2484, 0x2485, 0x2486, 0x2487,
-  0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467,
-  0x2468, 0x2469, 0xfffd, 0xfffd, 0x3220, 0x3221, 0x3222, 0x3223,
-  0x3224, 0x3225, 0x3226, 0x3227, 0x3228, 0x3229, 0xfffd, 0xfffd,
-  0x2160, 0x2161, 0x2162, 0x2163, 0x2164, 0x2165, 0x2166, 0x2167,
-  0x2168, 0x2169, 0x216a, 0x216b, 0xfffd, 0xfffd,
-  /* 0x23 */
-  0xff01, 0xff02, 0xff03, 0xffe5, 0xff05, 0xff06, 0xff07, 0xff08,
-  0xff09, 0xff0a, 0xff0b, 0xff0c, 0xff0d, 0xff0e, 0xff0f, 0xff10,
-  0xff11, 0xff12, 0xff13, 0xff14, 0xff15, 0xff16, 0xff17, 0xff18,
-  0xff19, 0xff1a, 0xff1b, 0xff1c, 0xff1d, 0xff1e, 0xff1f, 0xff20,
-  0xff21, 0xff22, 0xff23, 0xff24, 0xff25, 0xff26, 0xff27, 0xff28,
-  0xff29, 0xff2a, 0xff2b, 0xff2c, 0xff2d, 0xff2e, 0xff2f, 0xff30,
-  0xff31, 0xff32, 0xff33, 0xff34, 0xff35, 0xff36, 0xff37, 0xff38,
-  0xff39, 0xff3a, 0xff3b, 0xff3c, 0xff3d, 0xff3e, 0xff3f, 0xff40,
-  0xff41, 0xff42, 0xff43, 0xff44, 0xff45, 0xff46, 0xff47, 0xff48,
-  0xff49, 0xff4a, 0xff4b, 0xff4c, 0xff4d, 0xff4e, 0xff4f, 0xff50,
-  0xff51, 0xff52, 0xff53, 0xff54, 0xff55, 0xff56, 0xff57, 0xff58,
-  0xff59, 0xff5a, 0xff5b, 0xff5c, 0xff5d, 0xffe3,
-  /* 0x24 */
-  0x3041, 0x3042, 0x3043, 0x3044, 0x3045, 0x3046, 0x3047, 0x3048,
-  0x3049, 0x304a, 0x304b, 0x304c, 0x304d, 0x304e, 0x304f, 0x3050,
-  0x3051, 0x3052, 0x3053, 0x3054, 0x3055, 0x3056, 0x3057, 0x3058,
-  0x3059, 0x305a, 0x305b, 0x305c, 0x305d, 0x305e, 0x305f, 0x3060,
-  0x3061, 0x3062, 0x3063, 0x3064, 0x3065, 0x3066, 0x3067, 0x3068,
-  0x3069, 0x306a, 0x306b, 0x306c, 0x306d, 0x306e, 0x306f, 0x3070,
-  0x3071, 0x3072, 0x3073, 0x3074, 0x3075, 0x3076, 0x3077, 0x3078,
-  0x3079, 0x307a, 0x307b, 0x307c, 0x307d, 0x307e, 0x307f, 0x3080,
-  0x3081, 0x3082, 0x3083, 0x3084, 0x3085, 0x3086, 0x3087, 0x3088,
-  0x3089, 0x308a, 0x308b, 0x308c, 0x308d, 0x308e, 0x308f, 0x3090,
-  0x3091, 0x3092, 0x3093, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  /* 0x25 */
-  0x30a1, 0x30a2, 0x30a3, 0x30a4, 0x30a5, 0x30a6, 0x30a7, 0x30a8,
-  0x30a9, 0x30aa, 0x30ab, 0x30ac, 0x30ad, 0x30ae, 0x30af, 0x30b0,
-  0x30b1, 0x30b2, 0x30b3, 0x30b4, 0x30b5, 0x30b6, 0x30b7, 0x30b8,
-  0x30b9, 0x30ba, 0x30bb, 0x30bc, 0x30bd, 0x30be, 0x30bf, 0x30c0,
-  0x30c1, 0x30c2, 0x30c3, 0x30c4, 0x30c5, 0x30c6, 0x30c7, 0x30c8,
-  0x30c9, 0x30ca, 0x30cb, 0x30cc, 0x30cd, 0x30ce, 0x30cf, 0x30d0,
-  0x30d1, 0x30d2, 0x30d3, 0x30d4, 0x30d5, 0x30d6, 0x30d7, 0x30d8,
-  0x30d9, 0x30da, 0x30db, 0x30dc, 0x30dd, 0x30de, 0x30df, 0x30e0,
-  0x30e1, 0x30e2, 0x30e3, 0x30e4, 0x30e5, 0x30e6, 0x30e7, 0x30e8,
-  0x30e9, 0x30ea, 0x30eb, 0x30ec, 0x30ed, 0x30ee, 0x30ef, 0x30f0,
-  0x30f1, 0x30f2, 0x30f3, 0x30f4, 0x30f5, 0x30f6, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  /* 0x26 */
-  0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, 0x0398,
-  0x0399, 0x039a, 0x039b, 0x039c, 0x039d, 0x039e, 0x039f, 0x03a0,
-  0x03a1, 0x03a3, 0x03a4, 0x03a5, 0x03a6, 0x03a7, 0x03a8, 0x03a9,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0x03b1, 0x03b2, 0x03b3, 0x03b4, 0x03b5, 0x03b6, 0x03b7, 0x03b8,
-  0x03b9, 0x03ba, 0x03bb, 0x03bc, 0x03bd, 0x03be, 0x03bf, 0x03c0,
-  0x03c1, 0x03c3, 0x03c4, 0x03c5, 0x03c6, 0x03c7, 0x03c8, 0x03c9,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  /* 0x27 */
-  0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0401, 0x0416,
-  0x0417, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e,
-  0x041f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426,
-  0x0427, 0x0428, 0x0429, 0x042a, 0x042b, 0x042c, 0x042d, 0x042e,
-  0x042f, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0451, 0x0436,
-  0x0437, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e,
-  0x043f, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446,
-  0x0447, 0x0448, 0x0449, 0x044a, 0x044b, 0x044c, 0x044d, 0x044e,
-  0x044f, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  /* 0x28 */
-  0x0101, 0x00e1, 0x01ce, 0x00e0, 0x0113, 0x00e9, 0x011b, 0x00e8,
-  0x012b, 0x00ed, 0x01d0, 0x00ec, 0x014d, 0x00f3, 0x01d2, 0x00f2,
-  0x016b, 0x00fa, 0x01d4, 0x00f9, 0x01d6, 0x01d8, 0x01da, 0x01dc,
-  0x00fc, 0x00ea, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0x3105, 0x3106, 0x3107, 0x3108,
-  0x3109, 0x310a, 0x310b, 0x310c, 0x310d, 0x310e, 0x310f, 0x3110,
-  0x3111, 0x3112, 0x3113, 0x3114, 0x3115, 0x3116, 0x3117, 0x3118,
-  0x3119, 0x311a, 0x311b, 0x311c, 0x311d, 0x311e, 0x311f, 0x3120,
-  0x3121, 0x3122, 0x3123, 0x3124, 0x3125, 0x3126, 0x3127, 0x3128,
-  0x3129, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  /* 0x29 */
-  0xfffd, 0xfffd, 0xfffd, 0x2500, 0x2501, 0x2502, 0x2503, 0x2504,
-  0x2505, 0x2506, 0x2507, 0x2508, 0x2509, 0x250a, 0x250b, 0x250c,
-  0x250d, 0x250e, 0x250f, 0x2510, 0x2511, 0x2512, 0x2513, 0x2514,
-  0x2515, 0x2516, 0x2517, 0x2518, 0x2519, 0x251a, 0x251b, 0x251c,
-  0x251d, 0x251e, 0x251f, 0x2520, 0x2521, 0x2522, 0x2523, 0x2524,
-  0x2525, 0x2526, 0x2527, 0x2528, 0x2529, 0x252a, 0x252b, 0x252c,
-  0x252d, 0x252e, 0x252f, 0x2530, 0x2531, 0x2532, 0x2533, 0x2534,
-  0x2535, 0x2536, 0x2537, 0x2538, 0x2539, 0x253a, 0x253b, 0x253c,
-  0x253d, 0x253e, 0x253f, 0x2540, 0x2541, 0x2542, 0x2543, 0x2544,
-  0x2545, 0x2546, 0x2547, 0x2548, 0x2549, 0x254a, 0x254b,
-};
-static const unsigned short gb2312_2uni_page30[6768] = {
-  /* 0x30 */
-  0x554a, 0x963f, 0x57c3, 0x6328, 0x54ce, 0x5509, 0x54c0, 0x7691,
-  0x764c, 0x853c, 0x77ee, 0x827e, 0x788d, 0x7231, 0x9698, 0x978d,
-  0x6c28, 0x5b89, 0x4ffa, 0x6309, 0x6697, 0x5cb8, 0x80fa, 0x6848,
-  0x80ae, 0x6602, 0x76ce, 0x51f9, 0x6556, 0x71ac, 0x7ff1, 0x8884,
-  0x50b2, 0x5965, 0x61ca, 0x6fb3, 0x82ad, 0x634c, 0x6252, 0x53ed,
-  0x5427, 0x7b06, 0x516b, 0x75a4, 0x5df4, 0x62d4, 0x8dcb, 0x9776,
-  0x628a, 0x8019, 0x575d, 0x9738, 0x7f62, 0x7238, 0x767d, 0x67cf,
-  0x767e, 0x6446, 0x4f70, 0x8d25, 0x62dc, 0x7a17, 0x6591, 0x73ed,
-  0x642c, 0x6273, 0x822c, 0x9881, 0x677f, 0x7248, 0x626e, 0x62cc,
-  0x4f34, 0x74e3, 0x534a, 0x529e, 0x7eca, 0x90a6, 0x5e2e, 0x6886,
-  0x699c, 0x8180, 0x7ed1, 0x68d2, 0x78c5, 0x868c, 0x9551, 0x508d,
-  0x8c24, 0x82de, 0x80de, 0x5305, 0x8912, 0x5265,
-  /* 0x31 */
-  0x8584, 0x96f9, 0x4fdd, 0x5821, 0x9971, 0x5b9d, 0x62b1, 0x62a5,
-  0x66b4, 0x8c79, 0x9c8d, 0x7206, 0x676f, 0x7891, 0x60b2, 0x5351,
-  0x5317, 0x8f88, 0x80cc, 0x8d1d, 0x94a1, 0x500d, 0x72c8, 0x5907,
-  0x60eb, 0x7119, 0x88ab, 0x5954, 0x82ef, 0x672c, 0x7b28, 0x5d29,
-  0x7ef7, 0x752d, 0x6cf5, 0x8e66, 0x8ff8, 0x903c, 0x9f3b, 0x6bd4,
-  0x9119, 0x7b14, 0x5f7c, 0x78a7, 0x84d6, 0x853d, 0x6bd5, 0x6bd9,
-  0x6bd6, 0x5e01, 0x5e87, 0x75f9, 0x95ed, 0x655d, 0x5f0a, 0x5fc5,
-  0x8f9f, 0x58c1, 0x81c2, 0x907f, 0x965b, 0x97ad, 0x8fb9, 0x7f16,
-  0x8d2c, 0x6241, 0x4fbf, 0x53d8, 0x535e, 0x8fa8, 0x8fa9, 0x8fab,
-  0x904d, 0x6807, 0x5f6a, 0x8198, 0x8868, 0x9cd6, 0x618b, 0x522b,
-  0x762a, 0x5f6c, 0x658c, 0x6fd2, 0x6ee8, 0x5bbe, 0x6448, 0x5175,
-  0x51b0, 0x67c4, 0x4e19, 0x79c9, 0x997c, 0x70b3,
-  /* 0x32 */
-  0x75c5, 0x5e76, 0x73bb, 0x83e0, 0x64ad, 0x62e8, 0x94b5, 0x6ce2,
-  0x535a, 0x52c3, 0x640f, 0x94c2, 0x7b94, 0x4f2f, 0x5e1b, 0x8236,
-  0x8116, 0x818a, 0x6e24, 0x6cca, 0x9a73, 0x6355, 0x535c, 0x54fa,
-  0x8865, 0x57e0, 0x4e0d, 0x5e03, 0x6b65, 0x7c3f, 0x90e8, 0x6016,
-  0x64e6, 0x731c, 0x88c1, 0x6750, 0x624d, 0x8d22, 0x776c, 0x8e29,
-  0x91c7, 0x5f69, 0x83dc, 0x8521, 0x9910, 0x53c2, 0x8695, 0x6b8b,
-  0x60ed, 0x60e8, 0x707f, 0x82cd, 0x8231, 0x4ed3, 0x6ca7, 0x85cf,
-  0x64cd, 0x7cd9, 0x69fd, 0x66f9, 0x8349, 0x5395, 0x7b56, 0x4fa7,
-  0x518c, 0x6d4b, 0x5c42, 0x8e6d, 0x63d2, 0x53c9, 0x832c, 0x8336,
-  0x67e5, 0x78b4, 0x643d, 0x5bdf, 0x5c94, 0x5dee, 0x8be7, 0x62c6,
-  0x67f4, 0x8c7a, 0x6400, 0x63ba, 0x8749, 0x998b, 0x8c17, 0x7f20,
-  0x94f2, 0x4ea7, 0x9610, 0x98a4, 0x660c, 0x7316,
-  /* 0x33 */
-  0x573a, 0x5c1d, 0x5e38, 0x957f, 0x507f, 0x80a0, 0x5382, 0x655e,
-  0x7545, 0x5531, 0x5021, 0x8d85, 0x6284, 0x949e, 0x671d, 0x5632,
-  0x6f6e, 0x5de2, 0x5435, 0x7092, 0x8f66, 0x626f, 0x64a4, 0x63a3,
-  0x5f7b, 0x6f88, 0x90f4, 0x81e3, 0x8fb0, 0x5c18, 0x6668, 0x5ff1,
-  0x6c89, 0x9648, 0x8d81, 0x886c, 0x6491, 0x79f0, 0x57ce, 0x6a59,
-  0x6210, 0x5448, 0x4e58, 0x7a0b, 0x60e9, 0x6f84, 0x8bda, 0x627f,
-  0x901e, 0x9a8b, 0x79e4, 0x5403, 0x75f4, 0x6301, 0x5319, 0x6c60,
-  0x8fdf, 0x5f1b, 0x9a70, 0x803b, 0x9f7f, 0x4f88, 0x5c3a, 0x8d64,
-  0x7fc5, 0x65a5, 0x70bd, 0x5145, 0x51b2, 0x866b, 0x5d07, 0x5ba0,
-  0x62bd, 0x916c, 0x7574, 0x8e0c, 0x7a20, 0x6101, 0x7b79, 0x4ec7,
-  0x7ef8, 0x7785, 0x4e11, 0x81ed, 0x521d, 0x51fa, 0x6a71, 0x53a8,
-  0x8e87, 0x9504, 0x96cf, 0x6ec1, 0x9664, 0x695a,
-  /* 0x34 */
-  0x7840, 0x50a8, 0x77d7, 0x6410, 0x89e6, 0x5904, 0x63e3, 0x5ddd,
-  0x7a7f, 0x693d, 0x4f20, 0x8239, 0x5598, 0x4e32, 0x75ae, 0x7a97,
-  0x5e62, 0x5e8a, 0x95ef, 0x521b, 0x5439, 0x708a, 0x6376, 0x9524,
-  0x5782, 0x6625, 0x693f, 0x9187, 0x5507, 0x6df3, 0x7eaf, 0x8822,
-  0x6233, 0x7ef0, 0x75b5, 0x8328, 0x78c1, 0x96cc, 0x8f9e, 0x6148,
-  0x74f7, 0x8bcd, 0x6b64, 0x523a, 0x8d50, 0x6b21, 0x806a, 0x8471,
-  0x56f1, 0x5306, 0x4ece, 0x4e1b, 0x51d1, 0x7c97, 0x918b, 0x7c07,
-  0x4fc3, 0x8e7f, 0x7be1, 0x7a9c, 0x6467, 0x5d14, 0x50ac, 0x8106,
-  0x7601, 0x7cb9, 0x6dec, 0x7fe0, 0x6751, 0x5b58, 0x5bf8, 0x78cb,
-  0x64ae, 0x6413, 0x63aa, 0x632b, 0x9519, 0x642d, 0x8fbe, 0x7b54,
-  0x7629, 0x6253, 0x5927, 0x5446, 0x6b79, 0x50a3, 0x6234, 0x5e26,
-  0x6b86, 0x4ee3, 0x8d37, 0x888b, 0x5f85, 0x902e,
-  /* 0x35 */
-  0x6020, 0x803d, 0x62c5, 0x4e39, 0x5355, 0x90f8, 0x63b8, 0x80c6,
-  0x65e6, 0x6c2e, 0x4f46, 0x60ee, 0x6de1, 0x8bde, 0x5f39, 0x86cb,
-  0x5f53, 0x6321, 0x515a, 0x8361, 0x6863, 0x5200, 0x6363, 0x8e48,
-  0x5012, 0x5c9b, 0x7977, 0x5bfc, 0x5230, 0x7a3b, 0x60bc, 0x9053,
-  0x76d7, 0x5fb7, 0x5f97, 0x7684, 0x8e6c, 0x706f, 0x767b, 0x7b49,
-  0x77aa, 0x51f3, 0x9093, 0x5824, 0x4f4e, 0x6ef4, 0x8fea, 0x654c,
-  0x7b1b, 0x72c4, 0x6da4, 0x7fdf, 0x5ae1, 0x62b5, 0x5e95, 0x5730,
-  0x8482, 0x7b2c, 0x5e1d, 0x5f1f, 0x9012, 0x7f14, 0x98a0, 0x6382,
-  0x6ec7, 0x7898, 0x70b9, 0x5178, 0x975b, 0x57ab, 0x7535, 0x4f43,
-  0x7538, 0x5e97, 0x60e6, 0x5960, 0x6dc0, 0x6bbf, 0x7889, 0x53fc,
-  0x96d5, 0x51cb, 0x5201, 0x6389, 0x540a, 0x9493, 0x8c03, 0x8dcc,
-  0x7239, 0x789f, 0x8776, 0x8fed, 0x8c0d, 0x53e0,
-  /* 0x36 */
-  0x4e01, 0x76ef, 0x53ee, 0x9489, 0x9876, 0x9f0e, 0x952d, 0x5b9a,
-  0x8ba2, 0x4e22, 0x4e1c, 0x51ac, 0x8463, 0x61c2, 0x52a8, 0x680b,
-  0x4f97, 0x606b, 0x51bb, 0x6d1e, 0x515c, 0x6296, 0x6597, 0x9661,
-  0x8c46, 0x9017, 0x75d8, 0x90fd, 0x7763, 0x6bd2, 0x728a, 0x72ec,
-  0x8bfb, 0x5835, 0x7779, 0x8d4c, 0x675c, 0x9540, 0x809a, 0x5ea6,
-  0x6e21, 0x5992, 0x7aef, 0x77ed, 0x953b, 0x6bb5, 0x65ad, 0x7f0e,
-  0x5806, 0x5151, 0x961f, 0x5bf9, 0x58a9, 0x5428, 0x8e72, 0x6566,
-  0x987f, 0x56e4, 0x949d, 0x76fe, 0x9041, 0x6387, 0x54c6, 0x591a,
-  0x593a, 0x579b, 0x8eb2, 0x6735, 0x8dfa, 0x8235, 0x5241, 0x60f0,
-  0x5815, 0x86fe, 0x5ce8, 0x9e45, 0x4fc4, 0x989d, 0x8bb9, 0x5a25,
-  0x6076, 0x5384, 0x627c, 0x904f, 0x9102, 0x997f, 0x6069, 0x800c,
-  0x513f, 0x8033, 0x5c14, 0x9975, 0x6d31, 0x4e8c,
-  /* 0x37 */
-  0x8d30, 0x53d1, 0x7f5a, 0x7b4f, 0x4f10, 0x4e4f, 0x9600, 0x6cd5,
-  0x73d0, 0x85e9, 0x5e06, 0x756a, 0x7ffb, 0x6a0a, 0x77fe, 0x9492,
-  0x7e41, 0x51e1, 0x70e6, 0x53cd, 0x8fd4, 0x8303, 0x8d29, 0x72af,
-  0x996d, 0x6cdb, 0x574a, 0x82b3, 0x65b9, 0x80aa, 0x623f, 0x9632,
-  0x59a8, 0x4eff, 0x8bbf, 0x7eba, 0x653e, 0x83f2, 0x975e, 0x5561,
-  0x98de, 0x80a5, 0x532a, 0x8bfd, 0x5420, 0x80ba, 0x5e9f, 0x6cb8,
-  0x8d39, 0x82ac, 0x915a, 0x5429, 0x6c1b, 0x5206, 0x7eb7, 0x575f,
-  0x711a, 0x6c7e, 0x7c89, 0x594b, 0x4efd, 0x5fff, 0x6124, 0x7caa,
-  0x4e30, 0x5c01, 0x67ab, 0x8702, 0x5cf0, 0x950b, 0x98ce, 0x75af,
-  0x70fd, 0x9022, 0x51af, 0x7f1d, 0x8bbd, 0x5949, 0x51e4, 0x4f5b,
-  0x5426, 0x592b, 0x6577, 0x80a4, 0x5b75, 0x6276, 0x62c2, 0x8f90,
-  0x5e45, 0x6c1f, 0x7b26, 0x4f0f, 0x4fd8, 0x670d,
-  /* 0x38 */
-  0x6d6e, 0x6daa, 0x798f, 0x88b1, 0x5f17, 0x752b, 0x629a, 0x8f85,
-  0x4fef, 0x91dc, 0x65a7, 0x812f, 0x8151, 0x5e9c, 0x8150, 0x8d74,
-  0x526f, 0x8986, 0x8d4b, 0x590d, 0x5085, 0x4ed8, 0x961c, 0x7236,
-  0x8179, 0x8d1f, 0x5bcc, 0x8ba3, 0x9644, 0x5987, 0x7f1a, 0x5490,
-  0x5676, 0x560e, 0x8be5, 0x6539, 0x6982, 0x9499, 0x76d6, 0x6e89,
-  0x5e72, 0x7518, 0x6746, 0x67d1, 0x7aff, 0x809d, 0x8d76, 0x611f,
-  0x79c6, 0x6562, 0x8d63, 0x5188, 0x521a, 0x94a2, 0x7f38, 0x809b,
-  0x7eb2, 0x5c97, 0x6e2f, 0x6760, 0x7bd9, 0x768b, 0x9ad8, 0x818f,
-  0x7f94, 0x7cd5, 0x641e, 0x9550, 0x7a3f, 0x544a, 0x54e5, 0x6b4c,
-  0x6401, 0x6208, 0x9e3d, 0x80f3, 0x7599, 0x5272, 0x9769, 0x845b,
-  0x683c, 0x86e4, 0x9601, 0x9694, 0x94ec, 0x4e2a, 0x5404, 0x7ed9,
-  0x6839, 0x8ddf, 0x8015, 0x66f4, 0x5e9a, 0x7fb9,
-  /* 0x39 */
-  0x57c2, 0x803f, 0x6897, 0x5de5, 0x653b, 0x529f, 0x606d, 0x9f9a,
-  0x4f9b, 0x8eac, 0x516c, 0x5bab, 0x5f13, 0x5de9, 0x6c5e, 0x62f1,
-  0x8d21, 0x5171, 0x94a9, 0x52fe, 0x6c9f, 0x82df, 0x72d7, 0x57a2,
-  0x6784, 0x8d2d, 0x591f, 0x8f9c, 0x83c7, 0x5495, 0x7b8d, 0x4f30,
-  0x6cbd, 0x5b64, 0x59d1, 0x9f13, 0x53e4, 0x86ca, 0x9aa8, 0x8c37,
-  0x80a1, 0x6545, 0x987e, 0x56fa, 0x96c7, 0x522e, 0x74dc, 0x5250,
-  0x5be1, 0x6302, 0x8902, 0x4e56, 0x62d0, 0x602a, 0x68fa, 0x5173,
-  0x5b98, 0x51a0, 0x89c2, 0x7ba1, 0x9986, 0x7f50, 0x60ef, 0x704c,
-  0x8d2f, 0x5149, 0x5e7f, 0x901b, 0x7470, 0x89c4, 0x572d, 0x7845,
-  0x5f52, 0x9f9f, 0x95fa, 0x8f68, 0x9b3c, 0x8be1, 0x7678, 0x6842,
-  0x67dc, 0x8dea, 0x8d35, 0x523d, 0x8f8a, 0x6eda, 0x68cd, 0x9505,
-  0x90ed, 0x56fd, 0x679c, 0x88f9, 0x8fc7, 0x54c8,
-  /* 0x3a */
-  0x9ab8, 0x5b69, 0x6d77, 0x6c26, 0x4ea5, 0x5bb3, 0x9a87, 0x9163,
-  0x61a8, 0x90af, 0x97e9, 0x542b, 0x6db5, 0x5bd2, 0x51fd, 0x558a,
-  0x7f55, 0x7ff0, 0x64bc, 0x634d, 0x65f1, 0x61be, 0x608d, 0x710a,
-  0x6c57, 0x6c49, 0x592f, 0x676d, 0x822a, 0x58d5, 0x568e, 0x8c6a,
-  0x6beb, 0x90dd, 0x597d, 0x8017, 0x53f7, 0x6d69, 0x5475, 0x559d,
-  0x8377, 0x83cf, 0x6838, 0x79be, 0x548c, 0x4f55, 0x5408, 0x76d2,
-  0x8c89, 0x9602, 0x6cb3, 0x6db8, 0x8d6b, 0x8910, 0x9e64, 0x8d3a,
-  0x563f, 0x9ed1, 0x75d5, 0x5f88, 0x72e0, 0x6068, 0x54fc, 0x4ea8,
-  0x6a2a, 0x8861, 0x6052, 0x8f70, 0x54c4, 0x70d8, 0x8679, 0x9e3f,
-  0x6d2a, 0x5b8f, 0x5f18, 0x7ea2, 0x5589, 0x4faf, 0x7334, 0x543c,
-  0x539a, 0x5019, 0x540e, 0x547c, 0x4e4e, 0x5ffd, 0x745a, 0x58f6,
-  0x846b, 0x80e1, 0x8774, 0x72d0, 0x7cca, 0x6e56,
-  /* 0x3b */
-  0x5f27, 0x864e, 0x552c, 0x62a4, 0x4e92, 0x6caa, 0x6237, 0x82b1,
-  0x54d7, 0x534e, 0x733e, 0x6ed1, 0x753b, 0x5212, 0x5316, 0x8bdd,
-  0x69d0, 0x5f8a, 0x6000, 0x6dee, 0x574f, 0x6b22, 0x73af, 0x6853,
-  0x8fd8, 0x7f13, 0x6362, 0x60a3, 0x5524, 0x75ea, 0x8c62, 0x7115,
-  0x6da3, 0x5ba6, 0x5e7b, 0x8352, 0x614c, 0x9ec4, 0x78fa, 0x8757,
-  0x7c27, 0x7687, 0x51f0, 0x60f6, 0x714c, 0x6643, 0x5e4c, 0x604d,
-  0x8c0e, 0x7070, 0x6325, 0x8f89, 0x5fbd, 0x6062, 0x86d4, 0x56de,
-  0x6bc1, 0x6094, 0x6167, 0x5349, 0x60e0, 0x6666, 0x8d3f, 0x79fd,
-  0x4f1a, 0x70e9, 0x6c47, 0x8bb3, 0x8bf2, 0x7ed8, 0x8364, 0x660f,
-  0x5a5a, 0x9b42, 0x6d51, 0x6df7, 0x8c41, 0x6d3b, 0x4f19, 0x706b,
-  0x83b7, 0x6216, 0x60d1, 0x970d, 0x8d27, 0x7978, 0x51fb, 0x573e,
-  0x57fa, 0x673a, 0x7578, 0x7a3d, 0x79ef, 0x7b95,
-  /* 0x3c */
-  0x808c, 0x9965, 0x8ff9, 0x6fc0, 0x8ba5, 0x9e21, 0x59ec, 0x7ee9,
-  0x7f09, 0x5409, 0x6781, 0x68d8, 0x8f91, 0x7c4d, 0x96c6, 0x53ca,
-  0x6025, 0x75be, 0x6c72, 0x5373, 0x5ac9, 0x7ea7, 0x6324, 0x51e0,
-  0x810a, 0x5df1, 0x84df, 0x6280, 0x5180, 0x5b63, 0x4f0e, 0x796d,
-  0x5242, 0x60b8, 0x6d4e, 0x5bc4, 0x5bc2, 0x8ba1, 0x8bb0, 0x65e2,
-  0x5fcc, 0x9645, 0x5993, 0x7ee7, 0x7eaa, 0x5609, 0x67b7, 0x5939,
-  0x4f73, 0x5bb6, 0x52a0, 0x835a, 0x988a, 0x8d3e, 0x7532, 0x94be,
-  0x5047, 0x7a3c, 0x4ef7, 0x67b6, 0x9a7e, 0x5ac1, 0x6b7c, 0x76d1,
-  0x575a, 0x5c16, 0x7b3a, 0x95f4, 0x714e, 0x517c, 0x80a9, 0x8270,
-  0x5978, 0x7f04, 0x8327, 0x68c0, 0x67ec, 0x78b1, 0x7877, 0x62e3,
-  0x6361, 0x7b80, 0x4fed, 0x526a, 0x51cf, 0x8350, 0x69db, 0x9274,
-  0x8df5, 0x8d31, 0x89c1, 0x952e, 0x7bad, 0x4ef6,
-  /* 0x3d */
-  0x5065, 0x8230, 0x5251, 0x996f, 0x6e10, 0x6e85, 0x6da7, 0x5efa,
-  0x50f5, 0x59dc, 0x5c06, 0x6d46, 0x6c5f, 0x7586, 0x848b, 0x6868,
-  0x5956, 0x8bb2, 0x5320, 0x9171, 0x964d, 0x8549, 0x6912, 0x7901,
-  0x7126, 0x80f6, 0x4ea4, 0x90ca, 0x6d47, 0x9a84, 0x5a07, 0x56bc,
-  0x6405, 0x94f0, 0x77eb, 0x4fa5, 0x811a, 0x72e1, 0x89d2, 0x997a,
-  0x7f34, 0x7ede, 0x527f, 0x6559, 0x9175, 0x8f7f, 0x8f83, 0x53eb,
-  0x7a96, 0x63ed, 0x63a5, 0x7686, 0x79f8, 0x8857, 0x9636, 0x622a,
-  0x52ab, 0x8282, 0x6854, 0x6770, 0x6377, 0x776b, 0x7aed, 0x6d01,
-  0x7ed3, 0x89e3, 0x59d0, 0x6212, 0x85c9, 0x82a5, 0x754c, 0x501f,
-  0x4ecb, 0x75a5, 0x8beb, 0x5c4a, 0x5dfe, 0x7b4b, 0x65a4, 0x91d1,
-  0x4eca, 0x6d25, 0x895f, 0x7d27, 0x9526, 0x4ec5, 0x8c28, 0x8fdb,
-  0x9773, 0x664b, 0x7981, 0x8fd1, 0x70ec, 0x6d78,
-  /* 0x3e */
-  0x5c3d, 0x52b2, 0x8346, 0x5162, 0x830e, 0x775b, 0x6676, 0x9cb8,
-  0x4eac, 0x60ca, 0x7cbe, 0x7cb3, 0x7ecf, 0x4e95, 0x8b66, 0x666f,
-  0x9888, 0x9759, 0x5883, 0x656c, 0x955c, 0x5f84, 0x75c9, 0x9756,
-  0x7adf, 0x7ade, 0x51c0, 0x70af, 0x7a98, 0x63ea, 0x7a76, 0x7ea0,
-  0x7396, 0x97ed, 0x4e45, 0x7078, 0x4e5d, 0x9152, 0x53a9, 0x6551,
-  0x65e7, 0x81fc, 0x8205, 0x548e, 0x5c31, 0x759a, 0x97a0, 0x62d8,
-  0x72d9, 0x75bd, 0x5c45, 0x9a79, 0x83ca, 0x5c40, 0x5480, 0x77e9,
-  0x4e3e, 0x6cae, 0x805a, 0x62d2, 0x636e, 0x5de8, 0x5177, 0x8ddd,
-  0x8e1e, 0x952f, 0x4ff1, 0x53e5, 0x60e7, 0x70ac, 0x5267, 0x6350,
-  0x9e43, 0x5a1f, 0x5026, 0x7737, 0x5377, 0x7ee2, 0x6485, 0x652b,
-  0x6289, 0x6398, 0x5014, 0x7235, 0x89c9, 0x51b3, 0x8bc0, 0x7edd,
-  0x5747, 0x83cc, 0x94a7, 0x519b, 0x541b, 0x5cfb,
-  /* 0x3f */
-  0x4fca, 0x7ae3, 0x6d5a, 0x90e1, 0x9a8f, 0x5580, 0x5496, 0x5361,
-  0x54af, 0x5f00, 0x63e9, 0x6977, 0x51ef, 0x6168, 0x520a, 0x582a,
-  0x52d8, 0x574e, 0x780d, 0x770b, 0x5eb7, 0x6177, 0x7ce0, 0x625b,
-  0x6297, 0x4ea2, 0x7095, 0x8003, 0x62f7, 0x70e4, 0x9760, 0x5777,
-  0x82db, 0x67ef, 0x68f5, 0x78d5, 0x9897, 0x79d1, 0x58f3, 0x54b3,
-  0x53ef, 0x6e34, 0x514b, 0x523b, 0x5ba2, 0x8bfe, 0x80af, 0x5543,
-  0x57a6, 0x6073, 0x5751, 0x542d, 0x7a7a, 0x6050, 0x5b54, 0x63a7,
-  0x62a0, 0x53e3, 0x6263, 0x5bc7, 0x67af, 0x54ed, 0x7a9f, 0x82e6,
-  0x9177, 0x5e93, 0x88e4, 0x5938, 0x57ae, 0x630e, 0x8de8, 0x80ef,
-  0x5757, 0x7b77, 0x4fa9, 0x5feb, 0x5bbd, 0x6b3e, 0x5321, 0x7b50,
-  0x72c2, 0x6846, 0x77ff, 0x7736, 0x65f7, 0x51b5, 0x4e8f, 0x76d4,
-  0x5cbf, 0x7aa5, 0x8475, 0x594e, 0x9b41, 0x5080,
-  /* 0x40 */
-  0x9988, 0x6127, 0x6e83, 0x5764, 0x6606, 0x6346, 0x56f0, 0x62ec,
-  0x6269, 0x5ed3, 0x9614, 0x5783, 0x62c9, 0x5587, 0x8721, 0x814a,
-  0x8fa3, 0x5566, 0x83b1, 0x6765, 0x8d56, 0x84dd, 0x5a6a, 0x680f,
-  0x62e6, 0x7bee, 0x9611, 0x5170, 0x6f9c, 0x8c30, 0x63fd, 0x89c8,
-  0x61d2, 0x7f06, 0x70c2, 0x6ee5, 0x7405, 0x6994, 0x72fc, 0x5eca,
-  0x90ce, 0x6717, 0x6d6a, 0x635e, 0x52b3, 0x7262, 0x8001, 0x4f6c,
-  0x59e5, 0x916a, 0x70d9, 0x6d9d, 0x52d2, 0x4e50, 0x96f7, 0x956d,
-  0x857e, 0x78ca, 0x7d2f, 0x5121, 0x5792, 0x64c2, 0x808b, 0x7c7b,
-  0x6cea, 0x68f1, 0x695e, 0x51b7, 0x5398, 0x68a8, 0x7281, 0x9ece,
-  0x7bf1, 0x72f8, 0x79bb, 0x6f13, 0x7406, 0x674e, 0x91cc, 0x9ca4,
-  0x793c, 0x8389, 0x8354, 0x540f, 0x6817, 0x4e3d, 0x5389, 0x52b1,
-  0x783e, 0x5386, 0x5229, 0x5088, 0x4f8b, 0x4fd0,
-  /* 0x41 */
-  0x75e2, 0x7acb, 0x7c92, 0x6ca5, 0x96b6, 0x529b, 0x7483, 0x54e9,
-  0x4fe9, 0x8054, 0x83b2, 0x8fde, 0x9570, 0x5ec9, 0x601c, 0x6d9f,
-  0x5e18, 0x655b, 0x8138, 0x94fe, 0x604b, 0x70bc, 0x7ec3, 0x7cae,
-  0x51c9, 0x6881, 0x7cb1, 0x826f, 0x4e24, 0x8f86, 0x91cf, 0x667e,
-  0x4eae, 0x8c05, 0x64a9, 0x804a, 0x50da, 0x7597, 0x71ce, 0x5be5,
-  0x8fbd, 0x6f66, 0x4e86, 0x6482, 0x9563, 0x5ed6, 0x6599, 0x5217,
-  0x88c2, 0x70c8, 0x52a3, 0x730e, 0x7433, 0x6797, 0x78f7, 0x9716,
-  0x4e34, 0x90bb, 0x9cde, 0x6dcb, 0x51db, 0x8d41, 0x541d, 0x62ce,
-  0x73b2, 0x83f1, 0x96f6, 0x9f84, 0x94c3, 0x4f36, 0x7f9a, 0x51cc,
-  0x7075, 0x9675, 0x5cad, 0x9886, 0x53e6, 0x4ee4, 0x6e9c, 0x7409,
-  0x69b4, 0x786b, 0x998f, 0x7559, 0x5218, 0x7624, 0x6d41, 0x67f3,
-  0x516d, 0x9f99, 0x804b, 0x5499, 0x7b3c, 0x7abf,
-  /* 0x42 */
-  0x9686, 0x5784, 0x62e2, 0x9647, 0x697c, 0x5a04, 0x6402, 0x7bd3,
-  0x6f0f, 0x964b, 0x82a6, 0x5362, 0x9885, 0x5e90, 0x7089, 0x63b3,
-  0x5364, 0x864f, 0x9c81, 0x9e93, 0x788c, 0x9732, 0x8def, 0x8d42,
-  0x9e7f, 0x6f5e, 0x7984, 0x5f55, 0x9646, 0x622e, 0x9a74, 0x5415,
-  0x94dd, 0x4fa3, 0x65c5, 0x5c65, 0x5c61, 0x7f15, 0x8651, 0x6c2f,
-  0x5f8b, 0x7387, 0x6ee4, 0x7eff, 0x5ce6, 0x631b, 0x5b6a, 0x6ee6,
-  0x5375, 0x4e71, 0x63a0, 0x7565, 0x62a1, 0x8f6e, 0x4f26, 0x4ed1,
-  0x6ca6, 0x7eb6, 0x8bba, 0x841d, 0x87ba, 0x7f57, 0x903b, 0x9523,
-  0x7ba9, 0x9aa1, 0x88f8, 0x843d, 0x6d1b, 0x9a86, 0x7edc, 0x5988,
-  0x9ebb, 0x739b, 0x7801, 0x8682, 0x9a6c, 0x9a82, 0x561b, 0x5417,
-  0x57cb, 0x4e70, 0x9ea6, 0x5356, 0x8fc8, 0x8109, 0x7792, 0x9992,
-  0x86ee, 0x6ee1, 0x8513, 0x66fc, 0x6162, 0x6f2b,
-  /* 0x43 */
-  0x8c29, 0x8292, 0x832b, 0x76f2, 0x6c13, 0x5fd9, 0x83bd, 0x732b,
-  0x8305, 0x951a, 0x6bdb, 0x77db, 0x94c6, 0x536f, 0x8302, 0x5192,
-  0x5e3d, 0x8c8c, 0x8d38, 0x4e48, 0x73ab, 0x679a, 0x6885, 0x9176,
-  0x9709, 0x7164, 0x6ca1, 0x7709, 0x5a92, 0x9541, 0x6bcf, 0x7f8e,
-  0x6627, 0x5bd0, 0x59b9, 0x5a9a, 0x95e8, 0x95f7, 0x4eec, 0x840c,
-  0x8499, 0x6aac, 0x76df, 0x9530, 0x731b, 0x68a6, 0x5b5f, 0x772f,
-  0x919a, 0x9761, 0x7cdc, 0x8ff7, 0x8c1c, 0x5f25, 0x7c73, 0x79d8,
-  0x89c5, 0x6ccc, 0x871c, 0x5bc6, 0x5e42, 0x68c9, 0x7720, 0x7ef5,
-  0x5195, 0x514d, 0x52c9, 0x5a29, 0x7f05, 0x9762, 0x82d7, 0x63cf,
-  0x7784, 0x85d0, 0x79d2, 0x6e3a, 0x5e99, 0x5999, 0x8511, 0x706d,
-  0x6c11, 0x62bf, 0x76bf, 0x654f, 0x60af, 0x95fd, 0x660e, 0x879f,
-  0x9e23, 0x94ed, 0x540d, 0x547d, 0x8c2c, 0x6478,
-  /* 0x44 */
-  0x6479, 0x8611, 0x6a21, 0x819c, 0x78e8, 0x6469, 0x9b54, 0x62b9,
-  0x672b, 0x83ab, 0x58a8, 0x9ed8, 0x6cab, 0x6f20, 0x5bde, 0x964c,
-  0x8c0b, 0x725f, 0x67d0, 0x62c7, 0x7261, 0x4ea9, 0x59c6, 0x6bcd,
-  0x5893, 0x66ae, 0x5e55, 0x52df, 0x6155, 0x6728, 0x76ee, 0x7766,
-  0x7267, 0x7a46, 0x62ff, 0x54ea, 0x5450, 0x94a0, 0x90a3, 0x5a1c,
-  0x7eb3, 0x6c16, 0x4e43, 0x5976, 0x8010, 0x5948, 0x5357, 0x7537,
-  0x96be, 0x56ca, 0x6320, 0x8111, 0x607c, 0x95f9, 0x6dd6, 0x5462,
-  0x9981, 0x5185, 0x5ae9, 0x80fd, 0x59ae, 0x9713, 0x502a, 0x6ce5,
-  0x5c3c, 0x62df, 0x4f60, 0x533f, 0x817b, 0x9006, 0x6eba, 0x852b,
-  0x62c8, 0x5e74, 0x78be, 0x64b5, 0x637b, 0x5ff5, 0x5a18, 0x917f,
-  0x9e1f, 0x5c3f, 0x634f, 0x8042, 0x5b7d, 0x556e, 0x954a, 0x954d,
-  0x6d85, 0x60a8, 0x67e0, 0x72de, 0x51dd, 0x5b81,
-  /* 0x45 */
-  0x62e7, 0x6cde, 0x725b, 0x626d, 0x94ae, 0x7ebd, 0x8113, 0x6d53,
-  0x519c, 0x5f04, 0x5974, 0x52aa, 0x6012, 0x5973, 0x6696, 0x8650,
-  0x759f, 0x632a, 0x61e6, 0x7cef, 0x8bfa, 0x54e6, 0x6b27, 0x9e25,
-  0x6bb4, 0x85d5, 0x5455, 0x5076, 0x6ca4, 0x556a, 0x8db4, 0x722c,
-  0x5e15, 0x6015, 0x7436, 0x62cd, 0x6392, 0x724c, 0x5f98, 0x6e43,
-  0x6d3e, 0x6500, 0x6f58, 0x76d8, 0x78d0, 0x76fc, 0x7554, 0x5224,
-  0x53db, 0x4e53, 0x5e9e, 0x65c1, 0x802a, 0x80d6, 0x629b, 0x5486,
-  0x5228, 0x70ae, 0x888d, 0x8dd1, 0x6ce1, 0x5478, 0x80da, 0x57f9,
-  0x88f4, 0x8d54, 0x966a, 0x914d, 0x4f69, 0x6c9b, 0x55b7, 0x76c6,
-  0x7830, 0x62a8, 0x70f9, 0x6f8e, 0x5f6d, 0x84ec, 0x68da, 0x787c,
-  0x7bf7, 0x81a8, 0x670b, 0x9e4f, 0x6367, 0x78b0, 0x576f, 0x7812,
-  0x9739, 0x6279, 0x62ab, 0x5288, 0x7435, 0x6bd7,
-  /* 0x46 */
-  0x5564, 0x813e, 0x75b2, 0x76ae, 0x5339, 0x75de, 0x50fb, 0x5c41,
-  0x8b6c, 0x7bc7, 0x504f, 0x7247, 0x9a97, 0x98d8, 0x6f02, 0x74e2,
-  0x7968, 0x6487, 0x77a5, 0x62fc, 0x9891, 0x8d2b, 0x54c1, 0x8058,
-  0x4e52, 0x576a, 0x82f9, 0x840d, 0x5e73, 0x51ed, 0x74f6, 0x8bc4,
-  0x5c4f, 0x5761, 0x6cfc, 0x9887, 0x5a46, 0x7834, 0x9b44, 0x8feb,
-  0x7c95, 0x5256, 0x6251, 0x94fa, 0x4ec6, 0x8386, 0x8461, 0x83e9,
-  0x84b2, 0x57d4, 0x6734, 0x5703, 0x666e, 0x6d66, 0x8c31, 0x66dd,
-  0x7011, 0x671f, 0x6b3a, 0x6816, 0x621a, 0x59bb, 0x4e03, 0x51c4,
-  0x6f06, 0x67d2, 0x6c8f, 0x5176, 0x68cb, 0x5947, 0x6b67, 0x7566,
-  0x5d0e, 0x8110, 0x9f50, 0x65d7, 0x7948, 0x7941, 0x9a91, 0x8d77,
-  0x5c82, 0x4e5e, 0x4f01, 0x542f, 0x5951, 0x780c, 0x5668, 0x6c14,
-  0x8fc4, 0x5f03, 0x6c7d, 0x6ce3, 0x8bab, 0x6390,
-  /* 0x47 */
-  0x6070, 0x6d3d, 0x7275, 0x6266, 0x948e, 0x94c5, 0x5343, 0x8fc1,
-  0x7b7e, 0x4edf, 0x8c26, 0x4e7e, 0x9ed4, 0x94b1, 0x94b3, 0x524d,
-  0x6f5c, 0x9063, 0x6d45, 0x8c34, 0x5811, 0x5d4c, 0x6b20, 0x6b49,
-  0x67aa, 0x545b, 0x8154, 0x7f8c, 0x5899, 0x8537, 0x5f3a, 0x62a2,
-  0x6a47, 0x9539, 0x6572, 0x6084, 0x6865, 0x77a7, 0x4e54, 0x4fa8,
-  0x5de7, 0x9798, 0x64ac, 0x7fd8, 0x5ced, 0x4fcf, 0x7a8d, 0x5207,
-  0x8304, 0x4e14, 0x602f, 0x7a83, 0x94a6, 0x4fb5, 0x4eb2, 0x79e6,
-  0x7434, 0x52e4, 0x82b9, 0x64d2, 0x79bd, 0x5bdd, 0x6c81, 0x9752,
-  0x8f7b, 0x6c22, 0x503e, 0x537f, 0x6e05, 0x64ce, 0x6674, 0x6c30,
-  0x60c5, 0x9877, 0x8bf7, 0x5e86, 0x743c, 0x7a77, 0x79cb, 0x4e18,
-  0x90b1, 0x7403, 0x6c42, 0x56da, 0x914b, 0x6cc5, 0x8d8b, 0x533a,
-  0x86c6, 0x66f2, 0x8eaf, 0x5c48, 0x9a71, 0x6e20,
-  /* 0x48 */
-  0x53d6, 0x5a36, 0x9f8b, 0x8da3, 0x53bb, 0x5708, 0x98a7, 0x6743,
-  0x919b, 0x6cc9, 0x5168, 0x75ca, 0x62f3, 0x72ac, 0x5238, 0x529d,
-  0x7f3a, 0x7094, 0x7638, 0x5374, 0x9e4a, 0x69b7, 0x786e, 0x96c0,
-  0x88d9, 0x7fa4, 0x7136, 0x71c3, 0x5189, 0x67d3, 0x74e4, 0x58e4,
-  0x6518, 0x56b7, 0x8ba9, 0x9976, 0x6270, 0x7ed5, 0x60f9, 0x70ed,
-  0x58ec, 0x4ec1, 0x4eba, 0x5fcd, 0x97e7, 0x4efb, 0x8ba4, 0x5203,
-  0x598a, 0x7eab, 0x6254, 0x4ecd, 0x65e5, 0x620e, 0x8338, 0x84c9,
-  0x8363, 0x878d, 0x7194, 0x6eb6, 0x5bb9, 0x7ed2, 0x5197, 0x63c9,
-  0x67d4, 0x8089, 0x8339, 0x8815, 0x5112, 0x5b7a, 0x5982, 0x8fb1,
-  0x4e73, 0x6c5d, 0x5165, 0x8925, 0x8f6f, 0x962e, 0x854a, 0x745e,
-  0x9510, 0x95f0, 0x6da6, 0x82e5, 0x5f31, 0x6492, 0x6d12, 0x8428,
-  0x816e, 0x9cc3, 0x585e, 0x8d5b, 0x4e09, 0x53c1,
-  /* 0x49 */
-  0x4f1e, 0x6563, 0x6851, 0x55d3, 0x4e27, 0x6414, 0x9a9a, 0x626b,
-  0x5ac2, 0x745f, 0x8272, 0x6da9, 0x68ee, 0x50e7, 0x838e, 0x7802,
-  0x6740, 0x5239, 0x6c99, 0x7eb1, 0x50bb, 0x5565, 0x715e, 0x7b5b,
-  0x6652, 0x73ca, 0x82eb, 0x6749, 0x5c71, 0x5220, 0x717d, 0x886b,
-  0x95ea, 0x9655, 0x64c5, 0x8d61, 0x81b3, 0x5584, 0x6c55, 0x6247,
-  0x7f2e, 0x5892, 0x4f24, 0x5546, 0x8d4f, 0x664c, 0x4e0a, 0x5c1a,
-  0x88f3, 0x68a2, 0x634e, 0x7a0d, 0x70e7, 0x828d, 0x52fa, 0x97f6,
-  0x5c11, 0x54e8, 0x90b5, 0x7ecd, 0x5962, 0x8d4a, 0x86c7, 0x820c,
-  0x820d, 0x8d66, 0x6444, 0x5c04, 0x6151, 0x6d89, 0x793e, 0x8bbe,
-  0x7837, 0x7533, 0x547b, 0x4f38, 0x8eab, 0x6df1, 0x5a20, 0x7ec5,
-  0x795e, 0x6c88, 0x5ba1, 0x5a76, 0x751a, 0x80be, 0x614e, 0x6e17,
-  0x58f0, 0x751f, 0x7525, 0x7272, 0x5347, 0x7ef3,
-  /* 0x4a */
-  0x7701, 0x76db, 0x5269, 0x80dc, 0x5723, 0x5e08, 0x5931, 0x72ee,
-  0x65bd, 0x6e7f, 0x8bd7, 0x5c38, 0x8671, 0x5341, 0x77f3, 0x62fe,
-  0x65f6, 0x4ec0, 0x98df, 0x8680, 0x5b9e, 0x8bc6, 0x53f2, 0x77e2,
-  0x4f7f, 0x5c4e, 0x9a76, 0x59cb, 0x5f0f, 0x793a, 0x58eb, 0x4e16,
-  0x67ff, 0x4e8b, 0x62ed, 0x8a93, 0x901d, 0x52bf, 0x662f, 0x55dc,
-  0x566c, 0x9002, 0x4ed5, 0x4f8d, 0x91ca, 0x9970, 0x6c0f, 0x5e02,
-  0x6043, 0x5ba4, 0x89c6, 0x8bd5, 0x6536, 0x624b, 0x9996, 0x5b88,
-  0x5bff, 0x6388, 0x552e, 0x53d7, 0x7626, 0x517d, 0x852c, 0x67a2,
-  0x68b3, 0x6b8a, 0x6292, 0x8f93, 0x53d4, 0x8212, 0x6dd1, 0x758f,
-  0x4e66, 0x8d4e, 0x5b70, 0x719f, 0x85af, 0x6691, 0x66d9, 0x7f72,
-  0x8700, 0x9ecd, 0x9f20, 0x5c5e, 0x672f, 0x8ff0, 0x6811, 0x675f,
-  0x620d, 0x7ad6, 0x5885, 0x5eb6, 0x6570, 0x6f31,
-  /* 0x4b */
-  0x6055, 0x5237, 0x800d, 0x6454, 0x8870, 0x7529, 0x5e05, 0x6813,
-  0x62f4, 0x971c, 0x53cc, 0x723d, 0x8c01, 0x6c34, 0x7761, 0x7a0e,
-  0x542e, 0x77ac, 0x987a, 0x821c, 0x8bf4, 0x7855, 0x6714, 0x70c1,
-  0x65af, 0x6495, 0x5636, 0x601d, 0x79c1, 0x53f8, 0x4e1d, 0x6b7b,
-  0x8086, 0x5bfa, 0x55e3, 0x56db, 0x4f3a, 0x4f3c, 0x9972, 0x5df3,
-  0x677e, 0x8038, 0x6002, 0x9882, 0x9001, 0x5b8b, 0x8bbc, 0x8bf5,
-  0x641c, 0x8258, 0x64de, 0x55fd, 0x82cf, 0x9165, 0x4fd7, 0x7d20,
-  0x901f, 0x7c9f, 0x50f3, 0x5851, 0x6eaf, 0x5bbf, 0x8bc9, 0x8083,
-  0x9178, 0x849c, 0x7b97, 0x867d, 0x968b, 0x968f, 0x7ee5, 0x9ad3,
-  0x788e, 0x5c81, 0x7a57, 0x9042, 0x96a7, 0x795f, 0x5b59, 0x635f,
-  0x7b0b, 0x84d1, 0x68ad, 0x5506, 0x7f29, 0x7410, 0x7d22, 0x9501,
-  0x6240, 0x584c, 0x4ed6, 0x5b83, 0x5979, 0x5854,
-  /* 0x4c */
-  0x736d, 0x631e, 0x8e4b, 0x8e0f, 0x80ce, 0x82d4, 0x62ac, 0x53f0,
-  0x6cf0, 0x915e, 0x592a, 0x6001, 0x6c70, 0x574d, 0x644a, 0x8d2a,
-  0x762b, 0x6ee9, 0x575b, 0x6a80, 0x75f0, 0x6f6d, 0x8c2d, 0x8c08,
-  0x5766, 0x6bef, 0x8892, 0x78b3, 0x63a2, 0x53f9, 0x70ad, 0x6c64,
-  0x5858, 0x642a, 0x5802, 0x68e0, 0x819b, 0x5510, 0x7cd6, 0x5018,
-  0x8eba, 0x6dcc, 0x8d9f, 0x70eb, 0x638f, 0x6d9b, 0x6ed4, 0x7ee6,
-  0x8404, 0x6843, 0x9003, 0x6dd8, 0x9676, 0x8ba8, 0x5957, 0x7279,
-  0x85e4, 0x817e, 0x75bc, 0x8a8a, 0x68af, 0x5254, 0x8e22, 0x9511,
-  0x63d0, 0x9898, 0x8e44, 0x557c, 0x4f53, 0x66ff, 0x568f, 0x60d5,
-  0x6d95, 0x5243, 0x5c49, 0x5929, 0x6dfb, 0x586b, 0x7530, 0x751c,
-  0x606c, 0x8214, 0x8146, 0x6311, 0x6761, 0x8fe2, 0x773a, 0x8df3,
-  0x8d34, 0x94c1, 0x5e16, 0x5385, 0x542c, 0x70c3,
-  /* 0x4d */
-  0x6c40, 0x5ef7, 0x505c, 0x4ead, 0x5ead, 0x633a, 0x8247, 0x901a,
-  0x6850, 0x916e, 0x77b3, 0x540c, 0x94dc, 0x5f64, 0x7ae5, 0x6876,
-  0x6345, 0x7b52, 0x7edf, 0x75db, 0x5077, 0x6295, 0x5934, 0x900f,
-  0x51f8, 0x79c3, 0x7a81, 0x56fe, 0x5f92, 0x9014, 0x6d82, 0x5c60,
-  0x571f, 0x5410, 0x5154, 0x6e4d, 0x56e2, 0x63a8, 0x9893, 0x817f,
-  0x8715, 0x892a, 0x9000, 0x541e, 0x5c6f, 0x81c0, 0x62d6, 0x6258,
-  0x8131, 0x9e35, 0x9640, 0x9a6e, 0x9a7c, 0x692d, 0x59a5, 0x62d3,
-  0x553e, 0x6316, 0x54c7, 0x86d9, 0x6d3c, 0x5a03, 0x74e6, 0x889c,
-  0x6b6a, 0x5916, 0x8c4c, 0x5f2f, 0x6e7e, 0x73a9, 0x987d, 0x4e38,
-  0x70f7, 0x5b8c, 0x7897, 0x633d, 0x665a, 0x7696, 0x60cb, 0x5b9b,
-  0x5a49, 0x4e07, 0x8155, 0x6c6a, 0x738b, 0x4ea1, 0x6789, 0x7f51,
-  0x5f80, 0x65fa, 0x671b, 0x5fd8, 0x5984, 0x5a01,
-  /* 0x4e */
-  0x5dcd, 0x5fae, 0x5371, 0x97e6, 0x8fdd, 0x6845, 0x56f4, 0x552f,
-  0x60df, 0x4e3a, 0x6f4d, 0x7ef4, 0x82c7, 0x840e, 0x59d4, 0x4f1f,
-  0x4f2a, 0x5c3e, 0x7eac, 0x672a, 0x851a, 0x5473, 0x754f, 0x80c3,
-  0x5582, 0x9b4f, 0x4f4d, 0x6e2d, 0x8c13, 0x5c09, 0x6170, 0x536b,
-  0x761f, 0x6e29, 0x868a, 0x6587, 0x95fb, 0x7eb9, 0x543b, 0x7a33,
-  0x7d0a, 0x95ee, 0x55e1, 0x7fc1, 0x74ee, 0x631d, 0x8717, 0x6da1,
-  0x7a9d, 0x6211, 0x65a1, 0x5367, 0x63e1, 0x6c83, 0x5deb, 0x545c,
-  0x94a8, 0x4e4c, 0x6c61, 0x8bec, 0x5c4b, 0x65e0, 0x829c, 0x68a7,
-  0x543e, 0x5434, 0x6bcb, 0x6b66, 0x4e94, 0x6342, 0x5348, 0x821e,
-  0x4f0d, 0x4fae, 0x575e, 0x620a, 0x96fe, 0x6664, 0x7269, 0x52ff,
-  0x52a1, 0x609f, 0x8bef, 0x6614, 0x7199, 0x6790, 0x897f, 0x7852,
-  0x77fd, 0x6670, 0x563b, 0x5438, 0x9521, 0x727a,
-  /* 0x4f */
-  0x7a00, 0x606f, 0x5e0c, 0x6089, 0x819d, 0x5915, 0x60dc, 0x7184,
-  0x70ef, 0x6eaa, 0x6c50, 0x7280, 0x6a84, 0x88ad, 0x5e2d, 0x4e60,
-  0x5ab3, 0x559c, 0x94e3, 0x6d17, 0x7cfb, 0x9699, 0x620f, 0x7ec6,
-  0x778e, 0x867e, 0x5323, 0x971e, 0x8f96, 0x6687, 0x5ce1, 0x4fa0,
-  0x72ed, 0x4e0b, 0x53a6, 0x590f, 0x5413, 0x6380, 0x9528, 0x5148,
-  0x4ed9, 0x9c9c, 0x7ea4, 0x54b8, 0x8d24, 0x8854, 0x8237, 0x95f2,
-  0x6d8e, 0x5f26, 0x5acc, 0x663e, 0x9669, 0x73b0, 0x732e, 0x53bf,
-  0x817a, 0x9985, 0x7fa1, 0x5baa, 0x9677, 0x9650, 0x7ebf, 0x76f8,
-  0x53a2, 0x9576, 0x9999, 0x7bb1, 0x8944, 0x6e58, 0x4e61, 0x7fd4,
-  0x7965, 0x8be6, 0x60f3, 0x54cd, 0x4eab, 0x9879, 0x5df7, 0x6a61,
-  0x50cf, 0x5411, 0x8c61, 0x8427, 0x785d, 0x9704, 0x524a, 0x54ee,
-  0x56a3, 0x9500, 0x6d88, 0x5bb5, 0x6dc6, 0x6653,
-  /* 0x50 */
-  0x5c0f, 0x5b5d, 0x6821, 0x8096, 0x5578, 0x7b11, 0x6548, 0x6954,
-  0x4e9b, 0x6b47, 0x874e, 0x978b, 0x534f, 0x631f, 0x643a, 0x90aa,
-  0x659c, 0x80c1, 0x8c10, 0x5199, 0x68b0, 0x5378, 0x87f9, 0x61c8,
-  0x6cc4, 0x6cfb, 0x8c22, 0x5c51, 0x85aa, 0x82af, 0x950c, 0x6b23,
-  0x8f9b, 0x65b0, 0x5ffb, 0x5fc3, 0x4fe1, 0x8845, 0x661f, 0x8165,
-  0x7329, 0x60fa, 0x5174, 0x5211, 0x578b, 0x5f62, 0x90a2, 0x884c,
-  0x9192, 0x5e78, 0x674f, 0x6027, 0x59d3, 0x5144, 0x51f6, 0x80f8,
-  0x5308, 0x6c79, 0x96c4, 0x718a, 0x4f11, 0x4fee, 0x7f9e, 0x673d,
-  0x55c5, 0x9508, 0x79c0, 0x8896, 0x7ee3, 0x589f, 0x620c, 0x9700,
-  0x865a, 0x5618, 0x987b, 0x5f90, 0x8bb8, 0x84c4, 0x9157, 0x53d9,
-  0x65ed, 0x5e8f, 0x755c, 0x6064, 0x7d6e, 0x5a7f, 0x7eea, 0x7eed,
-  0x8f69, 0x55a7, 0x5ba3, 0x60ac, 0x65cb, 0x7384,
-  /* 0x51 */
-  0x9009, 0x7663, 0x7729, 0x7eda, 0x9774, 0x859b, 0x5b66, 0x7a74,
-  0x96ea, 0x8840, 0x52cb, 0x718f, 0x5faa, 0x65ec, 0x8be2, 0x5bfb,
-  0x9a6f, 0x5de1, 0x6b89, 0x6c5b, 0x8bad, 0x8baf, 0x900a, 0x8fc5,
-  0x538b, 0x62bc, 0x9e26, 0x9e2d, 0x5440, 0x4e2b, 0x82bd, 0x7259,
-  0x869c, 0x5d16, 0x8859, 0x6daf, 0x96c5, 0x54d1, 0x4e9a, 0x8bb6,
-  0x7109, 0x54bd, 0x9609, 0x70df, 0x6df9, 0x76d0, 0x4e25, 0x7814,
-  0x8712, 0x5ca9, 0x5ef6, 0x8a00, 0x989c, 0x960e, 0x708e, 0x6cbf,
-  0x5944, 0x63a9, 0x773c, 0x884d, 0x6f14, 0x8273, 0x5830, 0x71d5,
-  0x538c, 0x781a, 0x96c1, 0x5501, 0x5f66, 0x7130, 0x5bb4, 0x8c1a,
-  0x9a8c, 0x6b83, 0x592e, 0x9e2f, 0x79e7, 0x6768, 0x626c, 0x4f6f,
-  0x75a1, 0x7f8a, 0x6d0b, 0x9633, 0x6c27, 0x4ef0, 0x75d2, 0x517b,
-  0x6837, 0x6f3e, 0x9080, 0x8170, 0x5996, 0x7476,
-  /* 0x52 */
-  0x6447, 0x5c27, 0x9065, 0x7a91, 0x8c23, 0x59da, 0x54ac, 0x8200,
-  0x836f, 0x8981, 0x8000, 0x6930, 0x564e, 0x8036, 0x7237, 0x91ce,
-  0x51b6, 0x4e5f, 0x9875, 0x6396, 0x4e1a, 0x53f6, 0x66f3, 0x814b,
-  0x591c, 0x6db2, 0x4e00, 0x58f9, 0x533b, 0x63d6, 0x94f1, 0x4f9d,
-  0x4f0a, 0x8863, 0x9890, 0x5937, 0x9057, 0x79fb, 0x4eea, 0x80f0,
-  0x7591, 0x6c82, 0x5b9c, 0x59e8, 0x5f5d, 0x6905, 0x8681, 0x501a,
-  0x5df2, 0x4e59, 0x77e3, 0x4ee5, 0x827a, 0x6291, 0x6613, 0x9091,
-  0x5c79, 0x4ebf, 0x5f79, 0x81c6, 0x9038, 0x8084, 0x75ab, 0x4ea6,
-  0x88d4, 0x610f, 0x6bc5, 0x5fc6, 0x4e49, 0x76ca, 0x6ea2, 0x8be3,
-  0x8bae, 0x8c0a, 0x8bd1, 0x5f02, 0x7ffc, 0x7fcc, 0x7ece, 0x8335,
-  0x836b, 0x56e0, 0x6bb7, 0x97f3, 0x9634, 0x59fb, 0x541f, 0x94f6,
-  0x6deb, 0x5bc5, 0x996e, 0x5c39, 0x5f15, 0x9690,
-  /* 0x53 */
-  0x5370, 0x82f1, 0x6a31, 0x5a74, 0x9e70, 0x5e94, 0x7f28, 0x83b9,
-  0x8424, 0x8425, 0x8367, 0x8747, 0x8fce, 0x8d62, 0x76c8, 0x5f71,
-  0x9896, 0x786c, 0x6620, 0x54df, 0x62e5, 0x4f63, 0x81c3, 0x75c8,
-  0x5eb8, 0x96cd, 0x8e0a, 0x86f9, 0x548f, 0x6cf3, 0x6d8c, 0x6c38,
-  0x607f, 0x52c7, 0x7528, 0x5e7d, 0x4f18, 0x60a0, 0x5fe7, 0x5c24,
-  0x7531, 0x90ae, 0x94c0, 0x72b9, 0x6cb9, 0x6e38, 0x9149, 0x6709,
-  0x53cb, 0x53f3, 0x4f51, 0x91c9, 0x8bf1, 0x53c8, 0x5e7c, 0x8fc2,
-  0x6de4, 0x4e8e, 0x76c2, 0x6986, 0x865e, 0x611a, 0x8206, 0x4f59,
-  0x4fde, 0x903e, 0x9c7c, 0x6109, 0x6e1d, 0x6e14, 0x9685, 0x4e88,
-  0x5a31, 0x96e8, 0x4e0e, 0x5c7f, 0x79b9, 0x5b87, 0x8bed, 0x7fbd,
-  0x7389, 0x57df, 0x828b, 0x90c1, 0x5401, 0x9047, 0x55bb, 0x5cea,
-  0x5fa1, 0x6108, 0x6b32, 0x72f1, 0x80b2, 0x8a89,
-  /* 0x54 */
-  0x6d74, 0x5bd3, 0x88d5, 0x9884, 0x8c6b, 0x9a6d, 0x9e33, 0x6e0a,
-  0x51a4, 0x5143, 0x57a3, 0x8881, 0x539f, 0x63f4, 0x8f95, 0x56ed,
-  0x5458, 0x5706, 0x733f, 0x6e90, 0x7f18, 0x8fdc, 0x82d1, 0x613f,
-  0x6028, 0x9662, 0x66f0, 0x7ea6, 0x8d8a, 0x8dc3, 0x94a5, 0x5cb3,
-  0x7ca4, 0x6708, 0x60a6, 0x9605, 0x8018, 0x4e91, 0x90e7, 0x5300,
-  0x9668, 0x5141, 0x8fd0, 0x8574, 0x915d, 0x6655, 0x97f5, 0x5b55,
-  0x531d, 0x7838, 0x6742, 0x683d, 0x54c9, 0x707e, 0x5bb0, 0x8f7d,
-  0x518d, 0x5728, 0x54b1, 0x6512, 0x6682, 0x8d5e, 0x8d43, 0x810f,
-  0x846c, 0x906d, 0x7cdf, 0x51ff, 0x85fb, 0x67a3, 0x65e9, 0x6fa1,
-  0x86a4, 0x8e81, 0x566a, 0x9020, 0x7682, 0x7076, 0x71e5, 0x8d23,
-  0x62e9, 0x5219, 0x6cfd, 0x8d3c, 0x600e, 0x589e, 0x618e, 0x66fe,
-  0x8d60, 0x624e, 0x55b3, 0x6e23, 0x672d, 0x8f67,
-  /* 0x55 */
-  0x94e1, 0x95f8, 0x7728, 0x6805, 0x69a8, 0x548b, 0x4e4d, 0x70b8,
-  0x8bc8, 0x6458, 0x658b, 0x5b85, 0x7a84, 0x503a, 0x5be8, 0x77bb,
-  0x6be1, 0x8a79, 0x7c98, 0x6cbe, 0x76cf, 0x65a9, 0x8f97, 0x5d2d,
-  0x5c55, 0x8638, 0x6808, 0x5360, 0x6218, 0x7ad9, 0x6e5b, 0x7efd,
-  0x6a1f, 0x7ae0, 0x5f70, 0x6f33, 0x5f20, 0x638c, 0x6da8, 0x6756,
-  0x4e08, 0x5e10, 0x8d26, 0x4ed7, 0x80c0, 0x7634, 0x969c, 0x62db,
-  0x662d, 0x627e, 0x6cbc, 0x8d75, 0x7167, 0x7f69, 0x5146, 0x8087,
-  0x53ec, 0x906e, 0x6298, 0x54f2, 0x86f0, 0x8f99, 0x8005, 0x9517,
-  0x8517, 0x8fd9, 0x6d59, 0x73cd, 0x659f, 0x771f, 0x7504, 0x7827,
-  0x81fb, 0x8d1e, 0x9488, 0x4fa6, 0x6795, 0x75b9, 0x8bca, 0x9707,
-  0x632f, 0x9547, 0x9635, 0x84b8, 0x6323, 0x7741, 0x5f81, 0x72f0,
-  0x4e89, 0x6014, 0x6574, 0x62ef, 0x6b63, 0x653f,
-  /* 0x56 */
-  0x5e27, 0x75c7, 0x90d1, 0x8bc1, 0x829d, 0x679d, 0x652f, 0x5431,
-  0x8718, 0x77e5, 0x80a2, 0x8102, 0x6c41, 0x4e4b, 0x7ec7, 0x804c,
-  0x76f4, 0x690d, 0x6b96, 0x6267, 0x503c, 0x4f84, 0x5740, 0x6307,
-  0x6b62, 0x8dbe, 0x53ea, 0x65e8, 0x7eb8, 0x5fd7, 0x631a, 0x63b7,
-  0x81f3, 0x81f4, 0x7f6e, 0x5e1c, 0x5cd9, 0x5236, 0x667a, 0x79e9,
-  0x7a1a, 0x8d28, 0x7099, 0x75d4, 0x6ede, 0x6cbb, 0x7a92, 0x4e2d,
-  0x76c5, 0x5fe0, 0x949f, 0x8877, 0x7ec8, 0x79cd, 0x80bf, 0x91cd,
-  0x4ef2, 0x4f17, 0x821f, 0x5468, 0x5dde, 0x6d32, 0x8bcc, 0x7ca5,
-  0x8f74, 0x8098, 0x5e1a, 0x5492, 0x76b1, 0x5b99, 0x663c, 0x9aa4,
-  0x73e0, 0x682a, 0x86db, 0x6731, 0x732a, 0x8bf8, 0x8bdb, 0x9010,
-  0x7af9, 0x70db, 0x716e, 0x62c4, 0x77a9, 0x5631, 0x4e3b, 0x8457,
-  0x67f1, 0x52a9, 0x86c0, 0x8d2e, 0x94f8, 0x7b51,
-  /* 0x57 */
-  0x4f4f, 0x6ce8, 0x795d, 0x9a7b, 0x6293, 0x722a, 0x62fd, 0x4e13,
-  0x7816, 0x8f6c, 0x64b0, 0x8d5a, 0x7bc6, 0x6869, 0x5e84, 0x88c5,
-  0x5986, 0x649e, 0x58ee, 0x72b6, 0x690e, 0x9525, 0x8ffd, 0x8d58,
-  0x5760, 0x7f00, 0x8c06, 0x51c6, 0x6349, 0x62d9, 0x5353, 0x684c,
-  0x7422, 0x8301, 0x914c, 0x5544, 0x7740, 0x707c, 0x6d4a, 0x5179,
-  0x54a8, 0x8d44, 0x59ff, 0x6ecb, 0x6dc4, 0x5b5c, 0x7d2b, 0x4ed4,
-  0x7c7d, 0x6ed3, 0x5b50, 0x81ea, 0x6e0d, 0x5b57, 0x9b03, 0x68d5,
-  0x8e2a, 0x5b97, 0x7efc, 0x603b, 0x7eb5, 0x90b9, 0x8d70, 0x594f,
-  0x63cd, 0x79df, 0x8db3, 0x5352, 0x65cf, 0x7956, 0x8bc5, 0x963b,
-  0x7ec4, 0x94bb, 0x7e82, 0x5634, 0x9189, 0x6700, 0x7f6a, 0x5c0a,
-  0x9075, 0x6628, 0x5de6, 0x4f50, 0x67de, 0x505a, 0x4f5c, 0x5750,
-  0x5ea7, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  /* 0x58 */
-  0x4e8d, 0x4e0c, 0x5140, 0x4e10, 0x5eff, 0x5345, 0x4e15, 0x4e98,
-  0x4e1e, 0x9b32, 0x5b6c, 0x5669, 0x4e28, 0x79ba, 0x4e3f, 0x5315,
-  0x4e47, 0x592d, 0x723b, 0x536e, 0x6c10, 0x56df, 0x80e4, 0x9997,
-  0x6bd3, 0x777e, 0x9f17, 0x4e36, 0x4e9f, 0x9f10, 0x4e5c, 0x4e69,
-  0x4e93, 0x8288, 0x5b5b, 0x556c, 0x560f, 0x4ec4, 0x538d, 0x539d,
-  0x53a3, 0x53a5, 0x53ae, 0x9765, 0x8d5d, 0x531a, 0x53f5, 0x5326,
-  0x532e, 0x533e, 0x8d5c, 0x5366, 0x5363, 0x5202, 0x5208, 0x520e,
-  0x522d, 0x5233, 0x523f, 0x5240, 0x524c, 0x525e, 0x5261, 0x525c,
-  0x84af, 0x527d, 0x5282, 0x5281, 0x5290, 0x5293, 0x5182, 0x7f54,
-  0x4ebb, 0x4ec3, 0x4ec9, 0x4ec2, 0x4ee8, 0x4ee1, 0x4eeb, 0x4ede,
-  0x4f1b, 0x4ef3, 0x4f22, 0x4f64, 0x4ef5, 0x4f25, 0x4f27, 0x4f09,
-  0x4f2b, 0x4f5e, 0x4f67, 0x6538, 0x4f5a, 0x4f5d,
-  /* 0x59 */
-  0x4f5f, 0x4f57, 0x4f32, 0x4f3d, 0x4f76, 0x4f74, 0x4f91, 0x4f89,
-  0x4f83, 0x4f8f, 0x4f7e, 0x4f7b, 0x4faa, 0x4f7c, 0x4fac, 0x4f94,
-  0x4fe6, 0x4fe8, 0x4fea, 0x4fc5, 0x4fda, 0x4fe3, 0x4fdc, 0x4fd1,
-  0x4fdf, 0x4ff8, 0x5029, 0x504c, 0x4ff3, 0x502c, 0x500f, 0x502e,
-  0x502d, 0x4ffe, 0x501c, 0x500c, 0x5025, 0x5028, 0x507e, 0x5043,
-  0x5055, 0x5048, 0x504e, 0x506c, 0x507b, 0x50a5, 0x50a7, 0x50a9,
-  0x50ba, 0x50d6, 0x5106, 0x50ed, 0x50ec, 0x50e6, 0x50ee, 0x5107,
-  0x510b, 0x4edd, 0x6c3d, 0x4f58, 0x4f65, 0x4fce, 0x9fa0, 0x6c46,
-  0x7c74, 0x516e, 0x5dfd, 0x9ec9, 0x9998, 0x5181, 0x5914, 0x52f9,
-  0x530d, 0x8a07, 0x5310, 0x51eb, 0x5919, 0x5155, 0x4ea0, 0x5156,
-  0x4eb3, 0x886e, 0x88a4, 0x4eb5, 0x8114, 0x88d2, 0x7980, 0x5b34,
-  0x8803, 0x7fb8, 0x51ab, 0x51b1, 0x51bd, 0x51bc,
-  /* 0x5a */
-  0x51c7, 0x5196, 0x51a2, 0x51a5, 0x8ba0, 0x8ba6, 0x8ba7, 0x8baa,
-  0x8bb4, 0x8bb5, 0x8bb7, 0x8bc2, 0x8bc3, 0x8bcb, 0x8bcf, 0x8bce,
-  0x8bd2, 0x8bd3, 0x8bd4, 0x8bd6, 0x8bd8, 0x8bd9, 0x8bdc, 0x8bdf,
-  0x8be0, 0x8be4, 0x8be8, 0x8be9, 0x8bee, 0x8bf0, 0x8bf3, 0x8bf6,
-  0x8bf9, 0x8bfc, 0x8bff, 0x8c00, 0x8c02, 0x8c04, 0x8c07, 0x8c0c,
-  0x8c0f, 0x8c11, 0x8c12, 0x8c14, 0x8c15, 0x8c16, 0x8c19, 0x8c1b,
-  0x8c18, 0x8c1d, 0x8c1f, 0x8c20, 0x8c21, 0x8c25, 0x8c27, 0x8c2a,
-  0x8c2b, 0x8c2e, 0x8c2f, 0x8c32, 0x8c33, 0x8c35, 0x8c36, 0x5369,
-  0x537a, 0x961d, 0x9622, 0x9621, 0x9631, 0x962a, 0x963d, 0x963c,
-  0x9642, 0x9649, 0x9654, 0x965f, 0x9667, 0x966c, 0x9672, 0x9674,
-  0x9688, 0x968d, 0x9697, 0x96b0, 0x9097, 0x909b, 0x909d, 0x9099,
-  0x90ac, 0x90a1, 0x90b4, 0x90b3, 0x90b6, 0x90ba,
-  /* 0x5b */
-  0x90b8, 0x90b0, 0x90cf, 0x90c5, 0x90be, 0x90d0, 0x90c4, 0x90c7,
-  0x90d3, 0x90e6, 0x90e2, 0x90dc, 0x90d7, 0x90db, 0x90eb, 0x90ef,
-  0x90fe, 0x9104, 0x9122, 0x911e, 0x9123, 0x9131, 0x912f, 0x9139,
-  0x9143, 0x9146, 0x520d, 0x5942, 0x52a2, 0x52ac, 0x52ad, 0x52be,
-  0x54ff, 0x52d0, 0x52d6, 0x52f0, 0x53df, 0x71ee, 0x77cd, 0x5ef4,
-  0x51f5, 0x51fc, 0x9b2f, 0x53b6, 0x5f01, 0x755a, 0x5def, 0x574c,
-  0x57a9, 0x57a1, 0x587e, 0x58bc, 0x58c5, 0x58d1, 0x5729, 0x572c,
-  0x572a, 0x5733, 0x5739, 0x572e, 0x572f, 0x575c, 0x573b, 0x5742,
-  0x5769, 0x5785, 0x576b, 0x5786, 0x577c, 0x577b, 0x5768, 0x576d,
-  0x5776, 0x5773, 0x57ad, 0x57a4, 0x578c, 0x57b2, 0x57cf, 0x57a7,
-  0x57b4, 0x5793, 0x57a0, 0x57d5, 0x57d8, 0x57da, 0x57d9, 0x57d2,
-  0x57b8, 0x57f4, 0x57ef, 0x57f8, 0x57e4, 0x57dd,
-  /* 0x5c */
-  0x580b, 0x580d, 0x57fd, 0x57ed, 0x5800, 0x581e, 0x5819, 0x5844,
-  0x5820, 0x5865, 0x586c, 0x5881, 0x5889, 0x589a, 0x5880, 0x99a8,
-  0x9f19, 0x61ff, 0x8279, 0x827d, 0x827f, 0x828f, 0x828a, 0x82a8,
-  0x8284, 0x828e, 0x8291, 0x8297, 0x8299, 0x82ab, 0x82b8, 0x82be,
-  0x82b0, 0x82c8, 0x82ca, 0x82e3, 0x8298, 0x82b7, 0x82ae, 0x82cb,
-  0x82cc, 0x82c1, 0x82a9, 0x82b4, 0x82a1, 0x82aa, 0x829f, 0x82c4,
-  0x82ce, 0x82a4, 0x82e1, 0x8309, 0x82f7, 0x82e4, 0x830f, 0x8307,
-  0x82dc, 0x82f4, 0x82d2, 0x82d8, 0x830c, 0x82fb, 0x82d3, 0x8311,
-  0x831a, 0x8306, 0x8314, 0x8315, 0x82e0, 0x82d5, 0x831c, 0x8351,
-  0x835b, 0x835c, 0x8308, 0x8392, 0x833c, 0x8334, 0x8331, 0x839b,
-  0x835e, 0x832f, 0x834f, 0x8347, 0x8343, 0x835f, 0x8340, 0x8317,
-  0x8360, 0x832d, 0x833a, 0x8333, 0x8366, 0x8365,
-  /* 0x5d */
-  0x8368, 0x831b, 0x8369, 0x836c, 0x836a, 0x836d, 0x836e, 0x83b0,
-  0x8378, 0x83b3, 0x83b4, 0x83a0, 0x83aa, 0x8393, 0x839c, 0x8385,
-  0x837c, 0x83b6, 0x83a9, 0x837d, 0x83b8, 0x837b, 0x8398, 0x839e,
-  0x83a8, 0x83ba, 0x83bc, 0x83c1, 0x8401, 0x83e5, 0x83d8, 0x5807,
-  0x8418, 0x840b, 0x83dd, 0x83fd, 0x83d6, 0x841c, 0x8438, 0x8411,
-  0x8406, 0x83d4, 0x83df, 0x840f, 0x8403, 0x83f8, 0x83f9, 0x83ea,
-  0x83c5, 0x83c0, 0x8426, 0x83f0, 0x83e1, 0x845c, 0x8451, 0x845a,
-  0x8459, 0x8473, 0x8487, 0x8488, 0x847a, 0x8489, 0x8478, 0x843c,
-  0x8446, 0x8469, 0x8476, 0x848c, 0x848e, 0x8431, 0x846d, 0x84c1,
-  0x84cd, 0x84d0, 0x84e6, 0x84bd, 0x84d3, 0x84ca, 0x84bf, 0x84ba,
-  0x84e0, 0x84a1, 0x84b9, 0x84b4, 0x8497, 0x84e5, 0x84e3, 0x850c,
-  0x750d, 0x8538, 0x84f0, 0x8539, 0x851f, 0x853a,
-  /* 0x5e */
-  0x8556, 0x853b, 0x84ff, 0x84fc, 0x8559, 0x8548, 0x8568, 0x8564,
-  0x855e, 0x857a, 0x77a2, 0x8543, 0x8572, 0x857b, 0x85a4, 0x85a8,
-  0x8587, 0x858f, 0x8579, 0x85ae, 0x859c, 0x8585, 0x85b9, 0x85b7,
-  0x85b0, 0x85d3, 0x85c1, 0x85dc, 0x85ff, 0x8627, 0x8605, 0x8629,
-  0x8616, 0x863c, 0x5efe, 0x5f08, 0x593c, 0x5941, 0x8037, 0x5955,
-  0x595a, 0x5958, 0x530f, 0x5c22, 0x5c25, 0x5c2c, 0x5c34, 0x624c,
-  0x626a, 0x629f, 0x62bb, 0x62ca, 0x62da, 0x62d7, 0x62ee, 0x6322,
-  0x62f6, 0x6339, 0x634b, 0x6343, 0x63ad, 0x63f6, 0x6371, 0x637a,
-  0x638e, 0x63b4, 0x636d, 0x63ac, 0x638a, 0x6369, 0x63ae, 0x63bc,
-  0x63f2, 0x63f8, 0x63e0, 0x63ff, 0x63c4, 0x63de, 0x63ce, 0x6452,
-  0x63c6, 0x63be, 0x6445, 0x6441, 0x640b, 0x641b, 0x6420, 0x640c,
-  0x6426, 0x6421, 0x645e, 0x6484, 0x646d, 0x6496,
-  /* 0x5f */
-  0x647a, 0x64b7, 0x64b8, 0x6499, 0x64ba, 0x64c0, 0x64d0, 0x64d7,
-  0x64e4, 0x64e2, 0x6509, 0x6525, 0x652e, 0x5f0b, 0x5fd2, 0x7519,
-  0x5f11, 0x535f, 0x53f1, 0x53fd, 0x53e9, 0x53e8, 0x53fb, 0x5412,
-  0x5416, 0x5406, 0x544b, 0x5452, 0x5453, 0x5454, 0x5456, 0x5443,
-  0x5421, 0x5457, 0x5459, 0x5423, 0x5432, 0x5482, 0x5494, 0x5477,
-  0x5471, 0x5464, 0x549a, 0x549b, 0x5484, 0x5476, 0x5466, 0x549d,
-  0x54d0, 0x54ad, 0x54c2, 0x54b4, 0x54d2, 0x54a7, 0x54a6, 0x54d3,
-  0x54d4, 0x5472, 0x54a3, 0x54d5, 0x54bb, 0x54bf, 0x54cc, 0x54d9,
-  0x54da, 0x54dc, 0x54a9, 0x54aa, 0x54a4, 0x54dd, 0x54cf, 0x54de,
-  0x551b, 0x54e7, 0x5520, 0x54fd, 0x5514, 0x54f3, 0x5522, 0x5523,
-  0x550f, 0x5511, 0x5527, 0x552a, 0x5567, 0x558f, 0x55b5, 0x5549,
-  0x556d, 0x5541, 0x5555, 0x553f, 0x5550, 0x553c,
-  /* 0x60 */
-  0x5537, 0x5556, 0x5575, 0x5576, 0x5577, 0x5533, 0x5530, 0x555c,
-  0x558b, 0x55d2, 0x5583, 0x55b1, 0x55b9, 0x5588, 0x5581, 0x559f,
-  0x557e, 0x55d6, 0x5591, 0x557b, 0x55df, 0x55bd, 0x55be, 0x5594,
-  0x5599, 0x55ea, 0x55f7, 0x55c9, 0x561f, 0x55d1, 0x55eb, 0x55ec,
-  0x55d4, 0x55e6, 0x55dd, 0x55c4, 0x55ef, 0x55e5, 0x55f2, 0x55f3,
-  0x55cc, 0x55cd, 0x55e8, 0x55f5, 0x55e4, 0x8f94, 0x561e, 0x5608,
-  0x560c, 0x5601, 0x5624, 0x5623, 0x55fe, 0x5600, 0x5627, 0x562d,
-  0x5658, 0x5639, 0x5657, 0x562c, 0x564d, 0x5662, 0x5659, 0x565c,
-  0x564c, 0x5654, 0x5686, 0x5664, 0x5671, 0x566b, 0x567b, 0x567c,
-  0x5685, 0x5693, 0x56af, 0x56d4, 0x56d7, 0x56dd, 0x56e1, 0x56f5,
-  0x56eb, 0x56f9, 0x56ff, 0x5704, 0x570a, 0x5709, 0x571c, 0x5e0f,
-  0x5e19, 0x5e14, 0x5e11, 0x5e31, 0x5e3b, 0x5e3c,
-  /* 0x61 */
-  0x5e37, 0x5e44, 0x5e54, 0x5e5b, 0x5e5e, 0x5e61, 0x5c8c, 0x5c7a,
-  0x5c8d, 0x5c90, 0x5c96, 0x5c88, 0x5c98, 0x5c99, 0x5c91, 0x5c9a,
-  0x5c9c, 0x5cb5, 0x5ca2, 0x5cbd, 0x5cac, 0x5cab, 0x5cb1, 0x5ca3,
-  0x5cc1, 0x5cb7, 0x5cc4, 0x5cd2, 0x5ce4, 0x5ccb, 0x5ce5, 0x5d02,
-  0x5d03, 0x5d27, 0x5d26, 0x5d2e, 0x5d24, 0x5d1e, 0x5d06, 0x5d1b,
-  0x5d58, 0x5d3e, 0x5d34, 0x5d3d, 0x5d6c, 0x5d5b, 0x5d6f, 0x5d5d,
-  0x5d6b, 0x5d4b, 0x5d4a, 0x5d69, 0x5d74, 0x5d82, 0x5d99, 0x5d9d,
-  0x8c73, 0x5db7, 0x5dc5, 0x5f73, 0x5f77, 0x5f82, 0x5f87, 0x5f89,
-  0x5f8c, 0x5f95, 0x5f99, 0x5f9c, 0x5fa8, 0x5fad, 0x5fb5, 0x5fbc,
-  0x8862, 0x5f61, 0x72ad, 0x72b0, 0x72b4, 0x72b7, 0x72b8, 0x72c3,
-  0x72c1, 0x72ce, 0x72cd, 0x72d2, 0x72e8, 0x72ef, 0x72e9, 0x72f2,
-  0x72f4, 0x72f7, 0x7301, 0x72f3, 0x7303, 0x72fa,
-  /* 0x62 */
-  0x72fb, 0x7317, 0x7313, 0x7321, 0x730a, 0x731e, 0x731d, 0x7315,
-  0x7322, 0x7339, 0x7325, 0x732c, 0x7338, 0x7331, 0x7350, 0x734d,
-  0x7357, 0x7360, 0x736c, 0x736f, 0x737e, 0x821b, 0x5925, 0x98e7,
-  0x5924, 0x5902, 0x9963, 0x9967, 0x9968, 0x9969, 0x996a, 0x996b,
-  0x996c, 0x9974, 0x9977, 0x997d, 0x9980, 0x9984, 0x9987, 0x998a,
-  0x998d, 0x9990, 0x9991, 0x9993, 0x9994, 0x9995, 0x5e80, 0x5e91,
-  0x5e8b, 0x5e96, 0x5ea5, 0x5ea0, 0x5eb9, 0x5eb5, 0x5ebe, 0x5eb3,
-  0x8d53, 0x5ed2, 0x5ed1, 0x5edb, 0x5ee8, 0x5eea, 0x81ba, 0x5fc4,
-  0x5fc9, 0x5fd6, 0x5fcf, 0x6003, 0x5fee, 0x6004, 0x5fe1, 0x5fe4,
-  0x5ffe, 0x6005, 0x6006, 0x5fea, 0x5fed, 0x5ff8, 0x6019, 0x6035,
-  0x6026, 0x601b, 0x600f, 0x600d, 0x6029, 0x602b, 0x600a, 0x603f,
-  0x6021, 0x6078, 0x6079, 0x607b, 0x607a, 0x6042,
-  /* 0x63 */
-  0x606a, 0x607d, 0x6096, 0x609a, 0x60ad, 0x609d, 0x6083, 0x6092,
-  0x608c, 0x609b, 0x60ec, 0x60bb, 0x60b1, 0x60dd, 0x60d8, 0x60c6,
-  0x60da, 0x60b4, 0x6120, 0x6126, 0x6115, 0x6123, 0x60f4, 0x6100,
-  0x610e, 0x612b, 0x614a, 0x6175, 0x61ac, 0x6194, 0x61a7, 0x61b7,
-  0x61d4, 0x61f5, 0x5fdd, 0x96b3, 0x95e9, 0x95eb, 0x95f1, 0x95f3,
-  0x95f5, 0x95f6, 0x95fc, 0x95fe, 0x9603, 0x9604, 0x9606, 0x9608,
-  0x960a, 0x960b, 0x960c, 0x960d, 0x960f, 0x9612, 0x9615, 0x9616,
-  0x9617, 0x9619, 0x961a, 0x4e2c, 0x723f, 0x6215, 0x6c35, 0x6c54,
-  0x6c5c, 0x6c4a, 0x6ca3, 0x6c85, 0x6c90, 0x6c94, 0x6c8c, 0x6c68,
-  0x6c69, 0x6c74, 0x6c76, 0x6c86, 0x6ca9, 0x6cd0, 0x6cd4, 0x6cad,
-  0x6cf7, 0x6cf8, 0x6cf1, 0x6cd7, 0x6cb2, 0x6ce0, 0x6cd6, 0x6cfa,
-  0x6ceb, 0x6cee, 0x6cb1, 0x6cd3, 0x6cef, 0x6cfe,
-  /* 0x64 */
-  0x6d39, 0x6d27, 0x6d0c, 0x6d43, 0x6d48, 0x6d07, 0x6d04, 0x6d19,
-  0x6d0e, 0x6d2b, 0x6d4d, 0x6d2e, 0x6d35, 0x6d1a, 0x6d4f, 0x6d52,
-  0x6d54, 0x6d33, 0x6d91, 0x6d6f, 0x6d9e, 0x6da0, 0x6d5e, 0x6d93,
-  0x6d94, 0x6d5c, 0x6d60, 0x6d7c, 0x6d63, 0x6e1a, 0x6dc7, 0x6dc5,
-  0x6dde, 0x6e0e, 0x6dbf, 0x6de0, 0x6e11, 0x6de6, 0x6ddd, 0x6dd9,
-  0x6e16, 0x6dab, 0x6e0c, 0x6dae, 0x6e2b, 0x6e6e, 0x6e4e, 0x6e6b,
-  0x6eb2, 0x6e5f, 0x6e86, 0x6e53, 0x6e54, 0x6e32, 0x6e25, 0x6e44,
-  0x6edf, 0x6eb1, 0x6e98, 0x6ee0, 0x6f2d, 0x6ee2, 0x6ea5, 0x6ea7,
-  0x6ebd, 0x6ebb, 0x6eb7, 0x6ed7, 0x6eb4, 0x6ecf, 0x6e8f, 0x6ec2,
-  0x6e9f, 0x6f62, 0x6f46, 0x6f47, 0x6f24, 0x6f15, 0x6ef9, 0x6f2f,
-  0x6f36, 0x6f4b, 0x6f74, 0x6f2a, 0x6f09, 0x6f29, 0x6f89, 0x6f8d,
-  0x6f8c, 0x6f78, 0x6f72, 0x6f7c, 0x6f7a, 0x6fd1,
-  /* 0x65 */
-  0x6fc9, 0x6fa7, 0x6fb9, 0x6fb6, 0x6fc2, 0x6fe1, 0x6fee, 0x6fde,
-  0x6fe0, 0x6fef, 0x701a, 0x7023, 0x701b, 0x7039, 0x7035, 0x704f,
-  0x705e, 0x5b80, 0x5b84, 0x5b95, 0x5b93, 0x5ba5, 0x5bb8, 0x752f,
-  0x9a9e, 0x6434, 0x5be4, 0x5bee, 0x8930, 0x5bf0, 0x8e47, 0x8b07,
-  0x8fb6, 0x8fd3, 0x8fd5, 0x8fe5, 0x8fee, 0x8fe4, 0x8fe9, 0x8fe6,
-  0x8ff3, 0x8fe8, 0x9005, 0x9004, 0x900b, 0x9026, 0x9011, 0x900d,
-  0x9016, 0x9021, 0x9035, 0x9036, 0x902d, 0x902f, 0x9044, 0x9051,
-  0x9052, 0x9050, 0x9068, 0x9058, 0x9062, 0x905b, 0x66b9, 0x9074,
-  0x907d, 0x9082, 0x9088, 0x9083, 0x908b, 0x5f50, 0x5f57, 0x5f56,
-  0x5f58, 0x5c3b, 0x54ab, 0x5c50, 0x5c59, 0x5b71, 0x5c63, 0x5c66,
-  0x7fbc, 0x5f2a, 0x5f29, 0x5f2d, 0x8274, 0x5f3c, 0x9b3b, 0x5c6e,
-  0x5981, 0x5983, 0x598d, 0x59a9, 0x59aa, 0x59a3,
-  /* 0x66 */
-  0x5997, 0x59ca, 0x59ab, 0x599e, 0x59a4, 0x59d2, 0x59b2, 0x59af,
-  0x59d7, 0x59be, 0x5a05, 0x5a06, 0x59dd, 0x5a08, 0x59e3, 0x59d8,
-  0x59f9, 0x5a0c, 0x5a09, 0x5a32, 0x5a34, 0x5a11, 0x5a23, 0x5a13,
-  0x5a40, 0x5a67, 0x5a4a, 0x5a55, 0x5a3c, 0x5a62, 0x5a75, 0x80ec,
-  0x5aaa, 0x5a9b, 0x5a77, 0x5a7a, 0x5abe, 0x5aeb, 0x5ab2, 0x5ad2,
-  0x5ad4, 0x5ab8, 0x5ae0, 0x5ae3, 0x5af1, 0x5ad6, 0x5ae6, 0x5ad8,
-  0x5adc, 0x5b09, 0x5b17, 0x5b16, 0x5b32, 0x5b37, 0x5b40, 0x5c15,
-  0x5c1c, 0x5b5a, 0x5b65, 0x5b73, 0x5b51, 0x5b53, 0x5b62, 0x9a75,
-  0x9a77, 0x9a78, 0x9a7a, 0x9a7f, 0x9a7d, 0x9a80, 0x9a81, 0x9a85,
-  0x9a88, 0x9a8a, 0x9a90, 0x9a92, 0x9a93, 0x9a96, 0x9a98, 0x9a9b,
-  0x9a9c, 0x9a9d, 0x9a9f, 0x9aa0, 0x9aa2, 0x9aa3, 0x9aa5, 0x9aa7,
-  0x7e9f, 0x7ea1, 0x7ea3, 0x7ea5, 0x7ea8, 0x7ea9,
-  /* 0x67 */
-  0x7ead, 0x7eb0, 0x7ebe, 0x7ec0, 0x7ec1, 0x7ec2, 0x7ec9, 0x7ecb,
-  0x7ecc, 0x7ed0, 0x7ed4, 0x7ed7, 0x7edb, 0x7ee0, 0x7ee1, 0x7ee8,
-  0x7eeb, 0x7eee, 0x7eef, 0x7ef1, 0x7ef2, 0x7f0d, 0x7ef6, 0x7efa,
-  0x7efb, 0x7efe, 0x7f01, 0x7f02, 0x7f03, 0x7f07, 0x7f08, 0x7f0b,
-  0x7f0c, 0x7f0f, 0x7f11, 0x7f12, 0x7f17, 0x7f19, 0x7f1c, 0x7f1b,
-  0x7f1f, 0x7f21, 0x7f22, 0x7f23, 0x7f24, 0x7f25, 0x7f26, 0x7f27,
-  0x7f2a, 0x7f2b, 0x7f2c, 0x7f2d, 0x7f2f, 0x7f30, 0x7f31, 0x7f32,
-  0x7f33, 0x7f35, 0x5e7a, 0x757f, 0x5ddb, 0x753e, 0x9095, 0x738e,
-  0x7391, 0x73ae, 0x73a2, 0x739f, 0x73cf, 0x73c2, 0x73d1, 0x73b7,
-  0x73b3, 0x73c0, 0x73c9, 0x73c8, 0x73e5, 0x73d9, 0x987c, 0x740a,
-  0x73e9, 0x73e7, 0x73de, 0x73ba, 0x73f2, 0x740f, 0x742a, 0x745b,
-  0x7426, 0x7425, 0x7428, 0x7430, 0x742e, 0x742c,
-  /* 0x68 */
-  0x741b, 0x741a, 0x7441, 0x745c, 0x7457, 0x7455, 0x7459, 0x7477,
-  0x746d, 0x747e, 0x749c, 0x748e, 0x7480, 0x7481, 0x7487, 0x748b,
-  0x749e, 0x74a8, 0x74a9, 0x7490, 0x74a7, 0x74d2, 0x74ba, 0x97ea,
-  0x97eb, 0x97ec, 0x674c, 0x6753, 0x675e, 0x6748, 0x6769, 0x67a5,
-  0x6787, 0x676a, 0x6773, 0x6798, 0x67a7, 0x6775, 0x67a8, 0x679e,
-  0x67ad, 0x678b, 0x6777, 0x677c, 0x67f0, 0x6809, 0x67d8, 0x680a,
-  0x67e9, 0x67b0, 0x680c, 0x67d9, 0x67b5, 0x67da, 0x67b3, 0x67dd,
-  0x6800, 0x67c3, 0x67b8, 0x67e2, 0x680e, 0x67c1, 0x67fd, 0x6832,
-  0x6833, 0x6860, 0x6861, 0x684e, 0x6862, 0x6844, 0x6864, 0x6883,
-  0x681d, 0x6855, 0x6866, 0x6841, 0x6867, 0x6840, 0x683e, 0x684a,
-  0x6849, 0x6829, 0x68b5, 0x688f, 0x6874, 0x6877, 0x6893, 0x686b,
-  0x68c2, 0x696e, 0x68fc, 0x691f, 0x6920, 0x68f9,
-  /* 0x69 */
-  0x6924, 0x68f0, 0x690b, 0x6901, 0x6957, 0x68e3, 0x6910, 0x6971,
-  0x6939, 0x6960, 0x6942, 0x695d, 0x6984, 0x696b, 0x6980, 0x6998,
-  0x6978, 0x6934, 0x69cc, 0x6987, 0x6988, 0x69ce, 0x6989, 0x6966,
-  0x6963, 0x6979, 0x699b, 0x69a7, 0x69bb, 0x69ab, 0x69ad, 0x69d4,
-  0x69b1, 0x69c1, 0x69ca, 0x69df, 0x6995, 0x69e0, 0x698d, 0x69ff,
-  0x6a2f, 0x69ed, 0x6a17, 0x6a18, 0x6a65, 0x69f2, 0x6a44, 0x6a3e,
-  0x6aa0, 0x6a50, 0x6a5b, 0x6a35, 0x6a8e, 0x6a79, 0x6a3d, 0x6a28,
-  0x6a58, 0x6a7c, 0x6a91, 0x6a90, 0x6aa9, 0x6a97, 0x6aab, 0x7337,
-  0x7352, 0x6b81, 0x6b82, 0x6b87, 0x6b84, 0x6b92, 0x6b93, 0x6b8d,
-  0x6b9a, 0x6b9b, 0x6ba1, 0x6baa, 0x8f6b, 0x8f6d, 0x8f71, 0x8f72,
-  0x8f73, 0x8f75, 0x8f76, 0x8f78, 0x8f77, 0x8f79, 0x8f7a, 0x8f7c,
-  0x8f7e, 0x8f81, 0x8f82, 0x8f84, 0x8f87, 0x8f8b,
-  /* 0x6a */
-  0x8f8d, 0x8f8e, 0x8f8f, 0x8f98, 0x8f9a, 0x8ece, 0x620b, 0x6217,
-  0x621b, 0x621f, 0x6222, 0x6221, 0x6225, 0x6224, 0x622c, 0x81e7,
-  0x74ef, 0x74f4, 0x74ff, 0x750f, 0x7511, 0x7513, 0x6534, 0x65ee,
-  0x65ef, 0x65f0, 0x660a, 0x6619, 0x6772, 0x6603, 0x6615, 0x6600,
-  0x7085, 0x66f7, 0x661d, 0x6634, 0x6631, 0x6636, 0x6635, 0x8006,
-  0x665f, 0x6654, 0x6641, 0x664f, 0x6656, 0x6661, 0x6657, 0x6677,
-  0x6684, 0x668c, 0x66a7, 0x669d, 0x66be, 0x66db, 0x66dc, 0x66e6,
-  0x66e9, 0x8d32, 0x8d33, 0x8d36, 0x8d3b, 0x8d3d, 0x8d40, 0x8d45,
-  0x8d46, 0x8d48, 0x8d49, 0x8d47, 0x8d4d, 0x8d55, 0x8d59, 0x89c7,
-  0x89ca, 0x89cb, 0x89cc, 0x89ce, 0x89cf, 0x89d0, 0x89d1, 0x726e,
-  0x729f, 0x725d, 0x7266, 0x726f, 0x727e, 0x727f, 0x7284, 0x728b,
-  0x728d, 0x728f, 0x7292, 0x6308, 0x6332, 0x63b0,
-  /* 0x6b */
-  0x643f, 0x64d8, 0x8004, 0x6bea, 0x6bf3, 0x6bfd, 0x6bf5, 0x6bf9,
-  0x6c05, 0x6c07, 0x6c06, 0x6c0d, 0x6c15, 0x6c18, 0x6c19, 0x6c1a,
-  0x6c21, 0x6c29, 0x6c24, 0x6c2a, 0x6c32, 0x6535, 0x6555, 0x656b,
-  0x724d, 0x7252, 0x7256, 0x7230, 0x8662, 0x5216, 0x809f, 0x809c,
-  0x8093, 0x80bc, 0x670a, 0x80bd, 0x80b1, 0x80ab, 0x80ad, 0x80b4,
-  0x80b7, 0x80e7, 0x80e8, 0x80e9, 0x80ea, 0x80db, 0x80c2, 0x80c4,
-  0x80d9, 0x80cd, 0x80d7, 0x6710, 0x80dd, 0x80eb, 0x80f1, 0x80f4,
-  0x80ed, 0x810d, 0x810e, 0x80f2, 0x80fc, 0x6715, 0x8112, 0x8c5a,
-  0x8136, 0x811e, 0x812c, 0x8118, 0x8132, 0x8148, 0x814c, 0x8153,
-  0x8174, 0x8159, 0x815a, 0x8171, 0x8160, 0x8169, 0x817c, 0x817d,
-  0x816d, 0x8167, 0x584d, 0x5ab5, 0x8188, 0x8182, 0x8191, 0x6ed5,
-  0x81a3, 0x81aa, 0x81cc, 0x6726, 0x81ca, 0x81bb,
-  /* 0x6c */
-  0x81c1, 0x81a6, 0x6b24, 0x6b37, 0x6b39, 0x6b43, 0x6b46, 0x6b59,
-  0x98d1, 0x98d2, 0x98d3, 0x98d5, 0x98d9, 0x98da, 0x6bb3, 0x5f40,
-  0x6bc2, 0x89f3, 0x6590, 0x9f51, 0x6593, 0x65bc, 0x65c6, 0x65c4,
-  0x65c3, 0x65cc, 0x65ce, 0x65d2, 0x65d6, 0x7080, 0x709c, 0x7096,
-  0x709d, 0x70bb, 0x70c0, 0x70b7, 0x70ab, 0x70b1, 0x70e8, 0x70ca,
-  0x7110, 0x7113, 0x7116, 0x712f, 0x7131, 0x7173, 0x715c, 0x7168,
-  0x7145, 0x7172, 0x714a, 0x7178, 0x717a, 0x7198, 0x71b3, 0x71b5,
-  0x71a8, 0x71a0, 0x71e0, 0x71d4, 0x71e7, 0x71f9, 0x721d, 0x7228,
-  0x706c, 0x7118, 0x7166, 0x71b9, 0x623e, 0x623d, 0x6243, 0x6248,
-  0x6249, 0x793b, 0x7940, 0x7946, 0x7949, 0x795b, 0x795c, 0x7953,
-  0x795a, 0x7962, 0x7957, 0x7960, 0x796f, 0x7967, 0x797a, 0x7985,
-  0x798a, 0x799a, 0x79a7, 0x79b3, 0x5fd1, 0x5fd0,
-  /* 0x6d */
-  0x603c, 0x605d, 0x605a, 0x6067, 0x6041, 0x6059, 0x6063, 0x60ab,
-  0x6106, 0x610d, 0x615d, 0x61a9, 0x619d, 0x61cb, 0x61d1, 0x6206,
-  0x8080, 0x807f, 0x6c93, 0x6cf6, 0x6dfc, 0x77f6, 0x77f8, 0x7800,
-  0x7809, 0x7817, 0x7818, 0x7811, 0x65ab, 0x782d, 0x781c, 0x781d,
-  0x7839, 0x783a, 0x783b, 0x781f, 0x783c, 0x7825, 0x782c, 0x7823,
-  0x7829, 0x784e, 0x786d, 0x7856, 0x7857, 0x7826, 0x7850, 0x7847,
-  0x784c, 0x786a, 0x789b, 0x7893, 0x789a, 0x7887, 0x789c, 0x78a1,
-  0x78a3, 0x78b2, 0x78b9, 0x78a5, 0x78d4, 0x78d9, 0x78c9, 0x78ec,
-  0x78f2, 0x7905, 0x78f4, 0x7913, 0x7924, 0x791e, 0x7934, 0x9f9b,
-  0x9ef9, 0x9efb, 0x9efc, 0x76f1, 0x7704, 0x770d, 0x76f9, 0x7707,
-  0x7708, 0x771a, 0x7722, 0x7719, 0x772d, 0x7726, 0x7735, 0x7738,
-  0x7750, 0x7751, 0x7747, 0x7743, 0x775a, 0x7768,
-  /* 0x6e */
-  0x7762, 0x7765, 0x777f, 0x778d, 0x777d, 0x7780, 0x778c, 0x7791,
-  0x779f, 0x77a0, 0x77b0, 0x77b5, 0x77bd, 0x753a, 0x7540, 0x754e,
-  0x754b, 0x7548, 0x755b, 0x7572, 0x7579, 0x7583, 0x7f58, 0x7f61,
-  0x7f5f, 0x8a48, 0x7f68, 0x7f74, 0x7f71, 0x7f79, 0x7f81, 0x7f7e,
-  0x76cd, 0x76e5, 0x8832, 0x9485, 0x9486, 0x9487, 0x948b, 0x948a,
-  0x948c, 0x948d, 0x948f, 0x9490, 0x9494, 0x9497, 0x9495, 0x949a,
-  0x949b, 0x949c, 0x94a3, 0x94a4, 0x94ab, 0x94aa, 0x94ad, 0x94ac,
-  0x94af, 0x94b0, 0x94b2, 0x94b4, 0x94b6, 0x94b7, 0x94b8, 0x94b9,
-  0x94ba, 0x94bc, 0x94bd, 0x94bf, 0x94c4, 0x94c8, 0x94c9, 0x94ca,
-  0x94cb, 0x94cc, 0x94cd, 0x94ce, 0x94d0, 0x94d1, 0x94d2, 0x94d5,
-  0x94d6, 0x94d7, 0x94d9, 0x94d8, 0x94db, 0x94de, 0x94df, 0x94e0,
-  0x94e2, 0x94e4, 0x94e5, 0x94e7, 0x94e8, 0x94ea,
-  /* 0x6f */
-  0x94e9, 0x94eb, 0x94ee, 0x94ef, 0x94f3, 0x94f4, 0x94f5, 0x94f7,
-  0x94f9, 0x94fc, 0x94fd, 0x94ff, 0x9503, 0x9502, 0x9506, 0x9507,
-  0x9509, 0x950a, 0x950d, 0x950e, 0x950f, 0x9512, 0x9513, 0x9514,
-  0x9515, 0x9516, 0x9518, 0x951b, 0x951d, 0x951e, 0x951f, 0x9522,
-  0x952a, 0x952b, 0x9529, 0x952c, 0x9531, 0x9532, 0x9534, 0x9536,
-  0x9537, 0x9538, 0x953c, 0x953e, 0x953f, 0x9542, 0x9535, 0x9544,
-  0x9545, 0x9546, 0x9549, 0x954c, 0x954e, 0x954f, 0x9552, 0x9553,
-  0x9554, 0x9556, 0x9557, 0x9558, 0x9559, 0x955b, 0x955e, 0x955f,
-  0x955d, 0x9561, 0x9562, 0x9564, 0x9565, 0x9566, 0x9567, 0x9568,
-  0x9569, 0x956a, 0x956b, 0x956c, 0x956f, 0x9571, 0x9572, 0x9573,
-  0x953a, 0x77e7, 0x77ec, 0x96c9, 0x79d5, 0x79ed, 0x79e3, 0x79eb,
-  0x7a06, 0x5d47, 0x7a03, 0x7a02, 0x7a1e, 0x7a14,
-  /* 0x70 */
-  0x7a39, 0x7a37, 0x7a51, 0x9ecf, 0x99a5, 0x7a70, 0x7688, 0x768e,
-  0x7693, 0x7699, 0x76a4, 0x74de, 0x74e0, 0x752c, 0x9e20, 0x9e22,
-  0x9e28, 0x9e29, 0x9e2a, 0x9e2b, 0x9e2c, 0x9e32, 0x9e31, 0x9e36,
-  0x9e38, 0x9e37, 0x9e39, 0x9e3a, 0x9e3e, 0x9e41, 0x9e42, 0x9e44,
-  0x9e46, 0x9e47, 0x9e48, 0x9e49, 0x9e4b, 0x9e4c, 0x9e4e, 0x9e51,
-  0x9e55, 0x9e57, 0x9e5a, 0x9e5b, 0x9e5c, 0x9e5e, 0x9e63, 0x9e66,
-  0x9e67, 0x9e68, 0x9e69, 0x9e6a, 0x9e6b, 0x9e6c, 0x9e71, 0x9e6d,
-  0x9e73, 0x7592, 0x7594, 0x7596, 0x75a0, 0x759d, 0x75ac, 0x75a3,
-  0x75b3, 0x75b4, 0x75b8, 0x75c4, 0x75b1, 0x75b0, 0x75c3, 0x75c2,
-  0x75d6, 0x75cd, 0x75e3, 0x75e8, 0x75e6, 0x75e4, 0x75eb, 0x75e7,
-  0x7603, 0x75f1, 0x75fc, 0x75ff, 0x7610, 0x7600, 0x7605, 0x760c,
-  0x7617, 0x760a, 0x7625, 0x7618, 0x7615, 0x7619,
-  /* 0x71 */
-  0x761b, 0x763c, 0x7622, 0x7620, 0x7640, 0x762d, 0x7630, 0x763f,
-  0x7635, 0x7643, 0x763e, 0x7633, 0x764d, 0x765e, 0x7654, 0x765c,
-  0x7656, 0x766b, 0x766f, 0x7fca, 0x7ae6, 0x7a78, 0x7a79, 0x7a80,
-  0x7a86, 0x7a88, 0x7a95, 0x7aa6, 0x7aa0, 0x7aac, 0x7aa8, 0x7aad,
-  0x7ab3, 0x8864, 0x8869, 0x8872, 0x887d, 0x887f, 0x8882, 0x88a2,
-  0x88c6, 0x88b7, 0x88bc, 0x88c9, 0x88e2, 0x88ce, 0x88e3, 0x88e5,
-  0x88f1, 0x891a, 0x88fc, 0x88e8, 0x88fe, 0x88f0, 0x8921, 0x8919,
-  0x8913, 0x891b, 0x890a, 0x8934, 0x892b, 0x8936, 0x8941, 0x8966,
-  0x897b, 0x758b, 0x80e5, 0x76b2, 0x76b4, 0x77dc, 0x8012, 0x8014,
-  0x8016, 0x801c, 0x8020, 0x8022, 0x8025, 0x8026, 0x8027, 0x8029,
-  0x8028, 0x8031, 0x800b, 0x8035, 0x8043, 0x8046, 0x804d, 0x8052,
-  0x8069, 0x8071, 0x8983, 0x9878, 0x9880, 0x9883,
-  /* 0x72 */
-  0x9889, 0x988c, 0x988d, 0x988f, 0x9894, 0x989a, 0x989b, 0x989e,
-  0x989f, 0x98a1, 0x98a2, 0x98a5, 0x98a6, 0x864d, 0x8654, 0x866c,
-  0x866e, 0x867f, 0x867a, 0x867c, 0x867b, 0x86a8, 0x868d, 0x868b,
-  0x86ac, 0x869d, 0x86a7, 0x86a3, 0x86aa, 0x8693, 0x86a9, 0x86b6,
-  0x86c4, 0x86b5, 0x86ce, 0x86b0, 0x86ba, 0x86b1, 0x86af, 0x86c9,
-  0x86cf, 0x86b4, 0x86e9, 0x86f1, 0x86f2, 0x86ed, 0x86f3, 0x86d0,
-  0x8713, 0x86de, 0x86f4, 0x86df, 0x86d8, 0x86d1, 0x8703, 0x8707,
-  0x86f8, 0x8708, 0x870a, 0x870d, 0x8709, 0x8723, 0x873b, 0x871e,
-  0x8725, 0x872e, 0x871a, 0x873e, 0x8748, 0x8734, 0x8731, 0x8729,
-  0x8737, 0x873f, 0x8782, 0x8722, 0x877d, 0x877e, 0x877b, 0x8760,
-  0x8770, 0x874c, 0x876e, 0x878b, 0x8753, 0x8763, 0x877c, 0x8764,
-  0x8759, 0x8765, 0x8793, 0x87af, 0x87a8, 0x87d2,
-  /* 0x73 */
-  0x87c6, 0x8788, 0x8785, 0x87ad, 0x8797, 0x8783, 0x87ab, 0x87e5,
-  0x87ac, 0x87b5, 0x87b3, 0x87cb, 0x87d3, 0x87bd, 0x87d1, 0x87c0,
-  0x87ca, 0x87db, 0x87ea, 0x87e0, 0x87ee, 0x8816, 0x8813, 0x87fe,
-  0x880a, 0x881b, 0x8821, 0x8839, 0x883c, 0x7f36, 0x7f42, 0x7f44,
-  0x7f45, 0x8210, 0x7afa, 0x7afd, 0x7b08, 0x7b03, 0x7b04, 0x7b15,
-  0x7b0a, 0x7b2b, 0x7b0f, 0x7b47, 0x7b38, 0x7b2a, 0x7b19, 0x7b2e,
-  0x7b31, 0x7b20, 0x7b25, 0x7b24, 0x7b33, 0x7b3e, 0x7b1e, 0x7b58,
-  0x7b5a, 0x7b45, 0x7b75, 0x7b4c, 0x7b5d, 0x7b60, 0x7b6e, 0x7b7b,
-  0x7b62, 0x7b72, 0x7b71, 0x7b90, 0x7ba6, 0x7ba7, 0x7bb8, 0x7bac,
-  0x7b9d, 0x7ba8, 0x7b85, 0x7baa, 0x7b9c, 0x7ba2, 0x7bab, 0x7bb4,
-  0x7bd1, 0x7bc1, 0x7bcc, 0x7bdd, 0x7bda, 0x7be5, 0x7be6, 0x7bea,
-  0x7c0c, 0x7bfe, 0x7bfc, 0x7c0f, 0x7c16, 0x7c0b,
-  /* 0x74 */
-  0x7c1f, 0x7c2a, 0x7c26, 0x7c38, 0x7c41, 0x7c40, 0x81fe, 0x8201,
-  0x8202, 0x8204, 0x81ec, 0x8844, 0x8221, 0x8222, 0x8223, 0x822d,
-  0x822f, 0x8228, 0x822b, 0x8238, 0x823b, 0x8233, 0x8234, 0x823e,
-  0x8244, 0x8249, 0x824b, 0x824f, 0x825a, 0x825f, 0x8268, 0x887e,
-  0x8885, 0x8888, 0x88d8, 0x88df, 0x895e, 0x7f9d, 0x7f9f, 0x7fa7,
-  0x7faf, 0x7fb0, 0x7fb2, 0x7c7c, 0x6549, 0x7c91, 0x7c9d, 0x7c9c,
-  0x7c9e, 0x7ca2, 0x7cb2, 0x7cbc, 0x7cbd, 0x7cc1, 0x7cc7, 0x7ccc,
-  0x7ccd, 0x7cc8, 0x7cc5, 0x7cd7, 0x7ce8, 0x826e, 0x66a8, 0x7fbf,
-  0x7fce, 0x7fd5, 0x7fe5, 0x7fe1, 0x7fe6, 0x7fe9, 0x7fee, 0x7ff3,
-  0x7cf8, 0x7d77, 0x7da6, 0x7dae, 0x7e47, 0x7e9b, 0x9eb8, 0x9eb4,
-  0x8d73, 0x8d84, 0x8d94, 0x8d91, 0x8db1, 0x8d67, 0x8d6d, 0x8c47,
-  0x8c49, 0x914a, 0x9150, 0x914e, 0x914f, 0x9164,
-  /* 0x75 */
-  0x9162, 0x9161, 0x9170, 0x9169, 0x916f, 0x917d, 0x917e, 0x9172,
-  0x9174, 0x9179, 0x918c, 0x9185, 0x9190, 0x918d, 0x9191, 0x91a2,
-  0x91a3, 0x91aa, 0x91ad, 0x91ae, 0x91af, 0x91b5, 0x91b4, 0x91ba,
-  0x8c55, 0x9e7e, 0x8db8, 0x8deb, 0x8e05, 0x8e59, 0x8e69, 0x8db5,
-  0x8dbf, 0x8dbc, 0x8dba, 0x8dc4, 0x8dd6, 0x8dd7, 0x8dda, 0x8dde,
-  0x8dce, 0x8dcf, 0x8ddb, 0x8dc6, 0x8dec, 0x8df7, 0x8df8, 0x8de3,
-  0x8df9, 0x8dfb, 0x8de4, 0x8e09, 0x8dfd, 0x8e14, 0x8e1d, 0x8e1f,
-  0x8e2c, 0x8e2e, 0x8e23, 0x8e2f, 0x8e3a, 0x8e40, 0x8e39, 0x8e35,
-  0x8e3d, 0x8e31, 0x8e49, 0x8e41, 0x8e42, 0x8e51, 0x8e52, 0x8e4a,
-  0x8e70, 0x8e76, 0x8e7c, 0x8e6f, 0x8e74, 0x8e85, 0x8e8f, 0x8e94,
-  0x8e90, 0x8e9c, 0x8e9e, 0x8c78, 0x8c82, 0x8c8a, 0x8c85, 0x8c98,
-  0x8c94, 0x659b, 0x89d6, 0x89de, 0x89da, 0x89dc,
-  /* 0x76 */
-  0x89e5, 0x89eb, 0x89ef, 0x8a3e, 0x8b26, 0x9753, 0x96e9, 0x96f3,
-  0x96ef, 0x9706, 0x9701, 0x9708, 0x970f, 0x970e, 0x972a, 0x972d,
-  0x9730, 0x973e, 0x9f80, 0x9f83, 0x9f85, 0x9f86, 0x9f87, 0x9f88,
-  0x9f89, 0x9f8a, 0x9f8c, 0x9efe, 0x9f0b, 0x9f0d, 0x96b9, 0x96bc,
-  0x96bd, 0x96ce, 0x96d2, 0x77bf, 0x96e0, 0x928e, 0x92ae, 0x92c8,
-  0x933e, 0x936a, 0x93ca, 0x938f, 0x943e, 0x946b, 0x9c7f, 0x9c82,
-  0x9c85, 0x9c86, 0x9c87, 0x9c88, 0x7a23, 0x9c8b, 0x9c8e, 0x9c90,
-  0x9c91, 0x9c92, 0x9c94, 0x9c95, 0x9c9a, 0x9c9b, 0x9c9e, 0x9c9f,
-  0x9ca0, 0x9ca1, 0x9ca2, 0x9ca3, 0x9ca5, 0x9ca6, 0x9ca7, 0x9ca8,
-  0x9ca9, 0x9cab, 0x9cad, 0x9cae, 0x9cb0, 0x9cb1, 0x9cb2, 0x9cb3,
-  0x9cb4, 0x9cb5, 0x9cb6, 0x9cb7, 0x9cba, 0x9cbb, 0x9cbc, 0x9cbd,
-  0x9cc4, 0x9cc5, 0x9cc6, 0x9cc7, 0x9cca, 0x9ccb,
-  /* 0x77 */
-  0x9ccc, 0x9ccd, 0x9cce, 0x9ccf, 0x9cd0, 0x9cd3, 0x9cd4, 0x9cd5,
-  0x9cd7, 0x9cd8, 0x9cd9, 0x9cdc, 0x9cdd, 0x9cdf, 0x9ce2, 0x977c,
-  0x9785, 0x9791, 0x9792, 0x9794, 0x97af, 0x97ab, 0x97a3, 0x97b2,
-  0x97b4, 0x9ab1, 0x9ab0, 0x9ab7, 0x9e58, 0x9ab6, 0x9aba, 0x9abc,
-  0x9ac1, 0x9ac0, 0x9ac5, 0x9ac2, 0x9acb, 0x9acc, 0x9ad1, 0x9b45,
-  0x9b43, 0x9b47, 0x9b49, 0x9b48, 0x9b4d, 0x9b51, 0x98e8, 0x990d,
-  0x992e, 0x9955, 0x9954, 0x9adf, 0x9ae1, 0x9ae6, 0x9aef, 0x9aeb,
-  0x9afb, 0x9aed, 0x9af9, 0x9b08, 0x9b0f, 0x9b13, 0x9b1f, 0x9b23,
-  0x9ebd, 0x9ebe, 0x7e3b, 0x9e82, 0x9e87, 0x9e88, 0x9e8b, 0x9e92,
-  0x93d6, 0x9e9d, 0x9e9f, 0x9edb, 0x9edc, 0x9edd, 0x9ee0, 0x9edf,
-  0x9ee2, 0x9ee9, 0x9ee7, 0x9ee5, 0x9eea, 0x9eef, 0x9f22, 0x9f2c,
-  0x9f2f, 0x9f39, 0x9f37, 0x9f3d, 0x9f3e, 0x9f44,
-};
-
-static int
-gb2312_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c1 = s[0];
-  if ((c1 >= 0x21 && c1 <= 0x29) || (c1 >= 0x30 && c1 <= 0x77)) {
-    if (n >= 2) {
-      unsigned char c2 = s[1];
-      if (c2 >= 0x21 && c2 < 0x7f) {
-        unsigned int i = 94 * (c1 - 0x21) + (c2 - 0x21);
-        unsigned short wc = 0xfffd;
-        if (i < 1410) {
-          if (i < 831)
-            wc = gb2312_2uni_page21[i];
-        } else {
-          if (i < 8178)
-            wc = gb2312_2uni_page30[i-1410];
-        }
-        if (wc != 0xfffd) {
-          *pwc = (wchar_t) wc;
-          return 2;
-        }
-      }
-      return RET_ILSEQ;
-    }
-    return RET_TOOFEW(0);
-  }
-  return RET_ILSEQ;
-}
-
-static const unsigned short gb2312_2charset[7445] = {
-  0x2168, 0x216c, 0x2127, 0x2163, 0x2140, 0x2141, 0x2824, 0x2822,
-  0x2828, 0x2826, 0x283a, 0x282c, 0x282a, 0x2830, 0x282e, 0x2142,
-  0x2834, 0x2832, 0x2839, 0x2821, 0x2825, 0x2827, 0x2829, 0x282d,
-  0x2831, 0x2823, 0x282b, 0x282f, 0x2833, 0x2835, 0x2836, 0x2837,
-  0x2838, 0x2126, 0x2125, 0x2621, 0x2622, 0x2623, 0x2624, 0x2625,
-  0x2626, 0x2627, 0x2628, 0x2629, 0x262a, 0x262b, 0x262c, 0x262d,
-  0x262e, 0x262f, 0x2630, 0x2631, 0x2632, 0x2633, 0x2634, 0x2635,
-  0x2636, 0x2637, 0x2638, 0x2641, 0x2642, 0x2643, 0x2644, 0x2645,
-  0x2646, 0x2647, 0x2648, 0x2649, 0x264a, 0x264b, 0x264c, 0x264d,
-  0x264e, 0x264f, 0x2650, 0x2651, 0x2652, 0x2653, 0x2654, 0x2655,
-  0x2656, 0x2657, 0x2658, 0x2727, 0x2721, 0x2722, 0x2723, 0x2724,
-  0x2725, 0x2726, 0x2728, 0x2729, 0x272a, 0x272b, 0x272c, 0x272d,
-  0x272e, 0x272f, 0x2730, 0x2731, 0x2732, 0x2733, 0x2734, 0x2735,
-  0x2736, 0x2737, 0x2738, 0x2739, 0x273a, 0x273b, 0x273c, 0x273d,
-  0x273e, 0x273f, 0x2740, 0x2741, 0x2751, 0x2752, 0x2753, 0x2754,
-  0x2755, 0x2756, 0x2758, 0x2759, 0x275a, 0x275b, 0x275c, 0x275d,
-  0x275e, 0x275f, 0x2760, 0x2761, 0x2762, 0x2763, 0x2764, 0x2765,
-  0x2766, 0x2767, 0x2768, 0x2769, 0x276a, 0x276b, 0x276c, 0x276d,
-  0x276e, 0x276f, 0x2770, 0x2771, 0x2757, 0x212a, 0x212c, 0x212e,
-  0x212f, 0x2130, 0x2131, 0x212d, 0x216b, 0x2164, 0x2165, 0x2179,
-  0x2166, 0x216d, 0x2271, 0x2272, 0x2273, 0x2274, 0x2275, 0x2276,
-  0x2277, 0x2278, 0x2279, 0x227a, 0x227b, 0x227c, 0x217b, 0x217c,
-  0x217a, 0x217d, 0x214a, 0x2147, 0x2146, 0x214c, 0x2158, 0x215e,
-  0x214f, 0x214e, 0x2144, 0x2145, 0x2149, 0x2148, 0x2152, 0x2153,
-  0x2160, 0x215f, 0x2143, 0x214b, 0x2157, 0x2156, 0x2155, 0x2159,
-  0x2154, 0x215c, 0x215d, 0x215a, 0x215b, 0x2151, 0x214d, 0x2150,
-  0x2259, 0x225a, 0x225b, 0x225c, 0x225d, 0x225e, 0x225f, 0x2260,
-  0x2261, 0x2262, 0x2245, 0x2246, 0x2247, 0x2248, 0x2249, 0x224a,
-  0x224b, 0x224c, 0x224d, 0x224e, 0x224f, 0x2250, 0x2251, 0x2252,
-  0x2253, 0x2254, 0x2255, 0x2256, 0x2257, 0x2258, 0x2231, 0x2232,
-  0x2233, 0x2234, 0x2235, 0x2236, 0x2237, 0x2238, 0x2239, 0x223a,
-  0x223b, 0x223c, 0x223d, 0x223e, 0x223f, 0x2240, 0x2241, 0x2242,
-  0x2243, 0x2244, 0x2924, 0x2925, 0x2926, 0x2927, 0x2928, 0x2929,
-  0x292a, 0x292b, 0x292c, 0x292d, 0x292e, 0x292f, 0x2930, 0x2931,
-  0x2932, 0x2933, 0x2934, 0x2935, 0x2936, 0x2937, 0x2938, 0x2939,
-  0x293a, 0x293b, 0x293c, 0x293d, 0x293e, 0x293f, 0x2940, 0x2941,
-  0x2942, 0x2943, 0x2944, 0x2945, 0x2946, 0x2947, 0x2948, 0x2949,
-  0x294a, 0x294b, 0x294c, 0x294d, 0x294e, 0x294f, 0x2950, 0x2951,
-  0x2952, 0x2953, 0x2954, 0x2955, 0x2956, 0x2957, 0x2958, 0x2959,
-  0x295a, 0x295b, 0x295c, 0x295d, 0x295e, 0x295f, 0x2960, 0x2961,
-  0x2962, 0x2963, 0x2964, 0x2965, 0x2966, 0x2967, 0x2968, 0x2969,
-  0x296a, 0x296b, 0x296c, 0x296d, 0x296e, 0x296f, 0x2176, 0x2175,
-  0x2178, 0x2177, 0x2174, 0x2173, 0x2170, 0x2172, 0x2171, 0x216f,
-  0x216e, 0x2162, 0x2161, 0x2121, 0x2122, 0x2123, 0x2128, 0x2129,
-  0x2134, 0x2135, 0x2136, 0x2137, 0x2138, 0x2139, 0x213a, 0x213b,
-  0x213e, 0x213f, 0x217e, 0x2132, 0x2133, 0x213c, 0x213d, 0x2421,
-  0x2422, 0x2423, 0x2424, 0x2425, 0x2426, 0x2427, 0x2428, 0x2429,
-  0x242a, 0x242b, 0x242c, 0x242d, 0x242e, 0x242f, 0x2430, 0x2431,
-  0x2432, 0x2433, 0x2434, 0x2435, 0x2436, 0x2437, 0x2438, 0x2439,
-  0x243a, 0x243b, 0x243c, 0x243d, 0x243e, 0x243f, 0x2440, 0x2441,
-  0x2442, 0x2443, 0x2444, 0x2445, 0x2446, 0x2447, 0x2448, 0x2449,
-  0x244a, 0x244b, 0x244c, 0x244d, 0x244e, 0x244f, 0x2450, 0x2451,
-  0x2452, 0x2453, 0x2454, 0x2455, 0x2456, 0x2457, 0x2458, 0x2459,
-  0x245a, 0x245b, 0x245c, 0x245d, 0x245e, 0x245f, 0x2460, 0x2461,
-  0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467, 0x2468, 0x2469,
-  0x246a, 0x246b, 0x246c, 0x246d, 0x246e, 0x246f, 0x2470, 0x2471,
-  0x2472, 0x2473, 0x2521, 0x2522, 0x2523, 0x2524, 0x2525, 0x2526,
-  0x2527, 0x2528, 0x2529, 0x252a, 0x252b, 0x252c, 0x252d, 0x252e,
-  0x252f, 0x2530, 0x2531, 0x2532, 0x2533, 0x2534, 0x2535, 0x2536,
-  0x2537, 0x2538, 0x2539, 0x253a, 0x253b, 0x253c, 0x253d, 0x253e,
-  0x253f, 0x2540, 0x2541, 0x2542, 0x2543, 0x2544, 0x2545, 0x2546,
-  0x2547, 0x2548, 0x2549, 0x254a, 0x254b, 0x254c, 0x254d, 0x254e,
-  0x254f, 0x2550, 0x2551, 0x2552, 0x2553, 0x2554, 0x2555, 0x2556,
-  0x2557, 0x2558, 0x2559, 0x255a, 0x255b, 0x255c, 0x255d, 0x255e,
-  0x255f, 0x2560, 0x2561, 0x2562, 0x2563, 0x2564, 0x2565, 0x2566,
-  0x2567, 0x2568, 0x2569, 0x256a, 0x256b, 0x256c, 0x256d, 0x256e,
-  0x256f, 0x2570, 0x2571, 0x2572, 0x2573, 0x2574, 0x2575, 0x2576,
-  0x2124, 0x2845, 0x2846, 0x2847, 0x2848, 0x2849, 0x284a, 0x284b,
-  0x284c, 0x284d, 0x284e, 0x284f, 0x2850, 0x2851, 0x2852, 0x2853,
-  0x2854, 0x2855, 0x2856, 0x2857, 0x2858, 0x2859, 0x285a, 0x285b,
-  0x285c, 0x285d, 0x285e, 0x285f, 0x2860, 0x2861, 0x2862, 0x2863,
-  0x2864, 0x2865, 0x2866, 0x2867, 0x2868, 0x2869, 0x2265, 0x2266,
-  0x2267, 0x2268, 0x2269, 0x226a, 0x226b, 0x226c, 0x226d, 0x226e,
-  0x523b, 0x3621, 0x465f, 0x4d72, 0x5549, 0x487d, 0x494f, 0x4f42,
-  0x5822, 0x323b, 0x536b, 0x5824, 0x3373, 0x5728, 0x4752, 0x5827,
-  0x4a40, 0x4770, 0x317b, 0x5235, 0x3454, 0x362b, 0x4b3f, 0x5829,
-  0x362a, 0x413d, 0x514f, 0x4925, 0x582d, 0x3876, 0x513e, 0x635c,
-  0x5650, 0x3761, 0x342e, 0x4159, 0x583c, 0x4d68, 0x3524, 0x4e2a,
-  0x5677, 0x4076, 0x3e59, 0x582f, 0x444b, 0x3e43, 0x5831, 0x4334,
-  0x5265, 0x562e, 0x4e5a, 0x5527, 0x3a75, 0x3726, 0x4056, 0x4639,
-  0x4552, 0x4747, 0x3954, 0x334b, 0x5252, 0x583f, 0x3e45, 0x4672,
-  0x5232, 0x4f30, 0x4f67, 0x4a69, 0x5840, 0x4272, 0x4252, 0x4869,
-  0x472c, 0x414b, 0x5368, 0x5579, 0x4a42, 0x367e, 0x5821, 0x535a,
-  0x3f77, 0x5446, 0x3b25, 0x5841, 0x4e65, 0x3e2e, 0x5828, 0x5147,
-  0x5029, 0x583d, 0x596f, 0x4d76, 0x3f3a, 0x3d3b, 0x3a25, 0x5260,
-  0x327a, 0x3a60, 0x4436, 0x4f6d, 0x3e29, 0x4d24, 0x4141, 0x4757,
-  0x5971, 0x5974, 0x484b, 0x5869, 0x525a, 0x4a32, 0x484a, 0x586c,
-  0x586a, 0x5846, 0x3d76, 0x464d, 0x3370, 0x586b, 0x3d71, 0x3d69,
-  0x4854, 0x3453, 0x4258, 0x3256, 0x5750, 0x4a4b, 0x4b7b, 0x554c,
-  0x3836, 0x4f49, 0x595a, 0x5870, 0x472a, 0x586e, 0x347a, 0x416e,
-  0x5254, 0x586d, 0x5247, 0x586f, 0x4347, 0x5176, 0x5659, 0x5872,
-  0x5875, 0x3c7e, 0x3c5b, 0x484e, 0x375d, 0x3742, 0x4673, 0x5878,
-  0x5241, 0x4e69, 0x3c3f, 0x377c, 0x3725, 0x505d, 0x565a, 0x5345,
-  0x3b6f, 0x3b61, 0x5871, 0x4921, 0x4e30, 0x342b, 0x5873, 0x494b,
-  0x5876, 0x4257, 0x5877, 0x4e31, 0x5879, 0x322e, 0x3940, 0x5923,
-  0x3069, 0x4166, 0x496c, 0x4b45, 0x4b46, 0x5924, 0x3568, 0x352b,
-  0x4e3b, 0x354d, 0x5721, 0x5774, 0x5353, 0x4c65, 0x3a4e, 0x5922,
-  0x595c, 0x5360, 0x587d, 0x3770, 0x5777, 0x587e, 0x587a, 0x5921,
-  0x4463, 0x5336, 0x5874, 0x595d, 0x587b, 0x4565, 0x4050, 0x5170,
-  0x305b, 0x3c51, 0x5926, 0x5925, 0x592c, 0x592e, 0x592b, 0x4a39,
-  0x5929, 0x5636, 0x335e, 0x5928, 0x407d, 0x4a4c, 0x592a, 0x5927,
-  0x5930, 0x3631, 0x3929, 0x5240, 0x4f40, 0x4242, 0x3d44, 0x556c,
-  0x3260, 0x4748, 0x3f6b, 0x592d, 0x592f, 0x4e6a, 0x3a6e, 0x4756,
-  0x3163, 0x3459, 0x366d, 0x5934, 0x3f21, 0x595e, 0x474e, 0x407e,
-  0x5938, 0x4b57, 0x377d, 0x5935, 0x5937, 0x3123, 0x5361, 0x5939,
-  0x5045, 0x5936, 0x5931, 0x5932, 0x4129, 0x5933, 0x3c73, 0x505e,
-  0x3829, 0x3e63, 0x593d, 0x593a, 0x3033, 0x5942, 0x5944, 0x3136,
-  0x593f, 0x3539, 0x3e73, 0x4c48, 0x3a72, 0x5250, 0x5943, 0x3d68,
-  0x332b, 0x5945, 0x3e6b, 0x5946, 0x593b, 0x445f, 0x593e, 0x5941,
-  0x5940, 0x552e, 0x5635, 0x4763, 0x5948, 0x3c59, 0x594a, 0x593c,
-  0x594b, 0x462b, 0x5949, 0x5776, 0x4d23, 0x3d21, 0x594c, 0x453c,
-  0x4d35, 0x594d, 0x5947, 0x3325, 0x3f7e, 0x3835, 0x407c, 0x3078,
-  0x3476, 0x594e, 0x594f, 0x3422, 0x5950, 0x345f, 0x3041, 0x5951,
-  0x4935, 0x4f71, 0x5952, 0x4145, 0x5956, 0x492e, 0x5955, 0x5954,
-  0x5957, 0x4b5b, 0x3d29, 0x4627, 0x5953, 0x5958, 0x5959, 0x4865,
-  0x405c, 0x3679, 0x5823, 0x544a, 0x542a, 0x5056, 0x3364, 0x5557,
-  0x4f48, 0x3962, 0x3f4b, 0x4362, 0x3652, 0x4d43, 0x596e, 0x5970,
-  0x3533, 0x3635, 0x3e24, 0x486b, 0x482b, 0x304b, 0x392b, 0x4179,
-  0x5962, 0x403c, 0x3932, 0x3958, 0x504b, 0x3178, 0x4664, 0x3e5f,
-  0x3564, 0x5748, 0x5178, 0x3c66, 0x4a5e, 0x3c3d, 0x5966, 0x5867,
-  0x445a, 0x3854, 0x483d, 0x3261, 0x5459, 0x4330, 0x4361, 0x5a22,
-  0x485f, 0x5034, 0x3e7c, 0x4529, 0x395a, 0x5a23, 0x5429, 0x5a24,
-  0x597b, 0x362c, 0x376b, 0x3179, 0x597c, 0x3365, 0x3e76, 0x3f76,
-  0x5231, 0x4064, 0x3633, 0x597e, 0x597d, 0x3e3b, 0x4660, 0x573c,
-  0x5a21, 0x4139, 0x3572, 0x4168, 0x3c75, 0x3455, 0x415d, 0x447d,
-  0x3c38, 0x3732, 0x376f, 0x596c, 0x463e, 0x3f2d, 0x3b4b, 0x354a,
-  0x5b49, 0x5057, 0x4d39, 0x303c, 0x3376, 0x3b77, 0x5b4a, 0x3a2f,
-  0x5464, 0x3536, 0x3573, 0x5856, 0x4850, 0x3756, 0x4750, 0x5857,
-  0x3f2f, 0x5b3b, 0x5858, 0x504c, 0x3b2e, 0x6b3e, 0x4150, 0x4175,
-  0x5472, 0x3855, 0x3434, 0x3375, 0x493e, 0x4550, 0x4559, 0x407b,
-  0x3170, 0x5859, 0x394e, 0x353d, 0x585a, 0x5646, 0x4b22, 0x482f,
-  0x4932, 0x344c, 0x3f4c, 0x3974, 0x585b, 0x585c, 0x3667, 0x3c41,
-  0x4c6a, 0x4f77, 0x585d, 0x4730, 0x3950, 0x3d23, 0x4c5e, 0x464a,
-  0x5860, 0x585e, 0x585f, 0x307e, 0x3e67, 0x4a23, 0x3c74, 0x3831,
-  0x386e, 0x5862, 0x3d4b, 0x5864, 0x5863, 0x457c, 0x5865, 0x5866,
-  0x4126, 0x4830, 0x306c, 0x3926, 0x3c53, 0x4e71, 0x5b3d, 0x4153,
-  0x362f, 0x567a, 0x452c, 0x3d59, 0x5b3e, 0x5b3f, 0x4078, 0x3e22,
-  0x404d, 0x5b40, 0x4a46, 0x322a, 0x5342, 0x4363, 0x512b, 0x5b42,
-  0x4055, 0x5b43, 0x3f31, 0x443c, 0x475a, 0x5b44, 0x5968, 0x4957,
-  0x3934, 0x4e70, 0x5448, 0x307c, 0x3452, 0x5059, 0x5969, 0x5e4b,
-  0x596b, 0x5830, 0x3b2f, 0x3131, 0x3357, 0x584e, 0x5451, 0x3d33,
-  0x3f6f, 0x4f3b, 0x5850, 0x374b, 0x5851, 0x4625, 0x4778, 0x523d,
-  0x5852, 0x4464, 0x4a2e, 0x4727, 0x5826, 0x497d, 0x4e67, 0x3b5c,
-  0x306b, 0x3b2a, 0x502d, 0x3130, 0x5764, 0x573f, 0x3525, 0x4274,
-  0x444f, 0x3229, 0x3237, 0x3165, 0x5f32, 0x553c, 0x3f28, 0x422c,
-  0x5855, 0x4231, 0x5854, 0x4e54, 0x5a60, 0x4e40, 0x5834, 0x432e,
-  0x5321, 0x4e23, 0x3c34, 0x4834, 0x4251, 0x3e6d, 0x5036, 0x5a61,
-  0x4764, 0x3327, 0x3672, 0x4c7c, 0x407a, 0x4077, 0x5139, 0x5161,
-  0x5847, 0x325e, 0x4065, 0x3a71, 0x5848, 0x542d, 0x4f61, 0x5849,
-  0x584a, 0x4f43, 0x3378, 0x3e47, 0x584b, 0x5b4c, 0x4825, 0x4f58,
-  0x487e, 0x324e, 0x5356, 0x3266, 0x3c30, 0x5351, 0x4b2b, 0x3734,
-  0x3722, 0x4a65, 0x4821, 0x4a5c, 0x3164, 0x5070, 0x4551, 0x5b45,
-  0x357e, 0x3f5a, 0x3945, 0x3e64, 0x416d, 0x5f36, 0x5f35, 0x563b,
-  0x3d50, 0x5559, 0x3048, 0x3623, 0x3f49, 0x4c28, 0x5f33, 0x4a37,
-  0x5352, 0x584f, 0x5236, 0x3a45, 0x4b3e, 0x4c3e, 0x5f37, 0x3570,
-  0x5f34, 0x5375, 0x3354, 0x3877, 0x5f3a, 0x3a4f, 0x3c2a, 0x3575,
-  0x4d2c, 0x437b, 0x3a73, 0x4074, 0x4d42, 0x4f72, 0x5f38, 0x4f45,
-  0x4240, 0x5f39, 0x4270, 0x3e7d, 0x415f, 0x4d4c, 0x5277, 0x374d,
-  0x5f41, 0x5f44, 0x3771, 0x3049, 0x3656, 0x3754, 0x3a2c, 0x4c7d,
-  0x3f54, 0x4b31, 0x4674, 0x5628, 0x5f45, 0x4e62, 0x3333, 0x4e7c,
-  0x3435, 0x4e47, 0x3a70, 0x4e61, 0x513d, 0x5f40, 0x3474, 0x334a,
-  0x3866, 0x5f3b, 0x4445, 0x5f3c, 0x5f3d, 0x5f3e, 0x453b, 0x5f3f,
-  0x5f42, 0x5431, 0x5f43, 0x473a, 0x4e58, 0x4458, 0x5f4a, 0x5f4f,
-  0x565c, 0x5f49, 0x5f5a, 0x4e36, 0x3a47, 0x5f4e, 0x5f48, 0x455e,
-  0x496b, 0x3a74, 0x437c, 0x3e57, 0x5f46, 0x5f4d, 0x4558, 0x5526,
-  0x3a4d, 0x3e4c, 0x533d, 0x3840, 0x5664, 0x5f47, 0x393e, 0x3f27,
-  0x417c, 0x5f4b, 0x5f4c, 0x5f50, 0x5f5b, 0x5f65, 0x5f57, 0x5f56,
-  0x5749, 0x5f63, 0x5f64, 0x656b, 0x5227, 0x5f52, 0x3f29, 0x545b,
-  0x3f48, 0x5f54, 0x4f4c, 0x5f5d, 0x514a, 0x5f5e, 0x3027, 0x4637,
-  0x5f53, 0x3a65, 0x365f, 0x4d5b, 0x397e, 0x5455, 0x5f5f, 0x4f6c,
-  0x3025, 0x5f67, 0x5f51, 0x5146, 0x5f55, 0x5f58, 0x5f59, 0x5f5c,
-  0x3b29, 0x5f60, 0x5f61, 0x5f62, 0x5f66, 0x5f68, 0x5334, 0x3867,
-  0x4536, 0x5f6a, 0x495a, 0x4128, 0x4444, 0x3f5e, 0x4f78, 0x555c,
-  0x5f6e, 0x3238, 0x3a5f, 0x5f6c, 0x5b41, 0x5164, 0x4b74, 0x343d,
-  0x3026, 0x5f71, 0x4c46, 0x5f72, 0x5f6d, 0x5f69, 0x5f6b, 0x5f6f,
-  0x5f70, 0x3b3d, 0x5f73, 0x5f74, 0x3b23, 0x4a5b, 0x4e28, 0x6027,
-  0x332a, 0x6026, 0x6021, 0x5f7e, 0x4d59, 0x5f7c, 0x5f7a, 0x3f50,
-  0x5744, 0x494c, 0x5f78, 0x3021, 0x5f7d, 0x5f7b, 0x6022, 0x6028,
-  0x3748, 0x4621, 0x4936, 0x4032, 0x5f75, 0x453e, 0x5844, 0x5f79,
-  0x4476, 0x6023, 0x6024, 0x6025, 0x5025, 0x6034, 0x4c64, 0x6031,
-  0x3f26, 0x602f, 0x4e39, 0x602b, 0x4946, 0x402e, 0x602e, 0x3a6d,
-  0x3a30, 0x6029, 0x5f76, 0x6033, 0x6038, 0x342d, 0x6039, 0x4f32,
-  0x3a48, 0x6030, 0x507a, 0x602c, 0x547b, 0x5f77, 0x4567, 0x602d,
-  0x5377, 0x6036, 0x6037, 0x6044, 0x5061, 0x603c, 0x6049, 0x604a,
-  0x603e, 0x602a, 0x4924, 0x6041, 0x6032, 0x4a48, 0x6043, 0x6035,
-  0x4e4b, 0x4b43, 0x604d, 0x6046, 0x6042, 0x604b, 0x603a, 0x603f,
-  0x6040, 0x6045, 0x6047, 0x6048, 0x604c, 0x603b, 0x4b54, 0x6055,
-  0x6056, 0x6052, 0x6050, 0x3c4e, 0x6051, 0x3842, 0x5845, 0x506a,
-  0x426f, 0x604f, 0x603d, 0x6054, 0x6053, 0x6057, 0x605c, 0x6058,
-  0x5676, 0x3330, 0x576c, 0x4b3b, 0x605a, 0x4e7b, 0x3a59, 0x6061,
-  0x605d, 0x522d, 0x6062, 0x605b, 0x6059, 0x605f, 0x6060, 0x605e,
-  0x6064, 0x4677, 0x582c, 0x546b, 0x6066, 0x4a49, 0x6065, 0x3841,
-  0x6067, 0x6068, 0x6069, 0x6063, 0x3a3f, 0x4c67, 0x606a, 0x4f79,
-  0x606b, 0x4842, 0x3d40, 0x4452, 0x606c, 0x606d, 0x4774, 0x4b44,
-  0x606e, 0x3b58, 0x5836, 0x5272, 0x606f, 0x4d45, 0x365a, 0x6071,
-  0x5430, 0x4027, 0x3451, 0x4e27, 0x6070, 0x6072, 0x394c, 0x397a,
-  0x4d3c, 0x6073, 0x4654, 0x6074, 0x5432, 0x4826, 0x6076, 0x6075,
-  0x6077, 0x4d41, 0x4a25, 0x545a, 0x5b57, 0x5b59, 0x5b58, 0x3967,
-  0x5b5c, 0x5b5d, 0x3558, 0x5b5a, 0x5b5b, 0x3321, 0x5b5f, 0x3b78,
-  0x5637, 0x5b60, 0x3e79, 0x373b, 0x5b50, 0x4c2e, 0x3f32, 0x3b35,
-  0x5778, 0x3f53, 0x3f69, 0x3c61, 0x4c33, 0x5b5e, 0x3053, 0x4e6b,
-  0x3758, 0x5739, 0x4642, 0x4024, 0x4c39, 0x5b67, 0x5b61, 0x463a,
-  0x5b63, 0x5b68, 0x4577, 0x5b6a, 0x5b69, 0x3f40, 0x5b66, 0x5b65,
-  0x3439, 0x402c, 0x4222, 0x5b62, 0x5b64, 0x504d, 0x5b6d, 0x405d,
-  0x5b72, 0x3662, 0x5b73, 0x5b52, 0x3938, 0x542b, 0x5b6c, 0x3f51,
-  0x5b70, 0x5b51, 0x3566, 0x5b6b, 0x3f65, 0x5b6e, 0x5b71, 0x5b79,
-  0x3921, 0x3023, 0x4271, 0x3347, 0x5b6f, 0x5b78, 0x4652, 0x5b74,
-  0x5b75, 0x5b77, 0x5b76, 0x5b7e, 0x5372, 0x323a, 0x5b7d, 0x5c24,
-  0x5b7b, 0x5b7a, 0x5b7c, 0x4560, 0x3b79, 0x5c23, 0x5c25, 0x4c43,
-  0x3651, 0x5d40, 0x5c21, 0x5c22, 0x4735, 0x3669, 0x5c27, 0x5c26,
-  0x5c29, 0x3124, 0x354c, 0x3f30, 0x515f, 0x3642, 0x5c28, 0x4b7a,
-  0x6b73, 0x4b5c, 0x4b7e, 0x4c41, 0x487b, 0x5c2a, 0x4c6e, 0x5c2b,
-  0x5b53, 0x5c2f, 0x5c2c, 0x3e33, 0x4a7b, 0x5c2d, 0x494a, 0x4439,
-  0x473d, 0x5c2e, 0x5476, 0x5066, 0x442b, 0x3655, 0x5b54, 0x315a,
-  0x5b55, 0x5b56, 0x3a3e, 0x4840, 0x4a3f, 0x4849, 0x5733, 0x4979,
-  0x3f47, 0x3a78, 0x523c, 0x623a, 0x3426, 0x3138, 0x3834, 0x4f44,
-  0x5967, 0x4f26, 0x4d62, 0x596d, 0x3660, 0x5239, 0x393b, 0x6239,
-  0x6237, 0x3473, 0x4c6c, 0x4c2b, 0x3772, 0x5832, 0x516b, 0x3a3b,
-  0x4a27, 0x4d37, 0x5244, 0x3f64, 0x3c50, 0x3661, 0x5e45, 0x5e46,
-  0x5b3c, 0x5159, 0x4666, 0x444e, 0x376e, 0x375c, 0x3f7c, 0x5760,
-  0x4675, 0x313c, 0x5e48, 0x3d31, 0x4c57, 0x5e4a, 0x5e49, 0x356c,
-  0x495d, 0x3042, 0x452e, 0x452b, 0x444c, 0x3c69, 0x4b7d, 0x3a43,
-  0x6579, 0x4867, 0x657a, 0x4d7d, 0x5731, 0x383e, 0x4268, 0x4851,
-  0x657b, 0x364a, 0x3c4b, 0x517d, 0x6621, 0x436e, 0x6624, 0x657e,
-  0x6625, 0x4d57, 0x3741, 0x657c, 0x657d, 0x6623, 0x445d, 0x6628,
-  0x6627, 0x4343, 0x465e, 0x662a, 0x4437, 0x6622, 0x4a3c, 0x3d63,
-  0x3943, 0x6626, 0x5055, 0x4e2f, 0x6629, 0x6630, 0x5226, 0x3d2a,
-  0x662d, 0x662f, 0x4051, 0x524c, 0x3c27, 0x6631, 0x5276, 0x574b,
-  0x4d7e, 0x4d5e, 0x4226, 0x662b, 0x662c, 0x3d3f, 0x662e, 0x6633,
-  0x6632, 0x6636, 0x6638, 0x446f, 0x4448, 0x3e6a, 0x496f, 0x6637,
-  0x3670, 0x4364, 0x5369, 0x6634, 0x6635, 0x4822, 0x663d, 0x6639,
-  0x4645, 0x4d71, 0x663b, 0x663c, 0x3b69, 0x663e, 0x663a, 0x4037,
-  0x5324, 0x663f, 0x4974, 0x6643, 0x6644, 0x5076, 0x433d, 0x4344,
-  0x6642, 0x6641, 0x6647, 0x4f31, 0x6b74, 0x664a, 0x6645, 0x3c5e,
-  0x4929, 0x3c35, 0x4f53, 0x6648, 0x6649, 0x664e, 0x6650, 0x6651,
-  0x664b, 0x3555, 0x664c, 0x664f, 0x445b, 0x6646, 0x664d, 0x6652,
-  0x6654, 0x6653, 0x6655, 0x5978, 0x6656, 0x6657, 0x5753, 0x665d,
-  0x665e, 0x3f57, 0x5450, 0x5756, 0x3466, 0x4b6f, 0x665a, 0x5843,
-  0x574e, 0x5022, 0x434f, 0x665f, 0x3c3e, 0x3942, 0x665b, 0x5127,
-  0x3a22, 0x424f, 0x582b, 0x4a6b, 0x656e, 0x665c, 0x3775, 0x4866,
-  0x4475, 0x6532, 0x447e, 0x4b7c, 0x6533, 0x552c, 0x536e, 0x4a58,
-  0x3032, 0x4b4e, 0x4d6a, 0x3a6a, 0x6535, 0x6534, 0x575a, 0x3959,
-  0x5666, 0x3628, 0x4d70, 0x524b, 0x3126, 0x4a35, 0x3368, 0x4973,
-  0x3f4d, 0x507b, 0x4a52, 0x6536, 0x3b42, 0x4f5c, 0x392c, 0x5457,
-  0x3a26, 0x5167, 0x4f7c, 0x3c52, 0x6537, 0x485d, 0x3f6d, 0x3176,
-  0x4b5e, 0x3c45, 0x3c44, 0x527a, 0x435c, 0x3f5c, 0x383b, 0x4342,
-  0x3a2e, 0x5422, 0x475e, 0x442f, 0x326c, 0x3951, 0x653b, 0x4148,
-  0x552f, 0x653c, 0x653e, 0x3467, 0x3654, 0x4b42, 0x5130, 0x353c,
-  0x4a59, 0x3762, 0x4964, 0x3d2b, 0x4e3e, 0x5770, 0x5021, 0x4959,
-  0x367b, 0x6658, 0x3c62, 0x333e, 0x4950, 0x6659, 0x3322, 0x5e4c,
-  0x5348, 0x5e4d, 0x5222, 0x5e4e, 0x3e4d, 0x5e4f, 0x4a2c, 0x527c,
-  0x335f, 0x656a, 0x4461, 0x3e21, 0x4e32, 0x4472, 0x3e56, 0x4628,
-  0x3263, 0x3e53, 0x477c, 0x4c6b, 0x3d6c, 0x4e5d, 0x4a3a, 0x4641,
-  0x656c, 0x503c, 0x5539, 0x656d, 0x4a74, 0x4d40, 0x4245, 0x656f,
-  0x4244, 0x6570, 0x6578, 0x4d4d, 0x493d, 0x5259, 0x6128, 0x536c,
-  0x4b6a, 0x4671, 0x612c, 0x6127, 0x6129, 0x612a, 0x612f, 0x326d,
-  0x612b, 0x385a, 0x612d, 0x612e, 0x6130, 0x353a, 0x6131, 0x6133,
-  0x6138, 0x5152, 0x6136, 0x6135, 0x416b, 0x6137, 0x5440, 0x6132,
-  0x613a, 0x3036, 0x6134, 0x3f79, 0x6139, 0x613b, 0x613e, 0x613c,
-  0x5645, 0x4f3f, 0x613d, 0x613f, 0x424d, 0x366b, 0x5378, 0x474d,
-  0x3765, 0x3e7e, 0x6140, 0x6141, 0x6147, 0x3367, 0x4669, 0x345e,
-  0x5142, 0x6148, 0x6146, 0x6145, 0x6143, 0x6142, 0x3140, 0x5538,
-  0x6144, 0x614b, 0x614c, 0x614a, 0x6f7a, 0x6153, 0x6152, 0x4736,
-  0x6149, 0x614e, 0x6150, 0x6154, 0x6151, 0x614d, 0x614f, 0x6155,
-  0x6156, 0x6157, 0x6158, 0x615a, 0x615b, 0x4e21, 0x675d, 0x3428,
-  0x565d, 0x5132, 0x3332, 0x3924, 0x5773, 0x4749, 0x3e5e, 0x392e,
-  0x4e57, 0x326e, 0x5b4f, 0x3c3a, 0x5251, 0x4b48, 0x304d, 0x4f6f,
-  0x5963, 0x3d6d, 0x3152, 0x4a50, 0x323c, 0x4b27, 0x372b, 0x4a26,
-  0x4f23, 0x6078, 0x554a, 0x607b, 0x607a, 0x4541, 0x4c7b, 0x4131,
-  0x6079, 0x5663, 0x322f, 0x5644, 0x355b, 0x3478, 0x5621, 0x4f2f,
-  0x306f, 0x607c, 0x6121, 0x3323, 0x607d, 0x607e, 0x4331, 0x435d,
-  0x6122, 0x3779, 0x3b4f, 0x6123, 0x443b, 0x6124, 0x6125, 0x6126,
-  0x3431, 0x3849, 0x463d, 0x446a, 0x3222, 0x5052, 0x675b, 0x3b43,
-  0x5357, 0x5344, 0x3963, 0x624f, 0x572f, 0x476c, 0x3153, 0x3432,
-  0x6251, 0x5072, 0x422e, 0x6250, 0x3f62, 0x5326, 0x3557, 0x6252,
-  0x356a, 0x436d, 0x387d, 0x382e, 0x4553, 0x374f, 0x6254, 0x6253,
-  0x3648, 0x5779, 0x4d25, 0x6258, 0x6256, 0x4a7c, 0x3f35, 0x5339,
-  0x6255, 0x6257, 0x412e, 0x4048, 0x625b, 0x625a, 0x402a, 0x414e,
-  0x625c, 0x625d, 0x625e, 0x5b48, 0x5153, 0x4d22, 0x3d28, 0x5e43,
-  0x5825, 0x3f2a, 0x5b4d, 0x526c, 0x467a, 0x452a, 0x5e44, 0x3157,
-  0x5f2e, 0x4a3d, 0x5f31, 0x392d, 0x527d, 0x3825, 0x3a6b, 0x335a,
-  0x355c, 0x5545, 0x4356, 0x4f52, 0x3b21, 0x6573, 0x6572, 0x6574,
-  0x4d64, 0x4875, 0x352f, 0x473f, 0x6576, 0x6c30, 0x6566, 0x3969,
-  0x3531, 0x423c, 0x6568, 0x6567, 0x6569, 0x524d, 0x616a, 0x504e,
-  0x4d2e, 0x5165, 0x324a, 0x316b, 0x3172, 0x456d, 0x5543, 0x5330,
-  0x615c, 0x615d, 0x525b, 0x3339, 0x314b, 0x4d79, 0x5577, 0x615e,
-  0x3e36, 0x347d, 0x615f, 0x3a5c, 0x6160, 0x3b32, 0x4249, 0x6161,
-  0x506c, 0x4d3d, 0x6162, 0x3543, 0x4547, 0x6163, 0x6164, 0x5379,
-  0x6165, 0x512d, 0x6166, 0x4e22, 0x6167, 0x3542, 0x6168, 0x3b55,
-  0x5044, 0x6260, 0x3158, 0x5264, 0x6261, 0x3c49, 0x484c, 0x6263,
-  0x6c7e, 0x6c7d, 0x5f2f, 0x6262, 0x563e, 0x4d7c, 0x4326, 0x6343,
-  0x5652, 0x6267, 0x6268, 0x5347, 0x626c, 0x3f6c, 0x626d, 0x6265,
-  0x3340, 0x446e, 0x626e, 0x5043, 0x3a76, 0x6269, 0x375e, 0x3b33,
-  0x4c2c, 0x4b4b, 0x6264, 0x6266, 0x626a, 0x626b, 0x6277, 0x6274,
-  0x5475, 0x6273, 0x452d, 0x557a, 0x4542, 0x3240, 0x626f, 0x6272,
-  0x412f, 0x4b3c, 0x3521, 0x6279, 0x3c31, 0x6271, 0x5054, 0x5439,
-  0x6275, 0x3956, 0x6276, 0x4753, 0x6270, 0x575c, 0x6d21, 0x6278,
-  0x6d25, 0x627e, 0x4a51, 0x4135, 0x3b50, 0x3f56, 0x3a63, 0x4b21,
-  0x6d26, 0x6d23, 0x6d22, 0x3b56, 0x6d27, 0x5074, 0x6d24, 0x3a5e,
-  0x3677, 0x6321, 0x3632, 0x4c71, 0x3927, 0x4f22, 0x4721, 0x3f52,
-  0x3671, 0x627a, 0x627b, 0x627d, 0x627c, 0x4455, 0x6322, 0x5341,
-  0x6327, 0x4744, 0x4f24, 0x6329, 0x3a37, 0x6328, 0x3b5a, 0x6323,
-  0x6324, 0x632a, 0x6326, 0x4e72, 0x5346, 0x3b3c, 0x5443, 0x447a,
-  0x6d28, 0x507c, 0x6325, 0x4375, 0x632d, 0x312f, 0x6332, 0x3c42,
-  0x632c, 0x353f, 0x4769, 0x6330, 0x3e2a, 0x4d6f, 0x3b73, 0x4c68,
-  0x632f, 0x6331, 0x4f27, 0x632e, 0x4e29, 0x3b5d, 0x356b, 0x3e65,
-  0x3252, 0x334d, 0x3139, 0x632b, 0x3251, 0x352c, 0x395f, 0x3668,
-  0x4f6b, 0x6337, 0x3b4c, 0x4847, 0x504a, 0x6338, 0x336e, 0x6d29,
-  0x537a, 0x5364, 0x6d2a, 0x6339, 0x5262, 0x6335, 0x535e, 0x3850,
-  0x6333, 0x6336, 0x375f, 0x6334, 0x4022, 0x633a, 0x5438, 0x3448,
-  0x633b, 0x3b45, 0x4977, 0x4965, 0x443d, 0x6d2b, 0x427d, 0x3b5b,
-  0x3f2e, 0x4e3f, 0x633c, 0x3f36, 0x316f, 0x5477, 0x633e, 0x6d2d,
-  0x633f, 0x3a29, 0x6d2c, 0x633d, 0x6340, 0x3a36, 0x362e, 0x5038,
-  0x3043, 0x6d2e, 0x6d2f, 0x4041, 0x6341, 0x4533, 0x6342, 0x5c32,
-  0x6d30, 0x386a, 0x4e6c, 0x6a27, 0x5067, 0x4a79, 0x4856, 0x4f37,
-  0x3349, 0x4e52, 0x3d64, 0x635e, 0x3b72, 0x6a28, 0x553d, 0x465d,
-  0x6a29, 0x6a2a, 0x6a2c, 0x6a2b, 0x6a2e, 0x6a2d, 0x3d58, 0x6a2f,
-  0x423e, 0x3441, 0x3477, 0x3b27, 0x6c66, 0x6c65, 0x373f, 0x4b79,
-  0x3162, 0x6c67, 0x4948, 0x6c68, 0x6c69, 0x4a56, 0x5e50, 0x3245,
-  0x547a, 0x464b, 0x3047, 0x3472, 0x4853, 0x4d50, 0x3f38, 0x3f5b,
-  0x4724, 0x5634, 0x4029, 0x5e51, 0x4928, 0x516f, 0x4524, 0x3067,
-  0x3336, 0x4845, 0x3062, 0x3776, 0x457a, 0x3673, 0x5552, 0x3350,
-  0x3c3c, 0x332d, 0x3e71, 0x3051, 0x5256, 0x4a63, 0x5725, 0x4d36,
-  0x3636, 0x3f39, 0x555b, 0x3827, 0x4557, 0x5e52, 0x3f59, 0x4255,
-  0x4740, 0x3b24, 0x3128, 0x456a, 0x457b, 0x4c27, 0x3127, 0x3556,
-  0x4428, 0x5e53, 0x513a, 0x3369, 0x4372, 0x3777, 0x5674, 0x3523,
-  0x3270, 0x4434, 0x4469, 0x402d, 0x5e54, 0x3068, 0x4544, 0x4160,
-  0x3955, 0x3e5c, 0x4d58, 0x304e, 0x4d4f, 0x5e56, 0x3e50, 0x573e,
-  0x5e55, 0x5550, 0x305d, 0x4462, 0x4223, 0x3c70, 0x5335, 0x4039,
-  0x4521, 0x3226, 0x5471, 0x4028, 0x4a43, 0x5e57, 0x557c, 0x3930,
-  0x482d, 0x4b29, 0x5e59, 0x3f3d, 0x4634, 0x5727, 0x4a30, 0x4443,
-  0x3356, 0x3952, 0x5638, 0x6a7c, 0x3034, 0x3f66, 0x4c74, 0x4d5a,
-  0x563f, 0x424e, 0x4e4e, 0x4c22, 0x502e, 0x4453, 0x3532, 0x5e58,
-  0x5575, 0x3c37, 0x3b53, 0x3024, 0x4532, 0x346c, 0x5571, 0x6a7d,
-  0x5e5a, 0x4d26, 0x4d6c, 0x4e66, 0x5e5c, 0x4d31, 0x4026, 0x573d,
-  0x5e5b, 0x3046, 0x3a34, 0x4953, 0x4473, 0x3e68, 0x3236, 0x404c,
-  0x4b70, 0x3c71, 0x3b3b, 0x3537, 0x4575, 0x5e66, 0x5e63, 0x3e5d,
-  0x5e5f, 0x3437, 0x3d5d, 0x5e60, 0x446d, 0x4f46, 0x3560, 0x365e,
-  0x4a5a, 0x3574, 0x5e65, 0x5546, 0x5e61, 0x4c4d, 0x467e, 0x4545,
-  0x5234, 0x3e72, 0x4253, 0x4c3d, 0x3338, 0x3d53, 0x3f58, 0x4d46,
-  0x515a, 0x346b, 0x5e64, 0x5e5d, 0x5e67, 0x6a7e, 0x4230, 0x5e62,
-  0x5640, 0x3527, 0x3274, 0x5e68, 0x5e72, 0x5e6d, 0x5e71, 0x4860,
-  0x5761, 0x5e6f, 0x4368, 0x4c61, 0x3265, 0x523e, 0x5e6e, 0x5e6b,
-  0x4e55, 0x3427, 0x3f2b, 0x3e3e, 0x3d52, 0x5e69, 0x542e, 0x5e5e,
-  0x5e6a, 0x403f, 0x5e6c, 0x3273, 0x3869, 0x4227, 0x3d41, 0x5e75,
-  0x5e78, 0x322b, 0x3424, 0x346a, 0x4926, 0x5e76, 0x4b51, 0x3863,
-  0x5e77, 0x5e7a, 0x5e79, 0x4c42, 0x3061, 0x346e, 0x653a, 0x502f,
-  0x326b, 0x6b21, 0x5e74, 0x4963, 0x5e73, 0x305a, 0x5221, 0x3177,
-  0x4c2f, 0x5e70, 0x4b24, 0x552a, 0x5e7b, 0x345d, 0x4426, 0x5e7d,
-  0x437e, 0x4421, 0x5f21, 0x414c, 0x5e7c, 0x3e6f, 0x4632, 0x3345,
-  0x4876, 0x4b3a, 0x5e7e, 0x5f24, 0x5732, 0x3337, 0x4143, 0x474b,
-  0x3225, 0x3469, 0x572b, 0x446c, 0x5f22, 0x5f23, 0x5f25, 0x3a33,
-  0x5f26, 0x405e, 0x4943, 0x3259, 0x4766, 0x5f27, 0x475c, 0x5f28,
-  0x6b22, 0x4b53, 0x5f2a, 0x5f29, 0x3241, 0x454a, 0x5f2b, 0x545c,
-  0x4841, 0x5f2c, 0x3e70, 0x5f2d, 0x5627, 0x6a37, 0x6b36, 0x4a55,
-  0x587c, 0x3844, 0x3925, 0x3745, 0x557e, 0x394a, 0x5027, 0x744d,
-  0x3550, 0x4374, 0x3e48, 0x6b37, 0x303d, 0x3d4c, 0x4132, 0x3156,
-  0x3328, 0x3852, 0x4922, 0x3658, 0x6b38, 0x3e34, 0x4a7d, 0x4743,
-  0x557b, 0x3773, 0x4e44, 0x552b, 0x3173, 0x6c33, 0x305f, 0x6c35,
-  0x3637, 0x414f, 0x757a, 0x5031, 0x5565, 0x4e53, 0x3d6f, 0x3362,
-  0x382b, 0x5536, 0x6d3d, 0x364f, 0x4b39, 0x5042, 0x373d, 0x6c36,
-  0x4a29, 0x4554, 0x6c39, 0x6c38, 0x4243, 0x6c37, 0x507d, 0x6c3a,
-  0x6c3b, 0x5765, 0x6c3c, 0x6c3d, 0x466c, 0x4e5e, 0x3c48, 0x4855,
-  0x3529, 0x3e49, 0x563c, 0x5467, 0x512e, 0x5071, 0x6a38, 0x6a39,
-  0x6a3a, 0x3a35, 0x4a31, 0x3f75, 0x4d7a, 0x6a40, 0x303a, 0x6a3e,
-  0x4025, 0x6a3b, 0x327d, 0x4377, 0x3b68, 0x5257, 0x4e74, 0x6a3f,
-  0x6a3c, 0x6a43, 0x5047, 0x5333, 0x343a, 0x4341, 0x5772, 0x5551,
-  0x4a47, 0x6a45, 0x6a44, 0x6a47, 0x6a46, 0x5667, 0x4f54, 0x6a4b,
-  0x3b4e, 0x3d7a, 0x494e, 0x6a4c, 0x4939, 0x4f7e, 0x6a4a, 0x544e,
-  0x6a4d, 0x6a4f, 0x4d6d, 0x6a49, 0x6a4e, 0x4e6e, 0x3b5e, 0x333f,
-  0x4655, 0x3e30, 0x4e7a, 0x4767, 0x3e27, 0x6a50, 0x5647, 0x4140,
-  0x545d, 0x6a51, 0x4f3e, 0x6a52, 0x4a6e, 0x452f, 0x3035, 0x6a54,
-  0x6a53, 0x745f, 0x443a, 0x3129, 0x655f, 0x6a55, 0x4a6f, 0x6a56,
-  0x6a57, 0x4658, 0x6a58, 0x6a59, 0x543b, 0x477a, 0x5237, 0x387c,
-  0x6a42, 0x325c, 0x427c, 0x5478, 0x4c66, 0x576e, 0x5442, 0x5350,
-  0x6b43, 0x4573, 0x377e, 0x6b54, 0x4b37, 0x6b5e, 0x404a, 0x4d7b,
-  0x332f, 0x465a, 0x6b7c, 0x443e, 0x4e34, 0x4429, 0x313e, 0x547d,
-  0x4a75, 0x566c, 0x4653, 0x3664, 0x3b7a, 0x5060, 0x4931, 0x5453,
-  0x4828, 0x384b, 0x683e, 0x493c, 0x683b, 0x406e, 0x5053, 0x3244,
-  0x3465, 0x683c, 0x5548, 0x3645, 0x683d, 0x4a78, 0x385c, 0x4c75,
-  0x4034, 0x516e, 0x683f, 0x6842, 0x3a3c, 0x312d, 0x3d5c, 0x6a3d,
-  0x6843, 0x6846, 0x684b, 0x684c, 0x4b49, 0x3065, 0x3c2b, 0x3939,
-  0x6841, 0x4d77, 0x684a, 0x4e76, 0x556d, 0x4156, 0x6844, 0x4336,
-  0x397b, 0x5626, 0x6848, 0x4a60, 0x5466, 0x6840, 0x6845, 0x6847,
-  0x4739, 0x3763, 0x6849, 0x3f5d, 0x6852, 0x6857, 0x6855, 0x3c5c,
-  0x3c4f, 0x685b, 0x685e, 0x685a, 0x317a, 0x3058, 0x4433, 0x384c,
-  0x4662, 0x483e, 0x4861, 0x684f, 0x6854, 0x6856, 0x3971, 0x6858,
-  0x5775, 0x447b, 0x685c, 0x3269, 0x6851, 0x3c6d, 0x3f42, 0x684d,
-  0x5679, 0x4178, 0x3271, 0x685f, 0x4a41, 0x6859, 0x5524, 0x316a,
-  0x553b, 0x684e, 0x6850, 0x3630, 0x6853, 0x685d, 0x4038, 0x4a77,
-  0x4b28, 0x465c, 0x4075, 0x6869, 0x5023, 0x6872, 0x566a, 0x6860,
-  0x6861, 0x5179, 0x3a4b, 0x3879, 0x3871, 0x5454, 0x686f, 0x686e,
-  0x686c, 0x3970, 0x4c52, 0x6866, 0x4e26, 0x3f72, 0x3038, 0x6871,
-  0x6870, 0x5740, 0x6864, 0x4d29, 0x4923, 0x3b38, 0x3d5b, 0x686a,
-  0x6862, 0x6863, 0x6865, 0x3535, 0x6867, 0x4745, 0x686b, 0x686d,
-  0x3d30, 0x572e, 0x6878, 0x6875, 0x4d30, 0x6876, 0x413a, 0x6868,
-  0x4337, 0x3070, 0x6874, 0x6877, 0x3923, 0x4952, 0x434e, 0x4e60,
-  0x4066, 0x4b73, 0x4c5d, 0x5035, 0x4a61, 0x6873, 0x3c6c, 0x6879,
-  0x435e, 0x4665, 0x3977, 0x3074, 0x5758, 0x3c2c, 0x456f, 0x4c44,
-  0x6926, 0x492d, 0x6922, 0x4062, 0x3f43, 0x687e, 0x3957, 0x687b,
-  0x6924, 0x524e, 0x6923, 0x5632, 0x5735, 0x6927, 0x3d37, 0x687c,
-  0x687d, 0x6921, 0x4d56, 0x522c, 0x6932, 0x6929, 0x342a, 0x343b,
-  0x692b, 0x5028, 0x6925, 0x337e, 0x692c, 0x4063, 0x692a, 0x6939,
-  0x6938, 0x692e, 0x687a, 0x6928, 0x3f2c, 0x6931, 0x693a, 0x4225,
-  0x692f, 0x3845, 0x692d, 0x535c, 0x6934, 0x6935, 0x6937, 0x6947,
-  0x4046, 0x6945, 0x6930, 0x693b, 0x3071, 0x693c, 0x5525, 0x693e,
-  0x693f, 0x6941, 0x4171, 0x4836, 0x693d, 0x6942, 0x6943, 0x6933,
-  0x6936, 0x3b31, 0x6940, 0x3c77, 0x6944, 0x6946, 0x694a, 0x694e,
-  0x325b, 0x6948, 0x372e, 0x694b, 0x694c, 0x5541, 0x4423, 0x6958,
-  0x3a61, 0x6949, 0x5323, 0x6954, 0x6957, 0x6950, 0x694f, 0x4741,
-  0x6952, 0x6959, 0x3348, 0x6953, 0x4f70, 0x694d, 0x3377, 0x6956,
-  0x695a, 0x4c34, 0x4f2d, 0x6955, 0x695c, 0x695b, 0x695e, 0x6951,
-  0x695d, 0x695f, 0x434a, 0x4737, 0x344e, 0x3b36, 0x5040, 0x6c23,
-  0x4537, 0x537b, 0x6c24, 0x6c25, 0x465b, 0x3f6e, 0x6c26, 0x6c27,
-  0x502a, 0x4738, 0x3868, 0x6c28, 0x5639, 0x557d, 0x344b, 0x323d,
-  0x4e64, 0x4667, 0x4d61, 0x3475, 0x4b40, 0x3c5f, 0x6962, 0x6963,
-  0x516a, 0x6965, 0x3479, 0x6964, 0x5133, 0x4a62, 0x3250, 0x6968,
-  0x6966, 0x6967, 0x5633, 0x6969, 0x696a, 0x696b, 0x696c, 0x6c2f,
-  0x4539, 0x364e, 0x5273, 0x356e, 0x3b59, 0x6c31, 0x5263, 0x4e63,
-  0x4438, 0x433f, 0x363e, 0x5839, 0x3148, 0x314f, 0x3151, 0x457e,
-  0x3150, 0x432b, 0x5531, 0x6b24, 0x3a41, 0x4c3a, 0x6b25, 0x6b27,
-  0x6b28, 0x6b26, 0x6b29, 0x6b2b, 0x6b2a, 0x6b2c, 0x4a4f, 0x5835,
-  0x4371, 0x4325, 0x4678, 0x6b2d, 0x444a, 0x6b2e, 0x6b2f, 0x6b30,
-  0x3755, 0x377a, 0x6b31, 0x4762, 0x6b33, 0x3a24, 0x5175, 0x3031,
-  0x6b32, 0x6b34, 0x352a, 0x4248, 0x4768, 0x6b35, 0x4b2e, 0x635f,
-  0x5340, 0x595b, 0x4d21, 0x562d, 0x4773, 0x5960, 0x3b63, 0x3a3a,
-  0x6362, 0x4f2b, 0x6360, 0x4947, 0x3a39, 0x5134, 0x6361, 0x486a,
-  0x392f, 0x3d2d, 0x3358, 0x4e5b, 0x4c40, 0x6368, 0x6369, 0x4d74,
-  0x4c2d, 0x3c33, 0x636a, 0x636b, 0x505a, 0x467b, 0x375a, 0x475f,
-  0x524a, 0x4e56, 0x6364, 0x636c, 0x4972, 0x3341, 0x6367, 0x4663,
-  0x6365, 0x6d33, 0x6366, 0x4933, 0x4566, 0x3935, 0x433b, 0x6363,
-  0x453d, 0x4124, 0x4259, 0x3257, 0x636d, 0x3b26, 0x442d, 0x6370,
-  0x3e5a, 0x637b, 0x6375, 0x3a53, 0x3750, 0x534d, 0x564e, 0x5553,
-  0x3941, 0x5534, 0x5158, 0x5039, 0x4776, 0x482a, 0x3234, 0x435a,
-  0x636e, 0x637c, 0x636f, 0x3728, 0x6377, 0x6374, 0x373a, 0x4522,
-  0x6376, 0x455d, 0x3228, 0x467c, 0x4460, 0x5722, 0x4061, 0x6379,
-  0x637a, 0x637d, 0x4c29, 0x6373, 0x533e, 0x3143, 0x6d34, 0x6371,
-  0x6372, 0x6378, 0x503a, 0x4643, 0x5473, 0x637e, 0x3d60, 0x6427,
-  0x6426, 0x5173, 0x6423, 0x6429, 0x4877, 0x4f34, 0x6428, 0x642e,
-  0x4265, 0x3634, 0x3d72, 0x6422, 0x3a69, 0x642a, 0x642c, 0x367d,
-  0x565e, 0x6432, 0x642d, 0x6421, 0x3b6e, 0x4d5d, 0x4722, 0x4549,
-  0x4177, 0x6424, 0x4733, 0x3d2c, 0x3d3d, 0x6425, 0x5747, 0x3262,
-  0x642b, 0x3c43, 0x642f, 0x3b6b, 0x6430, 0x4528, 0x6431, 0x5563,
-  0x3f23, 0x643a, 0x6437, 0x643b, 0x643d, 0x4656, 0x3a46, 0x404b,
-  0x3821, 0x6434, 0x5421, 0x3a23, 0x3d7e, 0x643c, 0x4d3f, 0x4479,
-  0x4f7b, 0x4966, 0x533f, 0x4f51, 0x6433, 0x6438, 0x6439, 0x4c69,
-  0x4c4e, 0x4054, 0x6435, 0x4130, 0x6436, 0x4e50, 0x3b41, 0x3553,
-  0x4873, 0x3d27, 0x5547, 0x492c, 0x3822, 0x644a, 0x644c, 0x5144,
-  0x523a, 0x3a2d, 0x3a54, 0x6443, 0x356d, 0x574d, 0x6440, 0x4f7d,
-  0x643f, 0x415c, 0x4c4a, 0x4a67, 0x4457, 0x4c54, 0x6448, 0x6447,
-  0x6441, 0x6444, 0x352d, 0x5359, 0x6446, 0x5279, 0x3463, 0x3b34,
-  0x496e, 0x343e, 0x3b6c, 0x514d, 0x4c6d, 0x6d35, 0x4765, 0x5428,
-  0x644b, 0x5755, 0x6442, 0x3d25, 0x6445, 0x5366, 0x6449, 0x4978,
-  0x643e, 0x5365, 0x477e, 0x3649, 0x547c, 0x3233, 0x6457, 0x4e42,
-  0x644d, 0x4e3c, 0x385b, 0x6456, 0x3f4a, 0x534e, 0x436c, 0x4548,
-  0x6458, 0x4d44, 0x644f, 0x6454, 0x6455, 0x3a7e, 0x4f66, 0x553f,
-  0x6452, 0x6450, 0x644e, 0x4d65, 0x4a2a, 0x4023, 0x3d26, 0x6453,
-  0x3848, 0x6467, 0x5434, 0x645b, 0x416f, 0x6469, 0x5267, 0x645f,
-  0x6460, 0x4f2a, 0x4b5d, 0x645a, 0x6451, 0x6465, 0x485c, 0x6463,
-  0x4467, 0x6462, 0x6461, 0x337c, 0x6468, 0x3561, 0x574c, 0x6466,
-  0x3b2c, 0x5752, 0x4c4f, 0x6b78, 0x6464, 0x3976, 0x564d, 0x6459,
-  0x645c, 0x427a, 0x645e, 0x424b, 0x4044, 0x4250, 0x3175, 0x4c32,
-  0x354e, 0x646f, 0x462f, 0x4661, 0x6475, 0x4229, 0x406c, 0x515d,
-  0x646e, 0x442e, 0x646d, 0x6476, 0x6474, 0x427e, 0x645d, 0x6470,
-  0x4a7e, 0x5544, 0x6471, 0x517a, 0x646b, 0x646c, 0x6472, 0x4e2b,
-  0x454b, 0x4731, 0x423a, 0x646a, 0x414a, 0x4c36, 0x3331, 0x647b,
-  0x6473, 0x647a, 0x647d, 0x647c, 0x334e, 0x333a, 0x6477, 0x6479,
-  0x6478, 0x456c, 0x403d, 0x5468, 0x6522, 0x3044, 0x6524, 0x6523,
-  0x3c24, 0x6525, 0x6521, 0x647e, 0x3174, 0x6528, 0x6529, 0x6526,
-  0x6527, 0x652a, 0x4659, 0x652b, 0x652d, 0x652c, 0x652f, 0x652e,
-  0x3960, 0x6530, 0x6531, 0x3b70, 0x6c61, 0x4370, 0x3546, 0x3b52,
-  0x4169, 0x546e, 0x3e44, 0x5746, 0x5456, 0x3253, 0x6c3e, 0x6a41,
-  0x422f, 0x3436, 0x5157, 0x3334, 0x4832, 0x3f3b, 0x6c40, 0x564b,
-  0x6c3f, 0x6c41, 0x6c45, 0x3e66, 0x4c3f, 0x455a, 0x3e3c, 0x6c46,
-  0x317e, 0x6c44, 0x5528, 0x3563, 0x6c42, 0x4136, 0x3363, 0x6c43,
-  0x4b38, 0x4043, 0x4c7e, 0x4152, 0x6c48, 0x3a66, 0x4053, 0x5672,
-  0x514c, 0x3f3e, 0x3733, 0x4955, 0x6c47, 0x3b62, 0x4c4c, 0x3d7d,
-  0x4848, 0x4f29, 0x4d69, 0x456b, 0x3769, 0x5149, 0x3a38, 0x6c49,
-  0x6c4a, 0x3b40, 0x6c4b, 0x6c62, 0x313a, 0x3759, 0x3d39, 0x6c4c,
-  0x5166, 0x6c4d, 0x483b, 0x6c51, 0x6c53, 0x3b4d, 0x3c65, 0x6c4f,
-  0x4937, 0x433a, 0x6c63, 0x5555, 0x6c50, 0x5673, 0x6c52, 0x6c4e,
-  0x6c54, 0x6c55, 0x493f, 0x4f28, 0x505c, 0x512c, 0x485b, 0x6c56,
-  0x4e75, 0x4a6c, 0x6c5a, 0x6c59, 0x303e, 0x6c57, 0x6c58, 0x6c64,
-  0x483c, 0x4147, 0x6c5c, 0x5160, 0x6c5b, 0x546f, 0x6c5d, 0x5b46,
-  0x6c5e, 0x312c, 0x6c5f, 0x6c60, 0x5726, 0x4540, 0x6b3c, 0x302e,
-  0x3e74, 0x3838, 0x522f, 0x3056, 0x3579, 0x5833, 0x4b2c, 0x635d,
-  0x462c, 0x3066, 0x4546, 0x6b39, 0x6b3a, 0x6b3b, 0x5140, 0x4523,
-  0x6a72, 0x4432, 0x4435, 0x404e, 0x6a73, 0x4441, 0x4e6f, 0x6a70,
-  0x6a74, 0x497c, 0x4723, 0x4c58, 0x4e7e, 0x6a75, 0x6a76, 0x4f2c,
-  0x4067, 0x6a77, 0x363f, 0x6a78, 0x6a79, 0x6a7a, 0x6a7b, 0x6a71,
-  0x482e, 0x616b, 0x3738, 0x616c, 0x616d, 0x5734, 0x616e, 0x616f,
-  0x534c, 0x6171, 0x3f71, 0x6170, 0x3552, 0x3137, 0x6173, 0x6172,
-  0x3a7c, 0x6174, 0x3937, 0x3e51, 0x447c, 0x3a5d, 0x3d46, 0x6175,
-  0x6177, 0x3640, 0x4f41, 0x4a28, 0x6176, 0x5578, 0x537c, 0x6178,
-  0x617c, 0x6179, 0x617a, 0x406a, 0x617e, 0x6221, 0x4047, 0x617b,
-  0x617d, 0x6225, 0x4154, 0x6223, 0x6228, 0x327e, 0x6222, 0x434d,
-  0x3242, 0x6227, 0x6226, 0x6224, 0x6229, 0x622b, 0x5049, 0x566d,
-  0x4328, 0x622c, 0x4f57, 0x622e, 0x3a6f, 0x6960, 0x622d, 0x622a,
-  0x3b2b, 0x5433, 0x6230, 0x622f, 0x6961, 0x6231, 0x6232, 0x6233,
-  0x4c21, 0x6234, 0x6235, 0x507e, 0x424a, 0x5371, 0x4d75, 0x6760,
-  0x6761, 0x3e41, 0x426a, 0x6764, 0x6763, 0x4d66, 0x4335, 0x6762,
-  0x3b37, 0x4f56, 0x4161, 0x6769, 0x6768, 0x6774, 0x3223, 0x676a,
-  0x6766, 0x676c, 0x676b, 0x493a, 0x5564, 0x6765, 0x3729, 0x6767,
-  0x676e, 0x6773, 0x5669, 0x676d, 0x6772, 0x6771, 0x3060, 0x6775,
-  0x4772, 0x4045, 0x406d, 0x4170, 0x6770, 0x6776, 0x4b76, 0x6822,
-  0x6821, 0x5741, 0x677a, 0x6779, 0x677b, 0x6777, 0x677e, 0x677d,
-  0x677c, 0x4155, 0x4759, 0x457d, 0x4543, 0x476d, 0x6823, 0x6826,
-  0x6825, 0x6827, 0x3a77, 0x6778, 0x6824, 0x4870, 0x492a, 0x6829,
-  0x3965, 0x517e, 0x6828, 0x682a, 0x682d, 0x682e, 0x4127, 0x682f,
-  0x6830, 0x682c, 0x6834, 0x682b, 0x6831, 0x6835, 0x6832, 0x6833,
-  0x6837, 0x6836, 0x394f, 0x702c, 0x702d, 0x4630, 0x306a, 0x483f,
-  0x4d5f, 0x4e4d, 0x6a31, 0x6a32, 0x463f, 0x3449, 0x6a33, 0x5567,
-  0x5d79, 0x6a34, 0x6a35, 0x6a36, 0x384a, 0x5f30, 0x4975, 0x4c70,
-  0x497a, 0x497b, 0x5343, 0x4b26, 0x3826, 0x702e, 0x3142, 0x6538,
-  0x4c6f, 0x5349, 0x3c57, 0x496a, 0x3567, 0x4450, 0x3569, 0x6e2e,
-  0x3b2d, 0x675e, 0x6e2f, 0x3329, 0x6e32, 0x6e31, 0x3d67, 0x6e30,
-  0x4e37, 0x454f, 0x4174, 0x5b4e, 0x6e33, 0x5073, 0x4254, 0x4668,
-  0x372c, 0x6e34, 0x336b, 0x3b7b, 0x6e35, 0x675c, 0x6e36, 0x3d2e,
-  0x7162, 0x4a68, 0x5249, 0x705a, 0x705b, 0x705c, 0x4146, 0x386d,
-  0x3e4e, 0x705e, 0x4531, 0x705d, 0x5171, 0x7060, 0x304c, 0x3d6a,
-  0x525f, 0x705f, 0x342f, 0x3768, 0x7066, 0x7065, 0x4623, 0x7061,
-  0x7062, 0x3443, 0x7063, 0x556e, 0x4c5b, 0x3e52, 0x3c32, 0x7068,
-  0x7067, 0x7064, 0x3221, 0x5622, 0x5338, 0x3e37, 0x482c, 0x706a,
-  0x5177, 0x564c, 0x3a5b, 0x7069, 0x363b, 0x4d34, 0x4626, 0x4121,
-  0x706b, 0x706e, 0x706d, 0x7070, 0x706c, 0x3b3e, 0x706f, 0x4c35,
-  0x7072, 0x3355, 0x3154, 0x7073, 0x7074, 0x7076, 0x3461, 0x7071,
-  0x7077, 0x707a, 0x7078, 0x7075, 0x707d, 0x7079, 0x707c, 0x707e,
-  0x7121, 0x4e41, 0x7124, 0x7123, 0x4176, 0x707b, 0x4a5d, 0x3471,
-  0x3171, 0x4c31, 0x7126, 0x7127, 0x712c, 0x554e, 0x7129, 0x4833,
-  0x7122, 0x712b, 0x7128, 0x7125, 0x712a, 0x3029, 0x712d, 0x712f,
-  0x7131, 0x7130, 0x712e, 0x5122, 0x7132, 0x7133, 0x396f, 0x3547,
-  0x3057, 0x3059, 0x546d, 0x3544, 0x3d54, 0x3b4a, 0x7027, 0x385e,
-  0x7028, 0x3028, 0x7029, 0x4d6e, 0x702a, 0x702b, 0x4624, 0x5665,
-  0x7164, 0x7165, 0x4373, 0x535b, 0x5651, 0x4568, 0x532f, 0x5266,
-  0x6e41, 0x303b, 0x5535, 0x514e, 0x3c60, 0x3a50, 0x3f78, 0x3847,
-  0x3541, 0x454c, 0x4a22, 0x434b, 0x6e42, 0x443f, 0x3622, 0x6d6c,
-  0x4324, 0x5631, 0x4f60, 0x6d6f, 0x454e, 0x365c, 0x4a21, 0x6d6d,
-  0x6d70, 0x6d71, 0x433c, 0x3f34, 0x6d6e, 0x6d74, 0x6d72, 0x5566,
-  0x435f, 0x6d73, 0x6d76, 0x5523, 0x5123, 0x6d75, 0x4350, 0x6d77,
-  0x3f74, 0x3e6c, 0x6d78, 0x4c77, 0x515b, 0x5745, 0x5576, 0x6d7c,
-  0x6d7b, 0x6d79, 0x6d7a, 0x6d7d, 0x3e26, 0x4b2f, 0x6e21, 0x363d,
-  0x6e22, 0x4440, 0x6d7e, 0x3d5e, 0x3247, 0x3643, 0x6e25, 0x583a,
-  0x6e23, 0x6e26, 0x4369, 0x3372, 0x6e27, 0x6e24, 0x4f39, 0x6e28,
-  0x4277, 0x6e29, 0x6e2a, 0x5e2b, 0x4633, 0x4746, 0x5675, 0x3549,
-  0x4b32, 0x6e2b, 0x4d2b, 0x6e2c, 0x5530, 0x6e2d, 0x7644, 0x5b47,
-  0x3423, 0x432c, 0x7166, 0x4a38, 0x5253, 0x562a, 0x6f72, 0x3e58,
-  0x3d43, 0x6f73, 0x364c, 0x302b, 0x4a2f, 0x6d36, 0x6d37, 0x4e79,
-  0x372f, 0x3f73, 0x6d38, 0x426b, 0x4930, 0x6d39, 0x4676, 0x3f33,
-  0x6d3c, 0x4578, 0x5150, 0x5729, 0x6d3a, 0x6d3b, 0x5162, 0x6d3f,
-  0x6d40, 0x6d44, 0x6d48, 0x6d46, 0x6d4e, 0x5568, 0x6d49, 0x6d47,
-  0x6d3e, 0x4569, 0x4646, 0x4969, 0x5452, 0x6d41, 0x6d42, 0x6d43,
-  0x6d45, 0x4079, 0x3421, 0x3968, 0x6d50, 0x6d51, 0x6d4a, 0x6d4f,
-  0x4e78, 0x4b36, 0x6d4c, 0x6d4d, 0x4f75, 0x6d52, 0x4172, 0x5332,
-  0x6d4b, 0x4837, 0x3c6f, 0x4570, 0x6d56, 0x356f, 0x4235, 0x302d,
-  0x4b69, 0x312e, 0x6d54, 0x4d6b, 0x3562, 0x6d55, 0x6d53, 0x6d57,
-  0x357a, 0x6d58, 0x6d59, 0x6d5c, 0x314c, 0x4576, 0x3c6e, 0x6d5a,
-  0x4c3c, 0x326a, 0x6d5b, 0x446b, 0x3445, 0x3075, 0x6d5f, 0x405a,
-  0x3468, 0x454d, 0x6d5d, 0x3f44, 0x6d5e, 0x4425, 0x6d60, 0x6d61,
-  0x6d63, 0x4157, 0x3b47, 0x3d38, 0x6d62, 0x6d64, 0x6d66, 0x6d65,
-  0x6d67, 0x4a3e, 0x6c6a, 0x4071, 0x4967, 0x6c6b, 0x466e, 0x6c6c,
-  0x466d, 0x6c6d, 0x6c70, 0x5766, 0x6c73, 0x6c71, 0x6c6e, 0x6c6f,
-  0x5723, 0x4971, 0x4b6e, 0x6c74, 0x6c72, 0x4f69, 0x6c76, 0x4631,
-  0x3c40, 0x6c75, 0x353b, 0x3b76, 0x6c77, 0x5977, 0x3d7b, 0x423b,
-  0x6c78, 0x6c79, 0x3823, 0x6c7a, 0x6c7b, 0x6c7c, 0x536d, 0x582e,
-  0x406b, 0x475d, 0x3a4c, 0x5063, 0x4b3d, 0x4d3a, 0x3851, 0x317c,
-  0x476f, 0x5656, 0x3f46, 0x436b, 0x6f75, 0x4358, 0x5762, 0x6f77,
-  0x3353, 0x4758, 0x516d, 0x5648, 0x6f78, 0x6f76, 0x3b7d, 0x3346,
-  0x3d55, 0x5246, 0x3b60, 0x4f21, 0x6f7c, 0x6f7b, 0x6f79, 0x334c,
-  0x4954, 0x4b30, 0x6f7e, 0x305e, 0x5649, 0x6f7d, 0x336d, 0x7655,
-  0x4e48, 0x7022, 0x7021, 0x353e, 0x3c5a, 0x3b7c, 0x3865, 0x4442,
-  0x7023, 0x4b6b, 0x7026, 0x5128, 0x3e3f, 0x476e, 0x7136, 0x7137,
-  0x3f55, 0x3429, 0x7138, 0x4d3b, 0x4754, 0x552d, 0x7139, 0x713a,
-  0x474f, 0x5224, 0x564f, 0x713b, 0x3d51, 0x3430, 0x3e3d, 0x345c,
-  0x4e51, 0x3f5f, 0x713d, 0x3f7a, 0x713c, 0x713f, 0x713e, 0x7140,
-  0x7141, 0x417e, 0x4122, 0x4a7a, 0x553e, 0x3e3a, 0x3e39, 0x5542,
-  0x3f22, 0x4d2f, 0x7135, 0x3d5f, 0x364b, 0x5671, 0x7343, 0x7344,
-  0x384d, 0x7346, 0x7347, 0x304a, 0x7345, 0x7349, 0x4b71, 0x734b,
-  0x5026, 0x314a, 0x7348, 0x734f, 0x3551, 0x7357, 0x7352, 0x7354,
-  0x7353, 0x377b, 0x313f, 0x734e, 0x734a, 0x355a, 0x7350, 0x7351,
-  0x7355, 0x734d, 0x3c63, 0x417d, 0x7356, 0x735a, 0x734c, 0x3548,
-  0x3d6e, 0x735c, 0x3724, 0x3f70, 0x567e, 0x4d32, 0x3470, 0x325f,
-  0x7358, 0x7359, 0x4938, 0x735d, 0x735e, 0x7361, 0x735f, 0x7363,
-  0x7362, 0x735b, 0x3f6a, 0x336f, 0x7360, 0x4729, 0x3c72, 0x736b,
-  0x393f, 0x7364, 0x322d, 0x3b7e, 0x4b63, 0x736d, 0x7369, 0x395c,
-  0x736e, 0x7365, 0x7366, 0x736a, 0x4261, 0x736c, 0x736f, 0x7368,
-  0x3c7d, 0x4f64, 0x7370, 0x7367, 0x7372, 0x572d, 0x462a, 0x7373,
-  0x7371, 0x4228, 0x385d, 0x7375, 0x7374, 0x345b, 0x7376, 0x7377,
-  0x7378, 0x403a, 0x4069, 0x4571, 0x737b, 0x737a, 0x3458, 0x737e,
-  0x7379, 0x737c, 0x737d, 0x7421, 0x7423, 0x3b49, 0x7422, 0x7424,
-  0x323e, 0x7426, 0x7425, 0x3c2e, 0x4357, 0x5961, 0x4060, 0x744c,
-  0x5751, 0x375b, 0x744e, 0x4123, 0x4649, 0x3456, 0x5533, 0x7450,
-  0x744f, 0x7451, 0x4b5a, 0x7452, 0x5441, 0x5660, 0x3760, 0x4138,
-  0x413b, 0x7453, 0x3e2c, 0x3462, 0x7454, 0x7455, 0x3e2b, 0x7456,
-  0x745b, 0x7457, 0x745a, 0x3a7d, 0x7458, 0x7459, 0x3862, 0x4c47,
-  0x745c, 0x325a, 0x4353, 0x5463, 0x3f37, 0x745d, 0x4534, 0x7469,
-  0x4f35, 0x4e49, 0x4b58, 0x4b77, 0x3d74, 0x574f, 0x405b, 0x5075,
-  0x746a, 0x746b, 0x746c, 0x7763, 0x3731, 0x746d, 0x576b, 0x746e,
-  0x6679, 0x3e40, 0x667a, 0x3a6c, 0x667b, 0x4f4b, 0x667c, 0x543c,
-  0x3c36, 0x667d, 0x667e, 0x3c4d, 0x4852, 0x4e33, 0x6721, 0x343f,
-  0x6722, 0x4934, 0x3859, 0x4449, 0x575d, 0x425a, 0x3757, 0x563d,
-  0x4e46, 0x3744, 0x4526, 0x6723, 0x4f5f, 0x6724, 0x6725, 0x6726,
-  0x4137, 0x5769, 0x4970, 0x4f38, 0x562f, 0x5655, 0x6727, 0x306d,
-  0x6728, 0x6729, 0x495c, 0x526f, 0x3e2d, 0x672a, 0x3073, 0x485e,
-  0x3d61, 0x672b, 0x4846, 0x672c, 0x3b66, 0x3878, 0x5124, 0x672d,
-  0x4267, 0x3e78, 0x3d4a, 0x4d33, 0x672e, 0x672f, 0x3e6e, 0x5065,
-  0x4b67, 0x4c50, 0x3c4c, 0x6730, 0x3c28, 0x5077, 0x6731, 0x5078,
-  0x6732, 0x6733, 0x3442, 0x6734, 0x6735, 0x497e, 0x4e2c, 0x4360,
-  0x6737, 0x3141, 0x3371, 0x6738, 0x6739, 0x575b, 0x5540, 0x673a,
-  0x424c, 0x573a, 0x673b, 0x673c, 0x673d, 0x3c6a, 0x4365, 0x4042,
-  0x673e, 0x673f, 0x3c29, 0x6740, 0x6741, 0x6736, 0x3650, 0x6742,
-  0x6743, 0x6744, 0x3b3a, 0x355e, 0x4246, 0x3160, 0x6745, 0x5435,
-  0x6746, 0x383f, 0x6748, 0x6747, 0x376c, 0x6749, 0x3278, 0x674a,
-  0x674b, 0x674c, 0x674d, 0x674e, 0x674f, 0x6750, 0x5327, 0x4b75,
-  0x6751, 0x6752, 0x6753, 0x6754, 0x4949, 0x6755, 0x6756, 0x6757,
-  0x6758, 0x6759, 0x3d49, 0x675a, 0x733e, 0x3857, 0x4831, 0x733f,
-  0x7340, 0x7341, 0x395e, 0x4d78, 0x5868, 0x3a31, 0x425e, 0x6e37,
-  0x3723, 0x6e39, 0x6e38, 0x3055, 0x6e3b, 0x5556, 0x576f, 0x5643,
-  0x6e3d, 0x4a70, 0x6e3c, 0x6e3e, 0x6e40, 0x6e3f, 0x5172, 0x473c,
-  0x4340, 0x3861, 0x4167, 0x7446, 0x505f, 0x7447, 0x4f5b, 0x483a,
-  0x7448, 0x7449, 0x744a, 0x744b, 0x597a, 0x387e, 0x6571, 0x5370,
-  0x7460, 0x4e4c, 0x3361, 0x7134, 0x526e, 0x7461, 0x4f68, 0x7462,
-  0x474c, 0x3554, 0x3464, 0x7464, 0x7463, 0x7465, 0x7466, 0x7467,
-  0x3a32, 0x303f, 0x7468, 0x372d, 0x526d, 0x522b, 0x404f, 0x3f3c,
-  0x6b23, 0x555f, 0x6a48, 0x7173, 0x3678, 0x4b23, 0x444d, 0x7167,
-  0x7168, 0x387b, 0x7169, 0x3a44, 0x5445, 0x3052, 0x716a, 0x716b,
-  0x716c, 0x716d, 0x716e, 0x716f, 0x7171, 0x7170, 0x4555, 0x7172,
-  0x367a, 0x7174, 0x522e, 0x5e47, 0x4b4a, 0x335c, 0x3522, 0x3922,
-  0x4474, 0x7175, 0x7176, 0x4144, 0x417b, 0x5630, 0x7177, 0x7178,
-  0x412a, 0x4638, 0x3e5b, 0x7179, 0x344f, 0x717a, 0x6d32, 0x6d31,
-  0x4b60, 0x525e, 0x4b41, 0x5558, 0x4862, 0x405f, 0x3c21, 0x6b41,
-  0x5024, 0x5662, 0x3647, 0x3858, 0x6b40, 0x384e, 0x6b3f, 0x3326,
-  0x3949, 0x562b, 0x3774, 0x374a, 0x3c67, 0x373e, 0x6b46, 0x6b47,
-  0x3039, 0x3f4f, 0x6b45, 0x537d, 0x6b48, 0x6b49, 0x374e, 0x6b42,
-  0x6b44, 0x4976, 0x5657, 0x554d, 0x5032, 0x6b4f, 0x4e38, 0x6b50,
-  0x3528, 0x3133, 0x6b52, 0x4c25, 0x4556, 0x6b53, 0x6b51, 0x455f,
-  0x6b4e, 0x4a24, 0x6b55, 0x307b, 0x3a7a, 0x5837, 0x7163, 0x6b4a,
-  0x6b4b, 0x6b4c, 0x6b4d, 0x6b56, 0x6640, 0x6b59, 0x3f68, 0x5248,
-  0x6b57, 0x6b5c, 0x386c, 0x6b58, 0x3d3a, 0x5058, 0x3037, 0x6b5d,
-  0x445c, 0x562c, 0x3460, 0x4276, 0x3c39, 0x6b5a, 0x6b5b, 0x5460,
-  0x466a, 0x4454, 0x6b5f, 0x4527, 0x5975, 0x3231, 0x6b64, 0x3d45,
-  0x6b62, 0x6b63, 0x382c, 0x4d51, 0x6b65, 0x6b61, 0x4133, 0x4622,
-  0x4c73, 0x6b66, 0x4030, 0x5238, 0x6b67, 0x382f, 0x382d, 0x6b68,
-  0x473b, 0x4d73, 0x6b6a, 0x6b6b, 0x6b6d, 0x5048, 0x6b72, 0x6b6e,
-  0x6b71, 0x4879, 0x517c, 0x6b6c, 0x6b69, 0x3839, 0x4f59, 0x4465,
-  0x6b6f, 0x6b70, 0x4c5a, 0x4d48, 0x3072, 0x6b76, 0x6b75, 0x3232,
-  0x3860, 0x6b77, 0x316c, 0x4c45, 0x4424, 0x4f25, 0x6b79, 0x6c22,
-  0x4572, 0x6b7a, 0x4945, 0x625f, 0x6b7e, 0x4d4e, 0x6c21, 0x315b,
-  0x5337, 0x525c, 0x6b7d, 0x6b7b, 0x333c, 0x6a30, 0x5754, 0x742b,
-  0x3374, 0x5641, 0x5642, 0x5569, 0x3e4a, 0x7427, 0x5228, 0x7428,
-  0x7429, 0x742a, 0x3e4b, 0x535f, 0x4960, 0x4961, 0x7342, 0x4a66,
-  0x4c72, 0x6236, 0x4b34, 0x4e68, 0x565b, 0x742d, 0x742e, 0x742f,
-  0x7432, 0x3a3d, 0x7433, 0x3063, 0x7430, 0x7431, 0x3d22, 0x3255,
-  0x7436, 0x7437, 0x3666, 0x3230, 0x4f4f, 0x7434, 0x342c, 0x7435,
-  0x7438, 0x7439, 0x4d27, 0x743a, 0x743b, 0x743c, 0x4b52, 0x743d,
-  0x743e, 0x743f, 0x745e, 0x413c, 0x3c68, 0x492b, 0x515e, 0x6575,
-  0x5c33, 0x5255, 0x5c34, 0x302c, 0x5c35, 0x3d5a, 0x5c39, 0x5842,
-  0x5c37, 0x5373, 0x4956, 0x5c3a, 0x5c36, 0x5c3b, 0x4322, 0x5c3c,
-  0x5c45, 0x5c3d, 0x4e5f, 0x5625, 0x5c4f, 0x5c4d, 0x5c52, 0x3d66,
-  0x422b, 0x5c38, 0x5c4b, 0x5c4e, 0x5c3e, 0x3752, 0x3045, 0x5c47,
-  0x503e, 0x5c41, 0x3b28, 0x373c, 0x5c4c, 0x5c46, 0x5c3f, 0x475b,
-  0x513f, 0x5c40, 0x5c4a, 0x5c50, 0x4e2d, 0x5c42, 0x5c43, 0x5c48,
-  0x5c49, 0x3254, 0x5c51, 0x4b55, 0x5437, 0x5c5b, 0x5c5f, 0x4c26,
-  0x5c66, 0x4367, 0x5c5c, 0x3f41, 0x5c59, 0x307a, 0x3936, 0x5c65,
-  0x5c53, 0x5c44, 0x5c56, 0x4874, 0x3f60, 0x493b, 0x313d, 0x5322,
-  0x5c5a, 0x5c55, 0x463b, 0x5c5e, 0x5742, 0x432f, 0x3736, 0x4751,
-  0x4329, 0x5c62, 0x5c58, 0x5c6b, 0x5c54, 0x5c5d, 0x3e25, 0x5c57,
-  0x5c60, 0x5c63, 0x5c64, 0x5c78, 0x5c61, 0x5d22, 0x5c67, 0x3c6b,
-  0x3444, 0x4323, 0x3267, 0x5c7a, 0x5c72, 0x5c6f, 0x5c7c, 0x5c6e,
-  0x5270, 0x3268, 0x4857, 0x4863, 0x5c7b, 0x5c6d, 0x5c77, 0x5c75,
-  0x3e23, 0x5c74, 0x325d, 0x5c73, 0x3c76, 0x5c68, 0x3b44, 0x4073,
-  0x3c54, 0x5c69, 0x5c6a, 0x5c71, 0x5c76, 0x5c79, 0x3534, 0x4859,
-  0x3b67, 0x5c7e, 0x5c7d, 0x532b, 0x5d21, 0x5d23, 0x5d25, 0x5271,
-  0x5d24, 0x5d26, 0x5d27, 0x5229, 0x3a49, 0x5d29, 0x5d36, 0x5d31,
-  0x5d34, 0x5d30, 0x464e, 0x4072, 0x492f, 0x5c6c, 0x5d2e, 0x5d37,
-  0x5c70, 0x5d2f, 0x5d38, 0x5d2c, 0x5d39, 0x5d33, 0x5d2d, 0x442a,
-  0x5d28, 0x4033, 0x412b, 0x5d2a, 0x5d2b, 0x5d32, 0x3b71, 0x5d35,
-  0x5328, 0x5d3a, 0x5d3b, 0x4327, 0x5d52, 0x5d3c, 0x5d51, 0x393d,
-  0x3e55, 0x3e7a, 0x3a4a, 0x5d4a, 0x5d45, 0x5d3f, 0x324b, 0x5d43,
-  0x5d4b, 0x3224, 0x5d55, 0x5d3e, 0x4650, 0x5d50, 0x5d54, 0x4162,
-  0x3746, 0x5d4e, 0x5d4f, 0x5d44, 0x5d3d, 0x5d4d, 0x4c51, 0x5d49,
-  0x5d42, 0x4348, 0x463c, 0x4e2e, 0x5d4c, 0x5d48, 0x5d41, 0x5d46,
-  0x425c, 0x5329, 0x532a, 0x5d53, 0x4f74, 0x4878, 0x5d66, 0x5d47,
-  0x5d60, 0x4264, 0x5d61, 0x5d57, 0x5678, 0x5d59, 0x5d58, 0x3870,
-  0x5d56, 0x464f, 0x362d, 0x5d62, 0x3a79, 0x5461, 0x5d67, 0x3450,
-  0x5d5a, 0x3f7b, 0x5d63, 0x5d5f, 0x5d5d, 0x3559, 0x5d5b, 0x5d5c,
-  0x5d5e, 0x3d2f, 0x5d64, 0x5d65, 0x5d75, 0x4349, 0x4b62, 0x5d72,
-  0x5861, 0x4651, 0x5d74, 0x5574, 0x5d73, 0x5d70, 0x5d6c, 0x5d6f,
-  0x5d68, 0x506e, 0x4858, 0x5d6e, 0x5d69, 0x5d6a, 0x4b72, 0x5d6d,
-  0x314d, 0x4036, 0x3c3b, 0x5d71, 0x5d77, 0x5d76, 0x5d6b, 0x456e,
-  0x5d7b, 0x5e24, 0x5e23, 0x5d78, 0x436f, 0x427b, 0x5561, 0x4e35,
-  0x5d7d, 0x324c, 0x4468, 0x4a5f, 0x473e, 0x5d7a, 0x5d7c, 0x5d7e,
-  0x5e22, 0x302a, 0x314e, 0x5e2c, 0x5e26, 0x3d36, 0x486f, 0x5e21,
-  0x5e25, 0x5e29, 0x5e28, 0x5e27, 0x5e2d, 0x544c, 0x5e33, 0x5e2a,
-  0x5e2e, 0x4059, 0x3121, 0x5e36, 0x5e31, 0x5e32, 0x5126, 0x5e35,
-  0x5e2f, 0x5e30, 0x503d, 0x5e34, 0x4a6d, 0x5e39, 0x5e38, 0x5e37,
-  0x5e3b, 0x3d65, 0x3258, 0x436a, 0x5e3a, 0x453a, 0x5e3c, 0x4c59,
-  0x372a, 0x5465, 0x5e3d, 0x5e3f, 0x4422, 0x5e41, 0x5e3e, 0x5e40,
-  0x553a, 0x5e42, 0x722e, 0x3b22, 0x4232, 0x4530, 0x4247, 0x722f,
-  0x5069, 0x535d, 0x6b3d, 0x3366, 0x7230, 0x7231, 0x4a2d, 0x3a67,
-  0x7233, 0x7235, 0x7234, 0x4b64, 0x4f3a, 0x7232, 0x4a34, 0x524f,
-  0x426c, 0x4e43, 0x7238, 0x3076, 0x7237, 0x723e, 0x324f, 0x5141,
-  0x723a, 0x723c, 0x5469, 0x723b, 0x7236, 0x723f, 0x723d, 0x7239,
-  0x7247, 0x7244, 0x7246, 0x724a, 0x7242, 0x7240, 0x7245, 0x567b,
-  0x7241, 0x4779, 0x495f, 0x7248, 0x3946, 0x3530, 0x7243, 0x7249,
-  0x7250, 0x7256, 0x3b57, 0x7255, 0x4d5c, 0x566b, 0x7252, 0x7254,
-  0x3872, 0x724b, 0x724e, 0x4279, 0x555d, 0x724c, 0x724d, 0x724f,
-  0x7253, 0x7259, 0x533c, 0x366a, 0x4a71, 0x3764, 0x7257, 0x7258,
-  0x725a, 0x725d, 0x725b, 0x725c, 0x5151, 0x7251, 0x4d49, 0x4e4f,
-  0x5629, 0x7263, 0x435b, 0x7260, 0x402f, 0x726c, 0x725e, 0x7261,
-  0x7268, 0x7262, 0x7267, 0x7266, 0x7269, 0x725f, 0x7264, 0x726a,
-  0x532c, 0x7265, 0x3275, 0x7272, 0x502b, 0x7275, 0x3b48, 0x7279,
-  0x7270, 0x7276, 0x7278, 0x727a, 0x7273, 0x7271, 0x3a7b, 0x357b,
-  0x726f, 0x7277, 0x726d, 0x726e, 0x726b, 0x7326, 0x7323, 0x7322,
-  0x7274, 0x485a, 0x727b, 0x7325, 0x4378, 0x727d, 0x7327, 0x7329,
-  0x7324, 0x727c, 0x732b, 0x732a, 0x425d, 0x732e, 0x7330, 0x7321,
-  0x7331, 0x732c, 0x732f, 0x727e, 0x732d, 0x7332, 0x7334, 0x7328,
-  0x7333, 0x7335, 0x5037, 0x7338, 0x5979, 0x7339, 0x7337, 0x4864,
-  0x7336, 0x733a, 0x733b, 0x3440, 0x6e43, 0x733c, 0x733d, 0x512a,
-  0x742c, 0x5046, 0x5050, 0x515c, 0x4f4e, 0x3d56, 0x5143, 0x3a62,
-  0x6169, 0x5242, 0x7142, 0x3239, 0x316d, 0x7143, 0x4940, 0x3344,
-  0x5972, 0x4b25, 0x7144, 0x5654, 0x7145, 0x7440, 0x7146, 0x542c,
-  0x7147, 0x3040, 0x7441, 0x7442, 0x347c, 0x455b, 0x4c3b, 0x5064,
-  0x4d60, 0x7148, 0x5973, 0x313b, 0x4f2e, 0x3824, 0x714a, 0x714b,
-  0x3243, 0x4151, 0x5730, 0x7149, 0x714c, 0x714e, 0x5976, 0x5261,
-  0x5423, 0x7443, 0x4839, 0x7444, 0x714d, 0x714f, 0x3f63, 0x7150,
-  0x7154, 0x7156, 0x7151, 0x4951, 0x4561, 0x4263, 0x397c, 0x7153,
-  0x7155, 0x3953, 0x715b, 0x3a56, 0x307d, 0x7159, 0x7158, 0x7152,
-  0x715a, 0x7157, 0x486c, 0x4d4a, 0x715d, 0x653d, 0x715c, 0x715e,
-  0x715f, 0x4f65, 0x7445, 0x3d73, 0x7160, 0x7161, 0x4e77, 0x522a,
-  0x717b, 0x3832, 0x3c7b, 0x395b, 0x3966, 0x4359, 0x4a53, 0x6a68,
-  0x4040, 0x3e75, 0x6a69, 0x6a6a, 0x6a6b, 0x6a6c, 0x6a6d, 0x6a6e,
-  0x6a6f, 0x3d47, 0x757b, 0x757d, 0x757e, 0x757c, 0x3d62, 0x7621,
-  0x3425, 0x7622, 0x7623, 0x6c32, 0x5154, 0x596a, 0x7624, 0x6e3a,
-  0x5532, 0x537e, 0x4c5c, 0x4a44, 0x6540, 0x7625, 0x3e2f, 0x4629,
-  0x5a25, 0x3c46, 0x3629, 0x383c, 0x484f, 0x3c25, 0x5a26, 0x5a27,
-  0x4c56, 0x4843, 0x5a28, 0x467d, 0x5135, 0x5269, 0x5136, 0x3c47,
-  0x3d32, 0x3b64, 0x5a29, 0x5a2a, 0x5148, 0x5a2b, 0x506d, 0x366f,
-  0x425b, 0x4b4f, 0x376d, 0x4968, 0x3743, 0x3e77, 0x5624, 0x5a2c,
-  0x5a2d, 0x4640, 0x5767, 0x4a36, 0x5529, 0x4b5f, 0x556f, 0x5a2e,
-  0x565f, 0x344a, 0x5a30, 0x5a2f, 0x526b, 0x5a31, 0x5a32, 0x5a33,
-  0x4a54, 0x5a34, 0x4a2b, 0x5a35, 0x5a36, 0x334f, 0x566f, 0x5a37,
-  0x3b30, 0x352e, 0x5a38, 0x5a39, 0x396e, 0x512f, 0x5268, 0x5a3a,
-  0x3843, 0x4f6a, 0x326f, 0x5a3b, 0x5a3c, 0x3d6b, 0x4e5c, 0x536f,
-  0x5a3d, 0x4e73, 0x5a3e, 0x5355, 0x3b65, 0x5a3f, 0x4b35, 0x4b50,
-  0x5a40, 0x476b, 0x566e, 0x5a41, 0x4535, 0x3641, 0x5a42, 0x374c,
-  0x3f4e, 0x5a43, 0x5a44, 0x4b2d, 0x5a45, 0x3577, 0x5a46, 0x4142,
-  0x573b, 0x5a47, 0x4c38, 0x526a, 0x4431, 0x5a48, 0x357d, 0x3b51,
-  0x5a49, 0x5033, 0x5a4a, 0x5a4b, 0x4e3d, 0x5a4c, 0x5a4d, 0x5a4e,
-  0x3277, 0x5a51, 0x5a4f, 0x5168, 0x5a50, 0x4355, 0x5a52, 0x5a53,
-  0x5a54, 0x5a55, 0x503b, 0x5225, 0x3079, 0x5a56, 0x472b, 0x5a57,
-  0x3d77, 0x4321, 0x5a58, 0x5a59, 0x437d, 0x4c37, 0x5a5a, 0x5a5b,
-  0x403e, 0x4657, 0x5a5c, 0x5a5d, 0x4734, 0x5a5e, 0x5a5f, 0x3948,
-  0x3b6d, 0x3639, 0x7478, 0x7479, 0x4d63, 0x7539, 0x6b60, 0x4f73,
-  0x3b3f, 0x3a40, 0x5425, 0x6159, 0x7574, 0x312a, 0x3272, 0x7575,
-  0x7577, 0x3a51, 0x7576, 0x4332, 0x7579, 0x7578, 0x3134, 0x556a,
-  0x383a, 0x3931, 0x3246, 0x5470, 0x4f4d, 0x305c, 0x554b, 0x3b75,
-  0x564a, 0x3737, 0x4c30, 0x4636, 0x3161, 0x393a, 0x567c, 0x3961,
-  0x3721, 0x3c7a, 0x6a5a, 0x6a5b, 0x4c79, 0x3973, 0x6a5c, 0x347b,
-  0x4333, 0x3751, 0x3a58, 0x6a5d, 0x5474, 0x6a5e, 0x3c56, 0x3b5f,
-  0x6a5f, 0x415e, 0x4238, 0x545f, 0x574a, 0x6a60, 0x6a61, 0x6a64,
-  0x6a62, 0x6a63, 0x495e, 0x3833, 0x3644, 0x6a65, 0x4a6a, 0x494d,
-  0x344d, 0x6259, 0x4562, 0x6a66, 0x4035, 0x5738, 0x6a67, 0x572c,
-  0x487c, 0x5853, 0x584d, 0x545e, 0x5479, 0x4944, 0x532e, 0x3853,
-  0x3360, 0x4962, 0x7476, 0x3a55, 0x7477, 0x575f, 0x7471, 0x3830,
-  0x5554, 0x384f, 0x4670, 0x3343, 0x7472, 0x332c, 0x543d, 0x4777,
-  0x7474, 0x7473, 0x4c4b, 0x4824, 0x7475, 0x5763, 0x453f, 0x7540,
-  0x753b, 0x7543, 0x7542, 0x563a, 0x7541, 0x543e, 0x7544, 0x754c,
-  0x304f, 0x3578, 0x7549, 0x754a, 0x455c, 0x7545, 0x7546, 0x7547,
-  0x754b, 0x3e60, 0x7548, 0x387a, 0x7550, 0x7553, 0x3f67, 0x3972,
-  0x753c, 0x754d, 0x4237, 0x4c78, 0x3c79, 0x754e, 0x754f, 0x7551,
-  0x3665, 0x7552, 0x7555, 0x753d, 0x7554, 0x533b, 0x336c, 0x4c24,
-  0x7556, 0x7557, 0x3e61, 0x7558, 0x4c5f, 0x755b, 0x3248, 0x5759,
-  0x7559, 0x755a, 0x755c, 0x7562, 0x7560, 0x755f, 0x755d, 0x7561,
-  0x755e, 0x7564, 0x7565, 0x4c63, 0x653f, 0x3538, 0x7563, 0x7568,
-  0x4c23, 0x7566, 0x7567, 0x753e, 0x3144, 0x753f, 0x3545, 0x3264,
-  0x756c, 0x7569, 0x3657, 0x756d, 0x756a, 0x756b, 0x345a, 0x546a,
-  0x756e, 0x3379, 0x756f, 0x7571, 0x7570, 0x7572, 0x7573, 0x496d,
-  0x392a, 0x477b, 0x3663, 0x4c49, 0x6a26, 0x3335, 0x547e, 0x396c,
-  0x5079, 0x696d, 0x572a, 0x696e, 0x4256, 0x486d, 0x3a64, 0x696f,
-  0x6970, 0x6971, 0x5661, 0x6972, 0x6973, 0x6975, 0x6974, 0x6976,
-  0x6977, 0x4761, 0x6978, 0x5458, 0x6979, 0x3d4e, 0x697a, 0x697b,
-  0x3d4f, 0x697c, 0x3828, 0x413e, 0x697d, 0x3132, 0x3b54, 0x3975,
-  0x697e, 0x6a21, 0x6a22, 0x6a23, 0x3778, 0x3c2d, 0x4a64, 0x604e,
-  0x542f, 0x4f3d, 0x5537, 0x6a24, 0x555e, 0x6a25, 0x5041, 0x393c,
-  0x3447, 0x3159, 0x4031, 0x3166, 0x3167, 0x3168, 0x333d, 0x4868,
-  0x6541, 0x315f, 0x4149, 0x346f, 0x4728, 0x5358, 0x4679, 0x5138,
-  0x397d, 0x4275, 0x532d, 0x544b, 0x3d7c, 0x6542, 0x3735, 0x6543,
-  0x3b39, 0x5562, 0x3d78, 0x5436, 0x4e25, 0x412c, 0x3359, 0x4c76,
-  0x6546, 0x6544, 0x6548, 0x654a, 0x6547, 0x354f, 0x4648, 0x357c,
-  0x6545, 0x4a76, 0x6549, 0x4354, 0x3145, 0x3c23, 0x5737, 0x4d4b,
-  0x4b4d, 0x4a4a, 0x4c53, 0x654c, 0x654b, 0x4466, 0x5121, 0x5137,
-  0x654d, 0x6550, 0x4d38, 0x5670, 0x654f, 0x355d, 0x4d3e, 0x6551,
-  0x363a, 0x4d28, 0x3964, 0x4a45, 0x3351, 0x4b59, 0x546c, 0x6552,
-  0x376a, 0x654e, 0x6555, 0x347e, 0x6556, 0x6553, 0x6554, 0x525d,
-  0x425f, 0x3146, 0x5362, 0x365d, 0x4b6c, 0x6557, 0x5376, 0x3169,
-  0x3674, 0x655a, 0x6558, 0x6559, 0x3540, 0x5245, 0x655c, 0x655e,
-  0x655d, 0x4732, 0x5223, 0x655b, 0x5462, 0x555a, 0x6560, 0x5771,
-  0x6561, 0x315c, 0x517b, 0x6562, 0x6564, 0x6563, 0x6565, 0x5258,
-  0x354b, 0x675f, 0x5a75, 0x5a78, 0x5a76, 0x5a77, 0x5a7a, 0x504f,
-  0x4447, 0x306e, 0x5030, 0x5a79, 0x534a, 0x3a2a, 0x5b22, 0x4771,
-  0x5a7c, 0x5a7b, 0x495b, 0x5a7d, 0x5b21, 0x575e, 0x5a7e, 0x415a,
-  0x5b25, 0x5374, 0x5b27, 0x5b24, 0x5b28, 0x3d3c, 0x4049, 0x5b23,
-  0x5b26, 0x5623, 0x5b29, 0x5b2d, 0x5b2e, 0x5b2c, 0x3a42, 0x3f24,
-  0x5b2b, 0x5b2a, 0x5447, 0x323f, 0x5b2f, 0x3979, 0x5b30, 0x333b,
-  0x3526, 0x363c, 0x5b31, 0x3675, 0x5b32, 0x3149, 0x5b34, 0x5b33,
-  0x5b35, 0x5b37, 0x5b36, 0x5b38, 0x5b39, 0x5b3a, 0x534f, 0x747a,
-  0x4775, 0x5743, 0x4564, 0x747c, 0x747d, 0x747b, 0x3e46, 0x506f,
-  0x3753, 0x544d, 0x4c2a, 0x7522, 0x7521, 0x3a28, 0x747e, 0x4b56,
-  0x7524, 0x4052, 0x336a, 0x4d2a, 0x7525, 0x7523, 0x3d34, 0x7528,
-  0x7529, 0x3d4d, 0x4338, 0x3f61, 0x4b61, 0x752a, 0x7526, 0x7527,
-  0x4470, 0x752c, 0x343c, 0x576d, 0x3457, 0x752b, 0x752e, 0x752d,
-  0x752f, 0x5051, 0x4351, 0x4829, 0x7530, 0x7531, 0x7532, 0x7533,
-  0x7534, 0x7535, 0x7537, 0x7536, 0x7538, 0x3249, 0x5354, 0x4a4d,
-  0x406f, 0x5658, 0x5230, 0x413f, 0x3d70, 0x382a, 0x3c78, 0x7646,
-  0x7647, 0x7648, 0x7649, 0x764a, 0x764c, 0x764b, 0x7769, 0x764d,
-  0x764e, 0x6e44, 0x6e45, 0x6e46, 0x556b, 0x3624, 0x6e48, 0x6e47,
-  0x6e49, 0x6e4a, 0x4725, 0x6e4b, 0x6e4c, 0x3730, 0x3576, 0x6e4d,
-  0x6e4f, 0x6e4e, 0x3846, 0x6e50, 0x6e51, 0x6e52, 0x365b, 0x332e,
-  0x5653, 0x4446, 0x3135, 0x3856, 0x6e53, 0x6e54, 0x543f, 0x4755,
-  0x3e7b, 0x4e59, 0x3933, 0x6e56, 0x6e55, 0x6e58, 0x6e57, 0x4525,
-  0x6e59, 0x6e5a, 0x472e, 0x6e5b, 0x472f, 0x6e5c, 0x3227, 0x6e5d,
-  0x6e5e, 0x6e5f, 0x6e60, 0x6e61, 0x576a, 0x6e62, 0x6e63, 0x3c58,
-  0x6e64, 0x534b, 0x4c7a, 0x322c, 0x4165, 0x6e65, 0x4726, 0x432d,
-  0x6e66, 0x6e67, 0x6e68, 0x6e69, 0x6e6a, 0x6e6b, 0x6e6c, 0x6e6d,
-  0x6e6e, 0x6e6f, 0x6e70, 0x6e71, 0x6e72, 0x6e74, 0x6e73, 0x6e75,
-  0x4d2d, 0x4241, 0x6e76, 0x6e77, 0x6e78, 0x5521, 0x6e79, 0x4f33,
-  0x6e7a, 0x6e7b, 0x6e7c, 0x6e7d, 0x6f21, 0x6e7e, 0x6f22, 0x3875,
-  0x437a, 0x6f23, 0x6f24, 0x3d42, 0x523f, 0x3279, 0x6f25, 0x6f26,
-  0x6f27, 0x5278, 0x6f28, 0x567d, 0x6f29, 0x464c, 0x6f2a, 0x6f2b,
-  0x4134, 0x6f2c, 0x4f7a, 0x4b78, 0x6f2e, 0x6f2d, 0x337a, 0x3978,
-  0x6f2f, 0x6f30, 0x5062, 0x6f31, 0x6f32, 0x3766, 0x503f, 0x6f33,
-  0x6f34, 0x6f35, 0x4871, 0x4c60, 0x6f36, 0x6f37, 0x6f38, 0x6f39,
-  0x6f3a, 0x5560, 0x6f3b, 0x346d, 0x432a, 0x6f3c, 0x6f3d, 0x6f3e,
-  0x6f3f, 0x4e7d, 0x6f40, 0x4260, 0x3438, 0x5736, 0x3d75, 0x4f47,
-  0x6f43, 0x6f41, 0x6f42, 0x6f44, 0x3627, 0x3c7c, 0x3e62, 0x434c,
-  0x6f45, 0x6f46, 0x6f47, 0x6f4f, 0x6f48, 0x6f49, 0x6f4a, 0x4742,
-  0x6f71, 0x364d, 0x6f4b, 0x6f4c, 0x6f4d, 0x3646, 0x433e, 0x6f4e,
-  0x6f50, 0x6f51, 0x6f52, 0x5572, 0x6f53, 0x4477, 0x6f54, 0x4478,
-  0x6f55, 0x6f56, 0x3864, 0x3077, 0x6f57, 0x6f58, 0x6f59, 0x6f5a,
-  0x6f5b, 0x6f5c, 0x6f5d, 0x6f5e, 0x3e35, 0x6f61, 0x6f5f, 0x6f60,
-  0x6f62, 0x6f63, 0x414d, 0x6f64, 0x6f65, 0x6f66, 0x6f67, 0x6f68,
-  0x6f69, 0x6f6a, 0x6f6b, 0x6f6c, 0x4058, 0x6f6d, 0x412d, 0x6f6e,
-  0x6f6f, 0x6f70, 0x4f62, 0x3324, 0x4345, 0x6345, 0x4941, 0x6346,
-  0x3155, 0x4e4a, 0x3433, 0x4872, 0x6347, 0x4f50, 0x6348, 0x3c64,
-  0x6349, 0x634a, 0x4346, 0x5522, 0x4456, 0x396b, 0x4e45, 0x634b,
-  0x4376, 0x634c, 0x3727, 0x3873, 0x3a52, 0x634d, 0x634e, 0x5444,
-  0x634f, 0x6350, 0x514b, 0x6351, 0x6352, 0x6353, 0x6354, 0x5156,
-  0x6355, 0x327b, 0x403b, 0x6356, 0x402b, 0x6357, 0x6358, 0x6359,
-  0x635a, 0x635b, 0x3837, 0x5a62, 0x3653, 0x5a64, 0x5a63, 0x5a66,
-  0x486e, 0x5a65, 0x3740, 0x5174, 0x5275, 0x5573, 0x3d57, 0x5768,
-  0x5a68, 0x5a67, 0x3022, 0x4d53, 0x5a69, 0x383d, 0x3c4a, 0x423d,
-  0x4224, 0x3342, 0x5a6a, 0x422a, 0x4430, 0x3d35, 0x4f5e, 0x5a6b,
-  0x4942, 0x315d, 0x5a6c, 0x3638, 0x543a, 0x337d, 0x5a6d, 0x5449,
-  0x4f55, 0x4563, 0x5a6e, 0x5a6f, 0x5a70, 0x416a, 0x4c55, 0x4f5d,
-  0x5367, 0x4221, 0x5a71, 0x4b65, 0x5a72, 0x4b66, 0x527e, 0x3874,
-  0x5a73, 0x302f, 0x4f36, 0x554f, 0x4b6d, 0x5a74, 0x6344, 0x4125,
-  0x763f, 0x7640, 0x7641, 0x4451, 0x4838, 0x5163, 0x505b, 0x5145,
-  0x3c2f, 0x394d, 0x6f74, 0x3446, 0x533a, 0x7642, 0x337b, 0x7643,
-  0x3571, 0x7645, 0x536a, 0x7627, 0x5129, 0x7629, 0x7628, 0x4163,
-  0x4057, 0x3122, 0x4e6d, 0x5068, 0x762b, 0x4f76, 0x762a, 0x5570,
-  0x762c, 0x4339, 0x3b74, 0x762e, 0x762d, 0x445e, 0x4158, 0x4b2a,
-  0x4f3c, 0x762f, 0x7630, 0x7631, 0x4236, 0x3054, 0x4579, 0x7632,
-  0x4760, 0x7626, 0x3e38, 0x3e32, 0x3565, 0x3747, 0x3f3f, 0x4352,
-  0x4366, 0x584c, 0x386f, 0x3d79, 0x5125, 0x3050, 0x7730, 0x7731,
-  0x502c, 0x3030, 0x7732, 0x7733, 0x7734, 0x474a, 0x3e4f, 0x7737,
-  0x7736, 0x315e, 0x7735, 0x7738, 0x7739, 0x4e24, 0x484d, 0x3a2b,
-  0x6838, 0x6839, 0x683a, 0x3e42, 0x5274, 0x544f, 0x4958, 0x5233,
-  0x3625, 0x476a, 0x717c, 0x4f6e, 0x4b33, 0x506b, 0x676f, 0x4d67,
-  0x394b, 0x3659, 0x717d, 0x3064, 0x4b4c, 0x717e, 0x5424, 0x422d,
-  0x416c, 0x4644, 0x3e31, 0x7221, 0x3c55, 0x7222, 0x7223, 0x7224,
-  0x5243, 0x4635, 0x4d47, 0x7225, 0x5331, 0x3f45, 0x4c62, 0x7226,
-  0x7227, 0x5155, 0x366e, 0x7228, 0x7229, 0x355f, 0x722a, 0x722b,
-  0x327c, 0x722c, 0x722d, 0x4827, 0x3767, 0x6c29, 0x6c2a, 0x6c2b,
-  0x6c2c, 0x462e, 0x6c2d, 0x6c2e, 0x3749, 0x4a33, 0x6238, 0x774f,
-  0x7750, 0x324d, 0x7751, 0x7753, 0x7752, 0x623b, 0x3c22, 0x623c,
-  0x623d, 0x623e, 0x623f, 0x6240, 0x6241, 0x3739, 0x527b, 0x3d24,
-  0x4a4e, 0x3125, 0x4b47, 0x6242, 0x367c, 0x4844, 0x6243, 0x3d48,
-  0x317d, 0x6244, 0x3676, 0x6245, 0x4459, 0x6246, 0x4f5a, 0x395d,
-  0x6247, 0x4021, 0x6248, 0x3276, 0x6249, 0x4173, 0x624a, 0x624b,
-  0x4278, 0x624c, 0x624d, 0x624e, 0x4a57, 0x5838, 0x5965, 0x4f63,
-  0x7025, 0x5c30, 0x426d, 0x5426, 0x4d54, 0x5131, 0x335b, 0x477d,
-  0x3235, 0x423f, 0x6660, 0x4a3b, 0x6661, 0x6662, 0x3e54, 0x6663,
-  0x5724, 0x4d55, 0x6665, 0x3c5d, 0x6664, 0x6666, 0x6667, 0x426e,
-  0x3d3e, 0x6668, 0x4266, 0x3a27, 0x6669, 0x666a, 0x3352, 0x5169,
-  0x3f25, 0x666b, 0x466f, 0x666c, 0x666d, 0x666e, 0x462d, 0x666f,
-  0x4927, 0x6670, 0x6671, 0x6672, 0x6539, 0x6673, 0x6674, 0x4262,
-  0x6675, 0x6676, 0x5668, 0x6677, 0x6678, 0x3947, 0x773b, 0x773a,
-  0x773e, 0x773c, 0x3a21, 0x773f, 0x7740, 0x7742, 0x7741, 0x7744,
-  0x7743, 0x7745, 0x7746, 0x7747, 0x4b68, 0x385f, 0x7754, 0x7755,
-  0x7756, 0x7758, 0x775a, 0x7757, 0x775b, 0x7759, 0x5757, 0x775c,
-  0x775d, 0x775e, 0x775f, 0x7760, 0x5b4b, 0x582a, 0x6577, 0x396d,
-  0x3f7d, 0x3b6a, 0x7749, 0x4647, 0x7748, 0x774a, 0x774c, 0x774b,
-  0x774d, 0x4e3a, 0x774e, 0x4427, 0x5363, 0x764f, 0x4233, 0x7650,
-  0x7651, 0x7652, 0x7653, 0x7654, 0x7656, 0x312b, 0x7657, 0x7658,
-  0x7659, 0x765a, 0x765b, 0x765c, 0x765d, 0x765e, 0x4f4a, 0x765f,
-  0x7660, 0x7661, 0x7662, 0x7663, 0x7664, 0x4070, 0x7665, 0x7666,
-  0x7667, 0x7668, 0x7669, 0x766a, 0x766b, 0x766c, 0x766d, 0x766e,
-  0x766f, 0x7670, 0x7671, 0x7672, 0x7673, 0x7674, 0x3e28, 0x7675,
-  0x7676, 0x7677, 0x7678, 0x487a, 0x7679, 0x767a, 0x767b, 0x767c,
-  0x767d, 0x767e, 0x7721, 0x7722, 0x7723, 0x7724, 0x7725, 0x7726,
-  0x7727, 0x7728, 0x316e, 0x7729, 0x772a, 0x772b, 0x772c, 0x772d,
-  0x415b, 0x772e, 0x772f, 0x4471, 0x702f, 0x3c26, 0x7030, 0x4379,
-  0x4538, 0x513b, 0x7031, 0x7032, 0x7033, 0x7034, 0x7035, 0x513c,
-  0x516c, 0x7037, 0x7036, 0x5427, 0x4d52, 0x7038, 0x703a, 0x7039,
-  0x703b, 0x703c, 0x386b, 0x703d, 0x3a68, 0x703e, 0x703f, 0x3e69,
-  0x7040, 0x366c, 0x7041, 0x7042, 0x7043, 0x7044, 0x4835, 0x7045,
-  0x7046, 0x7047, 0x4574, 0x7048, 0x7049, 0x704a, 0x773d, 0x704b,
-  0x704c, 0x704d, 0x704e, 0x704f, 0x3a57, 0x7050, 0x7051, 0x7052,
-  0x7053, 0x7054, 0x7055, 0x7056, 0x7058, 0x5325, 0x7057, 0x7059,
-  0x753a, 0x4239, 0x7764, 0x7765, 0x7766, 0x7767, 0x7768, 0x4234,
-  0x776a, 0x776b, 0x4273, 0x7470, 0x746f, 0x4269, 0x7761, 0x7762,
-  0x3b46, 0x5964, 0x4a72, 0x4068, 0x7024, 0x3a5a, 0x472d, 0x442c,
-  0x776c, 0x776d, 0x776e, 0x7770, 0x776f, 0x7771, 0x7774, 0x7773,
-  0x7772, 0x7775, 0x7776, 0x6d69, 0x6d6a, 0x6d6b, 0x763c, 0x763d,
-  0x763e, 0x3626, 0x583e, 0x3944, 0x583b, 0x5c31, 0x4a73, 0x7777,
-  0x7778, 0x7779, 0x777b, 0x777a, 0x3147, 0x777c, 0x777d, 0x777e,
-  0x466b, 0x6c34, 0x335d, 0x7633, 0x7634, 0x4164, 0x7635, 0x7636,
-  0x7637, 0x7638, 0x7639, 0x763a, 0x4823, 0x763b, 0x417a, 0x3928,
-  0x6d68, 0x396a, 0x595f, 0x2321, 0x2322, 0x2323, 0x2167, 0x2325,
-  0x2326, 0x2327, 0x2328, 0x2329, 0x232a, 0x232b, 0x232c, 0x232d,
-  0x232e, 0x232f, 0x2330, 0x2331, 0x2332, 0x2333, 0x2334, 0x2335,
-  0x2336, 0x2337, 0x2338, 0x2339, 0x233a, 0x233b, 0x233c, 0x233d,
-  0x233e, 0x233f, 0x2340, 0x2341, 0x2342, 0x2343, 0x2344, 0x2345,
-  0x2346, 0x2347, 0x2348, 0x2349, 0x234a, 0x234b, 0x234c, 0x234d,
-  0x234e, 0x234f, 0x2350, 0x2351, 0x2352, 0x2353, 0x2354, 0x2355,
-  0x2356, 0x2357, 0x2358, 0x2359, 0x235a, 0x235b, 0x235c, 0x235d,
-  0x235e, 0x235f, 0x2360, 0x2361, 0x2362, 0x2363, 0x2364, 0x2365,
-  0x2366, 0x2367, 0x2368, 0x2369, 0x236a, 0x236b, 0x236c, 0x236d,
-  0x236e, 0x236f, 0x2370, 0x2371, 0x2372, 0x2373, 0x2374, 0x2375,
-  0x2376, 0x2377, 0x2378, 0x2379, 0x237a, 0x237b, 0x237c, 0x237d,
-  0x212b, 0x2169, 0x216a, 0x237e, 0x2324,
-};
-
-static const Summary16 gb2312_uni2indx_page00[70] = {
-  /* 0x0000 */
-  {    0, 0x0000 }, {    0, 0x0000 }, {    0, 0x0000 }, {    0, 0x0000 },
-  {    0, 0x0000 }, {    0, 0x0000 }, {    0, 0x0000 }, {    0, 0x0000 },
-  {    0, 0x0000 }, {    0, 0x0000 }, {    0, 0x0190 }, {    3, 0x0003 },
-  {    5, 0x0000 }, {    5, 0x0080 }, {    6, 0x3703 }, {   13, 0x168c },
-  /* 0x0100 */
-  {   19, 0x0002 }, {   20, 0x0808 }, {   22, 0x0800 }, {   23, 0x0000 },
-  {   23, 0x2000 }, {   24, 0x0000 }, {   24, 0x0800 }, {   25, 0x0000 },
-  {   25, 0x0000 }, {   25, 0x0000 }, {   25, 0x0000 }, {   25, 0x0000 },
-  {   25, 0x4000 }, {   26, 0x1555 }, {   33, 0x0000 }, {   33, 0x0000 },
-  /* 0x0200 */
-  {   33, 0x0000 }, {   33, 0x0000 }, {   33, 0x0000 }, {   33, 0x0000 },
-  {   33, 0x0000 }, {   33, 0x0000 }, {   33, 0x0000 }, {   33, 0x0000 },
-  {   33, 0x0000 }, {   33, 0x0000 }, {   33, 0x0000 }, {   33, 0x0000 },
-  {   33, 0x0280 }, {   35, 0x0000 }, {   35, 0x0000 }, {   35, 0x0000 },
-  /* 0x0300 */
-  {   35, 0x0000 }, {   35, 0x0000 }, {   35, 0x0000 }, {   35, 0x0000 },
-  {   35, 0x0000 }, {   35, 0x0000 }, {   35, 0x0000 }, {   35, 0x0000 },
-  {   35, 0x0000 }, {   35, 0xfffe }, {   50, 0x03fb }, {   59, 0xfffe },
-  {   74, 0x03fb }, {   83, 0x0000 }, {   83, 0x0000 }, {   83, 0x0000 },
-  /* 0x0400 */
-  {   83, 0x0002 }, {   84, 0xffff }, {  100, 0xffff }, {  116, 0xffff },
-  {  132, 0xffff }, {  148, 0x0002 },
-};
-static const Summary16 gb2312_uni2indx_page20[101] = {
-  /* 0x2000 */
-  {  149, 0x0000 }, {  149, 0x3360 }, {  155, 0x0040 }, {  156, 0x080d },
-  {  160, 0x0000 }, {  160, 0x0000 }, {  160, 0x0000 }, {  160, 0x0000 },
-  {  160, 0x0000 }, {  160, 0x0000 }, {  160, 0x0000 }, {  160, 0x0000 },
-  {  160, 0x0000 }, {  160, 0x0000 }, {  160, 0x0000 }, {  160, 0x0000 },
-  /* 0x2100 */
-  {  160, 0x0008 }, {  161, 0x0040 }, {  162, 0x0000 }, {  162, 0x0000 },
-  {  162, 0x0000 }, {  162, 0x0000 }, {  162, 0x0fff }, {  174, 0x0000 },
-  {  174, 0x0000 }, {  174, 0x000f }, {  178, 0x0000 }, {  178, 0x0000 },
-  {  178, 0x0000 }, {  178, 0x0000 }, {  178, 0x0000 }, {  178, 0x0000 },
-  /* 0x2200 */
-  {  178, 0x8100 }, {  180, 0x6402 }, {  184, 0x4fa1 }, {  192, 0x20f0 },
-  {  197, 0x1100 }, {  199, 0x0000 }, {  199, 0xc033 }, {  205, 0x0000 },
-  {  205, 0x0000 }, {  205, 0x0200 }, {  206, 0x0020 }, {  207, 0x0000 },
-  {  207, 0x0000 }, {  207, 0x0000 }, {  207, 0x0000 }, {  207, 0x0000 },
-  /* 0x2300 */
-  {  207, 0x0000 }, {  207, 0x0004 }, {  208, 0x0000 }, {  208, 0x0000 },
-  {  208, 0x0000 }, {  208, 0x0000 }, {  208, 0x0000 }, {  208, 0x0000 },
-  {  208, 0x0000 }, {  208, 0x0000 }, {  208, 0x0000 }, {  208, 0x0000 },
-  {  208, 0x0000 }, {  208, 0x0000 }, {  208, 0x0000 }, {  208, 0x0000 },
-  /* 0x2400 */
-  {  208, 0x0000 }, {  208, 0x0000 }, {  208, 0x0000 }, {  208, 0x0000 },
-  {  208, 0x0000 }, {  208, 0x0000 }, {  208, 0x03ff }, {  218, 0xfff0 },
-  {  230, 0xffff }, {  246, 0x0fff }, {  258, 0x0000 }, {  258, 0x0000 },
-  {  258, 0x0000 }, {  258, 0x0000 }, {  258, 0x0000 }, {  258, 0x0000 },
-  /* 0x2500 */
-  {  258, 0xffff }, {  274, 0xffff }, {  290, 0xffff }, {  306, 0xffff },
-  {  322, 0x0fff }, {  334, 0x0000 }, {  334, 0x0000 }, {  334, 0x0000 },
-  {  334, 0x0000 }, {  334, 0x0000 }, {  334, 0x0003 }, {  336, 0x000c },
-  {  338, 0xc8c0 }, {  343, 0x0000 }, {  343, 0x0000 }, {  343, 0x0000 },
-  /* 0x2600 */
-  {  343, 0x0060 }, {  345, 0x0000 }, {  345, 0x0000 }, {  345, 0x0000 },
-  {  345, 0x0005 },
-};
-static const Summary16 gb2312_uni2indx_page30[35] = {
-  /* 0x3000 */
-  {  347, 0xff2f }, {  360, 0x00fb }, {  367, 0x0000 }, {  367, 0x0000 },
-  {  367, 0xfffe }, {  382, 0xffff }, {  398, 0xffff }, {  414, 0xffff },
-  {  430, 0xffff }, {  446, 0x000f }, {  450, 0xfffe }, {  465, 0xffff },
-  {  481, 0xffff }, {  497, 0xffff }, {  513, 0xffff }, {  529, 0x087f },
-  /* 0x3100 */
-  {  537, 0xffe0 }, {  548, 0xffff }, {  564, 0x03ff }, {  574, 0x0000 },
-  {  574, 0x0000 }, {  574, 0x0000 }, {  574, 0x0000 }, {  574, 0x0000 },
-  {  574, 0x0000 }, {  574, 0x0000 }, {  574, 0x0000 }, {  574, 0x0000 },
-  {  574, 0x0000 }, {  574, 0x0000 }, {  574, 0x0000 }, {  574, 0x0000 },
-  /* 0x3200 */
-  {  574, 0x0000 }, {  574, 0x0000 }, {  574, 0x03ff },
-};
-static const Summary16 gb2312_uni2indx_page4e[1263] = {
-  /* 0x4e00 */
-  {  584, 0x7f8b }, {  595, 0x7f7b }, {  608, 0x3db4 }, {  617, 0xef55 },
-  {  628, 0xfba8 }, {  638, 0xf35d }, {  649, 0x0243 }, {  653, 0x400b },
-  {  657, 0xfb40 }, {  665, 0x8d3e }, {  674, 0x7bf7 }, {  687, 0x8c2c },
-  {  693, 0x6eff }, {  706, 0xe3fa }, {  717, 0x1d3a }, {  725, 0xa8ed },
-  /* 0x4f00 */
-  {  734, 0xe602 }, {  740, 0xcf83 }, {  749, 0x8cf5 }, {  758, 0x3555 },
-  {  766, 0xe048 }, {  771, 0xffab }, {  784, 0x92b9 }, {  792, 0xd859 },
-  {  800, 0xab18 }, {  807, 0x2892 }, {  812, 0xd7e9 }, {  823, 0x8020 },
-  {  825, 0xc438 }, {  831, 0xf583 }, {  840, 0xe74a }, {  849, 0x450a },
-  /* 0x5000 */
-  {  854, 0xb000 }, {  857, 0x9714 }, {  864, 0x7762 }, {  873, 0x5400 },
-  {  876, 0xd188 }, {  882, 0x1420 }, {  885, 0x1020 }, {  887, 0xc8c0 },
-  {  892, 0x2121 }, {  896, 0x0000 }, {  896, 0x13a8 }, {  902, 0x0c04 },
-  {  905, 0x8000 }, {  906, 0x0440 }, {  908, 0x70c0 }, {  913, 0x0828 },
-  /* 0x5100 */
-  {  916, 0x08c0 }, {  919, 0x0004 }, {  920, 0x0002 }, {  921, 0x8000 },
-  {  922, 0x2b7b }, {  932, 0x1472 }, {  938, 0x7924 }, {  945, 0x3bfb },
-  {  957, 0x3327 }, {  965, 0x1ae4 }, {  972, 0x9835 }, {  979, 0x38ef },
-  {  989, 0x9ad1 }, {  997, 0x2802 }, { 1000, 0xa813 }, { 1006, 0xbf69 },
-  /* 0x5200 */
-  { 1017, 0x65cf }, { 1027, 0x2fc6 }, { 1036, 0x6b11 }, { 1043, 0xafc9 },
-  { 1053, 0x340f }, { 1060, 0x5053 }, { 1066, 0x86a2 }, { 1072, 0xa004 },
-  { 1075, 0x0106 }, { 1078, 0xe809 }, { 1084, 0x3f0f }, { 1094, 0xc00e },
-  { 1099, 0x0a88 }, { 1103, 0x8145 }, { 1108, 0x0010 }, { 1109, 0xc601 },
-  /* 0x5300 */
-  { 1114, 0xa161 }, { 1120, 0x26e1 }, { 1127, 0x444b }, { 1133, 0xce00 },
-  { 1138, 0xc7aa }, { 1147, 0xd4ee }, { 1157, 0xcadf }, { 1168, 0x85bb },
-  { 1177, 0x3a74 }, { 1185, 0xa520 }, { 1190, 0x436c }, { 1197, 0x8840 },
-  { 1200, 0x3f06 }, { 1208, 0x8bd2 }, { 1216, 0xff79 }, { 1229, 0x3bef },
-  /* 0x5400 */
-  { 1241, 0xf75a }, { 1252, 0xe8ef }, { 1263, 0xfbcb }, { 1275, 0x5b36 },
-  { 1284, 0x0d49 }, { 1290, 0x1bfd }, { 1301, 0x0154 }, { 1305, 0x39ee },
-  { 1315, 0xd855 }, { 1323, 0x2e75 }, { 1332, 0xbfd8 }, { 1343, 0xa91a },
-  { 1350, 0xf3d7 }, { 1362, 0xf6bf }, { 1375, 0x67e0 }, { 1383, 0xb40c },
-  /* 0x5500 */
-  { 1389, 0x82c2 }, { 1394, 0x0813 }, { 1398, 0xd49d }, { 1407, 0xd08b },
-  { 1414, 0x065a }, { 1420, 0x1061 }, { 1424, 0x74f2 }, { 1433, 0x59e0 },
-  { 1440, 0x8f9f }, { 1451, 0xb312 }, { 1458, 0x0080 }, { 1459, 0x6aaa },
-  { 1467, 0x3230 }, { 1472, 0xb05e }, { 1480, 0x9d7a }, { 1490, 0x60ac },
-  /* 0x5600 */
-  { 1496, 0xd303 }, { 1503, 0xc900 }, { 1507, 0x3098 }, { 1512, 0x8a56 },
-  { 1519, 0x7000 }, { 1522, 0x1390 }, { 1527, 0x1f14 }, { 1534, 0x1842 },
-  { 1538, 0xc060 }, { 1542, 0x0008 }, { 1543, 0x8008 }, { 1545, 0x1080 },
-  { 1547, 0x0400 }, { 1548, 0xec90 }, { 1555, 0x2817 }, { 1561, 0xe633 },
-  /* 0x5700 */
-  { 1570, 0x0758 }, { 1576, 0x9000 }, { 1578, 0xf708 }, { 1586, 0x4e09 },
-  { 1592, 0xf485 }, { 1600, 0xfc83 }, { 1609, 0xaf53 }, { 1619, 0x18c8 },
-  { 1624, 0x187c }, { 1631, 0x080c }, { 1634, 0x6adf }, { 1645, 0x0114 },
-  { 1648, 0xc80c }, { 1653, 0xa734 }, { 1661, 0xa011 }, { 1665, 0x2710 },
-  /* 0x5800 */
-  { 1670, 0x28c5 }, { 1676, 0x4222 }, { 1680, 0x0413 }, { 1684, 0x0021 },
-  { 1686, 0x3010 }, { 1689, 0x4112 }, { 1693, 0x1820 }, { 1696, 0x4000 },
-  { 1697, 0x022b }, { 1702, 0xc60c }, { 1708, 0x0300 }, { 1710, 0x1000 },
-  { 1711, 0x0022 }, { 1713, 0x0022 }, { 1715, 0x5810 }, { 1719, 0x0249 },
-  /* 0x5900 */
-  { 1723, 0xa094 }, { 1728, 0x9670 }, { 1735, 0xeeb0 }, { 1744, 0x1792 },
-  { 1751, 0xcb96 }, { 1760, 0x05f2 }, { 1767, 0x0025 }, { 1770, 0x2358 },
-  { 1776, 0x25de }, { 1785, 0x42cc }, { 1791, 0xcf38 }, { 1800, 0x4a04 },
-  { 1804, 0x0c40 }, { 1807, 0x359f }, { 1817, 0x1128 }, { 1821, 0x8a00 },
-  /* 0x5a00 */
-  { 1824, 0x13fa }, { 1833, 0x910a }, { 1838, 0x0229 }, { 1842, 0x1056 },
-  { 1847, 0x0641 }, { 1851, 0x0420 }, { 1853, 0x0484 }, { 1856, 0x84f0 },
-  { 1862, 0x0000 }, { 1862, 0x0c04 }, { 1865, 0x0400 }, { 1866, 0x412c },
-  { 1871, 0x1206 }, { 1875, 0x1154 }, { 1880, 0x0a4b }, { 1886, 0x0002 },
-  /* 0x5b00 */
-  { 1887, 0x0200 }, { 1888, 0x00c0 }, { 1890, 0x0000 }, { 1890, 0x0094 },
-  { 1893, 0x0001 }, { 1894, 0xbfbb }, { 1907, 0x167c }, { 1915, 0x242b },
-  { 1921, 0x9bbb }, { 1932, 0x7fa8 }, { 1942, 0x0c7f }, { 1951, 0xe379 },
-  { 1961, 0x10f4 }, { 1967, 0xe00d }, { 1973, 0x4132 }, { 1978, 0x9f01 },
-  /* 0x5c00 */
-  { 1985, 0x8652 }, { 1991, 0x3572 }, { 1999, 0x10b4 }, { 2004, 0xff12 },
-  { 2014, 0xcf27 }, { 2024, 0x4223 }, { 2029, 0xc06b }, { 2036, 0x8602 },
-  { 2040, 0x3106 }, { 2045, 0x1fd3 }, { 2055, 0x3a0c }, { 2061, 0xa1aa },
-  { 2068, 0x0812 }, { 2071, 0x0204 }, { 2073, 0x2572 }, { 2080, 0x0801 },
-  /* 0x5d00 */
-  { 2082, 0x40cc }, { 2087, 0x4850 }, { 2091, 0x62d0 }, { 2097, 0x6010 },
-  { 2100, 0x1c80 }, { 2104, 0x2900 }, { 2107, 0x9a00 }, { 2111, 0x0010 },
-  { 2112, 0x0004 }, { 2113, 0x2200 }, { 2115, 0x0000 }, { 2115, 0x0080 },
-  { 2116, 0x2020 }, { 2118, 0x6800 }, { 2121, 0xcbe6 }, { 2131, 0x609e },
-  /* 0x5e00 */
-  { 2138, 0x916e }, { 2146, 0x3f73 }, { 2157, 0x60c0 }, { 2161, 0x3982 },
-  { 2167, 0x1034 }, { 2171, 0x4830 }, { 2175, 0x0006 }, { 2177, 0xbd5c },
-  { 2187, 0x8cd1 }, { 2194, 0xd6fb }, { 2206, 0x20e1 }, { 2211, 0x43e8 },
-  { 2218, 0x0600 }, { 2220, 0x084e }, { 2225, 0x0500 }, { 2227, 0xc4d0 },
-  /* 0x5f00 */
-  { 2233, 0x8d1f }, { 2242, 0x89aa }, { 2249, 0xa6e1 }, { 2257, 0x1602 },
-  { 2261, 0x0001 }, { 2262, 0x21ed }, { 2270, 0x3656 }, { 2278, 0x1a8b },
-  { 2285, 0x1fb7 }, { 2296, 0x13a5 }, { 2303, 0x6502 }, { 2308, 0x30a0 },
-  { 2312, 0xb278 }, { 2320, 0x23c7 }, { 2328, 0x6c93 }, { 2336, 0xe922 },
-  /* 0x6000 */
-  { 2343, 0xe47f }, { 2354, 0x3a74 }, { 2362, 0x8fe3 }, { 2372, 0x9820 },
-  { 2376, 0x280e }, { 2381, 0x2625 }, { 2387, 0xbf9c }, { 2398, 0xbf49 },
-  { 2408, 0x3218 }, { 2413, 0xac54 }, { 2420, 0xb949 }, { 2428, 0x1916 },
-  { 2434, 0x0c60 }, { 2438, 0xb522 }, { 2445, 0xfbc1 }, { 2455, 0x0659 },
-  /* 0x6100 */
-  { 2461, 0xe343 }, { 2469, 0x8420 }, { 2472, 0x08d9 }, { 2478, 0x8000 },
-  { 2479, 0x5500 }, { 2483, 0x2022 }, { 2486, 0x0184 }, { 2489, 0x00a1 },
-  { 2492, 0x4800 }, { 2494, 0x2010 }, { 2496, 0x1380 }, { 2500, 0x4080 },
-  { 2502, 0x0d04 }, { 2506, 0x0016 }, { 2509, 0x0040 }, { 2510, 0x8020 },
-  /* 0x6200 */
-  { 2512, 0xfd40 }, { 2520, 0x8de7 }, { 2530, 0x5436 }, { 2537, 0xe098 },
-  { 2543, 0x7b8b }, { 2553, 0x091e }, { 2559, 0xfec8 }, { 2569, 0xd249 },
-  { 2576, 0x0611 }, { 2580, 0x8dee }, { 2590, 0x1937 }, { 2598, 0xba22 },
-  { 2605, 0x77f4 }, { 2616, 0x9fdd }, { 2628, 0xf3ec }, { 2639, 0xf0da },
-  /* 0x6300 */
-  { 2648, 0x4386 }, { 2654, 0xec42 }, { 2661, 0x8d3f }, { 2671, 0x2604 },
-  { 2675, 0xfa6c }, { 2685, 0xc021 }, { 2689, 0x628e }, { 2696, 0x0cc2 },
-  { 2701, 0xd785 }, { 2710, 0x0145 }, { 2714, 0x77ad }, { 2725, 0x5599 },
-  { 2733, 0xe250 }, { 2739, 0x4045 }, { 2743, 0x260b }, { 2749, 0xa154 },
-  /* 0x6400 */
-  { 2755, 0x9827 }, { 2762, 0x5819 }, { 2768, 0x3443 }, { 2774, 0xa410 },
-  { 2778, 0x05f2 }, { 2785, 0x4114 }, { 2789, 0x2280 }, { 2792, 0x0700 },
-  { 2795, 0x00b4 }, { 2799, 0x4266 }, { 2805, 0x7210 }, { 2810, 0x15a1 },
-  { 2816, 0x6025 }, { 2821, 0x4185 }, { 2826, 0x0054 }, { 2829, 0x0000 },
-  /* 0x6500 */
-  { 2829, 0x0201 }, { 2831, 0x0104 }, { 2833, 0xc820 }, { 2837, 0xcb70 },
-  { 2845, 0x9320 }, { 2850, 0x6a62 }, { 2857, 0x184c }, { 2862, 0x0095 },
-  { 2866, 0x1880 }, { 2869, 0x9a8b }, { 2877, 0xaab2 }, { 2885, 0x3201 },
-  { 2889, 0xd87a }, { 2898, 0x00c4 }, { 2901, 0xf3e5 }, { 2912, 0x04c3 },
-  /* 0x6600 */
-  { 2917, 0xd44d }, { 2925, 0xa238 }, { 2931, 0xa1a1 }, { 2937, 0x5072 },
-  { 2943, 0x980a }, { 2948, 0x84fc }, { 2956, 0xc152 }, { 2962, 0x44d1 },
-  { 2968, 0x1094 }, { 2972, 0x20c2 }, { 2976, 0x4180 }, { 2979, 0x4210 },
-  { 2982, 0x0000 }, { 2982, 0x3a00 }, { 2986, 0x0240 }, { 2988, 0xd29d },
-  /* 0x6700 */
-  { 2997, 0x2f01 }, { 3003, 0xa8b1 }, { 3010, 0xbd40 }, { 3017, 0x2432 },
-  { 3022, 0xd34d }, { 3031, 0xd04b }, { 3038, 0xa723 }, { 3046, 0xd0ad },
-  { 3054, 0x0a92 }, { 3059, 0x75a1 }, { 3067, 0xadac }, { 3076, 0x01e9 },
-  { 3082, 0x801a }, { 3086, 0x771f }, { 3097, 0x9225 }, { 3103, 0xa01b },
-  /* 0x6800 */
-  { 3109, 0xdfa1 }, { 3119, 0x20ca }, { 3124, 0x0602 }, { 3127, 0x738c },
-  { 3135, 0x577f }, { 3147, 0x003b }, { 3152, 0x0bff }, { 3163, 0x00d0 },
-  { 3166, 0x806a }, { 3171, 0x0088 }, { 3173, 0xa1c4 }, { 3179, 0x0029 },
-  { 3182, 0x2a05 }, { 3187, 0x0524 }, { 3191, 0x4009 }, { 3194, 0x1623 },
-  /* 0x6900 */
-  { 3200, 0x6822 }, { 3205, 0x8005 }, { 3208, 0x2011 }, { 3211, 0xa211 },
-  { 3216, 0x0004 }, { 3217, 0x6490 }, { 3222, 0x4849 }, { 3227, 0x1382 },
-  { 3232, 0x23d5 }, { 3240, 0x1930 }, { 3245, 0x2980 }, { 3249, 0x0892 },
-  { 3253, 0x5402 }, { 3257, 0x8811 }, { 3261, 0x2001 }, { 3263, 0xa004 },
-  /* 0x6a00 */
-  { 3266, 0x0400 }, { 3267, 0x8180 }, { 3270, 0x8502 }, { 3274, 0x6022 },
-  { 3278, 0x0090 }, { 3280, 0x0b01 }, { 3284, 0x0022 }, { 3286, 0x1202 },
-  { 3289, 0x4011 }, { 3292, 0x0083 }, { 3295, 0x1a01 }, { 3299, 0x0000 },
-  { 3299, 0x0000 }, { 3299, 0x0000 }, { 3299, 0x0000 }, { 3299, 0x0000 },
-  /* 0x6b00 */
-  { 3299, 0x0000 }, { 3299, 0x0000 }, { 3299, 0x009f }, { 3305, 0x4684 },
-  { 3310, 0x12c8 }, { 3315, 0x0200 }, { 3316, 0x04fc }, { 3323, 0x1a00 },
-  { 3326, 0x2ede }, { 3336, 0x0c4c }, { 3341, 0x0402 }, { 3343, 0x80b8 },
-  { 3348, 0xa826 }, { 3354, 0x0afc }, { 3362, 0x8c02 }, { 3366, 0x2228 },
-  /* 0x6c00 */
-  { 3370, 0xa0e0 }, { 3375, 0x8f7b }, { 3386, 0xc7d6 }, { 3396, 0x2135 },
-  { 3402, 0x06c7 }, { 3409, 0xf8b1 }, { 3418, 0x0713 }, { 3424, 0x6255 },
-  { 3431, 0x936e }, { 3440, 0x8a19 }, { 3446, 0x6efa }, { 3457, 0xfb0e },
-  { 3467, 0x1630 }, { 3472, 0x48f9 }, { 3480, 0xcd2f }, { 3490, 0x7deb },
-  /* 0x6d00 */
-  { 3502, 0x5892 }, { 3508, 0x4e84 }, { 3514, 0x4ca0 }, { 3519, 0x7a2e },
-  { 3528, 0xedea }, { 3539, 0x561e }, { 3547, 0xc649 }, { 3554, 0x1190 },
-  { 3558, 0x5324 }, { 3564, 0xe83a }, { 3572, 0xcfdb }, { 3584, 0x8124 },
-  { 3588, 0x18f1 }, { 3595, 0x6342 }, { 3601, 0x5853 }, { 3608, 0x1a8a },
-  /* 0x6e00 */
-  { 3614, 0x7420 }, { 3619, 0x24d3 }, { 3626, 0xaa3b }, { 3635, 0x0514 },
-  { 3639, 0x6018 }, { 3643, 0x8958 }, { 3649, 0x4800 }, { 3651, 0xc000 },
-  { 3653, 0x8268 }, { 3658, 0x9101 }, { 3662, 0x84a4 }, { 3667, 0x2cd6 },
-  { 3675, 0x8886 }, { 3680, 0xc4ba }, { 3688, 0x0377 }, { 3696, 0x0210 },
-  /* 0x6f00 */
-  { 3698, 0x8244 }, { 3702, 0x0038 }, { 3705, 0xae11 }, { 3712, 0x404a },
-  { 3716, 0x28c0 }, { 3720, 0x5100 }, { 3723, 0x6044 }, { 3727, 0x1514 },
-  { 3732, 0x7310 }, { 3738, 0x1000 }, { 3739, 0x0082 }, { 3741, 0x0248 },
-  { 3744, 0x0205 }, { 3747, 0x4006 }, { 3750, 0xc003 }, { 3754, 0x0000 },
-  /* 0x7000 */
-  { 3754, 0x0000 }, { 3754, 0x0c02 }, { 3757, 0x0008 }, { 3758, 0x0220 },
-  { 3760, 0x9000 }, { 3762, 0x4000 }, { 3763, 0xb800 }, { 3767, 0xd161 },
-  { 3774, 0x4621 }, { 3779, 0x3274 }, { 3786, 0xf800 }, { 3791, 0x3b8a },
-  { 3799, 0x050f }, { 3805, 0x8b00 }, { 3809, 0xbbd0 }, { 3818, 0x2280 },
-  /* 0x7100 */
-  { 3821, 0x0600 }, { 3823, 0x0769 }, { 3830, 0x8040 }, { 3832, 0x0043 },
-  { 3835, 0x5420 }, { 3839, 0x5000 }, { 3841, 0x41d0 }, { 3846, 0x250c },
-  { 3851, 0x8410 }, { 3854, 0x8310 }, { 3858, 0x1101 }, { 3861, 0x0228 },
-  { 3864, 0x4008 }, { 3866, 0x0030 }, { 3868, 0x40a1 }, { 3872, 0x0200 },
-  /* 0x7200 */
-  { 3873, 0x0040 }, { 3874, 0x2000 }, { 3875, 0x1500 }, { 3878, 0xabe3 },
-  { 3888, 0x3180 }, { 3892, 0xaa44 }, { 3898, 0xc2c6 }, { 3905, 0xc624 },
-  { 3911, 0xac13 }, { 3918, 0x8004 }, { 3920, 0xb000 }, { 3923, 0x03d1 },
-  { 3929, 0x611e }, { 3936, 0x4285 }, { 3941, 0xf303 }, { 3949, 0x1d9f },
-  /* 0x7300 */
-  { 3959, 0x440a }, { 3963, 0x78e8 }, { 3971, 0x5e26 }, { 3979, 0xc392 },
-  { 3986, 0x2000 }, { 3987, 0x0085 }, { 3990, 0xb001 }, { 3994, 0x4000 },
-  { 3995, 0x4a90 }, { 4000, 0x8842 }, { 4004, 0xca04 }, { 4009, 0x0c8d },
-  { 4015, 0xa705 }, { 4022, 0x4203 }, { 4026, 0x22a1 }, { 4031, 0x0004 },
-  /* 0x7400 */
-  { 4032, 0x8668 }, { 4038, 0x0c01 }, { 4041, 0x5564 }, { 4048, 0x1079 },
-  { 4054, 0x0002 }, { 4055, 0xdea0 }, { 4063, 0x2000 }, { 4064, 0x40c1 },
-  { 4068, 0x488b }, { 4074, 0x5001 }, { 4077, 0x0380 }, { 4080, 0x0400 },
-  { 4081, 0x0000 }, { 4081, 0x5004 }, { 4084, 0xc05d }, { 4091, 0x80d0 },
-  /* 0x7500 */
-  { 4095, 0xa010 }, { 4098, 0x970a }, { 4105, 0xbb20 }, { 4112, 0x4daf },
-  { 4122, 0xd921 }, { 4129, 0x1e10 }, { 4134, 0x0460 }, { 4137, 0x8314 },
-  { 4142, 0x8848 }, { 4146, 0xa6d6 }, { 4155, 0xd83b }, { 4164, 0x733f },
-  { 4175, 0x27bc }, { 4184, 0x4974 }, { 4191, 0x0ddc }, { 4199, 0x9213 },
-  /* 0x7600 */
-  { 4205, 0x142b }, { 4211, 0x8ba1 }, { 4218, 0x2e75 }, { 4227, 0xd139 },
-  { 4235, 0x3009 }, { 4239, 0x5050 }, { 4243, 0x8808 }, { 4246, 0x6900 },
-  { 4250, 0x49d4 }, { 4257, 0x024a }, { 4261, 0x4010 }, { 4263, 0x8016 },
-  { 4267, 0xe564 }, { 4275, 0x89d7 }, { 4284, 0xc020 }, { 4287, 0x5316 },
-  /* 0x7700 */
-  { 4294, 0x2b92 }, { 4301, 0x8600 }, { 4304, 0xa345 }, { 4311, 0x15e0 },
-  { 4317, 0x008b }, { 4321, 0x0c03 }, { 4325, 0x196e }, { 4333, 0xe200 },
-  { 4337, 0x7031 }, { 4343, 0x8006 }, { 4346, 0x16a5 }, { 4353, 0xa829 },
-  { 4359, 0x2000 }, { 4360, 0x1880 }, { 4363, 0x7aac }, { 4372, 0xe148 },
-  /* 0x7800 */
-  { 4378, 0x3207 }, { 4384, 0xb5d6 }, { 4394, 0x32e8 }, { 4401, 0x5f91 },
-  { 4410, 0x50a1 }, { 4415, 0x20e5 }, { 4421, 0x7c00 }, { 4426, 0x1080 },
-  { 4428, 0x7280 }, { 4433, 0x9d8a }, { 4441, 0x00aa }, { 4445, 0x421f },
-  { 4452, 0x0e22 }, { 4457, 0x0231 }, { 4461, 0x1100 }, { 4463, 0x0494 },
-  /* 0x7900 */
-  { 4467, 0x0022 }, { 4469, 0x4008 }, { 4471, 0x0010 }, { 4472, 0x5c10 },
-  { 4477, 0x0343 }, { 4482, 0xfcc8 }, { 4491, 0xa1a5 }, { 4498, 0x0580 },
-  { 4501, 0x8433 }, { 4507, 0x0400 }, { 4508, 0x0080 }, { 4509, 0x6e08 },
-  { 4515, 0x2a4b }, { 4522, 0x8126 }, { 4527, 0xaad8 }, { 4535, 0x2901 },
-  /* 0x7a00 */
-  { 4539, 0x684d }, { 4546, 0x4490 }, { 4550, 0x0009 }, { 4552, 0xba88 },
-  { 4559, 0x0040 }, { 4560, 0x0082 }, { 4562, 0x0000 }, { 4562, 0x87d1 },
-  { 4570, 0x215b }, { 4577, 0xb1e6 }, { 4586, 0x3161 }, { 4592, 0x8008 },
-  { 4594, 0x0800 }, { 4595, 0xc240 }, { 4599, 0xa069 }, { 4605, 0xa600 },
-  /* 0x7b00 */
-  { 4609, 0x8d58 }, { 4616, 0x4a32 }, { 4622, 0x5d71 }, { 4631, 0x550a },
-  { 4637, 0x9aa0 }, { 4643, 0x2d57 }, { 4652, 0x4005 }, { 4655, 0x4aa6 },
-  { 4662, 0x2021 }, { 4665, 0x30b1 }, { 4671, 0x3fc6 }, { 4681, 0x0112 },
-  { 4684, 0x10c2 }, { 4688, 0x260a }, { 4693, 0x4462 }, { 4698, 0x5082 },
-  /* 0x7c00 */
-  { 4702, 0x9880 }, { 4706, 0x8040 }, { 4708, 0x04c0 }, { 4711, 0x8100 },
-  { 4713, 0x2003 }, { 4716, 0x0000 }, { 4716, 0x0000 }, { 4716, 0x3818 },
-  { 4721, 0x0200 }, { 4722, 0xf1a6 }, { 4731, 0x4434 }, { 4736, 0x720e },
-  { 4743, 0x35a2 }, { 4750, 0x92e0 }, { 4756, 0x8101 }, { 4759, 0x0900 },
-  /* 0x7d00 */
-  { 4761, 0x0400 }, { 4762, 0x0000 }, { 4762, 0x8885 }, { 4767, 0x0000 },
-  { 4767, 0x0000 }, { 4767, 0x0000 }, { 4767, 0x4000 }, { 4768, 0x0080 },
-  { 4769, 0x0000 }, { 4769, 0x0000 }, { 4769, 0x4040 }, { 4771, 0x0000 },
-  { 4771, 0x0000 }, { 4771, 0x0000 }, { 4771, 0x0000 }, { 4771, 0x0000 },
-  /* 0x7e00 */
-  { 4771, 0x0000 }, { 4771, 0x0000 }, { 4771, 0x0000 }, { 4771, 0x0800 },
-  { 4772, 0x0082 }, { 4774, 0x0000 }, { 4774, 0x0000 }, { 4774, 0x0000 },
-  { 4774, 0x0004 }, { 4775, 0x8800 }, { 4777, 0xbfff }, { 4792, 0xe7ef },
-  { 4805, 0xffff }, { 4821, 0xffbf }, { 4836, 0xefef }, { 4850, 0xfdff },
-  /* 0x7f00 */
-  { 4865, 0xfbff }, { 4880, 0xbffe }, { 4894, 0xffff }, { 4910, 0x057f },
-  { 4919, 0x0034 }, { 4922, 0x85b3 }, { 4930, 0x4706 }, { 4936, 0x4216 },
-  { 4941, 0x5402 }, { 4945, 0xe410 }, { 4950, 0x8092 }, { 4954, 0xb305 },
-  { 4961, 0x5422 }, { 4966, 0x8130 }, { 4970, 0x4263 }, { 4976, 0x180b },
-  /* 0x8000 */
-  { 4981, 0x387b }, { 4990, 0x13f5 }, { 4999, 0x07e5 }, { 5007, 0xa9ea },
-  { 5016, 0x3c4c }, { 5023, 0x0514 }, { 5027, 0x0600 }, { 5029, 0x8002 },
-  { 5031, 0x1ad9 }, { 5039, 0xbd48 }, { 5047, 0xee37 }, { 5058, 0xf496 },
-  { 5067, 0x705f }, { 5076, 0x7ec0 }, { 5084, 0xbfb2 }, { 5095, 0x355f },
-  /* 0x8100 */
-  { 5105, 0xe644 }, { 5112, 0x455f }, { 5121, 0x9000 }, { 5123, 0x4146 },
-  { 5128, 0x1d40 }, { 5133, 0x063b }, { 5140, 0x62a1 }, { 5146, 0xfe13 },
-  { 5156, 0x8505 }, { 5161, 0x3902 }, { 5166, 0x0548 }, { 5170, 0x0c08 },
-  { 5173, 0x144f }, { 5180, 0x0000 }, { 5180, 0x3488 }, { 5185, 0x5818 },
-  /* 0x8200 */
-  { 5190, 0x3077 }, { 5198, 0xd815 }, { 5205, 0xbd0e }, { 5214, 0x4bfb },
-  { 5225, 0x8a90 }, { 5230, 0x8500 }, { 5233, 0xc100 }, { 5236, 0xe61d },
-  { 5245, 0xed14 }, { 5253, 0xb386 }, { 5261, 0xff72 }, { 5273, 0x639b },
-  { 5282, 0xfd92 }, { 5292, 0xd9be }, { 5303, 0x887b }, { 5311, 0x0a92 },
-  /* 0x8300 */
-  { 5316, 0xd3fe }, { 5328, 0x1cb2 }, { 5335, 0xb980 }, { 5341, 0x177a },
-  { 5350, 0x82c9 }, { 5356, 0xdc17 }, { 5365, 0xfffb }, { 5380, 0x3980 },
-  { 5385, 0x4260 }, { 5389, 0x590c }, { 5395, 0x0f01 }, { 5400, 0x37df },
-  { 5412, 0x94a3 }, { 5419, 0xb150 }, { 5425, 0x0623 }, { 5430, 0x2307 },
-  /* 0x8400 */
-  { 5436, 0xf85a }, { 5445, 0x3102 }, { 5449, 0x01f0 }, { 5454, 0x3102 },
-  { 5458, 0x0040 }, { 5459, 0x1e82 }, { 5465, 0x3a0a }, { 5471, 0x056a },
-  { 5477, 0x5b84 }, { 5484, 0x1280 }, { 5487, 0x8002 }, { 5489, 0xa714 },
-  { 5496, 0x2612 }, { 5501, 0xa04b }, { 5507, 0x1069 }, { 5512, 0x9001 },
-  /* 0x8500 */
-  { 5515, 0x1000 }, { 5516, 0x848a }, { 5521, 0x1802 }, { 5524, 0x3f80 },
-  { 5531, 0x0708 }, { 5535, 0x4240 }, { 5538, 0x0110 }, { 5540, 0x4e14 },
-  { 5546, 0x80b0 }, { 5550, 0x1800 }, { 5552, 0xc510 }, { 5557, 0x0281 },
-  { 5560, 0x8202 }, { 5563, 0x1029 }, { 5567, 0x0210 }, { 5569, 0x8800 },
-  /* 0x8600 */
-  { 5571, 0x0020 }, { 5572, 0x0042 }, { 5574, 0x0280 }, { 5576, 0x1100 },
-  { 5578, 0xe000 }, { 5581, 0x4413 }, { 5586, 0x5804 }, { 5590, 0xfe02 },
-  { 5598, 0x3c07 }, { 5605, 0x3028 }, { 5609, 0x9798 }, { 5617, 0x0473 },
-  { 5623, 0xced1 }, { 5632, 0xcb13 }, { 5640, 0x6210 }, { 5644, 0x431f },
-  /* 0x8700 */
-  { 5652, 0x278d }, { 5660, 0x55ac }, { 5668, 0x422e }, { 5674, 0xc892 },
-  { 5680, 0x5380 }, { 5685, 0x0288 }, { 5688, 0x4039 }, { 5693, 0x7851 },
-  { 5700, 0x292c }, { 5706, 0x8088 }, { 5709, 0xb900 }, { 5714, 0x2428 },
-  { 5718, 0x0c41 }, { 5722, 0x080e }, { 5726, 0x4421 }, { 5730, 0x4200 },
-  /* 0x8800 */
-  { 5732, 0x0408 }, { 5734, 0x0868 }, { 5738, 0x0006 }, { 5740, 0x1204 },
-  { 5743, 0x3031 }, { 5748, 0x0290 }, { 5751, 0x5b3e }, { 5761, 0xe085 },
-  { 5767, 0x2936 }, { 5774, 0x1044 }, { 5777, 0x2814 }, { 5781, 0x1082 },
-  { 5784, 0x4266 }, { 5790, 0x8334 }, { 5796, 0x013c }, { 5801, 0x531b },
-  /* 0x8900 */
-  { 5809, 0x0404 }, { 5811, 0x0e0d }, { 5817, 0x0c22 }, { 5821, 0x0051 },
-  { 5824, 0x0012 }, { 5826, 0xc000 }, { 5828, 0x0040 }, { 5829, 0x8800 },
-  { 5831, 0x004a }, { 5834, 0x0000 }, { 5834, 0x0000 }, { 5834, 0x0000 },
-  { 5834, 0xdff6 }, { 5847, 0x5447 }, { 5854, 0x8868 }, { 5859, 0x0008 },
-  /* 0x8a00 */
-  { 5860, 0x0081 }, { 5862, 0x0000 }, { 5862, 0x0000 }, { 5862, 0x4000 },
-  { 5863, 0x0100 }, { 5864, 0x0000 }, { 5864, 0x0000 }, { 5864, 0x0200 },
-  { 5865, 0x0600 }, { 5867, 0x0008 }, { 5868, 0x0000 }, { 5868, 0x0000 },
-  { 5868, 0x0000 }, { 5868, 0x0000 }, { 5868, 0x0000 }, { 5868, 0x0000 },
-  /* 0x8b00 */
-  { 5868, 0x0080 }, { 5869, 0x0000 }, { 5869, 0x0040 }, { 5870, 0x0000 },
-  { 5870, 0x0000 }, { 5870, 0x0000 }, { 5870, 0x1040 }, { 5872, 0x0000 },
-  { 5872, 0x0000 }, { 5872, 0x0000 }, { 5872, 0xefff }, { 5887, 0xf7fd },
-  { 5901, 0xff7f }, { 5916, 0xfffe }, { 5931, 0xfbff }, { 5946, 0xffff },
-  /* 0x8c00 */
-  { 5962, 0xfdff }, { 5977, 0xbfff }, { 5992, 0xffff }, { 6008, 0x00ff },
-  { 6016, 0x12c2 }, { 6021, 0x0420 }, { 6023, 0x0c06 }, { 6027, 0x0708 },
-  { 6031, 0x1624 }, { 6036, 0x0110 }, { 6038, 0x0000 }, { 6038, 0x0000 },
-  { 6038, 0x0000 }, { 6038, 0x0000 }, { 6038, 0x0000 }, { 6038, 0x0000 },
-  /* 0x8d00 */
-  { 6038, 0x0000 }, { 6038, 0xe000 }, { 6041, 0xfffe }, { 6056, 0xffff },
-  { 6072, 0xffff }, { 6088, 0x7f79 }, { 6100, 0x28df }, { 6109, 0x00f9 },
-  { 6115, 0x0c32 }, { 6120, 0x8012 }, { 6123, 0x0008 }, { 6124, 0xd53a },
-  { 6133, 0xd858 }, { 6140, 0xecc2 }, { 6148, 0x9d18 }, { 6155, 0x2fa8 },
-  /* 0x8e00 */
-  { 6163, 0x9620 }, { 6168, 0xe010 }, { 6172, 0xd60c }, { 6179, 0x2622 },
-  { 6184, 0x0f97 }, { 6193, 0x0206 }, { 6196, 0xb240 }, { 6201, 0x9055 },
-  { 6207, 0x80a2 }, { 6211, 0x5011 }, { 6215, 0x9800 }, { 6218, 0x0404 },
-  { 6220, 0x4000 }, { 6221, 0x0000 }, { 6221, 0x0000 }, { 6221, 0x0000 },
-  /* 0x8f00 */
-  { 6221, 0x0000 }, { 6221, 0x0000 }, { 6221, 0x0000 }, { 6221, 0x0000 },
-  { 6221, 0x0000 }, { 6221, 0x0000 }, { 6221, 0xfbc0 }, { 6230, 0xffff },
-  { 6246, 0xeffe }, { 6260, 0xdffb }, { 6274, 0x0b08 }, { 6278, 0x6243 },
-  { 6284, 0x41b6 }, { 6291, 0xfb3b }, { 6303, 0x6f74 }, { 6313, 0x2389 },
-  /* 0x9000 */
-  { 6319, 0xae7f }, { 6331, 0xecd7 }, { 6342, 0xe047 }, { 6349, 0x5960 },
-  { 6355, 0xa096 }, { 6361, 0x098f }, { 6368, 0x612c }, { 6374, 0xa030 },
-  { 6378, 0x090d }, { 6383, 0x2aaa }, { 6390, 0xd44e }, { 6398, 0x4f7b },
-  { 6409, 0xc4b2 }, { 6416, 0x388b }, { 6423, 0xa9c6 }, { 6431, 0x6110 },
-  /* 0x9100 */
-  { 6435, 0x0014 }, { 6437, 0x4200 }, { 6439, 0x800c }, { 6442, 0x0202 },
-  { 6444, 0xfe48 }, { 6453, 0x6485 }, { 6459, 0xd63e }, { 6469, 0xe3f7 },
-  { 6481, 0x3aa0 }, { 6487, 0x0c07 }, { 6492, 0xe40c }, { 6498, 0x0430 },
-  { 6501, 0xf680 }, { 6508, 0x1002 }, { 6510, 0x0000 }, { 6510, 0x0000 },
-  /* 0x9200 */
-  { 6510, 0x0000 }, { 6510, 0x0000 }, { 6510, 0x0000 }, { 6510, 0x0000 },
-  { 6510, 0x0000 }, { 6510, 0x0000 }, { 6510, 0x0000 }, { 6510, 0x0010 },
-  { 6511, 0x4000 }, { 6512, 0x0000 }, { 6512, 0x4000 }, { 6513, 0x0000 },
-  { 6513, 0x0100 }, { 6514, 0x0000 }, { 6514, 0x0000 }, { 6514, 0x0000 },
-  /* 0x9300 */
-  { 6514, 0x0000 }, { 6514, 0x0000 }, { 6514, 0x0000 }, { 6514, 0x4000 },
-  { 6515, 0x0000 }, { 6515, 0x0000 }, { 6515, 0x0400 }, { 6516, 0x0000 },
-  { 6516, 0x8000 }, { 6517, 0x0000 }, { 6517, 0x0000 }, { 6517, 0x0000 },
-  { 6517, 0x0400 }, { 6518, 0x0040 }, { 6519, 0x0000 }, { 6519, 0x0000 },
-  /* 0x9400 */
-  { 6519, 0x0000 }, { 6519, 0x0000 }, { 6519, 0x0000 }, { 6519, 0x4000 },
-  { 6520, 0x0000 }, { 6520, 0x0000 }, { 6520, 0x0800 }, { 6521, 0x0000 },
-  { 6521, 0xffe0 }, { 6532, 0xfebd }, { 6545, 0xffff }, { 6561, 0xffff },
-  { 6577, 0x7f7f }, { 6591, 0xfbe7 }, { 6604, 0xffbf }, { 6619, 0xf7ff },
-  /* 0x9500 */
-  { 6634, 0xffff }, { 6650, 0xefff }, { 6665, 0xff7e }, { 6679, 0xdff7 },
-  { 6693, 0xf6f7 }, { 6706, 0xfbdf }, { 6720, 0xbffe }, { 6734, 0x804f },
-  { 6740, 0x0000 }, { 6740, 0x0000 }, { 6740, 0x0000 }, { 6740, 0x0000 },
-  { 6740, 0x0000 }, { 6740, 0x0000 }, { 6740, 0xef00 }, { 6747, 0x7fff },
-  /* 0x9600 */
-  { 6762, 0xff7f }, { 6777, 0xb6f7 }, { 6789, 0x4406 }, { 6793, 0xb87e },
-  { 6803, 0x3bf5 }, { 6814, 0x8831 }, { 6819, 0x1796 }, { 6827, 0x00f4 },
-  { 6832, 0xa960 }, { 6838, 0x1391 }, { 6844, 0x0080 }, { 6845, 0x7249 },
-  { 6852, 0xf2f3 }, { 6863, 0x0024 }, { 6865, 0x8701 }, { 6870, 0x42c8 },
-  /* 0x9700 */
-  { 6875, 0xe3d3 }, { 6885, 0x5048 }, { 6889, 0x2400 }, { 6891, 0x4305 },
-  { 6896, 0x0000 }, { 6896, 0x4a4c }, { 6902, 0x0227 }, { 6907, 0x1058 },
-  { 6911, 0x2820 }, { 6914, 0x0116 }, { 6918, 0xa809 }, { 6923, 0x0014 },
-  { 6925, 0x0000 }, { 6925, 0x0000 }, { 6925, 0x3ec0 }, { 6932, 0x0068 },
-  /* 0x9800 */
-  { 6935, 0x0000 }, { 6935, 0x0000 }, { 6935, 0x0000 }, { 6935, 0x0000 },
-  { 6935, 0x0000 }, { 6935, 0x0000 }, { 6935, 0x0000 }, { 6935, 0xffe0 },
-  { 6946, 0xb7ff }, { 6960, 0xfddb }, { 6973, 0x00f7 }, { 6980, 0x0000 },
-  { 6980, 0x4000 }, { 6981, 0xc72e }, { 6990, 0x0180 }, { 6992, 0x0000 },
-  /* 0x9900 */
-  { 6992, 0x2000 }, { 6993, 0x0001 }, { 6994, 0x4000 }, { 6995, 0x0000 },
-  { 6995, 0x0000 }, { 6995, 0x0030 }, { 6997, 0xffa8 }, { 7008, 0xb4f7 },
-  { 7019, 0xadf3 }, { 7030, 0x03ff }, { 7040, 0x0120 }, { 7042, 0x0000 },
-  { 7042, 0x0000 }, { 7042, 0x0000 }, { 7042, 0x0000 }, { 7042, 0x0000 },
-  /* 0x9a00 */
-  { 7042, 0x0000 }, { 7042, 0x0000 }, { 7042, 0x0000 }, { 7042, 0x0000 },
-  { 7042, 0x0000 }, { 7042, 0x0000 }, { 7042, 0xf000 }, { 7046, 0xfffb },
-  { 7061, 0x9df7 }, { 7073, 0xfdcf }, { 7086, 0x01bf }, { 7094, 0x15c3 },
-  { 7101, 0x1827 }, { 7107, 0x810a }, { 7111, 0xa842 }, { 7116, 0x0a00 },
-  /* 0x9b00 */
-  { 7118, 0x8108 }, { 7121, 0x8008 }, { 7123, 0x8008 }, { 7125, 0x1804 },
-  { 7128, 0xa3be }, { 7138, 0x0012 }, { 7140, 0x0000 }, { 7140, 0x0000 },
-  { 7140, 0x0000 }, { 7140, 0x0000 }, { 7140, 0x0000 }, { 7140, 0x0000 },
-  { 7140, 0x0000 }, { 7140, 0x0000 }, { 7140, 0x0000 }, { 7140, 0x0000 },
-  /* 0x9c00 */
-  { 7140, 0x0000 }, { 7140, 0x0000 }, { 7140, 0x0000 }, { 7140, 0x0000 },
-  { 7140, 0x0000 }, { 7140, 0x0000 }, { 7140, 0x0000 }, { 7140, 0x9000 },
-  { 7142, 0x69e6 }, { 7151, 0xdc37 }, { 7161, 0x6bff }, { 7174, 0x3dff },
-  { 7187, 0xfcf8 }, { 7198, 0xf3f9 }, { 7210, 0x0004 },
-};
-static const Summary16 gb2312_uni2indx_page9e[27] = {
-  /* 0x9e00 */
-  { 7211, 0x0000 }, { 7211, 0x8000 }, { 7212, 0xbf6f }, { 7225, 0xe7ee },
-  { 7237, 0xdffe }, { 7251, 0x5da2 }, { 7259, 0x3fd8 }, { 7269, 0xc00b },
-  { 7274, 0x0984 }, { 7278, 0xa00c }, { 7282, 0x0040 }, { 7283, 0x6910 },
-  { 7288, 0xe210 }, { 7293, 0xb912 }, { 7300, 0x86a5 }, { 7307, 0x5a00 },
-  /* 0x9f00 */
-  { 7311, 0x6800 }, { 7314, 0x0289 }, { 7318, 0x9005 }, { 7322, 0x6a80 },
-  { 7327, 0x0010 }, { 7328, 0x0003 }, { 7330, 0x0000 }, { 7330, 0x8000 },
-  { 7331, 0x1ff9 }, { 7342, 0x8e00 }, { 7346, 0x0001 },
-};
-static const Summary16 gb2312_uni2indx_pageff[15] = {
-  /* 0xff00 */
-  { 7347, 0xfffe }, { 7362, 0xffff }, { 7378, 0xffff }, { 7394, 0xffff },
-  { 7410, 0xffff }, { 7426, 0x7fff }, { 7441, 0x0000 }, { 7441, 0x0000 },
-  { 7441, 0x0000 }, { 7441, 0x0000 }, { 7441, 0x0000 }, { 7441, 0x0000 },
-  { 7441, 0x0000 }, { 7441, 0x0000 }, { 7441, 0x002b },
-};
-
-static int
-gb2312_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  if (n >= 2) {
-    const Summary16 *summary = NULL;
-    if (wc >= 0x0000 && wc < 0x0460)
-      summary = &gb2312_uni2indx_page00[(wc>>4)];
-    else if (wc >= 0x2000 && wc < 0x2650)
-      summary = &gb2312_uni2indx_page20[(wc>>4)-0x200];
-    else if (wc >= 0x3000 && wc < 0x3230)
-      summary = &gb2312_uni2indx_page30[(wc>>4)-0x300];
-    else if (wc >= 0x4e00 && wc < 0x9cf0)
-      summary = &gb2312_uni2indx_page4e[(wc>>4)-0x4e0];
-    else if (wc >= 0x9e00 && wc < 0x9fb0)
-      summary = &gb2312_uni2indx_page9e[(wc>>4)-0x9e0];
-    else if (wc >= 0xff00 && wc < 0xfff0)
-      summary = &gb2312_uni2indx_pageff[(wc>>4)-0xff0];
-    if (summary) {
-      unsigned short used = summary->used;
-      unsigned int i = wc & 0x0f;
-      if (used & ((unsigned short) 1 << i)) {
-        unsigned short c;
-        /* Keep in `used' only the bits 0..i-1. */
-        used &= ((unsigned short) 1 << i) - 1;
-        /* Add `summary->indx' and the number of bits set in `used'. */
-        used = (used & 0x5555) + ((used & 0xaaaa) >> 1);
-        used = (used & 0x3333) + ((used & 0xcccc) >> 2);
-        used = (used & 0x0f0f) + ((used & 0xf0f0) >> 4);
-        used = (used & 0x00ff) + (used >> 8);
-        c = gb2312_2charset[summary->indx + used];
-        r[0] = (c >> 8); r[1] = (c & 0xff);
-        return 2;
-      }
-    }
-    return RET_ILSEQ;
-  }
-  return RET_TOOSMALL;
-}
diff --git a/xc/lib/X11/lcUniConv/georgian_academy.h b/xc/lib/X11/lcUniConv/georgian_academy.h
deleted file mode 100644
index 14aebda96..000000000
--- a/xc/lib/X11/lcUniConv/georgian_academy.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-/*
- * GEORGIAN-ACADEMY
- */
-
-static const unsigned short georgian_academy_2uni[32] = {
-  /* 0x80 */
-  0x0080, 0x0081, 0x201a, 0x0192, 0x201e, 0x2026, 0x2020, 0x2021,
-  0x02c6, 0x2030, 0x0160, 0x2039, 0x0152, 0x008d, 0x008e, 0x008f,
-  /* 0x90 */
-  0x0090, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014,
-  0x02dc, 0x2122, 0x0161, 0x203a, 0x0153, 0x009d, 0x009e, 0x0178,
-};
-
-static int
-georgian_academy_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c >= 0x80 && c < 0xa0)
-    *pwc = (wchar_t) georgian_academy_2uni[c-0x80];
-  else if (c >= 0xc0 && c < 0xe7)
-    *pwc = (wchar_t) c + 0x1010;
-  else
-    *pwc = (wchar_t) c;
-  return 1;
-}
-
-static const unsigned char georgian_academy_page00[32] = {
-  0x80, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x87 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x8d, 0x8e, 0x8f, /* 0x88-0x8f */
-  0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x97 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x9d, 0x9e, 0x00, /* 0x98-0x9f */
-};
-static const unsigned char georgian_academy_page01[72] = {
-  0x00, 0x00, 0x8c, 0x9c, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x57 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5f */
-  0x8a, 0x9a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x67 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x77 */
-  0x9f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x87 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8f */
-  0x00, 0x00, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x97 */
-};
-static const unsigned char georgian_academy_page02[32] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x00, /* 0xc0-0xc7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc8-0xcf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd0-0xd7 */
-  0x00, 0x00, 0x00, 0x00, 0x98, 0x00, 0x00, 0x00, /* 0xd8-0xdf */
-};
-static const unsigned char georgian_academy_page20[48] = {
-  0x00, 0x00, 0x00, 0x96, 0x97, 0x00, 0x00, 0x00, /* 0x10-0x17 */
-  0x91, 0x92, 0x82, 0x00, 0x93, 0x94, 0x84, 0x00, /* 0x18-0x1f */
-  0x86, 0x87, 0x95, 0x00, 0x00, 0x00, 0x85, 0x00, /* 0x20-0x27 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2f */
-  0x89, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x37 */
-  0x00, 0x8b, 0x9b, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3f */
-};
-
-static int
-georgian_academy_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x0080) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc >= 0x0080 && wc < 0x00a0)
-    c = georgian_academy_page00[wc-0x0080];
-  else if ((wc >= 0x00a0 && wc < 0x00c0) || (wc >= 0x00e7 && wc < 0x0100))
-    c = wc;
-  else if (wc >= 0x0150 && wc < 0x0198)
-    c = georgian_academy_page01[wc-0x0150];
-  else if (wc >= 0x02c0 && wc < 0x02e0)
-    c = georgian_academy_page02[wc-0x02c0];
-  else if (wc >= 0x10d0 && wc < 0x10f7)
-    c = wc-0x1010;
-  else if (wc >= 0x2010 && wc < 0x2040)
-    c = georgian_academy_page20[wc-0x2010];
-  else if (wc == 0x2122)
-    c = 0x99;
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/georgian_ps.h b/xc/lib/X11/lcUniConv/georgian_ps.h
deleted file mode 100644
index f82c5e962..000000000
--- a/xc/lib/X11/lcUniConv/georgian_ps.h
+++ /dev/null
@@ -1,104 +0,0 @@
-
-/*
- * GEORGIAN-PS
- */
-
-static const unsigned short georgian_ps_2uni_1[32] = {
-  /* 0x80 */
-  0x0080, 0x0081, 0x201a, 0x0192, 0x201e, 0x2026, 0x2020, 0x2021,
-  0x02c6, 0x2030, 0x0160, 0x2039, 0x0152, 0x008d, 0x008e, 0x008f,
-  /* 0x90 */
-  0x0090, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014,
-  0x02dc, 0x2122, 0x0161, 0x203a, 0x0153, 0x009d, 0x009e, 0x0178,
-};
-static const unsigned short georgian_ps_2uni_2[39] = {
-  /* 0xc0 */
-  0x10d0, 0x10d1, 0x10d2, 0x10d3, 0x10d4, 0x10d5, 0x10d6, 0x10f1,
-  0x10d7, 0x10d8, 0x10d9, 0x10da, 0x10db, 0x10dc, 0x10f2, 0x10dd,
-  /* 0xd0 */
-  0x10de, 0x10df, 0x10e0, 0x10e1, 0x10e2, 0x10f3, 0x10e3, 0x10e4,
-  0x10e5, 0x10e6, 0x10e7, 0x10e8, 0x10e9, 0x10ea, 0x10eb, 0x10ec,
-  /* 0xe0 */
-  0x10ed, 0x10ee, 0x10f4, 0x10ef, 0x10f0, 0x10f5,
-};
-
-static int
-georgian_ps_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c >= 0x80 && c < 0xa0)
-    *pwc = (wchar_t) georgian_ps_2uni_1[c-0x80];
-  else if (c >= 0xc0 && c < 0xe6)
-    *pwc = (wchar_t) georgian_ps_2uni_2[c-0xc0];
-  else
-    *pwc = (wchar_t) c;
-  return 1;
-}
-
-static const unsigned char georgian_ps_page00[32] = {
-  0x80, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x87 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x8d, 0x8e, 0x8f, /* 0x88-0x8f */
-  0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x97 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x9d, 0x9e, 0x00, /* 0x98-0x9f */
-};
-static const unsigned char georgian_ps_page01[72] = {
-  0x00, 0x00, 0x8c, 0x9c, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x57 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5f */
-  0x8a, 0x9a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x67 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x77 */
-  0x9f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x87 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8f */
-  0x00, 0x00, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x97 */
-};
-static const unsigned char georgian_ps_page02[32] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x00, /* 0xc0-0xc7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc8-0xcf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd0-0xd7 */
-  0x00, 0x00, 0x00, 0x00, 0x98, 0x00, 0x00, 0x00, /* 0xd8-0xdf */
-};
-static const unsigned char georgian_ps_page10[40] = {
-  0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc8, /* 0xd0-0xd7 */
-  0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xcf, 0xd0, 0xd1, /* 0xd8-0xdf */
-  0xd2, 0xd3, 0xd4, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, /* 0xe0-0xe7 */
-  0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe3, /* 0xe8-0xef */
-  0xe4, 0xc7, 0xce, 0xd5, 0xe2, 0xe5, 0x00, 0x00, /* 0xf0-0xf7 */
-};
-static const unsigned char georgian_ps_page20[48] = {
-  0x00, 0x00, 0x00, 0x96, 0x97, 0x00, 0x00, 0x00, /* 0x10-0x17 */
-  0x91, 0x92, 0x82, 0x00, 0x93, 0x94, 0x84, 0x00, /* 0x18-0x1f */
-  0x86, 0x87, 0x95, 0x00, 0x00, 0x00, 0x85, 0x00, /* 0x20-0x27 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2f */
-  0x89, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x37 */
-  0x00, 0x8b, 0x9b, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3f */
-};
-
-static int
-georgian_ps_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x0080) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc >= 0x0080 && wc < 0x00a0)
-    c = georgian_ps_page00[wc-0x0080];
-  else if ((wc >= 0x00a0 && wc < 0x00c0) || (wc >= 0x00e6 && wc < 0x0100))
-    c = wc;
-  else if (wc >= 0x0150 && wc < 0x0198)
-    c = georgian_ps_page01[wc-0x0150];
-  else if (wc >= 0x02c0 && wc < 0x02e0)
-    c = georgian_ps_page02[wc-0x02c0];
-  else if (wc >= 0x10d0 && wc < 0x10f8)
-    c = georgian_ps_page10[wc-0x10d0];
-  else if (wc >= 0x2010 && wc < 0x2040)
-    c = georgian_ps_page20[wc-0x2010];
-  else if (wc == 0x2122)
-    c = 0x99;
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/iso8859_1.h b/xc/lib/X11/lcUniConv/iso8859_1.h
deleted file mode 100644
index fb64e2e2d..000000000
--- a/xc/lib/X11/lcUniConv/iso8859_1.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/*
- * ISO-8859-1
- */
-
-static int
-iso8859_1_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  *pwc = (wchar_t) c;
-  return 1;
-}
-
-static int
-iso8859_1_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  if (wc < 0x0100) {
-    *r = wc;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/iso8859_10.h b/xc/lib/X11/lcUniConv/iso8859_10.h
deleted file mode 100644
index a727a2f99..000000000
--- a/xc/lib/X11/lcUniConv/iso8859_10.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-/*
- * ISO-8859-10
- */
-
-static const unsigned short iso8859_10_2uni[96] = {
-  /* 0xa0 */
-  0x00a0, 0x0104, 0x0112, 0x0122, 0x012a, 0x0128, 0x0136, 0x00a7,
-  0x013b, 0x0110, 0x0160, 0x0166, 0x017d, 0x00ad, 0x016a, 0x014a,
-  /* 0xb0 */
-  0x00b0, 0x0105, 0x0113, 0x0123, 0x012b, 0x0129, 0x0137, 0x00b7,
-  0x013c, 0x0111, 0x0161, 0x0167, 0x017e, 0x2015, 0x016b, 0x014b,
-  /* 0xc0 */
-  0x0100, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x00c6, 0x012e,
-  0x010c, 0x00c9, 0x0118, 0x00cb, 0x0116, 0x00cd, 0x00ce, 0x00cf,
-  /* 0xd0 */
-  0x00d0, 0x0145, 0x014c, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x0168,
-  0x00d8, 0x0172, 0x00da, 0x00db, 0x00dc, 0x00dd, 0x00de, 0x00df,
-  /* 0xe0 */
-  0x0101, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x012f,
-  0x010d, 0x00e9, 0x0119, 0x00eb, 0x0117, 0x00ed, 0x00ee, 0x00ef,
-  /* 0xf0 */
-  0x00f0, 0x0146, 0x014d, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x0169,
-  0x00f8, 0x0173, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x0138,
-};
-
-static int
-iso8859_10_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c < 0xa0)
-    *pwc = (wchar_t) c;
-  else
-    *pwc = (wchar_t) iso8859_10_2uni[c-0xa0];
-  return 1;
-}
-
-static const unsigned char iso8859_10_page00[224] = {
-  0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa7, /* 0xa0-0xa7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xad, 0x00, 0x00, /* 0xa8-0xaf */
-  0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb7, /* 0xb0-0xb7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xb8-0xbf */
-  0x00, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0x00, /* 0xc0-0xc7 */
-  0x00, 0xc9, 0x00, 0xcb, 0x00, 0xcd, 0xce, 0xcf, /* 0xc8-0xcf */
-  0xd0, 0x00, 0x00, 0xd3, 0xd4, 0xd5, 0xd6, 0x00, /* 0xd0-0xd7 */
-  0xd8, 0x00, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, /* 0xd8-0xdf */
-  0x00, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0x00, /* 0xe0-0xe7 */
-  0x00, 0xe9, 0x00, 0xeb, 0x00, 0xed, 0xee, 0xef, /* 0xe8-0xef */
-  0xf0, 0x00, 0x00, 0xf3, 0xf4, 0xf5, 0xf6, 0x00, /* 0xf0-0xf7 */
-  0xf8, 0x00, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0x00, /* 0xf8-0xff */
-  /* 0x0100 */
-  0xc0, 0xe0, 0x00, 0x00, 0xa1, 0xb1, 0x00, 0x00, /* 0x00-0x07 */
-  0x00, 0x00, 0x00, 0x00, 0xc8, 0xe8, 0x00, 0x00, /* 0x08-0x0f */
-  0xa9, 0xb9, 0xa2, 0xb2, 0x00, 0x00, 0xcc, 0xec, /* 0x10-0x17 */
-  0xca, 0xea, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1f */
-  0x00, 0x00, 0xa3, 0xb3, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x27 */
-  0xa5, 0xb5, 0xa4, 0xb4, 0x00, 0x00, 0xc7, 0xe7, /* 0x28-0x2f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa6, 0xb6, /* 0x30-0x37 */
-  0xff, 0x00, 0x00, 0xa8, 0xb8, 0x00, 0x00, 0x00, /* 0x38-0x3f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xd1, 0xf1, 0x00, /* 0x40-0x47 */
-  0x00, 0x00, 0xaf, 0xbf, 0xd2, 0xf2, 0x00, 0x00, /* 0x48-0x4f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x57 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5f */
-  0xaa, 0xba, 0x00, 0x00, 0x00, 0x00, 0xab, 0xbb, /* 0x60-0x67 */
-  0xd7, 0xf7, 0xae, 0xbe, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6f */
-  0x00, 0x00, 0xd9, 0xf9, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x77 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xac, 0xbc, 0x00, /* 0x78-0x7f */
-};
-
-static int
-iso8859_10_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x00a0) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc >= 0x00a0 && wc < 0x0180)
-    c = iso8859_10_page00[wc-0x00a0];
-  else if (wc == 0x2015)
-    c = 0xbd;
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/iso8859_13.h b/xc/lib/X11/lcUniConv/iso8859_13.h
deleted file mode 100644
index fe1d767bc..000000000
--- a/xc/lib/X11/lcUniConv/iso8859_13.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* $XFree86: xc/lib/X11/lcUniConv/iso8859_13.h,v 1.2 2000/11/28 16:10:26 dawes Exp $ */
-
-/*
- * ISO-8859-13
- */
-
-static const unsigned short iso8859_13_2uni[96] = {
-  /* 0xa0 */
-  0x00a0, 0x201d, 0x00a2, 0x00a3, 0x00a4, 0x201e, 0x00a6, 0x00a7,
-  0x00d8, 0x00a9, 0x0156, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00c6,
-  /* 0xb0 */
-  0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x201c, 0x00b5, 0x00b6, 0x00b7,
-  0x00f8, 0x00b9, 0x0157, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00e6,
-  /* 0xc0 */
-  0x0104, 0x012e, 0x0100, 0x0106, 0x00c4, 0x00c5, 0x0118, 0x0112,
-  0x010c, 0x00c9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012a, 0x013b,
-  /* 0xd0 */
-  0x0160, 0x0143, 0x0145, 0x00d3, 0x014c, 0x00d5, 0x00d6, 0x00d7,
-  0x0172, 0x0141, 0x015a, 0x016a, 0x00dc, 0x017b, 0x017d, 0x00df,
-  /* 0xe0 */
-  0x0105, 0x012f, 0x0101, 0x0107, 0x00e4, 0x00e5, 0x0119, 0x0113,
-  0x010d, 0x00e9, 0x017a, 0x0117, 0x0123, 0x0137, 0x012b, 0x013c,
-  /* 0xf0 */
-  0x0161, 0x0144, 0x0146, 0x00f3, 0x014d, 0x00f5, 0x00f6, 0x00f7,
-  0x0173, 0x0142, 0x015b, 0x016b, 0x00fc, 0x017c, 0x017e, 0x2019,
-};
-
-static int
-iso8859_13_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c < 0xa0)
-    *pwc = (ucs4_t) c;
-  else
-    *pwc = (ucs4_t) iso8859_13_2uni[c-0xa0];
-  return 1;
-}
-
-static const unsigned char iso8859_13_page00[224] = {
-  0xa0, 0x00, 0xa2, 0xa3, 0xa4, 0x00, 0xa6, 0xa7, /* 0xa0-0xa7 */
-  0x00, 0xa9, 0x00, 0xab, 0xac, 0xad, 0xae, 0x00, /* 0xa8-0xaf */
-  0xb0, 0xb1, 0xb2, 0xb3, 0x00, 0xb5, 0xb6, 0xb7, /* 0xb0-0xb7 */
-  0x00, 0xb9, 0x00, 0xbb, 0xbc, 0xbd, 0xbe, 0x00, /* 0xb8-0xbf */
-  0x00, 0x00, 0x00, 0x00, 0xc4, 0xc5, 0xaf, 0x00, /* 0xc0-0xc7 */
-  0x00, 0xc9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc8-0xcf */
-  0x00, 0x00, 0x00, 0xd3, 0x00, 0xd5, 0xd6, 0xd7, /* 0xd0-0xd7 */
-  0xa8, 0x00, 0x00, 0x00, 0xdc, 0x00, 0x00, 0xdf, /* 0xd8-0xdf */
-  0x00, 0x00, 0x00, 0x00, 0xe4, 0xe5, 0xbf, 0x00, /* 0xe0-0xe7 */
-  0x00, 0xe9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xe8-0xef */
-  0x00, 0x00, 0x00, 0xf3, 0x00, 0xf5, 0xf6, 0xf7, /* 0xf0-0xf7 */
-  0xb8, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, /* 0xf8-0xff */
-  /* 0x0100 */
-  0xc2, 0xe2, 0x00, 0x00, 0xc0, 0xe0, 0xc3, 0xe3, /* 0x00-0x07 */
-  0x00, 0x00, 0x00, 0x00, 0xc8, 0xe8, 0x00, 0x00, /* 0x08-0x0f */
-  0x00, 0x00, 0xc7, 0xe7, 0x00, 0x00, 0xcb, 0xeb, /* 0x10-0x17 */
-  0xc6, 0xe6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1f */
-  0x00, 0x00, 0xcc, 0xec, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x27 */
-  0x00, 0x00, 0xce, 0xee, 0x00, 0x00, 0xc1, 0xe1, /* 0x28-0x2f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcd, 0xed, /* 0x30-0x37 */
-  0x00, 0x00, 0x00, 0xcf, 0xef, 0x00, 0x00, 0x00, /* 0x38-0x3f */
-  0x00, 0xd9, 0xf9, 0xd1, 0xf1, 0xd2, 0xf2, 0x00, /* 0x40-0x47 */
-  0x00, 0x00, 0x00, 0x00, 0xd4, 0xf4, 0x00, 0x00, /* 0x48-0x4f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xba, /* 0x50-0x57 */
-  0x00, 0x00, 0xda, 0xfa, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5f */
-  0xd0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x67 */
-  0x00, 0x00, 0xdb, 0xfb, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6f */
-  0x00, 0x00, 0xd8, 0xf8, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x77 */
-  0x00, 0xca, 0xea, 0xdd, 0xfd, 0xde, 0xfe, 0x00, /* 0x78-0x7f */
-};
-static const unsigned char iso8859_13_page20[8] = {
-  0x00, 0xff, 0x00, 0x00, 0xb4, 0xa1, 0xa5, 0x00, /* 0x18-0x1f */
-};
-
-static int
-iso8859_13_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x00a0) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc >= 0x00a0 && wc < 0x0180)
-    c = iso8859_13_page00[wc-0x00a0];
-  else if (wc >= 0x2018 && wc < 0x2020)
-    c = iso8859_13_page20[wc-0x2018];
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/iso8859_14.h b/xc/lib/X11/lcUniConv/iso8859_14.h
deleted file mode 100644
index 2fea4431f..000000000
--- a/xc/lib/X11/lcUniConv/iso8859_14.h
+++ /dev/null
@@ -1,108 +0,0 @@
-
-/*
- * ISO-8859-14
- */
-
-static const unsigned short iso8859_14_2uni[96] = {
-  /* 0xa0 */
-  0x00a0, 0x1e02, 0x1e03, 0x00a3, 0x010a, 0x010b, 0x1e0a, 0x00a7,
-  0x1e80, 0x00a9, 0x1e82, 0x1e0b, 0x1ef2, 0x00ad, 0x00ae, 0x0178,
-  /* 0xb0 */
-  0x1e1e, 0x1e1f, 0x0120, 0x0121, 0x1e40, 0x1e41, 0x00b6, 0x1e56,
-  0x1e81, 0x1e57, 0x1e83, 0x1e60, 0x1ef3, 0x1e84, 0x1e85, 0x1e61,
-  /* 0xc0 */
-  0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x00c6, 0x00c7,
-  0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x00cc, 0x00cd, 0x00ce, 0x00cf,
-  /* 0xd0 */
-  0x0174, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x1e6a,
-  0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x00dd, 0x0176, 0x00df,
-  /* 0xe0 */
-  0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x00e7,
-  0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef,
-  /* 0xf0 */
-  0x0175, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x1e6b,
-  0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x0177, 0x00ff,
-};
-
-static int
-iso8859_14_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c >= 0xa0)
-    *pwc = (wchar_t) iso8859_14_2uni[c-0xa0];
-  else
-    *pwc = (wchar_t) c;
-  return 1;
-}
-
-static const unsigned char iso8859_14_page00[96] = {
-  0xa0, 0x00, 0x00, 0xa3, 0x00, 0x00, 0x00, 0xa7, /* 0xa0-0xa7 */
-  0x00, 0xa9, 0x00, 0x00, 0x00, 0xad, 0xae, 0x00, /* 0xa8-0xaf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb6, 0x00, /* 0xb0-0xb7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xb8-0xbf */
-  0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, /* 0xc0-0xc7 */
-  0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, /* 0xc8-0xcf */
-  0x00, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0x00, /* 0xd0-0xd7 */
-  0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0x00, 0xdf, /* 0xd8-0xdf */
-  0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, /* 0xe0-0xe7 */
-  0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, /* 0xe8-0xef */
-  0x00, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0x00, /* 0xf0-0xf7 */
-  0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0x00, 0xff, /* 0xf8-0xff */
-};
-static const unsigned char iso8859_14_page01_0[32] = {
-  0x00, 0x00, 0xa4, 0xa5, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x17 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1f */
-  0xb2, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x27 */
-};
-static const unsigned char iso8859_14_page01_1[16] = {
-  0x00, 0x00, 0x00, 0x00, 0xd0, 0xf0, 0xde, 0xfe, /* 0x70-0x77 */
-  0xaf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7f */
-};
-static const unsigned char iso8859_14_page1e_0[136] = {
-  0x00, 0x00, 0xa1, 0xa2, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x07 */
-  0x00, 0x00, 0xa6, 0xab, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x17 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xb1, /* 0x18-0x1f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x27 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x37 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3f */
-  0xb4, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x47 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb7, 0xb9, /* 0x50-0x57 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5f */
-  0xbb, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x67 */
-  0x00, 0x00, 0xd7, 0xf7, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x77 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7f */
-  0xa8, 0xb8, 0xaa, 0xba, 0xbd, 0xbe, 0x00, 0x00, /* 0x80-0x87 */
-};
-static const unsigned char iso8859_14_page1e_1[8] = {
-  0x00, 0x00, 0xac, 0xbc, 0x00, 0x00, 0x00, 0x00, /* 0xf0-0xf7 */
-};
-
-static int
-iso8859_14_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x00a0) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc >= 0x00a0 && wc < 0x0100)
-    c = iso8859_14_page00[wc-0x00a0];
-  else if (wc >= 0x0108 && wc < 0x0128)
-    c = iso8859_14_page01_0[wc-0x0108];
-  else if (wc >= 0x0170 && wc < 0x0180)
-    c = iso8859_14_page01_1[wc-0x0170];
-  else if (wc >= 0x1e00 && wc < 0x1e88)
-    c = iso8859_14_page1e_0[wc-0x1e00];
-  else if (wc >= 0x1ef0 && wc < 0x1ef8)
-    c = iso8859_14_page1e_1[wc-0x1ef0];
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/iso8859_15.h b/xc/lib/X11/lcUniConv/iso8859_15.h
deleted file mode 100644
index 3801fc12f..000000000
--- a/xc/lib/X11/lcUniConv/iso8859_15.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-/*
- * ISO-8859-15
- */
-
-static const unsigned short iso8859_15_2uni[32] = {
-  /* 0xa0 */
-  0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x20ac, 0x00a5, 0x0160, 0x00a7,
-  0x0161, 0x00a9, 0x00aa, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af,
-  /* 0xb0 */
-  0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x017d, 0x00b5, 0x00b6, 0x00b7,
-  0x017e, 0x00b9, 0x00ba, 0x00bb, 0x0152, 0x0153, 0x0178, 0x00bf,
-};
-
-static int
-iso8859_15_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c >= 0xa0 && c < 0xc0)
-    *pwc = (wchar_t) iso8859_15_2uni[c-0xa0];
-  else
-    *pwc = (wchar_t) c;
-  return 1;
-}
-
-static const unsigned char iso8859_15_page00[32] = {
-  0xa0, 0xa1, 0xa2, 0xa3, 0x00, 0xa5, 0x00, 0xa7, /* 0xa0-0xa7 */
-  0x00, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, /* 0xa8-0xaf */
-  0xb0, 0xb1, 0xb2, 0xb3, 0x00, 0xb5, 0xb6, 0xb7, /* 0xb0-0xb7 */
-  0x00, 0xb9, 0xba, 0xbb, 0x00, 0x00, 0x00, 0xbf, /* 0xb8-0xbf */
-};
-static const unsigned char iso8859_15_page01[48] = {
-  0x00, 0x00, 0xbc, 0xbd, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x57 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5f */
-  0xa6, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x67 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x77 */
-  0xbe, 0x00, 0x00, 0x00, 0x00, 0xb4, 0xb8, 0x00, /* 0x78-0x7f */
-};
-
-static int
-iso8859_15_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x00a0) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc >= 0x00a0 && wc < 0x00c0)
-    c = iso8859_15_page00[wc-0x00a0];
-  else if (wc >= 0x00c0 && wc < 0x0100)
-    c = wc;
-  else if (wc >= 0x0150 && wc < 0x0180)
-    c = iso8859_15_page01[wc-0x0150];
-  else if (wc == 0x20ac)
-    c = 0xa4;
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/iso8859_16.h b/xc/lib/X11/lcUniConv/iso8859_16.h
deleted file mode 100644
index 3dbf3648b..000000000
--- a/xc/lib/X11/lcUniConv/iso8859_16.h
+++ /dev/null
@@ -1,97 +0,0 @@
-
-/*
- * ISO-8859-16
- */
-
-static const unsigned short iso8859_16_2uni[96] = {
-  /* 0xa0 */
-  0x00a0, 0x0104, 0x0105, 0x0141, 0x20ac, 0x00ab, 0x0160, 0x00a7,
-  0x0161, 0x00a9, 0x0218, 0x201e, 0x0179, 0x00ad, 0x017a, 0x017b,
-  /* 0xb0 */
-  0x00b0, 0x00b1, 0x010c, 0x0142, 0x017d, 0x201d, 0x00b6, 0x00b7,
-  0x017e, 0x010d, 0x0219, 0x00bb, 0x0152, 0x0153, 0x0178, 0x017c,
-  /* 0xc0 */
-  0x00c0, 0x00c1, 0x00c2, 0x0102, 0x00c4, 0x0106, 0x00c6, 0x00c7,
-  0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x00cc, 0x00cd, 0x00ce, 0x00cf,
-  /* 0xd0 */
-  0x0110, 0x0143, 0x00d2, 0x00d3, 0x00d4, 0x0150, 0x00d6, 0x015a,
-  0x0170, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x0118, 0x021a, 0x00df,
-  /* 0xe0 */
-  0x00e0, 0x00e1, 0x00e2, 0x0103, 0x00e4, 0x0107, 0x00e6, 0x00e7,
-  0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef,
-  /* 0xf0 */
-  0x0111, 0x0144, 0x00f2, 0x00f3, 0x00f4, 0x0151, 0x00f6, 0x015b,
-  0x0171, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x0119, 0x021b, 0x00ff,
-};
-
-static int
-iso8859_16_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c < 0xa0)
-    *pwc = (wchar_t) c;
-  else
-    *pwc = (wchar_t) iso8859_16_2uni[c-0xa0];
-  return 1;
-}
-
-static const unsigned char iso8859_16_page00[224] = {
-  0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa7, /* 0xa0-0xa7 */
-  0x00, 0xa9, 0x00, 0xa5, 0x00, 0xad, 0x00, 0x00, /* 0xa8-0xaf */
-  0xb0, 0xb1, 0x00, 0x00, 0x00, 0x00, 0xb6, 0xb7, /* 0xb0-0xb7 */
-  0x00, 0x00, 0x00, 0xbb, 0x00, 0x00, 0x00, 0x00, /* 0xb8-0xbf */
-  0xc0, 0xc1, 0xc2, 0x00, 0xc4, 0x00, 0xc6, 0xc7, /* 0xc0-0xc7 */
-  0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, /* 0xc8-0xcf */
-  0x00, 0x00, 0xd2, 0xd3, 0xd4, 0x00, 0xd6, 0x00, /* 0xd0-0xd7 */
-  0x00, 0xd9, 0xda, 0xdb, 0xdc, 0x00, 0x00, 0xdf, /* 0xd8-0xdf */
-  0xe0, 0xe1, 0xe2, 0x00, 0xe4, 0x00, 0xe6, 0xe7, /* 0xe0-0xe7 */
-  0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, /* 0xe8-0xef */
-  0x00, 0x00, 0xf2, 0xf3, 0xf4, 0x00, 0xf6, 0x00, /* 0xf0-0xf7 */
-  0x00, 0xf9, 0xfa, 0xfb, 0xfc, 0x00, 0x00, 0xff, /* 0xf8-0xff */
-  /* 0x0100 */
-  0x00, 0x00, 0xc3, 0xe3, 0xa1, 0xa2, 0xc5, 0xe5, /* 0x00-0x07 */
-  0x00, 0x00, 0x00, 0x00, 0xb2, 0xb9, 0x00, 0x00, /* 0x08-0x0f */
-  0xd0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x17 */
-  0xdd, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x27 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x37 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3f */
-  0x00, 0xa3, 0xb3, 0xd1, 0xf1, 0x00, 0x00, 0x00, /* 0x40-0x47 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4f */
-  0xd5, 0xf5, 0xbc, 0xbd, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x57 */
-  0x00, 0x00, 0xd7, 0xf7, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5f */
-  0xa6, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x67 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6f */
-  0xd8, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x77 */
-  0xbe, 0xac, 0xae, 0xaf, 0xbf, 0xb4, 0xb8, 0x00, /* 0x78-0x7f */
-};
-static const unsigned char iso8859_16_page02[8] = {
-  0xaa, 0xba, 0xde, 0xfe, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1f */
-};
-static const unsigned char iso8859_16_page20[8] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xb5, 0xab, 0x00, /* 0x18-0x1f */
-};
-
-static int
-iso8859_16_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x00a0) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc >= 0x00a0 && wc < 0x0180)
-    c = iso8859_16_page00[wc-0x00a0];
-  else if (wc >= 0x0218 && wc < 0x0220)
-    c = iso8859_16_page02[wc-0x0218];
-  else if (wc >= 0x2018 && wc < 0x2020)
-    c = iso8859_16_page20[wc-0x2018];
-  else if (wc == 0x20ac)
-    c = 0xa4;
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/iso8859_2.h b/xc/lib/X11/lcUniConv/iso8859_2.h
deleted file mode 100644
index 2309854be..000000000
--- a/xc/lib/X11/lcUniConv/iso8859_2.h
+++ /dev/null
@@ -1,93 +0,0 @@
-
-/*
- * ISO-8859-2
- */
-
-static const unsigned short iso8859_2_2uni[96] = {
-  /* 0xa0 */
-  0x00a0, 0x0104, 0x02d8, 0x0141, 0x00a4, 0x013d, 0x015a, 0x00a7,
-  0x00a8, 0x0160, 0x015e, 0x0164, 0x0179, 0x00ad, 0x017d, 0x017b,
-  /* 0xb0 */
-  0x00b0, 0x0105, 0x02db, 0x0142, 0x00b4, 0x013e, 0x015b, 0x02c7,
-  0x00b8, 0x0161, 0x015f, 0x0165, 0x017a, 0x02dd, 0x017e, 0x017c,
-  /* 0xc0 */
-  0x0154, 0x00c1, 0x00c2, 0x0102, 0x00c4, 0x0139, 0x0106, 0x00c7,
-  0x010c, 0x00c9, 0x0118, 0x00cb, 0x011a, 0x00cd, 0x00ce, 0x010e,
-  /* 0xd0 */
-  0x0110, 0x0143, 0x0147, 0x00d3, 0x00d4, 0x0150, 0x00d6, 0x00d7,
-  0x0158, 0x016e, 0x00da, 0x0170, 0x00dc, 0x00dd, 0x0162, 0x00df,
-  /* 0xe0 */
-  0x0155, 0x00e1, 0x00e2, 0x0103, 0x00e4, 0x013a, 0x0107, 0x00e7,
-  0x010d, 0x00e9, 0x0119, 0x00eb, 0x011b, 0x00ed, 0x00ee, 0x010f,
-  /* 0xf0 */
-  0x0111, 0x0144, 0x0148, 0x00f3, 0x00f4, 0x0151, 0x00f6, 0x00f7,
-  0x0159, 0x016f, 0x00fa, 0x0171, 0x00fc, 0x00fd, 0x0163, 0x02d9,
-};
-
-static int
-iso8859_2_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c < 0xa0)
-    *pwc = (wchar_t) c;
-  else
-    *pwc = (wchar_t) iso8859_2_2uni[c-0xa0];
-  return 1;
-}
-
-static const unsigned char iso8859_2_page00[224] = {
-  0xa0, 0x00, 0x00, 0x00, 0xa4, 0x00, 0x00, 0xa7, /* 0xa0-0xa7 */
-  0xa8, 0x00, 0x00, 0x00, 0x00, 0xad, 0x00, 0x00, /* 0xa8-0xaf */
-  0xb0, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, /* 0xb0-0xb7 */
-  0xb8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xb8-0xbf */
-  0x00, 0xc1, 0xc2, 0x00, 0xc4, 0x00, 0x00, 0xc7, /* 0xc0-0xc7 */
-  0x00, 0xc9, 0x00, 0xcb, 0x00, 0xcd, 0xce, 0x00, /* 0xc8-0xcf */
-  0x00, 0x00, 0x00, 0xd3, 0xd4, 0x00, 0xd6, 0xd7, /* 0xd0-0xd7 */
-  0x00, 0x00, 0xda, 0x00, 0xdc, 0xdd, 0x00, 0xdf, /* 0xd8-0xdf */
-  0x00, 0xe1, 0xe2, 0x00, 0xe4, 0x00, 0x00, 0xe7, /* 0xe0-0xe7 */
-  0x00, 0xe9, 0x00, 0xeb, 0x00, 0xed, 0xee, 0x00, /* 0xe8-0xef */
-  0x00, 0x00, 0x00, 0xf3, 0xf4, 0x00, 0xf6, 0xf7, /* 0xf0-0xf7 */
-  0x00, 0x00, 0xfa, 0x00, 0xfc, 0xfd, 0x00, 0x00, /* 0xf8-0xff */
-  /* 0x0100 */
-  0x00, 0x00, 0xc3, 0xe3, 0xa1, 0xb1, 0xc6, 0xe6, /* 0x00-0x07 */
-  0x00, 0x00, 0x00, 0x00, 0xc8, 0xe8, 0xcf, 0xef, /* 0x08-0x0f */
-  0xd0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x17 */
-  0xca, 0xea, 0xcc, 0xec, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x27 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x37 */
-  0x00, 0xc5, 0xe5, 0x00, 0x00, 0xa5, 0xb5, 0x00, /* 0x38-0x3f */
-  0x00, 0xa3, 0xb3, 0xd1, 0xf1, 0x00, 0x00, 0xd2, /* 0x40-0x47 */
-  0xf2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4f */
-  0xd5, 0xf5, 0x00, 0x00, 0xc0, 0xe0, 0x00, 0x00, /* 0x50-0x57 */
-  0xd8, 0xf8, 0xa6, 0xb6, 0x00, 0x00, 0xaa, 0xba, /* 0x58-0x5f */
-  0xa9, 0xb9, 0xde, 0xfe, 0xab, 0xbb, 0x00, 0x00, /* 0x60-0x67 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd9, 0xf9, /* 0x68-0x6f */
-  0xdb, 0xfb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x77 */
-  0x00, 0xac, 0xbc, 0xaf, 0xbf, 0xae, 0xbe, 0x00, /* 0x78-0x7f */
-};
-static const unsigned char iso8859_2_page02[32] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb7, /* 0xc0-0xc7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc8-0xcf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd0-0xd7 */
-  0xa2, 0xff, 0x00, 0xb2, 0x00, 0xbd, 0x00, 0x00, /* 0xd8-0xdf */
-};
-
-static int
-iso8859_2_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x00a0) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc >= 0x00a0 && wc < 0x0180)
-    c = iso8859_2_page00[wc-0x00a0];
-  else if (wc >= 0x02c0 && wc < 0x02e0)
-    c = iso8859_2_page02[wc-0x02c0];
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/iso8859_3.h b/xc/lib/X11/lcUniConv/iso8859_3.h
deleted file mode 100644
index dd49928e7..000000000
--- a/xc/lib/X11/lcUniConv/iso8859_3.h
+++ /dev/null
@@ -1,99 +0,0 @@
-
-/*
- * ISO-8859-3
- */
-
-static const unsigned short iso8859_3_2uni[96] = {
-  /* 0xa0 */
-  0x00a0, 0x0126, 0x02d8, 0x00a3, 0x00a4, 0xfffd, 0x0124, 0x00a7,
-  0x00a8, 0x0130, 0x015e, 0x011e, 0x0134, 0x00ad, 0xfffd, 0x017b,
-  /* 0xb0 */
-  0x00b0, 0x0127, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x0125, 0x00b7,
-  0x00b8, 0x0131, 0x015f, 0x011f, 0x0135, 0x00bd, 0xfffd, 0x017c,
-  /* 0xc0 */
-  0x00c0, 0x00c1, 0x00c2, 0xfffd, 0x00c4, 0x010a, 0x0108, 0x00c7,
-  0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x00cc, 0x00cd, 0x00ce, 0x00cf,
-  /* 0xd0 */
-  0xfffd, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x0120, 0x00d6, 0x00d7,
-  0x011c, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x016c, 0x015c, 0x00df,
-  /* 0xe0 */
-  0x00e0, 0x00e1, 0x00e2, 0xfffd, 0x00e4, 0x010b, 0x0109, 0x00e7,
-  0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef,
-  /* 0xf0 */
-  0xfffd, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x0121, 0x00f6, 0x00f7,
-  0x011d, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x016d, 0x015d, 0x02d9,
-};
-
-static int
-iso8859_3_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c < 0xa0) {
-    *pwc = (wchar_t) c;
-    return 1;
-  }
-  else {
-    unsigned short wc = iso8859_3_2uni[c-0xa0];
-    if (wc != 0xfffd) {
-      *pwc = (wchar_t) wc;
-      return 1;
-    }
-  }
-  return RET_ILSEQ;
-}
-
-static const unsigned char iso8859_3_page00[96] = {
-  0xa0, 0x00, 0x00, 0xa3, 0xa4, 0x00, 0x00, 0xa7, /* 0xa0-0xa7 */
-  0xa8, 0x00, 0x00, 0x00, 0x00, 0xad, 0x00, 0x00, /* 0xa8-0xaf */
-  0xb0, 0x00, 0xb2, 0xb3, 0xb4, 0xb5, 0x00, 0xb7, /* 0xb0-0xb7 */
-  0xb8, 0x00, 0x00, 0x00, 0x00, 0xbd, 0x00, 0x00, /* 0xb8-0xbf */
-  0xc0, 0xc1, 0xc2, 0x00, 0xc4, 0x00, 0x00, 0xc7, /* 0xc0-0xc7 */
-  0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, /* 0xc8-0xcf */
-  0x00, 0xd1, 0xd2, 0xd3, 0xd4, 0x00, 0xd6, 0xd7, /* 0xd0-0xd7 */
-  0x00, 0xd9, 0xda, 0xdb, 0xdc, 0x00, 0x00, 0xdf, /* 0xd8-0xdf */
-  0xe0, 0xe1, 0xe2, 0x00, 0xe4, 0x00, 0x00, 0xe7, /* 0xe0-0xe7 */
-  0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, /* 0xe8-0xef */
-  0x00, 0xf1, 0xf2, 0xf3, 0xf4, 0x00, 0xf6, 0xf7, /* 0xf0-0xf7 */
-  0x00, 0xf9, 0xfa, 0xfb, 0xfc, 0x00, 0x00, 0x00, /* 0xf8-0xff */
-};
-static const unsigned char iso8859_3_page01[120] = {
-  0xc6, 0xe6, 0xc5, 0xe5, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x17 */
-  0x00, 0x00, 0x00, 0x00, 0xd8, 0xf8, 0xab, 0xbb, /* 0x18-0x1f */
-  0xd5, 0xf5, 0x00, 0x00, 0xa6, 0xb6, 0xa1, 0xb1, /* 0x20-0x27 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2f */
-  0xa9, 0xb9, 0x00, 0x00, 0xac, 0xbc, 0x00, 0x00, /* 0x30-0x37 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x47 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x57 */
-  0x00, 0x00, 0x00, 0x00, 0xde, 0xfe, 0xaa, 0xba, /* 0x58-0x5f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x67 */
-  0x00, 0x00, 0x00, 0x00, 0xdd, 0xfd, 0x00, 0x00, /* 0x68-0x6f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x77 */
-  0x00, 0x00, 0x00, 0xaf, 0xbf, 0x00, 0x00, 0x00, /* 0x78-0x7f */
-};
-static const unsigned char iso8859_3_page02[8] = {
-  0xa2, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd8-0xdf */
-};
-
-static int
-iso8859_3_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x00a0) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc >= 0x00a0 && wc < 0x0100)
-    c = iso8859_3_page00[wc-0x00a0];
-  else if (wc >= 0x0108 && wc < 0x0180)
-    c = iso8859_3_page01[wc-0x0108];
-  else if (wc >= 0x02d8 && wc < 0x02e0)
-    c = iso8859_3_page02[wc-0x02d8];
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/iso8859_4.h b/xc/lib/X11/lcUniConv/iso8859_4.h
deleted file mode 100644
index 8afd809c0..000000000
--- a/xc/lib/X11/lcUniConv/iso8859_4.h
+++ /dev/null
@@ -1,93 +0,0 @@
-
-/*
- * ISO-8859-4
- */
-
-static const unsigned short iso8859_4_2uni[96] = {
-  /* 0xa0 */
-  0x00a0, 0x0104, 0x0138, 0x0156, 0x00a4, 0x0128, 0x013b, 0x00a7,
-  0x00a8, 0x0160, 0x0112, 0x0122, 0x0166, 0x00ad, 0x017d, 0x00af,
-  /* 0xb0 */
-  0x00b0, 0x0105, 0x02db, 0x0157, 0x00b4, 0x0129, 0x013c, 0x02c7,
-  0x00b8, 0x0161, 0x0113, 0x0123, 0x0167, 0x014a, 0x017e, 0x014b,
-  /* 0xc0 */
-  0x0100, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x00c6, 0x012e,
-  0x010c, 0x00c9, 0x0118, 0x00cb, 0x0116, 0x00cd, 0x00ce, 0x012a,
-  /* 0xd0 */
-  0x0110, 0x0145, 0x014c, 0x0136, 0x00d4, 0x00d5, 0x00d6, 0x00d7,
-  0x00d8, 0x0172, 0x00da, 0x00db, 0x00dc, 0x0168, 0x016a, 0x00df,
-  /* 0xe0 */
-  0x0101, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x012f,
-  0x010d, 0x00e9, 0x0119, 0x00eb, 0x0117, 0x00ed, 0x00ee, 0x012b,
-  /* 0xf0 */
-  0x0111, 0x0146, 0x014d, 0x0137, 0x00f4, 0x00f5, 0x00f6, 0x00f7,
-  0x00f8, 0x0173, 0x00fa, 0x00fb, 0x00fc, 0x0169, 0x016b, 0x02d9,
-};
-
-static int
-iso8859_4_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c < 0xa0)
-    *pwc = (wchar_t) c;
-  else
-    *pwc = (wchar_t) iso8859_4_2uni[c-0xa0];
-  return 1;
-}
-
-static const unsigned char iso8859_4_page00[224] = {
-  0xa0, 0x00, 0x00, 0x00, 0xa4, 0x00, 0x00, 0xa7, /* 0xa0-0xa7 */
-  0xa8, 0x00, 0x00, 0x00, 0x00, 0xad, 0x00, 0xaf, /* 0xa8-0xaf */
-  0xb0, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, /* 0xb0-0xb7 */
-  0xb8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xb8-0xbf */
-  0x00, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0x00, /* 0xc0-0xc7 */
-  0x00, 0xc9, 0x00, 0xcb, 0x00, 0xcd, 0xce, 0x00, /* 0xc8-0xcf */
-  0x00, 0x00, 0x00, 0x00, 0xd4, 0xd5, 0xd6, 0xd7, /* 0xd0-0xd7 */
-  0xd8, 0x00, 0xda, 0xdb, 0xdc, 0x00, 0x00, 0xdf, /* 0xd8-0xdf */
-  0x00, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0x00, /* 0xe0-0xe7 */
-  0x00, 0xe9, 0x00, 0xeb, 0x00, 0xed, 0xee, 0x00, /* 0xe8-0xef */
-  0x00, 0x00, 0x00, 0x00, 0xf4, 0xf5, 0xf6, 0xf7, /* 0xf0-0xf7 */
-  0xf8, 0x00, 0xfa, 0xfb, 0xfc, 0x00, 0x00, 0x00, /* 0xf8-0xff */
-  /* 0x0100 */
-  0xc0, 0xe0, 0x00, 0x00, 0xa1, 0xb1, 0x00, 0x00, /* 0x00-0x07 */
-  0x00, 0x00, 0x00, 0x00, 0xc8, 0xe8, 0x00, 0x00, /* 0x08-0x0f */
-  0xd0, 0xf0, 0xaa, 0xba, 0x00, 0x00, 0xcc, 0xec, /* 0x10-0x17 */
-  0xca, 0xea, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1f */
-  0x00, 0x00, 0xab, 0xbb, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x27 */
-  0xa5, 0xb5, 0xcf, 0xef, 0x00, 0x00, 0xc7, 0xe7, /* 0x28-0x2f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd3, 0xf3, /* 0x30-0x37 */
-  0xa2, 0x00, 0x00, 0xa6, 0xb6, 0x00, 0x00, 0x00, /* 0x38-0x3f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xd1, 0xf1, 0x00, /* 0x40-0x47 */
-  0x00, 0x00, 0xbd, 0xbf, 0xd2, 0xf2, 0x00, 0x00, /* 0x48-0x4f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa3, 0xb3, /* 0x50-0x57 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5f */
-  0xa9, 0xb9, 0x00, 0x00, 0x00, 0x00, 0xac, 0xbc, /* 0x60-0x67 */
-  0xdd, 0xfd, 0xde, 0xfe, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6f */
-  0x00, 0x00, 0xd9, 0xf9, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x77 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xae, 0xbe, 0x00, /* 0x78-0x7f */
-};
-static const unsigned char iso8859_4_page02[32] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb7, /* 0xc0-0xc7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc8-0xcf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd0-0xd7 */
-  0x00, 0xff, 0x00, 0xb2, 0x00, 0x00, 0x00, 0x00, /* 0xd8-0xdf */
-};
-
-static int
-iso8859_4_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x00a0) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc >= 0x00a0 && wc < 0x0180)
-    c = iso8859_4_page00[wc-0x00a0];
-  else if (wc >= 0x02c0 && wc < 0x02e0)
-    c = iso8859_4_page02[wc-0x02c0];
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/iso8859_5.h b/xc/lib/X11/lcUniConv/iso8859_5.h
deleted file mode 100644
index de105458d..000000000
--- a/xc/lib/X11/lcUniConv/iso8859_5.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-/*
- * ISO-8859-5
- */
-
-static const unsigned short iso8859_5_2uni[96] = {
-  /* 0xa0 */
-  0x00a0, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406, 0x0407,
-  0x0408, 0x0409, 0x040a, 0x040b, 0x040c, 0x00ad, 0x040e, 0x040f,
-  /* 0xb0 */
-  0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
-  0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, 0x041f,
-  /* 0xc0 */
-  0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,
-  0x0428, 0x0429, 0x042a, 0x042b, 0x042c, 0x042d, 0x042e, 0x042f,
-  /* 0xd0 */
-  0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,
-  0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, 0x043f,
-  /* 0xe0 */
-  0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
-  0x0448, 0x0449, 0x044a, 0x044b, 0x044c, 0x044d, 0x044e, 0x044f,
-  /* 0xf0 */
-  0x2116, 0x0451, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457,
-  0x0458, 0x0459, 0x045a, 0x045b, 0x045c, 0x00a7, 0x045e, 0x045f,
-};
-
-static int
-iso8859_5_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c < 0xa0)
-    *pwc = (wchar_t) c;
-  else
-    *pwc = (wchar_t) iso8859_5_2uni[c-0xa0];
-  return 1;
-}
-
-static const unsigned char iso8859_5_page00[16] = {
-  0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfd, /* 0xa0-0xa7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xad, 0x00, 0x00, /* 0xa8-0xaf */
-};
-static const unsigned char iso8859_5_page04[96] = {
-  0x00, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, /* 0x00-0x07 */
-  0xa8, 0xa9, 0xaa, 0xab, 0xac, 0x00, 0xae, 0xaf, /* 0x08-0x0f */
-  0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, /* 0x10-0x17 */
-  0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, /* 0x18-0x1f */
-  0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, /* 0x20-0x27 */
-  0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, /* 0x28-0x2f */
-  0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, /* 0x30-0x37 */
-  0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, /* 0x38-0x3f */
-  0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, /* 0x40-0x47 */
-  0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, /* 0x48-0x4f */
-  0x00, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, /* 0x50-0x57 */
-  0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0x00, 0xfe, 0xff, /* 0x58-0x5f */
-};
-
-static int
-iso8859_5_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x00a0) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc >= 0x00a0 && wc < 0x00b0)
-    c = iso8859_5_page00[wc-0x00a0];
-  else if (wc >= 0x0400 && wc < 0x0460)
-    c = iso8859_5_page04[wc-0x0400];
-  else if (wc == 0x2116)
-    c = 0xf0;
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/iso8859_6.h b/xc/lib/X11/lcUniConv/iso8859_6.h
deleted file mode 100644
index 28761f971..000000000
--- a/xc/lib/X11/lcUniConv/iso8859_6.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-/*
- * ISO-8859-6
- */
-
-static const unsigned short iso8859_6_2uni[96] = {
-  /* 0xa0 */
-  0x00a0, 0xfffd, 0xfffd, 0xfffd, 0x00a4, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0x060c, 0x00ad, 0xfffd, 0xfffd,
-  /* 0xb0 */
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0x061b, 0xfffd, 0xfffd, 0xfffd, 0x061f,
-  /* 0xc0 */
-  0xfffd, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627,
-  0x0628, 0x0629, 0x062a, 0x062b, 0x062c, 0x062d, 0x062e, 0x062f,
-  /* 0xd0 */
-  0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x0637,
-  0x0638, 0x0639, 0x063a, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  /* 0xe0 */
-  0x0640, 0x0641, 0x0642, 0x0643, 0x0644, 0x0645, 0x0646, 0x0647,
-  0x0648, 0x0649, 0x064a, 0x064b, 0x064c, 0x064d, 0x064e, 0x064f,
-  /* 0xf0 */
-  0x0650, 0x0651, 0x0652, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-};
-
-static int
-iso8859_6_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c < 0xa0) {
-    *pwc = (wchar_t) c;
-    return 1;
-  }
-  else {
-    unsigned short wc = iso8859_6_2uni[c-0xa0];
-    if (wc != 0xfffd) {
-      *pwc = (wchar_t) wc;
-      return 1;
-    }
-  }
-  return RET_ILSEQ;
-}
-
-static const unsigned char iso8859_6_page00[16] = {
-  0xa0, 0x00, 0x00, 0x00, 0xa4, 0x00, 0x00, 0x00, /* 0xa0-0xa7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xad, 0x00, 0x00, /* 0xa8-0xaf */
-};
-static const unsigned char iso8859_6_page06[80] = {
-  0x00, 0x00, 0x00, 0x00, 0xac, 0x00, 0x00, 0x00, /* 0x08-0x0f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x17 */
-  0x00, 0x00, 0x00, 0xbb, 0x00, 0x00, 0x00, 0xbf, /* 0x18-0x1f */
-  0x00, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, /* 0x20-0x27 */
-  0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, /* 0x28-0x2f */
-  0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, /* 0x30-0x37 */
-  0xd8, 0xd9, 0xda, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3f */
-  0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, /* 0x40-0x47 */
-  0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, /* 0x48-0x4f */
-  0xf0, 0xf1, 0xf2, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x57 */
-};
-
-static int
-iso8859_6_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x00a0) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc >= 0x00a0 && wc < 0x00b0)
-    c = iso8859_6_page00[wc-0x00a0];
-  else if (wc >= 0x0608 && wc < 0x0658)
-    c = iso8859_6_page06[wc-0x0608];
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/iso8859_7.h b/xc/lib/X11/lcUniConv/iso8859_7.h
deleted file mode 100644
index ae3233e7f..000000000
--- a/xc/lib/X11/lcUniConv/iso8859_7.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-/*
- * ISO-8859-7
- */
-
-static const unsigned short iso8859_7_2uni[96] = {
-  /* 0xa0 */
-  0x00a0, 0x2018, 0x2019, 0x00a3, 0xfffd, 0xfffd, 0x00a6, 0x00a7,
-  0x00a8, 0x00a9, 0xfffd, 0x00ab, 0x00ac, 0x00ad, 0xfffd, 0x2015,
-  /* 0xb0 */
-  0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x0384, 0x0385, 0x0386, 0x00b7,
-  0x0388, 0x0389, 0x038a, 0x00bb, 0x038c, 0x00bd, 0x038e, 0x038f,
-  /* 0xc0 */
-  0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397,
-  0x0398, 0x0399, 0x039a, 0x039b, 0x039c, 0x039d, 0x039e, 0x039f,
-  /* 0xd0 */
-  0x03a0, 0x03a1, 0xfffd, 0x03a3, 0x03a4, 0x03a5, 0x03a6, 0x03a7,
-  0x03a8, 0x03a9, 0x03aa, 0x03ab, 0x03ac, 0x03ad, 0x03ae, 0x03af,
-  /* 0xe0 */
-  0x03b0, 0x03b1, 0x03b2, 0x03b3, 0x03b4, 0x03b5, 0x03b6, 0x03b7,
-  0x03b8, 0x03b9, 0x03ba, 0x03bb, 0x03bc, 0x03bd, 0x03be, 0x03bf,
-  /* 0xf0 */
-  0x03c0, 0x03c1, 0x03c2, 0x03c3, 0x03c4, 0x03c5, 0x03c6, 0x03c7,
-  0x03c8, 0x03c9, 0x03ca, 0x03cb, 0x03cc, 0x03cd, 0x03ce, 0xfffd,
-};
-
-static int
-iso8859_7_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c < 0xa0) {
-    *pwc = (wchar_t) c;
-    return 1;
-  }
-  else {
-    unsigned short wc = iso8859_7_2uni[c-0xa0];
-    if (wc != 0xfffd) {
-      *pwc = (wchar_t) wc;
-      return 1;
-    }
-  }
-  return RET_ILSEQ;
-}
-
-static const unsigned char iso8859_7_page00[32] = {
-  0xa0, 0x00, 0x00, 0xa3, 0x00, 0x00, 0xa6, 0xa7, /* 0xa0-0xa7 */
-  0xa8, 0xa9, 0x00, 0xab, 0xac, 0xad, 0x00, 0x00, /* 0xa8-0xaf */
-  0xb0, 0xb1, 0xb2, 0xb3, 0x00, 0x00, 0x00, 0xb7, /* 0xb0-0xb7 */
-  0x00, 0x00, 0x00, 0xbb, 0x00, 0xbd, 0x00, 0x00, /* 0xb8-0xbf */
-};
-static const unsigned char iso8859_7_page03[80] = {
-  0x00, 0x00, 0x00, 0x00, 0xb4, 0xb5, 0xb6, 0x00, /* 0x80-0x87 */
-  0xb8, 0xb9, 0xba, 0x00, 0xbc, 0x00, 0xbe, 0xbf, /* 0x88-0x8f */
-  0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, /* 0x90-0x97 */
-  0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, /* 0x98-0x9f */
-  0xd0, 0xd1, 0x00, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, /* 0xa0-0xa7 */
-  0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, /* 0xa8-0xaf */
-  0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, /* 0xb0-0xb7 */
-  0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, /* 0xb8-0xbf */
-  0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, /* 0xc0-0xc7 */
-  0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0x00, /* 0xc8-0xcf */
-};
-static const unsigned char iso8859_7_page20[16] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xaf, 0x00, 0x00, /* 0x10-0x17 */
-  0xa1, 0xa2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1f */
-};
-
-static int
-iso8859_7_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x00a0) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc >= 0x00a0 && wc < 0x00c0)
-    c = iso8859_7_page00[wc-0x00a0];
-  else if (wc >= 0x0380 && wc < 0x03d0)
-    c = iso8859_7_page03[wc-0x0380];
-  else if (wc >= 0x2010 && wc < 0x2020)
-    c = iso8859_7_page20[wc-0x2010];
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/iso8859_8.h b/xc/lib/X11/lcUniConv/iso8859_8.h
deleted file mode 100644
index 79569be1a..000000000
--- a/xc/lib/X11/lcUniConv/iso8859_8.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-/*
- * ISO-8859-8
- */
-
-static const unsigned short iso8859_8_2uni[96] = {
-  /* 0xa0 */
-  0x00a0, 0xfffd, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6, 0x00a7,
-  0x00a8, 0x00a9, 0x00d7, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af,
-  /* 0xb0 */
-  0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7,
-  0x00b8, 0x00b9, 0x00f7, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0xfffd,
-  /* 0xc0 */
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  /* 0xd0 */
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0x2017,
-  /* 0xe0 */
-  0x05d0, 0x05d1, 0x05d2, 0x05d3, 0x05d4, 0x05d5, 0x05d6, 0x05d7,
-  0x05d8, 0x05d9, 0x05da, 0x05db, 0x05dc, 0x05dd, 0x05de, 0x05df,
-  /* 0xf0 */
-  0x05e0, 0x05e1, 0x05e2, 0x05e3, 0x05e4, 0x05e5, 0x05e6, 0x05e7,
-  0x05e8, 0x05e9, 0x05ea, 0xfffd, 0xfffd, 0x200e, 0x200f, 0xfffd,
-};
-
-static int
-iso8859_8_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c >= 0xa0) {
-    unsigned short wc = iso8859_8_2uni[c-0xa0];
-    if (wc != 0xfffd) {
-      *pwc = (wchar_t) wc;
-      return 1;
-    }
-  }
-  else {
-    *pwc = (wchar_t) c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
-
-static const unsigned char iso8859_8_page00[88] = {
-  0xa0, 0x00, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, /* 0xa0-0xa7 */
-  0xa8, 0xa9, 0x00, 0xab, 0xac, 0xad, 0xae, 0xaf, /* 0xa8-0xaf */
-  0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, /* 0xb0-0xb7 */
-  0xb8, 0xb9, 0x00, 0xbb, 0xbc, 0xbd, 0xbe, 0x00, /* 0xb8-0xbf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc0-0xc7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc8-0xcf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, /* 0xd0-0xd7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd8-0xdf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xe0-0xe7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xe8-0xef */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xba, /* 0xf0-0xf7 */
-};
-static const unsigned char iso8859_8_page05[32] = {
-  0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, /* 0xd0-0xd7 */
-  0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, /* 0xd8-0xdf */
-  0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, /* 0xe0-0xe7 */
-  0xf8, 0xf9, 0xfa, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xe8-0xef */
-};
-static const unsigned char iso8859_8_page20[16] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfd, 0xfe, /* 0x08-0x0f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdf, /* 0x10-0x17 */
-};
-
-static int
-iso8859_8_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x00a0) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc >= 0x00a0 && wc < 0x00f8)
-    c = iso8859_8_page00[wc-0x00a0];
-  else if (wc >= 0x05d0 && wc < 0x05f0)
-    c = iso8859_8_page05[wc-0x05d0];
-  else if (wc >= 0x2008 && wc < 0x2018)
-    c = iso8859_8_page20[wc-0x2008];
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/iso8859_9.h b/xc/lib/X11/lcUniConv/iso8859_9.h
deleted file mode 100644
index 8ca997918..000000000
--- a/xc/lib/X11/lcUniConv/iso8859_9.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-/*
- * ISO-8859-9
- */
-
-static const unsigned short iso8859_9_2uni[48] = {
-  /* 0xd0 */
-  0x011e, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x00d7,
-  0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x0130, 0x015e, 0x00df,
-  /* 0xe0 */
-  0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x00e7,
-  0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef,
-  /* 0xf0 */
-  0x011f, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x00f7,
-  0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x0131, 0x015f, 0x00ff,
-};
-
-static int
-iso8859_9_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c >= 0xd0)
-    *pwc = (wchar_t) iso8859_9_2uni[c-0xd0];
-  else
-    *pwc = (wchar_t) c;
-  return 1;
-}
-
-static const unsigned char iso8859_9_page00[48] = {
-  0x00, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, /* 0xd0-0xd7 */
-  0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0x00, 0x00, 0xdf, /* 0xd8-0xdf */
-  0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, /* 0xe0-0xe7 */
-  0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, /* 0xe8-0xef */
-  0x00, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, /* 0xf0-0xf7 */
-  0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0x00, 0x00, 0xff, /* 0xf8-0xff */
-};
-static const unsigned char iso8859_9_page01[72] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0xf0, /* 0x18-0x1f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x27 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2f */
-  0xdd, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x37 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x47 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x57 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xde, 0xfe, /* 0x58-0x5f */
-};
-
-static int
-iso8859_9_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x00d0) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc >= 0x00d0 && wc < 0x0100)
-    c = iso8859_9_page00[wc-0x00d0];
-  else if (wc >= 0x0118 && wc < 0x0160)
-    c = iso8859_9_page01[wc-0x0118];
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/iso8859_9e.h b/xc/lib/X11/lcUniConv/iso8859_9e.h
deleted file mode 100644
index a5a0b609c..000000000
--- a/xc/lib/X11/lcUniConv/iso8859_9e.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* $XFree86: xc/lib/X11/lcUniConv/iso8859_9e.h,v 1.3 2000/11/28 16:10:28 dawes Exp $ */
-
-/*
- * ISO-8859-9E
- */
-
-static const unsigned short iso8859_9e_2uni[96] = {
-  /* 0xa0 */
-  0x00a0, 0x017d, 0x00a2, 0x00a3, 0x20ac, 0x00a5, 0x012c, 0x00a7,
-  0x016c, 0x00a9, 0x01e6, 0x00ab, 0x014a, 0x00ad, 0x00ae, 0x01d1,
-  /* 0xb0 */
-  0x00b0, 0x017e, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x012d, 0x00b7,
-  0x016d, 0x00b9, 0x01e7, 0x00bb, 0x014b, 0x00bd, 0x0178, 0x01d2,
-  /* 0xc0 */
-  0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x018f, 0x00c7,
-  0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x00cc, 0x00cd, 0x00ce, 0x00cf,
-  /* 0xd0 */
-  0x011e, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x00dd,
-  0x019f, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x0130, 0x015e, 0x00df,
-  /* 0xe0 */
-  0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x0259, 0x00e7,
-  0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef,
-  /* 0xf0 */
-  0x011f, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x00fd,
-  0x0275, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x0131, 0x015f, 0x00ff,
-};
-
-static int
-iso8859_9e_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c >= 0xa0)
-    *pwc = (ucs4_t) iso8859_9e_2uni[c-0xa0];
-  else
-    *pwc = (ucs4_t) c;
-  return 1;
-}
-
-static const unsigned char iso8859_9e_page00[96] = {
-  0xa0, 0x00, 0xa2, 0xa3, 0x00, 0xa5, 0x00, 0xa7, /* 0xa0-0xa7 */
-  0x00, 0xa9, 0x00, 0xab, 0x00, 0xad, 0xae, 0x00, /* 0xa8-0xaf */
-  0xb0, 0x00, 0xb2, 0xb3, 0xb4, 0xb5, 0x00, 0xb7, /* 0xb0-0xb7 */
-  0x00, 0xb9, 0x00, 0xbb, 0x00, 0xbd, 0x00, 0x00, /* 0xb8-0xbf */
-  0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0x00, 0xc7, /* 0xc0-0xc7 */
-  0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, /* 0xc8-0xcf */
-  0x00, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0x00, /* 0xd0-0xd7 */
-  0x00, 0xd9, 0xda, 0xdb, 0xdc, 0xd7, 0x00, 0xdf, /* 0xd8-0xdf */
-  0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0x00, 0xe7, /* 0xe0-0xe7 */
-  0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, /* 0xe8-0xef */
-  0x00, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0x00, /* 0xf0-0xf7 */
-  0x00, 0xf9, 0xfa, 0xfb, 0xfc, 0xf7, 0x00, 0xff, /* 0xf8-0xff */
-};
-static const unsigned char iso8859_9e_page01[136] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0xf0, /* 0x18-0x1f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x27 */
-  0x00, 0x00, 0x00, 0x00, 0xa6, 0xb6, 0x00, 0x00, /* 0x28-0x2f */
-  0xdd, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x37 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x47 */
-  0x00, 0x00, 0xac, 0xbc, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x57 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xde, 0xfe, /* 0x58-0x5f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x67 */
-  0x00, 0x00, 0x00, 0x00, 0xa8, 0xb8, 0x00, 0x00, /* 0x68-0x6f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x77 */
-  0xbe, 0x00, 0x00, 0x00, 0x00, 0xa1, 0xb1, 0x00, /* 0x78-0x7f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x87 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, /* 0x88-0x8f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x97 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, /* 0x98-0x9f */
-};
-static const unsigned char iso8859_9e_page01_d[24] = {
-  0x00, 0xaf, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd0-0xd7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd8-0xdf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xba, /* 0xe0-0xe7 */
-};
-  
-static int
-iso8859_9e_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x00a0) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc >= 0x00a0 && wc < 0x0100)
-    c = iso8859_9e_page00[wc-0x00a0];
-  else if (wc >= 0x0118 && wc < 0x01a0)
-    c = iso8859_9e_page01[wc-0x0118];
-  else if (wc >= 0x01d0 && wc < 0x01e8)
-    c = iso8859_9e_page01_d[wc-0x01d0];
-  else if (wc == 0x0259)
-    c = 0xe6;
-  else if (wc == 0x0275)
-    c = 0xf8;
-  else if (wc == 0x20ac)
-    c = 0xa4;
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/jisx0201.h b/xc/lib/X11/lcUniConv/jisx0201.h
deleted file mode 100644
index 5bde56fa5..000000000
--- a/xc/lib/X11/lcUniConv/jisx0201.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
- * JISX0201.1976-0
- */
-
-static int
-jisx0201_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c < 0x80) {
-    if (c == 0x5c)
-      *pwc = (wchar_t) 0x00a5;
-    else if (c == 0x7e)
-      *pwc = (wchar_t) 0x203e;
-    else
-      *pwc = (wchar_t) c;
-    return 1;
-  } else {
-    if (c >= 0xa1 && c < 0xe0) {
-      *pwc = (wchar_t) c + 0xfec0;
-      return 1;
-    }
-  }
-  return RET_ILSEQ;
-}
-
-static int
-jisx0201_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  if (wc < 0x0080 && !(wc == 0x005c || wc == 0x007e)) {
-    *r = wc;
-    return 1;
-  }
-  if (wc == 0x00a5) {
-    *r = 0x5c;
-    return 1;
-  }
-  if (wc == 0x203e) {
-    *r = 0x7e;
-    return 1;
-  }
-  if (wc >= 0xff61 && wc < 0xffa0) {
-    *r = wc - 0xfec0;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/jisx0208.h b/xc/lib/X11/lcUniConv/jisx0208.h
deleted file mode 100644
index ff833d6ee..000000000
--- a/xc/lib/X11/lcUniConv/jisx0208.h
+++ /dev/null
@@ -1,2396 +0,0 @@
-
-/*
- * JISX0208.1990-0
- */
-
-static const unsigned short jisx0208_2uni_page21[690] = {
-  /* 0x21 */
-  0x3000, 0x3001, 0x3002, 0xff0c, 0xff0e, 0x30fb, 0xff1a, 0xff1b,
-  0xff1f, 0xff01, 0x309b, 0x309c, 0x00b4, 0xff40, 0x00a8, 0xff3e,
-  0xffe3, 0xff3f, 0x30fd, 0x30fe, 0x309d, 0x309e, 0x3003, 0x4edd,
-  0x3005, 0x3006, 0x3007, 0x30fc, 0x2015, 0x2010, 0xff0f, 0x005c,
-  0x301c, 0x2016, 0xff5c, 0x2026, 0x2025, 0x2018, 0x2019, 0x201c,
-  0x201d, 0xff08, 0xff09, 0x3014, 0x3015, 0xff3b, 0xff3d, 0xff5b,
-  0xff5d, 0x3008, 0x3009, 0x300a, 0x300b, 0x300c, 0x300d, 0x300e,
-  0x300f, 0x3010, 0x3011, 0xff0b, 0x2212, 0x00b1, 0x00d7, 0x00f7,
-  0xff1d, 0x2260, 0xff1c, 0xff1e, 0x2266, 0x2267, 0x221e, 0x2234,
-  0x2642, 0x2640, 0x00b0, 0x2032, 0x2033, 0x2103, 0xffe5, 0xff04,
-  0x00a2, 0x00a3, 0xff05, 0xff03, 0xff06, 0xff0a, 0xff20, 0x00a7,
-  0x2606, 0x2605, 0x25cb, 0x25cf, 0x25ce, 0x25c7,
-  /* 0x22 */
-  0x25c6, 0x25a1, 0x25a0, 0x25b3, 0x25b2, 0x25bd, 0x25bc, 0x203b,
-  0x3012, 0x2192, 0x2190, 0x2191, 0x2193, 0x3013, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0x2208, 0x220b, 0x2286, 0x2287, 0x2282, 0x2283, 0x222a,
-  0x2229, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0x2227, 0x2228, 0x00ac, 0x21d2, 0x21d4, 0x2200, 0x2203,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0x2220, 0x22a5, 0x2312, 0x2202, 0x2207,
-  0x2261, 0x2252, 0x226a, 0x226b, 0x221a, 0x223d, 0x221d, 0x2235,
-  0x222b, 0x222c, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0x212b, 0x2030, 0x266f, 0x266d, 0x266a, 0x2020, 0x2021,
-  0x00b6, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0x25ef,
-  /* 0x23 */
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xff10,
-  0xff11, 0xff12, 0xff13, 0xff14, 0xff15, 0xff16, 0xff17, 0xff18,
-  0xff19, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xff21, 0xff22, 0xff23, 0xff24, 0xff25, 0xff26, 0xff27, 0xff28,
-  0xff29, 0xff2a, 0xff2b, 0xff2c, 0xff2d, 0xff2e, 0xff2f, 0xff30,
-  0xff31, 0xff32, 0xff33, 0xff34, 0xff35, 0xff36, 0xff37, 0xff38,
-  0xff39, 0xff3a, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xff41, 0xff42, 0xff43, 0xff44, 0xff45, 0xff46, 0xff47, 0xff48,
-  0xff49, 0xff4a, 0xff4b, 0xff4c, 0xff4d, 0xff4e, 0xff4f, 0xff50,
-  0xff51, 0xff52, 0xff53, 0xff54, 0xff55, 0xff56, 0xff57, 0xff58,
-  0xff59, 0xff5a, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  /* 0x24 */
-  0x3041, 0x3042, 0x3043, 0x3044, 0x3045, 0x3046, 0x3047, 0x3048,
-  0x3049, 0x304a, 0x304b, 0x304c, 0x304d, 0x304e, 0x304f, 0x3050,
-  0x3051, 0x3052, 0x3053, 0x3054, 0x3055, 0x3056, 0x3057, 0x3058,
-  0x3059, 0x305a, 0x305b, 0x305c, 0x305d, 0x305e, 0x305f, 0x3060,
-  0x3061, 0x3062, 0x3063, 0x3064, 0x3065, 0x3066, 0x3067, 0x3068,
-  0x3069, 0x306a, 0x306b, 0x306c, 0x306d, 0x306e, 0x306f, 0x3070,
-  0x3071, 0x3072, 0x3073, 0x3074, 0x3075, 0x3076, 0x3077, 0x3078,
-  0x3079, 0x307a, 0x307b, 0x307c, 0x307d, 0x307e, 0x307f, 0x3080,
-  0x3081, 0x3082, 0x3083, 0x3084, 0x3085, 0x3086, 0x3087, 0x3088,
-  0x3089, 0x308a, 0x308b, 0x308c, 0x308d, 0x308e, 0x308f, 0x3090,
-  0x3091, 0x3092, 0x3093, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  /* 0x25 */
-  0x30a1, 0x30a2, 0x30a3, 0x30a4, 0x30a5, 0x30a6, 0x30a7, 0x30a8,
-  0x30a9, 0x30aa, 0x30ab, 0x30ac, 0x30ad, 0x30ae, 0x30af, 0x30b0,
-  0x30b1, 0x30b2, 0x30b3, 0x30b4, 0x30b5, 0x30b6, 0x30b7, 0x30b8,
-  0x30b9, 0x30ba, 0x30bb, 0x30bc, 0x30bd, 0x30be, 0x30bf, 0x30c0,
-  0x30c1, 0x30c2, 0x30c3, 0x30c4, 0x30c5, 0x30c6, 0x30c7, 0x30c8,
-  0x30c9, 0x30ca, 0x30cb, 0x30cc, 0x30cd, 0x30ce, 0x30cf, 0x30d0,
-  0x30d1, 0x30d2, 0x30d3, 0x30d4, 0x30d5, 0x30d6, 0x30d7, 0x30d8,
-  0x30d9, 0x30da, 0x30db, 0x30dc, 0x30dd, 0x30de, 0x30df, 0x30e0,
-  0x30e1, 0x30e2, 0x30e3, 0x30e4, 0x30e5, 0x30e6, 0x30e7, 0x30e8,
-  0x30e9, 0x30ea, 0x30eb, 0x30ec, 0x30ed, 0x30ee, 0x30ef, 0x30f0,
-  0x30f1, 0x30f2, 0x30f3, 0x30f4, 0x30f5, 0x30f6, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  /* 0x26 */
-  0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, 0x0398,
-  0x0399, 0x039a, 0x039b, 0x039c, 0x039d, 0x039e, 0x039f, 0x03a0,
-  0x03a1, 0x03a3, 0x03a4, 0x03a5, 0x03a6, 0x03a7, 0x03a8, 0x03a9,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0x03b1, 0x03b2, 0x03b3, 0x03b4, 0x03b5, 0x03b6, 0x03b7, 0x03b8,
-  0x03b9, 0x03ba, 0x03bb, 0x03bc, 0x03bd, 0x03be, 0x03bf, 0x03c0,
-  0x03c1, 0x03c3, 0x03c4, 0x03c5, 0x03c6, 0x03c7, 0x03c8, 0x03c9,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  /* 0x27 */
-  0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0401, 0x0416,
-  0x0417, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e,
-  0x041f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426,
-  0x0427, 0x0428, 0x0429, 0x042a, 0x042b, 0x042c, 0x042d, 0x042e,
-  0x042f, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0451, 0x0436,
-  0x0437, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e,
-  0x043f, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446,
-  0x0447, 0x0448, 0x0449, 0x044a, 0x044b, 0x044c, 0x044d, 0x044e,
-  0x044f, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  /* 0x28 */
-  0x2500, 0x2502, 0x250c, 0x2510, 0x2518, 0x2514, 0x251c, 0x252c,
-  0x2524, 0x2534, 0x253c, 0x2501, 0x2503, 0x250f, 0x2513, 0x251b,
-  0x2517, 0x2523, 0x2533, 0x252b, 0x253b, 0x254b, 0x2520, 0x252f,
-  0x2528, 0x2537, 0x253f, 0x251d, 0x2530, 0x2525, 0x2538, 0x2542,
-};
-static const unsigned short jisx0208_2uni_page30[6398] = {
-  /* 0x30 */
-  0x4e9c, 0x5516, 0x5a03, 0x963f, 0x54c0, 0x611b, 0x6328, 0x59f6,
-  0x9022, 0x8475, 0x831c, 0x7a50, 0x60aa, 0x63e1, 0x6e25, 0x65ed,
-  0x8466, 0x82a6, 0x9bf5, 0x6893, 0x5727, 0x65a1, 0x6271, 0x5b9b,
-  0x59d0, 0x867b, 0x98f4, 0x7d62, 0x7dbe, 0x9b8e, 0x6216, 0x7c9f,
-  0x88b7, 0x5b89, 0x5eb5, 0x6309, 0x6697, 0x6848, 0x95c7, 0x978d,
-  0x674f, 0x4ee5, 0x4f0a, 0x4f4d, 0x4f9d, 0x5049, 0x56f2, 0x5937,
-  0x59d4, 0x5a01, 0x5c09, 0x60df, 0x610f, 0x6170, 0x6613, 0x6905,
-  0x70ba, 0x754f, 0x7570, 0x79fb, 0x7dad, 0x7def, 0x80c3, 0x840e,
-  0x8863, 0x8b02, 0x9055, 0x907a, 0x533b, 0x4e95, 0x4ea5, 0x57df,
-  0x80b2, 0x90c1, 0x78ef, 0x4e00, 0x58f1, 0x6ea2, 0x9038, 0x7a32,
-  0x8328, 0x828b, 0x9c2f, 0x5141, 0x5370, 0x54bd, 0x54e1, 0x56e0,
-  0x59fb, 0x5f15, 0x98f2, 0x6deb, 0x80e4, 0x852d,
-  /* 0x31 */
-  0x9662, 0x9670, 0x96a0, 0x97fb, 0x540b, 0x53f3, 0x5b87, 0x70cf,
-  0x7fbd, 0x8fc2, 0x96e8, 0x536f, 0x9d5c, 0x7aba, 0x4e11, 0x7893,
-  0x81fc, 0x6e26, 0x5618, 0x5504, 0x6b1d, 0x851a, 0x9c3b, 0x59e5,
-  0x53a9, 0x6d66, 0x74dc, 0x958f, 0x5642, 0x4e91, 0x904b, 0x96f2,
-  0x834f, 0x990c, 0x53e1, 0x55b6, 0x5b30, 0x5f71, 0x6620, 0x66f3,
-  0x6804, 0x6c38, 0x6cf3, 0x6d29, 0x745b, 0x76c8, 0x7a4e, 0x9834,
-  0x82f1, 0x885b, 0x8a60, 0x92ed, 0x6db2, 0x75ab, 0x76ca, 0x99c5,
-  0x60a6, 0x8b01, 0x8d8a, 0x95b2, 0x698e, 0x53ad, 0x5186, 0x5712,
-  0x5830, 0x5944, 0x5bb4, 0x5ef6, 0x6028, 0x63a9, 0x63f4, 0x6cbf,
-  0x6f14, 0x708e, 0x7114, 0x7159, 0x71d5, 0x733f, 0x7e01, 0x8276,
-  0x82d1, 0x8597, 0x9060, 0x925b, 0x9d1b, 0x5869, 0x65bc, 0x6c5a,
-  0x7525, 0x51f9, 0x592e, 0x5965, 0x5f80, 0x5fdc,
-  /* 0x32 */
-  0x62bc, 0x65fa, 0x6a2a, 0x6b27, 0x6bb4, 0x738b, 0x7fc1, 0x8956,
-  0x9d2c, 0x9d0e, 0x9ec4, 0x5ca1, 0x6c96, 0x837b, 0x5104, 0x5c4b,
-  0x61b6, 0x81c6, 0x6876, 0x7261, 0x4e59, 0x4ffa, 0x5378, 0x6069,
-  0x6e29, 0x7a4f, 0x97f3, 0x4e0b, 0x5316, 0x4eee, 0x4f55, 0x4f3d,
-  0x4fa1, 0x4f73, 0x52a0, 0x53ef, 0x5609, 0x590f, 0x5ac1, 0x5bb6,
-  0x5be1, 0x79d1, 0x6687, 0x679c, 0x67b6, 0x6b4c, 0x6cb3, 0x706b,
-  0x73c2, 0x798d, 0x79be, 0x7a3c, 0x7b87, 0x82b1, 0x82db, 0x8304,
-  0x8377, 0x83ef, 0x83d3, 0x8766, 0x8ab2, 0x5629, 0x8ca8, 0x8fe6,
-  0x904e, 0x971e, 0x868a, 0x4fc4, 0x5ce8, 0x6211, 0x7259, 0x753b,
-  0x81e5, 0x82bd, 0x86fe, 0x8cc0, 0x96c5, 0x9913, 0x99d5, 0x4ecb,
-  0x4f1a, 0x89e3, 0x56de, 0x584a, 0x58ca, 0x5efb, 0x5feb, 0x602a,
-  0x6094, 0x6062, 0x61d0, 0x6212, 0x62d0, 0x6539,
-  /* 0x33 */
-  0x9b41, 0x6666, 0x68b0, 0x6d77, 0x7070, 0x754c, 0x7686, 0x7d75,
-  0x82a5, 0x87f9, 0x958b, 0x968e, 0x8c9d, 0x51f1, 0x52be, 0x5916,
-  0x54b3, 0x5bb3, 0x5d16, 0x6168, 0x6982, 0x6daf, 0x788d, 0x84cb,
-  0x8857, 0x8a72, 0x93a7, 0x9ab8, 0x6d6c, 0x99a8, 0x86d9, 0x57a3,
-  0x67ff, 0x86ce, 0x920e, 0x5283, 0x5687, 0x5404, 0x5ed3, 0x62e1,
-  0x64b9, 0x683c, 0x6838, 0x6bbb, 0x7372, 0x78ba, 0x7a6b, 0x899a,
-  0x89d2, 0x8d6b, 0x8f03, 0x90ed, 0x95a3, 0x9694, 0x9769, 0x5b66,
-  0x5cb3, 0x697d, 0x984d, 0x984e, 0x639b, 0x7b20, 0x6a2b, 0x6a7f,
-  0x68b6, 0x9c0d, 0x6f5f, 0x5272, 0x559d, 0x6070, 0x62ec, 0x6d3b,
-  0x6e07, 0x6ed1, 0x845b, 0x8910, 0x8f44, 0x4e14, 0x9c39, 0x53f6,
-  0x691b, 0x6a3a, 0x9784, 0x682a, 0x515c, 0x7ac3, 0x84b2, 0x91dc,
-  0x938c, 0x565b, 0x9d28, 0x6822, 0x8305, 0x8431,
-  /* 0x34 */
-  0x7ca5, 0x5208, 0x82c5, 0x74e6, 0x4e7e, 0x4f83, 0x51a0, 0x5bd2,
-  0x520a, 0x52d8, 0x52e7, 0x5dfb, 0x559a, 0x582a, 0x59e6, 0x5b8c,
-  0x5b98, 0x5bdb, 0x5e72, 0x5e79, 0x60a3, 0x611f, 0x6163, 0x61be,
-  0x63db, 0x6562, 0x67d1, 0x6853, 0x68fa, 0x6b3e, 0x6b53, 0x6c57,
-  0x6f22, 0x6f97, 0x6f45, 0x74b0, 0x7518, 0x76e3, 0x770b, 0x7aff,
-  0x7ba1, 0x7c21, 0x7de9, 0x7f36, 0x7ff0, 0x809d, 0x8266, 0x839e,
-  0x89b3, 0x8acc, 0x8cab, 0x9084, 0x9451, 0x9593, 0x9591, 0x95a2,
-  0x9665, 0x97d3, 0x9928, 0x8218, 0x4e38, 0x542b, 0x5cb8, 0x5dcc,
-  0x73a9, 0x764c, 0x773c, 0x5ca9, 0x7feb, 0x8d0b, 0x96c1, 0x9811,
-  0x9854, 0x9858, 0x4f01, 0x4f0e, 0x5371, 0x559c, 0x5668, 0x57fa,
-  0x5947, 0x5b09, 0x5bc4, 0x5c90, 0x5e0c, 0x5e7e, 0x5fcc, 0x63ee,
-  0x673a, 0x65d7, 0x65e2, 0x671f, 0x68cb, 0x68c4,
-  /* 0x35 */
-  0x6a5f, 0x5e30, 0x6bc5, 0x6c17, 0x6c7d, 0x757f, 0x7948, 0x5b63,
-  0x7a00, 0x7d00, 0x5fbd, 0x898f, 0x8a18, 0x8cb4, 0x8d77, 0x8ecc,
-  0x8f1d, 0x98e2, 0x9a0e, 0x9b3c, 0x4e80, 0x507d, 0x5100, 0x5993,
-  0x5b9c, 0x622f, 0x6280, 0x64ec, 0x6b3a, 0x72a0, 0x7591, 0x7947,
-  0x7fa9, 0x87fb, 0x8abc, 0x8b70, 0x63ac, 0x83ca, 0x97a0, 0x5409,
-  0x5403, 0x55ab, 0x6854, 0x6a58, 0x8a70, 0x7827, 0x6775, 0x9ecd,
-  0x5374, 0x5ba2, 0x811a, 0x8650, 0x9006, 0x4e18, 0x4e45, 0x4ec7,
-  0x4f11, 0x53ca, 0x5438, 0x5bae, 0x5f13, 0x6025, 0x6551, 0x673d,
-  0x6c42, 0x6c72, 0x6ce3, 0x7078, 0x7403, 0x7a76, 0x7aae, 0x7b08,
-  0x7d1a, 0x7cfe, 0x7d66, 0x65e7, 0x725b, 0x53bb, 0x5c45, 0x5de8,
-  0x62d2, 0x62e0, 0x6319, 0x6e20, 0x865a, 0x8a31, 0x8ddd, 0x92f8,
-  0x6f01, 0x79a6, 0x9b5a, 0x4ea8, 0x4eab, 0x4eac,
-  /* 0x36 */
-  0x4f9b, 0x4fa0, 0x50d1, 0x5147, 0x7af6, 0x5171, 0x51f6, 0x5354,
-  0x5321, 0x537f, 0x53eb, 0x55ac, 0x5883, 0x5ce1, 0x5f37, 0x5f4a,
-  0x602f, 0x6050, 0x606d, 0x631f, 0x6559, 0x6a4b, 0x6cc1, 0x72c2,
-  0x72ed, 0x77ef, 0x80f8, 0x8105, 0x8208, 0x854e, 0x90f7, 0x93e1,
-  0x97ff, 0x9957, 0x9a5a, 0x4ef0, 0x51dd, 0x5c2d, 0x6681, 0x696d,
-  0x5c40, 0x66f2, 0x6975, 0x7389, 0x6850, 0x7c81, 0x50c5, 0x52e4,
-  0x5747, 0x5dfe, 0x9326, 0x65a4, 0x6b23, 0x6b3d, 0x7434, 0x7981,
-  0x79bd, 0x7b4b, 0x7dca, 0x82b9, 0x83cc, 0x887f, 0x895f, 0x8b39,
-  0x8fd1, 0x91d1, 0x541f, 0x9280, 0x4e5d, 0x5036, 0x53e5, 0x533a,
-  0x72d7, 0x7396, 0x77e9, 0x82e6, 0x8eaf, 0x99c6, 0x99c8, 0x99d2,
-  0x5177, 0x611a, 0x865e, 0x55b0, 0x7a7a, 0x5076, 0x5bd3, 0x9047,
-  0x9685, 0x4e32, 0x6adb, 0x91e7, 0x5c51, 0x5c48,
-  /* 0x37 */
-  0x6398, 0x7a9f, 0x6c93, 0x9774, 0x8f61, 0x7aaa, 0x718a, 0x9688,
-  0x7c82, 0x6817, 0x7e70, 0x6851, 0x936c, 0x52f2, 0x541b, 0x85ab,
-  0x8a13, 0x7fa4, 0x8ecd, 0x90e1, 0x5366, 0x8888, 0x7941, 0x4fc2,
-  0x50be, 0x5211, 0x5144, 0x5553, 0x572d, 0x73ea, 0x578b, 0x5951,
-  0x5f62, 0x5f84, 0x6075, 0x6176, 0x6167, 0x61a9, 0x63b2, 0x643a,
-  0x656c, 0x666f, 0x6842, 0x6e13, 0x7566, 0x7a3d, 0x7cfb, 0x7d4c,
-  0x7d99, 0x7e4b, 0x7f6b, 0x830e, 0x834a, 0x86cd, 0x8a08, 0x8a63,
-  0x8b66, 0x8efd, 0x981a, 0x9d8f, 0x82b8, 0x8fce, 0x9be8, 0x5287,
-  0x621f, 0x6483, 0x6fc0, 0x9699, 0x6841, 0x5091, 0x6b20, 0x6c7a,
-  0x6f54, 0x7a74, 0x7d50, 0x8840, 0x8a23, 0x6708, 0x4ef6, 0x5039,
-  0x5026, 0x5065, 0x517c, 0x5238, 0x5263, 0x55a7, 0x570f, 0x5805,
-  0x5acc, 0x5efa, 0x61b2, 0x61f8, 0x62f3, 0x6372,
-  /* 0x38 */
-  0x691c, 0x6a29, 0x727d, 0x72ac, 0x732e, 0x7814, 0x786f, 0x7d79,
-  0x770c, 0x80a9, 0x898b, 0x8b19, 0x8ce2, 0x8ed2, 0x9063, 0x9375,
-  0x967a, 0x9855, 0x9a13, 0x9e78, 0x5143, 0x539f, 0x53b3, 0x5e7b,
-  0x5f26, 0x6e1b, 0x6e90, 0x7384, 0x73fe, 0x7d43, 0x8237, 0x8a00,
-  0x8afa, 0x9650, 0x4e4e, 0x500b, 0x53e4, 0x547c, 0x56fa, 0x59d1,
-  0x5b64, 0x5df1, 0x5eab, 0x5f27, 0x6238, 0x6545, 0x67af, 0x6e56,
-  0x72d0, 0x7cca, 0x88b4, 0x80a1, 0x80e1, 0x83f0, 0x864e, 0x8a87,
-  0x8de8, 0x9237, 0x96c7, 0x9867, 0x9f13, 0x4e94, 0x4e92, 0x4f0d,
-  0x5348, 0x5449, 0x543e, 0x5a2f, 0x5f8c, 0x5fa1, 0x609f, 0x68a7,
-  0x6a8e, 0x745a, 0x7881, 0x8a9e, 0x8aa4, 0x8b77, 0x9190, 0x4e5e,
-  0x9bc9, 0x4ea4, 0x4f7c, 0x4faf, 0x5019, 0x5016, 0x5149, 0x516c,
-  0x529f, 0x52b9, 0x52fe, 0x539a, 0x53e3, 0x5411,
-  /* 0x39 */
-  0x540e, 0x5589, 0x5751, 0x57a2, 0x597d, 0x5b54, 0x5b5d, 0x5b8f,
-  0x5de5, 0x5de7, 0x5df7, 0x5e78, 0x5e83, 0x5e9a, 0x5eb7, 0x5f18,
-  0x6052, 0x614c, 0x6297, 0x62d8, 0x63a7, 0x653b, 0x6602, 0x6643,
-  0x66f4, 0x676d, 0x6821, 0x6897, 0x69cb, 0x6c5f, 0x6d2a, 0x6d69,
-  0x6e2f, 0x6e9d, 0x7532, 0x7687, 0x786c, 0x7a3f, 0x7ce0, 0x7d05,
-  0x7d18, 0x7d5e, 0x7db1, 0x8015, 0x8003, 0x80af, 0x80b1, 0x8154,
-  0x818f, 0x822a, 0x8352, 0x884c, 0x8861, 0x8b1b, 0x8ca2, 0x8cfc,
-  0x90ca, 0x9175, 0x9271, 0x783f, 0x92fc, 0x95a4, 0x964d, 0x9805,
-  0x9999, 0x9ad8, 0x9d3b, 0x525b, 0x52ab, 0x53f7, 0x5408, 0x58d5,
-  0x62f7, 0x6fe0, 0x8c6a, 0x8f5f, 0x9eb9, 0x514b, 0x523b, 0x544a,
-  0x56fd, 0x7a40, 0x9177, 0x9d60, 0x9ed2, 0x7344, 0x6f09, 0x8170,
-  0x7511, 0x5ffd, 0x60da, 0x9aa8, 0x72db, 0x8fbc,
-  /* 0x3a */
-  0x6b64, 0x9803, 0x4eca, 0x56f0, 0x5764, 0x58be, 0x5a5a, 0x6068,
-  0x61c7, 0x660f, 0x6606, 0x6839, 0x68b1, 0x6df7, 0x75d5, 0x7d3a,
-  0x826e, 0x9b42, 0x4e9b, 0x4f50, 0x53c9, 0x5506, 0x5d6f, 0x5de6,
-  0x5dee, 0x67fb, 0x6c99, 0x7473, 0x7802, 0x8a50, 0x9396, 0x88df,
-  0x5750, 0x5ea7, 0x632b, 0x50b5, 0x50ac, 0x518d, 0x6700, 0x54c9,
-  0x585e, 0x59bb, 0x5bb0, 0x5f69, 0x624d, 0x63a1, 0x683d, 0x6b73,
-  0x6e08, 0x707d, 0x91c7, 0x7280, 0x7815, 0x7826, 0x796d, 0x658e,
-  0x7d30, 0x83dc, 0x88c1, 0x8f09, 0x969b, 0x5264, 0x5728, 0x6750,
-  0x7f6a, 0x8ca1, 0x51b4, 0x5742, 0x962a, 0x583a, 0x698a, 0x80b4,
-  0x54b2, 0x5d0e, 0x57fc, 0x7895, 0x9dfa, 0x4f5c, 0x524a, 0x548b,
-  0x643e, 0x6628, 0x6714, 0x67f5, 0x7a84, 0x7b56, 0x7d22, 0x932f,
-  0x685c, 0x9bad, 0x7b39, 0x5319, 0x518a, 0x5237,
-  /* 0x3b */
-  0x5bdf, 0x62f6, 0x64ae, 0x64e6, 0x672d, 0x6bba, 0x85a9, 0x96d1,
-  0x7690, 0x9bd6, 0x634c, 0x9306, 0x9bab, 0x76bf, 0x6652, 0x4e09,
-  0x5098, 0x53c2, 0x5c71, 0x60e8, 0x6492, 0x6563, 0x685f, 0x71e6,
-  0x73ca, 0x7523, 0x7b97, 0x7e82, 0x8695, 0x8b83, 0x8cdb, 0x9178,
-  0x9910, 0x65ac, 0x66ab, 0x6b8b, 0x4ed5, 0x4ed4, 0x4f3a, 0x4f7f,
-  0x523a, 0x53f8, 0x53f2, 0x55e3, 0x56db, 0x58eb, 0x59cb, 0x59c9,
-  0x59ff, 0x5b50, 0x5c4d, 0x5e02, 0x5e2b, 0x5fd7, 0x601d, 0x6307,
-  0x652f, 0x5b5c, 0x65af, 0x65bd, 0x65e8, 0x679d, 0x6b62, 0x6b7b,
-  0x6c0f, 0x7345, 0x7949, 0x79c1, 0x7cf8, 0x7d19, 0x7d2b, 0x80a2,
-  0x8102, 0x81f3, 0x8996, 0x8a5e, 0x8a69, 0x8a66, 0x8a8c, 0x8aee,
-  0x8cc7, 0x8cdc, 0x96cc, 0x98fc, 0x6b6f, 0x4e8b, 0x4f3c, 0x4f8d,
-  0x5150, 0x5b57, 0x5bfa, 0x6148, 0x6301, 0x6642,
-  /* 0x3c */
-  0x6b21, 0x6ecb, 0x6cbb, 0x723e, 0x74bd, 0x75d4, 0x78c1, 0x793a,
-  0x800c, 0x8033, 0x81ea, 0x8494, 0x8f9e, 0x6c50, 0x9e7f, 0x5f0f,
-  0x8b58, 0x9d2b, 0x7afa, 0x8ef8, 0x5b8d, 0x96eb, 0x4e03, 0x53f1,
-  0x57f7, 0x5931, 0x5ac9, 0x5ba4, 0x6089, 0x6e7f, 0x6f06, 0x75be,
-  0x8cea, 0x5b9f, 0x8500, 0x7be0, 0x5072, 0x67f4, 0x829d, 0x5c61,
-  0x854a, 0x7e1e, 0x820e, 0x5199, 0x5c04, 0x6368, 0x8d66, 0x659c,
-  0x716e, 0x793e, 0x7d17, 0x8005, 0x8b1d, 0x8eca, 0x906e, 0x86c7,
-  0x90aa, 0x501f, 0x52fa, 0x5c3a, 0x6753, 0x707c, 0x7235, 0x914c,
-  0x91c8, 0x932b, 0x82e5, 0x5bc2, 0x5f31, 0x60f9, 0x4e3b, 0x53d6,
-  0x5b88, 0x624b, 0x6731, 0x6b8a, 0x72e9, 0x73e0, 0x7a2e, 0x816b,
-  0x8da3, 0x9152, 0x9996, 0x5112, 0x53d7, 0x546a, 0x5bff, 0x6388,
-  0x6a39, 0x7dac, 0x9700, 0x56da, 0x53ce, 0x5468,
-  /* 0x3d */
-  0x5b97, 0x5c31, 0x5dde, 0x4fee, 0x6101, 0x62fe, 0x6d32, 0x79c0,
-  0x79cb, 0x7d42, 0x7e4d, 0x7fd2, 0x81ed, 0x821f, 0x8490, 0x8846,
-  0x8972, 0x8b90, 0x8e74, 0x8f2f, 0x9031, 0x914b, 0x916c, 0x96c6,
-  0x919c, 0x4ec0, 0x4f4f, 0x5145, 0x5341, 0x5f93, 0x620e, 0x67d4,
-  0x6c41, 0x6e0b, 0x7363, 0x7e26, 0x91cd, 0x9283, 0x53d4, 0x5919,
-  0x5bbf, 0x6dd1, 0x795d, 0x7e2e, 0x7c9b, 0x587e, 0x719f, 0x51fa,
-  0x8853, 0x8ff0, 0x4fca, 0x5cfb, 0x6625, 0x77ac, 0x7ae3, 0x821c,
-  0x99ff, 0x51c6, 0x5faa, 0x65ec, 0x696f, 0x6b89, 0x6df3, 0x6e96,
-  0x6f64, 0x76fe, 0x7d14, 0x5de1, 0x9075, 0x9187, 0x9806, 0x51e6,
-  0x521d, 0x6240, 0x6691, 0x66d9, 0x6e1a, 0x5eb6, 0x7dd2, 0x7f72,
-  0x66f8, 0x85af, 0x85f7, 0x8af8, 0x52a9, 0x53d9, 0x5973, 0x5e8f,
-  0x5f90, 0x6055, 0x92e4, 0x9664, 0x50b7, 0x511f,
-  /* 0x3e */
-  0x52dd, 0x5320, 0x5347, 0x53ec, 0x54e8, 0x5546, 0x5531, 0x5617,
-  0x5968, 0x59be, 0x5a3c, 0x5bb5, 0x5c06, 0x5c0f, 0x5c11, 0x5c1a,
-  0x5e84, 0x5e8a, 0x5ee0, 0x5f70, 0x627f, 0x6284, 0x62db, 0x638c,
-  0x6377, 0x6607, 0x660c, 0x662d, 0x6676, 0x677e, 0x68a2, 0x6a1f,
-  0x6a35, 0x6cbc, 0x6d88, 0x6e09, 0x6e58, 0x713c, 0x7126, 0x7167,
-  0x75c7, 0x7701, 0x785d, 0x7901, 0x7965, 0x79f0, 0x7ae0, 0x7b11,
-  0x7ca7, 0x7d39, 0x8096, 0x83d6, 0x848b, 0x8549, 0x885d, 0x88f3,
-  0x8a1f, 0x8a3c, 0x8a54, 0x8a73, 0x8c61, 0x8cde, 0x91a4, 0x9266,
-  0x937e, 0x9418, 0x969c, 0x9798, 0x4e0a, 0x4e08, 0x4e1e, 0x4e57,
-  0x5197, 0x5270, 0x57ce, 0x5834, 0x58cc, 0x5b22, 0x5e38, 0x60c5,
-  0x64fe, 0x6761, 0x6756, 0x6d44, 0x72b6, 0x7573, 0x7a63, 0x84b8,
-  0x8b72, 0x91b8, 0x9320, 0x5631, 0x57f4, 0x98fe,
-  /* 0x3f */
-  0x62ed, 0x690d, 0x6b96, 0x71ed, 0x7e54, 0x8077, 0x8272, 0x89e6,
-  0x98df, 0x8755, 0x8fb1, 0x5c3b, 0x4f38, 0x4fe1, 0x4fb5, 0x5507,
-  0x5a20, 0x5bdd, 0x5be9, 0x5fc3, 0x614e, 0x632f, 0x65b0, 0x664b,
-  0x68ee, 0x699b, 0x6d78, 0x6df1, 0x7533, 0x75b9, 0x771f, 0x795e,
-  0x79e6, 0x7d33, 0x81e3, 0x82af, 0x85aa, 0x89aa, 0x8a3a, 0x8eab,
-  0x8f9b, 0x9032, 0x91dd, 0x9707, 0x4eba, 0x4ec1, 0x5203, 0x5875,
-  0x58ec, 0x5c0b, 0x751a, 0x5c3d, 0x814e, 0x8a0a, 0x8fc5, 0x9663,
-  0x976d, 0x7b25, 0x8acf, 0x9808, 0x9162, 0x56f3, 0x53a8, 0x9017,
-  0x5439, 0x5782, 0x5e25, 0x63a8, 0x6c34, 0x708a, 0x7761, 0x7c8b,
-  0x7fe0, 0x8870, 0x9042, 0x9154, 0x9310, 0x9318, 0x968f, 0x745e,
-  0x9ac4, 0x5d07, 0x5d69, 0x6570, 0x67a2, 0x8da8, 0x96db, 0x636e,
-  0x6749, 0x6919, 0x83c5, 0x9817, 0x96c0, 0x88fe,
-  /* 0x40 */
-  0x6f84, 0x647a, 0x5bf8, 0x4e16, 0x702c, 0x755d, 0x662f, 0x51c4,
-  0x5236, 0x52e2, 0x59d3, 0x5f81, 0x6027, 0x6210, 0x653f, 0x6574,
-  0x661f, 0x6674, 0x68f2, 0x6816, 0x6b63, 0x6e05, 0x7272, 0x751f,
-  0x76db, 0x7cbe, 0x8056, 0x58f0, 0x88fd, 0x897f, 0x8aa0, 0x8a93,
-  0x8acb, 0x901d, 0x9192, 0x9752, 0x9759, 0x6589, 0x7a0e, 0x8106,
-  0x96bb, 0x5e2d, 0x60dc, 0x621a, 0x65a5, 0x6614, 0x6790, 0x77f3,
-  0x7a4d, 0x7c4d, 0x7e3e, 0x810a, 0x8cac, 0x8d64, 0x8de1, 0x8e5f,
-  0x78a9, 0x5207, 0x62d9, 0x63a5, 0x6442, 0x6298, 0x8a2d, 0x7a83,
-  0x7bc0, 0x8aac, 0x96ea, 0x7d76, 0x820c, 0x8749, 0x4ed9, 0x5148,
-  0x5343, 0x5360, 0x5ba3, 0x5c02, 0x5c16, 0x5ddd, 0x6226, 0x6247,
-  0x64b0, 0x6813, 0x6834, 0x6cc9, 0x6d45, 0x6d17, 0x67d3, 0x6f5c,
-  0x714e, 0x717d, 0x65cb, 0x7a7f, 0x7bad, 0x7dda,
-  /* 0x41 */
-  0x7e4a, 0x7fa8, 0x817a, 0x821b, 0x8239, 0x85a6, 0x8a6e, 0x8cce,
-  0x8df5, 0x9078, 0x9077, 0x92ad, 0x9291, 0x9583, 0x9bae, 0x524d,
-  0x5584, 0x6f38, 0x7136, 0x5168, 0x7985, 0x7e55, 0x81b3, 0x7cce,
-  0x564c, 0x5851, 0x5ca8, 0x63aa, 0x66fe, 0x66fd, 0x695a, 0x72d9,
-  0x758f, 0x758e, 0x790e, 0x7956, 0x79df, 0x7c97, 0x7d20, 0x7d44,
-  0x8607, 0x8a34, 0x963b, 0x9061, 0x9f20, 0x50e7, 0x5275, 0x53cc,
-  0x53e2, 0x5009, 0x55aa, 0x58ee, 0x594f, 0x723d, 0x5b8b, 0x5c64,
-  0x531d, 0x60e3, 0x60f3, 0x635c, 0x6383, 0x633f, 0x63bb, 0x64cd,
-  0x65e9, 0x66f9, 0x5de3, 0x69cd, 0x69fd, 0x6f15, 0x71e5, 0x4e89,
-  0x75e9, 0x76f8, 0x7a93, 0x7cdf, 0x7dcf, 0x7d9c, 0x8061, 0x8349,
-  0x8358, 0x846c, 0x84bc, 0x85fb, 0x88c5, 0x8d70, 0x9001, 0x906d,
-  0x9397, 0x971c, 0x9a12, 0x50cf, 0x5897, 0x618e,
-  /* 0x42 */
-  0x81d3, 0x8535, 0x8d08, 0x9020, 0x4fc3, 0x5074, 0x5247, 0x5373,
-  0x606f, 0x6349, 0x675f, 0x6e2c, 0x8db3, 0x901f, 0x4fd7, 0x5c5e,
-  0x8cca, 0x65cf, 0x7d9a, 0x5352, 0x8896, 0x5176, 0x63c3, 0x5b58,
-  0x5b6b, 0x5c0a, 0x640d, 0x6751, 0x905c, 0x4ed6, 0x591a, 0x592a,
-  0x6c70, 0x8a51, 0x553e, 0x5815, 0x59a5, 0x60f0, 0x6253, 0x67c1,
-  0x8235, 0x6955, 0x9640, 0x99c4, 0x9a28, 0x4f53, 0x5806, 0x5bfe,
-  0x8010, 0x5cb1, 0x5e2f, 0x5f85, 0x6020, 0x614b, 0x6234, 0x66ff,
-  0x6cf0, 0x6ede, 0x80ce, 0x817f, 0x82d4, 0x888b, 0x8cb8, 0x9000,
-  0x902e, 0x968a, 0x9edb, 0x9bdb, 0x4ee3, 0x53f0, 0x5927, 0x7b2c,
-  0x918d, 0x984c, 0x9df9, 0x6edd, 0x7027, 0x5353, 0x5544, 0x5b85,
-  0x6258, 0x629e, 0x62d3, 0x6ca2, 0x6fef, 0x7422, 0x8a17, 0x9438,
-  0x6fc1, 0x8afe, 0x8338, 0x51e7, 0x86f8, 0x53ea,
-  /* 0x43 */
-  0x53e9, 0x4f46, 0x9054, 0x8fb0, 0x596a, 0x8131, 0x5dfd, 0x7aea,
-  0x8fbf, 0x68da, 0x8c37, 0x72f8, 0x9c48, 0x6a3d, 0x8ab0, 0x4e39,
-  0x5358, 0x5606, 0x5766, 0x62c5, 0x63a2, 0x65e6, 0x6b4e, 0x6de1,
-  0x6e5b, 0x70ad, 0x77ed, 0x7aef, 0x7baa, 0x7dbb, 0x803d, 0x80c6,
-  0x86cb, 0x8a95, 0x935b, 0x56e3, 0x58c7, 0x5f3e, 0x65ad, 0x6696,
-  0x6a80, 0x6bb5, 0x7537, 0x8ac7, 0x5024, 0x77e5, 0x5730, 0x5f1b,
-  0x6065, 0x667a, 0x6c60, 0x75f4, 0x7a1a, 0x7f6e, 0x81f4, 0x8718,
-  0x9045, 0x99b3, 0x7bc9, 0x755c, 0x7af9, 0x7b51, 0x84c4, 0x9010,
-  0x79e9, 0x7a92, 0x8336, 0x5ae1, 0x7740, 0x4e2d, 0x4ef2, 0x5b99,
-  0x5fe0, 0x62bd, 0x663c, 0x67f1, 0x6ce8, 0x866b, 0x8877, 0x8a3b,
-  0x914e, 0x92f3, 0x99d0, 0x6a17, 0x7026, 0x732a, 0x82e7, 0x8457,
-  0x8caf, 0x4e01, 0x5146, 0x51cb, 0x558b, 0x5bf5,
-  /* 0x44 */
-  0x5e16, 0x5e33, 0x5e81, 0x5f14, 0x5f35, 0x5f6b, 0x5fb4, 0x61f2,
-  0x6311, 0x66a2, 0x671d, 0x6f6e, 0x7252, 0x753a, 0x773a, 0x8074,
-  0x8139, 0x8178, 0x8776, 0x8abf, 0x8adc, 0x8d85, 0x8df3, 0x929a,
-  0x9577, 0x9802, 0x9ce5, 0x52c5, 0x6357, 0x76f4, 0x6715, 0x6c88,
-  0x73cd, 0x8cc3, 0x93ae, 0x9673, 0x6d25, 0x589c, 0x690e, 0x69cc,
-  0x8ffd, 0x939a, 0x75db, 0x901a, 0x585a, 0x6802, 0x63b4, 0x69fb,
-  0x4f43, 0x6f2c, 0x67d8, 0x8fbb, 0x8526, 0x7db4, 0x9354, 0x693f,
-  0x6f70, 0x576a, 0x58f7, 0x5b2c, 0x7d2c, 0x722a, 0x540a, 0x91e3,
-  0x9db4, 0x4ead, 0x4f4e, 0x505c, 0x5075, 0x5243, 0x8c9e, 0x5448,
-  0x5824, 0x5b9a, 0x5e1d, 0x5e95, 0x5ead, 0x5ef7, 0x5f1f, 0x608c,
-  0x62b5, 0x633a, 0x63d0, 0x68af, 0x6c40, 0x7887, 0x798e, 0x7a0b,
-  0x7de0, 0x8247, 0x8a02, 0x8ae6, 0x8e44, 0x9013,
-  /* 0x45 */
-  0x90b8, 0x912d, 0x91d8, 0x9f0e, 0x6ce5, 0x6458, 0x64e2, 0x6575,
-  0x6ef4, 0x7684, 0x7b1b, 0x9069, 0x93d1, 0x6eba, 0x54f2, 0x5fb9,
-  0x64a4, 0x8f4d, 0x8fed, 0x9244, 0x5178, 0x586b, 0x5929, 0x5c55,
-  0x5e97, 0x6dfb, 0x7e8f, 0x751c, 0x8cbc, 0x8ee2, 0x985b, 0x70b9,
-  0x4f1d, 0x6bbf, 0x6fb1, 0x7530, 0x96fb, 0x514e, 0x5410, 0x5835,
-  0x5857, 0x59ac, 0x5c60, 0x5f92, 0x6597, 0x675c, 0x6e21, 0x767b,
-  0x83df, 0x8ced, 0x9014, 0x90fd, 0x934d, 0x7825, 0x783a, 0x52aa,
-  0x5ea6, 0x571f, 0x5974, 0x6012, 0x5012, 0x515a, 0x51ac, 0x51cd,
-  0x5200, 0x5510, 0x5854, 0x5858, 0x5957, 0x5b95, 0x5cf6, 0x5d8b,
-  0x60bc, 0x6295, 0x642d, 0x6771, 0x6843, 0x68bc, 0x68df, 0x76d7,
-  0x6dd8, 0x6e6f, 0x6d9b, 0x706f, 0x71c8, 0x5f53, 0x75d8, 0x7977,
-  0x7b49, 0x7b54, 0x7b52, 0x7cd6, 0x7d71, 0x5230,
-  /* 0x46 */
-  0x8463, 0x8569, 0x85e4, 0x8a0e, 0x8b04, 0x8c46, 0x8e0f, 0x9003,
-  0x900f, 0x9419, 0x9676, 0x982d, 0x9a30, 0x95d8, 0x50cd, 0x52d5,
-  0x540c, 0x5802, 0x5c0e, 0x61a7, 0x649e, 0x6d1e, 0x77b3, 0x7ae5,
-  0x80f4, 0x8404, 0x9053, 0x9285, 0x5ce0, 0x9d07, 0x533f, 0x5f97,
-  0x5fb3, 0x6d9c, 0x7279, 0x7763, 0x79bf, 0x7be4, 0x6bd2, 0x72ec,
-  0x8aad, 0x6803, 0x6a61, 0x51f8, 0x7a81, 0x6934, 0x5c4a, 0x9cf6,
-  0x82eb, 0x5bc5, 0x9149, 0x701e, 0x5678, 0x5c6f, 0x60c7, 0x6566,
-  0x6c8c, 0x8c5a, 0x9041, 0x9813, 0x5451, 0x66c7, 0x920d, 0x5948,
-  0x90a3, 0x5185, 0x4e4d, 0x51ea, 0x8599, 0x8b0e, 0x7058, 0x637a,
-  0x934b, 0x6962, 0x99b4, 0x7e04, 0x7577, 0x5357, 0x6960, 0x8edf,
-  0x96e3, 0x6c5d, 0x4e8c, 0x5c3c, 0x5f10, 0x8fe9, 0x5302, 0x8cd1,
-  0x8089, 0x8679, 0x5eff, 0x65e5, 0x4e73, 0x5165,
-  /* 0x47 */
-  0x5982, 0x5c3f, 0x97ee, 0x4efb, 0x598a, 0x5fcd, 0x8a8d, 0x6fe1,
-  0x79b0, 0x7962, 0x5be7, 0x8471, 0x732b, 0x71b1, 0x5e74, 0x5ff5,
-  0x637b, 0x649a, 0x71c3, 0x7c98, 0x4e43, 0x5efc, 0x4e4b, 0x57dc,
-  0x56a2, 0x60a9, 0x6fc3, 0x7d0d, 0x80fd, 0x8133, 0x81bf, 0x8fb2,
-  0x8997, 0x86a4, 0x5df4, 0x628a, 0x64ad, 0x8987, 0x6777, 0x6ce2,
-  0x6d3e, 0x7436, 0x7834, 0x5a46, 0x7f75, 0x82ad, 0x99ac, 0x4ff3,
-  0x5ec3, 0x62dd, 0x6392, 0x6557, 0x676f, 0x76c3, 0x724c, 0x80cc,
-  0x80ba, 0x8f29, 0x914d, 0x500d, 0x57f9, 0x5a92, 0x6885, 0x6973,
-  0x7164, 0x72fd, 0x8cb7, 0x58f2, 0x8ce0, 0x966a, 0x9019, 0x877f,
-  0x79e4, 0x77e7, 0x8429, 0x4f2f, 0x5265, 0x535a, 0x62cd, 0x67cf,
-  0x6cca, 0x767d, 0x7b94, 0x7c95, 0x8236, 0x8584, 0x8feb, 0x66dd,
-  0x6f20, 0x7206, 0x7e1b, 0x83ab, 0x99c1, 0x9ea6,
-  /* 0x48 */
-  0x51fd, 0x7bb1, 0x7872, 0x7bb8, 0x8087, 0x7b48, 0x6ae8, 0x5e61,
-  0x808c, 0x7551, 0x7560, 0x516b, 0x9262, 0x6e8c, 0x767a, 0x9197,
-  0x9aea, 0x4f10, 0x7f70, 0x629c, 0x7b4f, 0x95a5, 0x9ce9, 0x567a,
-  0x5859, 0x86e4, 0x96bc, 0x4f34, 0x5224, 0x534a, 0x53cd, 0x53db,
-  0x5e06, 0x642c, 0x6591, 0x677f, 0x6c3e, 0x6c4e, 0x7248, 0x72af,
-  0x73ed, 0x7554, 0x7e41, 0x822c, 0x85e9, 0x8ca9, 0x7bc4, 0x91c6,
-  0x7169, 0x9812, 0x98ef, 0x633d, 0x6669, 0x756a, 0x76e4, 0x78d0,
-  0x8543, 0x86ee, 0x532a, 0x5351, 0x5426, 0x5983, 0x5e87, 0x5f7c,
-  0x60b2, 0x6249, 0x6279, 0x62ab, 0x6590, 0x6bd4, 0x6ccc, 0x75b2,
-  0x76ae, 0x7891, 0x79d8, 0x7dcb, 0x7f77, 0x80a5, 0x88ab, 0x8ab9,
-  0x8cbb, 0x907f, 0x975e, 0x98db, 0x6a0b, 0x7c38, 0x5099, 0x5c3e,
-  0x5fae, 0x6787, 0x6bd8, 0x7435, 0x7709, 0x7f8e,
-  /* 0x49 */
-  0x9f3b, 0x67ca, 0x7a17, 0x5339, 0x758b, 0x9aed, 0x5f66, 0x819d,
-  0x83f1, 0x8098, 0x5f3c, 0x5fc5, 0x7562, 0x7b46, 0x903c, 0x6867,
-  0x59eb, 0x5a9b, 0x7d10, 0x767e, 0x8b2c, 0x4ff5, 0x5f6a, 0x6a19,
-  0x6c37, 0x6f02, 0x74e2, 0x7968, 0x8868, 0x8a55, 0x8c79, 0x5edf,
-  0x63cf, 0x75c5, 0x79d2, 0x82d7, 0x9328, 0x92f2, 0x849c, 0x86ed,
-  0x9c2d, 0x54c1, 0x5f6c, 0x658c, 0x6d5c, 0x7015, 0x8ca7, 0x8cd3,
-  0x983b, 0x654f, 0x74f6, 0x4e0d, 0x4ed8, 0x57e0, 0x592b, 0x5a66,
-  0x5bcc, 0x51a8, 0x5e03, 0x5e9c, 0x6016, 0x6276, 0x6577, 0x65a7,
-  0x666e, 0x6d6e, 0x7236, 0x7b26, 0x8150, 0x819a, 0x8299, 0x8b5c,
-  0x8ca0, 0x8ce6, 0x8d74, 0x961c, 0x9644, 0x4fae, 0x64ab, 0x6b66,
-  0x821e, 0x8461, 0x856a, 0x90e8, 0x5c01, 0x6953, 0x98a8, 0x847a,
-  0x8557, 0x4f0f, 0x526f, 0x5fa9, 0x5e45, 0x670d,
-  /* 0x4a */
-  0x798f, 0x8179, 0x8907, 0x8986, 0x6df5, 0x5f17, 0x6255, 0x6cb8,
-  0x4ecf, 0x7269, 0x9b92, 0x5206, 0x543b, 0x5674, 0x58b3, 0x61a4,
-  0x626e, 0x711a, 0x596e, 0x7c89, 0x7cde, 0x7d1b, 0x96f0, 0x6587,
-  0x805e, 0x4e19, 0x4f75, 0x5175, 0x5840, 0x5e63, 0x5e73, 0x5f0a,
-  0x67c4, 0x4e26, 0x853d, 0x9589, 0x965b, 0x7c73, 0x9801, 0x50fb,
-  0x58c1, 0x7656, 0x78a7, 0x5225, 0x77a5, 0x8511, 0x7b86, 0x504f,
-  0x5909, 0x7247, 0x7bc7, 0x7de8, 0x8fba, 0x8fd4, 0x904d, 0x4fbf,
-  0x52c9, 0x5a29, 0x5f01, 0x97ad, 0x4fdd, 0x8217, 0x92ea, 0x5703,
-  0x6355, 0x6b69, 0x752b, 0x88dc, 0x8f14, 0x7a42, 0x52df, 0x5893,
-  0x6155, 0x620a, 0x66ae, 0x6bcd, 0x7c3f, 0x83e9, 0x5023, 0x4ff8,
-  0x5305, 0x5446, 0x5831, 0x5949, 0x5b9d, 0x5cf0, 0x5cef, 0x5d29,
-  0x5e96, 0x62b1, 0x6367, 0x653e, 0x65b9, 0x670b,
-  /* 0x4b */
-  0x6cd5, 0x6ce1, 0x70f9, 0x7832, 0x7e2b, 0x80de, 0x82b3, 0x840c,
-  0x84ec, 0x8702, 0x8912, 0x8a2a, 0x8c4a, 0x90a6, 0x92d2, 0x98fd,
-  0x9cf3, 0x9d6c, 0x4e4f, 0x4ea1, 0x508d, 0x5256, 0x574a, 0x59a8,
-  0x5e3d, 0x5fd8, 0x5fd9, 0x623f, 0x66b4, 0x671b, 0x67d0, 0x68d2,
-  0x5192, 0x7d21, 0x80aa, 0x81a8, 0x8b00, 0x8c8c, 0x8cbf, 0x927e,
-  0x9632, 0x5420, 0x982c, 0x5317, 0x50d5, 0x535c, 0x58a8, 0x64b2,
-  0x6734, 0x7267, 0x7766, 0x7a46, 0x91e6, 0x52c3, 0x6ca1, 0x6b86,
-  0x5800, 0x5e4c, 0x5954, 0x672c, 0x7ffb, 0x51e1, 0x76c6, 0x6469,
-  0x78e8, 0x9b54, 0x9ebb, 0x57cb, 0x59b9, 0x6627, 0x679a, 0x6bce,
-  0x54e9, 0x69d9, 0x5e55, 0x819c, 0x6795, 0x9baa, 0x67fe, 0x9c52,
-  0x685d, 0x4ea6, 0x4fe3, 0x53c8, 0x62b9, 0x672b, 0x6cab, 0x8fc4,
-  0x4fad, 0x7e6d, 0x9ebf, 0x4e07, 0x6162, 0x6e80,
-  /* 0x4c */
-  0x6f2b, 0x8513, 0x5473, 0x672a, 0x9b45, 0x5df3, 0x7b95, 0x5cac,
-  0x5bc6, 0x871c, 0x6e4a, 0x84d1, 0x7a14, 0x8108, 0x5999, 0x7c8d,
-  0x6c11, 0x7720, 0x52d9, 0x5922, 0x7121, 0x725f, 0x77db, 0x9727,
-  0x9d61, 0x690b, 0x5a7f, 0x5a18, 0x51a5, 0x540d, 0x547d, 0x660e,
-  0x76df, 0x8ff7, 0x9298, 0x9cf4, 0x59ea, 0x725d, 0x6ec5, 0x514d,
-  0x68c9, 0x7dbf, 0x7dec, 0x9762, 0x9eba, 0x6478, 0x6a21, 0x8302,
-  0x5984, 0x5b5f, 0x6bdb, 0x731b, 0x76f2, 0x7db2, 0x8017, 0x8499,
-  0x5132, 0x6728, 0x9ed9, 0x76ee, 0x6762, 0x52ff, 0x9905, 0x5c24,
-  0x623b, 0x7c7e, 0x8cb0, 0x554f, 0x60b6, 0x7d0b, 0x9580, 0x5301,
-  0x4e5f, 0x51b6, 0x591c, 0x723a, 0x8036, 0x91ce, 0x5f25, 0x77e2,
-  0x5384, 0x5f79, 0x7d04, 0x85ac, 0x8a33, 0x8e8d, 0x9756, 0x67f3,
-  0x85ae, 0x9453, 0x6109, 0x6108, 0x6cb9, 0x7652,
-  /* 0x4d */
-  0x8aed, 0x8f38, 0x552f, 0x4f51, 0x512a, 0x52c7, 0x53cb, 0x5ba5,
-  0x5e7d, 0x60a0, 0x6182, 0x63d6, 0x6709, 0x67da, 0x6e67, 0x6d8c,
-  0x7336, 0x7337, 0x7531, 0x7950, 0x88d5, 0x8a98, 0x904a, 0x9091,
-  0x90f5, 0x96c4, 0x878d, 0x5915, 0x4e88, 0x4f59, 0x4e0e, 0x8a89,
-  0x8f3f, 0x9810, 0x50ad, 0x5e7c, 0x5996, 0x5bb9, 0x5eb8, 0x63da,
-  0x63fa, 0x64c1, 0x66dc, 0x694a, 0x69d8, 0x6d0b, 0x6eb6, 0x7194,
-  0x7528, 0x7aaf, 0x7f8a, 0x8000, 0x8449, 0x84c9, 0x8981, 0x8b21,
-  0x8e0a, 0x9065, 0x967d, 0x990a, 0x617e, 0x6291, 0x6b32, 0x6c83,
-  0x6d74, 0x7fcc, 0x7ffc, 0x6dc0, 0x7f85, 0x87ba, 0x88f8, 0x6765,
-  0x83b1, 0x983c, 0x96f7, 0x6d1b, 0x7d61, 0x843d, 0x916a, 0x4e71,
-  0x5375, 0x5d50, 0x6b04, 0x6feb, 0x85cd, 0x862d, 0x89a7, 0x5229,
-  0x540f, 0x5c65, 0x674e, 0x68a8, 0x7406, 0x7483,
-  /* 0x4e */
-  0x75e2, 0x88cf, 0x88e1, 0x91cc, 0x96e2, 0x9678, 0x5f8b, 0x7387,
-  0x7acb, 0x844e, 0x63a0, 0x7565, 0x5289, 0x6d41, 0x6e9c, 0x7409,
-  0x7559, 0x786b, 0x7c92, 0x9686, 0x7adc, 0x9f8d, 0x4fb6, 0x616e,
-  0x65c5, 0x865c, 0x4e86, 0x4eae, 0x50da, 0x4e21, 0x51cc, 0x5bee,
-  0x6599, 0x6881, 0x6dbc, 0x731f, 0x7642, 0x77ad, 0x7a1c, 0x7ce7,
-  0x826f, 0x8ad2, 0x907c, 0x91cf, 0x9675, 0x9818, 0x529b, 0x7dd1,
-  0x502b, 0x5398, 0x6797, 0x6dcb, 0x71d0, 0x7433, 0x81e8, 0x8f2a,
-  0x96a3, 0x9c57, 0x9e9f, 0x7460, 0x5841, 0x6d99, 0x7d2f, 0x985e,
-  0x4ee4, 0x4f36, 0x4f8b, 0x51b7, 0x52b1, 0x5dba, 0x601c, 0x73b2,
-  0x793c, 0x82d3, 0x9234, 0x96b7, 0x96f6, 0x970a, 0x9e97, 0x9f62,
-  0x66a6, 0x6b74, 0x5217, 0x52a3, 0x70c8, 0x88c2, 0x5ec9, 0x604b,
-  0x6190, 0x6f23, 0x7149, 0x7c3e, 0x7df4, 0x806f,
-  /* 0x4f */
-  0x84ee, 0x9023, 0x932c, 0x5442, 0x9b6f, 0x6ad3, 0x7089, 0x8cc2,
-  0x8def, 0x9732, 0x52b4, 0x5a41, 0x5eca, 0x5f04, 0x6717, 0x697c,
-  0x6994, 0x6d6a, 0x6f0f, 0x7262, 0x72fc, 0x7bed, 0x8001, 0x807e,
-  0x874b, 0x90ce, 0x516d, 0x9e93, 0x7984, 0x808b, 0x9332, 0x8ad6,
-  0x502d, 0x548c, 0x8a71, 0x6b6a, 0x8cc4, 0x8107, 0x60d1, 0x67a0,
-  0x9df2, 0x4e99, 0x4e98, 0x9c10, 0x8a6b, 0x85c1, 0x8568, 0x6900,
-  0x6e7e, 0x7897, 0x8155, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  /* 0x50 */
-  0x5f0c, 0x4e10, 0x4e15, 0x4e2a, 0x4e31, 0x4e36, 0x4e3c, 0x4e3f,
-  0x4e42, 0x4e56, 0x4e58, 0x4e82, 0x4e85, 0x8c6b, 0x4e8a, 0x8212,
-  0x5f0d, 0x4e8e, 0x4e9e, 0x4e9f, 0x4ea0, 0x4ea2, 0x4eb0, 0x4eb3,
-  0x4eb6, 0x4ece, 0x4ecd, 0x4ec4, 0x4ec6, 0x4ec2, 0x4ed7, 0x4ede,
-  0x4eed, 0x4edf, 0x4ef7, 0x4f09, 0x4f5a, 0x4f30, 0x4f5b, 0x4f5d,
-  0x4f57, 0x4f47, 0x4f76, 0x4f88, 0x4f8f, 0x4f98, 0x4f7b, 0x4f69,
-  0x4f70, 0x4f91, 0x4f6f, 0x4f86, 0x4f96, 0x5118, 0x4fd4, 0x4fdf,
-  0x4fce, 0x4fd8, 0x4fdb, 0x4fd1, 0x4fda, 0x4fd0, 0x4fe4, 0x4fe5,
-  0x501a, 0x5028, 0x5014, 0x502a, 0x5025, 0x5005, 0x4f1c, 0x4ff6,
-  0x5021, 0x5029, 0x502c, 0x4ffe, 0x4fef, 0x5011, 0x5006, 0x5043,
-  0x5047, 0x6703, 0x5055, 0x5050, 0x5048, 0x505a, 0x5056, 0x506c,
-  0x5078, 0x5080, 0x509a, 0x5085, 0x50b4, 0x50b2,
-  /* 0x51 */
-  0x50c9, 0x50ca, 0x50b3, 0x50c2, 0x50d6, 0x50de, 0x50e5, 0x50ed,
-  0x50e3, 0x50ee, 0x50f9, 0x50f5, 0x5109, 0x5101, 0x5102, 0x5116,
-  0x5115, 0x5114, 0x511a, 0x5121, 0x513a, 0x5137, 0x513c, 0x513b,
-  0x513f, 0x5140, 0x5152, 0x514c, 0x5154, 0x5162, 0x7af8, 0x5169,
-  0x516a, 0x516e, 0x5180, 0x5182, 0x56d8, 0x518c, 0x5189, 0x518f,
-  0x5191, 0x5193, 0x5195, 0x5196, 0x51a4, 0x51a6, 0x51a2, 0x51a9,
-  0x51aa, 0x51ab, 0x51b3, 0x51b1, 0x51b2, 0x51b0, 0x51b5, 0x51bd,
-  0x51c5, 0x51c9, 0x51db, 0x51e0, 0x8655, 0x51e9, 0x51ed, 0x51f0,
-  0x51f5, 0x51fe, 0x5204, 0x520b, 0x5214, 0x520e, 0x5227, 0x522a,
-  0x522e, 0x5233, 0x5239, 0x524f, 0x5244, 0x524b, 0x524c, 0x525e,
-  0x5254, 0x526a, 0x5274, 0x5269, 0x5273, 0x527f, 0x527d, 0x528d,
-  0x5294, 0x5292, 0x5271, 0x5288, 0x5291, 0x8fa8,
-  /* 0x52 */
-  0x8fa7, 0x52ac, 0x52ad, 0x52bc, 0x52b5, 0x52c1, 0x52cd, 0x52d7,
-  0x52de, 0x52e3, 0x52e6, 0x98ed, 0x52e0, 0x52f3, 0x52f5, 0x52f8,
-  0x52f9, 0x5306, 0x5308, 0x7538, 0x530d, 0x5310, 0x530f, 0x5315,
-  0x531a, 0x5323, 0x532f, 0x5331, 0x5333, 0x5338, 0x5340, 0x5346,
-  0x5345, 0x4e17, 0x5349, 0x534d, 0x51d6, 0x535e, 0x5369, 0x536e,
-  0x5918, 0x537b, 0x5377, 0x5382, 0x5396, 0x53a0, 0x53a6, 0x53a5,
-  0x53ae, 0x53b0, 0x53b6, 0x53c3, 0x7c12, 0x96d9, 0x53df, 0x66fc,
-  0x71ee, 0x53ee, 0x53e8, 0x53ed, 0x53fa, 0x5401, 0x543d, 0x5440,
-  0x542c, 0x542d, 0x543c, 0x542e, 0x5436, 0x5429, 0x541d, 0x544e,
-  0x548f, 0x5475, 0x548e, 0x545f, 0x5471, 0x5477, 0x5470, 0x5492,
-  0x547b, 0x5480, 0x5476, 0x5484, 0x5490, 0x5486, 0x54c7, 0x54a2,
-  0x54b8, 0x54a5, 0x54ac, 0x54c4, 0x54c8, 0x54a8,
-  /* 0x53 */
-  0x54ab, 0x54c2, 0x54a4, 0x54be, 0x54bc, 0x54d8, 0x54e5, 0x54e6,
-  0x550f, 0x5514, 0x54fd, 0x54ee, 0x54ed, 0x54fa, 0x54e2, 0x5539,
-  0x5540, 0x5563, 0x554c, 0x552e, 0x555c, 0x5545, 0x5556, 0x5557,
-  0x5538, 0x5533, 0x555d, 0x5599, 0x5580, 0x54af, 0x558a, 0x559f,
-  0x557b, 0x557e, 0x5598, 0x559e, 0x55ae, 0x557c, 0x5583, 0x55a9,
-  0x5587, 0x55a8, 0x55da, 0x55c5, 0x55df, 0x55c4, 0x55dc, 0x55e4,
-  0x55d4, 0x5614, 0x55f7, 0x5616, 0x55fe, 0x55fd, 0x561b, 0x55f9,
-  0x564e, 0x5650, 0x71df, 0x5634, 0x5636, 0x5632, 0x5638, 0x566b,
-  0x5664, 0x562f, 0x566c, 0x566a, 0x5686, 0x5680, 0x568a, 0x56a0,
-  0x5694, 0x568f, 0x56a5, 0x56ae, 0x56b6, 0x56b4, 0x56c2, 0x56bc,
-  0x56c1, 0x56c3, 0x56c0, 0x56c8, 0x56ce, 0x56d1, 0x56d3, 0x56d7,
-  0x56ee, 0x56f9, 0x5700, 0x56ff, 0x5704, 0x5709,
-  /* 0x54 */
-  0x5708, 0x570b, 0x570d, 0x5713, 0x5718, 0x5716, 0x55c7, 0x571c,
-  0x5726, 0x5737, 0x5738, 0x574e, 0x573b, 0x5740, 0x574f, 0x5769,
-  0x57c0, 0x5788, 0x5761, 0x577f, 0x5789, 0x5793, 0x57a0, 0x57b3,
-  0x57a4, 0x57aa, 0x57b0, 0x57c3, 0x57c6, 0x57d4, 0x57d2, 0x57d3,
-  0x580a, 0x57d6, 0x57e3, 0x580b, 0x5819, 0x581d, 0x5872, 0x5821,
-  0x5862, 0x584b, 0x5870, 0x6bc0, 0x5852, 0x583d, 0x5879, 0x5885,
-  0x58b9, 0x589f, 0x58ab, 0x58ba, 0x58de, 0x58bb, 0x58b8, 0x58ae,
-  0x58c5, 0x58d3, 0x58d1, 0x58d7, 0x58d9, 0x58d8, 0x58e5, 0x58dc,
-  0x58e4, 0x58df, 0x58ef, 0x58fa, 0x58f9, 0x58fb, 0x58fc, 0x58fd,
-  0x5902, 0x590a, 0x5910, 0x591b, 0x68a6, 0x5925, 0x592c, 0x592d,
-  0x5932, 0x5938, 0x593e, 0x7ad2, 0x5955, 0x5950, 0x594e, 0x595a,
-  0x5958, 0x5962, 0x5960, 0x5967, 0x596c, 0x5969,
-  /* 0x55 */
-  0x5978, 0x5981, 0x599d, 0x4f5e, 0x4fab, 0x59a3, 0x59b2, 0x59c6,
-  0x59e8, 0x59dc, 0x598d, 0x59d9, 0x59da, 0x5a25, 0x5a1f, 0x5a11,
-  0x5a1c, 0x5a09, 0x5a1a, 0x5a40, 0x5a6c, 0x5a49, 0x5a35, 0x5a36,
-  0x5a62, 0x5a6a, 0x5a9a, 0x5abc, 0x5abe, 0x5acb, 0x5ac2, 0x5abd,
-  0x5ae3, 0x5ad7, 0x5ae6, 0x5ae9, 0x5ad6, 0x5afa, 0x5afb, 0x5b0c,
-  0x5b0b, 0x5b16, 0x5b32, 0x5ad0, 0x5b2a, 0x5b36, 0x5b3e, 0x5b43,
-  0x5b45, 0x5b40, 0x5b51, 0x5b55, 0x5b5a, 0x5b5b, 0x5b65, 0x5b69,
-  0x5b70, 0x5b73, 0x5b75, 0x5b78, 0x6588, 0x5b7a, 0x5b80, 0x5b83,
-  0x5ba6, 0x5bb8, 0x5bc3, 0x5bc7, 0x5bc9, 0x5bd4, 0x5bd0, 0x5be4,
-  0x5be6, 0x5be2, 0x5bde, 0x5be5, 0x5beb, 0x5bf0, 0x5bf6, 0x5bf3,
-  0x5c05, 0x5c07, 0x5c08, 0x5c0d, 0x5c13, 0x5c20, 0x5c22, 0x5c28,
-  0x5c38, 0x5c39, 0x5c41, 0x5c46, 0x5c4e, 0x5c53,
-  /* 0x56 */
-  0x5c50, 0x5c4f, 0x5b71, 0x5c6c, 0x5c6e, 0x4e62, 0x5c76, 0x5c79,
-  0x5c8c, 0x5c91, 0x5c94, 0x599b, 0x5cab, 0x5cbb, 0x5cb6, 0x5cbc,
-  0x5cb7, 0x5cc5, 0x5cbe, 0x5cc7, 0x5cd9, 0x5ce9, 0x5cfd, 0x5cfa,
-  0x5ced, 0x5d8c, 0x5cea, 0x5d0b, 0x5d15, 0x5d17, 0x5d5c, 0x5d1f,
-  0x5d1b, 0x5d11, 0x5d14, 0x5d22, 0x5d1a, 0x5d19, 0x5d18, 0x5d4c,
-  0x5d52, 0x5d4e, 0x5d4b, 0x5d6c, 0x5d73, 0x5d76, 0x5d87, 0x5d84,
-  0x5d82, 0x5da2, 0x5d9d, 0x5dac, 0x5dae, 0x5dbd, 0x5d90, 0x5db7,
-  0x5dbc, 0x5dc9, 0x5dcd, 0x5dd3, 0x5dd2, 0x5dd6, 0x5ddb, 0x5deb,
-  0x5df2, 0x5df5, 0x5e0b, 0x5e1a, 0x5e19, 0x5e11, 0x5e1b, 0x5e36,
-  0x5e37, 0x5e44, 0x5e43, 0x5e40, 0x5e4e, 0x5e57, 0x5e54, 0x5e5f,
-  0x5e62, 0x5e64, 0x5e47, 0x5e75, 0x5e76, 0x5e7a, 0x9ebc, 0x5e7f,
-  0x5ea0, 0x5ec1, 0x5ec2, 0x5ec8, 0x5ed0, 0x5ecf,
-  /* 0x57 */
-  0x5ed6, 0x5ee3, 0x5edd, 0x5eda, 0x5edb, 0x5ee2, 0x5ee1, 0x5ee8,
-  0x5ee9, 0x5eec, 0x5ef1, 0x5ef3, 0x5ef0, 0x5ef4, 0x5ef8, 0x5efe,
-  0x5f03, 0x5f09, 0x5f5d, 0x5f5c, 0x5f0b, 0x5f11, 0x5f16, 0x5f29,
-  0x5f2d, 0x5f38, 0x5f41, 0x5f48, 0x5f4c, 0x5f4e, 0x5f2f, 0x5f51,
-  0x5f56, 0x5f57, 0x5f59, 0x5f61, 0x5f6d, 0x5f73, 0x5f77, 0x5f83,
-  0x5f82, 0x5f7f, 0x5f8a, 0x5f88, 0x5f91, 0x5f87, 0x5f9e, 0x5f99,
-  0x5f98, 0x5fa0, 0x5fa8, 0x5fad, 0x5fbc, 0x5fd6, 0x5ffb, 0x5fe4,
-  0x5ff8, 0x5ff1, 0x5fdd, 0x60b3, 0x5fff, 0x6021, 0x6060, 0x6019,
-  0x6010, 0x6029, 0x600e, 0x6031, 0x601b, 0x6015, 0x602b, 0x6026,
-  0x600f, 0x603a, 0x605a, 0x6041, 0x606a, 0x6077, 0x605f, 0x604a,
-  0x6046, 0x604d, 0x6063, 0x6043, 0x6064, 0x6042, 0x606c, 0x606b,
-  0x6059, 0x6081, 0x608d, 0x60e7, 0x6083, 0x609a,
-  /* 0x58 */
-  0x6084, 0x609b, 0x6096, 0x6097, 0x6092, 0x60a7, 0x608b, 0x60e1,
-  0x60b8, 0x60e0, 0x60d3, 0x60b4, 0x5ff0, 0x60bd, 0x60c6, 0x60b5,
-  0x60d8, 0x614d, 0x6115, 0x6106, 0x60f6, 0x60f7, 0x6100, 0x60f4,
-  0x60fa, 0x6103, 0x6121, 0x60fb, 0x60f1, 0x610d, 0x610e, 0x6147,
-  0x613e, 0x6128, 0x6127, 0x614a, 0x613f, 0x613c, 0x612c, 0x6134,
-  0x613d, 0x6142, 0x6144, 0x6173, 0x6177, 0x6158, 0x6159, 0x615a,
-  0x616b, 0x6174, 0x616f, 0x6165, 0x6171, 0x615f, 0x615d, 0x6153,
-  0x6175, 0x6199, 0x6196, 0x6187, 0x61ac, 0x6194, 0x619a, 0x618a,
-  0x6191, 0x61ab, 0x61ae, 0x61cc, 0x61ca, 0x61c9, 0x61f7, 0x61c8,
-  0x61c3, 0x61c6, 0x61ba, 0x61cb, 0x7f79, 0x61cd, 0x61e6, 0x61e3,
-  0x61f6, 0x61fa, 0x61f4, 0x61ff, 0x61fd, 0x61fc, 0x61fe, 0x6200,
-  0x6208, 0x6209, 0x620d, 0x620c, 0x6214, 0x621b,
-  /* 0x59 */
-  0x621e, 0x6221, 0x622a, 0x622e, 0x6230, 0x6232, 0x6233, 0x6241,
-  0x624e, 0x625e, 0x6263, 0x625b, 0x6260, 0x6268, 0x627c, 0x6282,
-  0x6289, 0x627e, 0x6292, 0x6293, 0x6296, 0x62d4, 0x6283, 0x6294,
-  0x62d7, 0x62d1, 0x62bb, 0x62cf, 0x62ff, 0x62c6, 0x64d4, 0x62c8,
-  0x62dc, 0x62cc, 0x62ca, 0x62c2, 0x62c7, 0x629b, 0x62c9, 0x630c,
-  0x62ee, 0x62f1, 0x6327, 0x6302, 0x6308, 0x62ef, 0x62f5, 0x6350,
-  0x633e, 0x634d, 0x641c, 0x634f, 0x6396, 0x638e, 0x6380, 0x63ab,
-  0x6376, 0x63a3, 0x638f, 0x6389, 0x639f, 0x63b5, 0x636b, 0x6369,
-  0x63be, 0x63e9, 0x63c0, 0x63c6, 0x63e3, 0x63c9, 0x63d2, 0x63f6,
-  0x63c4, 0x6416, 0x6434, 0x6406, 0x6413, 0x6426, 0x6436, 0x651d,
-  0x6417, 0x6428, 0x640f, 0x6467, 0x646f, 0x6476, 0x644e, 0x652a,
-  0x6495, 0x6493, 0x64a5, 0x64a9, 0x6488, 0x64bc,
-  /* 0x5a */
-  0x64da, 0x64d2, 0x64c5, 0x64c7, 0x64bb, 0x64d8, 0x64c2, 0x64f1,
-  0x64e7, 0x8209, 0x64e0, 0x64e1, 0x62ac, 0x64e3, 0x64ef, 0x652c,
-  0x64f6, 0x64f4, 0x64f2, 0x64fa, 0x6500, 0x64fd, 0x6518, 0x651c,
-  0x6505, 0x6524, 0x6523, 0x652b, 0x6534, 0x6535, 0x6537, 0x6536,
-  0x6538, 0x754b, 0x6548, 0x6556, 0x6555, 0x654d, 0x6558, 0x655e,
-  0x655d, 0x6572, 0x6578, 0x6582, 0x6583, 0x8b8a, 0x659b, 0x659f,
-  0x65ab, 0x65b7, 0x65c3, 0x65c6, 0x65c1, 0x65c4, 0x65cc, 0x65d2,
-  0x65db, 0x65d9, 0x65e0, 0x65e1, 0x65f1, 0x6772, 0x660a, 0x6603,
-  0x65fb, 0x6773, 0x6635, 0x6636, 0x6634, 0x661c, 0x664f, 0x6644,
-  0x6649, 0x6641, 0x665e, 0x665d, 0x6664, 0x6667, 0x6668, 0x665f,
-  0x6662, 0x6670, 0x6683, 0x6688, 0x668e, 0x6689, 0x6684, 0x6698,
-  0x669d, 0x66c1, 0x66b9, 0x66c9, 0x66be, 0x66bc,
-  /* 0x5b */
-  0x66c4, 0x66b8, 0x66d6, 0x66da, 0x66e0, 0x663f, 0x66e6, 0x66e9,
-  0x66f0, 0x66f5, 0x66f7, 0x670f, 0x6716, 0x671e, 0x6726, 0x6727,
-  0x9738, 0x672e, 0x673f, 0x6736, 0x6741, 0x6738, 0x6737, 0x6746,
-  0x675e, 0x6760, 0x6759, 0x6763, 0x6764, 0x6789, 0x6770, 0x67a9,
-  0x677c, 0x676a, 0x678c, 0x678b, 0x67a6, 0x67a1, 0x6785, 0x67b7,
-  0x67ef, 0x67b4, 0x67ec, 0x67b3, 0x67e9, 0x67b8, 0x67e4, 0x67de,
-  0x67dd, 0x67e2, 0x67ee, 0x67b9, 0x67ce, 0x67c6, 0x67e7, 0x6a9c,
-  0x681e, 0x6846, 0x6829, 0x6840, 0x684d, 0x6832, 0x684e, 0x68b3,
-  0x682b, 0x6859, 0x6863, 0x6877, 0x687f, 0x689f, 0x688f, 0x68ad,
-  0x6894, 0x689d, 0x689b, 0x6883, 0x6aae, 0x68b9, 0x6874, 0x68b5,
-  0x68a0, 0x68ba, 0x690f, 0x688d, 0x687e, 0x6901, 0x68ca, 0x6908,
-  0x68d8, 0x6922, 0x6926, 0x68e1, 0x690c, 0x68cd,
-  /* 0x5c */
-  0x68d4, 0x68e7, 0x68d5, 0x6936, 0x6912, 0x6904, 0x68d7, 0x68e3,
-  0x6925, 0x68f9, 0x68e0, 0x68ef, 0x6928, 0x692a, 0x691a, 0x6923,
-  0x6921, 0x68c6, 0x6979, 0x6977, 0x695c, 0x6978, 0x696b, 0x6954,
-  0x697e, 0x696e, 0x6939, 0x6974, 0x693d, 0x6959, 0x6930, 0x6961,
-  0x695e, 0x695d, 0x6981, 0x696a, 0x69b2, 0x69ae, 0x69d0, 0x69bf,
-  0x69c1, 0x69d3, 0x69be, 0x69ce, 0x5be8, 0x69ca, 0x69dd, 0x69bb,
-  0x69c3, 0x69a7, 0x6a2e, 0x6991, 0x69a0, 0x699c, 0x6995, 0x69b4,
-  0x69de, 0x69e8, 0x6a02, 0x6a1b, 0x69ff, 0x6b0a, 0x69f9, 0x69f2,
-  0x69e7, 0x6a05, 0x69b1, 0x6a1e, 0x69ed, 0x6a14, 0x69eb, 0x6a0a,
-  0x6a12, 0x6ac1, 0x6a23, 0x6a13, 0x6a44, 0x6a0c, 0x6a72, 0x6a36,
-  0x6a78, 0x6a47, 0x6a62, 0x6a59, 0x6a66, 0x6a48, 0x6a38, 0x6a22,
-  0x6a90, 0x6a8d, 0x6aa0, 0x6a84, 0x6aa2, 0x6aa3,
-  /* 0x5d */
-  0x6a97, 0x8617, 0x6abb, 0x6ac3, 0x6ac2, 0x6ab8, 0x6ab3, 0x6aac,
-  0x6ade, 0x6ad1, 0x6adf, 0x6aaa, 0x6ada, 0x6aea, 0x6afb, 0x6b05,
-  0x8616, 0x6afa, 0x6b12, 0x6b16, 0x9b31, 0x6b1f, 0x6b38, 0x6b37,
-  0x76dc, 0x6b39, 0x98ee, 0x6b47, 0x6b43, 0x6b49, 0x6b50, 0x6b59,
-  0x6b54, 0x6b5b, 0x6b5f, 0x6b61, 0x6b78, 0x6b79, 0x6b7f, 0x6b80,
-  0x6b84, 0x6b83, 0x6b8d, 0x6b98, 0x6b95, 0x6b9e, 0x6ba4, 0x6baa,
-  0x6bab, 0x6baf, 0x6bb2, 0x6bb1, 0x6bb3, 0x6bb7, 0x6bbc, 0x6bc6,
-  0x6bcb, 0x6bd3, 0x6bdf, 0x6bec, 0x6beb, 0x6bf3, 0x6bef, 0x9ebe,
-  0x6c08, 0x6c13, 0x6c14, 0x6c1b, 0x6c24, 0x6c23, 0x6c5e, 0x6c55,
-  0x6c62, 0x6c6a, 0x6c82, 0x6c8d, 0x6c9a, 0x6c81, 0x6c9b, 0x6c7e,
-  0x6c68, 0x6c73, 0x6c92, 0x6c90, 0x6cc4, 0x6cf1, 0x6cd3, 0x6cbd,
-  0x6cd7, 0x6cc5, 0x6cdd, 0x6cae, 0x6cb1, 0x6cbe,
-  /* 0x5e */
-  0x6cba, 0x6cdb, 0x6cef, 0x6cd9, 0x6cea, 0x6d1f, 0x884d, 0x6d36,
-  0x6d2b, 0x6d3d, 0x6d38, 0x6d19, 0x6d35, 0x6d33, 0x6d12, 0x6d0c,
-  0x6d63, 0x6d93, 0x6d64, 0x6d5a, 0x6d79, 0x6d59, 0x6d8e, 0x6d95,
-  0x6fe4, 0x6d85, 0x6df9, 0x6e15, 0x6e0a, 0x6db5, 0x6dc7, 0x6de6,
-  0x6db8, 0x6dc6, 0x6dec, 0x6dde, 0x6dcc, 0x6de8, 0x6dd2, 0x6dc5,
-  0x6dfa, 0x6dd9, 0x6de4, 0x6dd5, 0x6dea, 0x6dee, 0x6e2d, 0x6e6e,
-  0x6e2e, 0x6e19, 0x6e72, 0x6e5f, 0x6e3e, 0x6e23, 0x6e6b, 0x6e2b,
-  0x6e76, 0x6e4d, 0x6e1f, 0x6e43, 0x6e3a, 0x6e4e, 0x6e24, 0x6eff,
-  0x6e1d, 0x6e38, 0x6e82, 0x6eaa, 0x6e98, 0x6ec9, 0x6eb7, 0x6ed3,
-  0x6ebd, 0x6eaf, 0x6ec4, 0x6eb2, 0x6ed4, 0x6ed5, 0x6e8f, 0x6ea5,
-  0x6ec2, 0x6e9f, 0x6f41, 0x6f11, 0x704c, 0x6eec, 0x6ef8, 0x6efe,
-  0x6f3f, 0x6ef2, 0x6f31, 0x6eef, 0x6f32, 0x6ecc,
-  /* 0x5f */
-  0x6f3e, 0x6f13, 0x6ef7, 0x6f86, 0x6f7a, 0x6f78, 0x6f81, 0x6f80,
-  0x6f6f, 0x6f5b, 0x6ff3, 0x6f6d, 0x6f82, 0x6f7c, 0x6f58, 0x6f8e,
-  0x6f91, 0x6fc2, 0x6f66, 0x6fb3, 0x6fa3, 0x6fa1, 0x6fa4, 0x6fb9,
-  0x6fc6, 0x6faa, 0x6fdf, 0x6fd5, 0x6fec, 0x6fd4, 0x6fd8, 0x6ff1,
-  0x6fee, 0x6fdb, 0x7009, 0x700b, 0x6ffa, 0x7011, 0x7001, 0x700f,
-  0x6ffe, 0x701b, 0x701a, 0x6f74, 0x701d, 0x7018, 0x701f, 0x7030,
-  0x703e, 0x7032, 0x7051, 0x7063, 0x7099, 0x7092, 0x70af, 0x70f1,
-  0x70ac, 0x70b8, 0x70b3, 0x70ae, 0x70df, 0x70cb, 0x70dd, 0x70d9,
-  0x7109, 0x70fd, 0x711c, 0x7119, 0x7165, 0x7155, 0x7188, 0x7166,
-  0x7162, 0x714c, 0x7156, 0x716c, 0x718f, 0x71fb, 0x7184, 0x7195,
-  0x71a8, 0x71ac, 0x71d7, 0x71b9, 0x71be, 0x71d2, 0x71c9, 0x71d4,
-  0x71ce, 0x71e0, 0x71ec, 0x71e7, 0x71f5, 0x71fc,
-  /* 0x60 */
-  0x71f9, 0x71ff, 0x720d, 0x7210, 0x721b, 0x7228, 0x722d, 0x722c,
-  0x7230, 0x7232, 0x723b, 0x723c, 0x723f, 0x7240, 0x7246, 0x724b,
-  0x7258, 0x7274, 0x727e, 0x7282, 0x7281, 0x7287, 0x7292, 0x7296,
-  0x72a2, 0x72a7, 0x72b9, 0x72b2, 0x72c3, 0x72c6, 0x72c4, 0x72ce,
-  0x72d2, 0x72e2, 0x72e0, 0x72e1, 0x72f9, 0x72f7, 0x500f, 0x7317,
-  0x730a, 0x731c, 0x7316, 0x731d, 0x7334, 0x732f, 0x7329, 0x7325,
-  0x733e, 0x734e, 0x734f, 0x9ed8, 0x7357, 0x736a, 0x7368, 0x7370,
-  0x7378, 0x7375, 0x737b, 0x737a, 0x73c8, 0x73b3, 0x73ce, 0x73bb,
-  0x73c0, 0x73e5, 0x73ee, 0x73de, 0x74a2, 0x7405, 0x746f, 0x7425,
-  0x73f8, 0x7432, 0x743a, 0x7455, 0x743f, 0x745f, 0x7459, 0x7441,
-  0x745c, 0x7469, 0x7470, 0x7463, 0x746a, 0x7476, 0x747e, 0x748b,
-  0x749e, 0x74a7, 0x74ca, 0x74cf, 0x74d4, 0x73f1,
-  /* 0x61 */
-  0x74e0, 0x74e3, 0x74e7, 0x74e9, 0x74ee, 0x74f2, 0x74f0, 0x74f1,
-  0x74f8, 0x74f7, 0x7504, 0x7503, 0x7505, 0x750c, 0x750e, 0x750d,
-  0x7515, 0x7513, 0x751e, 0x7526, 0x752c, 0x753c, 0x7544, 0x754d,
-  0x754a, 0x7549, 0x755b, 0x7546, 0x755a, 0x7569, 0x7564, 0x7567,
-  0x756b, 0x756d, 0x7578, 0x7576, 0x7586, 0x7587, 0x7574, 0x758a,
-  0x7589, 0x7582, 0x7594, 0x759a, 0x759d, 0x75a5, 0x75a3, 0x75c2,
-  0x75b3, 0x75c3, 0x75b5, 0x75bd, 0x75b8, 0x75bc, 0x75b1, 0x75cd,
-  0x75ca, 0x75d2, 0x75d9, 0x75e3, 0x75de, 0x75fe, 0x75ff, 0x75fc,
-  0x7601, 0x75f0, 0x75fa, 0x75f2, 0x75f3, 0x760b, 0x760d, 0x7609,
-  0x761f, 0x7627, 0x7620, 0x7621, 0x7622, 0x7624, 0x7634, 0x7630,
-  0x763b, 0x7647, 0x7648, 0x7646, 0x765c, 0x7658, 0x7661, 0x7662,
-  0x7668, 0x7669, 0x766a, 0x7667, 0x766c, 0x7670,
-  /* 0x62 */
-  0x7672, 0x7676, 0x7678, 0x767c, 0x7680, 0x7683, 0x7688, 0x768b,
-  0x768e, 0x7696, 0x7693, 0x7699, 0x769a, 0x76b0, 0x76b4, 0x76b8,
-  0x76b9, 0x76ba, 0x76c2, 0x76cd, 0x76d6, 0x76d2, 0x76de, 0x76e1,
-  0x76e5, 0x76e7, 0x76ea, 0x862f, 0x76fb, 0x7708, 0x7707, 0x7704,
-  0x7729, 0x7724, 0x771e, 0x7725, 0x7726, 0x771b, 0x7737, 0x7738,
-  0x7747, 0x775a, 0x7768, 0x776b, 0x775b, 0x7765, 0x777f, 0x777e,
-  0x7779, 0x778e, 0x778b, 0x7791, 0x77a0, 0x779e, 0x77b0, 0x77b6,
-  0x77b9, 0x77bf, 0x77bc, 0x77bd, 0x77bb, 0x77c7, 0x77cd, 0x77d7,
-  0x77da, 0x77dc, 0x77e3, 0x77ee, 0x77fc, 0x780c, 0x7812, 0x7926,
-  0x7820, 0x792a, 0x7845, 0x788e, 0x7874, 0x7886, 0x787c, 0x789a,
-  0x788c, 0x78a3, 0x78b5, 0x78aa, 0x78af, 0x78d1, 0x78c6, 0x78cb,
-  0x78d4, 0x78be, 0x78bc, 0x78c5, 0x78ca, 0x78ec,
-  /* 0x63 */
-  0x78e7, 0x78da, 0x78fd, 0x78f4, 0x7907, 0x7912, 0x7911, 0x7919,
-  0x792c, 0x792b, 0x7940, 0x7960, 0x7957, 0x795f, 0x795a, 0x7955,
-  0x7953, 0x797a, 0x797f, 0x798a, 0x799d, 0x79a7, 0x9f4b, 0x79aa,
-  0x79ae, 0x79b3, 0x79b9, 0x79ba, 0x79c9, 0x79d5, 0x79e7, 0x79ec,
-  0x79e1, 0x79e3, 0x7a08, 0x7a0d, 0x7a18, 0x7a19, 0x7a20, 0x7a1f,
-  0x7980, 0x7a31, 0x7a3b, 0x7a3e, 0x7a37, 0x7a43, 0x7a57, 0x7a49,
-  0x7a61, 0x7a62, 0x7a69, 0x9f9d, 0x7a70, 0x7a79, 0x7a7d, 0x7a88,
-  0x7a97, 0x7a95, 0x7a98, 0x7a96, 0x7aa9, 0x7ac8, 0x7ab0, 0x7ab6,
-  0x7ac5, 0x7ac4, 0x7abf, 0x9083, 0x7ac7, 0x7aca, 0x7acd, 0x7acf,
-  0x7ad5, 0x7ad3, 0x7ad9, 0x7ada, 0x7add, 0x7ae1, 0x7ae2, 0x7ae6,
-  0x7aed, 0x7af0, 0x7b02, 0x7b0f, 0x7b0a, 0x7b06, 0x7b33, 0x7b18,
-  0x7b19, 0x7b1e, 0x7b35, 0x7b28, 0x7b36, 0x7b50,
-  /* 0x64 */
-  0x7b7a, 0x7b04, 0x7b4d, 0x7b0b, 0x7b4c, 0x7b45, 0x7b75, 0x7b65,
-  0x7b74, 0x7b67, 0x7b70, 0x7b71, 0x7b6c, 0x7b6e, 0x7b9d, 0x7b98,
-  0x7b9f, 0x7b8d, 0x7b9c, 0x7b9a, 0x7b8b, 0x7b92, 0x7b8f, 0x7b5d,
-  0x7b99, 0x7bcb, 0x7bc1, 0x7bcc, 0x7bcf, 0x7bb4, 0x7bc6, 0x7bdd,
-  0x7be9, 0x7c11, 0x7c14, 0x7be6, 0x7be5, 0x7c60, 0x7c00, 0x7c07,
-  0x7c13, 0x7bf3, 0x7bf7, 0x7c17, 0x7c0d, 0x7bf6, 0x7c23, 0x7c27,
-  0x7c2a, 0x7c1f, 0x7c37, 0x7c2b, 0x7c3d, 0x7c4c, 0x7c43, 0x7c54,
-  0x7c4f, 0x7c40, 0x7c50, 0x7c58, 0x7c5f, 0x7c64, 0x7c56, 0x7c65,
-  0x7c6c, 0x7c75, 0x7c83, 0x7c90, 0x7ca4, 0x7cad, 0x7ca2, 0x7cab,
-  0x7ca1, 0x7ca8, 0x7cb3, 0x7cb2, 0x7cb1, 0x7cae, 0x7cb9, 0x7cbd,
-  0x7cc0, 0x7cc5, 0x7cc2, 0x7cd8, 0x7cd2, 0x7cdc, 0x7ce2, 0x9b3b,
-  0x7cef, 0x7cf2, 0x7cf4, 0x7cf6, 0x7cfa, 0x7d06,
-  /* 0x65 */
-  0x7d02, 0x7d1c, 0x7d15, 0x7d0a, 0x7d45, 0x7d4b, 0x7d2e, 0x7d32,
-  0x7d3f, 0x7d35, 0x7d46, 0x7d73, 0x7d56, 0x7d4e, 0x7d72, 0x7d68,
-  0x7d6e, 0x7d4f, 0x7d63, 0x7d93, 0x7d89, 0x7d5b, 0x7d8f, 0x7d7d,
-  0x7d9b, 0x7dba, 0x7dae, 0x7da3, 0x7db5, 0x7dc7, 0x7dbd, 0x7dab,
-  0x7e3d, 0x7da2, 0x7daf, 0x7ddc, 0x7db8, 0x7d9f, 0x7db0, 0x7dd8,
-  0x7ddd, 0x7de4, 0x7dde, 0x7dfb, 0x7df2, 0x7de1, 0x7e05, 0x7e0a,
-  0x7e23, 0x7e21, 0x7e12, 0x7e31, 0x7e1f, 0x7e09, 0x7e0b, 0x7e22,
-  0x7e46, 0x7e66, 0x7e3b, 0x7e35, 0x7e39, 0x7e43, 0x7e37, 0x7e32,
-  0x7e3a, 0x7e67, 0x7e5d, 0x7e56, 0x7e5e, 0x7e59, 0x7e5a, 0x7e79,
-  0x7e6a, 0x7e69, 0x7e7c, 0x7e7b, 0x7e83, 0x7dd5, 0x7e7d, 0x8fae,
-  0x7e7f, 0x7e88, 0x7e89, 0x7e8c, 0x7e92, 0x7e90, 0x7e93, 0x7e94,
-  0x7e96, 0x7e8e, 0x7e9b, 0x7e9c, 0x7f38, 0x7f3a,
-  /* 0x66 */
-  0x7f45, 0x7f4c, 0x7f4d, 0x7f4e, 0x7f50, 0x7f51, 0x7f55, 0x7f54,
-  0x7f58, 0x7f5f, 0x7f60, 0x7f68, 0x7f69, 0x7f67, 0x7f78, 0x7f82,
-  0x7f86, 0x7f83, 0x7f88, 0x7f87, 0x7f8c, 0x7f94, 0x7f9e, 0x7f9d,
-  0x7f9a, 0x7fa3, 0x7faf, 0x7fb2, 0x7fb9, 0x7fae, 0x7fb6, 0x7fb8,
-  0x8b71, 0x7fc5, 0x7fc6, 0x7fca, 0x7fd5, 0x7fd4, 0x7fe1, 0x7fe6,
-  0x7fe9, 0x7ff3, 0x7ff9, 0x98dc, 0x8006, 0x8004, 0x800b, 0x8012,
-  0x8018, 0x8019, 0x801c, 0x8021, 0x8028, 0x803f, 0x803b, 0x804a,
-  0x8046, 0x8052, 0x8058, 0x805a, 0x805f, 0x8062, 0x8068, 0x8073,
-  0x8072, 0x8070, 0x8076, 0x8079, 0x807d, 0x807f, 0x8084, 0x8086,
-  0x8085, 0x809b, 0x8093, 0x809a, 0x80ad, 0x5190, 0x80ac, 0x80db,
-  0x80e5, 0x80d9, 0x80dd, 0x80c4, 0x80da, 0x80d6, 0x8109, 0x80ef,
-  0x80f1, 0x811b, 0x8129, 0x8123, 0x812f, 0x814b,
-  /* 0x67 */
-  0x968b, 0x8146, 0x813e, 0x8153, 0x8151, 0x80fc, 0x8171, 0x816e,
-  0x8165, 0x8166, 0x8174, 0x8183, 0x8188, 0x818a, 0x8180, 0x8182,
-  0x81a0, 0x8195, 0x81a4, 0x81a3, 0x815f, 0x8193, 0x81a9, 0x81b0,
-  0x81b5, 0x81be, 0x81b8, 0x81bd, 0x81c0, 0x81c2, 0x81ba, 0x81c9,
-  0x81cd, 0x81d1, 0x81d9, 0x81d8, 0x81c8, 0x81da, 0x81df, 0x81e0,
-  0x81e7, 0x81fa, 0x81fb, 0x81fe, 0x8201, 0x8202, 0x8205, 0x8207,
-  0x820a, 0x820d, 0x8210, 0x8216, 0x8229, 0x822b, 0x8238, 0x8233,
-  0x8240, 0x8259, 0x8258, 0x825d, 0x825a, 0x825f, 0x8264, 0x8262,
-  0x8268, 0x826a, 0x826b, 0x822e, 0x8271, 0x8277, 0x8278, 0x827e,
-  0x828d, 0x8292, 0x82ab, 0x829f, 0x82bb, 0x82ac, 0x82e1, 0x82e3,
-  0x82df, 0x82d2, 0x82f4, 0x82f3, 0x82fa, 0x8393, 0x8303, 0x82fb,
-  0x82f9, 0x82de, 0x8306, 0x82dc, 0x8309, 0x82d9,
-  /* 0x68 */
-  0x8335, 0x8334, 0x8316, 0x8332, 0x8331, 0x8340, 0x8339, 0x8350,
-  0x8345, 0x832f, 0x832b, 0x8317, 0x8318, 0x8385, 0x839a, 0x83aa,
-  0x839f, 0x83a2, 0x8396, 0x8323, 0x838e, 0x8387, 0x838a, 0x837c,
-  0x83b5, 0x8373, 0x8375, 0x83a0, 0x8389, 0x83a8, 0x83f4, 0x8413,
-  0x83eb, 0x83ce, 0x83fd, 0x8403, 0x83d8, 0x840b, 0x83c1, 0x83f7,
-  0x8407, 0x83e0, 0x83f2, 0x840d, 0x8422, 0x8420, 0x83bd, 0x8438,
-  0x8506, 0x83fb, 0x846d, 0x842a, 0x843c, 0x855a, 0x8484, 0x8477,
-  0x846b, 0x84ad, 0x846e, 0x8482, 0x8469, 0x8446, 0x842c, 0x846f,
-  0x8479, 0x8435, 0x84ca, 0x8462, 0x84b9, 0x84bf, 0x849f, 0x84d9,
-  0x84cd, 0x84bb, 0x84da, 0x84d0, 0x84c1, 0x84c6, 0x84d6, 0x84a1,
-  0x8521, 0x84ff, 0x84f4, 0x8517, 0x8518, 0x852c, 0x851f, 0x8515,
-  0x8514, 0x84fc, 0x8540, 0x8563, 0x8558, 0x8548,
-  /* 0x69 */
-  0x8541, 0x8602, 0x854b, 0x8555, 0x8580, 0x85a4, 0x8588, 0x8591,
-  0x858a, 0x85a8, 0x856d, 0x8594, 0x859b, 0x85ea, 0x8587, 0x859c,
-  0x8577, 0x857e, 0x8590, 0x85c9, 0x85ba, 0x85cf, 0x85b9, 0x85d0,
-  0x85d5, 0x85dd, 0x85e5, 0x85dc, 0x85f9, 0x860a, 0x8613, 0x860b,
-  0x85fe, 0x85fa, 0x8606, 0x8622, 0x861a, 0x8630, 0x863f, 0x864d,
-  0x4e55, 0x8654, 0x865f, 0x8667, 0x8671, 0x8693, 0x86a3, 0x86a9,
-  0x86aa, 0x868b, 0x868c, 0x86b6, 0x86af, 0x86c4, 0x86c6, 0x86b0,
-  0x86c9, 0x8823, 0x86ab, 0x86d4, 0x86de, 0x86e9, 0x86ec, 0x86df,
-  0x86db, 0x86ef, 0x8712, 0x8706, 0x8708, 0x8700, 0x8703, 0x86fb,
-  0x8711, 0x8709, 0x870d, 0x86f9, 0x870a, 0x8734, 0x873f, 0x8737,
-  0x873b, 0x8725, 0x8729, 0x871a, 0x8760, 0x875f, 0x8778, 0x874c,
-  0x874e, 0x8774, 0x8757, 0x8768, 0x876e, 0x8759,
-  /* 0x6a */
-  0x8753, 0x8763, 0x876a, 0x8805, 0x87a2, 0x879f, 0x8782, 0x87af,
-  0x87cb, 0x87bd, 0x87c0, 0x87d0, 0x96d6, 0x87ab, 0x87c4, 0x87b3,
-  0x87c7, 0x87c6, 0x87bb, 0x87ef, 0x87f2, 0x87e0, 0x880f, 0x880d,
-  0x87fe, 0x87f6, 0x87f7, 0x880e, 0x87d2, 0x8811, 0x8816, 0x8815,
-  0x8822, 0x8821, 0x8831, 0x8836, 0x8839, 0x8827, 0x883b, 0x8844,
-  0x8842, 0x8852, 0x8859, 0x885e, 0x8862, 0x886b, 0x8881, 0x887e,
-  0x889e, 0x8875, 0x887d, 0x88b5, 0x8872, 0x8882, 0x8897, 0x8892,
-  0x88ae, 0x8899, 0x88a2, 0x888d, 0x88a4, 0x88b0, 0x88bf, 0x88b1,
-  0x88c3, 0x88c4, 0x88d4, 0x88d8, 0x88d9, 0x88dd, 0x88f9, 0x8902,
-  0x88fc, 0x88f4, 0x88e8, 0x88f2, 0x8904, 0x890c, 0x890a, 0x8913,
-  0x8943, 0x891e, 0x8925, 0x892a, 0x892b, 0x8941, 0x8944, 0x893b,
-  0x8936, 0x8938, 0x894c, 0x891d, 0x8960, 0x895e,
-  /* 0x6b */
-  0x8966, 0x8964, 0x896d, 0x896a, 0x896f, 0x8974, 0x8977, 0x897e,
-  0x8983, 0x8988, 0x898a, 0x8993, 0x8998, 0x89a1, 0x89a9, 0x89a6,
-  0x89ac, 0x89af, 0x89b2, 0x89ba, 0x89bd, 0x89bf, 0x89c0, 0x89da,
-  0x89dc, 0x89dd, 0x89e7, 0x89f4, 0x89f8, 0x8a03, 0x8a16, 0x8a10,
-  0x8a0c, 0x8a1b, 0x8a1d, 0x8a25, 0x8a36, 0x8a41, 0x8a5b, 0x8a52,
-  0x8a46, 0x8a48, 0x8a7c, 0x8a6d, 0x8a6c, 0x8a62, 0x8a85, 0x8a82,
-  0x8a84, 0x8aa8, 0x8aa1, 0x8a91, 0x8aa5, 0x8aa6, 0x8a9a, 0x8aa3,
-  0x8ac4, 0x8acd, 0x8ac2, 0x8ada, 0x8aeb, 0x8af3, 0x8ae7, 0x8ae4,
-  0x8af1, 0x8b14, 0x8ae0, 0x8ae2, 0x8af7, 0x8ade, 0x8adb, 0x8b0c,
-  0x8b07, 0x8b1a, 0x8ae1, 0x8b16, 0x8b10, 0x8b17, 0x8b20, 0x8b33,
-  0x97ab, 0x8b26, 0x8b2b, 0x8b3e, 0x8b28, 0x8b41, 0x8b4c, 0x8b4f,
-  0x8b4e, 0x8b49, 0x8b56, 0x8b5b, 0x8b5a, 0x8b6b,
-  /* 0x6c */
-  0x8b5f, 0x8b6c, 0x8b6f, 0x8b74, 0x8b7d, 0x8b80, 0x8b8c, 0x8b8e,
-  0x8b92, 0x8b93, 0x8b96, 0x8b99, 0x8b9a, 0x8c3a, 0x8c41, 0x8c3f,
-  0x8c48, 0x8c4c, 0x8c4e, 0x8c50, 0x8c55, 0x8c62, 0x8c6c, 0x8c78,
-  0x8c7a, 0x8c82, 0x8c89, 0x8c85, 0x8c8a, 0x8c8d, 0x8c8e, 0x8c94,
-  0x8c7c, 0x8c98, 0x621d, 0x8cad, 0x8caa, 0x8cbd, 0x8cb2, 0x8cb3,
-  0x8cae, 0x8cb6, 0x8cc8, 0x8cc1, 0x8ce4, 0x8ce3, 0x8cda, 0x8cfd,
-  0x8cfa, 0x8cfb, 0x8d04, 0x8d05, 0x8d0a, 0x8d07, 0x8d0f, 0x8d0d,
-  0x8d10, 0x9f4e, 0x8d13, 0x8ccd, 0x8d14, 0x8d16, 0x8d67, 0x8d6d,
-  0x8d71, 0x8d73, 0x8d81, 0x8d99, 0x8dc2, 0x8dbe, 0x8dba, 0x8dcf,
-  0x8dda, 0x8dd6, 0x8dcc, 0x8ddb, 0x8dcb, 0x8dea, 0x8deb, 0x8ddf,
-  0x8de3, 0x8dfc, 0x8e08, 0x8e09, 0x8dff, 0x8e1d, 0x8e1e, 0x8e10,
-  0x8e1f, 0x8e42, 0x8e35, 0x8e30, 0x8e34, 0x8e4a,
-  /* 0x6d */
-  0x8e47, 0x8e49, 0x8e4c, 0x8e50, 0x8e48, 0x8e59, 0x8e64, 0x8e60,
-  0x8e2a, 0x8e63, 0x8e55, 0x8e76, 0x8e72, 0x8e7c, 0x8e81, 0x8e87,
-  0x8e85, 0x8e84, 0x8e8b, 0x8e8a, 0x8e93, 0x8e91, 0x8e94, 0x8e99,
-  0x8eaa, 0x8ea1, 0x8eac, 0x8eb0, 0x8ec6, 0x8eb1, 0x8ebe, 0x8ec5,
-  0x8ec8, 0x8ecb, 0x8edb, 0x8ee3, 0x8efc, 0x8efb, 0x8eeb, 0x8efe,
-  0x8f0a, 0x8f05, 0x8f15, 0x8f12, 0x8f19, 0x8f13, 0x8f1c, 0x8f1f,
-  0x8f1b, 0x8f0c, 0x8f26, 0x8f33, 0x8f3b, 0x8f39, 0x8f45, 0x8f42,
-  0x8f3e, 0x8f4c, 0x8f49, 0x8f46, 0x8f4e, 0x8f57, 0x8f5c, 0x8f62,
-  0x8f63, 0x8f64, 0x8f9c, 0x8f9f, 0x8fa3, 0x8fad, 0x8faf, 0x8fb7,
-  0x8fda, 0x8fe5, 0x8fe2, 0x8fea, 0x8fef, 0x9087, 0x8ff4, 0x9005,
-  0x8ff9, 0x8ffa, 0x9011, 0x9015, 0x9021, 0x900d, 0x901e, 0x9016,
-  0x900b, 0x9027, 0x9036, 0x9035, 0x9039, 0x8ff8,
-  /* 0x6e */
-  0x904f, 0x9050, 0x9051, 0x9052, 0x900e, 0x9049, 0x903e, 0x9056,
-  0x9058, 0x905e, 0x9068, 0x906f, 0x9076, 0x96a8, 0x9072, 0x9082,
-  0x907d, 0x9081, 0x9080, 0x908a, 0x9089, 0x908f, 0x90a8, 0x90af,
-  0x90b1, 0x90b5, 0x90e2, 0x90e4, 0x6248, 0x90db, 0x9102, 0x9112,
-  0x9119, 0x9132, 0x9130, 0x914a, 0x9156, 0x9158, 0x9163, 0x9165,
-  0x9169, 0x9173, 0x9172, 0x918b, 0x9189, 0x9182, 0x91a2, 0x91ab,
-  0x91af, 0x91aa, 0x91b5, 0x91b4, 0x91ba, 0x91c0, 0x91c1, 0x91c9,
-  0x91cb, 0x91d0, 0x91d6, 0x91df, 0x91e1, 0x91db, 0x91fc, 0x91f5,
-  0x91f6, 0x921e, 0x91ff, 0x9214, 0x922c, 0x9215, 0x9211, 0x925e,
-  0x9257, 0x9245, 0x9249, 0x9264, 0x9248, 0x9295, 0x923f, 0x924b,
-  0x9250, 0x929c, 0x9296, 0x9293, 0x929b, 0x925a, 0x92cf, 0x92b9,
-  0x92b7, 0x92e9, 0x930f, 0x92fa, 0x9344, 0x932e,
-  /* 0x6f */
-  0x9319, 0x9322, 0x931a, 0x9323, 0x933a, 0x9335, 0x933b, 0x935c,
-  0x9360, 0x937c, 0x936e, 0x9356, 0x93b0, 0x93ac, 0x93ad, 0x9394,
-  0x93b9, 0x93d6, 0x93d7, 0x93e8, 0x93e5, 0x93d8, 0x93c3, 0x93dd,
-  0x93d0, 0x93c8, 0x93e4, 0x941a, 0x9414, 0x9413, 0x9403, 0x9407,
-  0x9410, 0x9436, 0x942b, 0x9435, 0x9421, 0x943a, 0x9441, 0x9452,
-  0x9444, 0x945b, 0x9460, 0x9462, 0x945e, 0x946a, 0x9229, 0x9470,
-  0x9475, 0x9477, 0x947d, 0x945a, 0x947c, 0x947e, 0x9481, 0x947f,
-  0x9582, 0x9587, 0x958a, 0x9594, 0x9596, 0x9598, 0x9599, 0x95a0,
-  0x95a8, 0x95a7, 0x95ad, 0x95bc, 0x95bb, 0x95b9, 0x95be, 0x95ca,
-  0x6ff6, 0x95c3, 0x95cd, 0x95cc, 0x95d5, 0x95d4, 0x95d6, 0x95dc,
-  0x95e1, 0x95e5, 0x95e2, 0x9621, 0x9628, 0x962e, 0x962f, 0x9642,
-  0x964c, 0x964f, 0x964b, 0x9677, 0x965c, 0x965e,
-  /* 0x70 */
-  0x965d, 0x965f, 0x9666, 0x9672, 0x966c, 0x968d, 0x9698, 0x9695,
-  0x9697, 0x96aa, 0x96a7, 0x96b1, 0x96b2, 0x96b0, 0x96b4, 0x96b6,
-  0x96b8, 0x96b9, 0x96ce, 0x96cb, 0x96c9, 0x96cd, 0x894d, 0x96dc,
-  0x970d, 0x96d5, 0x96f9, 0x9704, 0x9706, 0x9708, 0x9713, 0x970e,
-  0x9711, 0x970f, 0x9716, 0x9719, 0x9724, 0x972a, 0x9730, 0x9739,
-  0x973d, 0x973e, 0x9744, 0x9746, 0x9748, 0x9742, 0x9749, 0x975c,
-  0x9760, 0x9764, 0x9766, 0x9768, 0x52d2, 0x976b, 0x9771, 0x9779,
-  0x9785, 0x977c, 0x9781, 0x977a, 0x9786, 0x978b, 0x978f, 0x9790,
-  0x979c, 0x97a8, 0x97a6, 0x97a3, 0x97b3, 0x97b4, 0x97c3, 0x97c6,
-  0x97c8, 0x97cb, 0x97dc, 0x97ed, 0x9f4f, 0x97f2, 0x7adf, 0x97f6,
-  0x97f5, 0x980f, 0x980c, 0x9838, 0x9824, 0x9821, 0x9837, 0x983d,
-  0x9846, 0x984f, 0x984b, 0x986b, 0x986f, 0x9870,
-  /* 0x71 */
-  0x9871, 0x9874, 0x9873, 0x98aa, 0x98af, 0x98b1, 0x98b6, 0x98c4,
-  0x98c3, 0x98c6, 0x98e9, 0x98eb, 0x9903, 0x9909, 0x9912, 0x9914,
-  0x9918, 0x9921, 0x991d, 0x991e, 0x9924, 0x9920, 0x992c, 0x992e,
-  0x993d, 0x993e, 0x9942, 0x9949, 0x9945, 0x9950, 0x994b, 0x9951,
-  0x9952, 0x994c, 0x9955, 0x9997, 0x9998, 0x99a5, 0x99ad, 0x99ae,
-  0x99bc, 0x99df, 0x99db, 0x99dd, 0x99d8, 0x99d1, 0x99ed, 0x99ee,
-  0x99f1, 0x99f2, 0x99fb, 0x99f8, 0x9a01, 0x9a0f, 0x9a05, 0x99e2,
-  0x9a19, 0x9a2b, 0x9a37, 0x9a45, 0x9a42, 0x9a40, 0x9a43, 0x9a3e,
-  0x9a55, 0x9a4d, 0x9a5b, 0x9a57, 0x9a5f, 0x9a62, 0x9a65, 0x9a64,
-  0x9a69, 0x9a6b, 0x9a6a, 0x9aad, 0x9ab0, 0x9abc, 0x9ac0, 0x9acf,
-  0x9ad1, 0x9ad3, 0x9ad4, 0x9ade, 0x9adf, 0x9ae2, 0x9ae3, 0x9ae6,
-  0x9aef, 0x9aeb, 0x9aee, 0x9af4, 0x9af1, 0x9af7,
-  /* 0x72 */
-  0x9afb, 0x9b06, 0x9b18, 0x9b1a, 0x9b1f, 0x9b22, 0x9b23, 0x9b25,
-  0x9b27, 0x9b28, 0x9b29, 0x9b2a, 0x9b2e, 0x9b2f, 0x9b32, 0x9b44,
-  0x9b43, 0x9b4f, 0x9b4d, 0x9b4e, 0x9b51, 0x9b58, 0x9b74, 0x9b93,
-  0x9b83, 0x9b91, 0x9b96, 0x9b97, 0x9b9f, 0x9ba0, 0x9ba8, 0x9bb4,
-  0x9bc0, 0x9bca, 0x9bb9, 0x9bc6, 0x9bcf, 0x9bd1, 0x9bd2, 0x9be3,
-  0x9be2, 0x9be4, 0x9bd4, 0x9be1, 0x9c3a, 0x9bf2, 0x9bf1, 0x9bf0,
-  0x9c15, 0x9c14, 0x9c09, 0x9c13, 0x9c0c, 0x9c06, 0x9c08, 0x9c12,
-  0x9c0a, 0x9c04, 0x9c2e, 0x9c1b, 0x9c25, 0x9c24, 0x9c21, 0x9c30,
-  0x9c47, 0x9c32, 0x9c46, 0x9c3e, 0x9c5a, 0x9c60, 0x9c67, 0x9c76,
-  0x9c78, 0x9ce7, 0x9cec, 0x9cf0, 0x9d09, 0x9d08, 0x9ceb, 0x9d03,
-  0x9d06, 0x9d2a, 0x9d26, 0x9daf, 0x9d23, 0x9d1f, 0x9d44, 0x9d15,
-  0x9d12, 0x9d41, 0x9d3f, 0x9d3e, 0x9d46, 0x9d48,
-  /* 0x73 */
-  0x9d5d, 0x9d5e, 0x9d64, 0x9d51, 0x9d50, 0x9d59, 0x9d72, 0x9d89,
-  0x9d87, 0x9dab, 0x9d6f, 0x9d7a, 0x9d9a, 0x9da4, 0x9da9, 0x9db2,
-  0x9dc4, 0x9dc1, 0x9dbb, 0x9db8, 0x9dba, 0x9dc6, 0x9dcf, 0x9dc2,
-  0x9dd9, 0x9dd3, 0x9df8, 0x9de6, 0x9ded, 0x9def, 0x9dfd, 0x9e1a,
-  0x9e1b, 0x9e1e, 0x9e75, 0x9e79, 0x9e7d, 0x9e81, 0x9e88, 0x9e8b,
-  0x9e8c, 0x9e92, 0x9e95, 0x9e91, 0x9e9d, 0x9ea5, 0x9ea9, 0x9eb8,
-  0x9eaa, 0x9ead, 0x9761, 0x9ecc, 0x9ece, 0x9ecf, 0x9ed0, 0x9ed4,
-  0x9edc, 0x9ede, 0x9edd, 0x9ee0, 0x9ee5, 0x9ee8, 0x9eef, 0x9ef4,
-  0x9ef6, 0x9ef7, 0x9ef9, 0x9efb, 0x9efc, 0x9efd, 0x9f07, 0x9f08,
-  0x76b7, 0x9f15, 0x9f21, 0x9f2c, 0x9f3e, 0x9f4a, 0x9f52, 0x9f54,
-  0x9f63, 0x9f5f, 0x9f60, 0x9f61, 0x9f66, 0x9f67, 0x9f6c, 0x9f6a,
-  0x9f77, 0x9f72, 0x9f76, 0x9f95, 0x9f9c, 0x9fa0,
-  /* 0x74 */
-  0x582f, 0x69c7, 0x9059, 0x7464, 0x51dc, 0x7199,
-};
-
-static int
-jisx0208_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c1 = s[0];
-  if ((c1 >= 0x21 && c1 <= 0x28) || (c1 >= 0x30 && c1 <= 0x74)) {
-    if (n >= 2) {
-      unsigned char c2 = s[1];
-      if (c2 >= 0x21 && c2 < 0x7f) {
-        unsigned int i = 94 * (c1 - 0x21) + (c2 - 0x21);
-        unsigned short wc = 0xfffd;
-        if (i < 1410) {
-          if (i < 690)
-            wc = jisx0208_2uni_page21[i];
-        } else {
-          if (i < 7808)
-            wc = jisx0208_2uni_page30[i-1410];
-        }
-        if (wc != 0xfffd) {
-          *pwc = (wchar_t) wc;
-          return 2;
-        }
-      }
-      return RET_ILSEQ;
-    }
-    return RET_TOOFEW(0);
-  }
-  return RET_ILSEQ;
-}
-
-static const unsigned short jisx0208_2charset[6879] = {
-  0x2140, 0x2171, 0x2172, 0x2178, 0x212f, 0x224c, 0x216b, 0x215e,
-  0x212d, 0x2279, 0x215f, 0x2160, 0x2621, 0x2622, 0x2623, 0x2624,
-  0x2625, 0x2626, 0x2627, 0x2628, 0x2629, 0x262a, 0x262b, 0x262c,
-  0x262d, 0x262e, 0x262f, 0x2630, 0x2631, 0x2632, 0x2633, 0x2634,
-  0x2635, 0x2636, 0x2637, 0x2638, 0x2641, 0x2642, 0x2643, 0x2644,
-  0x2645, 0x2646, 0x2647, 0x2648, 0x2649, 0x264a, 0x264b, 0x264c,
-  0x264d, 0x264e, 0x264f, 0x2650, 0x2651, 0x2652, 0x2653, 0x2654,
-  0x2655, 0x2656, 0x2657, 0x2658, 0x2727, 0x2721, 0x2722, 0x2723,
-  0x2724, 0x2725, 0x2726, 0x2728, 0x2729, 0x272a, 0x272b, 0x272c,
-  0x272d, 0x272e, 0x272f, 0x2730, 0x2731, 0x2732, 0x2733, 0x2734,
-  0x2735, 0x2736, 0x2737, 0x2738, 0x2739, 0x273a, 0x273b, 0x273c,
-  0x273d, 0x273e, 0x273f, 0x2740, 0x2741, 0x2751, 0x2752, 0x2753,
-  0x2754, 0x2755, 0x2756, 0x2758, 0x2759, 0x275a, 0x275b, 0x275c,
-  0x275d, 0x275e, 0x275f, 0x2760, 0x2761, 0x2762, 0x2763, 0x2764,
-  0x2765, 0x2766, 0x2767, 0x2768, 0x2769, 0x276a, 0x276b, 0x276c,
-  0x276d, 0x276e, 0x276f, 0x2770, 0x2771, 0x2757, 0x213e, 0x213d,
-  0x2142, 0x2146, 0x2147, 0x2148, 0x2149, 0x2277, 0x2278, 0x2145,
-  0x2144, 0x2273, 0x216c, 0x216d, 0x2228, 0x216e, 0x2272, 0x222b,
-  0x222c, 0x222a, 0x222d, 0x224d, 0x224e, 0x224f, 0x225f, 0x2250,
-  0x2260, 0x223a, 0x223b, 0x215d, 0x2265, 0x2267, 0x2167, 0x225c,
-  0x224a, 0x224b, 0x2241, 0x2240, 0x2269, 0x226a, 0x2168, 0x2268,
-  0x2266, 0x2262, 0x2162, 0x2261, 0x2165, 0x2166, 0x2263, 0x2264,
-  0x223e, 0x223f, 0x223c, 0x223d, 0x225d, 0x225e, 0x2821, 0x282c,
-  0x2822, 0x282d, 0x2823, 0x282e, 0x2824, 0x282f, 0x2826, 0x2831,
-  0x2825, 0x2830, 0x2827, 0x283c, 0x2837, 0x2832, 0x2829, 0x283e,
-  0x2839, 0x2834, 0x2828, 0x2838, 0x283d, 0x2833, 0x282a, 0x283a,
-  0x283f, 0x2835, 0x282b, 0x283b, 0x2840, 0x2836, 0x2223, 0x2222,
-  0x2225, 0x2224, 0x2227, 0x2226, 0x2221, 0x217e, 0x217b, 0x217d,
-  0x217c, 0x227e, 0x217a, 0x2179, 0x216a, 0x2169, 0x2276, 0x2275,
-  0x2274, 0x2121, 0x2122, 0x2123, 0x2137, 0x2139, 0x213a, 0x213b,
-  0x2152, 0x2153, 0x2154, 0x2155, 0x2156, 0x2157, 0x2158, 0x2159,
-  0x215a, 0x215b, 0x2229, 0x222e, 0x214c, 0x214d, 0x2141, 0x2421,
-  0x2422, 0x2423, 0x2424, 0x2425, 0x2426, 0x2427, 0x2428, 0x2429,
-  0x242a, 0x242b, 0x242c, 0x242d, 0x242e, 0x242f, 0x2430, 0x2431,
-  0x2432, 0x2433, 0x2434, 0x2435, 0x2436, 0x2437, 0x2438, 0x2439,
-  0x243a, 0x243b, 0x243c, 0x243d, 0x243e, 0x243f, 0x2440, 0x2441,
-  0x2442, 0x2443, 0x2444, 0x2445, 0x2446, 0x2447, 0x2448, 0x2449,
-  0x244a, 0x244b, 0x244c, 0x244d, 0x244e, 0x244f, 0x2450, 0x2451,
-  0x2452, 0x2453, 0x2454, 0x2455, 0x2456, 0x2457, 0x2458, 0x2459,
-  0x245a, 0x245b, 0x245c, 0x245d, 0x245e, 0x245f, 0x2460, 0x2461,
-  0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467, 0x2468, 0x2469,
-  0x246a, 0x246b, 0x246c, 0x246d, 0x246e, 0x246f, 0x2470, 0x2471,
-  0x2472, 0x2473, 0x212b, 0x212c, 0x2135, 0x2136, 0x2521, 0x2522,
-  0x2523, 0x2524, 0x2525, 0x2526, 0x2527, 0x2528, 0x2529, 0x252a,
-  0x252b, 0x252c, 0x252d, 0x252e, 0x252f, 0x2530, 0x2531, 0x2532,
-  0x2533, 0x2534, 0x2535, 0x2536, 0x2537, 0x2538, 0x2539, 0x253a,
-  0x253b, 0x253c, 0x253d, 0x253e, 0x253f, 0x2540, 0x2541, 0x2542,
-  0x2543, 0x2544, 0x2545, 0x2546, 0x2547, 0x2548, 0x2549, 0x254a,
-  0x254b, 0x254c, 0x254d, 0x254e, 0x254f, 0x2550, 0x2551, 0x2552,
-  0x2553, 0x2554, 0x2555, 0x2556, 0x2557, 0x2558, 0x2559, 0x255a,
-  0x255b, 0x255c, 0x255d, 0x255e, 0x255f, 0x2560, 0x2561, 0x2562,
-  0x2563, 0x2564, 0x2565, 0x2566, 0x2567, 0x2568, 0x2569, 0x256a,
-  0x256b, 0x256c, 0x256d, 0x256e, 0x256f, 0x2570, 0x2571, 0x2572,
-  0x2573, 0x2574, 0x2575, 0x2576, 0x2126, 0x213c, 0x2133, 0x2134,
-  0x306c, 0x437a, 0x3c37, 0x4b7c, 0x3e66, 0x3b30, 0x3e65, 0x323c,
-  0x4954, 0x4d3f, 0x5022, 0x312f, 0x336e, 0x5023, 0x4024, 0x5242,
-  0x3556, 0x4a3a, 0x3e67, 0x4e3e, 0x4a42, 0x5024, 0x4366, 0x5025,
-  0x367a, 0x5026, 0x345d, 0x4330, 0x3c67, 0x5027, 0x5028, 0x5029,
-  0x4735, 0x3557, 0x4737, 0x4663, 0x3843, 0x4b33, 0x6949, 0x502a,
-  0x3e68, 0x502b, 0x3235, 0x3665, 0x3870, 0x4c69, 0x5626, 0x4d70,
-  0x467d, 0x3425, 0x3535, 0x502c, 0x502d, 0x4e3b, 0x4d3d, 0x4168,
-  0x502f, 0x3b76, 0x4673, 0x5032, 0x313e, 0x385f, 0x385e, 0x3066,
-  0x4f4b, 0x4f4a, 0x3a33, 0x3021, 0x5033, 0x5034, 0x5035, 0x4b34,
-  0x5036, 0x3872, 0x3067, 0x4b72, 0x357c, 0x357d, 0x357e, 0x4462,
-  0x4e3c, 0x5037, 0x5038, 0x5039, 0x3f4d, 0x3d3a, 0x3f4e, 0x503e,
-  0x503c, 0x503d, 0x3558, 0x3a23, 0x3270, 0x503b, 0x503a, 0x4a29,
-  0x3b46, 0x3b45, 0x423e, 0x503f, 0x4955, 0x4067, 0x2138, 0x5040,
-  0x5042, 0x4265, 0x4e61, 0x304a, 0x5041, 0x323e, 0x3644, 0x4367,
-  0x376f, 0x5043, 0x4724, 0x346b, 0x5044, 0x304b, 0x3860, 0x346c,
-  0x497a, 0x4832, 0x3559, 0x3271, 0x5067, 0x4541, 0x476c, 0x5046,
-  0x483c, 0x4e62, 0x3f2d, 0x3b47, 0x3b77, 0x3240, 0x4451, 0x4322,
-  0x504a, 0x304c, 0x4463, 0x3d3b, 0x3a34, 0x4d24, 0x424e, 0x323f,
-  0x5049, 0x4d3e, 0x5045, 0x5047, 0x3a6e, 0x5048, 0x5524, 0x5050,
-  0x5053, 0x5051, 0x3242, 0x4a3b, 0x504b, 0x504f, 0x3873, 0x3b48,
-  0x3426, 0x5054, 0x504c, 0x4e63, 0x3b78, 0x504d, 0x5052, 0x5055,
-  0x504e, 0x3621, 0x304d, 0x3622, 0x3241, 0x5525, 0x4b79, 0x496e,
-  0x3874, 0x3f2f, 0x4e37, 0x4a58, 0x3738, 0x4225, 0x3264, 0x3d53,
-  0x5059, 0x505e, 0x505c, 0x5057, 0x422f, 0x505a, 0x505d, 0x505b,
-  0x4a5d, 0x5058, 0x3f2e, 0x4b73, 0x505f, 0x5060, 0x3d24, 0x506d,
-  0x4750, 0x4936, 0x5068, 0x4a70, 0x3236, 0x506c, 0x5066, 0x506f,
-  0x4152, 0x3844, 0x475c, 0x6047, 0x506e, 0x455d, 0x5063, 0x3876,
-  0x3875, 0x5061, 0x3c5a, 0x5069, 0x4a6f, 0x434d, 0x5065, 0x3771,
-  0x5062, 0x506a, 0x5064, 0x4e51, 0x506b, 0x4f41, 0x3666, 0x3770,
-  0x5070, 0x5071, 0x5075, 0x304e, 0x4a50, 0x5074, 0x5073, 0x5077,
-  0x5076, 0x4464, 0x3772, 0x5078, 0x3c45, 0x4226, 0x4465, 0x3676,
-  0x5079, 0x3536, 0x507a, 0x507c, 0x4b35, 0x3766, 0x3b31, 0x4877,
-  0x507b, 0x3a45, 0x4d43, 0x507e, 0x5123, 0x507d, 0x3a44, 0x3d7d,
-  0x3739, 0x5124, 0x364f, 0x5121, 0x5122, 0x462f, 0x417c, 0x3623,
-  0x4b4d, 0x5125, 0x4e3d, 0x5126, 0x5129, 0x5127, 0x414e, 0x5128,
-  0x512a, 0x512c, 0x512b, 0x4a48, 0x3537, 0x512e, 0x512f, 0x322f,
-  0x512d, 0x3c74, 0x5132, 0x5131, 0x5130, 0x5056, 0x5133, 0x3d7e,
-  0x5134, 0x4d25, 0x4c59, 0x5136, 0x5135, 0x5138, 0x5137, 0x5139,
-  0x513a, 0x3074, 0x3835, 0x373b, 0x3d3c, 0x437b, 0x3624, 0x4068,
-  0x3877, 0x396e, 0x513c, 0x4c48, 0x4546, 0x3b79, 0x513b, 0x513d,
-  0x455e, 0x3375, 0x513e, 0x467e, 0x4134, 0x5140, 0x5141, 0x482c,
-  0x3878, 0x4f3b, 0x5142, 0x3626, 0x4a3c, 0x4236, 0x3671, 0x4535,
-  0x3773, 0x5143, 0x5144, 0x4662, 0x315f, 0x5147, 0x3a7d, 0x5146,
-  0x3a46, 0x5148, 0x666e, 0x5149, 0x4b41, 0x514a, 0x514b, 0x514c,
-  0x3e69, 0x3c4c, 0x3427, 0x514f, 0x514d, 0x4c3d, 0x514e, 0x495a,
-  0x5150, 0x5151, 0x5152, 0x455f, 0x5156, 0x5154, 0x5155, 0x5153,
-  0x3a63, 0x5157, 0x4c6a, 0x4e64, 0x5158, 0x4028, 0x5159, 0x3d5a,
-  0x515a, 0x437c, 0x4e3f, 0x4560, 0x5245, 0x515b, 0x7425, 0x3645,
-  0x515c, 0x4b5e, 0x3d68, 0x427c, 0x515e, 0x4664, 0x515f, 0x5160,
-  0x332e, 0x5161, 0x3627, 0x464c, 0x317a, 0x3d50, 0x4821, 0x5162,
-  0x4561, 0x3f4f, 0x5163, 0x4a2c, 0x405a, 0x3422, 0x3429, 0x5164,
-  0x5166, 0x373a, 0x5165, 0x4e73, 0x3d69, 0x483d, 0x4a4c, 0x5167,
-  0x4d78, 0x5168, 0x5169, 0x457e, 0x516a, 0x4029, 0x3a7e, 0x3774,
-  0x516b, 0x3b49, 0x396f, 0x4466, 0x516d, 0x4227, 0x3a6f, 0x516e,
-  0x516f, 0x4130, 0x516c, 0x5171, 0x4b36, 0x3964, 0x5170, 0x3775,
-  0x3a5e, 0x476d, 0x5174, 0x5172, 0x497b, 0x3e6a, 0x517b, 0x3364,
-  0x5175, 0x5173, 0x414f, 0x5177, 0x5176, 0x3344, 0x3760, 0x517c,
-  0x4e2d, 0x5178, 0x517d, 0x517a, 0x5179, 0x4e4f, 0x3879, 0x3243,
-  0x4e74, 0x3d75, 0x4558, 0x3965, 0x5222, 0x5223, 0x4e65, 0x4f2b,
-  0x5225, 0x387a, 0x5224, 0x332f, 0x5226, 0x4b56, 0x443c, 0x4d26,
-  0x4a59, 0x5227, 0x7055, 0x4630, 0x5228, 0x342a, 0x4c33, 0x3e21,
-  0x5229, 0x4a67, 0x522d, 0x402a, 0x522a, 0x3650, 0x522b, 0x342b,
-  0x372e, 0x522e, 0x522f, 0x5230, 0x5231, 0x3c5b, 0x387b, 0x4c5e,
-  0x4c68, 0x4677, 0x4a71, 0x5232, 0x5233, 0x5235, 0x5237, 0x5236,
-  0x5238, 0x323d, 0x4b4c, 0x3a7c, 0x5239, 0x4159, 0x3e22, 0x3629,
-  0x523a, 0x485b, 0x523b, 0x523c, 0x523d, 0x523e, 0x4924, 0x3668,
-  0x3065, 0x463f, 0x523f, 0x3d3d, 0x4069, 0x5241, 0x5240, 0x3e23,
-  0x3861, 0x5243, 0x483e, 0x5244, 0x485c, 0x4234, 0x426e, 0x3628,
-  0x466e, 0x4331, 0x476e, 0x4b4e, 0x5246, 0x406a, 0x3735, 0x5247,
-  0x5248, 0x312c, 0x3075, 0x346d, 0x4228, 0x3551, 0x4d71, 0x524b,
-  0x3237, 0x524a, 0x362a, 0x524c, 0x4c71, 0x524d, 0x4e52, 0x387c,
-  0x3836, 0x524e, 0x5250, 0x524f, 0x3f5f, 0x3139, 0x315e, 0x5251,
-  0x5252, 0x3837, 0x5253, 0x356e, 0x3b32, 0x5254, 0x4b74, 0x3a35,
-  0x355a, 0x4d27, 0x4150, 0x483f, 0x3c7d, 0x3d47, 0x3c68, 0x3c75,
-  0x3d76, 0x4840, 0x5257, 0x3143, 0x4151, 0x387d, 0x3845, 0x3667,
-  0x525b, 0x4321, 0x427e, 0x362b, 0x3e24, 0x525c, 0x525a, 0x3244,
-  0x4266, 0x3c38, 0x3b4b, 0x3126, 0x3370, 0x3966, 0x3b4a, 0x525d,
-  0x525e, 0x3549, 0x3346, 0x3967, 0x3548, 0x445f, 0x3125, 0x4631,
-  0x4c3e, 0x3921, 0x4d79, 0x4547, 0x387e, 0x372f, 0x5267, 0x3663,
-  0x4b4a, 0x485d, 0x5266, 0x345e, 0x5261, 0x5262, 0x5264, 0x5265,
-  0x355b, 0x3f61, 0x4a2d, 0x5263, 0x525f, 0x3863, 0x5260, 0x4f24,
-  0x4a72, 0x4468, 0x3862, 0x3970, 0x5268, 0x465d, 0x526c, 0x3c7e,
-  0x3c76, 0x526f, 0x526d, 0x4c23, 0x526a, 0x5273, 0x526e, 0x5271,
-  0x3846, 0x4c3f, 0x5272, 0x5274, 0x5276, 0x3a70, 0x4f42, 0x526b,
-  0x5269, 0x5275, 0x5270, 0x5278, 0x5323, 0x527a, 0x527e, 0x5321,
-  0x527b, 0x533e, 0x3a69, 0x3331, 0x5279, 0x5325, 0x3076, 0x5324,
-  0x3025, 0x494a, 0x5322, 0x527c, 0x5277, 0x527d, 0x3a48, 0x5326,
-  0x3077, 0x532f, 0x5327, 0x5328, 0x3e25, 0x4b69, 0x532d, 0x532c,
-  0x452f, 0x532e, 0x532b, 0x3134, 0x3a36, 0x3f30, 0x5329, 0x4562,
-  0x532a, 0x3022, 0x5334, 0x4d23, 0x3e27, 0x533a, 0x5339, 0x5330,
-  0x4243, 0x5331, 0x426f, 0x5336, 0x3e26, 0x5333, 0x4c64, 0x373c,
-  0x5337, 0x5338, 0x5335, 0x533b, 0x5332, 0x5341, 0x5346, 0x5342,
-  0x533d, 0x5347, 0x4131, 0x5349, 0x3922, 0x533f, 0x437d, 0x5343,
-  0x533c, 0x342d, 0x346e, 0x3365, 0x5344, 0x5340, 0x3776, 0x534a,
-  0x5348, 0x4153, 0x354a, 0x362c, 0x5345, 0x3674, 0x3144, 0x534e,
-  0x534c, 0x5427, 0x5351, 0x534b, 0x534f, 0x534d, 0x3b4c, 0x5350,
-  0x5353, 0x5358, 0x5356, 0x5355, 0x4332, 0x3245, 0x5352, 0x5354,
-  0x3e28, 0x3133, 0x5357, 0x325e, 0x5362, 0x3e7c, 0x535e, 0x535c,
-  0x535d, 0x535f, 0x313d, 0x4139, 0x5359, 0x535a, 0x337a, 0x5361,
-  0x346f, 0x5364, 0x5360, 0x5363, 0x4a2e, 0x4655, 0x4838, 0x5366,
-  0x5365, 0x3345, 0x5367, 0x536a, 0x5369, 0x5368, 0x4739, 0x536b,
-  0x536c, 0x536e, 0x536d, 0x5370, 0x5373, 0x5371, 0x536f, 0x5372,
-  0x5374, 0x5375, 0x5376, 0x5377, 0x5378, 0x5145, 0x3c7c, 0x3b4d,
-  0x3273, 0x3078, 0x4344, 0x5379, 0x3a24, 0x304f, 0x3f5e, 0x537a,
-  0x3847, 0x3971, 0x537c, 0x537b, 0x4a60, 0x537d, 0x5421, 0x537e,
-  0x5422, 0x5423, 0x3777, 0x3160, 0x5424, 0x5426, 0x5425, 0x5428,
-  0x455a, 0x5429, 0x3035, 0x3a5f, 0x373d, 0x434f, 0x542a, 0x542b,
-  0x542d, 0x542e, 0x3a64, 0x3651, 0x4b37, 0x542c, 0x542f, 0x3a41,
-  0x3923, 0x5433, 0x3a25, 0x4333, 0x5430, 0x445a, 0x5434, 0x3f62,
-  0x5432, 0x5435, 0x373f, 0x5436, 0x5437, 0x3924, 0x3340, 0x5439,
-  0x543a, 0x543b, 0x5438, 0x5431, 0x543c, 0x543d, 0x4b64, 0x3e6b,
-  0x543f, 0x5440, 0x543e, 0x5442, 0x4738, 0x3068, 0x4956, 0x5443,
-  0x3e7d, 0x3c39, 0x475d, 0x3470, 0x3a6b, 0x4b59, 0x4632, 0x3778,
-  0x424f, 0x5441, 0x5444, 0x4244, 0x5445, 0x5446, 0x5448, 0x4469,
-  0x342e, 0x7421, 0x3161, 0x4a73, 0x3e6c, 0x4548, 0x3a66, 0x544e,
-  0x4a3d, 0x4e5d, 0x3274, 0x544a, 0x413a, 0x544d, 0x4563, 0x4549,
-  0x4564, 0x4839, 0x444d, 0x3a49, 0x5449, 0x3176, 0x4536, 0x544b,
-  0x5447, 0x3f50, 0x544f, 0x3d4e, 0x362d, 0x5450, 0x4a68, 0x417d,
-  0x4446, 0x5452, 0x4b4f, 0x5453, 0x5458, 0x4a2f, 0x5457, 0x5451,
-  0x5454, 0x5456, 0x3a26, 0x4a49, 0x5459, 0x4345, 0x3275, 0x3e6d,
-  0x545b, 0x545a, 0x3968, 0x545c, 0x545e, 0x545d, 0x5460, 0x5455,
-  0x5462, 0x5461, 0x545f, 0x3b4e, 0x3f51, 0x4154, 0x5463, 0x403c,
-  0x306d, 0x4764, 0x445b, 0x5465, 0x5464, 0x5466, 0x5467, 0x5468,
-  0x5469, 0x4a51, 0x546a, 0x3246, 0x546b, 0x4d3c, 0x3330, 0x5249,
-  0x3d48, 0x423f, 0x546c, 0x4c6b, 0x4c34, 0x546e, 0x4267, 0x4537,
-  0x4240, 0x4957, 0x546f, 0x5470, 0x317b, 0x3c3a, 0x5471, 0x3050,
-  0x5472, 0x5473, 0x3162, 0x3471, 0x4660, 0x4a74, 0x5477, 0x4155,
-  0x5476, 0x3740, 0x4b5b, 0x5475, 0x4565, 0x5479, 0x5478, 0x547b,
-  0x547a, 0x317c, 0x547c, 0x3e29, 0x547e, 0x4325, 0x547d, 0x4a33,
-  0x3d77, 0x455b, 0x5521, 0x3925, 0x5522, 0x4721, 0x485e, 0x4c51,
-  0x4725, 0x552b, 0x3538, 0x4d45, 0x4c2f, 0x562c, 0x5523, 0x5526,
-  0x4245, 0x4b38, 0x454a, 0x5527, 0x4b65, 0x3a4a, 0x3e2a, 0x5528,
-  0x3b50, 0x3b4f, 0x3039, 0x3848, 0x402b, 0x3051, 0x552c, 0x552d,
-  0x552a, 0x3138, 0x342f, 0x5529, 0x4c45, 0x4931, 0x3028, 0x3079,
-  0x3b51, 0x3052, 0x3023, 0x5532, 0x5530, 0x4c3c, 0x5533, 0x5531,
-  0x552f, 0x3f31, 0x552e, 0x4a5a, 0x3864, 0x5537, 0x5538, 0x3e2b,
-  0x5534, 0x4f2c, 0x474c, 0x5536, 0x3a27, 0x5539, 0x4958, 0x553a,
-  0x5535, 0x4c3b, 0x475e, 0x553b, 0x4932, 0x553c, 0x5540, 0x553d,
-  0x3247, 0x553f, 0x3c3b, 0x553e, 0x3779, 0x554c, 0x5545, 0x5542,
-  0x4364, 0x5541, 0x5543, 0x5544, 0x5546, 0x5547, 0x3472, 0x5549,
-  0x5548, 0x554a, 0x3e6e, 0x554d, 0x445c, 0x3145, 0x554b, 0x554e,
-  0x554f, 0x5552, 0x5550, 0x5551, 0x3b52, 0x5553, 0x3926, 0x5554,
-  0x3b7a, 0x4238, 0x5555, 0x5556, 0x3b5a, 0x3927, 0x4c52, 0x3528,
-  0x3849, 0x5557, 0x3358, 0x5558, 0x4239, 0x5559, 0x5623, 0x555a,
-  0x555b, 0x555c, 0x555e, 0x555f, 0x5560, 0x4270, 0x3127, 0x3c69,
-  0x3042, 0x4157, 0x3430, 0x3c35, 0x3928, 0x4566, 0x3d21, 0x3431,
-  0x4368, 0x446a, 0x3038, 0x3539, 0x4a75, 0x3c42, 0x3552, 0x406b,
-  0x3c3c, 0x4d28, 0x5561, 0x355c, 0x3a4b, 0x3332, 0x3163, 0x3e2c,
-  0x3248, 0x5562, 0x4d46, 0x3d49, 0x3c64, 0x5563, 0x3473, 0x4652,
-  0x4c29, 0x5564, 0x5565, 0x4959, 0x5567, 0x3428, 0x3677, 0x5566,
-  0x3432, 0x3f32, 0x556b, 0x3b21, 0x3249, 0x556a, 0x5568, 0x556c,
-  0x5569, 0x472b, 0x5c4d, 0x3f33, 0x556d, 0x4e40, 0x556e, 0x5570,
-  0x437e, 0x556f, 0x4023, 0x3b7b, 0x4250, 0x3c77, 0x4975, 0x406c,
-  0x3c4d, 0x5571, 0x3e2d, 0x5572, 0x5573, 0x3053, 0x423a, 0x3f52,
-  0x5574, 0x4633, 0x3e2e, 0x3e2f, 0x5575, 0x406d, 0x3e30, 0x5576,
-  0x5577, 0x4c60, 0x5578, 0x3646, 0x3d22, 0x5579, 0x557a, 0x3c5c,
-  0x3f2c, 0x4674, 0x3f54, 0x4878, 0x4722, 0x3649, 0x557b, 0x356f,
-  0x557c, 0x367e, 0x464f, 0x3230, 0x3b53, 0x557d, 0x5622, 0x5621,
-  0x367d, 0x557e, 0x4538, 0x4230, 0x454b, 0x3c48, 0x4158, 0x4d7a,
-  0x5624, 0x5625, 0x4656, 0x3b33, 0x5627, 0x5628, 0x5629, 0x3474,
-  0x562a, 0x562b, 0x322c, 0x413b, 0x3464, 0x562d, 0x4c28, 0x4252,
-  0x3359, 0x562f, 0x5631, 0x345f, 0x562e, 0x5630, 0x5633, 0x5632,
-  0x5634, 0x5635, 0x463d, 0x362e, 0x3265, 0x5636, 0x563b, 0x5639,
-  0x4a77, 0x4a76, 0x4567, 0x5638, 0x3d54, 0x5637, 0x3f72, 0x563c,
-  0x3a6a, 0x5642, 0x5643, 0x563d, 0x3333, 0x563e, 0x5647, 0x5646,
-  0x5645, 0x5641, 0x5640, 0x5644, 0x4a78, 0x564b, 0x5648, 0x564a,
-  0x4d72, 0x5649, 0x563f, 0x3f73, 0x564c, 0x3a37, 0x564d, 0x564e,
-  0x5651, 0x5650, 0x564f, 0x4568, 0x563a, 0x5657, 0x5653, 0x5652,
-  0x5654, 0x5655, 0x5658, 0x4e66, 0x5659, 0x5656, 0x565a, 0x3460,
-  0x565b, 0x565d, 0x565c, 0x565e, 0x565f, 0x406e, 0x3d23, 0x3d64,
-  0x4163, 0x3929, 0x3a38, 0x392a, 0x3570, 0x5660, 0x3a39, 0x384a,
-  0x5661, 0x4c26, 0x4743, 0x5662, 0x392b, 0x342c, 0x4327, 0x3652,
-  0x3b54, 0x495b, 0x4841, 0x5663, 0x3475, 0x5666, 0x4421, 0x5665,
-  0x5664, 0x5667, 0x446b, 0x3f63, 0x3b55, 0x404a, 0x4253, 0x3522,
-  0x4422, 0x5668, 0x5669, 0x3e6f, 0x4b39, 0x566c, 0x566b, 0x566a,
-  0x497d, 0x5673, 0x4b5a, 0x566d, 0x566f, 0x4b6b, 0x566e, 0x5670,
-  0x4828, 0x5671, 0x4a3e, 0x5672, 0x3433, 0x4a3f, 0x472f, 0x5674,
-  0x5675, 0x392c, 0x3434, 0x5676, 0x3838, 0x4d44, 0x4d29, 0x3476,
-  0x5678, 0x4423, 0x392d, 0x3e31, 0x485f, 0x3e32, 0x3d78, 0x446c,
-  0x4a79, 0x4539, 0x392e, 0x495c, 0x5679, 0x4559, 0x3a42, 0x384b,
-  0x446d, 0x3043, 0x3d6e, 0x392f, 0x4d47, 0x567a, 0x567b, 0x4751,
-  0x567c, 0x4e77, 0x4f2d, 0x567e, 0x567d, 0x3347, 0x5721, 0x5724,
-  0x5725, 0x5723, 0x4940, 0x3e33, 0x5727, 0x5726, 0x5722, 0x5728,
-  0x5729, 0x572a, 0x572d, 0x572b, 0x572c, 0x572e, 0x3164, 0x446e,
-  0x572f, 0x377a, 0x3276, 0x4736, 0x5730, 0x467b, 0x4a5b, 0x5731,
-  0x4f2e, 0x5732, 0x4a40, 0x5735, 0x5021, 0x5031, 0x3c30, 0x4675,
-  0x5736, 0x355d, 0x4424, 0x307a, 0x5737, 0x4a26, 0x3930, 0x4350,
-  0x446f, 0x4c6f, 0x3839, 0x384c, 0x5738, 0x5739, 0x573f, 0x3c65,
-  0x4425, 0x362f, 0x573a, 0x492b, 0x4346, 0x573b, 0x573c, 0x3630,
-  0x573d, 0x573e, 0x5740, 0x4576, 0x5741, 0x5742, 0x5743, 0x5734,
-  0x5733, 0x5744, 0x3741, 0x4927, 0x3a4c, 0x4937, 0x4426, 0x494b,
-  0x5745, 0x3e34, 0x3146, 0x5746, 0x5747, 0x4c72, 0x4860, 0x574a,
-  0x317d, 0x402c, 0x5749, 0x5748, 0x3742, 0x4254, 0x574e, 0x574c,
-  0x574b, 0x4e27, 0x3865, 0x3d79, 0x574d, 0x454c, 0x3d3e, 0x4640,
-  0x5751, 0x5750, 0x574f, 0x5752, 0x3866, 0x5753, 0x497c, 0x3d5b,
-  0x5754, 0x4879, 0x4641, 0x4427, 0x4530, 0x5755, 0x352b, 0x3f34,
-  0x492c, 0x3477, 0x4726, 0x5756, 0x3b56, 0x4b3a, 0x4b3b, 0x317e,
-  0x575b, 0x4369, 0x5758, 0x3277, 0x582d, 0x575a, 0x4730, 0x5759,
-  0x5757, 0x397a, 0x575d, 0x5763, 0x5769, 0x5761, 0x455c, 0x5766,
-  0x495d, 0x5760, 0x5765, 0x4e67, 0x3b57, 0x4255, 0x575e, 0x355e,
-  0x5768, 0x402d, 0x3165, 0x5762, 0x3278, 0x5767, 0x3631, 0x5764,
-  0x576a, 0x576c, 0x5776, 0x5774, 0x5771, 0x5770, 0x4e78, 0x5772,
-  0x3632, 0x3931, 0x3d7a, 0x5779, 0x576b, 0x576f, 0x575f, 0x327a,
-  0x5773, 0x5775, 0x4351, 0x3a28, 0x3238, 0x576d, 0x5778, 0x5777,
-  0x3633, 0x4229, 0x3366, 0x3743, 0x576e, 0x577a, 0x577d, 0x5821,
-  0x3c3d, 0x5827, 0x4470, 0x577b, 0x5825, 0x3279, 0x5823, 0x5824,
-  0x577e, 0x5822, 0x3867, 0x4d2a, 0x3435, 0x3159, 0x5826, 0x473a,
-  0x302d, 0x4861, 0x575c, 0x582c, 0x5830, 0x4c65, 0x5829, 0x4569,
-  0x582e, 0x3e70, 0x582f, 0x4657, 0x4f47, 0x582b, 0x5831, 0x397b,
-  0x404b, 0x3054, 0x582a, 0x5828, 0x415a, 0x577c, 0x3b34, 0x4246,
-  0x583d, 0x415b, 0x5838, 0x5835, 0x5836, 0x3c66, 0x5839, 0x583c,
-  0x5837, 0x3d25, 0x583a, 0x5834, 0x4c7c, 0x4c7b, 0x583e, 0x583f,
-  0x3055, 0x5833, 0x3672, 0x3026, 0x3436, 0x583b, 0x5843, 0x5842,
-  0x5847, 0x5848, 0x5846, 0x5849, 0x5841, 0x5845, 0x584a, 0x584b,
-  0x5840, 0x3b7c, 0x5844, 0x4256, 0x3932, 0x5832, 0x3f35, 0x5858,
-  0x4a69, 0x584e, 0x584f, 0x5850, 0x5857, 0x5856, 0x4b7d, 0x3437,
-  0x5854, 0x3745, 0x3334, 0x5851, 0x4e38, 0x5853, 0x3056, 0x5855,
-  0x584c, 0x5852, 0x5859, 0x3744, 0x584d, 0x4d5d, 0x4d2b, 0x585c,
-  0x5860, 0x417e, 0x4e79, 0x5861, 0x585e, 0x585b, 0x585a, 0x585f,
-  0x4a30, 0x4634, 0x3746, 0x5862, 0x585d, 0x5863, 0x377b, 0x3231,
-  0x586b, 0x3438, 0x5869, 0x586a, 0x3a29, 0x5868, 0x5866, 0x5865,
-  0x586c, 0x5864, 0x586e, 0x327b, 0x5870, 0x586f, 0x4428, 0x5873,
-  0x5871, 0x5867, 0x377c, 0x5872, 0x5876, 0x5875, 0x5877, 0x5874,
-  0x5878, 0x5879, 0x587a, 0x4a6a, 0x587c, 0x587b, 0x3d3f, 0x402e,
-  0x3266, 0x327c, 0x587d, 0x303f, 0x404c, 0x587e, 0x6c43, 0x5921,
-  0x3761, 0x5922, 0x406f, 0x5923, 0x5924, 0x353a, 0x5925, 0x5926,
-  0x5927, 0x4257, 0x384d, 0x4c61, 0x4b3c, 0x3d6a, 0x5928, 0x4070,
-  0x6e3d, 0x4862, 0x3c6a, 0x3a4d, 0x5929, 0x4247, 0x4a27, 0x4271,
-  0x592c, 0x592a, 0x592d, 0x592b, 0x592e, 0x4a31, 0x3037, 0x495e,
-  0x4863, 0x592f, 0x5932, 0x3e35, 0x353b, 0x5930, 0x5937, 0x3e36,
-  0x5931, 0x4744, 0x4d5e, 0x5933, 0x5934, 0x5938, 0x456a, 0x5935,
-  0x3933, 0x405e, 0x5946, 0x4834, 0x4272, 0x4864, 0x5a2d, 0x4a7a,
-  0x4471, 0x4b75, 0x593b, 0x3221, 0x436a, 0x5944, 0x4334, 0x593e,
-  0x5945, 0x5940, 0x5947, 0x5943, 0x5942, 0x476f, 0x593c, 0x327d,
-  0x593a, 0x3571, 0x4273, 0x5936, 0x5939, 0x3934, 0x405b, 0x3e37,
-  0x5941, 0x4752, 0x3572, 0x3348, 0x3367, 0x3f21, 0x5949, 0x594e,
-  0x594a, 0x377d, 0x594f, 0x3b22, 0x3969, 0x3d26, 0x593d, 0x3b7d,
-  0x594c, 0x3b58, 0x594d, 0x3044, 0x5948, 0x4429, 0x3573, 0x3634,
-  0x594b, 0x3027, 0x3a43, 0x3f36, 0x4472, 0x4854, 0x5951, 0x415e,
-  0x422a, 0x3b2b, 0x5952, 0x5954, 0x5950, 0x4a61, 0x443d, 0x415c,
-  0x4a7b, 0x3c4e, 0x5960, 0x595f, 0x3f78, 0x377e, 0x5959, 0x3e39,
-  0x4668, 0x4731, 0x5957, 0x415d, 0x3c78, 0x595c, 0x3e38, 0x5956,
-  0x595b, 0x4753, 0x5955, 0x3721, 0x335d, 0x595d, 0x4e2b, 0x3a4e,
-  0x4335, 0x595a, 0x405c, 0x3935, 0x3f64, 0x3166, 0x413c, 0x5958,
-  0x3545, 0x3747, 0x444f, 0x595e, 0x415f, 0x5961, 0x5963, 0x4237,
-  0x5969, 0x5964, 0x5966, 0x4941, 0x4473, 0x5967, 0x4d2c, 0x4d48,
-  0x3439, 0x302e, 0x5965, 0x5962, 0x3478, 0x3167, 0x5968, 0x4d49,
-  0x596c, 0x423b, 0x5973, 0x596d, 0x596a, 0x5971, 0x5953, 0x596e,
-  0x5972, 0x4842, 0x456b, 0x596b, 0x596f, 0x3748, 0x3a71, 0x405d,
-  0x5977, 0x4526, 0x5974, 0x4b60, 0x5975, 0x5976, 0x4c4e, 0x4022,
-  0x3762, 0x597d, 0x3b35, 0x597a, 0x5979, 0x4732, 0x4635, 0x4531,
-  0x597b, 0x597c, 0x496f, 0x4745, 0x3b23, 0x4071, 0x4b50, 0x3349,
-  0x5a25, 0x597e, 0x4d4a, 0x5a27, 0x5a23, 0x5a24, 0x4160, 0x5a22,
-  0x593f, 0x5a26, 0x5a21, 0x5a2b, 0x5a2c, 0x4527, 0x5a2e, 0x3b24,
-  0x5a29, 0x353c, 0x5a2f, 0x5a28, 0x5a33, 0x5a32, 0x5a31, 0x5a34,
-  0x5a36, 0x3e71, 0x5a35, 0x5a39, 0x5a37, 0x5a38, 0x5970, 0x5a3b,
-  0x5a3a, 0x5978, 0x5a3c, 0x5a30, 0x3b59, 0x5a3d, 0x5a3e, 0x5a40,
-  0x5a3f, 0x5a41, 0x327e, 0x3936, 0x4a7c, 0x402f, 0x384e, 0x5a43,
-  0x5a46, 0x4952, 0x355f, 0x5a45, 0x5a44, 0x4754, 0x5a47, 0x3635,
-  0x5a49, 0x5a48, 0x343a, 0x3b36, 0x4658, 0x3749, 0x3f74, 0x5a4a,
-  0x4030, 0x4528, 0x495f, 0x5a4b, 0x5a4c, 0x5a4d, 0x4a38, 0x555d,
-  0x4046, 0x494c, 0x3a58, 0x4865, 0x4843, 0x454d, 0x4e41, 0x5a4f,
-  0x3c50, 0x5a50, 0x3036, 0x3654, 0x404d, 0x4960, 0x5a51, 0x3b42,
-  0x4347, 0x3b5b, 0x3f37, 0x5a52, 0x4a7d, 0x3177, 0x3b5c, 0x5a55,
-  0x5a53, 0x5a56, 0x4e39, 0x5a54, 0x407b, 0x5a57, 0x4232, 0x5a58,
-  0x347a, 0x5a5a, 0x5a59, 0x5a5b, 0x5a5c, 0x347b, 0x467c, 0x4336,
-  0x356c, 0x3b5d, 0x4161, 0x3d5c, 0x3030, 0x5a5d, 0x3222, 0x5a61,
-  0x3937, 0x5a60, 0x3a2b, 0x3e3a, 0x5a5f, 0x3e3b, 0x4c40, 0x3a2a,
-  0x3057, 0x404e, 0x5a66, 0x4031, 0x3147, 0x3d55, 0x4b66, 0x3a72,
-  0x3e3c, 0x4027, 0x5a65, 0x5a63, 0x5a64, 0x436b, 0x5b26, 0x5a6a,
-  0x3b7e, 0x3938, 0x5a68, 0x5a69, 0x3f38, 0x5a67, 0x3b2f, 0x5a6c,
-  0x5a6b, 0x5a70, 0x5a71, 0x5a6d, 0x3322, 0x5a6e, 0x5a6f, 0x4855,
-  0x4961, 0x374a, 0x5a72, 0x4032, 0x3e3d, 0x4352, 0x3647, 0x5a73,
-  0x5a77, 0x324b, 0x5a74, 0x5a76, 0x5a75, 0x3d6b, 0x4348, 0x3045,
-  0x5a78, 0x5a79, 0x442a, 0x4e71, 0x3b43, 0x4a6b, 0x4b3d, 0x5b22,
-  0x5a7b, 0x5a7e, 0x5a7d, 0x5a7a, 0x5b21, 0x465e, 0x5a7c, 0x5b23,
-  0x3d6c, 0x5b24, 0x4d4b, 0x4778, 0x5b25, 0x5b27, 0x5b28, 0x5b29,
-  0x364a, 0x3148, 0x3939, 0x5b2a, 0x5b2b, 0x3d71, 0x4162, 0x5258,
-  0x413e, 0x413d, 0x4258, 0x3a47, 0x5072, 0x376e, 0x4d2d, 0x4a7e,
-  0x497e, 0x5b2c, 0x3a73, 0x443f, 0x5b2d, 0x4f2f, 0x4b3e, 0x442b,
-  0x5b2e, 0x347c, 0x5b2f, 0x5b30, 0x4c5a, 0x4c24, 0x4b76, 0x4b5c,
-  0x3b25, 0x5b32, 0x3c6b, 0x4b51, 0x5b34, 0x5b37, 0x5b36, 0x3479,
-  0x3560, 0x5b33, 0x5b35, 0x5b38, 0x3f79, 0x4d7b, 0x3049, 0x3a60,
-  0x423c, 0x3c5d, 0x3e73, 0x5b3b, 0x454e, 0x5b39, 0x422b, 0x5b3a,
-  0x3e72, 0x4c5d, 0x5b3c, 0x5b3d, 0x4d68, 0x5b42, 0x393a, 0x4755,
-  0x5b3f, 0x456c, 0x5a5e, 0x5a62, 0x354f, 0x4747, 0x5b41, 0x3e3e,
-  0x4844, 0x5b47, 0x487a, 0x5b3e, 0x5b44, 0x5b43, 0x404f, 0x4b6d,
-  0x4e53, 0x4b67, 0x324c, 0x3b5e, 0x4f48, 0x5b46, 0x3f75, 0x5b45,
-  0x5b40, 0x384f, 0x5b4c, 0x5b4a, 0x324d, 0x5b48, 0x5b4e, 0x5b54,
-  0x4248, 0x4a41, 0x5b56, 0x4922, 0x5b55, 0x4770, 0x4b3f, 0x343b,
-  0x4077, 0x3d40, 0x4453, 0x4d2e, 0x5b51, 0x5b50, 0x5b52, 0x5b4f,
-  0x5b57, 0x5b4d, 0x5b4b, 0x5b53, 0x5b49, 0x436c, 0x4c78, 0x3c46,
-  0x3a74, 0x3a3a, 0x4b6f, 0x3341, 0x444e, 0x464a, 0x3149, 0x4072,
-  0x4034, 0x372a, 0x5b59, 0x393b, 0x337c, 0x5b5b, 0x3374, 0x5b61,
-  0x5b5e, 0x4073, 0x334b, 0x3a2c, 0x334a, 0x3a4f, 0x5b5c, 0x3765,
-  0x374b, 0x456d, 0x5b5a, 0x3046, 0x5b5d, 0x5b5f, 0x364d, 0x372c,
-  0x343c, 0x354b, 0x5b62, 0x3a79, 0x4b71, 0x3b37, 0x5b63, 0x4930,
-  0x5b6f, 0x3233, 0x5b64, 0x5b75, 0x5b65, 0x4e42, 0x5b6c, 0x475f,
-  0x5b74, 0x5b67, 0x3034, 0x5b69, 0x393c, 0x5b6b, 0x5b6a, 0x5b66,
-  0x5b71, 0x3e3f, 0x546d, 0x3868, 0x4d7c, 0x5b68, 0x4474, 0x3323,
-  0x3a2d, 0x5b60, 0x5b70, 0x3361, 0x5b6e, 0x5b72, 0x456e, 0x347e,
-  0x5c32, 0x4c49, 0x5b77, 0x347d, 0x5b7e, 0x4b40, 0x5c21, 0x5c23,
-  0x5c27, 0x5b79, 0x432a, 0x456f, 0x5c2b, 0x5b7c, 0x5c28, 0x5c22,
-  0x3f39, 0x5c2c, 0x4033, 0x5c2a, 0x343d, 0x4f50, 0x5b76, 0x5c26,
-  0x3058, 0x5b78, 0x4c3a, 0x5b7d, 0x3f22, 0x4447, 0x5b73, 0x5c25,
-  0x3f7a, 0x5c2f, 0x3371, 0x3821, 0x5c31, 0x5b7a, 0x5c30, 0x5c29,
-  0x5b7b, 0x5c2d, 0x5c2e, 0x5c3f, 0x464e, 0x5c24, 0x5c3b, 0x5c3d,
-  0x4458, 0x4d4c, 0x4976, 0x5c38, 0x424a, 0x5c3e, 0x413f, 0x5c35,
-  0x5c42, 0x5c41, 0x466f, 0x5c40, 0x466a, 0x5c44, 0x5c37, 0x3648,
-  0x5c3a, 0x3d5d, 0x4760, 0x5c3c, 0x364b, 0x5c34, 0x5c36, 0x5c33,
-  0x4f30, 0x335a, 0x5c39, 0x5c43, 0x3335, 0x3a67, 0x315d, 0x5c54,
-  0x4f31, 0x5c57, 0x3f3a, 0x5c56, 0x5c55, 0x5c52, 0x5c46, 0x5c63,
-  0x5c45, 0x5c58, 0x5c50, 0x5c4b, 0x5c48, 0x5c49, 0x5c51, 0x7422,
-  0x5c4e, 0x393d, 0x4448, 0x4164, 0x5c4c, 0x5c47, 0x5c4a, 0x4d4d,
-  0x4b6a, 0x5c4f, 0x5c59, 0x5c61, 0x5c5a, 0x5c67, 0x5c65, 0x5c60,
-  0x5c5f, 0x4450, 0x4165, 0x5c5d, 0x5c5b, 0x5c62, 0x5c68, 0x4875,
-  0x5c6e, 0x5c69, 0x5c6c, 0x5c66, 0x4374, 0x4938, 0x5c5c, 0x5c64,
-  0x3e40, 0x4c4f, 0x5c78, 0x5c6b, 0x3822, 0x3223, 0x335f, 0x5c53,
-  0x3e41, 0x5c70, 0x5c77, 0x3c79, 0x3372, 0x432e, 0x5c6d, 0x5c72,
-  0x5c76, 0x3636, 0x354c, 0x5c74, 0x3521, 0x464b, 0x5c73, 0x5c75,
-  0x5c6f, 0x5c71, 0x3360, 0x4349, 0x5c7c, 0x5c7a, 0x3869, 0x5c79,
-  0x5d21, 0x5b58, 0x5c7b, 0x5c7d, 0x5c7e, 0x5d2c, 0x5d28, 0x5b6d,
-  0x5d27, 0x5d26, 0x5d23, 0x5c6a, 0x5d25, 0x5d24, 0x5d2a, 0x4f26,
-  0x5d2d, 0x367b, 0x5d29, 0x5d2b, 0x4827, 0x5d2e, 0x5d32, 0x5d2f,
-  0x4d73, 0x5d30, 0x5c5e, 0x5d33, 0x5d34, 0x3135, 0x5d36, 0x3767,
-  0x3c21, 0x3655, 0x3224, 0x4d5f, 0x5d38, 0x5d37, 0x5d3a, 0x353d,
-  0x3656, 0x343e, 0x5d3d, 0x5d3c, 0x5d3e, 0x324e, 0x4337, 0x5d3f,
-  0x343f, 0x5d41, 0x5d40, 0x5d42, 0x5d43, 0x5d44, 0x3b5f, 0x4035,
-  0x3a21, 0x4970, 0x4a62, 0x4f44, 0x3b75, 0x3a50, 0x4e72, 0x5d45,
-  0x5d46, 0x3b60, 0x5d47, 0x5d48, 0x5d4a, 0x5d49, 0x4b58, 0x3d5e,
-  0x3c6c, 0x3b44, 0x5d4b, 0x5d4d, 0x3f23, 0x5d4c, 0x5d4e, 0x5d4f,
-  0x5d50, 0x5d51, 0x5d52, 0x5d54, 0x5d53, 0x5d55, 0x3225, 0x434a,
-  0x5d56, 0x3b26, 0x334c, 0x5d57, 0x4542, 0x544c, 0x3523, 0x5d58,
-  0x5d59, 0x4a6c, 0x4b68, 0x4647, 0x5d5a, 0x4866, 0x487b, 0x4c53,
-  0x5d5b, 0x5d5d, 0x5d5c, 0x5d5f, 0x5d5e, 0x5d61, 0x3b61, 0x4c31,
-  0x5d62, 0x5d63, 0x3524, 0x5d64, 0x5d66, 0x5d65, 0x3f65, 0x4939,
-  0x314a, 0x4845, 0x4475, 0x3d41, 0x3561, 0x4846, 0x3c2e, 0x5d68,
-  0x3440, 0x3178, 0x4672, 0x5d67, 0x393e, 0x4353, 0x5d69, 0x5d71,
-  0x5d6a, 0x4241, 0x3562, 0x5d72, 0x3768, 0x3525, 0x5d70, 0x5d6e,
-  0x5d6b, 0x4d60, 0x4440, 0x4659, 0x5d6c, 0x5d74, 0x5d73, 0x3723,
-  0x322d, 0x3a3b, 0x5d6d, 0x5d6f, 0x4b57, 0x4274, 0x4b77, 0x5d7c,
-  0x5d7d, 0x324f, 0x4a28, 0x4c7d, 0x5e21, 0x3c23, 0x3e42, 0x5d78,
-  0x5d7e, 0x3168, 0x3637, 0x5d75, 0x5d7a, 0x4074, 0x4771, 0x4867,
-  0x5d77, 0x4b21, 0x5d79, 0x5e24, 0x5e22, 0x5d7b, 0x4b22, 0x4748,
-  0x3563, 0x4525, 0x436d, 0x5e25, 0x5e23, 0x4259, 0x5d76, 0x314b,
-  0x4d4e, 0x5e30, 0x5e2f, 0x4076, 0x5e2c, 0x4d6c, 0x4636, 0x5e26,
-  0x4445, 0x314c, 0x393f, 0x5e29, 0x3d27, 0x5e2e, 0x5e2d, 0x5e28,
-  0x5e2b, 0x3368, 0x5e2a, 0x4749, 0x4e2e, 0x3e74, 0x4075, 0x5e36,
-  0x5e34, 0x494d, 0x5e31, 0x5e33, 0x313a, 0x3940, 0x4f32, 0x333d,
-  0x4962, 0x4d61, 0x3324, 0x3f3b, 0x5e35, 0x5e3a, 0x3e43, 0x4d30,
-  0x5e37, 0x5e32, 0x5e38, 0x4e5e, 0x4573, 0x4642, 0x3336, 0x3155,
-  0x5e3e, 0x5e41, 0x4e43, 0x4d64, 0x5e48, 0x5e42, 0x5e3f, 0x4e54,
-  0x5e45, 0x3d4a, 0x5e47, 0x5e4c, 0x4571, 0x5e4a, 0x5e44, 0x4338,
-  0x5e4b, 0x5e40, 0x5e46, 0x5e4d, 0x307c, 0x5e43, 0x5e4e, 0x3f3c,
-  0x3d5f, 0x4a25, 0x3a2e, 0x5e3b, 0x5e49, 0x453a, 0x4036, 0x3369,
-  0x3a51, 0x3e44, 0x5e3d, 0x3d42, 0x374c, 0x5e3c, 0x5e52, 0x3d6d,
-  0x383a, 0x5e61, 0x5e5b, 0x3574, 0x454f, 0x5e56, 0x5e5f, 0x302f,
-  0x3132, 0x3239, 0x5e58, 0x422c, 0x5e4f, 0x5e51, 0x3941, 0x5e62,
-  0x5e5d, 0x5e55, 0x5e5c, 0x4c2b, 0x5e5a, 0x5e5e, 0x3850, 0x3e45,
-  0x4339, 0x5e54, 0x4d2f, 0x5e57, 0x5e50, 0x4572, 0x5e53, 0x5e59,
-  0x4f51, 0x3c3e, 0x4b7e, 0x5e63, 0x482e, 0x5e6f, 0x383b, 0x3d60,
-  0x5e65, 0x4e2f, 0x3942, 0x5e72, 0x306e, 0x5e70, 0x5e64, 0x5e6a,
-  0x5e6c, 0x4d4f, 0x5e67, 0x452e, 0x5e69, 0x5e71, 0x5e6b, 0x4c47,
-  0x5e66, 0x3c22, 0x5e7e, 0x336a, 0x5e68, 0x5e6d, 0x5e6e, 0x426c,
-  0x425a, 0x5e76, 0x5e7c, 0x5e7a, 0x4529, 0x5f23, 0x5e77, 0x5e78,
-  0x5e60, 0x3579, 0x493a, 0x3c3f, 0x3977, 0x4f33, 0x5e74, 0x5f22,
-  0x3169, 0x4166, 0x4779, 0x3441, 0x4e7a, 0x4c21, 0x4452, 0x5e7b,
-  0x5e7d, 0x4132, 0x5f21, 0x5e79, 0x5e73, 0x3443, 0x3769, 0x5f2f,
-  0x5f2a, 0x4078, 0x3363, 0x3d61, 0x5f33, 0x5f2c, 0x442c, 0x5f29,
-  0x4459, 0x5f4c, 0x5f26, 0x5f25, 0x5f2e, 0x5f28, 0x5f27, 0x5f2d,
-  0x4021, 0x5f24, 0x5f30, 0x5f31, 0x3442, 0x5f36, 0x5f35, 0x5f37,
-  0x5f3a, 0x4543, 0x5f34, 0x5f38, 0x3763, 0x4279, 0x5f32, 0x473b,
-  0x5f39, 0x5f3e, 0x5f3c, 0x5f3f, 0x5f42, 0x5f3b, 0x396a, 0x4728,
-  0x5e39, 0x4d74, 0x5f3d, 0x5f41, 0x4275, 0x5f40, 0x5f2b, 0x6f69,
-  0x5f45, 0x5f49, 0x5f47, 0x5f43, 0x5f44, 0x5f48, 0x5f46, 0x494e,
-  0x5f4e, 0x5f4b, 0x5f4a, 0x5f4d, 0x4654, 0x5f4f, 0x4375, 0x426d,
-  0x4025, 0x5f50, 0x5f52, 0x5f51, 0x5e75, 0x5f53, 0x4667, 0x5f54,
-  0x3250, 0x4574, 0x3325, 0x3564, 0x3c5e, 0x3a52, 0x4f27, 0x3f66,
-  0x316a, 0x5f56, 0x5f55, 0x5f59, 0x433a, 0x5f5c, 0x5f57, 0x5f5b,
-  0x5f5a, 0x4540, 0x3059, 0x4e75, 0x5f5e, 0x3128, 0x5f60, 0x5f5f,
-  0x5f5d, 0x5f58, 0x4b23, 0x5f62, 0x5f61, 0x316b, 0x5f64, 0x4a32,
-  0x5f63, 0x4c35, 0x3e47, 0x4133, 0x3e46, 0x4e7b, 0x5f6a, 0x4079,
-  0x5f66, 0x5f6b, 0x316c, 0x5f69, 0x4761, 0x5f65, 0x5f68, 0x3e48,
-  0x4851, 0x5f6c, 0x3c51, 0x407a, 0x5f6f, 0x5f67, 0x3727, 0x5f6d,
-  0x4d50, 0x5f70, 0x7426, 0x3d4f, 0x5f71, 0x5f72, 0x472e, 0x5f74,
-  0x5f75, 0x4733, 0x4575, 0x5f77, 0x5f79, 0x4e55, 0x5f76, 0x5f78,
-  0x316d, 0x5f73, 0x535b, 0x5f7a, 0x4167, 0x3b38, 0x5f7c, 0x5f7b,
-  0x3f24, 0x5259, 0x5f7d, 0x6021, 0x5f6e, 0x5f7e, 0x6022, 0x477a,
-  0x6023, 0x6024, 0x6025, 0x6026, 0x445e, 0x6028, 0x6027, 0x6029,
-  0x602a, 0x3c5f, 0x4963, 0x4c6c, 0x602b, 0x602c, 0x4156, 0x3c24,
-  0x602d, 0x602e, 0x602f, 0x4a52, 0x4847, 0x6030, 0x4757, 0x442d,
-  0x6031, 0x3267, 0x356d, 0x4c46, 0x4c36, 0x3234, 0x4f34, 0x4b52,
-  0x4a2a, 0x4037, 0x6032, 0x4643, 0x3823, 0x6033, 0x3a54, 0x6035,
-  0x6034, 0x6036, 0x6037, 0x6038, 0x353e, 0x6039, 0x603a, 0x3824,
-  0x4848, 0x603c, 0x3e75, 0x603b, 0x3638, 0x603d, 0x603f, 0x603e,
-  0x6040, 0x3851, 0x6041, 0x3669, 0x4140, 0x397d, 0x6043, 0x6044,
-  0x6042, 0x3c6d, 0x4648, 0x3639, 0x6046, 0x432c, 0x6045, 0x4f35,
-  0x4762, 0x6049, 0x604b, 0x6048, 0x4c54, 0x604a, 0x604c, 0x4e44,
-  0x6050, 0x604f, 0x4376, 0x472d, 0x3825, 0x604e, 0x604d, 0x4d31,
-  0x4d32, 0x6051, 0x316e, 0x3976, 0x3b62, 0x6052, 0x6053, 0x6055,
-  0x3d43, 0x6057, 0x6056, 0x6058, 0x334d, 0x605a, 0x6059, 0x605c,
-  0x605b, 0x383c, 0x4e28, 0x364c, 0x3226, 0x366a, 0x3461, 0x4e68,
-  0x605e, 0x6060, 0x6061, 0x3251, 0x605d, 0x3b39, 0x4441, 0x605f,
-  0x6064, 0x3c6e, 0x6062, 0x373e, 0x4849, 0x6063, 0x607e, 0x6069,
-  0x383d, 0x3565, 0x6066, 0x4d7d, 0x4e30, 0x4276, 0x6068, 0x606a,
-  0x4e56, 0x3657, 0x487c, 0x474a, 0x606b, 0x606d, 0x6070, 0x606c,
-  0x606f, 0x386a, 0x314d, 0x6071, 0x3f70, 0x606e, 0x4e5c, 0x6074,
-  0x7424, 0x6072, 0x6075, 0x6067, 0x6073, 0x3a3c, 0x6076, 0x6077,
-  0x4d7e, 0x6078, 0x6079, 0x6065, 0x607a, 0x3444, 0x3c25, 0x607b,
-  0x607c, 0x607d, 0x313b, 0x6121, 0x493b, 0x6122, 0x3424, 0x6123,
-  0x6124, 0x6125, 0x6127, 0x6128, 0x6126, 0x4953, 0x612a, 0x6129,
-  0x612c, 0x612b, 0x612d, 0x612e, 0x6130, 0x612f, 0x3979, 0x6132,
-  0x6131, 0x3445, 0x3f53, 0x453c, 0x6133, 0x4038, 0x3b3a, 0x3179,
-  0x6134, 0x4d51, 0x4a63, 0x6135, 0x4544, 0x4d33, 0x3943, 0x3f3d,
-  0x434b, 0x5234, 0x442e, 0x3268, 0x6136, 0x6137, 0x613c, 0x613a,
-  0x6139, 0x5a42, 0x3326, 0x6138, 0x305a, 0x482a, 0x484a, 0x4e31,
-  0x613d, 0x613b, 0x435c, 0x4026, 0x482b, 0x492d, 0x613f, 0x4e2c,
-  0x374d, 0x6140, 0x613e, 0x4856, 0x6141, 0x6142, 0x305b, 0x3e76,
-  0x6147, 0x6144, 0x466d, 0x6143, 0x3526, 0x614a, 0x6145, 0x6146,
-  0x6149, 0x6148, 0x4925, 0x4142, 0x4141, 0x353f, 0x614b, 0x614c,
-  0x614d, 0x614f, 0x614e, 0x3156, 0x6157, 0x4868, 0x6151, 0x6153,
-  0x6155, 0x3f3e, 0x6156, 0x6154, 0x3c40, 0x6150, 0x6152, 0x4942,
-  0x3e49, 0x6159, 0x6158, 0x615a, 0x3c26, 0x3a2f, 0x4577, 0x615b,
-  0x444b, 0x615d, 0x4e21, 0x615c, 0x4169, 0x6162, 0x6164, 0x6165,
-  0x4354, 0x6163, 0x6160, 0x615e, 0x615f, 0x6161, 0x6168, 0x6166,
-  0x6167, 0x6169, 0x616b, 0x616c, 0x616d, 0x616e, 0x616a, 0x6170,
-  0x616f, 0x6171, 0x4e45, 0x6174, 0x6172, 0x6173, 0x3462, 0x4c7e,
-  0x4a4a, 0x6176, 0x6175, 0x6177, 0x6178, 0x617c, 0x6179, 0x617a,
-  0x617b, 0x617d, 0x617e, 0x6221, 0x6222, 0x6223, 0x482f, 0x4550,
-  0x6224, 0x4772, 0x4934, 0x6225, 0x6226, 0x452a, 0x3327, 0x3944,
-  0x6227, 0x6228, 0x6229, 0x3b29, 0x622b, 0x622a, 0x622c, 0x622d,
-  0x4869, 0x622e, 0x622f, 0x7369, 0x6230, 0x6231, 0x6232, 0x3b2e,
-  0x6233, 0x4756, 0x4b5f, 0x314e, 0x3157, 0x6234, 0x6236, 0x6235,
-  0x4570, 0x4039, 0x5d39, 0x6237, 0x4c41, 0x6238, 0x3446, 0x4857,
-  0x6239, 0x623a, 0x623b, 0x4c5c, 0x4c55, 0x443e, 0x416a, 0x623d,
-  0x3d62, 0x3e4a, 0x6240, 0x623f, 0x623e, 0x487d, 0x3447, 0x3829,
-  0x6246, 0x6243, 0x3f3f, 0x4c32, 0x6242, 0x6244, 0x6245, 0x6241,
-  0x6247, 0x6248, 0x442f, 0x3463, 0x4365, 0x6249, 0x624a, 0x624d,
-  0x3f67, 0x4644, 0x624e, 0x4b53, 0x624b, 0x624c, 0x6251, 0x6250,
-  0x624f, 0x6253, 0x6252, 0x6254, 0x6256, 0x6255, 0x4a4d, 0x3d56,
-  0x4e46, 0x6257, 0x4637, 0x6258, 0x6259, 0x625d, 0x625b, 0x625c,
-  0x625a, 0x625e, 0x625f, 0x6260, 0x6261, 0x4c37, 0x6262, 0x4c70,
-  0x6263, 0x434e, 0x476a, 0x366b, 0x433b, 0x6264, 0x363a, 0x4050,
-  0x6265, 0x3a3d, 0x6266, 0x6267, 0x3826, 0x3a55, 0x6269, 0x4556,
-  0x3a56, 0x354e, 0x4b24, 0x474b, 0x4557, 0x395c, 0x626b, 0x3e4b,
-  0x4e32, 0x3945, 0x3827, 0x4823, 0x626d, 0x626f, 0x386b, 0x626e,
-  0x4476, 0x6271, 0x3337, 0x626c, 0x486a, 0x3130, 0x3a6c, 0x4f52,
-  0x6270, 0x6272, 0x4a4b, 0x4059, 0x6274, 0x6275, 0x6273, 0x334e,
-  0x627b, 0x627a, 0x3c27, 0x627c, 0x6277, 0x627d, 0x6278, 0x4858,
-  0x6276, 0x6279, 0x6322, 0x6321, 0x4b61, 0x627e, 0x306b, 0x6324,
-  0x6323, 0x3e4c, 0x6325, 0x4143, 0x6327, 0x6326, 0x6328, 0x6268,
-  0x626a, 0x632a, 0x6329, 0x3c28, 0x4e69, 0x3c52, 0x632b, 0x3737,
-  0x3540, 0x3527, 0x3b63, 0x4d34, 0x6331, 0x6330, 0x4144, 0x632d,
-  0x632f, 0x3d4b, 0x3f40, 0x632e, 0x632c, 0x472a, 0x3e4d, 0x493c,
-  0x3a57, 0x4578, 0x6332, 0x6333, 0x6349, 0x3658, 0x4f3d, 0x4135,
-  0x6334, 0x3252, 0x4477, 0x4a21, 0x6335, 0x357a, 0x6336, 0x6338,
-  0x6339, 0x4729, 0x633a, 0x633b, 0x633c, 0x3659, 0x3253, 0x4645,
-  0x3d28, 0x3b64, 0x633d, 0x3d29, 0x324a, 0x4943, 0x633e, 0x486b,
-  0x4145, 0x6341, 0x6342, 0x4769, 0x3f41, 0x633f, 0x4361, 0x6340,
-  0x3e4e, 0x305c, 0x3529, 0x6343, 0x4478, 0x6344, 0x4047, 0x4c2d,
-  0x4923, 0x6345, 0x6346, 0x4355, 0x4e47, 0x6348, 0x6347, 0x3c6f,
-  0x634a, 0x3070, 0x634d, 0x634b, 0x3254, 0x374e, 0x634c, 0x3946,
-  0x3972, 0x4a66, 0x634e, 0x4b54, 0x6350, 0x4051, 0x314f, 0x323a,
-  0x302c, 0x634f, 0x6351, 0x6352, 0x3e77, 0x6353, 0x334f, 0x6355,
-  0x376a, 0x3566, 0x6356, 0x3675, 0x6357, 0x407c, 0x464d, 0x4060,
-  0x3a75, 0x6358, 0x4362, 0x416b, 0x635a, 0x635c, 0x6359, 0x635b,
-  0x3722, 0x635d, 0x3726, 0x3567, 0x4d52, 0x635f, 0x6360, 0x312e,
-  0x6363, 0x3376, 0x6362, 0x6361, 0x6365, 0x635e, 0x6366, 0x4e29,
-  0x6367, 0x6368, 0x5474, 0x636a, 0x6369, 0x636b, 0x636c, 0x4e35,
-  0x636d, 0x706f, 0x3e4f, 0x636e, 0x636f, 0x3d57, 0x4638, 0x6370,
-  0x4328, 0x6371, 0x433c, 0x6372, 0x3625, 0x513f, 0x435d, 0x3c33,
-  0x3448, 0x6373, 0x6422, 0x6376, 0x3568, 0x6375, 0x6424, 0x6374,
-  0x3e50, 0x6378, 0x6379, 0x452b, 0x637a, 0x335e, 0x3f5a, 0x4964,
-  0x637c, 0x4268, 0x6377, 0x637b, 0x637d, 0x3a7b, 0x6426, 0x492e,
-  0x4826, 0x4579, 0x365a, 0x6425, 0x6423, 0x4835, 0x637e, 0x435e,
-  0x457b, 0x457a, 0x3a76, 0x6438, 0x6428, 0x642a, 0x642d, 0x642e,
-  0x642b, 0x642c, 0x6429, 0x6427, 0x6421, 0x4a4f, 0x3255, 0x6435,
-  0x6432, 0x6437, 0x6436, 0x4773, 0x4c27, 0x3b3b, 0x6430, 0x6439,
-  0x6434, 0x6433, 0x642f, 0x6431, 0x3449, 0x433d, 0x407d, 0x4822,
-  0x643e, 0x4824, 0x4061, 0x643b, 0x484f, 0x643f, 0x4a53, 0x435b,
-  0x643a, 0x643c, 0x643d, 0x6440, 0x3c44, 0x4646, 0x6445, 0x6444,
-  0x6441, 0x4f36, 0x644a, 0x644e, 0x644b, 0x6447, 0x6448, 0x644d,
-  0x6442, 0x5255, 0x6449, 0x6443, 0x644c, 0x6452, 0x344a, 0x644f,
-  0x6450, 0x6451, 0x6454, 0x6453, 0x4876, 0x6455, 0x4e7c, 0x4a6d,
-  0x645a, 0x6457, 0x6456, 0x4052, 0x6459, 0x645b, 0x6458, 0x645f,
-  0x645c, 0x645d, 0x6446, 0x645e, 0x6460, 0x6461, 0x4a46, 0x6462,
-  0x4c62, 0x364e, 0x3729, 0x6463, 0x4a34, 0x3f68, 0x4c30, 0x6464,
-  0x4e33, 0x4774, 0x4146, 0x4734, 0x3d4d, 0x3040, 0x6469, 0x6467,
-  0x6465, 0x3421, 0x3e51, 0x646a, 0x6468, 0x6466, 0x646e, 0x646d,
-  0x646c, 0x646b, 0x646f, 0x6470, 0x403a, 0x6471, 0x6473, 0x6472,
-  0x3852, 0x4138, 0x6475, 0x457c, 0x6474, 0x6476, 0x4a35, 0x416c,
-  0x3947, 0x6477, 0x4e48, 0x6479, 0x647a, 0x647b, 0x647c, 0x3b65,
-  0x647d, 0x374f, 0x356a, 0x352a, 0x6521, 0x4c73, 0x3948, 0x647e,
-  0x6524, 0x4c66, 0x473c, 0x4933, 0x3d63, 0x6523, 0x3c53, 0x3949,
-  0x3b66, 0x3569, 0x4a36, 0x6522, 0x4147, 0x4b42, 0x3a77, 0x3b67,
-  0x445d, 0x6527, 0x4e5f, 0x3a59, 0x6528, 0x3f42, 0x652a, 0x3e52,
-  0x3a30, 0x6529, 0x3d2a, 0x383e, 0x4148, 0x6525, 0x652b, 0x6526,
-  0x3750, 0x652e, 0x6532, 0x376b, 0x652d, 0x6536, 0x394a, 0x4d6d,
-  0x303c, 0x6533, 0x356b, 0x6530, 0x6531, 0x457d, 0x652f, 0x652c,
-  0x3328, 0x4064, 0x3828, 0x6538, 0x6535, 0x6537, 0x6534, 0x3751,
-  0x4233, 0x6539, 0x416e, 0x6546, 0x6542, 0x653c, 0x6540, 0x3c7a,
-  0x305d, 0x653b, 0x6543, 0x6547, 0x394b, 0x4c56, 0x4456, 0x653d,
-  0x6545, 0x653a, 0x433e, 0x653f, 0x303d, 0x4c4a, 0x653e, 0x365b,
-  0x486c, 0x416d, 0x4e50, 0x3d6f, 0x656e, 0x6548, 0x407e, 0x6544,
-  0x6549, 0x654b, 0x4479, 0x654e, 0x654a, 0x4a54, 0x344b, 0x4c4b,
-  0x305e, 0x654d, 0x4e7d, 0x654c, 0x316f, 0x466c, 0x654f, 0x6556,
-  0x6550, 0x6557, 0x6553, 0x477b, 0x3c4a, 0x6555, 0x6552, 0x6558,
-  0x6551, 0x3d44, 0x4b25, 0x3d4c, 0x6554, 0x6560, 0x655c, 0x655f,
-  0x655d, 0x6561, 0x655b, 0x6541, 0x4053, 0x484b, 0x655e, 0x6559,
-  0x4121, 0x3752, 0x3d2b, 0x3f25, 0x4136, 0x6564, 0x6566, 0x6567,
-  0x6563, 0x6565, 0x655a, 0x6562, 0x656a, 0x6569, 0x4b7a, 0x372b,
-  0x6568, 0x656c, 0x656b, 0x656f, 0x6571, 0x3b3c, 0x656d, 0x6572,
-  0x6573, 0x6574, 0x657a, 0x453b, 0x6576, 0x6575, 0x6577, 0x6578,
-  0x6579, 0x657b, 0x657c, 0x344c, 0x657d, 0x657e, 0x6621, 0x6622,
-  0x6623, 0x6624, 0x6625, 0x6626, 0x6628, 0x6627, 0x6629, 0x662a,
-  0x662b, 0x662e, 0x662c, 0x662d, 0x3a61, 0x3753, 0x4356, 0x4833,
-  0x3d70, 0x474d, 0x486d, 0x662f, 0x586d, 0x6630, 0x6632, 0x4d65,
-  0x6631, 0x6634, 0x6633, 0x4d53, 0x6635, 0x487e, 0x6636, 0x6639,
-  0x6638, 0x6637, 0x663a, 0x3732, 0x4122, 0x3541, 0x663e, 0x663b,
-  0x663c, 0x663f, 0x6640, 0x663d, 0x3129, 0x3227, 0x6642, 0x6643,
-  0x6644, 0x4d62, 0x3d2c, 0x6646, 0x6645, 0x3f69, 0x6647, 0x6648,
-  0x6649, 0x3465, 0x344d, 0x664a, 0x664b, 0x4b5d, 0x4d63, 0x4d54,
-  0x4f37, 0x394d, 0x664e, 0x3c54, 0x664d, 0x664f, 0x3c29, 0x4251,
-  0x6650, 0x394c, 0x4c57, 0x6651, 0x6652, 0x6653, 0x6654, 0x6655,
-  0x3c2a, 0x4c6d, 0x6657, 0x433f, 0x6656, 0x6659, 0x6658, 0x665a,
-  0x403b, 0x665b, 0x665c, 0x4a39, 0x665d, 0x416f, 0x665e, 0x665f,
-  0x4e7e, 0x6662, 0x6661, 0x6660, 0x4430, 0x6663, 0x3f26, 0x6664,
-  0x6665, 0x4f38, 0x6666, 0x6667, 0x6669, 0x6668, 0x4825, 0x4679,
-  0x4f3e, 0x4829, 0x666b, 0x3e53, 0x492a, 0x666c, 0x666a, 0x344e,
-  0x3854, 0x3b68, 0x486e, 0x382a, 0x4b43, 0x666f, 0x666d, 0x394e,
-  0x394f, 0x3069, 0x3a68, 0x4759, 0x305f, 0x6674, 0x4340, 0x4758,
-  0x425b, 0x6676, 0x6672, 0x6675, 0x6670, 0x6673, 0x4b26, 0x3855,
-  0x307d, 0x6671, 0x6678, 0x6679, 0x4639, 0x363b, 0x6726, 0x473d,
-  0x3b69, 0x363c, 0x4048, 0x4f46, 0x4c2e, 0x6677, 0x4054, 0x3553,
-  0x667a, 0x667c, 0x667b, 0x667d, 0x4326, 0x473e, 0x4431, 0x6723,
-  0x6722, 0x667e, 0x3f55, 0x4965, 0x6725, 0x6724, 0x3950, 0x4f53,
-  0x6735, 0x6729, 0x672a, 0x3c70, 0x6728, 0x3978, 0x6727, 0x672b,
-  0x4432, 0x4a22, 0x4123, 0x425c, 0x672f, 0x6730, 0x672c, 0x672d,
-  0x672e, 0x3951, 0x6736, 0x6732, 0x4966, 0x4b6c, 0x4928, 0x6731,
-  0x6734, 0x6733, 0x4b44, 0x6737, 0x6738, 0x4137, 0x6739, 0x673b,
-  0x673f, 0x673c, 0x673a, 0x473f, 0x673d, 0x673e, 0x3232, 0x6745,
-  0x6740, 0x6741, 0x6742, 0x4221, 0x6744, 0x6743, 0x6746, 0x6747,
-  0x6748, 0x3f43, 0x3269, 0x6749, 0x4e57, 0x3c2b, 0x3d2d, 0x3b6a,
-  0x4357, 0x674a, 0x674b, 0x3131, 0x674c, 0x674d, 0x674e, 0x674f,
-  0x6750, 0x363d, 0x5a2a, 0x6751, 0x4065, 0x6752, 0x3c4b, 0x6753,
-  0x5030, 0x6754, 0x4a5e, 0x345c, 0x4124, 0x3d58, 0x4971, 0x3d2e,
-  0x6755, 0x3952, 0x6756, 0x484c, 0x6764, 0x6758, 0x4249, 0x4775,
-  0x383f, 0x6757, 0x4125, 0x6759, 0x447a, 0x675b, 0x675a, 0x675d,
-  0x675c, 0x675e, 0x6760, 0x675f, 0x344f, 0x6761, 0x6762, 0x6763,
-  0x3a31, 0x4e49, 0x6765, 0x3f27, 0x3170, 0x6766, 0x6767, 0x6768,
-  0x3072, 0x6769, 0x676a, 0x4967, 0x3c47, 0x676c, 0x3329, 0x3032,
-  0x676b, 0x676e, 0x474e, 0x3f44, 0x3256, 0x4b27, 0x375d, 0x365c,
-  0x676d, 0x326a, 0x3423, 0x3171, 0x6772, 0x4e6a, 0x425d, 0x4944,
-  0x677e, 0x3257, 0x677c, 0x677a, 0x6771, 0x676f, 0x6770, 0x3c63,
-  0x366c, 0x4377, 0x4651, 0x3151, 0x6774, 0x6773, 0x6779, 0x6775,
-  0x6778, 0x4c50, 0x6777, 0x3258, 0x337d, 0x677b, 0x677d, 0x3754,
-  0x6823, 0x682c, 0x682d, 0x302b, 0x6834, 0x3071, 0x682b, 0x682a,
-  0x6825, 0x6824, 0x6822, 0x6821, 0x4363, 0x427b, 0x6827, 0x6826,
-  0x6829, 0x4170, 0x3755, 0x3141, 0x6828, 0x3953, 0x4171, 0x683a,
-  0x683b, 0x3259, 0x322e, 0x6838, 0x682e, 0x6836, 0x683d, 0x6837,
-  0x6835, 0x6776, 0x6833, 0x682f, 0x3450, 0x6831, 0x683c, 0x6832,
-  0x683e, 0x6830, 0x477c, 0x4d69, 0x6839, 0x684f, 0x6847, 0x3f7b,
-  0x3546, 0x365d, 0x6842, 0x325b, 0x3e54, 0x6845, 0x3a5a, 0x4551,
-  0x684a, 0x4a6e, 0x6841, 0x325a, 0x3856, 0x4929, 0x684b, 0x683f,
-  0x6848, 0x6852, 0x6843, 0x6844, 0x463a, 0x6849, 0x6846, 0x4b28,
-  0x684c, 0x3060, 0x6840, 0x684e, 0x684d, 0x476b, 0x6854, 0x685f,
-  0x337e, 0x6862, 0x6850, 0x6855, 0x4d6e, 0x685e, 0x4d55, 0x4e2a,
-  0x4378, 0x336b, 0x4972, 0x6864, 0x4621, 0x3031, 0x685d, 0x6859,
-  0x4172, 0x6853, 0x685b, 0x6860, 0x472c, 0x302a, 0x6858, 0x6861,
-  0x4978, 0x685c, 0x6857, 0x3e55, 0x3d2f, 0x3c2c, 0x4c58, 0x4947,
-  0x6867, 0x6870, 0x685a, 0x3377, 0x3e78, 0x6865, 0x686a, 0x4173,
-  0x6866, 0x686d, 0x435f, 0x686e, 0x4d56, 0x6863, 0x3338, 0x6869,
-  0x686c, 0x4c2c, 0x686f, 0x6868, 0x686b, 0x4b29, 0x4f21, 0x6873,
-  0x687a, 0x6872, 0x3c43, 0x6851, 0x4a4e, 0x4c22, 0x6879, 0x6878,
-  0x6874, 0x6875, 0x3136, 0x6877, 0x6871, 0x4455, 0x6876, 0x307e,
-  0x4222, 0x4a43, 0x687b, 0x6921, 0x4859, 0x687e, 0x3e56, 0x3c49,
-  0x6923, 0x363e, 0x6924, 0x4979, 0x687d, 0x6856, 0x687c, 0x4f4f,
-  0x4622, 0x4973, 0x692b, 0x6931, 0x6932, 0x6925, 0x4776, 0x692f,
-  0x6927, 0x6929, 0x6933, 0x6928, 0x692c, 0x3172, 0x4665, 0x692d,
-  0x6930, 0x6926, 0x4126, 0x692a, 0x3b27, 0x3f45, 0x3730, 0x4c74,
-  0x4c79, 0x3d72, 0x6937, 0x6935, 0x4f4e, 0x6934, 0x4d75, 0x6936,
-  0x6938, 0x6939, 0x693c, 0x693a, 0x4623, 0x693b, 0x484d, 0x692e,
-  0x3d73, 0x693d, 0x6942, 0x4174, 0x6941, 0x6922, 0x6943, 0x4149,
-  0x693e, 0x6940, 0x693f, 0x5d31, 0x5d22, 0x6945, 0x6944, 0x4d76,
-  0x623c, 0x6946, 0x6947, 0x6948, 0x3857, 0x3554, 0x694a, 0x515d,
-  0x3575, 0x4e3a, 0x3673, 0x694b, 0x694c, 0x436e, 0x694d, 0x467a,
-  0x303a, 0x3263, 0x6952, 0x6953, 0x694e, 0x3b3d, 0x694f, 0x4742,
-  0x6950, 0x6951, 0x695b, 0x6955, 0x6958, 0x6954, 0x6956, 0x6957,
-  0x3c58, 0x6959, 0x4341, 0x3756, 0x3342, 0x695c, 0x333f, 0x6961,
-  0x695d, 0x6960, 0x483a, 0x695e, 0x695f, 0x4948, 0x485a, 0x6962,
-  0x427d, 0x696c, 0x6968, 0x326b, 0x6966, 0x4b2a, 0x6967, 0x6964,
-  0x6965, 0x696a, 0x696d, 0x696b, 0x6969, 0x6963, 0x4358, 0x6974,
-  0x4c2a, 0x6972, 0x6973, 0x696e, 0x6970, 0x6971, 0x696f, 0x4066,
-  0x4f39, 0x6978, 0x6979, 0x6a21, 0x3f2a, 0x697b, 0x697e, 0x6976,
-  0x6975, 0x6a22, 0x325c, 0x697c, 0x6a23, 0x697d, 0x697a, 0x4433,
-  0x6977, 0x4768, 0x6a27, 0x4d3b, 0x6a26, 0x6a25, 0x6a2e, 0x6a28,
-  0x6a30, 0x4d66, 0x6a33, 0x6a2a, 0x6a2b, 0x6a2f, 0x6a32, 0x6a31,
-  0x6a29, 0x6a2c, 0x6a3d, 0x6a36, 0x6a34, 0x6a35, 0x6a3a, 0x6a3b,
-  0x332a, 0x3542, 0x6a39, 0x6a24, 0x6a38, 0x6a3c, 0x6a37, 0x6a3e,
-  0x6a40, 0x6a3f, 0x6a42, 0x6a41, 0x695a, 0x6a46, 0x6a43, 0x6a44,
-  0x6a45, 0x6a47, 0x376c, 0x6a49, 0x6a48, 0x3d30, 0x3954, 0x5e27,
-  0x6a4a, 0x3d51, 0x3339, 0x6a4b, 0x3152, 0x3e57, 0x6a4c, 0x3955,
-  0x6a4d, 0x3061, 0x493d, 0x6a4e, 0x3f6a, 0x6a55, 0x6a52, 0x436f,
-  0x6a53, 0x6a50, 0x365e, 0x6a4f, 0x6a56, 0x3736, 0x425e, 0x6a5c,
-  0x6a58, 0x4235, 0x6a57, 0x6a5a, 0x6a51, 0x6a5b, 0x6a5d, 0x486f,
-  0x6a59, 0x6a5e, 0x6a60, 0x3853, 0x6a54, 0x3041, 0x6a5f, 0x3a5b,
-  0x4e76, 0x6a61, 0x6a62, 0x4175, 0x4e22, 0x6a63, 0x4d35, 0x6a64,
-  0x6a65, 0x4a64, 0x6a66, 0x3a40, 0x4e23, 0x6a6b, 0x6a6c, 0x3e58,
-  0x6a6a, 0x4d67, 0x6a67, 0x6a69, 0x403d, 0x3f7e, 0x6a68, 0x6a6d,
-  0x4a23, 0x6a6f, 0x6a6e, 0x336c, 0x4b2b, 0x6a70, 0x6a7c, 0x6a72,
-  0x6a73, 0x6a74, 0x6a75, 0x6a79, 0x6a7a, 0x6a78, 0x6a76, 0x6a71,
-  0x6a77, 0x6a7b, 0x7037, 0x3228, 0x6a7e, 0x365f, 0x6a7d, 0x6b22,
-  0x6b21, 0x6b24, 0x6b23, 0x6b25, 0x3d31, 0x6b26, 0x6b27, 0x6b28,
-  0x403e, 0x4d57, 0x6b29, 0x4a24, 0x4746, 0x6b2a, 0x6b2b, 0x382b,
-  0x352c, 0x6b2c, 0x3b6b, 0x4741, 0x6b2d, 0x3350, 0x6b2e, 0x6b30,
-  0x4d77, 0x6b2f, 0x3f46, 0x6b31, 0x6b32, 0x6b33, 0x3451, 0x6b34,
-  0x6b35, 0x6b36, 0x6b37, 0x3351, 0x6b38, 0x6b39, 0x6b3a, 0x3272,
-  0x3f28, 0x6b3b, 0x6b3c, 0x6b3d, 0x3840, 0x447b, 0x6b3e, 0x3757,
-  0x3f56, 0x6b41, 0x4624, 0x6b40, 0x3731, 0x6b3f, 0x4277, 0x352d,
-  0x6b42, 0x6b43, 0x3e59, 0x376d, 0x6b44, 0x4b2c, 0x405f, 0x3576,
-  0x4c75, 0x414a, 0x6b45, 0x3f47, 0x4370, 0x3e5a, 0x6b46, 0x6b49,
-  0x6b4a, 0x3a3e, 0x4242, 0x6b48, 0x3e5b, 0x493e, 0x6b47, 0x3b6c,
-  0x3153, 0x6b4e, 0x3758, 0x3b6e, 0x3b6d, 0x4f4d, 0x6b4d, 0x6b4c,
-  0x4127, 0x354d, 0x4f43, 0x333a, 0x3e5c, 0x6b4b, 0x6b50, 0x6b51,
-  0x6b4f, 0x3858, 0x4d40, 0x3b6f, 0x4727, 0x6b54, 0x4040, 0x4342,
-  0x4d36, 0x6b57, 0x386c, 0x403f, 0x6b53, 0x6b58, 0x386d, 0x6b55,
-  0x6b56, 0x6b52, 0x4062, 0x4649, 0x432f, 0x325d, 0x4870, 0x3543,
-  0x4434, 0x6b5b, 0x6b59, 0x434c, 0x4041, 0x3452, 0x6b5a, 0x3f5b,
-  0x4e4a, 0x4f40, 0x6b5c, 0x6b67, 0x4435, 0x6b66, 0x6b63, 0x6b6b,
-  0x6b64, 0x6b60, 0x447c, 0x6b5f, 0x6b5d, 0x4d21, 0x3b70, 0x6b61,
-  0x6b5e, 0x6b65, 0x3d74, 0x3841, 0x427a, 0x4b45, 0x315a, 0x3062,
-  0x4625, 0x6b69, 0x6b68, 0x4666, 0x6b6d, 0x6b62, 0x6b6c, 0x6b6e,
-  0x382c, 0x6b6a, 0x3956, 0x3c55, 0x6b6f, 0x4d58, 0x6b72, 0x6b75,
-  0x6b73, 0x4935, 0x6b70, 0x3660, 0x6b74, 0x6b76, 0x6b7a, 0x6b77,
-  0x6b79, 0x6b78, 0x6b7b, 0x3c31, 0x6b7d, 0x6b7c, 0x4968, 0x6c21,
-  0x3759, 0x6b7e, 0x6c22, 0x6c23, 0x3544, 0x6641, 0x3e79, 0x6c24,
-  0x386e, 0x6c25, 0x6c26, 0x3b3e, 0x5a4e, 0x6c27, 0x6c28, 0x3d32,
-  0x6c29, 0x6c2a, 0x6c2b, 0x6c2c, 0x6c2d, 0x432b, 0x6c2e, 0x6c30,
-  0x6c2f, 0x4626, 0x6c31, 0x4b2d, 0x6c32, 0x6c33, 0x6c34, 0x6c35,
-  0x465a, 0x3e5d, 0x6c36, 0x396b, 0x502e, 0x6c37, 0x6c38, 0x493f,
-  0x6c39, 0x6c41, 0x6c3a, 0x6c3c, 0x6c3b, 0x6c3d, 0x4b46, 0x6c3e,
-  0x6c3f, 0x6c40, 0x6c42, 0x332d, 0x4467, 0x4969, 0x3a62, 0x3957,
-  0x494f, 0x325f, 0x484e, 0x6c45, 0x3453, 0x4055, 0x6c44, 0x6c49,
-  0x4379, 0x4c63, 0x6c47, 0x6c48, 0x352e, 0x6c4a, 0x4763, 0x425f,
-  0x4871, 0x453d, 0x6c46, 0x4b47, 0x326c, 0x6c4c, 0x4f28, 0x4442,
-  0x4f45, 0x3b71, 0x6c4b, 0x4231, 0x6c5c, 0x4128, 0x4678, 0x4950,
-  0x6c4f, 0x3b3f, 0x3b72, 0x3e5e, 0x4765, 0x382d, 0x6c4e, 0x6c4d,
-  0x496a, 0x3c41, 0x4552, 0x6c51, 0x6c52, 0x3958, 0x6c50, 0x6c53,
-  0x6c54, 0x6c56, 0x4223, 0x6c55, 0x3466, 0x6c58, 0x6c57, 0x6c59,
-  0x6c5b, 0x6c5d, 0x6c5e, 0x4056, 0x3c4f, 0x6c5f, 0x3352, 0x6c60,
-  0x4176, 0x6c61, 0x6c62, 0x496b, 0x352f, 0x6c63, 0x4436, 0x315b,
-  0x6c64, 0x3c71, 0x3f76, 0x422d, 0x6c67, 0x6c66, 0x6c65, 0x6c6d,
-  0x6c6b, 0x6c68, 0x6c6a, 0x6c69, 0x6c6c, 0x3577, 0x6c70, 0x4057,
-  0x6c71, 0x3859, 0x6c6e, 0x6c6f, 0x4f29, 0x4437, 0x4129, 0x6c72,
-  0x6c75, 0x6c73, 0x6c74, 0x4d59, 0x4627, 0x6c78, 0x6c76, 0x6c77,
-  0x6c79, 0x6d29, 0x6c7c, 0x6c7d, 0x6c7b, 0x6c7a, 0x447d, 0x6d21,
-  0x6d25, 0x6d22, 0x6c7e, 0x6d23, 0x6d24, 0x6d2b, 0x6d26, 0x4058,
-  0x6d28, 0x6d2a, 0x6d27, 0x6d2d, 0x3d33, 0x6d2c, 0x6d2e, 0x6d2f,
-  0x6d32, 0x6d31, 0x6d30, 0x6d34, 0x6d33, 0x4c76, 0x6d36, 0x6d35,
-  0x6d37, 0x6d38, 0x6d3a, 0x6d39, 0x3f48, 0x6d3b, 0x366d, 0x6d3c,
-  0x6d3e, 0x6d3f, 0x6d40, 0x6d3d, 0x6d41, 0x3c56, 0x6d42, 0x3530,
-  0x3733, 0x382e, 0x6d43, 0x4670, 0x453e, 0x6d44, 0x6d47, 0x3c34,
-  0x6d46, 0x6d45, 0x375a, 0x6d48, 0x3353, 0x6d4a, 0x3a5c, 0x6d49,
-  0x6d52, 0x6d4c, 0x6d4e, 0x4a65, 0x6d4b, 0x6d4d, 0x6d51, 0x6d4f,
-  0x3531, 0x6d50, 0x6d53, 0x475a, 0x4e58, 0x3d34, 0x6d54, 0x4d22,
-  0x6d56, 0x6d55, 0x6d59, 0x4d41, 0x6d58, 0x336d, 0x6d57, 0x6d5c,
-  0x6d5b, 0x6d5a, 0x4532, 0x6d5d, 0x6d5e, 0x6d5f, 0x396c, 0x3725,
-  0x6d60, 0x6d61, 0x6d62, 0x3f49, 0x6d63, 0x3c2d, 0x6d64, 0x6d65,
-  0x5221, 0x517e, 0x6d66, 0x6570, 0x6d67, 0x4324, 0x3f2b, 0x4740,
-  0x6d68, 0x4a55, 0x4454, 0x397e, 0x4329, 0x312a, 0x4b78, 0x3f57,
-  0x375e, 0x3661, 0x4a56, 0x6d69, 0x6d6b, 0x6d6a, 0x3260, 0x4676,
-  0x6d6c, 0x4777, 0x4533, 0x6d6d, 0x3d52, 0x6d6f, 0x4c42, 0x6d7e,
-  0x6d71, 0x6d72, 0x4449, 0x4260, 0x4177, 0x4628, 0x6d70, 0x3555,
-  0x6d79, 0x6d76, 0x6e25, 0x4629, 0x4360, 0x6d73, 0x447e, 0x4553,
-  0x6d74, 0x6d78, 0x3f60, 0x4767, 0x444c, 0x4042, 0x6d77, 0x422e,
-  0x4224, 0x6d75, 0x3029, 0x4f22, 0x6d7a, 0x4261, 0x3d35, 0x3f4a,
-  0x6d7c, 0x6d7b, 0x306f, 0x6d7d, 0x492f, 0x6e27, 0x465b, 0x3f6b,
-  0x4359, 0x3678, 0x6e26, 0x4d37, 0x313f, 0x4a57, 0x3261, 0x6e21,
-  0x6e22, 0x6e23, 0x6e24, 0x463b, 0x4323, 0x3063, 0x6e28, 0x6e29,
-  0x7423, 0x423d, 0x6e2a, 0x3173, 0x414c, 0x382f, 0x4d5a, 0x6e2b,
-  0x452c, 0x4178, 0x3c57, 0x6e2c, 0x6e2f, 0x3d65, 0x6e2d, 0x412b,
-  0x412a, 0x3064, 0x4e4b, 0x6e31, 0x4872, 0x6e33, 0x6e32, 0x6e30,
-  0x6364, 0x3454, 0x6d6e, 0x6e35, 0x6e34, 0x6e36, 0x4d38, 0x4661,
-  0x4b2e, 0x6e37, 0x3c59, 0x6e38, 0x6e39, 0x6e3a, 0x4521, 0x306a,
-  0x3959, 0x4f3a, 0x6e3e, 0x3734, 0x6e3b, 0x6e3c, 0x4974, 0x3354,
-  0x4d39, 0x363f, 0x4554, 0x6e3f, 0x6e40, 0x6e41, 0x4522, 0x6e43,
-  0x6e42, 0x4653, 0x6e44, 0x3d36, 0x3c60, 0x475b, 0x4371, 0x3c72,
-  0x3f6c, 0x6e45, 0x6e46, 0x3f5d, 0x6e47, 0x6e48, 0x6e49, 0x4d6f,
-  0x3d37, 0x6e4b, 0x6e4a, 0x395a, 0x3973, 0x3b40, 0x6e4e, 0x3d66,
-  0x6e4d, 0x6e4c, 0x4269, 0x386f, 0x4043, 0x4830, 0x3d39, 0x6e4f,
-  0x3e5f, 0x6e52, 0x6e50, 0x6e51, 0x6e54, 0x6e53, 0x3e7a, 0x6e55,
-  0x6e56, 0x6e57, 0x4850, 0x3a53, 0x3c61, 0x6e58, 0x6e59, 0x4e24,
-  0x3d45, 0x4c6e, 0x4e4c, 0x6e5a, 0x3662, 0x6e5b, 0x4523, 0x6e5e,
-  0x3378, 0x3f4b, 0x6e5c, 0x6e5d, 0x4460, 0x4b55, 0x367c, 0x6e60,
-  0x6e61, 0x6e5f, 0x6e63, 0x465f, 0x3343, 0x6e67, 0x6e64, 0x6e66,
-  0x6e62, 0x6f4f, 0x6e65, 0x4e6b, 0x385a, 0x6e6f, 0x4534, 0x6e6a,
-  0x6e6d, 0x6e6b, 0x6e70, 0x6e71, 0x6e69, 0x6e76, 0x3174, 0x6e68,
-  0x482d, 0x6e6c, 0x3e60, 0x395b, 0x4b48, 0x3664, 0x3d46, 0x463c,
-  0x412d, 0x6e74, 0x6e6e, 0x6e73, 0x4c43, 0x4438, 0x6e75, 0x6e72,
-  0x412c, 0x6e79, 0x6e78, 0x6e77, 0x4b2f, 0x3d7b, 0x6e7a, 0x4a5f,
-  0x3154, 0x4946, 0x4372, 0x3578, 0x6e7c, 0x395d, 0x3b2c, 0x6e7b,
-  0x3f6d, 0x3f6e, 0x6f21, 0x6f23, 0x3e7b, 0x6f22, 0x6f24, 0x3653,
-  0x4945, 0x3c62, 0x4f23, 0x6e7e, 0x3a78, 0x4f3f, 0x6f26, 0x6f25,
-  0x6f27, 0x6e7d, 0x4669, 0x4555, 0x4457, 0x6f2c, 0x4343, 0x6f28,
-  0x6f29, 0x372d, 0x6f2b, 0x3830, 0x6f2a, 0x3e61, 0x3379, 0x6f30,
-  0x3a3f, 0x4179, 0x444a, 0x333b, 0x6f2e, 0x6f2f, 0x4443, 0x6f2d,
-  0x6f31, 0x6f37, 0x6f3a, 0x6f39, 0x452d, 0x6f32, 0x6f33, 0x6f36,
-  0x6f38, 0x3640, 0x6f3b, 0x6f35, 0x6f34, 0x6f3f, 0x6f40, 0x6f41,
-  0x6f3e, 0x6f3d, 0x3e62, 0x462a, 0x6f3c, 0x6f45, 0x6f43, 0x6f44,
-  0x6f42, 0x4278, 0x6f46, 0x6f47, 0x6f49, 0x3455, 0x6f48, 0x4c7a,
-  0x6f54, 0x6f4a, 0x6f4d, 0x6f4b, 0x6f4c, 0x6f4e, 0x6f50, 0x6f51,
-  0x6f52, 0x6f55, 0x6f53, 0x6f56, 0x6f58, 0x6f57, 0x4439, 0x4c67,
-  0x6f59, 0x412e, 0x6f5a, 0x4a44, 0x6f5b, 0x332b, 0x313c, 0x3457,
-  0x3456, 0x6f5c, 0x6f5d, 0x6f5e, 0x6f5f, 0x6f60, 0x3458, 0x3355,
-  0x395e, 0x4836, 0x6f62, 0x6f61, 0x6f63, 0x315c, 0x6f66, 0x6f65,
-  0x6f64, 0x6f67, 0x6f6a, 0x3047, 0x6f68, 0x6f6c, 0x6f6b, 0x6f6e,
-  0x6f6d, 0x6f6f, 0x462e, 0x6f70, 0x6f71, 0x6f73, 0x6f72, 0x496c,
-  0x6f74, 0x6f75, 0x3a65, 0x6f76, 0x6f77, 0x4b49, 0x414b, 0x3024,
-  0x424b, 0x6f78, 0x496d, 0x6f7b, 0x6f79, 0x395f, 0x6f7a, 0x3842,
-  0x4a45, 0x6f7d, 0x7021, 0x6f7e, 0x7022, 0x3121, 0x3f58, 0x3d7c,
-  0x3459, 0x7023, 0x4766, 0x7025, 0x3122, 0x7024, 0x4444, 0x4e4d,
-  0x462b, 0x6f7c, 0x4e26, 0x3831, 0x4d5b, 0x3679, 0x4e34, 0x3728,
-  0x4262, 0x6721, 0x7026, 0x332c, 0x3f6f, 0x3356, 0x7028, 0x7029,
-  0x7027, 0x3764, 0x3a5d, 0x3e63, 0x3123, 0x4e59, 0x702b, 0x6e2e,
-  0x702a, 0x702e, 0x702c, 0x702d, 0x702f, 0x7030, 0x4e6c, 0x7031,
-  0x7032, 0x4049, 0x483b, 0x3f7d, 0x3467, 0x4d3a, 0x326d, 0x3d38,
-  0x385b, 0x7035, 0x7034, 0x3b73, 0x7036, 0x7033, 0x3b28, 0x703a,
-  0x6a2d, 0x5256, 0x3f77, 0x7038, 0x4e25, 0x4671, 0x312b, 0x4063,
-  0x3c36, 0x4a37, 0x3140, 0x4e6d, 0x4d6b, 0x703b, 0x4545, 0x3c7b,
-  0x703c, 0x703d, 0x3f4c, 0x703e, 0x4e6e, 0x7039, 0x7040, 0x7042,
-  0x7041, 0x703f, 0x7043, 0x7044, 0x417a, 0x3262, 0x7045, 0x4c38,
-  0x7046, 0x7047, 0x4f2a, 0x5b31, 0x7048, 0x7049, 0x704a, 0x704e,
-  0x704b, 0x704c, 0x704d, 0x704f, 0x4044, 0x4c77, 0x4045, 0x7050,
-  0x4873, 0x7051, 0x7353, 0x4c4c, 0x7052, 0x7053, 0x7054, 0x3357,
-  0x7056, 0x3f59, 0x7057, 0x3724, 0x7058, 0x705c, 0x705a, 0x705b,
-  0x3373, 0x7059, 0x705d, 0x705e, 0x3048, 0x705f, 0x7060, 0x3e64,
-  0x7061, 0x3547, 0x7064, 0x7063, 0x7062, 0x6b71, 0x4a5c, 0x7065,
-  0x7066, 0x7067, 0x7068, 0x7069, 0x706a, 0x345a, 0x706b, 0x706c,
-  0x4723, 0x706e, 0x323b, 0x7071, 0x7070, 0x3124, 0x3641, 0x4a47,
-  0x443a, 0x3a22, 0x3960, 0x3d67, 0x3f5c, 0x7073, 0x7072, 0x4d42,
-  0x3468, 0x4852, 0x465c, 0x3f7c, 0x4e4e, 0x375b, 0x7076, 0x7075,
-  0x4b4b, 0x462c, 0x3150, 0x7077, 0x7074, 0x4951, 0x4d6a, 0x7078,
-  0x7079, 0x707b, 0x426a, 0x335b, 0x335c, 0x707a, 0x3469, 0x3832,
-  0x346a, 0x453f, 0x4e60, 0x385c, 0x707c, 0x707d, 0x707e, 0x7121,
-  0x7123, 0x7122, 0x4977, 0x7124, 0x7125, 0x7126, 0x7127, 0x7129,
-  0x7128, 0x712a, 0x4874, 0x664c, 0x3f29, 0x3532, 0x712b, 0x712c,
-  0x522c, 0x5d3b, 0x4853, 0x307b, 0x303b, 0x3b74, 0x4b30, 0x3e7e,
-  0x712d, 0x4c5f, 0x712e, 0x4d5c, 0x3142, 0x3b41, 0x712f, 0x326e,
-  0x7130, 0x7131, 0x7133, 0x7134, 0x7136, 0x7132, 0x7135, 0x345b,
-  0x7137, 0x7138, 0x7139, 0x713a, 0x713b, 0x713d, 0x713c, 0x713f,
-  0x7142, 0x713e, 0x7140, 0x7141, 0x7143, 0x3642, 0x3c73, 0x7144,
-  0x7145, 0x3961, 0x7146, 0x333e, 0x474f, 0x7147, 0x7148, 0x435a,
-  0x466b, 0x7149, 0x477d, 0x424c, 0x3158, 0x366e, 0x366f, 0x4373,
-  0x714e, 0x3670, 0x326f, 0x714d, 0x714b, 0x714c, 0x714a, 0x7158,
-  0x714f, 0x7150, 0x7151, 0x7152, 0x7154, 0x7153, 0x3d59, 0x7155,
-  0x7157, 0x3533, 0x7156, 0x417b, 0x3833, 0x7159, 0x424d, 0x715a,
-  0x462d, 0x715b, 0x7160, 0x715e, 0x715d, 0x715f, 0x715c, 0x7162,
-  0x7161, 0x7164, 0x3643, 0x7163, 0x7165, 0x7166, 0x7168, 0x7167,
-  0x7169, 0x716b, 0x716a, 0x397c, 0x716c, 0x716d, 0x333c, 0x716e,
-  0x716f, 0x3f71, 0x7170, 0x7171, 0x7172, 0x7173, 0x3962, 0x7174,
-  0x7175, 0x7176, 0x7177, 0x7178, 0x4831, 0x717a, 0x4926, 0x717b,
-  0x7179, 0x717d, 0x717c, 0x717e, 0x7221, 0x7222, 0x7223, 0x7224,
-  0x7225, 0x7226, 0x7227, 0x7228, 0x7229, 0x722a, 0x722b, 0x722c,
-  0x722d, 0x722e, 0x5d35, 0x722f, 0x6478, 0x3534, 0x3321, 0x3a32,
-  0x7231, 0x7230, 0x4c25, 0x7233, 0x7234, 0x7232, 0x7235, 0x4b62,
-  0x7236, 0x357b, 0x4f25, 0x7237, 0x7239, 0x303e, 0x723a, 0x4a2b,
-  0x7238, 0x723b, 0x723c, 0x723d, 0x723e, 0x723f, 0x4b6e, 0x3b2d,
-  0x3a7a, 0x412f, 0x7240, 0x7243, 0x7241, 0x7244, 0x3871, 0x7242,
-  0x7245, 0x7246, 0x7247, 0x724b, 0x3b2a, 0x4264, 0x724c, 0x7249,
-  0x7248, 0x724a, 0x375f, 0x7250, 0x724f, 0x724e, 0x3033, 0x725a,
-  0x7256, 0x7257, 0x7253, 0x7259, 0x7255, 0x3362, 0x4f4c, 0x7258,
-  0x7254, 0x7252, 0x7251, 0x725c, 0x725f, 0x725e, 0x725d, 0x4949,
-  0x725b, 0x3073, 0x7260, 0x7262, 0x336f, 0x724d, 0x3137, 0x7264,
-  0x7263, 0x7261, 0x432d, 0x4b70, 0x4e5a, 0x7265, 0x7266, 0x7267,
-  0x7268, 0x7269, 0x443b, 0x726a, 0x4837, 0x726f, 0x726b, 0x726c,
-  0x4b31, 0x4c44, 0x4650, 0x7270, 0x7271, 0x463e, 0x726e, 0x726d,
-  0x322a, 0x7279, 0x7278, 0x3175, 0x7276, 0x7275, 0x7273, 0x337b,
-  0x7272, 0x3c32, 0x3229, 0x3963, 0x727c, 0x727b, 0x727a, 0x7277,
-  0x727d, 0x727e, 0x7325, 0x7324, 0x7326, 0x312d, 0x7321, 0x7322,
-  0x3974, 0x4c39, 0x7323, 0x4b32, 0x732b, 0x7327, 0x732c, 0x7329,
-  0x7328, 0x375c, 0x732d, 0x732e, 0x732f, 0x732a, 0x7274, 0x7330,
-  0x4461, 0x7334, 0x7335, 0x7333, 0x7332, 0x7338, 0x7331, 0x7336,
-  0x7337, 0x733a, 0x7339, 0x733c, 0x733d, 0x733e, 0x4f49, 0x733b,
-  0x426b, 0x3a6d, 0x733f, 0x7340, 0x7341, 0x7342, 0x7343, 0x3834,
-  0x7344, 0x7345, 0x3c2f, 0x7346, 0x7347, 0x7348, 0x7349, 0x734c,
-  0x734a, 0x4f3c, 0x734b, 0x4e6f, 0x734d, 0x4e5b, 0x734e, 0x477e,
-  0x734f, 0x7351, 0x7352, 0x7350, 0x396d, 0x4c4d, 0x4b63, 0x5677,
-  0x5d60, 0x4b7b, 0x322b, 0x7354, 0x3550, 0x7355, 0x7356, 0x7357,
-  0x3975, 0x7358, 0x6054, 0x4c5b, 0x4263, 0x7359, 0x735b, 0x735a,
-  0x735c, 0x735d, 0x735e, 0x735f, 0x7360, 0x7361, 0x7362, 0x7363,
-  0x7364, 0x7365, 0x7366, 0x7367, 0x7368, 0x4524, 0x385d, 0x736a,
-  0x414d, 0x736b, 0x736c, 0x4921, 0x736d, 0x736e, 0x6337, 0x6c5a,
-  0x706d, 0x736f, 0x7370, 0x7372, 0x7373, 0x7374, 0x4e70, 0x7371,
-  0x7375, 0x7376, 0x7378, 0x7377, 0x737a, 0x737b, 0x7379, 0x4e36,
-  0x737c, 0x737d, 0x6354, 0x737e, 0x212a, 0x2174, 0x2170, 0x2173,
-  0x2175, 0x214a, 0x214b, 0x2176, 0x215c, 0x2124, 0x2125, 0x213f,
-  0x2330, 0x2331, 0x2332, 0x2333, 0x2334, 0x2335, 0x2336, 0x2337,
-  0x2338, 0x2339, 0x2127, 0x2128, 0x2163, 0x2161, 0x2164, 0x2129,
-  0x2177, 0x2341, 0x2342, 0x2343, 0x2344, 0x2345, 0x2346, 0x2347,
-  0x2348, 0x2349, 0x234a, 0x234b, 0x234c, 0x234d, 0x234e, 0x234f,
-  0x2350, 0x2351, 0x2352, 0x2353, 0x2354, 0x2355, 0x2356, 0x2357,
-  0x2358, 0x2359, 0x235a, 0x214e, 0x214f, 0x2130, 0x2132, 0x212e,
-  0x2361, 0x2362, 0x2363, 0x2364, 0x2365, 0x2366, 0x2367, 0x2368,
-  0x2369, 0x236a, 0x236b, 0x236c, 0x236d, 0x236e, 0x236f, 0x2370,
-  0x2371, 0x2372, 0x2373, 0x2374, 0x2375, 0x2376, 0x2377, 0x2378,
-  0x2379, 0x237a, 0x2150, 0x2143, 0x2151, 0x2131, 0x216f,
-};
-
-static const Summary16 jisx0208_uni2indx_page00[16] = {
-  /* 0x0000 */
-  {    0, 0x0000 }, {    0, 0x0000 }, {    0, 0x0000 }, {    0, 0x0000 },
-  {    0, 0x0000 }, {    0, 0x1000 }, {    1, 0x0000 }, {    1, 0x0000 },
-  {    1, 0x0000 }, {    1, 0x0000 }, {    1, 0x118c }, {    6, 0x0053 },
-  {   10, 0x0000 }, {   10, 0x0080 }, {   11, 0x0000 }, {   11, 0x0080 },
-};
-static const Summary16 jisx0208_uni2indx_page03[22] = {
-  /* 0x0300 */
-  {   12, 0x0000 }, {   12, 0x0000 }, {   12, 0x0000 }, {   12, 0x0000 },
-  {   12, 0x0000 }, {   12, 0x0000 }, {   12, 0x0000 }, {   12, 0x0000 },
-  {   12, 0x0000 }, {   12, 0xfffe }, {   27, 0x03fb }, {   36, 0xfffe },
-  {   51, 0x03fb }, {   60, 0x0000 }, {   60, 0x0000 }, {   60, 0x0000 },
-  /* 0x0400 */
-  {   60, 0x0002 }, {   61, 0xffff }, {   77, 0xffff }, {   93, 0xffff },
-  {  109, 0xffff }, {  125, 0x0002 },
-};
-static const Summary16 jisx0208_uni2indx_page20[50] = {
-  /* 0x2000 */
-  {  126, 0x0000 }, {  126, 0x3361 }, {  133, 0x0063 }, {  137, 0x080d },
-  {  141, 0x0000 }, {  141, 0x0000 }, {  141, 0x0000 }, {  141, 0x0000 },
-  {  141, 0x0000 }, {  141, 0x0000 }, {  141, 0x0000 }, {  141, 0x0000 },
-  {  141, 0x0000 }, {  141, 0x0000 }, {  141, 0x0000 }, {  141, 0x0000 },
-  /* 0x2100 */
-  {  141, 0x0008 }, {  142, 0x0000 }, {  142, 0x0800 }, {  143, 0x0000 },
-  {  143, 0x0000 }, {  143, 0x0000 }, {  143, 0x0000 }, {  143, 0x0000 },
-  {  143, 0x0000 }, {  143, 0x000f }, {  147, 0x0000 }, {  147, 0x0000 },
-  {  147, 0x0000 }, {  147, 0x0014 }, {  149, 0x0000 }, {  149, 0x0000 },
-  /* 0x2200 */
-  {  149, 0x098d }, {  155, 0x6404 }, {  159, 0x1f81 }, {  166, 0x2030 },
-  {  169, 0x0000 }, {  169, 0x0004 }, {  170, 0x0cc3 }, {  176, 0x0000 },
-  {  176, 0x00cc }, {  180, 0x0000 }, {  180, 0x0020 }, {  181, 0x0000 },
-  {  181, 0x0000 }, {  181, 0x0000 }, {  181, 0x0000 }, {  181, 0x0000 },
-  /* 0x2300 */
-  {  181, 0x0000 }, {  181, 0x0004 },
-};
-static const Summary16 jisx0208_uni2indx_page25[23] = {
-  /* 0x2500 */
-  {  182, 0x900f }, {  188, 0x3999 }, {  196, 0x9939 }, {  204, 0x9999 },
-  {  212, 0x0804 }, {  214, 0x0000 }, {  214, 0x0000 }, {  214, 0x0000 },
-  {  214, 0x0000 }, {  214, 0x0000 }, {  214, 0x0003 }, {  216, 0x300c },
-  {  220, 0xc8c0 }, {  225, 0x0000 }, {  225, 0x8000 }, {  226, 0x0000 },
-  /* 0x2600 */
-  {  226, 0x0060 }, {  228, 0x0000 }, {  228, 0x0000 }, {  228, 0x0000 },
-  {  228, 0x0005 }, {  230, 0x0000 }, {  230, 0xa400 },
-};
-static const Summary16 jisx0208_uni2indx_page30[16] = {
-  /* 0x3000 */
-  {  233, 0xffef }, {  248, 0x103f }, {  255, 0x0000 }, {  255, 0x0000 },
-  {  255, 0xfffe }, {  270, 0xffff }, {  286, 0xffff }, {  302, 0xffff },
-  {  318, 0xffff }, {  334, 0x780f }, {  342, 0xfffe }, {  357, 0xffff },
-  {  373, 0xffff }, {  389, 0xffff }, {  405, 0xffff }, {  421, 0x787f },
-};
-static const Summary16 jisx0208_uni2indx_page4e[1307] = {
-  /* 0x4e00 */
-  {  432, 0x6f8b }, {  442, 0x43f3 }, {  451, 0x2442 }, {  455, 0x9b46 },
-  {  463, 0xe82c }, {  470, 0xe3e0 }, {  478, 0x0004 }, {  479, 0x400a },
-  {  482, 0x5f65 }, {  492, 0xdb36 }, {  502, 0x7977 }, {  513, 0x0449 },
-  {  517, 0xecd7 }, {  528, 0xe3f0 }, {  537, 0x6038 }, {  542, 0x08c5 },
-  /* 0x4f00 */
-  {  547, 0xe602 }, {  553, 0x3403 }, {  558, 0x8000 }, {  559, 0x3551 },
-  {  566, 0xe0c8 }, {  572, 0x7eab }, {  583, 0x8200 }, {  585, 0x9869 },
-  {  592, 0xa948 }, {  598, 0x2942 }, {  603, 0xe803 }, {  609, 0x8060 },
-  {  612, 0x441c }, {  617, 0xad93 }, {  626, 0xc03a }, {  632, 0x4568 },
-  /* 0x5000 */
-  {  638, 0xaa60 }, {  644, 0x8656 }, {  651, 0x3f7a }, {  662, 0x0240 },
-  {  664, 0x8388 }, {  669, 0x1461 }, {  674, 0x1020 }, {  676, 0x2174 },
-  {  682, 0x2021 }, {  685, 0x0702 }, {  689, 0x3000 }, {  691, 0x40bc },
-  {  697, 0xa624 }, {  703, 0x4462 }, {  708, 0x60a8 }, {  713, 0x0a20 },
-  /* 0x5100 */
-  {  716, 0x0217 }, {  721, 0x8574 }, {  728, 0x0402 }, {  730, 0x9c84 },
-  {  736, 0x7bfb }, {  749, 0x1415 }, {  754, 0x7f24 }, {  763, 0x11e2 },
-  {  769, 0xb665 }, {  778, 0x02ef }, {  786, 0x1f75 }, {  796, 0x20ff },
-  {  805, 0x3a70 }, {  812, 0x3840 }, {  816, 0x26c3 }, {  823, 0x6763 },
-  /* 0x5200 */
-  {  832, 0x4dd9 }, {  841, 0x2092 }, {  845, 0x46b0 }, {  851, 0x0fc9 },
-  {  859, 0xbc98 }, {  867, 0x4850 }, {  871, 0x8638 }, {  877, 0xa03f },
-  {  885, 0x2388 }, {  890, 0x8816 }, {  895, 0x3e09 }, {  902, 0x5232 },
-  {  908, 0x22aa }, {  914, 0xe3a4 }, {  922, 0x00dd }, {  928, 0xc72c },
-  /* 0x5300 */
-  {  936, 0xa166 }, {  943, 0x26e1 }, {  950, 0x840b }, {  955, 0x8f0a },
-  {  962, 0x27eb }, {  972, 0x559e }, {  981, 0xc241 }, {  986, 0x89bb },
-  {  995, 0x0014 }, {  997, 0x8540 }, { 1001, 0x6361 }, { 1008, 0x0849 },
-  { 1012, 0x7f0c }, { 1021, 0x8ad0 }, { 1027, 0xff3e }, { 1040, 0x05cf },
-  /* 0x5400 */
-  { 1048, 0xff1a }, { 1059, 0xa803 }, { 1064, 0x7a41 }, { 1071, 0x7b40 },
-  { 1078, 0x4745 }, { 1085, 0x8002 }, { 1087, 0x0500 }, { 1089, 0x38eb },
-  { 1098, 0xd851 }, { 1105, 0x0005 }, { 1107, 0x9934 }, { 1114, 0x710c },
-  { 1120, 0x0397 }, { 1127, 0x0100 }, { 1128, 0x6366 }, { 1136, 0x2404 },
-  /* 0x5500 */
-  { 1139, 0x80d0 }, { 1143, 0x0051 }, { 1146, 0xc000 }, { 1148, 0x430a },
-  { 1153, 0x9071 }, { 1159, 0x30c8 }, { 1164, 0x0008 }, { 1165, 0x5800 },
-  { 1168, 0x0e99 }, { 1175, 0xf700 }, { 1182, 0x5f80 }, { 1189, 0x0041 },
-  { 1191, 0x00b0 }, { 1194, 0x9410 }, { 1198, 0x0018 }, { 1200, 0x6280 },
-  /* 0x5600 */
-  { 1204, 0x0240 }, { 1206, 0x09d0 }, { 1211, 0x8200 }, { 1213, 0x0156 },
-  { 1218, 0x5004 }, { 1221, 0x0801 }, { 1223, 0x1d10 }, { 1228, 0x0510 },
-  { 1231, 0x84c1 }, { 1236, 0x0010 }, { 1237, 0x4025 }, { 1241, 0x1050 },
-  { 1244, 0x410f }, { 1250, 0x4d8a }, { 1257, 0x4009 }, { 1260, 0xa60d },
-  /* 0x5700 */
-  { 1267, 0xab19 }, { 1275, 0x914c }, { 1281, 0x21c0 }, { 1285, 0x0981 },
-  { 1289, 0xc485 }, { 1295, 0x0003 }, { 1297, 0x0652 }, { 1302, 0x8000 },
-  { 1303, 0x0b04 }, { 1307, 0x0008 }, { 1308, 0x041d }, { 1313, 0x0009 },
-  { 1315, 0x4849 }, { 1320, 0x905c }, { 1326, 0x0009 }, { 1328, 0x1690 },
-  /* 0x5800 */
-  { 1333, 0x0c65 }, { 1339, 0x2220 }, { 1342, 0x8412 }, { 1346, 0x2433 },
-  { 1352, 0x0c03 }, { 1356, 0x4796 }, { 1364, 0x0a04 }, { 1367, 0x4225 },
-  { 1372, 0x0028 }, { 1374, 0x9088 }, { 1378, 0x4900 }, { 1381, 0x4f08 },
-  { 1387, 0x14a2 }, { 1392, 0xd3aa }, { 1401, 0xd830 }, { 1407, 0x3e87 },
-  /* 0x5900 */
-  { 1416, 0x8604 }, { 1420, 0x1f61 }, { 1428, 0x7ea4 }, { 1437, 0x4186 },
-  { 1442, 0xc390 }, { 1448, 0x05b3 }, { 1455, 0x57a5 }, { 1464, 0x2118 },
-  { 1468, 0x241e }, { 1474, 0x2a48 }, { 1479, 0x1128 }, { 1483, 0x4a04 },
-  { 1487, 0x0a40 }, { 1490, 0x161b }, { 1497, 0x0d60 }, { 1502, 0x8840 },
-  /* 0x5a00 */
-  { 1505, 0x020a }, { 1508, 0x9502 }, { 1513, 0x8221 }, { 1517, 0x1060 },
-  { 1520, 0x0243 }, { 1524, 0x0400 }, { 1525, 0x1444 }, { 1529, 0x8000 },
-  { 1530, 0x0000 }, { 1530, 0x0c04 }, { 1533, 0x0000 }, { 1533, 0x7000 },
-  { 1536, 0x1a06 }, { 1541, 0x00c1 }, { 1544, 0x024a }, { 1548, 0x0c00 },
-  /* 0x5b00 */
-  { 1550, 0x1a00 }, { 1553, 0x0040 }, { 1554, 0x1404 }, { 1557, 0x4045 },
-  { 1561, 0x0029 }, { 1564, 0xbdb3 }, { 1575, 0x0a78 }, { 1581, 0x052b },
-  { 1587, 0xbba9 }, { 1597, 0xbfa0 }, { 1606, 0x407c }, { 1612, 0x8379 },
-  { 1620, 0x12fc }, { 1628, 0xe81d }, { 1636, 0x4bf6 }, { 1646, 0xc569 },
-  /* 0x5c00 */
-  { 1654, 0xeff6 }, { 1667, 0x044a }, { 1671, 0x2115 }, { 1676, 0xff02 },
-  { 1685, 0xed63 }, { 1695, 0x402b }, { 1700, 0xd033 }, { 1707, 0x0242 },
-  { 1710, 0x1000 }, { 1711, 0x0013 }, { 1714, 0x1b02 }, { 1719, 0x59ca },
-  { 1727, 0x00a0 }, { 1729, 0x0200 }, { 1730, 0xa703 }, { 1737, 0x2c41 },
-  /* 0x5d00 */
-  { 1742, 0x4880 }, { 1745, 0x8ff2 }, { 1755, 0x0204 }, { 1757, 0x0000 },
-  { 1757, 0x5800 }, { 1760, 0x1005 }, { 1763, 0x9200 }, { 1766, 0x0048 },
-  { 1768, 0x1894 }, { 1773, 0x2001 }, { 1775, 0x5004 }, { 1778, 0x3480 },
-  { 1782, 0x3200 }, { 1785, 0x684c }, { 1791, 0x49ea }, { 1799, 0x68be },
-  /* 0x5e00 */
-  { 1808, 0x184c }, { 1813, 0x2e42 }, { 1819, 0xa820 }, { 1823, 0x21c9 },
-  { 1829, 0x50b9 }, { 1836, 0x80b0 }, { 1840, 0x001e }, { 1844, 0xff7c },
-  { 1857, 0x849a }, { 1863, 0x14e0 }, { 1868, 0x28c1 }, { 1873, 0x01e0 },
-  { 1877, 0x870e }, { 1884, 0xac49 }, { 1891, 0x130f }, { 1898, 0xdddb },
-  /* 0x5f00 */
-  { 1910, 0xbe1a }, { 1919, 0x89fb }, { 1929, 0xa2e0 }, { 1935, 0x51a2 },
-  { 1941, 0x5502 }, { 1946, 0x32ca }, { 1953, 0x3e46 }, { 1961, 0x928b },
-  { 1968, 0x1dbf }, { 1979, 0x438f }, { 1987, 0x6703 }, { 1994, 0x3218 },
-  { 1999, 0x3028 }, { 2003, 0x33c0 }, { 2009, 0x0811 }, { 2012, 0xa923 },
-  /* 0x6000 */
-  { 2019, 0xc000 }, { 2021, 0x3a65 }, { 2029, 0x8fe3 }, { 2039, 0x0402 },
-  { 2041, 0x2c4e }, { 2048, 0x8625 }, { 2054, 0xbf3d }, { 2066, 0x00a1 },
-  { 2069, 0x3a1a }, { 2076, 0x8cd4 }, { 2083, 0x06c9 }, { 2089, 0x317c },
-  { 2097, 0x00e0 }, { 2100, 0x950a }, { 2106, 0x018b }, { 2111, 0x0edb },
-  /* 0x6100 */
-  { 2120, 0xe34b }, { 2129, 0x8c20 }, { 2133, 0x1182 }, { 2137, 0xf010 },
-  { 2142, 0x7d94 }, { 2151, 0xa728 }, { 2158, 0xc9ac }, { 2166, 0x40fb },
-  { 2174, 0x4484 }, { 2178, 0x0653 }, { 2184, 0x5a90 }, { 2190, 0x4444 },
-  { 2194, 0x3fc8 }, { 2203, 0x0001 }, { 2204, 0x0048 }, { 2206, 0xf5d4 },
-  /* 0x6200 */
-  { 2216, 0x7701 }, { 2223, 0xec57 }, { 2233, 0xc442 }, { 2238, 0x891d },
-  { 2245, 0x6b83 }, { 2253, 0x4928 }, { 2258, 0x4109 }, { 2262, 0xd242 },
-  { 2268, 0x061d }, { 2274, 0x59fe }, { 2285, 0x1800 }, { 2287, 0x3a22 },
-  { 2293, 0xb7e4 }, { 2303, 0x3b9f }, { 2314, 0xf003 }, { 2320, 0xc0ea },
-  /* 0x6300 */
-  { 2327, 0x1386 }, { 2333, 0x8202 }, { 2336, 0x8980 }, { 2340, 0xe400 },
-  { 2344, 0xb200 }, { 2348, 0x10a1 }, { 2352, 0x4b80 }, { 2357, 0x0cc4 },
-  { 2362, 0xd309 }, { 2369, 0x8944 }, { 2374, 0x1faf }, { 2385, 0x4834 },
-  { 2390, 0x8259 }, { 2396, 0x0c45 }, { 2401, 0x420a }, { 2405, 0x0450 },
-  /* 0x6400 */
-  { 2408, 0xa040 }, { 2411, 0x10c8 }, { 2415, 0x3140 }, { 2419, 0x4450 },
-  { 2423, 0x4004 }, { 2425, 0x0100 }, { 2426, 0x8280 }, { 2429, 0x0540 },
-  { 2432, 0x0108 }, { 2434, 0x442c }, { 2439, 0x6a30 }, { 2445, 0x1a05 },
-  { 2450, 0x20a6 }, { 2455, 0x0514 }, { 2459, 0x90cf }, { 2467, 0x6456 },
-  /* 0x6500 */
-  { 2474, 0x0021 }, { 2476, 0x3100 }, { 2479, 0x9c18 }, { 2485, 0xcbf0 },
-  { 2494, 0xa120 }, { 2498, 0x63e2 }, { 2506, 0x104c }, { 2510, 0x01b5 },
-  { 2516, 0x538c }, { 2523, 0x9a83 }, { 2530, 0xb8b2 }, { 2538, 0x3281 },
-  { 2543, 0x987a }, { 2551, 0x0a84 }, { 2555, 0x33e7 }, { 2565, 0x0c02 },
-  /* 0x6600 */
-  { 2568, 0xd4cc }, { 2576, 0x9018 }, { 2580, 0xa1a1 }, { 2586, 0x9070 },
-  { 2591, 0x8a1e }, { 2598, 0xe004 }, { 2602, 0xc3d4 }, { 2610, 0x0451 },
-  { 2614, 0x439a }, { 2621, 0x21c2 }, { 2626, 0x4844 }, { 2630, 0x5310 },
-  { 2635, 0x0292 }, { 2639, 0x3640 }, { 2644, 0x0241 }, { 2647, 0xf3bd },
-  /* 0x6700 */
-  { 2659, 0xab09 }, { 2666, 0xe8f0 }, { 2674, 0x7dc0 }, { 2682, 0xa5d2 },
-  { 2690, 0xc242 }, { 2695, 0xd24b }, { 2703, 0xa43f }, { 2712, 0xd0af },
-  { 2721, 0x1aa0 }, { 2726, 0x34a1 }, { 2732, 0x8247 }, { 2738, 0x03d8 },
-  { 2744, 0xc452 }, { 2750, 0x651b }, { 2758, 0xd294 }, { 2765, 0xc83a },
-  /* 0x6800 */
-  { 2772, 0x001c }, { 2775, 0x40c8 }, { 2779, 0x0e06 }, { 2784, 0x3314 },
-  { 2790, 0x614f }, { 2798, 0xb21b }, { 2806, 0x0088 }, { 2808, 0xc0d0 },
-  { 2813, 0xa02a }, { 2818, 0xa898 }, { 2824, 0xa1c5 }, { 2831, 0x166b },
-  { 2839, 0x2e50 }, { 2845, 0x85b4 }, { 2852, 0xc08b }, { 2858, 0x0604 },
-  /* 0x6900 */
-  { 2861, 0xf933 }, { 2871, 0x1e04 }, { 2876, 0x056e }, { 2883, 0xa251 },
-  { 2889, 0x0400 }, { 2890, 0x7638 }, { 2898, 0xec07 }, { 2906, 0x73b8 },
-  { 2915, 0x4406 }, { 2919, 0x1832 }, { 2924, 0x4081 }, { 2927, 0xc816 },
-  { 2933, 0x7c8a }, { 2941, 0x6309 }, { 2947, 0x2980 }, { 2951, 0xaa04 },
-  /* 0x6a00 */
-  { 2956, 0x1c24 }, { 2961, 0xca9c }, { 2969, 0x4e0e }, { 2976, 0x2760 },
-  { 2982, 0x0990 }, { 2986, 0x8300 }, { 2989, 0x0046 }, { 2992, 0x8104 },
-  { 2995, 0x6011 }, { 2999, 0x1081 }, { 3002, 0x540d }, { 3008, 0x0908 },
-  { 3011, 0x000e }, { 3014, 0xcc0a }, { 3020, 0x0500 }, { 3022, 0x0c00 },
-  /* 0x6b00 */
-  { 3024, 0x0430 }, { 3027, 0xa044 }, { 3031, 0x008b }, { 3035, 0x6784 },
-  { 3042, 0x5288 }, { 3047, 0x8a19 }, { 3053, 0x865e }, { 3061, 0x8b18 },
-  { 3067, 0x2e59 }, { 3075, 0x4160 }, { 3079, 0x8c10 }, { 3083, 0x9cbe },
-  { 3093, 0x6861 }, { 3099, 0x891c }, { 3105, 0x9800 }, { 3108, 0x0008 },
-  /* 0x6c00 */
-  { 3109, 0x8100 }, { 3111, 0x089a }, { 3116, 0x0018 }, { 3118, 0x4190 },
-  { 3122, 0x4007 }, { 3126, 0xe4a1 }, { 3133, 0x0505 }, { 3137, 0x640d },
-  { 3143, 0x310e }, { 3149, 0x0e4d }, { 3156, 0x4806 }, { 3160, 0xff0a },
-  { 3170, 0x1632 }, { 3176, 0x2aa8 }, { 3182, 0x852e }, { 3189, 0x000b },
-  /* 0x6d00 */
-  { 3192, 0x1800 }, { 3194, 0xca84 }, { 3200, 0x0e20 }, { 3204, 0x696c },
-  { 3212, 0x0032 }, { 3215, 0x1600 }, { 3218, 0x5658 }, { 3225, 0x0390 },
-  { 3229, 0x5120 }, { 3233, 0x1a28 }, { 3238, 0x8000 }, { 3239, 0x1124 },
-  { 3243, 0x18e1 }, { 3249, 0x4326 }, { 3255, 0x5d52 }, { 3263, 0x0eaa },
-  /* 0x6e00 */
-  { 3270, 0x0fa0 }, { 3276, 0xae28 }, { 3283, 0xfa7b }, { 3295, 0x4500 },
-  { 3298, 0x6408 }, { 3302, 0x8940 }, { 3306, 0xc880 }, { 3310, 0xc044 },
-  { 3314, 0x9005 }, { 3318, 0xb141 }, { 3324, 0x8424 }, { 3328, 0x24c4 },
-  { 3333, 0x1a34 }, { 3339, 0x603a }, { 3345, 0x9000 }, { 3347, 0xc194 },
-  /* 0x6f00 */
-  { 3353, 0x8246 }, { 3358, 0x003a }, { 3362, 0x180d }, { 3367, 0xc106 },
-  { 3372, 0x0022 }, { 3374, 0x9910 }, { 3379, 0xe050 }, { 3384, 0x1511 },
-  { 3389, 0x4057 }, { 3395, 0x0082 }, { 3397, 0x041a }, { 3401, 0x020a },
-  { 3404, 0x004f }, { 3409, 0x8930 }, { 3414, 0xd813 }, { 3421, 0x444a },
-  /* 0x7000 */
-  { 3426, 0x8a02 }, { 3430, 0xed22 }, { 3438, 0x10c0 }, { 3441, 0x4005 },
-  { 3444, 0x1000 }, { 3445, 0x0102 }, { 3447, 0x8808 }, { 3450, 0x3101 },
-  { 3454, 0x4600 }, { 3457, 0x0204 }, { 3459, 0xf000 }, { 3463, 0x0708 },
-  { 3467, 0x8900 }, { 3470, 0xa200 }, { 3473, 0x0000 }, { 3473, 0x2202 },
-  /* 0x7100 */
-  { 3476, 0x0200 }, { 3477, 0x1610 }, { 3481, 0x0042 }, { 3483, 0x1040 },
-  { 3485, 0x5200 }, { 3488, 0x0260 }, { 3491, 0x52f4 }, { 3499, 0x2000 },
-  { 3500, 0x8510 }, { 3504, 0x8230 }, { 3508, 0x1100 }, { 3510, 0x4202 },
-  { 3513, 0x4308 }, { 3517, 0x80b5 }, { 3523, 0x70e1 }, { 3530, 0x9a20 },
-  /* 0x7200 */
-  { 3535, 0x2040 }, { 3537, 0x0801 }, { 3539, 0x3500 }, { 3543, 0xfc65 },
-  { 3553, 0x19c1 }, { 3559, 0xab04 }, { 3565, 0x0286 }, { 3569, 0x6214 },
-  { 3574, 0x0087 }, { 3578, 0x0044 }, { 3580, 0x9085 }, { 3585, 0x0244 },
-  { 3588, 0x405c }, { 3593, 0x0a85 }, { 3598, 0x3207 }, { 3604, 0x3380 },
-  /* 0x7300 */
-  { 3609, 0x0400 }, { 3610, 0xb8c0 }, { 3616, 0xce20 }, { 3622, 0xc0d0 },
-  { 3627, 0xc030 }, { 3631, 0x0080 }, { 3632, 0x0508 }, { 3635, 0x0d25 },
-  { 3641, 0x0a90 }, { 3645, 0x0040 }, { 3646, 0x0200 }, { 3647, 0x080c },
-  { 3650, 0x6505 }, { 3656, 0x4000 }, { 3657, 0x6421 }, { 3662, 0x4102 },
-  /* 0x7400 */
-  { 3665, 0x0268 }, { 3669, 0x0000 }, { 3669, 0x0024 }, { 3671, 0x847c },
-  { 3678, 0x0002 }, { 3679, 0xde20 }, { 3686, 0x8619 }, { 3692, 0x4049 },
-  { 3696, 0x0808 }, { 3698, 0x4000 }, { 3699, 0x0084 }, { 3701, 0x2001 },
-  { 3703, 0x8400 }, { 3705, 0x1010 }, { 3707, 0x42cd }, { 3714, 0x01c7 },
-  /* 0x7500 */
-  { 3720, 0x7038 }, { 3726, 0xd52a }, { 3734, 0x1968 }, { 3740, 0x1d8f },
-  { 3749, 0xbe50 }, { 3757, 0x3e12 }, { 3764, 0x2ef5 }, { 3774, 0x81d9 },
-  { 3781, 0xcec4 }, { 3789, 0x2412 }, { 3793, 0x0828 }, { 3796, 0x732e },
-  { 3805, 0x24ac }, { 3811, 0x4b34 }, { 3818, 0x020c }, { 3821, 0xd41d },
-  /* 0x7600 */
-  { 3829, 0x2a02 }, { 3833, 0x8000 }, { 3834, 0x0097 }, { 3839, 0x0811 },
-  { 3842, 0x11c4 }, { 3847, 0x1144 }, { 3851, 0x1786 }, { 3858, 0x7d45 },
-  { 3867, 0x49d9 }, { 3875, 0x0649 }, { 3880, 0x4000 }, { 3881, 0x8791 },
-  { 3888, 0x254c }, { 3894, 0xd8c4 }, { 3901, 0x44ba }, { 3908, 0x4914 },
-  /* 0x7700 */
-  { 3913, 0x1b92 }, { 3920, 0xc800 }, { 3923, 0x0271 }, { 3928, 0x1580 },
-  { 3932, 0x0081 }, { 3934, 0x0c00 }, { 3936, 0x096a }, { 3942, 0xc200 },
-  { 3945, 0x4800 }, { 3947, 0x4002 }, { 3949, 0x3021 }, { 3953, 0xba49 },
-  { 3961, 0x2080 }, { 3963, 0x1c80 }, { 3967, 0xe2ac }, { 3975, 0x1008 },
-  /* 0x7800 */
-  { 3977, 0x1004 }, { 3979, 0x0034 }, { 3982, 0x00e1 }, { 3986, 0x8414 },
-  { 3990, 0x0020 }, { 3991, 0x2000 }, { 3992, 0x9800 }, { 3995, 0x1014 },
-  { 3998, 0x70c2 }, { 4004, 0x04aa }, { 4009, 0x8688 }, { 4014, 0x5420 },
-  { 4018, 0x0c62 }, { 4023, 0x0413 }, { 4027, 0x9180 }, { 4031, 0x2010 },
-  /* 0x7900 */
-  { 4033, 0x4082 }, { 4036, 0x0206 }, { 4039, 0x1c40 }, { 4043, 0x5400 },
-  { 4046, 0x0383 }, { 4051, 0xe4e9 }, { 4060, 0x2125 }, { 4065, 0x8480 },
-  { 4068, 0xe433 }, { 4076, 0x2000 }, { 4077, 0x44c0 }, { 4081, 0xe609 },
-  { 4088, 0x0a03 }, { 4092, 0x8126 }, { 4097, 0x12da }, { 4104, 0x0801 },
-  /* 0x7a00 */
-  { 4106, 0x6901 }, { 4111, 0x9790 }, { 4118, 0x4001 }, { 4120, 0xf886 },
-  { 4128, 0xe24d }, { 4136, 0x0081 }, { 4138, 0x0a0e }, { 4143, 0xa651 },
-  { 4150, 0x011a }, { 4154, 0x81ec }, { 4161, 0xc600 }, { 4165, 0x8441 },
-  { 4169, 0xadb8 }, { 4178, 0xb62c }, { 4186, 0xa46f }, { 4195, 0x8741 },
-  /* 0x7b00 */
-  { 4201, 0x8d54 }, { 4208, 0x4b02 }, { 4213, 0x1161 }, { 4218, 0x0268 },
-  { 4222, 0xbb60 }, { 4230, 0x2057 }, { 4236, 0x50a0 }, { 4240, 0x0433 },
-  { 4245, 0xa8c0 }, { 4250, 0xb7b4 }, { 4260, 0x2402 }, { 4263, 0x0112 },
-  { 4266, 0x9ad3 }, { 4275, 0x2000 }, { 4276, 0x2271 }, { 4282, 0x00c8 },
-  /* 0x7c00 */
-  { 4285, 0x2081 }, { 4288, 0x809e }, { 4294, 0x0c8a }, { 4299, 0xe180 },
-  { 4304, 0xb009 }, { 4309, 0x8151 }, { 4314, 0x1031 }, { 4318, 0x4028 },
-  { 4321, 0x2a0e }, { 4327, 0x89a5 }, { 4334, 0x69b6 }, { 4343, 0x620e },
-  { 4349, 0x4425 }, { 4354, 0xd144 }, { 4360, 0x8085 }, { 4364, 0x4d54 },
-  /* 0x7d00 */
-  { 4371, 0x2c75 }, { 4379, 0x1fb1 }, { 4388, 0xd807 }, { 4395, 0x862d },
-  { 4402, 0xd87c }, { 4411, 0x4841 }, { 4415, 0x414e }, { 4421, 0x226e },
-  { 4428, 0x8200 }, { 4430, 0x9e08 }, { 4436, 0xf80c }, { 4443, 0xed37 },
-  { 4454, 0x8c80 }, { 4458, 0x7526 }, { 4466, 0x9313 }, { 4473, 0x0814 },
-  /* 0x7e00 */
-  { 4476, 0x0e32 }, { 4482, 0xc804 }, { 4486, 0x484e }, { 4492, 0x6ea6 },
-  { 4501, 0x2c4a }, { 4507, 0x6670 }, { 4514, 0x26c0 }, { 4519, 0xba01 },
-  { 4525, 0xd30c }, { 4532, 0x185d }, { 4539, 0x0000 }, { 4539, 0x0000 },
-  { 4539, 0x0000 }, { 4539, 0x0000 }, { 4539, 0x0000 }, { 4539, 0x0000 },
-  /* 0x7f00 */
-  { 4539, 0x0000 }, { 4539, 0x0000 }, { 4539, 0x0000 }, { 4539, 0x0540 },
-  { 4542, 0x7020 }, { 4546, 0x8133 }, { 4552, 0x4f81 }, { 4559, 0x03a5 },
-  { 4565, 0x55ec }, { 4574, 0x6410 }, { 4578, 0xc318 }, { 4584, 0x2344 },
-  { 4589, 0x1462 }, { 4594, 0x0034 }, { 4597, 0x0a43 }, { 4602, 0x1a09 },
-  /* 0x8000 */
-  { 4607, 0x187b }, { 4615, 0x13a5 }, { 4622, 0x0102 }, { 4624, 0xa848 },
-  { 4629, 0x0440 }, { 4631, 0xc544 }, { 4637, 0x8106 }, { 4641, 0xe2dd },
-  { 4651, 0x1af0 }, { 4658, 0x2d48 }, { 4664, 0xb626 }, { 4672, 0x0416 },
-  { 4676, 0x5058 }, { 4681, 0x6e40 }, { 4687, 0x8032 }, { 4691, 0x3112 },
-  /* 0x8100 */
-  { 4696, 0x07e4 }, { 4703, 0x0c00 }, { 4705, 0x8208 }, { 4708, 0x420a },
-  { 4712, 0x4840 }, { 4715, 0x803b }, { 4721, 0x4860 }, { 4725, 0x8713 },
-  { 4732, 0x850d }, { 4738, 0x3428 }, { 4743, 0x0319 }, { 4748, 0xe529 },
-  { 4756, 0x2345 }, { 4762, 0x870a }, { 4768, 0x25a9 }, { 4775, 0x5c18 },
-  /* 0x8200 */
-  { 4781, 0x77a6 }, { 4791, 0xd9c5 }, { 4800, 0x5e00 }, { 4805, 0x03e8 },
-  { 4811, 0x0081 }, { 4813, 0xa700 }, { 4818, 0xcd54 }, { 4826, 0x41c6 },
-  { 4832, 0x2800 }, { 4834, 0xa204 }, { 4838, 0xb860 }, { 4844, 0x2b0a },
-  { 4850, 0x0020 }, { 4851, 0xda9e }, { 4861, 0x08ea }, { 4867, 0x0e1a },
-  /* 0x8300 */
-  { 4873, 0x427c }, { 4880, 0x11c0 }, { 4884, 0x8908 }, { 4888, 0x0376 },
-  { 4895, 0x8621 }, { 4900, 0x0105 }, { 4903, 0x0000 }, { 4903, 0x18a8 },
-  { 4908, 0x46a0 }, { 4913, 0xc448 }, { 4918, 0x0d05 }, { 4923, 0x2022 },
-  { 4926, 0x5422 }, { 4931, 0x9148 }, { 4936, 0x8a01 }, { 4940, 0x2897 },
-  /* 0x8400 */
-  { 4947, 0x7898 }, { 4954, 0x0008 }, { 4955, 0x1605 }, { 4960, 0x3122 },
-  { 4965, 0x4240 }, { 4968, 0x0880 }, { 4970, 0xfa4e }, { 4980, 0x06a2 },
-  { 4985, 0x0814 }, { 4988, 0x9211 }, { 4993, 0x2002 }, { 4995, 0x9b04 },
-  { 5001, 0x2e52 }, { 5008, 0x0643 }, { 5013, 0x5000 }, { 5015, 0x9010 },
-  /* 0x8500 */
-  { 5018, 0x0041 }, { 5020, 0x85ba }, { 5028, 0x3042 }, { 5032, 0x2020 },
-  { 5034, 0x4f0b }, { 5042, 0x05a0 }, { 5046, 0x2708 }, { 5051, 0x4080 },
-  { 5053, 0x0591 }, { 5058, 0x1a93 }, { 5065, 0xdf50 }, { 5074, 0x0600 },
-  { 5076, 0xa202 }, { 5080, 0x3021 }, { 5084, 0x0630 }, { 5088, 0x4e80 },
-  /* 0x8600 */
-  { 5093, 0x0cc4 }, { 5098, 0x04c8 }, { 5102, 0xa004 }, { 5105, 0x8001 },
-  { 5107, 0x6000 }, { 5109, 0xd431 }, { 5116, 0x0880 }, { 5118, 0x0a02 },
-  { 5121, 0x1c00 }, { 5124, 0x0028 }, { 5126, 0x8e18 }, { 5132, 0x0041 },
-  { 5134, 0x6ad0 }, { 5141, 0xca10 }, { 5146, 0xf210 }, { 5152, 0x4b00 },
-  /* 0x8700 */
-  { 5156, 0x274d }, { 5164, 0x1506 }, { 5169, 0x0220 }, { 5171, 0x8890 },
-  { 5175, 0x5a00 }, { 5179, 0x82a8 }, { 5184, 0x4549 }, { 5190, 0x8150 },
-  { 5194, 0x2004 }, { 5196, 0x8000 }, { 5197, 0x8804 }, { 5200, 0x2c08 },
-  { 5204, 0x08d1 }, { 5209, 0x0005 }, { 5211, 0x8001 }, { 5213, 0x4ac4 },
-  /* 0x8800 */
-  { 5219, 0xe020 }, { 5223, 0x0062 }, { 5226, 0x008e }, { 5230, 0x0a42 },
-  { 5234, 0x3055 }, { 5240, 0x6a8c }, { 5247, 0x090e }, { 5252, 0xe0a5 },
-  { 5259, 0x2906 }, { 5264, 0x42c4 }, { 5269, 0x4814 }, { 5273, 0x80b3 },
-  { 5279, 0x803e }, { 5285, 0xb330 }, { 5292, 0x0102 }, { 5294, 0x731c },
-  /* 0x8900 */
-  { 5302, 0x1494 }, { 5307, 0x600d }, { 5312, 0x0c20 }, { 5315, 0x0940 },
-  { 5318, 0x301a }, { 5323, 0xc040 }, { 5326, 0xa451 }, { 5332, 0xc094 },
-  { 5337, 0x8dca }, { 5345, 0x05c8 }, { 5350, 0x96c2 }, { 5357, 0xa40c },
-  { 5362, 0x0001 }, { 5363, 0x3404 }, { 5367, 0x00c8 }, { 5370, 0x0110 },
-  /* 0x8a00 */
-  { 5372, 0x550d }, { 5379, 0xa9c9 }, { 5387, 0x2428 }, { 5391, 0x1c5a },
-  { 5398, 0x0142 }, { 5401, 0x4837 }, { 5408, 0x7a4d }, { 5417, 0x100f },
-  { 5422, 0x32b4 }, { 5429, 0x452a }, { 5435, 0x317b }, { 5444, 0x9205 },
-  { 5449, 0xb894 }, { 5456, 0x5c44 }, { 5462, 0x68d7 }, { 5471, 0x458a },
-  /* 0x8b00 */
-  { 5477, 0x5097 }, { 5484, 0x2ed1 }, { 5492, 0x1943 }, { 5498, 0x4208 },
-  { 5501, 0xd202 }, { 5506, 0x9d40 }, { 5512, 0x9840 }, { 5516, 0x2097 },
-  { 5522, 0x5409 }, { 5527, 0x064d }, { 5533, 0x0000 }, { 5533, 0x0000 },
-  { 5533, 0x0000 }, { 5533, 0x0000 }, { 5533, 0x0000 }, { 5533, 0x0000 },
-  /* 0x8c00 */
-  { 5533, 0x0000 }, { 5533, 0x0000 }, { 5533, 0x0000 }, { 5533, 0x8480 },
-  { 5536, 0x5542 }, { 5542, 0x0421 }, { 5545, 0x1c06 }, { 5550, 0x1700 },
-  { 5554, 0x7624 }, { 5561, 0x6110 }, { 5565, 0xff87 }, { 5577, 0xb9dd },
-  { 5588, 0x659f }, { 5598, 0x5c0a }, { 5604, 0x245d }, { 5611, 0x3c00 },
-  /* 0x8d00 */
-  { 5615, 0xadb0 }, { 5623, 0x0059 }, { 5627, 0x0000 }, { 5627, 0x0000 },
-  { 5627, 0x0000 }, { 5627, 0x0000 }, { 5627, 0x28d0 }, { 5632, 0x009b },
-  { 5637, 0x0422 }, { 5640, 0x0200 }, { 5641, 0x0108 }, { 5643, 0x4408 },
-  { 5646, 0x9804 }, { 5650, 0xac40 }, { 5655, 0x8d0a }, { 5661, 0x9028 },
-  /* 0x8e00 */
-  { 5665, 0x8700 }, { 5669, 0xe001 }, { 5673, 0x0400 }, { 5674, 0x0031 },
-  { 5677, 0x1794 }, { 5684, 0x8221 }, { 5688, 0x0019 }, { 5691, 0x1054 },
-  { 5695, 0x2cb2 }, { 5702, 0x021a }, { 5706, 0x9c02 }, { 5711, 0x4003 },
-  { 5714, 0x3d60 }, { 5721, 0x8804 }, { 5724, 0x080c }, { 5727, 0x7900 },
-  /* 0x8f00 */
-  { 5732, 0x1628 }, { 5737, 0xba3c }, { 5746, 0x8640 }, { 5750, 0xcb08 },
-  { 5756, 0x7274 }, { 5764, 0x9080 }, { 5767, 0x001e }, { 5771, 0x0000 },
-  { 5771, 0x0000 }, { 5771, 0xd800 }, { 5775, 0xe188 }, { 5781, 0x9c87 },
-  { 5789, 0x4034 }, { 5793, 0x0412 }, { 5796, 0xae64 }, { 5804, 0x2791 },
-  /* 0x9000 */
-  { 5811, 0xe86b }, { 5820, 0xe6fb }, { 5832, 0x408f }, { 5838, 0x5366 },
-  { 5846, 0xeea6 }, { 5856, 0x537f }, { 5867, 0xe32b }, { 5876, 0xb5e4 },
-  { 5885, 0x869f }, { 5894, 0x0002 }, { 5895, 0x8548 }, { 5900, 0x0122 },
-  { 5903, 0x4402 }, { 5906, 0x0800 }, { 5907, 0x2116 }, { 5912, 0x20a0 },
-  /* 0x9100 */
-  { 5915, 0x0004 }, { 5916, 0x0204 }, { 5918, 0x2000 }, { 5919, 0x0005 },
-  { 5921, 0x7e00 }, { 5927, 0x0154 }, { 5931, 0x162c }, { 5937, 0x01ac },
-  { 5942, 0x2a84 }, { 5947, 0x1085 }, { 5951, 0x8c14 }, { 5956, 0x0530 },
-  { 5960, 0xfbc3 }, { 5971, 0xb943 }, { 5979, 0x00ca }, { 5983, 0x9060 },
-  /* 0x9200 */
-  { 5987, 0x6000 }, { 5989, 0x4032 }, { 5993, 0x1200 }, { 5995, 0x8090 },
-  { 5998, 0x0b30 }, { 6003, 0x4c81 }, { 6008, 0x0054 }, { 6011, 0x4002 },
-  { 6013, 0x0029 }, { 6016, 0x1d6a }, { 6024, 0x2000 }, { 6025, 0x0280 },
-  { 6027, 0x8000 }, { 6028, 0x0004 }, { 6029, 0x2610 }, { 6033, 0x150c },
-  /* 0x9300 */
-  { 6038, 0x8040 }, { 6040, 0x0701 }, { 6044, 0xd94d }, { 6053, 0x0c24 },
-  { 6057, 0x2810 }, { 6060, 0x1850 }, { 6064, 0x5001 }, { 6067, 0x5020 },
-  { 6070, 0x1000 }, { 6071, 0x04d0 }, { 6075, 0x7080 }, { 6079, 0x0201 },
-  { 6081, 0x0108 }, { 6083, 0x21c3 }, { 6089, 0x0132 }, { 6093, 0x0000 },
-  /* 0x9400 */
-  { 6093, 0x0088 }, { 6095, 0x0719 }, { 6101, 0x0802 }, { 6103, 0x0560 },
-  { 6107, 0x0012 }, { 6109, 0x4c0e }, { 6115, 0x0405 }, { 6118, 0xf0a1 },
-  { 6125, 0x0002 }, { 6126, 0x0000 }, { 6126, 0x0000 }, { 6126, 0x0000 },
-  { 6126, 0x0000 }, { 6126, 0x0000 }, { 6126, 0x0000 }, { 6126, 0x0000 },
-  /* 0x9500 */
-  { 6126, 0x0000 }, { 6126, 0x0000 }, { 6126, 0x0000 }, { 6126, 0x0000 },
-  { 6126, 0x0000 }, { 6126, 0x0000 }, { 6126, 0x0000 }, { 6126, 0x0080 },
-  { 6127, 0x8e8d }, { 6135, 0x035a }, { 6141, 0x21bd }, { 6149, 0x5a04 },
-  { 6154, 0x3488 }, { 6159, 0x1170 }, { 6164, 0x0026 }, { 6167, 0x0000 },
-  /* 0x9600 */
-  { 6167, 0x0000 }, { 6167, 0x1000 }, { 6168, 0xc502 }, { 6173, 0x8804 },
-  { 6176, 0xb815 }, { 6183, 0xf801 }, { 6189, 0x147c }, { 6196, 0x25ed },
-  { 6205, 0xed60 }, { 6213, 0x1bb0 }, { 6220, 0x0589 }, { 6225, 0x1bd7 },
-  { 6235, 0x7af3 }, { 6246, 0x1a62 }, { 6252, 0x0d0c }, { 6257, 0x0ac5 },
-  /* 0x9700 */
-  { 6263, 0xe5d1 }, { 6272, 0x524a }, { 6278, 0x0490 }, { 6281, 0x6305 },
-  { 6287, 0x0354 }, { 6292, 0x5244 }, { 6297, 0x2b57 }, { 6306, 0x1612 },
-  { 6311, 0xa872 }, { 6318, 0x1101 }, { 6321, 0x2949 }, { 6327, 0x0018 },
-  { 6329, 0x0948 }, { 6333, 0x1008 }, { 6335, 0x6000 }, { 6337, 0x886c },
-  /* 0x9800 */
-  { 6343, 0x916e }, { 6351, 0x058f }, { 6358, 0x3012 }, { 6362, 0x3990 },
-  { 6368, 0xf840 }, { 6374, 0x4930 }, { 6379, 0x8880 }, { 6382, 0x001b },
-  { 6386, 0x0000 }, { 6386, 0x0000 }, { 6386, 0x8500 }, { 6389, 0x0042 },
-  { 6391, 0x0058 }, { 6394, 0x9800 }, { 6397, 0xea04 }, { 6403, 0x7014 },
-  /* 0x9900 */
-  { 6408, 0x1628 }, { 6413, 0x611d }, { 6420, 0x5113 }, { 6426, 0x6000 },
-  { 6428, 0x1a24 }, { 6433, 0x00a7 }, { 6438, 0x0000 }, { 6438, 0x0000 },
-  { 6438, 0x0000 }, { 6438, 0x03c0 }, { 6442, 0x7120 }, { 6447, 0x1018 },
-  { 6450, 0x0172 }, { 6455, 0xa927 }, { 6463, 0x6004 }, { 6466, 0x8906 },
-  /* 0x9a00 */
-  { 6471, 0xc022 }, { 6475, 0x020c }, { 6478, 0x0900 }, { 6480, 0x4081 },
-  { 6483, 0x202d }, { 6488, 0x8ca0 }, { 6493, 0x0e34 }, { 6499, 0x0000 },
-  { 6499, 0x0000 }, { 6499, 0x0000 }, { 6499, 0x2100 }, { 6501, 0x1101 },
-  { 6504, 0x8011 }, { 6507, 0xc11a }, { 6513, 0xec4c }, { 6521, 0x0892 },
-  /* 0x9b00 */
-  { 6525, 0x0040 }, { 6526, 0x8500 }, { 6529, 0xc7ac }, { 6538, 0x1806 },
-  { 6542, 0xe03e }, { 6550, 0x0512 }, { 6554, 0x8000 }, { 6555, 0x0010 },
-  { 6556, 0x4008 }, { 6558, 0x80ce }, { 6564, 0x6d01 }, { 6570, 0x0210 },
-  { 6572, 0x8641 }, { 6577, 0x0856 }, { 6582, 0x011e }, { 6587, 0x0027 },
-  /* 0x9c00 */
-  { 6591, 0x3750 }, { 6598, 0x083d }, { 6604, 0xe032 }, { 6610, 0x4e05 },
-  { 6616, 0x01c0 }, { 6619, 0x0484 }, { 6622, 0x0081 }, { 6624, 0x0140 },
-  { 6626, 0x0000 }, { 6626, 0x0000 }, { 6626, 0x0000 }, { 6626, 0x0000 },
-  { 6626, 0x0000 }, { 6626, 0x0000 }, { 6626, 0x1aa0 }, { 6631, 0x0059 },
-  /* 0x9d00 */
-  { 6635, 0x43c8 }, { 6641, 0x8824 }, { 6645, 0x1d48 }, { 6651, 0xc800 },
-  { 6654, 0x0152 }, { 6658, 0x7203 }, { 6664, 0x9013 }, { 6669, 0x0404 },
-  { 6671, 0x8280 }, { 6674, 0x0400 }, { 6675, 0x8a10 }, { 6679, 0x0d14 },
-  { 6684, 0x8056 }, { 6689, 0x0208 }, { 6691, 0xa040 }, { 6694, 0x2704 },
-  /* 0x9e00 */
-  { 6699, 0x0000 }, { 6699, 0x4c00 }, { 6702, 0x0000 }, { 6702, 0x0000 },
-  { 6702, 0x0000 }, { 6702, 0x0000 }, { 6702, 0x0000 }, { 6702, 0xa320 },
-  { 6707, 0x1902 }, { 6711, 0xa0ae }, { 6718, 0x2660 }, { 6723, 0xdf00 },
-  { 6730, 0xf010 }, { 6735, 0x7b15 }, { 6744, 0x8121 }, { 6748, 0x3ad0 },
-  /* 0x9f00 */
-  { 6755, 0x4180 }, { 6758, 0x0028 }, { 6760, 0x1003 }, { 6763, 0x4800 },
-  { 6765, 0xcc00 }, { 6769, 0x8014 }, { 6772, 0x14cf }, { 6780, 0x00c4 },
-  { 6783, 0x2000 }, { 6784, 0x3020 }, { 6787, 0x0001 },
-};
-static const Summary16 jisx0208_uni2indx_pageff[15] = {
-  /* 0xff00 */
-  { 6788, 0xdf7a }, { 6800, 0xffff }, { 6816, 0xffff }, { 6832, 0xefff },
-  { 6847, 0xffff }, { 6863, 0x3fff }, { 6877, 0x0000 }, { 6877, 0x0000 },
-  { 6877, 0x0000 }, { 6877, 0x0000 }, { 6877, 0x0000 }, { 6877, 0x0000 },
-  { 6877, 0x0000 }, { 6877, 0x0000 }, { 6877, 0x0028 },
-};
-
-static int
-jisx0208_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  if (n >= 2) {
-    const Summary16 *summary = NULL;
-    if (wc >= 0x0000 && wc < 0x0100)
-      summary = &jisx0208_uni2indx_page00[(wc>>4)];
-    else if (wc >= 0x0300 && wc < 0x0460)
-      summary = &jisx0208_uni2indx_page03[(wc>>4)-0x030];
-    else if (wc >= 0x2000 && wc < 0x2320)
-      summary = &jisx0208_uni2indx_page20[(wc>>4)-0x200];
-    else if (wc >= 0x2500 && wc < 0x2670)
-      summary = &jisx0208_uni2indx_page25[(wc>>4)-0x250];
-    else if (wc >= 0x3000 && wc < 0x3100)
-      summary = &jisx0208_uni2indx_page30[(wc>>4)-0x300];
-    else if (wc >= 0x4e00 && wc < 0x9fb0)
-      summary = &jisx0208_uni2indx_page4e[(wc>>4)-0x4e0];
-    else if (wc >= 0xff00 && wc < 0xfff0)
-      summary = &jisx0208_uni2indx_pageff[(wc>>4)-0xff0];
-    if (summary) {
-      unsigned short used = summary->used;
-      unsigned int i = wc & 0x0f;
-      if (used & ((unsigned short) 1 << i)) {
-        unsigned short c;
-        /* Keep in `used' only the bits 0..i-1. */
-        used &= ((unsigned short) 1 << i) - 1;
-        /* Add `summary->indx' and the number of bits set in `used'. */
-        used = (used & 0x5555) + ((used & 0xaaaa) >> 1);
-        used = (used & 0x3333) + ((used & 0xcccc) >> 2);
-        used = (used & 0x0f0f) + ((used & 0xf0f0) >> 4);
-        used = (used & 0x00ff) + (used >> 8);
-        c = jisx0208_2charset[summary->indx + used];
-        r[0] = (c >> 8); r[1] = (c & 0xff);
-        return 2;
-      }
-    }
-    return RET_ILSEQ;
-  }
-  return RET_TOOSMALL;
-}
diff --git a/xc/lib/X11/lcUniConv/jisx0212.h b/xc/lib/X11/lcUniConv/jisx0212.h
deleted file mode 100644
index 6ba69459e..000000000
--- a/xc/lib/X11/lcUniConv/jisx0212.h
+++ /dev/null
@@ -1,2163 +0,0 @@
-
-/*
- * JISX0212.1990-0
- */
-
-static const unsigned short jisx0212_2uni_page22[81] = {
-  /* 0x22 */
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0x02d8, 0x02c7,
-  0x00b8, 0x02d9, 0x02dd, 0x00af, 0x02db, 0x02da, 0x007e, 0x0384,
-  0x0385, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0x00a1, 0x00a6, 0x00bf, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0x00ba, 0x00aa, 0x00a9, 0x00ae, 0x2122, 0x00a4,
-  0x2116,
-};
-static const unsigned short jisx0212_2uni_page26[188] = {
-  /* 0x26 */
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0x0386, 0x0388, 0x0389, 0x038a, 0x03aa, 0xfffd, 0x038c, 0xfffd,
-  0x038e, 0x03ab, 0xfffd, 0x038f, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0x03ac, 0x03ad, 0x03ae, 0x03af, 0x03ca, 0x0390, 0x03cc, 0x03c2,
-  0x03cd, 0x03cb, 0x03b0, 0x03ce, 0xfffd, 0xfffd,
-  /* 0x27 */
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406, 0x0407, 0x0408,
-  0x0409, 0x040a, 0x040b, 0x040c, 0x040e, 0x040f, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457, 0x0458,
-  0x0459, 0x045a, 0x045b, 0x045c, 0x045e, 0x045f,
-};
-static const unsigned short jisx0212_2uni_page29[275] = {
-  /* 0x29 */
-  0x00c6, 0x0110, 0xfffd, 0x0126, 0xfffd, 0x0132, 0xfffd, 0x0141,
-  0x013f, 0xfffd, 0x014a, 0x00d8, 0x0152, 0xfffd, 0x0166, 0x00de,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0x00e6, 0x0111, 0x00f0, 0x0127, 0x0131, 0x0133, 0x0138, 0x0142,
-  0x0140, 0x0149, 0x014b, 0x00f8, 0x0153, 0x00df, 0x0167, 0x00fe,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  /* 0x2a */
-  0x00c1, 0x00c0, 0x00c4, 0x00c2, 0x0102, 0x01cd, 0x0100, 0x0104,
-  0x00c5, 0x00c3, 0x0106, 0x0108, 0x010c, 0x00c7, 0x010a, 0x010e,
-  0x00c9, 0x00c8, 0x00cb, 0x00ca, 0x011a, 0x0116, 0x0112, 0x0118,
-  0xfffd, 0x011c, 0x011e, 0x0122, 0x0120, 0x0124, 0x00cd, 0x00cc,
-  0x00cf, 0x00ce, 0x01cf, 0x0130, 0x012a, 0x012e, 0x0128, 0x0134,
-  0x0136, 0x0139, 0x013d, 0x013b, 0x0143, 0x0147, 0x0145, 0x00d1,
-  0x00d3, 0x00d2, 0x00d6, 0x00d4, 0x01d1, 0x0150, 0x014c, 0x00d5,
-  0x0154, 0x0158, 0x0156, 0x015a, 0x015c, 0x0160, 0x015e, 0x0164,
-  0x0162, 0x00da, 0x00d9, 0x00dc, 0x00db, 0x016c, 0x01d3, 0x0170,
-  0x016a, 0x0172, 0x016e, 0x0168, 0x01d7, 0x01db, 0x01d9, 0x01d5,
-  0x0174, 0x00dd, 0x0178, 0x0176, 0x0179, 0x017d, 0x017b, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  /* 0x2b */
-  0x00e1, 0x00e0, 0x00e4, 0x00e2, 0x0103, 0x01ce, 0x0101, 0x0105,
-  0x00e5, 0x00e3, 0x0107, 0x0109, 0x010d, 0x00e7, 0x010b, 0x010f,
-  0x00e9, 0x00e8, 0x00eb, 0x00ea, 0x011b, 0x0117, 0x0113, 0x0119,
-  0x01f5, 0x011d, 0x011f, 0xfffd, 0x0121, 0x0125, 0x00ed, 0x00ec,
-  0x00ef, 0x00ee, 0x01d0, 0xfffd, 0x012b, 0x012f, 0x0129, 0x0135,
-  0x0137, 0x013a, 0x013e, 0x013c, 0x0144, 0x0148, 0x0146, 0x00f1,
-  0x00f3, 0x00f2, 0x00f6, 0x00f4, 0x01d2, 0x0151, 0x014d, 0x00f5,
-  0x0155, 0x0159, 0x0157, 0x015b, 0x015d, 0x0161, 0x015f, 0x0165,
-  0x0163, 0x00fa, 0x00f9, 0x00fc, 0x00fb, 0x016d, 0x01d4, 0x0171,
-  0x016b, 0x0173, 0x016f, 0x0169, 0x01d8, 0x01dc, 0x01da, 0x01d6,
-  0x0175, 0x00fd, 0x00ff, 0x0177, 0x017a, 0x017e, 0x017c,
-};
-static const unsigned short jisx0212_2uni_page30[5801] = {
-  /* 0x30 */
-  0x4e02, 0x4e04, 0x4e05, 0x4e0c, 0x4e12, 0x4e1f, 0x4e23, 0x4e24,
-  0x4e28, 0x4e2b, 0x4e2e, 0x4e2f, 0x4e30, 0x4e35, 0x4e40, 0x4e41,
-  0x4e44, 0x4e47, 0x4e51, 0x4e5a, 0x4e5c, 0x4e63, 0x4e68, 0x4e69,
-  0x4e74, 0x4e75, 0x4e79, 0x4e7f, 0x4e8d, 0x4e96, 0x4e97, 0x4e9d,
-  0x4eaf, 0x4eb9, 0x4ec3, 0x4ed0, 0x4eda, 0x4edb, 0x4ee0, 0x4ee1,
-  0x4ee2, 0x4ee8, 0x4eef, 0x4ef1, 0x4ef3, 0x4ef5, 0x4efd, 0x4efe,
-  0x4eff, 0x4f00, 0x4f02, 0x4f03, 0x4f08, 0x4f0b, 0x4f0c, 0x4f12,
-  0x4f15, 0x4f16, 0x4f17, 0x4f19, 0x4f2e, 0x4f31, 0x4f60, 0x4f33,
-  0x4f35, 0x4f37, 0x4f39, 0x4f3b, 0x4f3e, 0x4f40, 0x4f42, 0x4f48,
-  0x4f49, 0x4f4b, 0x4f4c, 0x4f52, 0x4f54, 0x4f56, 0x4f58, 0x4f5f,
-  0x4f63, 0x4f6a, 0x4f6c, 0x4f6e, 0x4f71, 0x4f77, 0x4f78, 0x4f79,
-  0x4f7a, 0x4f7d, 0x4f7e, 0x4f81, 0x4f82, 0x4f84,
-  /* 0x31 */
-  0x4f85, 0x4f89, 0x4f8a, 0x4f8c, 0x4f8e, 0x4f90, 0x4f92, 0x4f93,
-  0x4f94, 0x4f97, 0x4f99, 0x4f9a, 0x4f9e, 0x4f9f, 0x4fb2, 0x4fb7,
-  0x4fb9, 0x4fbb, 0x4fbc, 0x4fbd, 0x4fbe, 0x4fc0, 0x4fc1, 0x4fc5,
-  0x4fc6, 0x4fc8, 0x4fc9, 0x4fcb, 0x4fcc, 0x4fcd, 0x4fcf, 0x4fd2,
-  0x4fdc, 0x4fe0, 0x4fe2, 0x4ff0, 0x4ff2, 0x4ffc, 0x4ffd, 0x4fff,
-  0x5000, 0x5001, 0x5004, 0x5007, 0x500a, 0x500c, 0x500e, 0x5010,
-  0x5013, 0x5017, 0x5018, 0x501b, 0x501c, 0x501d, 0x501e, 0x5022,
-  0x5027, 0x502e, 0x5030, 0x5032, 0x5033, 0x5035, 0x5040, 0x5041,
-  0x5042, 0x5045, 0x5046, 0x504a, 0x504c, 0x504e, 0x5051, 0x5052,
-  0x5053, 0x5057, 0x5059, 0x505f, 0x5060, 0x5062, 0x5063, 0x5066,
-  0x5067, 0x506a, 0x506d, 0x5070, 0x5071, 0x503b, 0x5081, 0x5083,
-  0x5084, 0x5086, 0x508a, 0x508e, 0x508f, 0x5090,
-  /* 0x32 */
-  0x5092, 0x5093, 0x5094, 0x5096, 0x509b, 0x509c, 0x509e, 0x509f,
-  0x50a0, 0x50a1, 0x50a2, 0x50aa, 0x50af, 0x50b0, 0x50b9, 0x50ba,
-  0x50bd, 0x50c0, 0x50c3, 0x50c4, 0x50c7, 0x50cc, 0x50ce, 0x50d0,
-  0x50d3, 0x50d4, 0x50d8, 0x50dc, 0x50dd, 0x50df, 0x50e2, 0x50e4,
-  0x50e6, 0x50e8, 0x50e9, 0x50ef, 0x50f1, 0x50f6, 0x50fa, 0x50fe,
-  0x5103, 0x5106, 0x5107, 0x5108, 0x510b, 0x510c, 0x510d, 0x510e,
-  0x50f2, 0x5110, 0x5117, 0x5119, 0x511b, 0x511c, 0x511d, 0x511e,
-  0x5123, 0x5127, 0x5128, 0x512c, 0x512d, 0x512f, 0x5131, 0x5133,
-  0x5134, 0x5135, 0x5138, 0x5139, 0x5142, 0x514a, 0x514f, 0x5153,
-  0x5155, 0x5157, 0x5158, 0x515f, 0x5164, 0x5166, 0x517e, 0x5183,
-  0x5184, 0x518b, 0x518e, 0x5198, 0x519d, 0x51a1, 0x51a3, 0x51ad,
-  0x51b8, 0x51ba, 0x51bc, 0x51be, 0x51bf, 0x51c2,
-  /* 0x33 */
-  0x51c8, 0x51cf, 0x51d1, 0x51d2, 0x51d3, 0x51d5, 0x51d8, 0x51de,
-  0x51e2, 0x51e5, 0x51ee, 0x51f2, 0x51f3, 0x51f4, 0x51f7, 0x5201,
-  0x5202, 0x5205, 0x5212, 0x5213, 0x5215, 0x5216, 0x5218, 0x5222,
-  0x5228, 0x5231, 0x5232, 0x5235, 0x523c, 0x5245, 0x5249, 0x5255,
-  0x5257, 0x5258, 0x525a, 0x525c, 0x525f, 0x5260, 0x5261, 0x5266,
-  0x526e, 0x5277, 0x5278, 0x5279, 0x5280, 0x5282, 0x5285, 0x528a,
-  0x528c, 0x5293, 0x5295, 0x5296, 0x5297, 0x5298, 0x529a, 0x529c,
-  0x52a4, 0x52a5, 0x52a6, 0x52a7, 0x52af, 0x52b0, 0x52b6, 0x52b7,
-  0x52b8, 0x52ba, 0x52bb, 0x52bd, 0x52c0, 0x52c4, 0x52c6, 0x52c8,
-  0x52cc, 0x52cf, 0x52d1, 0x52d4, 0x52d6, 0x52db, 0x52dc, 0x52e1,
-  0x52e5, 0x52e8, 0x52e9, 0x52ea, 0x52ec, 0x52f0, 0x52f1, 0x52f4,
-  0x52f6, 0x52f7, 0x5300, 0x5303, 0x530a, 0x530b,
-  /* 0x34 */
-  0x530c, 0x5311, 0x5313, 0x5318, 0x531b, 0x531c, 0x531e, 0x531f,
-  0x5325, 0x5327, 0x5328, 0x5329, 0x532b, 0x532c, 0x532d, 0x5330,
-  0x5332, 0x5335, 0x533c, 0x533d, 0x533e, 0x5342, 0x534c, 0x534b,
-  0x5359, 0x535b, 0x5361, 0x5363, 0x5365, 0x536c, 0x536d, 0x5372,
-  0x5379, 0x537e, 0x5383, 0x5387, 0x5388, 0x538e, 0x5393, 0x5394,
-  0x5399, 0x539d, 0x53a1, 0x53a4, 0x53aa, 0x53ab, 0x53af, 0x53b2,
-  0x53b4, 0x53b5, 0x53b7, 0x53b8, 0x53ba, 0x53bd, 0x53c0, 0x53c5,
-  0x53cf, 0x53d2, 0x53d3, 0x53d5, 0x53da, 0x53dd, 0x53de, 0x53e0,
-  0x53e6, 0x53e7, 0x53f5, 0x5402, 0x5413, 0x541a, 0x5421, 0x5427,
-  0x5428, 0x542a, 0x542f, 0x5431, 0x5434, 0x5435, 0x5443, 0x5444,
-  0x5447, 0x544d, 0x544f, 0x545e, 0x5462, 0x5464, 0x5466, 0x5467,
-  0x5469, 0x546b, 0x546d, 0x546e, 0x5474, 0x547f,
-  /* 0x35 */
-  0x5481, 0x5483, 0x5485, 0x5488, 0x5489, 0x548d, 0x5491, 0x5495,
-  0x5496, 0x549c, 0x549f, 0x54a1, 0x54a6, 0x54a7, 0x54a9, 0x54aa,
-  0x54ad, 0x54ae, 0x54b1, 0x54b7, 0x54b9, 0x54ba, 0x54bb, 0x54bf,
-  0x54c6, 0x54ca, 0x54cd, 0x54ce, 0x54e0, 0x54ea, 0x54ec, 0x54ef,
-  0x54f6, 0x54fc, 0x54fe, 0x54ff, 0x5500, 0x5501, 0x5505, 0x5508,
-  0x5509, 0x550c, 0x550d, 0x550e, 0x5515, 0x552a, 0x552b, 0x5532,
-  0x5535, 0x5536, 0x553b, 0x553c, 0x553d, 0x5541, 0x5547, 0x5549,
-  0x554a, 0x554d, 0x5550, 0x5551, 0x5558, 0x555a, 0x555b, 0x555e,
-  0x5560, 0x5561, 0x5564, 0x5566, 0x557f, 0x5581, 0x5582, 0x5586,
-  0x5588, 0x558e, 0x558f, 0x5591, 0x5592, 0x5593, 0x5594, 0x5597,
-  0x55a3, 0x55a4, 0x55ad, 0x55b2, 0x55bf, 0x55c1, 0x55c3, 0x55c6,
-  0x55c9, 0x55cb, 0x55cc, 0x55ce, 0x55d1, 0x55d2,
-  /* 0x36 */
-  0x55d3, 0x55d7, 0x55d8, 0x55db, 0x55de, 0x55e2, 0x55e9, 0x55f6,
-  0x55ff, 0x5605, 0x5608, 0x560a, 0x560d, 0x560e, 0x560f, 0x5610,
-  0x5611, 0x5612, 0x5619, 0x562c, 0x5630, 0x5633, 0x5635, 0x5637,
-  0x5639, 0x563b, 0x563c, 0x563d, 0x563f, 0x5640, 0x5641, 0x5643,
-  0x5644, 0x5646, 0x5649, 0x564b, 0x564d, 0x564f, 0x5654, 0x565e,
-  0x5660, 0x5661, 0x5662, 0x5663, 0x5666, 0x5669, 0x566d, 0x566f,
-  0x5671, 0x5672, 0x5675, 0x5684, 0x5685, 0x5688, 0x568b, 0x568c,
-  0x5695, 0x5699, 0x569a, 0x569d, 0x569e, 0x569f, 0x56a6, 0x56a7,
-  0x56a8, 0x56a9, 0x56ab, 0x56ac, 0x56ad, 0x56b1, 0x56b3, 0x56b7,
-  0x56be, 0x56c5, 0x56c9, 0x56ca, 0x56cb, 0x56cf, 0x56d0, 0x56cc,
-  0x56cd, 0x56d9, 0x56dc, 0x56dd, 0x56df, 0x56e1, 0x56e4, 0x56e5,
-  0x56e6, 0x56e7, 0x56e8, 0x56f1, 0x56eb, 0x56ed,
-  /* 0x37 */
-  0x56f6, 0x56f7, 0x5701, 0x5702, 0x5707, 0x570a, 0x570c, 0x5711,
-  0x5715, 0x571a, 0x571b, 0x571d, 0x5720, 0x5722, 0x5723, 0x5724,
-  0x5725, 0x5729, 0x572a, 0x572c, 0x572e, 0x572f, 0x5733, 0x5734,
-  0x573d, 0x573e, 0x573f, 0x5745, 0x5746, 0x574c, 0x574d, 0x5752,
-  0x5762, 0x5765, 0x5767, 0x5768, 0x576b, 0x576d, 0x576e, 0x576f,
-  0x5770, 0x5771, 0x5773, 0x5774, 0x5775, 0x5777, 0x5779, 0x577a,
-  0x577b, 0x577c, 0x577e, 0x5781, 0x5783, 0x578c, 0x5794, 0x5797,
-  0x5799, 0x579a, 0x579c, 0x579d, 0x579e, 0x579f, 0x57a1, 0x5795,
-  0x57a7, 0x57a8, 0x57a9, 0x57ac, 0x57b8, 0x57bd, 0x57c7, 0x57c8,
-  0x57cc, 0x57cf, 0x57d5, 0x57dd, 0x57de, 0x57e4, 0x57e6, 0x57e7,
-  0x57e9, 0x57ed, 0x57f0, 0x57f5, 0x57f6, 0x57f8, 0x57fd, 0x57fe,
-  0x57ff, 0x5803, 0x5804, 0x5808, 0x5809, 0x57e1,
-  /* 0x38 */
-  0x580c, 0x580d, 0x581b, 0x581e, 0x581f, 0x5820, 0x5826, 0x5827,
-  0x582d, 0x5832, 0x5839, 0x583f, 0x5849, 0x584c, 0x584d, 0x584f,
-  0x5850, 0x5855, 0x585f, 0x5861, 0x5864, 0x5867, 0x5868, 0x5878,
-  0x587c, 0x587f, 0x5880, 0x5881, 0x5887, 0x5888, 0x5889, 0x588a,
-  0x588c, 0x588d, 0x588f, 0x5890, 0x5894, 0x5896, 0x589d, 0x58a0,
-  0x58a1, 0x58a2, 0x58a6, 0x58a9, 0x58b1, 0x58b2, 0x58c4, 0x58bc,
-  0x58c2, 0x58c8, 0x58cd, 0x58ce, 0x58d0, 0x58d2, 0x58d4, 0x58d6,
-  0x58da, 0x58dd, 0x58e1, 0x58e2, 0x58e9, 0x58f3, 0x5905, 0x5906,
-  0x590b, 0x590c, 0x5912, 0x5913, 0x5914, 0x8641, 0x591d, 0x5921,
-  0x5923, 0x5924, 0x5928, 0x592f, 0x5930, 0x5933, 0x5935, 0x5936,
-  0x593f, 0x5943, 0x5946, 0x5952, 0x5953, 0x5959, 0x595b, 0x595d,
-  0x595e, 0x595f, 0x5961, 0x5963, 0x596b, 0x596d,
-  /* 0x39 */
-  0x596f, 0x5972, 0x5975, 0x5976, 0x5979, 0x597b, 0x597c, 0x598b,
-  0x598c, 0x598e, 0x5992, 0x5995, 0x5997, 0x599f, 0x59a4, 0x59a7,
-  0x59ad, 0x59ae, 0x59af, 0x59b0, 0x59b3, 0x59b7, 0x59ba, 0x59bc,
-  0x59c1, 0x59c3, 0x59c4, 0x59c8, 0x59ca, 0x59cd, 0x59d2, 0x59dd,
-  0x59de, 0x59df, 0x59e3, 0x59e4, 0x59e7, 0x59ee, 0x59ef, 0x59f1,
-  0x59f2, 0x59f4, 0x59f7, 0x5a00, 0x5a04, 0x5a0c, 0x5a0d, 0x5a0e,
-  0x5a12, 0x5a13, 0x5a1e, 0x5a23, 0x5a24, 0x5a27, 0x5a28, 0x5a2a,
-  0x5a2d, 0x5a30, 0x5a44, 0x5a45, 0x5a47, 0x5a48, 0x5a4c, 0x5a50,
-  0x5a55, 0x5a5e, 0x5a63, 0x5a65, 0x5a67, 0x5a6d, 0x5a77, 0x5a7a,
-  0x5a7b, 0x5a7e, 0x5a8b, 0x5a90, 0x5a93, 0x5a96, 0x5a99, 0x5a9c,
-  0x5a9e, 0x5a9f, 0x5aa0, 0x5aa2, 0x5aa7, 0x5aac, 0x5ab1, 0x5ab2,
-  0x5ab3, 0x5ab5, 0x5ab8, 0x5aba, 0x5abb, 0x5abf,
-  /* 0x3a */
-  0x5ac4, 0x5ac6, 0x5ac8, 0x5acf, 0x5ada, 0x5adc, 0x5ae0, 0x5ae5,
-  0x5aea, 0x5aee, 0x5af5, 0x5af6, 0x5afd, 0x5b00, 0x5b01, 0x5b08,
-  0x5b17, 0x5b34, 0x5b19, 0x5b1b, 0x5b1d, 0x5b21, 0x5b25, 0x5b2d,
-  0x5b38, 0x5b41, 0x5b4b, 0x5b4c, 0x5b52, 0x5b56, 0x5b5e, 0x5b68,
-  0x5b6e, 0x5b6f, 0x5b7c, 0x5b7d, 0x5b7e, 0x5b7f, 0x5b81, 0x5b84,
-  0x5b86, 0x5b8a, 0x5b8e, 0x5b90, 0x5b91, 0x5b93, 0x5b94, 0x5b96,
-  0x5ba8, 0x5ba9, 0x5bac, 0x5bad, 0x5baf, 0x5bb1, 0x5bb2, 0x5bb7,
-  0x5bba, 0x5bbc, 0x5bc0, 0x5bc1, 0x5bcd, 0x5bcf, 0x5bd6, 0x5bd7,
-  0x5bd8, 0x5bd9, 0x5bda, 0x5be0, 0x5bef, 0x5bf1, 0x5bf4, 0x5bfd,
-  0x5c0c, 0x5c17, 0x5c1e, 0x5c1f, 0x5c23, 0x5c26, 0x5c29, 0x5c2b,
-  0x5c2c, 0x5c2e, 0x5c30, 0x5c32, 0x5c35, 0x5c36, 0x5c59, 0x5c5a,
-  0x5c5c, 0x5c62, 0x5c63, 0x5c67, 0x5c68, 0x5c69,
-  /* 0x3b */
-  0x5c6d, 0x5c70, 0x5c74, 0x5c75, 0x5c7a, 0x5c7b, 0x5c7c, 0x5c7d,
-  0x5c87, 0x5c88, 0x5c8a, 0x5c8f, 0x5c92, 0x5c9d, 0x5c9f, 0x5ca0,
-  0x5ca2, 0x5ca3, 0x5ca6, 0x5caa, 0x5cb2, 0x5cb4, 0x5cb5, 0x5cba,
-  0x5cc9, 0x5ccb, 0x5cd2, 0x5cdd, 0x5cd7, 0x5cee, 0x5cf1, 0x5cf2,
-  0x5cf4, 0x5d01, 0x5d06, 0x5d0d, 0x5d12, 0x5d2b, 0x5d23, 0x5d24,
-  0x5d26, 0x5d27, 0x5d31, 0x5d34, 0x5d39, 0x5d3d, 0x5d3f, 0x5d42,
-  0x5d43, 0x5d46, 0x5d48, 0x5d55, 0x5d51, 0x5d59, 0x5d4a, 0x5d5f,
-  0x5d60, 0x5d61, 0x5d62, 0x5d64, 0x5d6a, 0x5d6d, 0x5d70, 0x5d79,
-  0x5d7a, 0x5d7e, 0x5d7f, 0x5d81, 0x5d83, 0x5d88, 0x5d8a, 0x5d92,
-  0x5d93, 0x5d94, 0x5d95, 0x5d99, 0x5d9b, 0x5d9f, 0x5da0, 0x5da7,
-  0x5dab, 0x5db0, 0x5db4, 0x5db8, 0x5db9, 0x5dc3, 0x5dc7, 0x5dcb,
-  0x5dd0, 0x5dce, 0x5dd8, 0x5dd9, 0x5de0, 0x5de4,
-  /* 0x3c */
-  0x5de9, 0x5df8, 0x5df9, 0x5e00, 0x5e07, 0x5e0d, 0x5e12, 0x5e14,
-  0x5e15, 0x5e18, 0x5e1f, 0x5e20, 0x5e2e, 0x5e28, 0x5e32, 0x5e35,
-  0x5e3e, 0x5e4b, 0x5e50, 0x5e49, 0x5e51, 0x5e56, 0x5e58, 0x5e5b,
-  0x5e5c, 0x5e5e, 0x5e68, 0x5e6a, 0x5e6b, 0x5e6c, 0x5e6d, 0x5e6e,
-  0x5e70, 0x5e80, 0x5e8b, 0x5e8e, 0x5ea2, 0x5ea4, 0x5ea5, 0x5ea8,
-  0x5eaa, 0x5eac, 0x5eb1, 0x5eb3, 0x5ebd, 0x5ebe, 0x5ebf, 0x5ec6,
-  0x5ecc, 0x5ecb, 0x5ece, 0x5ed1, 0x5ed2, 0x5ed4, 0x5ed5, 0x5edc,
-  0x5ede, 0x5ee5, 0x5eeb, 0x5f02, 0x5f06, 0x5f07, 0x5f08, 0x5f0e,
-  0x5f19, 0x5f1c, 0x5f1d, 0x5f21, 0x5f22, 0x5f23, 0x5f24, 0x5f28,
-  0x5f2b, 0x5f2c, 0x5f2e, 0x5f30, 0x5f34, 0x5f36, 0x5f3b, 0x5f3d,
-  0x5f3f, 0x5f40, 0x5f44, 0x5f45, 0x5f47, 0x5f4d, 0x5f50, 0x5f54,
-  0x5f58, 0x5f5b, 0x5f60, 0x5f63, 0x5f64, 0x5f67,
-  /* 0x3d */
-  0x5f6f, 0x5f72, 0x5f74, 0x5f75, 0x5f78, 0x5f7a, 0x5f7d, 0x5f7e,
-  0x5f89, 0x5f8d, 0x5f8f, 0x5f96, 0x5f9c, 0x5f9d, 0x5fa2, 0x5fa7,
-  0x5fab, 0x5fa4, 0x5fac, 0x5faf, 0x5fb0, 0x5fb1, 0x5fb8, 0x5fc4,
-  0x5fc7, 0x5fc8, 0x5fc9, 0x5fcb, 0x5fd0, 0x5fd1, 0x5fd2, 0x5fd3,
-  0x5fd4, 0x5fde, 0x5fe1, 0x5fe2, 0x5fe8, 0x5fe9, 0x5fea, 0x5fec,
-  0x5fed, 0x5fee, 0x5fef, 0x5ff2, 0x5ff3, 0x5ff6, 0x5ffa, 0x5ffc,
-  0x6007, 0x600a, 0x600d, 0x6013, 0x6014, 0x6017, 0x6018, 0x601a,
-  0x601f, 0x6024, 0x602d, 0x6033, 0x6035, 0x6040, 0x6047, 0x6048,
-  0x6049, 0x604c, 0x6051, 0x6054, 0x6056, 0x6057, 0x605d, 0x6061,
-  0x6067, 0x6071, 0x607e, 0x607f, 0x6082, 0x6086, 0x6088, 0x608a,
-  0x608e, 0x6091, 0x6093, 0x6095, 0x6098, 0x609d, 0x609e, 0x60a2,
-  0x60a4, 0x60a5, 0x60a8, 0x60b0, 0x60b1, 0x60b7,
-  /* 0x3e */
-  0x60bb, 0x60be, 0x60c2, 0x60c4, 0x60c8, 0x60c9, 0x60ca, 0x60cb,
-  0x60ce, 0x60cf, 0x60d4, 0x60d5, 0x60d9, 0x60db, 0x60dd, 0x60de,
-  0x60e2, 0x60e5, 0x60f2, 0x60f5, 0x60f8, 0x60fc, 0x60fd, 0x6102,
-  0x6107, 0x610a, 0x610c, 0x6110, 0x6111, 0x6112, 0x6113, 0x6114,
-  0x6116, 0x6117, 0x6119, 0x611c, 0x611e, 0x6122, 0x612a, 0x612b,
-  0x6130, 0x6131, 0x6135, 0x6136, 0x6137, 0x6139, 0x6141, 0x6145,
-  0x6146, 0x6149, 0x615e, 0x6160, 0x616c, 0x6172, 0x6178, 0x617b,
-  0x617c, 0x617f, 0x6180, 0x6181, 0x6183, 0x6184, 0x618b, 0x618d,
-  0x6192, 0x6193, 0x6197, 0x6198, 0x619c, 0x619d, 0x619f, 0x61a0,
-  0x61a5, 0x61a8, 0x61aa, 0x61ad, 0x61b8, 0x61b9, 0x61bc, 0x61c0,
-  0x61c1, 0x61c2, 0x61ce, 0x61cf, 0x61d5, 0x61dc, 0x61dd, 0x61de,
-  0x61df, 0x61e1, 0x61e2, 0x61e7, 0x61e9, 0x61e5,
-  /* 0x3f */
-  0x61ec, 0x61ed, 0x61ef, 0x6201, 0x6203, 0x6204, 0x6207, 0x6213,
-  0x6215, 0x621c, 0x6220, 0x6222, 0x6223, 0x6227, 0x6229, 0x622b,
-  0x6239, 0x623d, 0x6242, 0x6243, 0x6244, 0x6246, 0x624c, 0x6250,
-  0x6251, 0x6252, 0x6254, 0x6256, 0x625a, 0x625c, 0x6264, 0x626d,
-  0x626f, 0x6273, 0x627a, 0x627d, 0x628d, 0x628e, 0x628f, 0x6290,
-  0x62a6, 0x62a8, 0x62b3, 0x62b6, 0x62b7, 0x62ba, 0x62be, 0x62bf,
-  0x62c4, 0x62ce, 0x62d5, 0x62d6, 0x62da, 0x62ea, 0x62f2, 0x62f4,
-  0x62fc, 0x62fd, 0x6303, 0x6304, 0x630a, 0x630b, 0x630d, 0x6310,
-  0x6313, 0x6316, 0x6318, 0x6329, 0x632a, 0x632d, 0x6335, 0x6336,
-  0x6339, 0x633c, 0x6341, 0x6342, 0x6343, 0x6344, 0x6346, 0x634a,
-  0x634b, 0x634e, 0x6352, 0x6353, 0x6354, 0x6358, 0x635b, 0x6365,
-  0x6366, 0x636c, 0x636d, 0x6371, 0x6374, 0x6375,
-  /* 0x40 */
-  0x6378, 0x637c, 0x637d, 0x637f, 0x6382, 0x6384, 0x6387, 0x638a,
-  0x6390, 0x6394, 0x6395, 0x6399, 0x639a, 0x639e, 0x63a4, 0x63a6,
-  0x63ad, 0x63ae, 0x63af, 0x63bd, 0x63c1, 0x63c5, 0x63c8, 0x63ce,
-  0x63d1, 0x63d3, 0x63d4, 0x63d5, 0x63dc, 0x63e0, 0x63e5, 0x63ea,
-  0x63ec, 0x63f2, 0x63f3, 0x63f5, 0x63f8, 0x63f9, 0x6409, 0x640a,
-  0x6410, 0x6412, 0x6414, 0x6418, 0x641e, 0x6420, 0x6422, 0x6424,
-  0x6425, 0x6429, 0x642a, 0x642f, 0x6430, 0x6435, 0x643d, 0x643f,
-  0x644b, 0x644f, 0x6451, 0x6452, 0x6453, 0x6454, 0x645a, 0x645b,
-  0x645c, 0x645d, 0x645f, 0x6460, 0x6461, 0x6463, 0x646d, 0x6473,
-  0x6474, 0x647b, 0x647d, 0x6485, 0x6487, 0x648f, 0x6490, 0x6491,
-  0x6498, 0x6499, 0x649b, 0x649d, 0x649f, 0x64a1, 0x64a3, 0x64a6,
-  0x64a8, 0x64ac, 0x64b3, 0x64bd, 0x64be, 0x64bf,
-  /* 0x41 */
-  0x64c4, 0x64c9, 0x64ca, 0x64cb, 0x64cc, 0x64ce, 0x64d0, 0x64d1,
-  0x64d5, 0x64d7, 0x64e4, 0x64e5, 0x64e9, 0x64ea, 0x64ed, 0x64f0,
-  0x64f5, 0x64f7, 0x64fb, 0x64ff, 0x6501, 0x6504, 0x6508, 0x6509,
-  0x650a, 0x650f, 0x6513, 0x6514, 0x6516, 0x6519, 0x651b, 0x651e,
-  0x651f, 0x6522, 0x6526, 0x6529, 0x652e, 0x6531, 0x653a, 0x653c,
-  0x653d, 0x6543, 0x6547, 0x6549, 0x6550, 0x6552, 0x6554, 0x655f,
-  0x6560, 0x6567, 0x656b, 0x657a, 0x657d, 0x6581, 0x6585, 0x658a,
-  0x6592, 0x6595, 0x6598, 0x659d, 0x65a0, 0x65a3, 0x65a6, 0x65ae,
-  0x65b2, 0x65b3, 0x65b4, 0x65bf, 0x65c2, 0x65c8, 0x65c9, 0x65ce,
-  0x65d0, 0x65d4, 0x65d6, 0x65d8, 0x65df, 0x65f0, 0x65f2, 0x65f4,
-  0x65f5, 0x65f9, 0x65fe, 0x65ff, 0x6600, 0x6604, 0x6608, 0x6609,
-  0x660d, 0x6611, 0x6612, 0x6615, 0x6616, 0x661d,
-  /* 0x42 */
-  0x661e, 0x6621, 0x6622, 0x6623, 0x6624, 0x6626, 0x6629, 0x662a,
-  0x662b, 0x662c, 0x662e, 0x6630, 0x6631, 0x6633, 0x6639, 0x6637,
-  0x6640, 0x6645, 0x6646, 0x664a, 0x664c, 0x6651, 0x664e, 0x6657,
-  0x6658, 0x6659, 0x665b, 0x665c, 0x6660, 0x6661, 0x66fb, 0x666a,
-  0x666b, 0x666c, 0x667e, 0x6673, 0x6675, 0x667f, 0x6677, 0x6678,
-  0x6679, 0x667b, 0x6680, 0x667c, 0x668b, 0x668c, 0x668d, 0x6690,
-  0x6692, 0x6699, 0x669a, 0x669b, 0x669c, 0x669f, 0x66a0, 0x66a4,
-  0x66ad, 0x66b1, 0x66b2, 0x66b5, 0x66bb, 0x66bf, 0x66c0, 0x66c2,
-  0x66c3, 0x66c8, 0x66cc, 0x66ce, 0x66cf, 0x66d4, 0x66db, 0x66df,
-  0x66e8, 0x66eb, 0x66ec, 0x66ee, 0x66fa, 0x6705, 0x6707, 0x670e,
-  0x6713, 0x6719, 0x671c, 0x6720, 0x6722, 0x6733, 0x673e, 0x6745,
-  0x6747, 0x6748, 0x674c, 0x6754, 0x6755, 0x675d,
-  /* 0x43 */
-  0x6766, 0x676c, 0x676e, 0x6774, 0x6776, 0x677b, 0x6781, 0x6784,
-  0x678e, 0x678f, 0x6791, 0x6793, 0x6796, 0x6798, 0x6799, 0x679b,
-  0x67b0, 0x67b1, 0x67b2, 0x67b5, 0x67bb, 0x67bc, 0x67bd, 0x67f9,
-  0x67c0, 0x67c2, 0x67c3, 0x67c5, 0x67c8, 0x67c9, 0x67d2, 0x67d7,
-  0x67d9, 0x67dc, 0x67e1, 0x67e6, 0x67f0, 0x67f2, 0x67f6, 0x67f7,
-  0x6852, 0x6814, 0x6819, 0x681d, 0x681f, 0x6828, 0x6827, 0x682c,
-  0x682d, 0x682f, 0x6830, 0x6831, 0x6833, 0x683b, 0x683f, 0x6844,
-  0x6845, 0x684a, 0x684c, 0x6855, 0x6857, 0x6858, 0x685b, 0x686b,
-  0x686e, 0x686f, 0x6870, 0x6871, 0x6872, 0x6875, 0x6879, 0x687a,
-  0x687b, 0x687c, 0x6882, 0x6884, 0x6886, 0x6888, 0x6896, 0x6898,
-  0x689a, 0x689c, 0x68a1, 0x68a3, 0x68a5, 0x68a9, 0x68aa, 0x68ae,
-  0x68b2, 0x68bb, 0x68c5, 0x68c8, 0x68cc, 0x68cf,
-  /* 0x44 */
-  0x68d0, 0x68d1, 0x68d3, 0x68d6, 0x68d9, 0x68dc, 0x68dd, 0x68e5,
-  0x68e8, 0x68ea, 0x68eb, 0x68ec, 0x68ed, 0x68f0, 0x68f1, 0x68f5,
-  0x68f6, 0x68fb, 0x68fc, 0x68fd, 0x6906, 0x6909, 0x690a, 0x6910,
-  0x6911, 0x6913, 0x6916, 0x6917, 0x6931, 0x6933, 0x6935, 0x6938,
-  0x693b, 0x6942, 0x6945, 0x6949, 0x694e, 0x6957, 0x695b, 0x6963,
-  0x6964, 0x6965, 0x6966, 0x6968, 0x6969, 0x696c, 0x6970, 0x6971,
-  0x6972, 0x697a, 0x697b, 0x697f, 0x6980, 0x698d, 0x6992, 0x6996,
-  0x6998, 0x69a1, 0x69a5, 0x69a6, 0x69a8, 0x69ab, 0x69ad, 0x69af,
-  0x69b7, 0x69b8, 0x69ba, 0x69bc, 0x69c5, 0x69c8, 0x69d1, 0x69d6,
-  0x69d7, 0x69e2, 0x69e5, 0x69ee, 0x69ef, 0x69f1, 0x69f3, 0x69f5,
-  0x69fe, 0x6a00, 0x6a01, 0x6a03, 0x6a0f, 0x6a11, 0x6a15, 0x6a1a,
-  0x6a1d, 0x6a20, 0x6a24, 0x6a28, 0x6a30, 0x6a32,
-  /* 0x45 */
-  0x6a34, 0x6a37, 0x6a3b, 0x6a3e, 0x6a3f, 0x6a45, 0x6a46, 0x6a49,
-  0x6a4a, 0x6a4e, 0x6a50, 0x6a51, 0x6a52, 0x6a55, 0x6a56, 0x6a5b,
-  0x6a64, 0x6a67, 0x6a6a, 0x6a71, 0x6a73, 0x6a7e, 0x6a81, 0x6a83,
-  0x6a86, 0x6a87, 0x6a89, 0x6a8b, 0x6a91, 0x6a9b, 0x6a9d, 0x6a9e,
-  0x6a9f, 0x6aa5, 0x6aab, 0x6aaf, 0x6ab0, 0x6ab1, 0x6ab4, 0x6abd,
-  0x6abe, 0x6abf, 0x6ac6, 0x6ac9, 0x6ac8, 0x6acc, 0x6ad0, 0x6ad4,
-  0x6ad5, 0x6ad6, 0x6adc, 0x6add, 0x6ae4, 0x6ae7, 0x6aec, 0x6af0,
-  0x6af1, 0x6af2, 0x6afc, 0x6afd, 0x6b02, 0x6b03, 0x6b06, 0x6b07,
-  0x6b09, 0x6b0f, 0x6b10, 0x6b11, 0x6b17, 0x6b1b, 0x6b1e, 0x6b24,
-  0x6b28, 0x6b2b, 0x6b2c, 0x6b2f, 0x6b35, 0x6b36, 0x6b3b, 0x6b3f,
-  0x6b46, 0x6b4a, 0x6b4d, 0x6b52, 0x6b56, 0x6b58, 0x6b5d, 0x6b60,
-  0x6b67, 0x6b6b, 0x6b6e, 0x6b70, 0x6b75, 0x6b7d,
-  /* 0x46 */
-  0x6b7e, 0x6b82, 0x6b85, 0x6b97, 0x6b9b, 0x6b9f, 0x6ba0, 0x6ba2,
-  0x6ba3, 0x6ba8, 0x6ba9, 0x6bac, 0x6bad, 0x6bae, 0x6bb0, 0x6bb8,
-  0x6bb9, 0x6bbd, 0x6bbe, 0x6bc3, 0x6bc4, 0x6bc9, 0x6bcc, 0x6bd6,
-  0x6bda, 0x6be1, 0x6be3, 0x6be6, 0x6be7, 0x6bee, 0x6bf1, 0x6bf7,
-  0x6bf9, 0x6bff, 0x6c02, 0x6c04, 0x6c05, 0x6c09, 0x6c0d, 0x6c0e,
-  0x6c10, 0x6c12, 0x6c19, 0x6c1f, 0x6c26, 0x6c27, 0x6c28, 0x6c2c,
-  0x6c2e, 0x6c33, 0x6c35, 0x6c36, 0x6c3a, 0x6c3b, 0x6c3f, 0x6c4a,
-  0x6c4b, 0x6c4d, 0x6c4f, 0x6c52, 0x6c54, 0x6c59, 0x6c5b, 0x6c5c,
-  0x6c6b, 0x6c6d, 0x6c6f, 0x6c74, 0x6c76, 0x6c78, 0x6c79, 0x6c7b,
-  0x6c85, 0x6c86, 0x6c87, 0x6c89, 0x6c94, 0x6c95, 0x6c97, 0x6c98,
-  0x6c9c, 0x6c9f, 0x6cb0, 0x6cb2, 0x6cb4, 0x6cc2, 0x6cc6, 0x6ccd,
-  0x6ccf, 0x6cd0, 0x6cd1, 0x6cd2, 0x6cd4, 0x6cd6,
-  /* 0x47 */
-  0x6cda, 0x6cdc, 0x6ce0, 0x6ce7, 0x6ce9, 0x6ceb, 0x6cec, 0x6cee,
-  0x6cf2, 0x6cf4, 0x6d04, 0x6d07, 0x6d0a, 0x6d0e, 0x6d0f, 0x6d11,
-  0x6d13, 0x6d1a, 0x6d26, 0x6d27, 0x6d28, 0x6c67, 0x6d2e, 0x6d2f,
-  0x6d31, 0x6d39, 0x6d3c, 0x6d3f, 0x6d57, 0x6d5e, 0x6d5f, 0x6d61,
-  0x6d65, 0x6d67, 0x6d6f, 0x6d70, 0x6d7c, 0x6d82, 0x6d87, 0x6d91,
-  0x6d92, 0x6d94, 0x6d96, 0x6d97, 0x6d98, 0x6daa, 0x6dac, 0x6db4,
-  0x6db7, 0x6db9, 0x6dbd, 0x6dbf, 0x6dc4, 0x6dc8, 0x6dca, 0x6dce,
-  0x6dcf, 0x6dd6, 0x6ddb, 0x6ddd, 0x6ddf, 0x6de0, 0x6de2, 0x6de5,
-  0x6de9, 0x6def, 0x6df0, 0x6df4, 0x6df6, 0x6dfc, 0x6e00, 0x6e04,
-  0x6e1e, 0x6e22, 0x6e27, 0x6e32, 0x6e36, 0x6e39, 0x6e3b, 0x6e3c,
-  0x6e44, 0x6e45, 0x6e48, 0x6e49, 0x6e4b, 0x6e4f, 0x6e51, 0x6e52,
-  0x6e53, 0x6e54, 0x6e57, 0x6e5c, 0x6e5d, 0x6e5e,
-  /* 0x48 */
-  0x6e62, 0x6e63, 0x6e68, 0x6e73, 0x6e7b, 0x6e7d, 0x6e8d, 0x6e93,
-  0x6e99, 0x6ea0, 0x6ea7, 0x6ead, 0x6eae, 0x6eb1, 0x6eb3, 0x6ebb,
-  0x6ebf, 0x6ec0, 0x6ec1, 0x6ec3, 0x6ec7, 0x6ec8, 0x6eca, 0x6ecd,
-  0x6ece, 0x6ecf, 0x6eeb, 0x6eed, 0x6eee, 0x6ef9, 0x6efb, 0x6efd,
-  0x6f04, 0x6f08, 0x6f0a, 0x6f0c, 0x6f0d, 0x6f16, 0x6f18, 0x6f1a,
-  0x6f1b, 0x6f26, 0x6f29, 0x6f2a, 0x6f2f, 0x6f30, 0x6f33, 0x6f36,
-  0x6f3b, 0x6f3c, 0x6f2d, 0x6f4f, 0x6f51, 0x6f52, 0x6f53, 0x6f57,
-  0x6f59, 0x6f5a, 0x6f5d, 0x6f5e, 0x6f61, 0x6f62, 0x6f68, 0x6f6c,
-  0x6f7d, 0x6f7e, 0x6f83, 0x6f87, 0x6f88, 0x6f8b, 0x6f8c, 0x6f8d,
-  0x6f90, 0x6f92, 0x6f93, 0x6f94, 0x6f96, 0x6f9a, 0x6f9f, 0x6fa0,
-  0x6fa5, 0x6fa6, 0x6fa7, 0x6fa8, 0x6fae, 0x6faf, 0x6fb0, 0x6fb5,
-  0x6fb6, 0x6fbc, 0x6fc5, 0x6fc7, 0x6fc8, 0x6fca,
-  /* 0x49 */
-  0x6fda, 0x6fde, 0x6fe8, 0x6fe9, 0x6ff0, 0x6ff5, 0x6ff9, 0x6ffc,
-  0x6ffd, 0x7000, 0x7005, 0x7006, 0x7007, 0x700d, 0x7017, 0x7020,
-  0x7023, 0x702f, 0x7034, 0x7037, 0x7039, 0x703c, 0x7043, 0x7044,
-  0x7048, 0x7049, 0x704a, 0x704b, 0x7054, 0x7055, 0x705d, 0x705e,
-  0x704e, 0x7064, 0x7065, 0x706c, 0x706e, 0x7075, 0x7076, 0x707e,
-  0x7081, 0x7085, 0x7086, 0x7094, 0x7095, 0x7096, 0x7097, 0x7098,
-  0x709b, 0x70a4, 0x70ab, 0x70b0, 0x70b1, 0x70b4, 0x70b7, 0x70ca,
-  0x70d1, 0x70d3, 0x70d4, 0x70d5, 0x70d6, 0x70d8, 0x70dc, 0x70e4,
-  0x70fa, 0x7103, 0x7104, 0x7105, 0x7106, 0x7107, 0x710b, 0x710c,
-  0x710f, 0x711e, 0x7120, 0x712b, 0x712d, 0x712f, 0x7130, 0x7131,
-  0x7138, 0x7141, 0x7145, 0x7146, 0x7147, 0x714a, 0x714b, 0x7150,
-  0x7152, 0x7157, 0x715a, 0x715c, 0x715e, 0x7160,
-  /* 0x4a */
-  0x7168, 0x7179, 0x7180, 0x7185, 0x7187, 0x718c, 0x7192, 0x719a,
-  0x719b, 0x71a0, 0x71a2, 0x71af, 0x71b0, 0x71b2, 0x71b3, 0x71ba,
-  0x71bf, 0x71c0, 0x71c1, 0x71c4, 0x71cb, 0x71cc, 0x71d3, 0x71d6,
-  0x71d9, 0x71da, 0x71dc, 0x71f8, 0x71fe, 0x7200, 0x7207, 0x7208,
-  0x7209, 0x7213, 0x7217, 0x721a, 0x721d, 0x721f, 0x7224, 0x722b,
-  0x722f, 0x7234, 0x7238, 0x7239, 0x7241, 0x7242, 0x7243, 0x7245,
-  0x724e, 0x724f, 0x7250, 0x7253, 0x7255, 0x7256, 0x725a, 0x725c,
-  0x725e, 0x7260, 0x7263, 0x7268, 0x726b, 0x726e, 0x726f, 0x7271,
-  0x7277, 0x7278, 0x727b, 0x727c, 0x727f, 0x7284, 0x7289, 0x728d,
-  0x728e, 0x7293, 0x729b, 0x72a8, 0x72ad, 0x72ae, 0x72b1, 0x72b4,
-  0x72be, 0x72c1, 0x72c7, 0x72c9, 0x72cc, 0x72d5, 0x72d6, 0x72d8,
-  0x72df, 0x72e5, 0x72f3, 0x72f4, 0x72fa, 0x72fb,
-  /* 0x4b */
-  0x72fe, 0x7302, 0x7304, 0x7305, 0x7307, 0x730b, 0x730d, 0x7312,
-  0x7313, 0x7318, 0x7319, 0x731e, 0x7322, 0x7324, 0x7327, 0x7328,
-  0x732c, 0x7331, 0x7332, 0x7335, 0x733a, 0x733b, 0x733d, 0x7343,
-  0x734d, 0x7350, 0x7352, 0x7356, 0x7358, 0x735d, 0x735e, 0x735f,
-  0x7360, 0x7366, 0x7367, 0x7369, 0x736b, 0x736c, 0x736e, 0x736f,
-  0x7371, 0x7377, 0x7379, 0x737c, 0x7380, 0x7381, 0x7383, 0x7385,
-  0x7386, 0x738e, 0x7390, 0x7393, 0x7395, 0x7397, 0x7398, 0x739c,
-  0x739e, 0x739f, 0x73a0, 0x73a2, 0x73a5, 0x73a6, 0x73aa, 0x73ab,
-  0x73ad, 0x73b5, 0x73b7, 0x73b9, 0x73bc, 0x73bd, 0x73bf, 0x73c5,
-  0x73c6, 0x73c9, 0x73cb, 0x73cc, 0x73cf, 0x73d2, 0x73d3, 0x73d6,
-  0x73d9, 0x73dd, 0x73e1, 0x73e3, 0x73e6, 0x73e7, 0x73e9, 0x73f4,
-  0x73f5, 0x73f7, 0x73f9, 0x73fa, 0x73fb, 0x73fd,
-  /* 0x4c */
-  0x73ff, 0x7400, 0x7401, 0x7404, 0x7407, 0x740a, 0x7411, 0x741a,
-  0x741b, 0x7424, 0x7426, 0x7428, 0x7429, 0x742a, 0x742b, 0x742c,
-  0x742d, 0x742e, 0x742f, 0x7430, 0x7431, 0x7439, 0x7440, 0x7443,
-  0x7444, 0x7446, 0x7447, 0x744b, 0x744d, 0x7451, 0x7452, 0x7457,
-  0x745d, 0x7462, 0x7466, 0x7467, 0x7468, 0x746b, 0x746d, 0x746e,
-  0x7471, 0x7472, 0x7480, 0x7481, 0x7485, 0x7486, 0x7487, 0x7489,
-  0x748f, 0x7490, 0x7491, 0x7492, 0x7498, 0x7499, 0x749a, 0x749c,
-  0x749f, 0x74a0, 0x74a1, 0x74a3, 0x74a6, 0x74a8, 0x74a9, 0x74aa,
-  0x74ab, 0x74ae, 0x74af, 0x74b1, 0x74b2, 0x74b5, 0x74b9, 0x74bb,
-  0x74bf, 0x74c8, 0x74c9, 0x74cc, 0x74d0, 0x74d3, 0x74d8, 0x74da,
-  0x74db, 0x74de, 0x74df, 0x74e4, 0x74e8, 0x74ea, 0x74eb, 0x74ef,
-  0x74f4, 0x74fa, 0x74fb, 0x74fc, 0x74ff, 0x7506,
-  /* 0x4d */
-  0x7512, 0x7516, 0x7517, 0x7520, 0x7521, 0x7524, 0x7527, 0x7529,
-  0x752a, 0x752f, 0x7536, 0x7539, 0x753d, 0x753e, 0x753f, 0x7540,
-  0x7543, 0x7547, 0x7548, 0x754e, 0x7550, 0x7552, 0x7557, 0x755e,
-  0x755f, 0x7561, 0x756f, 0x7571, 0x7579, 0x757a, 0x757b, 0x757c,
-  0x757d, 0x757e, 0x7581, 0x7585, 0x7590, 0x7592, 0x7593, 0x7595,
-  0x7599, 0x759c, 0x75a2, 0x75a4, 0x75b4, 0x75ba, 0x75bf, 0x75c0,
-  0x75c1, 0x75c4, 0x75c6, 0x75cc, 0x75ce, 0x75cf, 0x75d7, 0x75dc,
-  0x75df, 0x75e0, 0x75e1, 0x75e4, 0x75e7, 0x75ec, 0x75ee, 0x75ef,
-  0x75f1, 0x75f9, 0x7600, 0x7602, 0x7603, 0x7604, 0x7607, 0x7608,
-  0x760a, 0x760c, 0x760f, 0x7612, 0x7613, 0x7615, 0x7616, 0x7619,
-  0x761b, 0x761c, 0x761d, 0x761e, 0x7623, 0x7625, 0x7626, 0x7629,
-  0x762d, 0x7632, 0x7633, 0x7635, 0x7638, 0x7639,
-  /* 0x4e */
-  0x763a, 0x763c, 0x764a, 0x7640, 0x7641, 0x7643, 0x7644, 0x7645,
-  0x7649, 0x764b, 0x7655, 0x7659, 0x765f, 0x7664, 0x7665, 0x766d,
-  0x766e, 0x766f, 0x7671, 0x7674, 0x7681, 0x7685, 0x768c, 0x768d,
-  0x7695, 0x769b, 0x769c, 0x769d, 0x769f, 0x76a0, 0x76a2, 0x76a3,
-  0x76a4, 0x76a5, 0x76a6, 0x76a7, 0x76a8, 0x76aa, 0x76ad, 0x76bd,
-  0x76c1, 0x76c5, 0x76c9, 0x76cb, 0x76cc, 0x76ce, 0x76d4, 0x76d9,
-  0x76e0, 0x76e6, 0x76e8, 0x76ec, 0x76f0, 0x76f1, 0x76f6, 0x76f9,
-  0x76fc, 0x7700, 0x7706, 0x770a, 0x770e, 0x7712, 0x7714, 0x7715,
-  0x7717, 0x7719, 0x771a, 0x771c, 0x7722, 0x7728, 0x772d, 0x772e,
-  0x772f, 0x7734, 0x7735, 0x7736, 0x7739, 0x773d, 0x773e, 0x7742,
-  0x7745, 0x7746, 0x774a, 0x774d, 0x774e, 0x774f, 0x7752, 0x7756,
-  0x7757, 0x775c, 0x775e, 0x775f, 0x7760, 0x7762,
-  /* 0x4f */
-  0x7764, 0x7767, 0x776a, 0x776c, 0x7770, 0x7772, 0x7773, 0x7774,
-  0x777a, 0x777d, 0x7780, 0x7784, 0x778c, 0x778d, 0x7794, 0x7795,
-  0x7796, 0x779a, 0x779f, 0x77a2, 0x77a7, 0x77aa, 0x77ae, 0x77af,
-  0x77b1, 0x77b5, 0x77be, 0x77c3, 0x77c9, 0x77d1, 0x77d2, 0x77d5,
-  0x77d9, 0x77de, 0x77df, 0x77e0, 0x77e4, 0x77e6, 0x77ea, 0x77ec,
-  0x77f0, 0x77f1, 0x77f4, 0x77f8, 0x77fb, 0x7805, 0x7806, 0x7809,
-  0x780d, 0x780e, 0x7811, 0x781d, 0x7821, 0x7822, 0x7823, 0x782d,
-  0x782e, 0x7830, 0x7835, 0x7837, 0x7843, 0x7844, 0x7847, 0x7848,
-  0x784c, 0x784e, 0x7852, 0x785c, 0x785e, 0x7860, 0x7861, 0x7863,
-  0x7864, 0x7868, 0x786a, 0x786e, 0x787a, 0x787e, 0x788a, 0x788f,
-  0x7894, 0x7898, 0x78a1, 0x789d, 0x789e, 0x789f, 0x78a4, 0x78a8,
-  0x78ac, 0x78ad, 0x78b0, 0x78b1, 0x78b2, 0x78b3,
-  /* 0x50 */
-  0x78bb, 0x78bd, 0x78bf, 0x78c7, 0x78c8, 0x78c9, 0x78cc, 0x78ce,
-  0x78d2, 0x78d3, 0x78d5, 0x78d6, 0x78e4, 0x78db, 0x78df, 0x78e0,
-  0x78e1, 0x78e6, 0x78ea, 0x78f2, 0x78f3, 0x7900, 0x78f6, 0x78f7,
-  0x78fa, 0x78fb, 0x78ff, 0x7906, 0x790c, 0x7910, 0x791a, 0x791c,
-  0x791e, 0x791f, 0x7920, 0x7925, 0x7927, 0x7929, 0x792d, 0x7931,
-  0x7934, 0x7935, 0x793b, 0x793d, 0x793f, 0x7944, 0x7945, 0x7946,
-  0x794a, 0x794b, 0x794f, 0x7951, 0x7954, 0x7958, 0x795b, 0x795c,
-  0x7967, 0x7969, 0x796b, 0x7972, 0x7979, 0x797b, 0x797c, 0x797e,
-  0x798b, 0x798c, 0x7991, 0x7993, 0x7994, 0x7995, 0x7996, 0x7998,
-  0x799b, 0x799c, 0x79a1, 0x79a8, 0x79a9, 0x79ab, 0x79af, 0x79b1,
-  0x79b4, 0x79b8, 0x79bb, 0x79c2, 0x79c4, 0x79c7, 0x79c8, 0x79ca,
-  0x79cf, 0x79d4, 0x79d6, 0x79da, 0x79dd, 0x79de,
-  /* 0x51 */
-  0x79e0, 0x79e2, 0x79e5, 0x79ea, 0x79eb, 0x79ed, 0x79f1, 0x79f8,
-  0x79fc, 0x7a02, 0x7a03, 0x7a07, 0x7a09, 0x7a0a, 0x7a0c, 0x7a11,
-  0x7a15, 0x7a1b, 0x7a1e, 0x7a21, 0x7a27, 0x7a2b, 0x7a2d, 0x7a2f,
-  0x7a30, 0x7a34, 0x7a35, 0x7a38, 0x7a39, 0x7a3a, 0x7a44, 0x7a45,
-  0x7a47, 0x7a48, 0x7a4c, 0x7a55, 0x7a56, 0x7a59, 0x7a5c, 0x7a5d,
-  0x7a5f, 0x7a60, 0x7a65, 0x7a67, 0x7a6a, 0x7a6d, 0x7a75, 0x7a78,
-  0x7a7e, 0x7a80, 0x7a82, 0x7a85, 0x7a86, 0x7a8a, 0x7a8b, 0x7a90,
-  0x7a91, 0x7a94, 0x7a9e, 0x7aa0, 0x7aa3, 0x7aac, 0x7ab3, 0x7ab5,
-  0x7ab9, 0x7abb, 0x7abc, 0x7ac6, 0x7ac9, 0x7acc, 0x7ace, 0x7ad1,
-  0x7adb, 0x7ae8, 0x7ae9, 0x7aeb, 0x7aec, 0x7af1, 0x7af4, 0x7afb,
-  0x7afd, 0x7afe, 0x7b07, 0x7b14, 0x7b1f, 0x7b23, 0x7b27, 0x7b29,
-  0x7b2a, 0x7b2b, 0x7b2d, 0x7b2e, 0x7b2f, 0x7b30,
-  /* 0x52 */
-  0x7b31, 0x7b34, 0x7b3d, 0x7b3f, 0x7b40, 0x7b41, 0x7b47, 0x7b4e,
-  0x7b55, 0x7b60, 0x7b64, 0x7b66, 0x7b69, 0x7b6a, 0x7b6d, 0x7b6f,
-  0x7b72, 0x7b73, 0x7b77, 0x7b84, 0x7b89, 0x7b8e, 0x7b90, 0x7b91,
-  0x7b96, 0x7b9b, 0x7b9e, 0x7ba0, 0x7ba5, 0x7bac, 0x7baf, 0x7bb0,
-  0x7bb2, 0x7bb5, 0x7bb6, 0x7bba, 0x7bbb, 0x7bbc, 0x7bbd, 0x7bc2,
-  0x7bc5, 0x7bc8, 0x7bca, 0x7bd4, 0x7bd6, 0x7bd7, 0x7bd9, 0x7bda,
-  0x7bdb, 0x7be8, 0x7bea, 0x7bf2, 0x7bf4, 0x7bf5, 0x7bf8, 0x7bf9,
-  0x7bfa, 0x7bfc, 0x7bfe, 0x7c01, 0x7c02, 0x7c03, 0x7c04, 0x7c06,
-  0x7c09, 0x7c0b, 0x7c0c, 0x7c0e, 0x7c0f, 0x7c19, 0x7c1b, 0x7c20,
-  0x7c25, 0x7c26, 0x7c28, 0x7c2c, 0x7c31, 0x7c33, 0x7c34, 0x7c36,
-  0x7c39, 0x7c3a, 0x7c46, 0x7c4a, 0x7c55, 0x7c51, 0x7c52, 0x7c53,
-  0x7c59, 0x7c5a, 0x7c5b, 0x7c5c, 0x7c5d, 0x7c5e,
-  /* 0x53 */
-  0x7c61, 0x7c63, 0x7c67, 0x7c69, 0x7c6d, 0x7c6e, 0x7c70, 0x7c72,
-  0x7c79, 0x7c7c, 0x7c7d, 0x7c86, 0x7c87, 0x7c8f, 0x7c94, 0x7c9e,
-  0x7ca0, 0x7ca6, 0x7cb0, 0x7cb6, 0x7cb7, 0x7cba, 0x7cbb, 0x7cbc,
-  0x7cbf, 0x7cc4, 0x7cc7, 0x7cc8, 0x7cc9, 0x7ccd, 0x7ccf, 0x7cd3,
-  0x7cd4, 0x7cd5, 0x7cd7, 0x7cd9, 0x7cda, 0x7cdd, 0x7ce6, 0x7ce9,
-  0x7ceb, 0x7cf5, 0x7d03, 0x7d07, 0x7d08, 0x7d09, 0x7d0f, 0x7d11,
-  0x7d12, 0x7d13, 0x7d16, 0x7d1d, 0x7d1e, 0x7d23, 0x7d26, 0x7d2a,
-  0x7d2d, 0x7d31, 0x7d3c, 0x7d3d, 0x7d3e, 0x7d40, 0x7d41, 0x7d47,
-  0x7d48, 0x7d4d, 0x7d51, 0x7d53, 0x7d57, 0x7d59, 0x7d5a, 0x7d5c,
-  0x7d5d, 0x7d65, 0x7d67, 0x7d6a, 0x7d70, 0x7d78, 0x7d7a, 0x7d7b,
-  0x7d7f, 0x7d81, 0x7d82, 0x7d83, 0x7d85, 0x7d86, 0x7d88, 0x7d8b,
-  0x7d8c, 0x7d8d, 0x7d91, 0x7d96, 0x7d97, 0x7d9d,
-  /* 0x54 */
-  0x7d9e, 0x7da6, 0x7da7, 0x7daa, 0x7db3, 0x7db6, 0x7db7, 0x7db9,
-  0x7dc2, 0x7dc3, 0x7dc4, 0x7dc5, 0x7dc6, 0x7dcc, 0x7dcd, 0x7dce,
-  0x7dd7, 0x7dd9, 0x7e00, 0x7de2, 0x7de5, 0x7de6, 0x7dea, 0x7deb,
-  0x7ded, 0x7df1, 0x7df5, 0x7df6, 0x7df9, 0x7dfa, 0x7e08, 0x7e10,
-  0x7e11, 0x7e15, 0x7e17, 0x7e1c, 0x7e1d, 0x7e20, 0x7e27, 0x7e28,
-  0x7e2c, 0x7e2d, 0x7e2f, 0x7e33, 0x7e36, 0x7e3f, 0x7e44, 0x7e45,
-  0x7e47, 0x7e4e, 0x7e50, 0x7e52, 0x7e58, 0x7e5f, 0x7e61, 0x7e62,
-  0x7e65, 0x7e6b, 0x7e6e, 0x7e6f, 0x7e73, 0x7e78, 0x7e7e, 0x7e81,
-  0x7e86, 0x7e87, 0x7e8a, 0x7e8d, 0x7e91, 0x7e95, 0x7e98, 0x7e9a,
-  0x7e9d, 0x7e9e, 0x7f3c, 0x7f3b, 0x7f3d, 0x7f3e, 0x7f3f, 0x7f43,
-  0x7f44, 0x7f47, 0x7f4f, 0x7f52, 0x7f53, 0x7f5b, 0x7f5c, 0x7f5d,
-  0x7f61, 0x7f63, 0x7f64, 0x7f65, 0x7f66, 0x7f6d,
-  /* 0x55 */
-  0x7f71, 0x7f7d, 0x7f7e, 0x7f7f, 0x7f80, 0x7f8b, 0x7f8d, 0x7f8f,
-  0x7f90, 0x7f91, 0x7f96, 0x7f97, 0x7f9c, 0x7fa1, 0x7fa2, 0x7fa6,
-  0x7faa, 0x7fad, 0x7fb4, 0x7fbc, 0x7fbf, 0x7fc0, 0x7fc3, 0x7fc8,
-  0x7fce, 0x7fcf, 0x7fdb, 0x7fdf, 0x7fe3, 0x7fe5, 0x7fe8, 0x7fec,
-  0x7fee, 0x7fef, 0x7ff2, 0x7ffa, 0x7ffd, 0x7ffe, 0x7fff, 0x8007,
-  0x8008, 0x800a, 0x800d, 0x800e, 0x800f, 0x8011, 0x8013, 0x8014,
-  0x8016, 0x801d, 0x801e, 0x801f, 0x8020, 0x8024, 0x8026, 0x802c,
-  0x802e, 0x8030, 0x8034, 0x8035, 0x8037, 0x8039, 0x803a, 0x803c,
-  0x803e, 0x8040, 0x8044, 0x8060, 0x8064, 0x8066, 0x806d, 0x8071,
-  0x8075, 0x8081, 0x8088, 0x808e, 0x809c, 0x809e, 0x80a6, 0x80a7,
-  0x80ab, 0x80b8, 0x80b9, 0x80c8, 0x80cd, 0x80cf, 0x80d2, 0x80d4,
-  0x80d5, 0x80d7, 0x80d8, 0x80e0, 0x80ed, 0x80ee,
-  /* 0x56 */
-  0x80f0, 0x80f2, 0x80f3, 0x80f6, 0x80f9, 0x80fa, 0x80fe, 0x8103,
-  0x810b, 0x8116, 0x8117, 0x8118, 0x811c, 0x811e, 0x8120, 0x8124,
-  0x8127, 0x812c, 0x8130, 0x8135, 0x813a, 0x813c, 0x8145, 0x8147,
-  0x814a, 0x814c, 0x8152, 0x8157, 0x8160, 0x8161, 0x8167, 0x8168,
-  0x8169, 0x816d, 0x816f, 0x8177, 0x8181, 0x8190, 0x8184, 0x8185,
-  0x8186, 0x818b, 0x818e, 0x8196, 0x8198, 0x819b, 0x819e, 0x81a2,
-  0x81ae, 0x81b2, 0x81b4, 0x81bb, 0x81cb, 0x81c3, 0x81c5, 0x81ca,
-  0x81ce, 0x81cf, 0x81d5, 0x81d7, 0x81db, 0x81dd, 0x81de, 0x81e1,
-  0x81e4, 0x81eb, 0x81ec, 0x81f0, 0x81f1, 0x81f2, 0x81f5, 0x81f6,
-  0x81f8, 0x81f9, 0x81fd, 0x81ff, 0x8200, 0x8203, 0x820f, 0x8213,
-  0x8214, 0x8219, 0x821a, 0x821d, 0x8221, 0x8222, 0x8228, 0x8232,
-  0x8234, 0x823a, 0x8243, 0x8244, 0x8245, 0x8246,
-  /* 0x57 */
-  0x824b, 0x824e, 0x824f, 0x8251, 0x8256, 0x825c, 0x8260, 0x8263,
-  0x8267, 0x826d, 0x8274, 0x827b, 0x827d, 0x827f, 0x8280, 0x8281,
-  0x8283, 0x8284, 0x8287, 0x8289, 0x828a, 0x828e, 0x8291, 0x8294,
-  0x8296, 0x8298, 0x829a, 0x829b, 0x82a0, 0x82a1, 0x82a3, 0x82a4,
-  0x82a7, 0x82a8, 0x82a9, 0x82aa, 0x82ae, 0x82b0, 0x82b2, 0x82b4,
-  0x82b7, 0x82ba, 0x82bc, 0x82be, 0x82bf, 0x82c6, 0x82d0, 0x82d5,
-  0x82da, 0x82e0, 0x82e2, 0x82e4, 0x82e8, 0x82ea, 0x82ed, 0x82ef,
-  0x82f6, 0x82f7, 0x82fd, 0x82fe, 0x8300, 0x8301, 0x8307, 0x8308,
-  0x830a, 0x830b, 0x8354, 0x831b, 0x831d, 0x831e, 0x831f, 0x8321,
-  0x8322, 0x832c, 0x832d, 0x832e, 0x8330, 0x8333, 0x8337, 0x833a,
-  0x833c, 0x833d, 0x8342, 0x8343, 0x8344, 0x8347, 0x834d, 0x834e,
-  0x8351, 0x8355, 0x8356, 0x8357, 0x8370, 0x8378,
-  /* 0x58 */
-  0x837d, 0x837f, 0x8380, 0x8382, 0x8384, 0x8386, 0x838d, 0x8392,
-  0x8394, 0x8395, 0x8398, 0x8399, 0x839b, 0x839c, 0x839d, 0x83a6,
-  0x83a7, 0x83a9, 0x83ac, 0x83be, 0x83bf, 0x83c0, 0x83c7, 0x83c9,
-  0x83cf, 0x83d0, 0x83d1, 0x83d4, 0x83dd, 0x8353, 0x83e8, 0x83ea,
-  0x83f6, 0x83f8, 0x83f9, 0x83fc, 0x8401, 0x8406, 0x840a, 0x840f,
-  0x8411, 0x8415, 0x8419, 0x83ad, 0x842f, 0x8439, 0x8445, 0x8447,
-  0x8448, 0x844a, 0x844d, 0x844f, 0x8451, 0x8452, 0x8456, 0x8458,
-  0x8459, 0x845a, 0x845c, 0x8460, 0x8464, 0x8465, 0x8467, 0x846a,
-  0x8470, 0x8473, 0x8474, 0x8476, 0x8478, 0x847c, 0x847d, 0x8481,
-  0x8485, 0x8492, 0x8493, 0x8495, 0x849e, 0x84a6, 0x84a8, 0x84a9,
-  0x84aa, 0x84af, 0x84b1, 0x84b4, 0x84ba, 0x84bd, 0x84be, 0x84c0,
-  0x84c2, 0x84c7, 0x84c8, 0x84cc, 0x84cf, 0x84d3,
-  /* 0x59 */
-  0x84dc, 0x84e7, 0x84ea, 0x84ef, 0x84f0, 0x84f1, 0x84f2, 0x84f7,
-  0x8532, 0x84fa, 0x84fb, 0x84fd, 0x8502, 0x8503, 0x8507, 0x850c,
-  0x850e, 0x8510, 0x851c, 0x851e, 0x8522, 0x8523, 0x8524, 0x8525,
-  0x8527, 0x852a, 0x852b, 0x852f, 0x8533, 0x8534, 0x8536, 0x853f,
-  0x8546, 0x854f, 0x8550, 0x8551, 0x8552, 0x8553, 0x8556, 0x8559,
-  0x855c, 0x855d, 0x855e, 0x855f, 0x8560, 0x8561, 0x8562, 0x8564,
-  0x856b, 0x856f, 0x8579, 0x857a, 0x857b, 0x857d, 0x857f, 0x8581,
-  0x8585, 0x8586, 0x8589, 0x858b, 0x858c, 0x858f, 0x8593, 0x8598,
-  0x859d, 0x859f, 0x85a0, 0x85a2, 0x85a5, 0x85a7, 0x85b4, 0x85b6,
-  0x85b7, 0x85b8, 0x85bc, 0x85bd, 0x85be, 0x85bf, 0x85c2, 0x85c7,
-  0x85ca, 0x85cb, 0x85ce, 0x85ad, 0x85d8, 0x85da, 0x85df, 0x85e0,
-  0x85e6, 0x85e8, 0x85ed, 0x85f3, 0x85f6, 0x85fc,
-  /* 0x5a */
-  0x85ff, 0x8600, 0x8604, 0x8605, 0x860d, 0x860e, 0x8610, 0x8611,
-  0x8612, 0x8618, 0x8619, 0x861b, 0x861e, 0x8621, 0x8627, 0x8629,
-  0x8636, 0x8638, 0x863a, 0x863c, 0x863d, 0x8640, 0x8642, 0x8646,
-  0x8652, 0x8653, 0x8656, 0x8657, 0x8658, 0x8659, 0x865d, 0x8660,
-  0x8661, 0x8662, 0x8663, 0x8664, 0x8669, 0x866c, 0x866f, 0x8675,
-  0x8676, 0x8677, 0x867a, 0x868d, 0x8691, 0x8696, 0x8698, 0x869a,
-  0x869c, 0x86a1, 0x86a6, 0x86a7, 0x86a8, 0x86ad, 0x86b1, 0x86b3,
-  0x86b4, 0x86b5, 0x86b7, 0x86b8, 0x86b9, 0x86bf, 0x86c0, 0x86c1,
-  0x86c3, 0x86c5, 0x86d1, 0x86d2, 0x86d5, 0x86d7, 0x86da, 0x86dc,
-  0x86e0, 0x86e3, 0x86e5, 0x86e7, 0x8688, 0x86fa, 0x86fc, 0x86fd,
-  0x8704, 0x8705, 0x8707, 0x870b, 0x870e, 0x870f, 0x8710, 0x8713,
-  0x8714, 0x8719, 0x871e, 0x871f, 0x8721, 0x8723,
-  /* 0x5b */
-  0x8728, 0x872e, 0x872f, 0x8731, 0x8732, 0x8739, 0x873a, 0x873c,
-  0x873d, 0x873e, 0x8740, 0x8743, 0x8745, 0x874d, 0x8758, 0x875d,
-  0x8761, 0x8764, 0x8765, 0x876f, 0x8771, 0x8772, 0x877b, 0x8783,
-  0x8784, 0x8785, 0x8786, 0x8787, 0x8788, 0x8789, 0x878b, 0x878c,
-  0x8790, 0x8793, 0x8795, 0x8797, 0x8798, 0x8799, 0x879e, 0x87a0,
-  0x87a3, 0x87a7, 0x87ac, 0x87ad, 0x87ae, 0x87b1, 0x87b5, 0x87be,
-  0x87bf, 0x87c1, 0x87c8, 0x87c9, 0x87ca, 0x87ce, 0x87d5, 0x87d6,
-  0x87d9, 0x87da, 0x87dc, 0x87df, 0x87e2, 0x87e3, 0x87e4, 0x87ea,
-  0x87eb, 0x87ed, 0x87f1, 0x87f3, 0x87f8, 0x87fa, 0x87ff, 0x8801,
-  0x8803, 0x8806, 0x8809, 0x880a, 0x880b, 0x8810, 0x8819, 0x8812,
-  0x8813, 0x8814, 0x8818, 0x881a, 0x881b, 0x881c, 0x881e, 0x881f,
-  0x8828, 0x882d, 0x882e, 0x8830, 0x8832, 0x8835,
-  /* 0x5c */
-  0x883a, 0x883c, 0x8841, 0x8843, 0x8845, 0x8848, 0x8849, 0x884a,
-  0x884b, 0x884e, 0x8851, 0x8855, 0x8856, 0x8858, 0x885a, 0x885c,
-  0x885f, 0x8860, 0x8864, 0x8869, 0x8871, 0x8879, 0x887b, 0x8880,
-  0x8898, 0x889a, 0x889b, 0x889c, 0x889f, 0x88a0, 0x88a8, 0x88aa,
-  0x88ba, 0x88bd, 0x88be, 0x88c0, 0x88ca, 0x88cb, 0x88cc, 0x88cd,
-  0x88ce, 0x88d1, 0x88d2, 0x88d3, 0x88db, 0x88de, 0x88e7, 0x88ef,
-  0x88f0, 0x88f1, 0x88f5, 0x88f7, 0x8901, 0x8906, 0x890d, 0x890e,
-  0x890f, 0x8915, 0x8916, 0x8918, 0x8919, 0x891a, 0x891c, 0x8920,
-  0x8926, 0x8927, 0x8928, 0x8930, 0x8931, 0x8932, 0x8935, 0x8939,
-  0x893a, 0x893e, 0x8940, 0x8942, 0x8945, 0x8946, 0x8949, 0x894f,
-  0x8952, 0x8957, 0x895a, 0x895b, 0x895c, 0x8961, 0x8962, 0x8963,
-  0x896b, 0x896e, 0x8970, 0x8973, 0x8975, 0x897a,
-  /* 0x5d */
-  0x897b, 0x897c, 0x897d, 0x8989, 0x898d, 0x8990, 0x8994, 0x8995,
-  0x899b, 0x899c, 0x899f, 0x89a0, 0x89a5, 0x89b0, 0x89b4, 0x89b5,
-  0x89b6, 0x89b7, 0x89bc, 0x89d4, 0x89d5, 0x89d6, 0x89d7, 0x89d8,
-  0x89e5, 0x89e9, 0x89eb, 0x89ed, 0x89f1, 0x89f3, 0x89f6, 0x89f9,
-  0x89fd, 0x89ff, 0x8a04, 0x8a05, 0x8a07, 0x8a0f, 0x8a11, 0x8a12,
-  0x8a14, 0x8a15, 0x8a1e, 0x8a20, 0x8a22, 0x8a24, 0x8a26, 0x8a2b,
-  0x8a2c, 0x8a2f, 0x8a35, 0x8a37, 0x8a3d, 0x8a3e, 0x8a40, 0x8a43,
-  0x8a45, 0x8a47, 0x8a49, 0x8a4d, 0x8a4e, 0x8a53, 0x8a56, 0x8a57,
-  0x8a58, 0x8a5c, 0x8a5d, 0x8a61, 0x8a65, 0x8a67, 0x8a75, 0x8a76,
-  0x8a77, 0x8a79, 0x8a7a, 0x8a7b, 0x8a7e, 0x8a7f, 0x8a80, 0x8a83,
-  0x8a86, 0x8a8b, 0x8a8f, 0x8a90, 0x8a92, 0x8a96, 0x8a97, 0x8a99,
-  0x8a9f, 0x8aa7, 0x8aa9, 0x8aae, 0x8aaf, 0x8ab3,
-  /* 0x5e */
-  0x8ab6, 0x8ab7, 0x8abb, 0x8abe, 0x8ac3, 0x8ac6, 0x8ac8, 0x8ac9,
-  0x8aca, 0x8ad1, 0x8ad3, 0x8ad4, 0x8ad5, 0x8ad7, 0x8add, 0x8adf,
-  0x8aec, 0x8af0, 0x8af4, 0x8af5, 0x8af6, 0x8afc, 0x8aff, 0x8b05,
-  0x8b06, 0x8b0b, 0x8b11, 0x8b1c, 0x8b1e, 0x8b1f, 0x8b0a, 0x8b2d,
-  0x8b30, 0x8b37, 0x8b3c, 0x8b42, 0x8b43, 0x8b44, 0x8b45, 0x8b46,
-  0x8b48, 0x8b52, 0x8b53, 0x8b54, 0x8b59, 0x8b4d, 0x8b5e, 0x8b63,
-  0x8b6d, 0x8b76, 0x8b78, 0x8b79, 0x8b7c, 0x8b7e, 0x8b81, 0x8b84,
-  0x8b85, 0x8b8b, 0x8b8d, 0x8b8f, 0x8b94, 0x8b95, 0x8b9c, 0x8b9e,
-  0x8b9f, 0x8c38, 0x8c39, 0x8c3d, 0x8c3e, 0x8c45, 0x8c47, 0x8c49,
-  0x8c4b, 0x8c4f, 0x8c51, 0x8c53, 0x8c54, 0x8c57, 0x8c58, 0x8c5b,
-  0x8c5d, 0x8c59, 0x8c63, 0x8c64, 0x8c66, 0x8c68, 0x8c69, 0x8c6d,
-  0x8c73, 0x8c75, 0x8c76, 0x8c7b, 0x8c7e, 0x8c86,
-  /* 0x5f */
-  0x8c87, 0x8c8b, 0x8c90, 0x8c92, 0x8c93, 0x8c99, 0x8c9b, 0x8c9c,
-  0x8ca4, 0x8cb9, 0x8cba, 0x8cc5, 0x8cc6, 0x8cc9, 0x8ccb, 0x8ccf,
-  0x8cd6, 0x8cd5, 0x8cd9, 0x8cdd, 0x8ce1, 0x8ce8, 0x8cec, 0x8cef,
-  0x8cf0, 0x8cf2, 0x8cf5, 0x8cf7, 0x8cf8, 0x8cfe, 0x8cff, 0x8d01,
-  0x8d03, 0x8d09, 0x8d12, 0x8d17, 0x8d1b, 0x8d65, 0x8d69, 0x8d6c,
-  0x8d6e, 0x8d7f, 0x8d82, 0x8d84, 0x8d88, 0x8d8d, 0x8d90, 0x8d91,
-  0x8d95, 0x8d9e, 0x8d9f, 0x8da0, 0x8da6, 0x8dab, 0x8dac, 0x8daf,
-  0x8db2, 0x8db5, 0x8db7, 0x8db9, 0x8dbb, 0x8dc0, 0x8dc5, 0x8dc6,
-  0x8dc7, 0x8dc8, 0x8dca, 0x8dce, 0x8dd1, 0x8dd4, 0x8dd5, 0x8dd7,
-  0x8dd9, 0x8de4, 0x8de5, 0x8de7, 0x8dec, 0x8df0, 0x8dbc, 0x8df1,
-  0x8df2, 0x8df4, 0x8dfd, 0x8e01, 0x8e04, 0x8e05, 0x8e06, 0x8e0b,
-  0x8e11, 0x8e14, 0x8e16, 0x8e20, 0x8e21, 0x8e22,
-  /* 0x60 */
-  0x8e23, 0x8e26, 0x8e27, 0x8e31, 0x8e33, 0x8e36, 0x8e37, 0x8e38,
-  0x8e39, 0x8e3d, 0x8e40, 0x8e41, 0x8e4b, 0x8e4d, 0x8e4e, 0x8e4f,
-  0x8e54, 0x8e5b, 0x8e5c, 0x8e5d, 0x8e5e, 0x8e61, 0x8e62, 0x8e69,
-  0x8e6c, 0x8e6d, 0x8e6f, 0x8e70, 0x8e71, 0x8e79, 0x8e7a, 0x8e7b,
-  0x8e82, 0x8e83, 0x8e89, 0x8e90, 0x8e92, 0x8e95, 0x8e9a, 0x8e9b,
-  0x8e9d, 0x8e9e, 0x8ea2, 0x8ea7, 0x8ea9, 0x8ead, 0x8eae, 0x8eb3,
-  0x8eb5, 0x8eba, 0x8ebb, 0x8ec0, 0x8ec1, 0x8ec3, 0x8ec4, 0x8ec7,
-  0x8ecf, 0x8ed1, 0x8ed4, 0x8edc, 0x8ee8, 0x8eee, 0x8ef0, 0x8ef1,
-  0x8ef7, 0x8ef9, 0x8efa, 0x8eed, 0x8f00, 0x8f02, 0x8f07, 0x8f08,
-  0x8f0f, 0x8f10, 0x8f16, 0x8f17, 0x8f18, 0x8f1e, 0x8f20, 0x8f21,
-  0x8f23, 0x8f25, 0x8f27, 0x8f28, 0x8f2c, 0x8f2d, 0x8f2e, 0x8f34,
-  0x8f35, 0x8f36, 0x8f37, 0x8f3a, 0x8f40, 0x8f41,
-  /* 0x61 */
-  0x8f43, 0x8f47, 0x8f4f, 0x8f51, 0x8f52, 0x8f53, 0x8f54, 0x8f55,
-  0x8f58, 0x8f5d, 0x8f5e, 0x8f65, 0x8f9d, 0x8fa0, 0x8fa1, 0x8fa4,
-  0x8fa5, 0x8fa6, 0x8fb5, 0x8fb6, 0x8fb8, 0x8fbe, 0x8fc0, 0x8fc1,
-  0x8fc6, 0x8fca, 0x8fcb, 0x8fcd, 0x8fd0, 0x8fd2, 0x8fd3, 0x8fd5,
-  0x8fe0, 0x8fe3, 0x8fe4, 0x8fe8, 0x8fee, 0x8ff1, 0x8ff5, 0x8ff6,
-  0x8ffb, 0x8ffe, 0x9002, 0x9004, 0x9008, 0x900c, 0x9018, 0x901b,
-  0x9028, 0x9029, 0x902f, 0x902a, 0x902c, 0x902d, 0x9033, 0x9034,
-  0x9037, 0x903f, 0x9043, 0x9044, 0x904c, 0x905b, 0x905d, 0x9062,
-  0x9066, 0x9067, 0x906c, 0x9070, 0x9074, 0x9079, 0x9085, 0x9088,
-  0x908b, 0x908c, 0x908e, 0x9090, 0x9095, 0x9097, 0x9098, 0x9099,
-  0x909b, 0x90a0, 0x90a1, 0x90a2, 0x90a5, 0x90b0, 0x90b2, 0x90b3,
-  0x90b4, 0x90b6, 0x90bd, 0x90cc, 0x90be, 0x90c3,
-  /* 0x62 */
-  0x90c4, 0x90c5, 0x90c7, 0x90c8, 0x90d5, 0x90d7, 0x90d8, 0x90d9,
-  0x90dc, 0x90dd, 0x90df, 0x90e5, 0x90d2, 0x90f6, 0x90eb, 0x90ef,
-  0x90f0, 0x90f4, 0x90fe, 0x90ff, 0x9100, 0x9104, 0x9105, 0x9106,
-  0x9108, 0x910d, 0x9110, 0x9114, 0x9116, 0x9117, 0x9118, 0x911a,
-  0x911c, 0x911e, 0x9120, 0x9125, 0x9122, 0x9123, 0x9127, 0x9129,
-  0x912e, 0x912f, 0x9131, 0x9134, 0x9136, 0x9137, 0x9139, 0x913a,
-  0x913c, 0x913d, 0x9143, 0x9147, 0x9148, 0x914f, 0x9153, 0x9157,
-  0x9159, 0x915a, 0x915b, 0x9161, 0x9164, 0x9167, 0x916d, 0x9174,
-  0x9179, 0x917a, 0x917b, 0x9181, 0x9183, 0x9185, 0x9186, 0x918a,
-  0x918e, 0x9191, 0x9193, 0x9194, 0x9195, 0x9198, 0x919e, 0x91a1,
-  0x91a6, 0x91a8, 0x91ac, 0x91ad, 0x91ae, 0x91b0, 0x91b1, 0x91b2,
-  0x91b3, 0x91b6, 0x91bb, 0x91bc, 0x91bd, 0x91bf,
-  /* 0x63 */
-  0x91c2, 0x91c3, 0x91c5, 0x91d3, 0x91d4, 0x91d7, 0x91d9, 0x91da,
-  0x91de, 0x91e4, 0x91e5, 0x91e9, 0x91ea, 0x91ec, 0x91ed, 0x91ee,
-  0x91ef, 0x91f0, 0x91f1, 0x91f7, 0x91f9, 0x91fb, 0x91fd, 0x9200,
-  0x9201, 0x9204, 0x9205, 0x9206, 0x9207, 0x9209, 0x920a, 0x920c,
-  0x9210, 0x9212, 0x9213, 0x9216, 0x9218, 0x921c, 0x921d, 0x9223,
-  0x9224, 0x9225, 0x9226, 0x9228, 0x922e, 0x922f, 0x9230, 0x9233,
-  0x9235, 0x9236, 0x9238, 0x9239, 0x923a, 0x923c, 0x923e, 0x9240,
-  0x9242, 0x9243, 0x9246, 0x9247, 0x924a, 0x924d, 0x924e, 0x924f,
-  0x9251, 0x9258, 0x9259, 0x925c, 0x925d, 0x9260, 0x9261, 0x9265,
-  0x9267, 0x9268, 0x9269, 0x926e, 0x926f, 0x9270, 0x9275, 0x9276,
-  0x9277, 0x9278, 0x9279, 0x927b, 0x927c, 0x927d, 0x927f, 0x9288,
-  0x9289, 0x928a, 0x928d, 0x928e, 0x9292, 0x9297,
-  /* 0x64 */
-  0x9299, 0x929f, 0x92a0, 0x92a4, 0x92a5, 0x92a7, 0x92a8, 0x92ab,
-  0x92af, 0x92b2, 0x92b6, 0x92b8, 0x92ba, 0x92bb, 0x92bc, 0x92bd,
-  0x92bf, 0x92c0, 0x92c1, 0x92c2, 0x92c3, 0x92c5, 0x92c6, 0x92c7,
-  0x92c8, 0x92cb, 0x92cc, 0x92cd, 0x92ce, 0x92d0, 0x92d3, 0x92d5,
-  0x92d7, 0x92d8, 0x92d9, 0x92dc, 0x92dd, 0x92df, 0x92e0, 0x92e1,
-  0x92e3, 0x92e5, 0x92e7, 0x92e8, 0x92ec, 0x92ee, 0x92f0, 0x92f9,
-  0x92fb, 0x92ff, 0x9300, 0x9302, 0x9308, 0x930d, 0x9311, 0x9314,
-  0x9315, 0x931c, 0x931d, 0x931e, 0x931f, 0x9321, 0x9324, 0x9325,
-  0x9327, 0x9329, 0x932a, 0x9333, 0x9334, 0x9336, 0x9337, 0x9347,
-  0x9348, 0x9349, 0x9350, 0x9351, 0x9352, 0x9355, 0x9357, 0x9358,
-  0x935a, 0x935e, 0x9364, 0x9365, 0x9367, 0x9369, 0x936a, 0x936d,
-  0x936f, 0x9370, 0x9371, 0x9373, 0x9374, 0x9376,
-  /* 0x65 */
-  0x937a, 0x937d, 0x937f, 0x9380, 0x9381, 0x9382, 0x9388, 0x938a,
-  0x938b, 0x938d, 0x938f, 0x9392, 0x9395, 0x9398, 0x939b, 0x939e,
-  0x93a1, 0x93a3, 0x93a4, 0x93a6, 0x93a8, 0x93ab, 0x93b4, 0x93b5,
-  0x93b6, 0x93ba, 0x93a9, 0x93c1, 0x93c4, 0x93c5, 0x93c6, 0x93c7,
-  0x93c9, 0x93ca, 0x93cb, 0x93cc, 0x93cd, 0x93d3, 0x93d9, 0x93dc,
-  0x93de, 0x93df, 0x93e2, 0x93e6, 0x93e7, 0x93f9, 0x93f7, 0x93f8,
-  0x93fa, 0x93fb, 0x93fd, 0x9401, 0x9402, 0x9404, 0x9408, 0x9409,
-  0x940d, 0x940e, 0x940f, 0x9415, 0x9416, 0x9417, 0x941f, 0x942e,
-  0x942f, 0x9431, 0x9432, 0x9433, 0x9434, 0x943b, 0x943f, 0x943d,
-  0x9443, 0x9445, 0x9448, 0x944a, 0x944c, 0x9455, 0x9459, 0x945c,
-  0x945f, 0x9461, 0x9463, 0x9468, 0x946b, 0x946d, 0x946e, 0x946f,
-  0x9471, 0x9472, 0x9484, 0x9483, 0x9578, 0x9579,
-  /* 0x66 */
-  0x957e, 0x9584, 0x9588, 0x958c, 0x958d, 0x958e, 0x959d, 0x959e,
-  0x959f, 0x95a1, 0x95a6, 0x95a9, 0x95ab, 0x95ac, 0x95b4, 0x95b6,
-  0x95ba, 0x95bd, 0x95bf, 0x95c6, 0x95c8, 0x95c9, 0x95cb, 0x95d0,
-  0x95d1, 0x95d2, 0x95d3, 0x95d9, 0x95da, 0x95dd, 0x95de, 0x95df,
-  0x95e0, 0x95e4, 0x95e6, 0x961d, 0x961e, 0x9622, 0x9624, 0x9625,
-  0x9626, 0x962c, 0x9631, 0x9633, 0x9637, 0x9638, 0x9639, 0x963a,
-  0x963c, 0x963d, 0x9641, 0x9652, 0x9654, 0x9656, 0x9657, 0x9658,
-  0x9661, 0x966e, 0x9674, 0x967b, 0x967c, 0x967e, 0x967f, 0x9681,
-  0x9682, 0x9683, 0x9684, 0x9689, 0x9691, 0x9696, 0x969a, 0x969d,
-  0x969f, 0x96a4, 0x96a5, 0x96a6, 0x96a9, 0x96ae, 0x96af, 0x96b3,
-  0x96ba, 0x96ca, 0x96d2, 0x5db2, 0x96d8, 0x96da, 0x96dd, 0x96de,
-  0x96df, 0x96e9, 0x96ef, 0x96f1, 0x96fa, 0x9702,
-  /* 0x67 */
-  0x9703, 0x9705, 0x9709, 0x971a, 0x971b, 0x971d, 0x9721, 0x9722,
-  0x9723, 0x9728, 0x9731, 0x9733, 0x9741, 0x9743, 0x974a, 0x974e,
-  0x974f, 0x9755, 0x9757, 0x9758, 0x975a, 0x975b, 0x9763, 0x9767,
-  0x976a, 0x976e, 0x9773, 0x9776, 0x9777, 0x9778, 0x977b, 0x977d,
-  0x977f, 0x9780, 0x9789, 0x9795, 0x9796, 0x9797, 0x9799, 0x979a,
-  0x979e, 0x979f, 0x97a2, 0x97ac, 0x97ae, 0x97b1, 0x97b2, 0x97b5,
-  0x97b6, 0x97b8, 0x97b9, 0x97ba, 0x97bc, 0x97be, 0x97bf, 0x97c1,
-  0x97c4, 0x97c5, 0x97c7, 0x97c9, 0x97ca, 0x97cc, 0x97cd, 0x97ce,
-  0x97d0, 0x97d1, 0x97d4, 0x97d7, 0x97d8, 0x97d9, 0x97dd, 0x97de,
-  0x97e0, 0x97db, 0x97e1, 0x97e4, 0x97ef, 0x97f1, 0x97f4, 0x97f7,
-  0x97f8, 0x97fa, 0x9807, 0x980a, 0x9819, 0x980d, 0x980e, 0x9814,
-  0x9816, 0x981c, 0x981e, 0x9820, 0x9823, 0x9826,
-  /* 0x68 */
-  0x982b, 0x982e, 0x982f, 0x9830, 0x9832, 0x9833, 0x9835, 0x9825,
-  0x983e, 0x9844, 0x9847, 0x984a, 0x9851, 0x9852, 0x9853, 0x9856,
-  0x9857, 0x9859, 0x985a, 0x9862, 0x9863, 0x9865, 0x9866, 0x986a,
-  0x986c, 0x98ab, 0x98ad, 0x98ae, 0x98b0, 0x98b4, 0x98b7, 0x98b8,
-  0x98ba, 0x98bb, 0x98bf, 0x98c2, 0x98c5, 0x98c8, 0x98cc, 0x98e1,
-  0x98e3, 0x98e5, 0x98e6, 0x98e7, 0x98ea, 0x98f3, 0x98f6, 0x9902,
-  0x9907, 0x9908, 0x9911, 0x9915, 0x9916, 0x9917, 0x991a, 0x991b,
-  0x991c, 0x991f, 0x9922, 0x9926, 0x9927, 0x992b, 0x9931, 0x9932,
-  0x9933, 0x9934, 0x9935, 0x9939, 0x993a, 0x993b, 0x993c, 0x9940,
-  0x9941, 0x9946, 0x9947, 0x9948, 0x994d, 0x994e, 0x9954, 0x9958,
-  0x9959, 0x995b, 0x995c, 0x995e, 0x995f, 0x9960, 0x999b, 0x999d,
-  0x999f, 0x99a6, 0x99b0, 0x99b1, 0x99b2, 0x99b5,
-  /* 0x69 */
-  0x99b9, 0x99ba, 0x99bd, 0x99bf, 0x99c3, 0x99c9, 0x99d3, 0x99d4,
-  0x99d9, 0x99da, 0x99dc, 0x99de, 0x99e7, 0x99ea, 0x99eb, 0x99ec,
-  0x99f0, 0x99f4, 0x99f5, 0x99f9, 0x99fd, 0x99fe, 0x9a02, 0x9a03,
-  0x9a04, 0x9a0b, 0x9a0c, 0x9a10, 0x9a11, 0x9a16, 0x9a1e, 0x9a20,
-  0x9a22, 0x9a23, 0x9a24, 0x9a27, 0x9a2d, 0x9a2e, 0x9a33, 0x9a35,
-  0x9a36, 0x9a38, 0x9a47, 0x9a41, 0x9a44, 0x9a4a, 0x9a4b, 0x9a4c,
-  0x9a4e, 0x9a51, 0x9a54, 0x9a56, 0x9a5d, 0x9aaa, 0x9aac, 0x9aae,
-  0x9aaf, 0x9ab2, 0x9ab4, 0x9ab5, 0x9ab6, 0x9ab9, 0x9abb, 0x9abe,
-  0x9abf, 0x9ac1, 0x9ac3, 0x9ac6, 0x9ac8, 0x9ace, 0x9ad0, 0x9ad2,
-  0x9ad5, 0x9ad6, 0x9ad7, 0x9adb, 0x9adc, 0x9ae0, 0x9ae4, 0x9ae5,
-  0x9ae7, 0x9ae9, 0x9aec, 0x9af2, 0x9af3, 0x9af5, 0x9af9, 0x9afa,
-  0x9afd, 0x9aff, 0x9b00, 0x9b01, 0x9b02, 0x9b03,
-  /* 0x6a */
-  0x9b04, 0x9b05, 0x9b08, 0x9b09, 0x9b0b, 0x9b0c, 0x9b0d, 0x9b0e,
-  0x9b10, 0x9b12, 0x9b16, 0x9b19, 0x9b1b, 0x9b1c, 0x9b20, 0x9b26,
-  0x9b2b, 0x9b2d, 0x9b33, 0x9b34, 0x9b35, 0x9b37, 0x9b39, 0x9b3a,
-  0x9b3d, 0x9b48, 0x9b4b, 0x9b4c, 0x9b55, 0x9b56, 0x9b57, 0x9b5b,
-  0x9b5e, 0x9b61, 0x9b63, 0x9b65, 0x9b66, 0x9b68, 0x9b6a, 0x9b6b,
-  0x9b6c, 0x9b6d, 0x9b6e, 0x9b73, 0x9b75, 0x9b77, 0x9b78, 0x9b79,
-  0x9b7f, 0x9b80, 0x9b84, 0x9b85, 0x9b86, 0x9b87, 0x9b89, 0x9b8a,
-  0x9b8b, 0x9b8d, 0x9b8f, 0x9b90, 0x9b94, 0x9b9a, 0x9b9d, 0x9b9e,
-  0x9ba6, 0x9ba7, 0x9ba9, 0x9bac, 0x9bb0, 0x9bb1, 0x9bb2, 0x9bb7,
-  0x9bb8, 0x9bbb, 0x9bbc, 0x9bbe, 0x9bbf, 0x9bc1, 0x9bc7, 0x9bc8,
-  0x9bce, 0x9bd0, 0x9bd7, 0x9bd8, 0x9bdd, 0x9bdf, 0x9be5, 0x9be7,
-  0x9bea, 0x9beb, 0x9bef, 0x9bf3, 0x9bf7, 0x9bf8,
-  /* 0x6b */
-  0x9bf9, 0x9bfa, 0x9bfd, 0x9bff, 0x9c00, 0x9c02, 0x9c0b, 0x9c0f,
-  0x9c11, 0x9c16, 0x9c18, 0x9c19, 0x9c1a, 0x9c1c, 0x9c1e, 0x9c22,
-  0x9c23, 0x9c26, 0x9c27, 0x9c28, 0x9c29, 0x9c2a, 0x9c31, 0x9c35,
-  0x9c36, 0x9c37, 0x9c3d, 0x9c41, 0x9c43, 0x9c44, 0x9c45, 0x9c49,
-  0x9c4a, 0x9c4e, 0x9c4f, 0x9c50, 0x9c53, 0x9c54, 0x9c56, 0x9c58,
-  0x9c5b, 0x9c5d, 0x9c5e, 0x9c5f, 0x9c63, 0x9c69, 0x9c6a, 0x9c5c,
-  0x9c6b, 0x9c68, 0x9c6e, 0x9c70, 0x9c72, 0x9c75, 0x9c77, 0x9c7b,
-  0x9ce6, 0x9cf2, 0x9cf7, 0x9cf9, 0x9d0b, 0x9d02, 0x9d11, 0x9d17,
-  0x9d18, 0x9d1c, 0x9d1d, 0x9d1e, 0x9d2f, 0x9d30, 0x9d32, 0x9d33,
-  0x9d34, 0x9d3a, 0x9d3c, 0x9d45, 0x9d3d, 0x9d42, 0x9d43, 0x9d47,
-  0x9d4a, 0x9d53, 0x9d54, 0x9d5f, 0x9d63, 0x9d62, 0x9d65, 0x9d69,
-  0x9d6a, 0x9d6b, 0x9d70, 0x9d76, 0x9d77, 0x9d7b,
-  /* 0x6c */
-  0x9d7c, 0x9d7e, 0x9d83, 0x9d84, 0x9d86, 0x9d8a, 0x9d8d, 0x9d8e,
-  0x9d92, 0x9d93, 0x9d95, 0x9d96, 0x9d97, 0x9d98, 0x9da1, 0x9daa,
-  0x9dac, 0x9dae, 0x9db1, 0x9db5, 0x9db9, 0x9dbc, 0x9dbf, 0x9dc3,
-  0x9dc7, 0x9dc9, 0x9dca, 0x9dd4, 0x9dd5, 0x9dd6, 0x9dd7, 0x9dda,
-  0x9dde, 0x9ddf, 0x9de0, 0x9de5, 0x9de7, 0x9de9, 0x9deb, 0x9dee,
-  0x9df0, 0x9df3, 0x9df4, 0x9dfe, 0x9e0a, 0x9e02, 0x9e07, 0x9e0e,
-  0x9e10, 0x9e11, 0x9e12, 0x9e15, 0x9e16, 0x9e19, 0x9e1c, 0x9e1d,
-  0x9e7a, 0x9e7b, 0x9e7c, 0x9e80, 0x9e82, 0x9e83, 0x9e84, 0x9e85,
-  0x9e87, 0x9e8e, 0x9e8f, 0x9e96, 0x9e98, 0x9e9b, 0x9e9e, 0x9ea4,
-  0x9ea8, 0x9eac, 0x9eae, 0x9eaf, 0x9eb0, 0x9eb3, 0x9eb4, 0x9eb5,
-  0x9ec6, 0x9ec8, 0x9ecb, 0x9ed5, 0x9edf, 0x9ee4, 0x9ee7, 0x9eec,
-  0x9eed, 0x9eee, 0x9ef0, 0x9ef1, 0x9ef2, 0x9ef5,
-  /* 0x6d */
-  0x9ef8, 0x9eff, 0x9f02, 0x9f03, 0x9f09, 0x9f0f, 0x9f10, 0x9f11,
-  0x9f12, 0x9f14, 0x9f16, 0x9f17, 0x9f19, 0x9f1a, 0x9f1b, 0x9f1f,
-  0x9f22, 0x9f26, 0x9f2a, 0x9f2b, 0x9f2f, 0x9f31, 0x9f32, 0x9f34,
-  0x9f37, 0x9f39, 0x9f3a, 0x9f3c, 0x9f3d, 0x9f3f, 0x9f41, 0x9f43,
-  0x9f44, 0x9f45, 0x9f46, 0x9f47, 0x9f53, 0x9f55, 0x9f56, 0x9f57,
-  0x9f58, 0x9f5a, 0x9f5d, 0x9f5e, 0x9f68, 0x9f69, 0x9f6d, 0x9f6e,
-  0x9f6f, 0x9f70, 0x9f71, 0x9f73, 0x9f75, 0x9f7a, 0x9f7d, 0x9f8f,
-  0x9f90, 0x9f91, 0x9f92, 0x9f94, 0x9f96, 0x9f97, 0x9f9e, 0x9fa1,
-  0x9fa2, 0x9fa3, 0x9fa5,
-};
-
-static int
-jisx0212_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c1 = s[0];
-  if ((c1 == 0x22) || (c1 >= 0x26 && c1 <= 0x27) || (c1 >= 0x29 && c1 <= 0x2b) || (c1 >= 0x30 && c1 <= 0x6d)) {
-    if (n >= 2) {
-      unsigned char c2 = s[1];
-      if (c2 >= 0x21 && c2 < 0x7f) {
-        unsigned int i = 94 * (c1 - 0x21) + (c2 - 0x21);
-        unsigned short wc = 0xfffd;
-        if (i < 470) {
-          if (i < 175)
-            wc = jisx0212_2uni_page22[i-94];
-        } else if (i < 752) {
-          if (i < 658)
-            wc = jisx0212_2uni_page26[i-470];
-        } else if (i < 1410) {
-          if (i < 1027)
-            wc = jisx0212_2uni_page29[i-752];
-        } else {
-          if (i < 7211)
-            wc = jisx0212_2uni_page30[i-1410];
-        }
-        if (wc != 0xfffd) {
-          *pwc = (wchar_t) wc;
-          return 2;
-        }
-      }
-      return RET_ILSEQ;
-    }
-    return RET_TOOFEW(0);
-  }
-  return RET_ILSEQ;
-}
-
-static const unsigned short jisx0212_2charset[6067] = {
-  0x2237, 0x2242, 0x2270, 0x2243, 0x226d, 0x226c, 0x226e, 0x2234,
-  0x2231, 0x226b, 0x2244, 0x2a22, 0x2a21, 0x2a24, 0x2a2a, 0x2a23,
-  0x2a29, 0x2921, 0x2a2e, 0x2a32, 0x2a31, 0x2a34, 0x2a33, 0x2a40,
-  0x2a3f, 0x2a42, 0x2a41, 0x2a50, 0x2a52, 0x2a51, 0x2a54, 0x2a58,
-  0x2a53, 0x292c, 0x2a63, 0x2a62, 0x2a65, 0x2a64, 0x2a72, 0x2930,
-  0x294e, 0x2b22, 0x2b21, 0x2b24, 0x2b2a, 0x2b23, 0x2b29, 0x2941,
-  0x2b2e, 0x2b32, 0x2b31, 0x2b34, 0x2b33, 0x2b40, 0x2b3f, 0x2b42,
-  0x2b41, 0x2943, 0x2b50, 0x2b52, 0x2b51, 0x2b54, 0x2b58, 0x2b53,
-  0x294c, 0x2b63, 0x2b62, 0x2b65, 0x2b64, 0x2b72, 0x2950, 0x2b73,
-  0x2a27, 0x2b27, 0x2a25, 0x2b25, 0x2a28, 0x2b28, 0x2a2b, 0x2b2b,
-  0x2a2c, 0x2b2c, 0x2a2f, 0x2b2f, 0x2a2d, 0x2b2d, 0x2a30, 0x2b30,
-  0x2922, 0x2942, 0x2a37, 0x2b37, 0x2a36, 0x2b36, 0x2a38, 0x2b38,
-  0x2a35, 0x2b35, 0x2a3a, 0x2b3a, 0x2a3b, 0x2b3b, 0x2a3d, 0x2b3d,
-  0x2a3c, 0x2a3e, 0x2b3e, 0x2924, 0x2944, 0x2a47, 0x2b47, 0x2a45,
-  0x2b45, 0x2a46, 0x2b46, 0x2a44, 0x2945, 0x2926, 0x2946, 0x2a48,
-  0x2b48, 0x2a49, 0x2b49, 0x2947, 0x2a4a, 0x2b4a, 0x2a4c, 0x2b4c,
-  0x2a4b, 0x2b4b, 0x2929, 0x2949, 0x2928, 0x2948, 0x2a4d, 0x2b4d,
-  0x2a4f, 0x2b4f, 0x2a4e, 0x2b4e, 0x294a, 0x292b, 0x294b, 0x2a57,
-  0x2b57, 0x2a56, 0x2b56, 0x292d, 0x294d, 0x2a59, 0x2b59, 0x2a5b,
-  0x2b5b, 0x2a5a, 0x2b5a, 0x2a5c, 0x2b5c, 0x2a5d, 0x2b5d, 0x2a5f,
-  0x2b5f, 0x2a5e, 0x2b5e, 0x2a61, 0x2b61, 0x2a60, 0x2b60, 0x292f,
-  0x294f, 0x2a6c, 0x2b6c, 0x2a69, 0x2b69, 0x2a66, 0x2b66, 0x2a6b,
-  0x2b6b, 0x2a68, 0x2b68, 0x2a6a, 0x2b6a, 0x2a71, 0x2b71, 0x2a74,
-  0x2b74, 0x2a73, 0x2a75, 0x2b75, 0x2a77, 0x2b77, 0x2a76, 0x2b76,
-  0x2a26, 0x2b26, 0x2a43, 0x2b43, 0x2a55, 0x2b55, 0x2a67, 0x2b67,
-  0x2a70, 0x2b70, 0x2a6d, 0x2b6d, 0x2a6f, 0x2b6f, 0x2a6e, 0x2b6e,
-  0x2b39, 0x2230, 0x222f, 0x2232, 0x2236, 0x2235, 0x2233, 0x2238,
-  0x2239, 0x2661, 0x2662, 0x2663, 0x2664, 0x2667, 0x2669, 0x266c,
-  0x2676, 0x2665, 0x266a, 0x2671, 0x2672, 0x2673, 0x2674, 0x267b,
-  0x2678, 0x2675, 0x267a, 0x2677, 0x2679, 0x267c, 0x2742, 0x2743,
-  0x2744, 0x2745, 0x2746, 0x2747, 0x2748, 0x2749, 0x274a, 0x274b,
-  0x274c, 0x274d, 0x274e, 0x2772, 0x2773, 0x2774, 0x2775, 0x2776,
-  0x2777, 0x2778, 0x2779, 0x277a, 0x277b, 0x277c, 0x277d, 0x277e,
-  0x2271, 0x226f, 0x3021, 0x3022, 0x3023, 0x3024, 0x3025, 0x3026,
-  0x3027, 0x3028, 0x3029, 0x302a, 0x302b, 0x302c, 0x302d, 0x302e,
-  0x302f, 0x3030, 0x3031, 0x3032, 0x3033, 0x3034, 0x3035, 0x3036,
-  0x3037, 0x3038, 0x3039, 0x303a, 0x303b, 0x303c, 0x303d, 0x303e,
-  0x303f, 0x3040, 0x3041, 0x3042, 0x3043, 0x3044, 0x3045, 0x3046,
-  0x3047, 0x3048, 0x3049, 0x304a, 0x304b, 0x304c, 0x304d, 0x304e,
-  0x304f, 0x3050, 0x3051, 0x3052, 0x3053, 0x3054, 0x3055, 0x3056,
-  0x3057, 0x3058, 0x3059, 0x305a, 0x305b, 0x305c, 0x305d, 0x305e,
-  0x3060, 0x3061, 0x3062, 0x3063, 0x3064, 0x3065, 0x3066, 0x3067,
-  0x3068, 0x3069, 0x306a, 0x306b, 0x306c, 0x306d, 0x306e, 0x306f,
-  0x3070, 0x305f, 0x3071, 0x3072, 0x3073, 0x3074, 0x3075, 0x3076,
-  0x3077, 0x3078, 0x3079, 0x307a, 0x307b, 0x307c, 0x307d, 0x307e,
-  0x3121, 0x3122, 0x3123, 0x3124, 0x3125, 0x3126, 0x3127, 0x3128,
-  0x3129, 0x312a, 0x312b, 0x312c, 0x312d, 0x312e, 0x312f, 0x3130,
-  0x3131, 0x3132, 0x3133, 0x3134, 0x3135, 0x3136, 0x3137, 0x3138,
-  0x3139, 0x313a, 0x313b, 0x313c, 0x313d, 0x313e, 0x313f, 0x3140,
-  0x3141, 0x3142, 0x3143, 0x3144, 0x3145, 0x3146, 0x3147, 0x3148,
-  0x3149, 0x314a, 0x314b, 0x314c, 0x314d, 0x314e, 0x314f, 0x3150,
-  0x3151, 0x3152, 0x3153, 0x3154, 0x3155, 0x3156, 0x3157, 0x3158,
-  0x3159, 0x315a, 0x315b, 0x315c, 0x315d, 0x315e, 0x3176, 0x315f,
-  0x3160, 0x3161, 0x3162, 0x3163, 0x3164, 0x3165, 0x3166, 0x3167,
-  0x3168, 0x3169, 0x316a, 0x316b, 0x316c, 0x316d, 0x316e, 0x316f,
-  0x3170, 0x3171, 0x3172, 0x3173, 0x3174, 0x3175, 0x3177, 0x3178,
-  0x3179, 0x317a, 0x317b, 0x317c, 0x317d, 0x317e, 0x3221, 0x3222,
-  0x3223, 0x3224, 0x3225, 0x3226, 0x3227, 0x3228, 0x3229, 0x322a,
-  0x322b, 0x322c, 0x322d, 0x322e, 0x322f, 0x3230, 0x3231, 0x3232,
-  0x3233, 0x3234, 0x3235, 0x3236, 0x3237, 0x3238, 0x3239, 0x323a,
-  0x323b, 0x323c, 0x323d, 0x323e, 0x323f, 0x3240, 0x3241, 0x3242,
-  0x3243, 0x3244, 0x3245, 0x3251, 0x3246, 0x3247, 0x3248, 0x3249,
-  0x324a, 0x324b, 0x324c, 0x324d, 0x324e, 0x324f, 0x3250, 0x3252,
-  0x3253, 0x3254, 0x3255, 0x3256, 0x3257, 0x3258, 0x3259, 0x325a,
-  0x325b, 0x325c, 0x325d, 0x325e, 0x325f, 0x3260, 0x3261, 0x3262,
-  0x3263, 0x3264, 0x3265, 0x3266, 0x3267, 0x3268, 0x3269, 0x326a,
-  0x326b, 0x326c, 0x326d, 0x326e, 0x326f, 0x3270, 0x3271, 0x3272,
-  0x3273, 0x3274, 0x3275, 0x3276, 0x3277, 0x3278, 0x3279, 0x327a,
-  0x327b, 0x327c, 0x327d, 0x327e, 0x3321, 0x3322, 0x3323, 0x3324,
-  0x3325, 0x3326, 0x3327, 0x3328, 0x3329, 0x332a, 0x332b, 0x332c,
-  0x332d, 0x332e, 0x332f, 0x3330, 0x3331, 0x3332, 0x3333, 0x3334,
-  0x3335, 0x3336, 0x3337, 0x3338, 0x3339, 0x333a, 0x333b, 0x333c,
-  0x333d, 0x333e, 0x333f, 0x3340, 0x3341, 0x3342, 0x3343, 0x3344,
-  0x3345, 0x3346, 0x3347, 0x3348, 0x3349, 0x334a, 0x334b, 0x334c,
-  0x334d, 0x334e, 0x334f, 0x3350, 0x3351, 0x3352, 0x3353, 0x3354,
-  0x3355, 0x3356, 0x3357, 0x3358, 0x3359, 0x335a, 0x335b, 0x335c,
-  0x335d, 0x335e, 0x335f, 0x3360, 0x3361, 0x3362, 0x3363, 0x3364,
-  0x3365, 0x3366, 0x3367, 0x3368, 0x3369, 0x336a, 0x336b, 0x336c,
-  0x336d, 0x336e, 0x336f, 0x3370, 0x3371, 0x3372, 0x3373, 0x3374,
-  0x3375, 0x3376, 0x3377, 0x3378, 0x3379, 0x337a, 0x337b, 0x337c,
-  0x337d, 0x337e, 0x3421, 0x3422, 0x3423, 0x3424, 0x3425, 0x3426,
-  0x3427, 0x3428, 0x3429, 0x342a, 0x342b, 0x342c, 0x342d, 0x342e,
-  0x342f, 0x3430, 0x3431, 0x3432, 0x3433, 0x3434, 0x3435, 0x3436,
-  0x3438, 0x3437, 0x3439, 0x343a, 0x343b, 0x343c, 0x343d, 0x343e,
-  0x343f, 0x3440, 0x3441, 0x3442, 0x3443, 0x3444, 0x3445, 0x3446,
-  0x3447, 0x3448, 0x3449, 0x344a, 0x344b, 0x344c, 0x344d, 0x344e,
-  0x344f, 0x3450, 0x3451, 0x3452, 0x3453, 0x3454, 0x3455, 0x3456,
-  0x3457, 0x3458, 0x3459, 0x345a, 0x345b, 0x345c, 0x345d, 0x345e,
-  0x345f, 0x3460, 0x3461, 0x3462, 0x3463, 0x3464, 0x3465, 0x3466,
-  0x3467, 0x3468, 0x3469, 0x346a, 0x346b, 0x346c, 0x346d, 0x346e,
-  0x346f, 0x3470, 0x3471, 0x3472, 0x3473, 0x3474, 0x3475, 0x3476,
-  0x3477, 0x3478, 0x3479, 0x347a, 0x347b, 0x347c, 0x347d, 0x347e,
-  0x3521, 0x3522, 0x3523, 0x3524, 0x3525, 0x3526, 0x3527, 0x3528,
-  0x3529, 0x352a, 0x352b, 0x352c, 0x352d, 0x352e, 0x352f, 0x3530,
-  0x3531, 0x3532, 0x3533, 0x3534, 0x3535, 0x3536, 0x3537, 0x3538,
-  0x3539, 0x353a, 0x353b, 0x353c, 0x353d, 0x353e, 0x353f, 0x3540,
-  0x3541, 0x3542, 0x3543, 0x3544, 0x3545, 0x3546, 0x3547, 0x3548,
-  0x3549, 0x354a, 0x354b, 0x354c, 0x354d, 0x354e, 0x354f, 0x3550,
-  0x3551, 0x3552, 0x3553, 0x3554, 0x3555, 0x3556, 0x3557, 0x3558,
-  0x3559, 0x355a, 0x355b, 0x355c, 0x355d, 0x355e, 0x355f, 0x3560,
-  0x3561, 0x3562, 0x3563, 0x3564, 0x3565, 0x3566, 0x3567, 0x3568,
-  0x3569, 0x356a, 0x356b, 0x356c, 0x356d, 0x356e, 0x356f, 0x3570,
-  0x3571, 0x3572, 0x3573, 0x3574, 0x3575, 0x3576, 0x3577, 0x3578,
-  0x3579, 0x357a, 0x357b, 0x357c, 0x357d, 0x357e, 0x3621, 0x3622,
-  0x3623, 0x3624, 0x3625, 0x3626, 0x3627, 0x3628, 0x3629, 0x362a,
-  0x362b, 0x362c, 0x362d, 0x362e, 0x362f, 0x3630, 0x3631, 0x3632,
-  0x3633, 0x3634, 0x3635, 0x3636, 0x3637, 0x3638, 0x3639, 0x363a,
-  0x363b, 0x363c, 0x363d, 0x363e, 0x363f, 0x3640, 0x3641, 0x3642,
-  0x3643, 0x3644, 0x3645, 0x3646, 0x3647, 0x3648, 0x3649, 0x364a,
-  0x364b, 0x364c, 0x364d, 0x364e, 0x364f, 0x3650, 0x3651, 0x3652,
-  0x3653, 0x3654, 0x3655, 0x3656, 0x3657, 0x3658, 0x3659, 0x365a,
-  0x365b, 0x365c, 0x365d, 0x365e, 0x365f, 0x3660, 0x3661, 0x3662,
-  0x3663, 0x3664, 0x3665, 0x3666, 0x3667, 0x3668, 0x3669, 0x366a,
-  0x366b, 0x366c, 0x366d, 0x3670, 0x3671, 0x366e, 0x366f, 0x3672,
-  0x3673, 0x3674, 0x3675, 0x3676, 0x3677, 0x3678, 0x3679, 0x367a,
-  0x367b, 0x367d, 0x367e, 0x367c, 0x3721, 0x3722, 0x3723, 0x3724,
-  0x3725, 0x3726, 0x3727, 0x3728, 0x3729, 0x372a, 0x372b, 0x372c,
-  0x372d, 0x372e, 0x372f, 0x3730, 0x3731, 0x3732, 0x3733, 0x3734,
-  0x3735, 0x3736, 0x3737, 0x3738, 0x3739, 0x373a, 0x373b, 0x373c,
-  0x373d, 0x373e, 0x373f, 0x3740, 0x3741, 0x3742, 0x3743, 0x3744,
-  0x3745, 0x3746, 0x3747, 0x3748, 0x3749, 0x374a, 0x374b, 0x374c,
-  0x374d, 0x374e, 0x374f, 0x3750, 0x3751, 0x3752, 0x3753, 0x3754,
-  0x3755, 0x3756, 0x3757, 0x3760, 0x3758, 0x3759, 0x375a, 0x375b,
-  0x375c, 0x375d, 0x375e, 0x375f, 0x3761, 0x3762, 0x3763, 0x3764,
-  0x3765, 0x3766, 0x3767, 0x3768, 0x3769, 0x376a, 0x376b, 0x376c,
-  0x376d, 0x377e, 0x376e, 0x376f, 0x3770, 0x3771, 0x3772, 0x3773,
-  0x3774, 0x3775, 0x3776, 0x3777, 0x3778, 0x3779, 0x377a, 0x377b,
-  0x377c, 0x377d, 0x3821, 0x3822, 0x3823, 0x3824, 0x3825, 0x3826,
-  0x3827, 0x3828, 0x3829, 0x382a, 0x382b, 0x382c, 0x382d, 0x382e,
-  0x382f, 0x3830, 0x3831, 0x3832, 0x3833, 0x3834, 0x3835, 0x3836,
-  0x3837, 0x3838, 0x3839, 0x383a, 0x383b, 0x383c, 0x383d, 0x383e,
-  0x383f, 0x3840, 0x3841, 0x3842, 0x3843, 0x3844, 0x3845, 0x3846,
-  0x3847, 0x3848, 0x3849, 0x384a, 0x384b, 0x384c, 0x384d, 0x384e,
-  0x3850, 0x3851, 0x384f, 0x3852, 0x3853, 0x3854, 0x3855, 0x3856,
-  0x3857, 0x3858, 0x3859, 0x385a, 0x385b, 0x385c, 0x385d, 0x385e,
-  0x385f, 0x3860, 0x3861, 0x3862, 0x3863, 0x3864, 0x3865, 0x3867,
-  0x3868, 0x3869, 0x386a, 0x386b, 0x386c, 0x386d, 0x386e, 0x386f,
-  0x3870, 0x3871, 0x3872, 0x3873, 0x3874, 0x3875, 0x3876, 0x3877,
-  0x3878, 0x3879, 0x387a, 0x387b, 0x387c, 0x387d, 0x387e, 0x3921,
-  0x3922, 0x3923, 0x3924, 0x3925, 0x3926, 0x3927, 0x3928, 0x3929,
-  0x392a, 0x392b, 0x392c, 0x392d, 0x392e, 0x392f, 0x3930, 0x3931,
-  0x3932, 0x3933, 0x3934, 0x3935, 0x3936, 0x3937, 0x3938, 0x3939,
-  0x393a, 0x393b, 0x393c, 0x393d, 0x393e, 0x393f, 0x3940, 0x3941,
-  0x3942, 0x3943, 0x3944, 0x3945, 0x3946, 0x3947, 0x3948, 0x3949,
-  0x394a, 0x394b, 0x394c, 0x394d, 0x394e, 0x394f, 0x3950, 0x3951,
-  0x3952, 0x3953, 0x3954, 0x3955, 0x3956, 0x3957, 0x3958, 0x3959,
-  0x395a, 0x395b, 0x395c, 0x395d, 0x395e, 0x395f, 0x3960, 0x3961,
-  0x3962, 0x3963, 0x3964, 0x3965, 0x3966, 0x3967, 0x3968, 0x3969,
-  0x396a, 0x396b, 0x396c, 0x396d, 0x396e, 0x396f, 0x3970, 0x3971,
-  0x3972, 0x3973, 0x3974, 0x3975, 0x3976, 0x3977, 0x3978, 0x3979,
-  0x397a, 0x397b, 0x397c, 0x397d, 0x397e, 0x3a21, 0x3a22, 0x3a23,
-  0x3a24, 0x3a25, 0x3a26, 0x3a27, 0x3a28, 0x3a29, 0x3a2a, 0x3a2b,
-  0x3a2c, 0x3a2d, 0x3a2e, 0x3a2f, 0x3a30, 0x3a31, 0x3a33, 0x3a34,
-  0x3a35, 0x3a36, 0x3a37, 0x3a38, 0x3a32, 0x3a39, 0x3a3a, 0x3a3b,
-  0x3a3c, 0x3a3d, 0x3a3e, 0x3a3f, 0x3a40, 0x3a41, 0x3a42, 0x3a43,
-  0x3a44, 0x3a45, 0x3a46, 0x3a47, 0x3a48, 0x3a49, 0x3a4a, 0x3a4b,
-  0x3a4c, 0x3a4d, 0x3a4e, 0x3a4f, 0x3a50, 0x3a51, 0x3a52, 0x3a53,
-  0x3a54, 0x3a55, 0x3a56, 0x3a57, 0x3a58, 0x3a59, 0x3a5a, 0x3a5b,
-  0x3a5c, 0x3a5d, 0x3a5e, 0x3a5f, 0x3a60, 0x3a61, 0x3a62, 0x3a63,
-  0x3a64, 0x3a65, 0x3a66, 0x3a67, 0x3a68, 0x3a69, 0x3a6a, 0x3a6b,
-  0x3a6c, 0x3a6d, 0x3a6e, 0x3a6f, 0x3a70, 0x3a71, 0x3a72, 0x3a73,
-  0x3a74, 0x3a75, 0x3a76, 0x3a77, 0x3a78, 0x3a79, 0x3a7a, 0x3a7b,
-  0x3a7c, 0x3a7d, 0x3a7e, 0x3b21, 0x3b22, 0x3b23, 0x3b24, 0x3b25,
-  0x3b26, 0x3b27, 0x3b28, 0x3b29, 0x3b2a, 0x3b2b, 0x3b2c, 0x3b2d,
-  0x3b2e, 0x3b2f, 0x3b30, 0x3b31, 0x3b32, 0x3b33, 0x3b34, 0x3b35,
-  0x3b36, 0x3b37, 0x3b38, 0x3b39, 0x3b3a, 0x3b3b, 0x3b3d, 0x3b3c,
-  0x3b3e, 0x3b3f, 0x3b40, 0x3b41, 0x3b42, 0x3b43, 0x3b44, 0x3b45,
-  0x3b47, 0x3b48, 0x3b49, 0x3b4a, 0x3b46, 0x3b4b, 0x3b4c, 0x3b4d,
-  0x3b4e, 0x3b4f, 0x3b50, 0x3b51, 0x3b52, 0x3b53, 0x3b57, 0x3b55,
-  0x3b54, 0x3b56, 0x3b58, 0x3b59, 0x3b5a, 0x3b5b, 0x3b5c, 0x3b5d,
-  0x3b5e, 0x3b5f, 0x3b60, 0x3b61, 0x3b62, 0x3b63, 0x3b64, 0x3b65,
-  0x3b66, 0x3b67, 0x3b68, 0x3b69, 0x3b6a, 0x3b6b, 0x3b6c, 0x3b6d,
-  0x3b6e, 0x3b6f, 0x3b70, 0x3b71, 0x3b72, 0x6674, 0x3b73, 0x3b74,
-  0x3b75, 0x3b76, 0x3b77, 0x3b78, 0x3b7a, 0x3b79, 0x3b7b, 0x3b7c,
-  0x3b7d, 0x3b7e, 0x3c21, 0x3c22, 0x3c23, 0x3c24, 0x3c25, 0x3c26,
-  0x3c27, 0x3c28, 0x3c29, 0x3c2a, 0x3c2b, 0x3c2c, 0x3c2e, 0x3c2d,
-  0x3c2f, 0x3c30, 0x3c31, 0x3c34, 0x3c32, 0x3c33, 0x3c35, 0x3c36,
-  0x3c37, 0x3c38, 0x3c39, 0x3c3a, 0x3c3b, 0x3c3c, 0x3c3d, 0x3c3e,
-  0x3c3f, 0x3c40, 0x3c41, 0x3c42, 0x3c43, 0x3c44, 0x3c45, 0x3c46,
-  0x3c47, 0x3c48, 0x3c49, 0x3c4a, 0x3c4b, 0x3c4c, 0x3c4d, 0x3c4e,
-  0x3c4f, 0x3c50, 0x3c52, 0x3c51, 0x3c53, 0x3c54, 0x3c55, 0x3c56,
-  0x3c57, 0x3c58, 0x3c59, 0x3c5a, 0x3c5b, 0x3c5c, 0x3c5d, 0x3c5e,
-  0x3c5f, 0x3c60, 0x3c61, 0x3c62, 0x3c63, 0x3c64, 0x3c65, 0x3c66,
-  0x3c67, 0x3c68, 0x3c69, 0x3c6a, 0x3c6b, 0x3c6c, 0x3c6d, 0x3c6e,
-  0x3c6f, 0x3c70, 0x3c71, 0x3c72, 0x3c73, 0x3c74, 0x3c75, 0x3c76,
-  0x3c77, 0x3c78, 0x3c79, 0x3c7a, 0x3c7b, 0x3c7c, 0x3c7d, 0x3c7e,
-  0x3d21, 0x3d22, 0x3d23, 0x3d24, 0x3d25, 0x3d26, 0x3d27, 0x3d28,
-  0x3d29, 0x3d2a, 0x3d2b, 0x3d2c, 0x3d2d, 0x3d2e, 0x3d2f, 0x3d32,
-  0x3d30, 0x3d31, 0x3d33, 0x3d34, 0x3d35, 0x3d36, 0x3d37, 0x3d38,
-  0x3d39, 0x3d3a, 0x3d3b, 0x3d3c, 0x3d3d, 0x3d3e, 0x3d3f, 0x3d40,
-  0x3d41, 0x3d42, 0x3d43, 0x3d44, 0x3d45, 0x3d46, 0x3d47, 0x3d48,
-  0x3d49, 0x3d4a, 0x3d4b, 0x3d4c, 0x3d4d, 0x3d4e, 0x3d4f, 0x3d50,
-  0x3d51, 0x3d52, 0x3d53, 0x3d54, 0x3d55, 0x3d56, 0x3d57, 0x3d58,
-  0x3d59, 0x3d5a, 0x3d5b, 0x3d5c, 0x3d5d, 0x3d5e, 0x3d5f, 0x3d60,
-  0x3d61, 0x3d62, 0x3d63, 0x3d64, 0x3d65, 0x3d66, 0x3d67, 0x3d68,
-  0x3d69, 0x3d6a, 0x3d6b, 0x3d6c, 0x3d6d, 0x3d6e, 0x3d6f, 0x3d70,
-  0x3d71, 0x3d72, 0x3d73, 0x3d74, 0x3d75, 0x3d76, 0x3d77, 0x3d78,
-  0x3d79, 0x3d7a, 0x3d7b, 0x3d7c, 0x3d7d, 0x3d7e, 0x3e21, 0x3e22,
-  0x3e23, 0x3e24, 0x3e25, 0x3e26, 0x3e27, 0x3e28, 0x3e29, 0x3e2a,
-  0x3e2b, 0x3e2c, 0x3e2d, 0x3e2e, 0x3e2f, 0x3e30, 0x3e31, 0x3e32,
-  0x3e33, 0x3e34, 0x3e35, 0x3e36, 0x3e37, 0x3e38, 0x3e39, 0x3e3a,
-  0x3e3b, 0x3e3c, 0x3e3d, 0x3e3e, 0x3e3f, 0x3e40, 0x3e41, 0x3e42,
-  0x3e43, 0x3e44, 0x3e45, 0x3e46, 0x3e47, 0x3e48, 0x3e49, 0x3e4a,
-  0x3e4b, 0x3e4c, 0x3e4d, 0x3e4e, 0x3e4f, 0x3e50, 0x3e51, 0x3e52,
-  0x3e53, 0x3e54, 0x3e55, 0x3e56, 0x3e57, 0x3e58, 0x3e59, 0x3e5a,
-  0x3e5b, 0x3e5c, 0x3e5d, 0x3e5e, 0x3e5f, 0x3e60, 0x3e61, 0x3e62,
-  0x3e63, 0x3e64, 0x3e65, 0x3e66, 0x3e67, 0x3e68, 0x3e69, 0x3e6a,
-  0x3e6b, 0x3e6c, 0x3e6d, 0x3e6e, 0x3e6f, 0x3e70, 0x3e71, 0x3e72,
-  0x3e73, 0x3e74, 0x3e75, 0x3e76, 0x3e77, 0x3e78, 0x3e79, 0x3e7a,
-  0x3e7b, 0x3e7e, 0x3e7c, 0x3e7d, 0x3f21, 0x3f22, 0x3f23, 0x3f24,
-  0x3f25, 0x3f26, 0x3f27, 0x3f28, 0x3f29, 0x3f2a, 0x3f2b, 0x3f2c,
-  0x3f2d, 0x3f2e, 0x3f2f, 0x3f30, 0x3f31, 0x3f32, 0x3f33, 0x3f34,
-  0x3f35, 0x3f36, 0x3f37, 0x3f38, 0x3f39, 0x3f3a, 0x3f3b, 0x3f3c,
-  0x3f3d, 0x3f3e, 0x3f3f, 0x3f40, 0x3f41, 0x3f42, 0x3f43, 0x3f44,
-  0x3f45, 0x3f46, 0x3f47, 0x3f48, 0x3f49, 0x3f4a, 0x3f4b, 0x3f4c,
-  0x3f4d, 0x3f4e, 0x3f4f, 0x3f50, 0x3f51, 0x3f52, 0x3f53, 0x3f54,
-  0x3f55, 0x3f56, 0x3f57, 0x3f58, 0x3f59, 0x3f5a, 0x3f5b, 0x3f5c,
-  0x3f5d, 0x3f5e, 0x3f5f, 0x3f60, 0x3f61, 0x3f62, 0x3f63, 0x3f64,
-  0x3f65, 0x3f66, 0x3f67, 0x3f68, 0x3f69, 0x3f6a, 0x3f6b, 0x3f6c,
-  0x3f6d, 0x3f6e, 0x3f6f, 0x3f70, 0x3f71, 0x3f72, 0x3f73, 0x3f74,
-  0x3f75, 0x3f76, 0x3f77, 0x3f78, 0x3f79, 0x3f7a, 0x3f7b, 0x3f7c,
-  0x3f7d, 0x3f7e, 0x4021, 0x4022, 0x4023, 0x4024, 0x4025, 0x4026,
-  0x4027, 0x4028, 0x4029, 0x402a, 0x402b, 0x402c, 0x402d, 0x402e,
-  0x402f, 0x4030, 0x4031, 0x4032, 0x4033, 0x4034, 0x4035, 0x4036,
-  0x4037, 0x4038, 0x4039, 0x403a, 0x403b, 0x403c, 0x403d, 0x403e,
-  0x403f, 0x4040, 0x4041, 0x4042, 0x4043, 0x4044, 0x4045, 0x4046,
-  0x4047, 0x4048, 0x4049, 0x404a, 0x404b, 0x404c, 0x404d, 0x404e,
-  0x404f, 0x4050, 0x4051, 0x4052, 0x4053, 0x4054, 0x4055, 0x4056,
-  0x4057, 0x4058, 0x4059, 0x405a, 0x405b, 0x405c, 0x405d, 0x405e,
-  0x405f, 0x4060, 0x4061, 0x4062, 0x4063, 0x4064, 0x4065, 0x4066,
-  0x4067, 0x4068, 0x4069, 0x406a, 0x406b, 0x406c, 0x406d, 0x406e,
-  0x406f, 0x4070, 0x4071, 0x4072, 0x4073, 0x4074, 0x4075, 0x4076,
-  0x4077, 0x4078, 0x4079, 0x407a, 0x407b, 0x407c, 0x407d, 0x407e,
-  0x4121, 0x4122, 0x4123, 0x4124, 0x4125, 0x4126, 0x4127, 0x4128,
-  0x4129, 0x412a, 0x412b, 0x412c, 0x412d, 0x412e, 0x412f, 0x4130,
-  0x4131, 0x4132, 0x4133, 0x4134, 0x4135, 0x4136, 0x4137, 0x4138,
-  0x4139, 0x413a, 0x413b, 0x413c, 0x413d, 0x413e, 0x413f, 0x4140,
-  0x4141, 0x4142, 0x4143, 0x4144, 0x4145, 0x4146, 0x4147, 0x4148,
-  0x4149, 0x414a, 0x414b, 0x414c, 0x414d, 0x414e, 0x414f, 0x4150,
-  0x4151, 0x4152, 0x4153, 0x4154, 0x4155, 0x4156, 0x4157, 0x4158,
-  0x4159, 0x415a, 0x415b, 0x415c, 0x415d, 0x415e, 0x415f, 0x4160,
-  0x4161, 0x4162, 0x4163, 0x4164, 0x4165, 0x4166, 0x4167, 0x4168,
-  0x4169, 0x416a, 0x416b, 0x416c, 0x416d, 0x416e, 0x416f, 0x4170,
-  0x4171, 0x4172, 0x4173, 0x4174, 0x4175, 0x4176, 0x4177, 0x4178,
-  0x4179, 0x417a, 0x417b, 0x417c, 0x417d, 0x417e, 0x4221, 0x4222,
-  0x4223, 0x4224, 0x4225, 0x4226, 0x4227, 0x4228, 0x4229, 0x422a,
-  0x422b, 0x422c, 0x422d, 0x422e, 0x4230, 0x422f, 0x4231, 0x4232,
-  0x4233, 0x4234, 0x4235, 0x4237, 0x4236, 0x4238, 0x4239, 0x423a,
-  0x423b, 0x423c, 0x423d, 0x423e, 0x4240, 0x4241, 0x4242, 0x4244,
-  0x4245, 0x4247, 0x4248, 0x4249, 0x424a, 0x424c, 0x4243, 0x4246,
-  0x424b, 0x424d, 0x424e, 0x424f, 0x4250, 0x4251, 0x4252, 0x4253,
-  0x4254, 0x4255, 0x4256, 0x4257, 0x4258, 0x4259, 0x425a, 0x425b,
-  0x425c, 0x425d, 0x425e, 0x425f, 0x4260, 0x4261, 0x4262, 0x4263,
-  0x4264, 0x4265, 0x4266, 0x4267, 0x4268, 0x4269, 0x426a, 0x426b,
-  0x426c, 0x426d, 0x423f, 0x426e, 0x426f, 0x4270, 0x4271, 0x4272,
-  0x4273, 0x4274, 0x4275, 0x4276, 0x4277, 0x4278, 0x4279, 0x427a,
-  0x427b, 0x427c, 0x427d, 0x427e, 0x4321, 0x4322, 0x4323, 0x4324,
-  0x4325, 0x4326, 0x4327, 0x4328, 0x4329, 0x432a, 0x432b, 0x432c,
-  0x432d, 0x432e, 0x432f, 0x4330, 0x4331, 0x4332, 0x4333, 0x4334,
-  0x4335, 0x4336, 0x4337, 0x4339, 0x433a, 0x433b, 0x433c, 0x433d,
-  0x433e, 0x433f, 0x4340, 0x4341, 0x4342, 0x4343, 0x4344, 0x4345,
-  0x4346, 0x4347, 0x4348, 0x4338, 0x434a, 0x434b, 0x434c, 0x434d,
-  0x434f, 0x434e, 0x4350, 0x4351, 0x4352, 0x4353, 0x4354, 0x4355,
-  0x4356, 0x4357, 0x4358, 0x4359, 0x435a, 0x435b, 0x4349, 0x435c,
-  0x435d, 0x435e, 0x435f, 0x4360, 0x4361, 0x4362, 0x4363, 0x4364,
-  0x4365, 0x4366, 0x4367, 0x4368, 0x4369, 0x436a, 0x436b, 0x436c,
-  0x436d, 0x436e, 0x436f, 0x4370, 0x4371, 0x4372, 0x4373, 0x4374,
-  0x4375, 0x4376, 0x4377, 0x4378, 0x4379, 0x437a, 0x437b, 0x437c,
-  0x437d, 0x437e, 0x4421, 0x4422, 0x4423, 0x4424, 0x4425, 0x4426,
-  0x4427, 0x4428, 0x4429, 0x442a, 0x442b, 0x442c, 0x442d, 0x442e,
-  0x442f, 0x4430, 0x4431, 0x4432, 0x4433, 0x4434, 0x4435, 0x4436,
-  0x4437, 0x4438, 0x4439, 0x443a, 0x443b, 0x443c, 0x443d, 0x443e,
-  0x443f, 0x4440, 0x4441, 0x4442, 0x4443, 0x4444, 0x4445, 0x4446,
-  0x4447, 0x4448, 0x4449, 0x444a, 0x444b, 0x444c, 0x444d, 0x444e,
-  0x444f, 0x4450, 0x4451, 0x4452, 0x4453, 0x4454, 0x4455, 0x4456,
-  0x4457, 0x4458, 0x4459, 0x445a, 0x445b, 0x445c, 0x445d, 0x445e,
-  0x445f, 0x4460, 0x4461, 0x4462, 0x4463, 0x4464, 0x4465, 0x4466,
-  0x4467, 0x4468, 0x4469, 0x446a, 0x446b, 0x446c, 0x446d, 0x446e,
-  0x446f, 0x4470, 0x4471, 0x4472, 0x4473, 0x4474, 0x4475, 0x4476,
-  0x4477, 0x4478, 0x4479, 0x447a, 0x447b, 0x447c, 0x447d, 0x447e,
-  0x4521, 0x4522, 0x4523, 0x4524, 0x4525, 0x4526, 0x4527, 0x4528,
-  0x4529, 0x452a, 0x452b, 0x452c, 0x452d, 0x452e, 0x452f, 0x4530,
-  0x4531, 0x4532, 0x4533, 0x4534, 0x4535, 0x4536, 0x4537, 0x4538,
-  0x4539, 0x453a, 0x453b, 0x453c, 0x453d, 0x453e, 0x453f, 0x4540,
-  0x4541, 0x4542, 0x4543, 0x4544, 0x4545, 0x4546, 0x4547, 0x4548,
-  0x4549, 0x454a, 0x454b, 0x454d, 0x454c, 0x454e, 0x454f, 0x4550,
-  0x4551, 0x4552, 0x4553, 0x4554, 0x4555, 0x4556, 0x4557, 0x4558,
-  0x4559, 0x455a, 0x455b, 0x455c, 0x455d, 0x455e, 0x455f, 0x4560,
-  0x4561, 0x4562, 0x4563, 0x4564, 0x4565, 0x4566, 0x4567, 0x4568,
-  0x4569, 0x456a, 0x456b, 0x456c, 0x456d, 0x456e, 0x456f, 0x4570,
-  0x4571, 0x4572, 0x4573, 0x4574, 0x4575, 0x4576, 0x4577, 0x4578,
-  0x4579, 0x457a, 0x457b, 0x457c, 0x457d, 0x457e, 0x4621, 0x4622,
-  0x4623, 0x4624, 0x4625, 0x4626, 0x4627, 0x4628, 0x4629, 0x462a,
-  0x462b, 0x462c, 0x462d, 0x462e, 0x462f, 0x4630, 0x4631, 0x4632,
-  0x4633, 0x4634, 0x4635, 0x4636, 0x4637, 0x4638, 0x4639, 0x463a,
-  0x463b, 0x463c, 0x463d, 0x463e, 0x463f, 0x4640, 0x4641, 0x4642,
-  0x4643, 0x4644, 0x4645, 0x4646, 0x4647, 0x4648, 0x4649, 0x464a,
-  0x464b, 0x464c, 0x464d, 0x464e, 0x464f, 0x4650, 0x4651, 0x4652,
-  0x4653, 0x4654, 0x4655, 0x4656, 0x4657, 0x4658, 0x4659, 0x465a,
-  0x465b, 0x465c, 0x465d, 0x465e, 0x465f, 0x4660, 0x4736, 0x4661,
-  0x4662, 0x4663, 0x4664, 0x4665, 0x4666, 0x4667, 0x4668, 0x4669,
-  0x466a, 0x466b, 0x466c, 0x466d, 0x466e, 0x466f, 0x4670, 0x4671,
-  0x4672, 0x4673, 0x4674, 0x4675, 0x4676, 0x4677, 0x4678, 0x4679,
-  0x467a, 0x467b, 0x467c, 0x467d, 0x467e, 0x4721, 0x4722, 0x4723,
-  0x4724, 0x4725, 0x4726, 0x4727, 0x4728, 0x4729, 0x472a, 0x472b,
-  0x472c, 0x472d, 0x472e, 0x472f, 0x4730, 0x4731, 0x4732, 0x4733,
-  0x4734, 0x4735, 0x4737, 0x4738, 0x4739, 0x473a, 0x473b, 0x473c,
-  0x473d, 0x473e, 0x473f, 0x4740, 0x4741, 0x4742, 0x4743, 0x4744,
-  0x4745, 0x4746, 0x4747, 0x4748, 0x4749, 0x474a, 0x474b, 0x474c,
-  0x474d, 0x474e, 0x474f, 0x4750, 0x4751, 0x4752, 0x4753, 0x4754,
-  0x4755, 0x4756, 0x4757, 0x4758, 0x4759, 0x475a, 0x475b, 0x475c,
-  0x475d, 0x475e, 0x475f, 0x4760, 0x4761, 0x4762, 0x4763, 0x4764,
-  0x4765, 0x4766, 0x4767, 0x4768, 0x4769, 0x476a, 0x476b, 0x476c,
-  0x476d, 0x476e, 0x476f, 0x4770, 0x4771, 0x4772, 0x4773, 0x4774,
-  0x4775, 0x4776, 0x4777, 0x4778, 0x4779, 0x477a, 0x477b, 0x477c,
-  0x477d, 0x477e, 0x4821, 0x4822, 0x4823, 0x4824, 0x4825, 0x4826,
-  0x4827, 0x4828, 0x4829, 0x482a, 0x482b, 0x482c, 0x482d, 0x482e,
-  0x482f, 0x4830, 0x4831, 0x4832, 0x4833, 0x4834, 0x4835, 0x4836,
-  0x4837, 0x4838, 0x4839, 0x483a, 0x483b, 0x483c, 0x483d, 0x483e,
-  0x483f, 0x4840, 0x4841, 0x4842, 0x4843, 0x4844, 0x4845, 0x4846,
-  0x4847, 0x4848, 0x4849, 0x484a, 0x484b, 0x484c, 0x4853, 0x484d,
-  0x484e, 0x484f, 0x4850, 0x4851, 0x4852, 0x4854, 0x4855, 0x4856,
-  0x4857, 0x4858, 0x4859, 0x485a, 0x485b, 0x485c, 0x485d, 0x485e,
-  0x485f, 0x4860, 0x4861, 0x4862, 0x4863, 0x4864, 0x4865, 0x4866,
-  0x4867, 0x4868, 0x4869, 0x486a, 0x486b, 0x486c, 0x486d, 0x486e,
-  0x486f, 0x4870, 0x4871, 0x4872, 0x4873, 0x4874, 0x4875, 0x4876,
-  0x4877, 0x4878, 0x4879, 0x487a, 0x487b, 0x487c, 0x487d, 0x487e,
-  0x4921, 0x4922, 0x4923, 0x4924, 0x4925, 0x4926, 0x4927, 0x4928,
-  0x4929, 0x492a, 0x492b, 0x492c, 0x492d, 0x492e, 0x492f, 0x4930,
-  0x4931, 0x4932, 0x4933, 0x4934, 0x4935, 0x4936, 0x4937, 0x4938,
-  0x4939, 0x493a, 0x493b, 0x493c, 0x4941, 0x493d, 0x493e, 0x493f,
-  0x4940, 0x4942, 0x4943, 0x4944, 0x4945, 0x4946, 0x4947, 0x4948,
-  0x4949, 0x494a, 0x494b, 0x494c, 0x494d, 0x494e, 0x494f, 0x4950,
-  0x4951, 0x4952, 0x4953, 0x4954, 0x4955, 0x4956, 0x4957, 0x4958,
-  0x4959, 0x495a, 0x495b, 0x495c, 0x495d, 0x495e, 0x495f, 0x4960,
-  0x4961, 0x4962, 0x4963, 0x4964, 0x4965, 0x4966, 0x4967, 0x4968,
-  0x4969, 0x496a, 0x496b, 0x496c, 0x496d, 0x496e, 0x496f, 0x4970,
-  0x4971, 0x4972, 0x4973, 0x4974, 0x4975, 0x4976, 0x4977, 0x4978,
-  0x4979, 0x497a, 0x497b, 0x497c, 0x497d, 0x497e, 0x4a21, 0x4a22,
-  0x4a23, 0x4a24, 0x4a25, 0x4a26, 0x4a27, 0x4a28, 0x4a29, 0x4a2a,
-  0x4a2b, 0x4a2c, 0x4a2d, 0x4a2e, 0x4a2f, 0x4a30, 0x4a31, 0x4a32,
-  0x4a33, 0x4a34, 0x4a35, 0x4a36, 0x4a37, 0x4a38, 0x4a39, 0x4a3a,
-  0x4a3b, 0x4a3c, 0x4a3d, 0x4a3e, 0x4a3f, 0x4a40, 0x4a41, 0x4a42,
-  0x4a43, 0x4a44, 0x4a45, 0x4a46, 0x4a47, 0x4a48, 0x4a49, 0x4a4a,
-  0x4a4b, 0x4a4c, 0x4a4d, 0x4a4e, 0x4a4f, 0x4a50, 0x4a51, 0x4a52,
-  0x4a53, 0x4a54, 0x4a55, 0x4a56, 0x4a57, 0x4a58, 0x4a59, 0x4a5a,
-  0x4a5b, 0x4a5c, 0x4a5d, 0x4a5e, 0x4a5f, 0x4a60, 0x4a61, 0x4a62,
-  0x4a63, 0x4a64, 0x4a65, 0x4a66, 0x4a67, 0x4a68, 0x4a69, 0x4a6a,
-  0x4a6b, 0x4a6c, 0x4a6d, 0x4a6e, 0x4a6f, 0x4a70, 0x4a71, 0x4a72,
-  0x4a73, 0x4a74, 0x4a75, 0x4a76, 0x4a77, 0x4a78, 0x4a79, 0x4a7a,
-  0x4a7b, 0x4a7c, 0x4a7d, 0x4a7e, 0x4b21, 0x4b22, 0x4b23, 0x4b24,
-  0x4b25, 0x4b26, 0x4b27, 0x4b28, 0x4b29, 0x4b2a, 0x4b2b, 0x4b2c,
-  0x4b2d, 0x4b2e, 0x4b2f, 0x4b30, 0x4b31, 0x4b32, 0x4b33, 0x4b34,
-  0x4b35, 0x4b36, 0x4b37, 0x4b38, 0x4b39, 0x4b3a, 0x4b3b, 0x4b3c,
-  0x4b3d, 0x4b3e, 0x4b3f, 0x4b40, 0x4b41, 0x4b42, 0x4b43, 0x4b44,
-  0x4b45, 0x4b46, 0x4b47, 0x4b48, 0x4b49, 0x4b4a, 0x4b4b, 0x4b4c,
-  0x4b4d, 0x4b4e, 0x4b4f, 0x4b50, 0x4b51, 0x4b52, 0x4b53, 0x4b54,
-  0x4b55, 0x4b56, 0x4b57, 0x4b58, 0x4b59, 0x4b5a, 0x4b5b, 0x4b5c,
-  0x4b5d, 0x4b5e, 0x4b5f, 0x4b60, 0x4b61, 0x4b62, 0x4b63, 0x4b64,
-  0x4b65, 0x4b66, 0x4b67, 0x4b68, 0x4b69, 0x4b6a, 0x4b6b, 0x4b6c,
-  0x4b6d, 0x4b6e, 0x4b6f, 0x4b70, 0x4b71, 0x4b72, 0x4b73, 0x4b74,
-  0x4b75, 0x4b76, 0x4b77, 0x4b78, 0x4b79, 0x4b7a, 0x4b7b, 0x4b7c,
-  0x4b7d, 0x4b7e, 0x4c21, 0x4c22, 0x4c23, 0x4c24, 0x4c25, 0x4c26,
-  0x4c27, 0x4c28, 0x4c29, 0x4c2a, 0x4c2b, 0x4c2c, 0x4c2d, 0x4c2e,
-  0x4c2f, 0x4c30, 0x4c31, 0x4c32, 0x4c33, 0x4c34, 0x4c35, 0x4c36,
-  0x4c37, 0x4c38, 0x4c39, 0x4c3a, 0x4c3b, 0x4c3c, 0x4c3d, 0x4c3e,
-  0x4c3f, 0x4c40, 0x4c41, 0x4c42, 0x4c43, 0x4c44, 0x4c45, 0x4c46,
-  0x4c47, 0x4c48, 0x4c49, 0x4c4a, 0x4c4b, 0x4c4c, 0x4c4d, 0x4c4e,
-  0x4c4f, 0x4c50, 0x4c51, 0x4c52, 0x4c53, 0x4c54, 0x4c55, 0x4c56,
-  0x4c57, 0x4c58, 0x4c59, 0x4c5a, 0x4c5b, 0x4c5c, 0x4c5d, 0x4c5e,
-  0x4c5f, 0x4c60, 0x4c61, 0x4c62, 0x4c63, 0x4c64, 0x4c65, 0x4c66,
-  0x4c67, 0x4c68, 0x4c69, 0x4c6a, 0x4c6b, 0x4c6c, 0x4c6d, 0x4c6e,
-  0x4c6f, 0x4c70, 0x4c71, 0x4c72, 0x4c73, 0x4c74, 0x4c75, 0x4c76,
-  0x4c77, 0x4c78, 0x4c79, 0x4c7a, 0x4c7b, 0x4c7c, 0x4c7d, 0x4c7e,
-  0x4d21, 0x4d22, 0x4d23, 0x4d24, 0x4d25, 0x4d26, 0x4d27, 0x4d28,
-  0x4d29, 0x4d2a, 0x4d2b, 0x4d2c, 0x4d2d, 0x4d2e, 0x4d2f, 0x4d30,
-  0x4d31, 0x4d32, 0x4d33, 0x4d34, 0x4d35, 0x4d36, 0x4d37, 0x4d38,
-  0x4d39, 0x4d3a, 0x4d3b, 0x4d3c, 0x4d3d, 0x4d3e, 0x4d3f, 0x4d40,
-  0x4d41, 0x4d42, 0x4d43, 0x4d44, 0x4d45, 0x4d46, 0x4d47, 0x4d48,
-  0x4d49, 0x4d4a, 0x4d4b, 0x4d4c, 0x4d4d, 0x4d4e, 0x4d4f, 0x4d50,
-  0x4d51, 0x4d52, 0x4d53, 0x4d54, 0x4d55, 0x4d56, 0x4d57, 0x4d58,
-  0x4d59, 0x4d5a, 0x4d5b, 0x4d5c, 0x4d5d, 0x4d5e, 0x4d5f, 0x4d60,
-  0x4d61, 0x4d62, 0x4d63, 0x4d64, 0x4d65, 0x4d66, 0x4d67, 0x4d68,
-  0x4d69, 0x4d6a, 0x4d6b, 0x4d6c, 0x4d6d, 0x4d6e, 0x4d6f, 0x4d70,
-  0x4d71, 0x4d72, 0x4d73, 0x4d74, 0x4d75, 0x4d76, 0x4d77, 0x4d78,
-  0x4d79, 0x4d7a, 0x4d7b, 0x4d7c, 0x4d7d, 0x4d7e, 0x4e21, 0x4e22,
-  0x4e24, 0x4e25, 0x4e26, 0x4e27, 0x4e28, 0x4e29, 0x4e23, 0x4e2a,
-  0x4e2b, 0x4e2c, 0x4e2d, 0x4e2e, 0x4e2f, 0x4e30, 0x4e31, 0x4e32,
-  0x4e33, 0x4e34, 0x4e35, 0x4e36, 0x4e37, 0x4e38, 0x4e39, 0x4e3a,
-  0x4e3b, 0x4e3c, 0x4e3d, 0x4e3e, 0x4e3f, 0x4e40, 0x4e41, 0x4e42,
-  0x4e43, 0x4e44, 0x4e45, 0x4e46, 0x4e47, 0x4e48, 0x4e49, 0x4e4a,
-  0x4e4b, 0x4e4c, 0x4e4d, 0x4e4e, 0x4e4f, 0x4e50, 0x4e51, 0x4e52,
-  0x4e53, 0x4e54, 0x4e55, 0x4e56, 0x4e57, 0x4e58, 0x4e59, 0x4e5a,
-  0x4e5b, 0x4e5c, 0x4e5d, 0x4e5e, 0x4e5f, 0x4e60, 0x4e61, 0x4e62,
-  0x4e63, 0x4e64, 0x4e65, 0x4e66, 0x4e67, 0x4e68, 0x4e69, 0x4e6a,
-  0x4e6b, 0x4e6c, 0x4e6d, 0x4e6e, 0x4e6f, 0x4e70, 0x4e71, 0x4e72,
-  0x4e73, 0x4e74, 0x4e75, 0x4e76, 0x4e77, 0x4e78, 0x4e79, 0x4e7a,
-  0x4e7b, 0x4e7c, 0x4e7d, 0x4e7e, 0x4f21, 0x4f22, 0x4f23, 0x4f24,
-  0x4f25, 0x4f26, 0x4f27, 0x4f28, 0x4f29, 0x4f2a, 0x4f2b, 0x4f2c,
-  0x4f2d, 0x4f2e, 0x4f2f, 0x4f30, 0x4f31, 0x4f32, 0x4f33, 0x4f34,
-  0x4f35, 0x4f36, 0x4f37, 0x4f38, 0x4f39, 0x4f3a, 0x4f3b, 0x4f3c,
-  0x4f3d, 0x4f3e, 0x4f3f, 0x4f40, 0x4f41, 0x4f42, 0x4f43, 0x4f44,
-  0x4f45, 0x4f46, 0x4f47, 0x4f48, 0x4f49, 0x4f4a, 0x4f4b, 0x4f4c,
-  0x4f4d, 0x4f4e, 0x4f4f, 0x4f50, 0x4f51, 0x4f52, 0x4f53, 0x4f54,
-  0x4f55, 0x4f56, 0x4f57, 0x4f58, 0x4f59, 0x4f5a, 0x4f5b, 0x4f5c,
-  0x4f5d, 0x4f5e, 0x4f5f, 0x4f60, 0x4f61, 0x4f62, 0x4f63, 0x4f64,
-  0x4f65, 0x4f66, 0x4f67, 0x4f68, 0x4f69, 0x4f6a, 0x4f6b, 0x4f6c,
-  0x4f6d, 0x4f6e, 0x4f6f, 0x4f70, 0x4f71, 0x4f72, 0x4f74, 0x4f75,
-  0x4f76, 0x4f73, 0x4f77, 0x4f78, 0x4f79, 0x4f7a, 0x4f7b, 0x4f7c,
-  0x4f7d, 0x4f7e, 0x5021, 0x5022, 0x5023, 0x5024, 0x5025, 0x5026,
-  0x5027, 0x5028, 0x5029, 0x502a, 0x502b, 0x502c, 0x502e, 0x502f,
-  0x5030, 0x5031, 0x502d, 0x5032, 0x5033, 0x5034, 0x5035, 0x5037,
-  0x5038, 0x5039, 0x503a, 0x503b, 0x5036, 0x503c, 0x503d, 0x503e,
-  0x503f, 0x5040, 0x5041, 0x5042, 0x5043, 0x5044, 0x5045, 0x5046,
-  0x5047, 0x5048, 0x5049, 0x504a, 0x504b, 0x504c, 0x504d, 0x504e,
-  0x504f, 0x5050, 0x5051, 0x5052, 0x5053, 0x5054, 0x5055, 0x5056,
-  0x5057, 0x5058, 0x5059, 0x505a, 0x505b, 0x505c, 0x505d, 0x505e,
-  0x505f, 0x5060, 0x5061, 0x5062, 0x5063, 0x5064, 0x5065, 0x5066,
-  0x5067, 0x5068, 0x5069, 0x506a, 0x506b, 0x506c, 0x506d, 0x506e,
-  0x506f, 0x5070, 0x5071, 0x5072, 0x5073, 0x5074, 0x5075, 0x5076,
-  0x5077, 0x5078, 0x5079, 0x507a, 0x507b, 0x507c, 0x507d, 0x507e,
-  0x5121, 0x5122, 0x5123, 0x5124, 0x5125, 0x5126, 0x5127, 0x5128,
-  0x5129, 0x512a, 0x512b, 0x512c, 0x512d, 0x512e, 0x512f, 0x5130,
-  0x5131, 0x5132, 0x5133, 0x5134, 0x5135, 0x5136, 0x5137, 0x5138,
-  0x5139, 0x513a, 0x513b, 0x513c, 0x513d, 0x513e, 0x513f, 0x5140,
-  0x5141, 0x5142, 0x5143, 0x5144, 0x5145, 0x5146, 0x5147, 0x5148,
-  0x5149, 0x514a, 0x514b, 0x514c, 0x514d, 0x514e, 0x514f, 0x5150,
-  0x5151, 0x5152, 0x5153, 0x5154, 0x5155, 0x5156, 0x5157, 0x5158,
-  0x5159, 0x515a, 0x515b, 0x515c, 0x515d, 0x515e, 0x515f, 0x5160,
-  0x5161, 0x5162, 0x5163, 0x5164, 0x5165, 0x5166, 0x5167, 0x5168,
-  0x5169, 0x516a, 0x516b, 0x516c, 0x516d, 0x516e, 0x516f, 0x5170,
-  0x5171, 0x5172, 0x5173, 0x5174, 0x5175, 0x5176, 0x5177, 0x5178,
-  0x5179, 0x517a, 0x517b, 0x517c, 0x517d, 0x517e, 0x5221, 0x5222,
-  0x5223, 0x5224, 0x5225, 0x5226, 0x5227, 0x5228, 0x5229, 0x522a,
-  0x522b, 0x522c, 0x522d, 0x522e, 0x522f, 0x5230, 0x5231, 0x5232,
-  0x5233, 0x5234, 0x5235, 0x5236, 0x5237, 0x5238, 0x5239, 0x523a,
-  0x523b, 0x523c, 0x523d, 0x523e, 0x523f, 0x5240, 0x5241, 0x5242,
-  0x5243, 0x5244, 0x5245, 0x5246, 0x5247, 0x5248, 0x5249, 0x524a,
-  0x524b, 0x524c, 0x524d, 0x524e, 0x524f, 0x5250, 0x5251, 0x5252,
-  0x5253, 0x5254, 0x5255, 0x5256, 0x5257, 0x5258, 0x5259, 0x525a,
-  0x525b, 0x525c, 0x525d, 0x525e, 0x525f, 0x5260, 0x5261, 0x5262,
-  0x5263, 0x5264, 0x5265, 0x5266, 0x5267, 0x5268, 0x5269, 0x526a,
-  0x526b, 0x526c, 0x526d, 0x526e, 0x526f, 0x5270, 0x5271, 0x5272,
-  0x5273, 0x5274, 0x5276, 0x5277, 0x5278, 0x5275, 0x5279, 0x527a,
-  0x527b, 0x527c, 0x527d, 0x527e, 0x5321, 0x5322, 0x5323, 0x5324,
-  0x5325, 0x5326, 0x5327, 0x5328, 0x5329, 0x532a, 0x532b, 0x532c,
-  0x532d, 0x532e, 0x532f, 0x5330, 0x5331, 0x5332, 0x5333, 0x5334,
-  0x5335, 0x5336, 0x5337, 0x5338, 0x5339, 0x533a, 0x533b, 0x533c,
-  0x533d, 0x533e, 0x533f, 0x5340, 0x5341, 0x5342, 0x5343, 0x5344,
-  0x5345, 0x5346, 0x5347, 0x5348, 0x5349, 0x534a, 0x534b, 0x534c,
-  0x534d, 0x534e, 0x534f, 0x5350, 0x5351, 0x5352, 0x5353, 0x5354,
-  0x5355, 0x5356, 0x5357, 0x5358, 0x5359, 0x535a, 0x535b, 0x535c,
-  0x535d, 0x535e, 0x535f, 0x5360, 0x5361, 0x5362, 0x5363, 0x5364,
-  0x5365, 0x5366, 0x5367, 0x5368, 0x5369, 0x536a, 0x536b, 0x536c,
-  0x536d, 0x536e, 0x536f, 0x5370, 0x5371, 0x5372, 0x5373, 0x5374,
-  0x5375, 0x5376, 0x5377, 0x5378, 0x5379, 0x537a, 0x537b, 0x537c,
-  0x537d, 0x537e, 0x5421, 0x5422, 0x5423, 0x5424, 0x5425, 0x5426,
-  0x5427, 0x5428, 0x5429, 0x542a, 0x542b, 0x542c, 0x542d, 0x542e,
-  0x542f, 0x5430, 0x5431, 0x5432, 0x5434, 0x5435, 0x5436, 0x5437,
-  0x5438, 0x5439, 0x543a, 0x543b, 0x543c, 0x543d, 0x543e, 0x5433,
-  0x543f, 0x5440, 0x5441, 0x5442, 0x5443, 0x5444, 0x5445, 0x5446,
-  0x5447, 0x5448, 0x5449, 0x544a, 0x544b, 0x544c, 0x544d, 0x544e,
-  0x544f, 0x5450, 0x5451, 0x5452, 0x5453, 0x5454, 0x5455, 0x5456,
-  0x5457, 0x5458, 0x5459, 0x545a, 0x545b, 0x545c, 0x545d, 0x545e,
-  0x545f, 0x5460, 0x5461, 0x5462, 0x5463, 0x5464, 0x5465, 0x5466,
-  0x5467, 0x5468, 0x5469, 0x546a, 0x546c, 0x546b, 0x546d, 0x546e,
-  0x546f, 0x5470, 0x5471, 0x5472, 0x5473, 0x5474, 0x5475, 0x5476,
-  0x5477, 0x5478, 0x5479, 0x547a, 0x547b, 0x547c, 0x547d, 0x547e,
-  0x5521, 0x5522, 0x5523, 0x5524, 0x5525, 0x5526, 0x5527, 0x5528,
-  0x5529, 0x552a, 0x552b, 0x552c, 0x552d, 0x552e, 0x552f, 0x5530,
-  0x5531, 0x5532, 0x5533, 0x5534, 0x5535, 0x5536, 0x5537, 0x5538,
-  0x5539, 0x553a, 0x553b, 0x553c, 0x553d, 0x553e, 0x553f, 0x5540,
-  0x5541, 0x5542, 0x5543, 0x5544, 0x5545, 0x5546, 0x5547, 0x5548,
-  0x5549, 0x554a, 0x554b, 0x554c, 0x554d, 0x554e, 0x554f, 0x5550,
-  0x5551, 0x5552, 0x5553, 0x5554, 0x5555, 0x5556, 0x5557, 0x5558,
-  0x5559, 0x555a, 0x555b, 0x555c, 0x555d, 0x555e, 0x555f, 0x5560,
-  0x5561, 0x5562, 0x5563, 0x5564, 0x5565, 0x5566, 0x5567, 0x5568,
-  0x5569, 0x556a, 0x556b, 0x556c, 0x556d, 0x556e, 0x556f, 0x5570,
-  0x5571, 0x5572, 0x5573, 0x5574, 0x5575, 0x5576, 0x5577, 0x5578,
-  0x5579, 0x557a, 0x557b, 0x557c, 0x557d, 0x557e, 0x5621, 0x5622,
-  0x5623, 0x5624, 0x5625, 0x5626, 0x5627, 0x5628, 0x5629, 0x562a,
-  0x562b, 0x562c, 0x562d, 0x562e, 0x562f, 0x5630, 0x5631, 0x5632,
-  0x5633, 0x5634, 0x5635, 0x5636, 0x5637, 0x5638, 0x5639, 0x563a,
-  0x563b, 0x563c, 0x563d, 0x563e, 0x563f, 0x5640, 0x5641, 0x5642,
-  0x5643, 0x5644, 0x5645, 0x5647, 0x5648, 0x5649, 0x564a, 0x564b,
-  0x5646, 0x564c, 0x564d, 0x564e, 0x564f, 0x5650, 0x5651, 0x5652,
-  0x5653, 0x5654, 0x5656, 0x5657, 0x5658, 0x5655, 0x5659, 0x565a,
-  0x565b, 0x565c, 0x565d, 0x565e, 0x565f, 0x5660, 0x5661, 0x5662,
-  0x5663, 0x5664, 0x5665, 0x5666, 0x5667, 0x5668, 0x5669, 0x566a,
-  0x566b, 0x566c, 0x566d, 0x566e, 0x566f, 0x5670, 0x5671, 0x5672,
-  0x5673, 0x5674, 0x5675, 0x5676, 0x5677, 0x5678, 0x5679, 0x567a,
-  0x567b, 0x567c, 0x567d, 0x567e, 0x5721, 0x5722, 0x5723, 0x5724,
-  0x5725, 0x5726, 0x5727, 0x5728, 0x5729, 0x572a, 0x572b, 0x572c,
-  0x572d, 0x572e, 0x572f, 0x5730, 0x5731, 0x5732, 0x5733, 0x5734,
-  0x5735, 0x5736, 0x5737, 0x5738, 0x5739, 0x573a, 0x573b, 0x573c,
-  0x573d, 0x573e, 0x573f, 0x5740, 0x5741, 0x5742, 0x5743, 0x5744,
-  0x5745, 0x5746, 0x5747, 0x5748, 0x5749, 0x574a, 0x574b, 0x574c,
-  0x574d, 0x574e, 0x574f, 0x5750, 0x5751, 0x5752, 0x5753, 0x5754,
-  0x5755, 0x5756, 0x5757, 0x5758, 0x5759, 0x575a, 0x575b, 0x575c,
-  0x575d, 0x575e, 0x575f, 0x5760, 0x5761, 0x5762, 0x5764, 0x5765,
-  0x5766, 0x5767, 0x5768, 0x5769, 0x576a, 0x576b, 0x576c, 0x576d,
-  0x576e, 0x576f, 0x5770, 0x5771, 0x5772, 0x5773, 0x5774, 0x5775,
-  0x5776, 0x5777, 0x5778, 0x5779, 0x583e, 0x5763, 0x577a, 0x577b,
-  0x577c, 0x577d, 0x577e, 0x5821, 0x5822, 0x5823, 0x5824, 0x5825,
-  0x5826, 0x5827, 0x5828, 0x5829, 0x582a, 0x582b, 0x582c, 0x582d,
-  0x582e, 0x582f, 0x5830, 0x5831, 0x5832, 0x5833, 0x584c, 0x5834,
-  0x5835, 0x5836, 0x5837, 0x5838, 0x5839, 0x583a, 0x583b, 0x583c,
-  0x583d, 0x583f, 0x5840, 0x5841, 0x5842, 0x5843, 0x5844, 0x5845,
-  0x5846, 0x5847, 0x5848, 0x5849, 0x584a, 0x584b, 0x584d, 0x584e,
-  0x584f, 0x5850, 0x5851, 0x5852, 0x5853, 0x5854, 0x5855, 0x5856,
-  0x5857, 0x5858, 0x5859, 0x585a, 0x585b, 0x585c, 0x585d, 0x585e,
-  0x585f, 0x5860, 0x5861, 0x5862, 0x5863, 0x5864, 0x5865, 0x5866,
-  0x5867, 0x5868, 0x5869, 0x586a, 0x586b, 0x586c, 0x586d, 0x586e,
-  0x586f, 0x5870, 0x5871, 0x5872, 0x5873, 0x5874, 0x5875, 0x5876,
-  0x5877, 0x5878, 0x5879, 0x587a, 0x587b, 0x587c, 0x587d, 0x587e,
-  0x5921, 0x5922, 0x5923, 0x5924, 0x5925, 0x5926, 0x5927, 0x5928,
-  0x592a, 0x592b, 0x592c, 0x592d, 0x592e, 0x592f, 0x5930, 0x5931,
-  0x5932, 0x5933, 0x5934, 0x5935, 0x5936, 0x5937, 0x5938, 0x5939,
-  0x593a, 0x593b, 0x593c, 0x5929, 0x593d, 0x593e, 0x593f, 0x5940,
-  0x5941, 0x5942, 0x5943, 0x5944, 0x5945, 0x5946, 0x5947, 0x5948,
-  0x5949, 0x594a, 0x594b, 0x594c, 0x594d, 0x594e, 0x594f, 0x5950,
-  0x5951, 0x5952, 0x5953, 0x5954, 0x5955, 0x5956, 0x5957, 0x5958,
-  0x5959, 0x595a, 0x595b, 0x595c, 0x595d, 0x595e, 0x595f, 0x5960,
-  0x5961, 0x5962, 0x5963, 0x5964, 0x5965, 0x5966, 0x5974, 0x5967,
-  0x5968, 0x5969, 0x596a, 0x596b, 0x596c, 0x596d, 0x596e, 0x596f,
-  0x5970, 0x5971, 0x5972, 0x5973, 0x5975, 0x5976, 0x5977, 0x5978,
-  0x5979, 0x597a, 0x597b, 0x597c, 0x597d, 0x597e, 0x5a21, 0x5a22,
-  0x5a23, 0x5a24, 0x5a25, 0x5a26, 0x5a27, 0x5a28, 0x5a29, 0x5a2a,
-  0x5a2b, 0x5a2c, 0x5a2d, 0x5a2e, 0x5a2f, 0x5a30, 0x5a31, 0x5a32,
-  0x5a33, 0x5a34, 0x5a35, 0x5a36, 0x3866, 0x5a37, 0x5a38, 0x5a39,
-  0x5a3a, 0x5a3b, 0x5a3c, 0x5a3d, 0x5a3e, 0x5a3f, 0x5a40, 0x5a41,
-  0x5a42, 0x5a43, 0x5a44, 0x5a45, 0x5a46, 0x5a47, 0x5a48, 0x5a49,
-  0x5a4a, 0x5a4b, 0x5a6d, 0x5a4c, 0x5a4d, 0x5a4e, 0x5a4f, 0x5a50,
-  0x5a51, 0x5a52, 0x5a53, 0x5a54, 0x5a55, 0x5a56, 0x5a57, 0x5a58,
-  0x5a59, 0x5a5a, 0x5a5b, 0x5a5c, 0x5a5d, 0x5a5e, 0x5a5f, 0x5a60,
-  0x5a61, 0x5a62, 0x5a63, 0x5a64, 0x5a65, 0x5a66, 0x5a67, 0x5a68,
-  0x5a69, 0x5a6a, 0x5a6b, 0x5a6c, 0x5a6e, 0x5a6f, 0x5a70, 0x5a71,
-  0x5a72, 0x5a73, 0x5a74, 0x5a75, 0x5a76, 0x5a77, 0x5a78, 0x5a79,
-  0x5a7a, 0x5a7b, 0x5a7c, 0x5a7d, 0x5a7e, 0x5b21, 0x5b22, 0x5b23,
-  0x5b24, 0x5b25, 0x5b26, 0x5b27, 0x5b28, 0x5b29, 0x5b2a, 0x5b2b,
-  0x5b2c, 0x5b2d, 0x5b2e, 0x5b2f, 0x5b30, 0x5b31, 0x5b32, 0x5b33,
-  0x5b34, 0x5b35, 0x5b36, 0x5b37, 0x5b38, 0x5b39, 0x5b3a, 0x5b3b,
-  0x5b3c, 0x5b3d, 0x5b3e, 0x5b3f, 0x5b40, 0x5b41, 0x5b42, 0x5b43,
-  0x5b44, 0x5b45, 0x5b46, 0x5b47, 0x5b48, 0x5b49, 0x5b4a, 0x5b4b,
-  0x5b4c, 0x5b4d, 0x5b4e, 0x5b4f, 0x5b50, 0x5b51, 0x5b52, 0x5b53,
-  0x5b54, 0x5b55, 0x5b56, 0x5b57, 0x5b58, 0x5b59, 0x5b5a, 0x5b5b,
-  0x5b5c, 0x5b5d, 0x5b5e, 0x5b5f, 0x5b60, 0x5b61, 0x5b62, 0x5b63,
-  0x5b64, 0x5b65, 0x5b66, 0x5b67, 0x5b68, 0x5b69, 0x5b6a, 0x5b6b,
-  0x5b6c, 0x5b6d, 0x5b6e, 0x5b70, 0x5b71, 0x5b72, 0x5b73, 0x5b6f,
-  0x5b74, 0x5b75, 0x5b76, 0x5b77, 0x5b78, 0x5b79, 0x5b7a, 0x5b7b,
-  0x5b7c, 0x5b7d, 0x5b7e, 0x5c21, 0x5c22, 0x5c23, 0x5c24, 0x5c25,
-  0x5c26, 0x5c27, 0x5c28, 0x5c29, 0x5c2a, 0x5c2b, 0x5c2c, 0x5c2d,
-  0x5c2e, 0x5c2f, 0x5c30, 0x5c31, 0x5c32, 0x5c33, 0x5c34, 0x5c35,
-  0x5c36, 0x5c37, 0x5c38, 0x5c39, 0x5c3a, 0x5c3b, 0x5c3c, 0x5c3d,
-  0x5c3e, 0x5c3f, 0x5c40, 0x5c41, 0x5c42, 0x5c43, 0x5c44, 0x5c45,
-  0x5c46, 0x5c47, 0x5c48, 0x5c49, 0x5c4a, 0x5c4b, 0x5c4c, 0x5c4d,
-  0x5c4e, 0x5c4f, 0x5c50, 0x5c51, 0x5c52, 0x5c53, 0x5c54, 0x5c55,
-  0x5c56, 0x5c57, 0x5c58, 0x5c59, 0x5c5a, 0x5c5b, 0x5c5c, 0x5c5d,
-  0x5c5e, 0x5c5f, 0x5c60, 0x5c61, 0x5c62, 0x5c63, 0x5c64, 0x5c65,
-  0x5c66, 0x5c67, 0x5c68, 0x5c69, 0x5c6a, 0x5c6b, 0x5c6c, 0x5c6d,
-  0x5c6e, 0x5c6f, 0x5c70, 0x5c71, 0x5c72, 0x5c73, 0x5c74, 0x5c75,
-  0x5c76, 0x5c77, 0x5c78, 0x5c79, 0x5c7a, 0x5c7b, 0x5c7c, 0x5c7d,
-  0x5c7e, 0x5d21, 0x5d22, 0x5d23, 0x5d24, 0x5d25, 0x5d26, 0x5d27,
-  0x5d28, 0x5d29, 0x5d2a, 0x5d2b, 0x5d2c, 0x5d2d, 0x5d2e, 0x5d2f,
-  0x5d30, 0x5d31, 0x5d32, 0x5d33, 0x5d34, 0x5d35, 0x5d36, 0x5d37,
-  0x5d38, 0x5d39, 0x5d3a, 0x5d3b, 0x5d3c, 0x5d3d, 0x5d3e, 0x5d3f,
-  0x5d40, 0x5d41, 0x5d42, 0x5d43, 0x5d44, 0x5d45, 0x5d46, 0x5d47,
-  0x5d48, 0x5d49, 0x5d4a, 0x5d4b, 0x5d4c, 0x5d4d, 0x5d4e, 0x5d4f,
-  0x5d50, 0x5d51, 0x5d52, 0x5d53, 0x5d54, 0x5d55, 0x5d56, 0x5d57,
-  0x5d58, 0x5d59, 0x5d5a, 0x5d5b, 0x5d5c, 0x5d5d, 0x5d5e, 0x5d5f,
-  0x5d60, 0x5d61, 0x5d62, 0x5d63, 0x5d64, 0x5d65, 0x5d66, 0x5d67,
-  0x5d68, 0x5d69, 0x5d6a, 0x5d6b, 0x5d6c, 0x5d6d, 0x5d6e, 0x5d6f,
-  0x5d70, 0x5d71, 0x5d72, 0x5d73, 0x5d74, 0x5d75, 0x5d76, 0x5d77,
-  0x5d78, 0x5d79, 0x5d7a, 0x5d7b, 0x5d7c, 0x5d7d, 0x5d7e, 0x5e21,
-  0x5e22, 0x5e23, 0x5e24, 0x5e25, 0x5e26, 0x5e27, 0x5e28, 0x5e29,
-  0x5e2a, 0x5e2b, 0x5e2c, 0x5e2d, 0x5e2e, 0x5e2f, 0x5e30, 0x5e31,
-  0x5e32, 0x5e33, 0x5e34, 0x5e35, 0x5e36, 0x5e37, 0x5e38, 0x5e39,
-  0x5e3f, 0x5e3a, 0x5e3b, 0x5e3c, 0x5e3d, 0x5e3e, 0x5e40, 0x5e41,
-  0x5e42, 0x5e43, 0x5e44, 0x5e45, 0x5e46, 0x5e47, 0x5e48, 0x5e49,
-  0x5e4e, 0x5e4a, 0x5e4b, 0x5e4c, 0x5e4d, 0x5e4f, 0x5e50, 0x5e51,
-  0x5e52, 0x5e53, 0x5e54, 0x5e55, 0x5e56, 0x5e57, 0x5e58, 0x5e59,
-  0x5e5a, 0x5e5b, 0x5e5c, 0x5e5d, 0x5e5e, 0x5e5f, 0x5e60, 0x5e61,
-  0x5e62, 0x5e63, 0x5e64, 0x5e65, 0x5e66, 0x5e67, 0x5e68, 0x5e69,
-  0x5e6a, 0x5e6b, 0x5e6c, 0x5e6d, 0x5e6e, 0x5e6f, 0x5e72, 0x5e70,
-  0x5e71, 0x5e73, 0x5e74, 0x5e75, 0x5e76, 0x5e77, 0x5e78, 0x5e79,
-  0x5e7a, 0x5e7b, 0x5e7c, 0x5e7d, 0x5e7e, 0x5f21, 0x5f22, 0x5f23,
-  0x5f24, 0x5f25, 0x5f26, 0x5f27, 0x5f28, 0x5f29, 0x5f2a, 0x5f2b,
-  0x5f2c, 0x5f2d, 0x5f2e, 0x5f2f, 0x5f30, 0x5f32, 0x5f31, 0x5f33,
-  0x5f34, 0x5f35, 0x5f36, 0x5f37, 0x5f38, 0x5f39, 0x5f3a, 0x5f3b,
-  0x5f3c, 0x5f3d, 0x5f3e, 0x5f3f, 0x5f40, 0x5f41, 0x5f42, 0x5f43,
-  0x5f44, 0x5f45, 0x5f46, 0x5f47, 0x5f48, 0x5f49, 0x5f4a, 0x5f4b,
-  0x5f4c, 0x5f4d, 0x5f4e, 0x5f4f, 0x5f50, 0x5f51, 0x5f52, 0x5f53,
-  0x5f54, 0x5f55, 0x5f56, 0x5f57, 0x5f58, 0x5f59, 0x5f5a, 0x5f5b,
-  0x5f5c, 0x5f5d, 0x5f6f, 0x5f5e, 0x5f5f, 0x5f60, 0x5f61, 0x5f62,
-  0x5f63, 0x5f64, 0x5f65, 0x5f66, 0x5f67, 0x5f68, 0x5f69, 0x5f6a,
-  0x5f6b, 0x5f6c, 0x5f6d, 0x5f6e, 0x5f70, 0x5f71, 0x5f72, 0x5f73,
-  0x5f74, 0x5f75, 0x5f76, 0x5f77, 0x5f78, 0x5f79, 0x5f7a, 0x5f7b,
-  0x5f7c, 0x5f7d, 0x5f7e, 0x6021, 0x6022, 0x6023, 0x6024, 0x6025,
-  0x6026, 0x6027, 0x6028, 0x6029, 0x602a, 0x602b, 0x602c, 0x602d,
-  0x602e, 0x602f, 0x6030, 0x6031, 0x6032, 0x6033, 0x6034, 0x6035,
-  0x6036, 0x6037, 0x6038, 0x6039, 0x603a, 0x603b, 0x603c, 0x603d,
-  0x603e, 0x603f, 0x6040, 0x6041, 0x6042, 0x6043, 0x6044, 0x6045,
-  0x6046, 0x6047, 0x6048, 0x6049, 0x604a, 0x604b, 0x604c, 0x604d,
-  0x604e, 0x604f, 0x6050, 0x6051, 0x6052, 0x6053, 0x6054, 0x6055,
-  0x6056, 0x6057, 0x6058, 0x6059, 0x605a, 0x605b, 0x605c, 0x605d,
-  0x6064, 0x605e, 0x605f, 0x6060, 0x6061, 0x6062, 0x6063, 0x6065,
-  0x6066, 0x6067, 0x6068, 0x6069, 0x606a, 0x606b, 0x606c, 0x606d,
-  0x606e, 0x606f, 0x6070, 0x6071, 0x6072, 0x6073, 0x6074, 0x6075,
-  0x6076, 0x6077, 0x6078, 0x6079, 0x607a, 0x607b, 0x607c, 0x607d,
-  0x607e, 0x6121, 0x6122, 0x6123, 0x6124, 0x6125, 0x6126, 0x6127,
-  0x6128, 0x6129, 0x612a, 0x612b, 0x612c, 0x612d, 0x612e, 0x612f,
-  0x6130, 0x6131, 0x6132, 0x6133, 0x6134, 0x6135, 0x6136, 0x6137,
-  0x6138, 0x6139, 0x613a, 0x613b, 0x613c, 0x613d, 0x613e, 0x613f,
-  0x6140, 0x6141, 0x6142, 0x6143, 0x6144, 0x6145, 0x6146, 0x6147,
-  0x6148, 0x6149, 0x614a, 0x614b, 0x614c, 0x614d, 0x614e, 0x614f,
-  0x6150, 0x6151, 0x6152, 0x6154, 0x6155, 0x6156, 0x6153, 0x6157,
-  0x6158, 0x6159, 0x615a, 0x615b, 0x615c, 0x615d, 0x615e, 0x615f,
-  0x6160, 0x6161, 0x6162, 0x6163, 0x6164, 0x6165, 0x6166, 0x6167,
-  0x6168, 0x6169, 0x616a, 0x616b, 0x616c, 0x616d, 0x616e, 0x616f,
-  0x6170, 0x6171, 0x6172, 0x6173, 0x6174, 0x6175, 0x6176, 0x6177,
-  0x6178, 0x6179, 0x617a, 0x617b, 0x617d, 0x617e, 0x6221, 0x6222,
-  0x6223, 0x6224, 0x617c, 0x622d, 0x6225, 0x6226, 0x6227, 0x6228,
-  0x6229, 0x622a, 0x622b, 0x622c, 0x622f, 0x6230, 0x6231, 0x6232,
-  0x622e, 0x6233, 0x6234, 0x6235, 0x6236, 0x6237, 0x6238, 0x6239,
-  0x623a, 0x623b, 0x623c, 0x623d, 0x623e, 0x623f, 0x6240, 0x6241,
-  0x6242, 0x6243, 0x6245, 0x6246, 0x6244, 0x6247, 0x6248, 0x6249,
-  0x624a, 0x624b, 0x624c, 0x624d, 0x624e, 0x624f, 0x6250, 0x6251,
-  0x6252, 0x6253, 0x6254, 0x6255, 0x6256, 0x6257, 0x6258, 0x6259,
-  0x625a, 0x625b, 0x625c, 0x625d, 0x625e, 0x625f, 0x6260, 0x6261,
-  0x6262, 0x6263, 0x6264, 0x6265, 0x6266, 0x6267, 0x6268, 0x6269,
-  0x626a, 0x626b, 0x626c, 0x626d, 0x626e, 0x626f, 0x6270, 0x6271,
-  0x6272, 0x6273, 0x6274, 0x6275, 0x6276, 0x6277, 0x6278, 0x6279,
-  0x627a, 0x627b, 0x627c, 0x627d, 0x627e, 0x6321, 0x6322, 0x6323,
-  0x6324, 0x6325, 0x6326, 0x6327, 0x6328, 0x6329, 0x632a, 0x632b,
-  0x632c, 0x632d, 0x632e, 0x632f, 0x6330, 0x6331, 0x6332, 0x6333,
-  0x6334, 0x6335, 0x6336, 0x6337, 0x6338, 0x6339, 0x633a, 0x633b,
-  0x633c, 0x633d, 0x633e, 0x633f, 0x6340, 0x6341, 0x6342, 0x6343,
-  0x6344, 0x6345, 0x6346, 0x6347, 0x6348, 0x6349, 0x634a, 0x634b,
-  0x634c, 0x634d, 0x634e, 0x634f, 0x6350, 0x6351, 0x6352, 0x6353,
-  0x6354, 0x6355, 0x6356, 0x6357, 0x6358, 0x6359, 0x635a, 0x635b,
-  0x635c, 0x635d, 0x635e, 0x635f, 0x6360, 0x6361, 0x6362, 0x6363,
-  0x6364, 0x6365, 0x6366, 0x6367, 0x6368, 0x6369, 0x636a, 0x636b,
-  0x636c, 0x636d, 0x636e, 0x636f, 0x6370, 0x6371, 0x6372, 0x6373,
-  0x6374, 0x6375, 0x6376, 0x6377, 0x6378, 0x6379, 0x637a, 0x637b,
-  0x637c, 0x637d, 0x637e, 0x6421, 0x6422, 0x6423, 0x6424, 0x6425,
-  0x6426, 0x6427, 0x6428, 0x6429, 0x642a, 0x642b, 0x642c, 0x642d,
-  0x642e, 0x642f, 0x6430, 0x6431, 0x6432, 0x6433, 0x6434, 0x6435,
-  0x6436, 0x6437, 0x6438, 0x6439, 0x643a, 0x643b, 0x643c, 0x643d,
-  0x643e, 0x643f, 0x6440, 0x6441, 0x6442, 0x6443, 0x6444, 0x6445,
-  0x6446, 0x6447, 0x6448, 0x6449, 0x644a, 0x644b, 0x644c, 0x644d,
-  0x644e, 0x644f, 0x6450, 0x6451, 0x6452, 0x6453, 0x6454, 0x6455,
-  0x6456, 0x6457, 0x6458, 0x6459, 0x645a, 0x645b, 0x645c, 0x645d,
-  0x645e, 0x645f, 0x6460, 0x6461, 0x6462, 0x6463, 0x6464, 0x6465,
-  0x6466, 0x6467, 0x6468, 0x6469, 0x646a, 0x646b, 0x646c, 0x646d,
-  0x646e, 0x646f, 0x6470, 0x6471, 0x6472, 0x6473, 0x6474, 0x6475,
-  0x6476, 0x6477, 0x6478, 0x6479, 0x647a, 0x647b, 0x647c, 0x647d,
-  0x647e, 0x6521, 0x6522, 0x6523, 0x6524, 0x6525, 0x6526, 0x6527,
-  0x6528, 0x6529, 0x652a, 0x652b, 0x652c, 0x652d, 0x652e, 0x652f,
-  0x6530, 0x6531, 0x6532, 0x6533, 0x6534, 0x6535, 0x653b, 0x6536,
-  0x6537, 0x6538, 0x6539, 0x653a, 0x653c, 0x653d, 0x653e, 0x653f,
-  0x6540, 0x6541, 0x6542, 0x6543, 0x6544, 0x6545, 0x6546, 0x6547,
-  0x6548, 0x6549, 0x654a, 0x654b, 0x654c, 0x654d, 0x654f, 0x6550,
-  0x654e, 0x6551, 0x6552, 0x6553, 0x6554, 0x6555, 0x6556, 0x6557,
-  0x6558, 0x6559, 0x655a, 0x655b, 0x655c, 0x655d, 0x655e, 0x655f,
-  0x6560, 0x6561, 0x6562, 0x6563, 0x6564, 0x6565, 0x6566, 0x6568,
-  0x6567, 0x6569, 0x656a, 0x656b, 0x656c, 0x656d, 0x656e, 0x656f,
-  0x6570, 0x6571, 0x6572, 0x6573, 0x6574, 0x6575, 0x6576, 0x6577,
-  0x6578, 0x6579, 0x657a, 0x657c, 0x657b, 0x657d, 0x657e, 0x6621,
-  0x6622, 0x6623, 0x6624, 0x6625, 0x6626, 0x6627, 0x6628, 0x6629,
-  0x662a, 0x662b, 0x662c, 0x662d, 0x662e, 0x662f, 0x6630, 0x6631,
-  0x6632, 0x6633, 0x6634, 0x6635, 0x6636, 0x6637, 0x6638, 0x6639,
-  0x663a, 0x663b, 0x663c, 0x663d, 0x663e, 0x663f, 0x6640, 0x6641,
-  0x6642, 0x6643, 0x6644, 0x6645, 0x6646, 0x6647, 0x6648, 0x6649,
-  0x664a, 0x664b, 0x664c, 0x664d, 0x664e, 0x664f, 0x6650, 0x6651,
-  0x6652, 0x6653, 0x6654, 0x6655, 0x6656, 0x6657, 0x6658, 0x6659,
-  0x665a, 0x665b, 0x665c, 0x665d, 0x665e, 0x665f, 0x6660, 0x6661,
-  0x6662, 0x6663, 0x6664, 0x6665, 0x6666, 0x6667, 0x6668, 0x6669,
-  0x666a, 0x666b, 0x666c, 0x666d, 0x666e, 0x666f, 0x6670, 0x6671,
-  0x6672, 0x6673, 0x6675, 0x6676, 0x6677, 0x6678, 0x6679, 0x667a,
-  0x667b, 0x667c, 0x667d, 0x667e, 0x6721, 0x6722, 0x6723, 0x6724,
-  0x6725, 0x6726, 0x6727, 0x6728, 0x6729, 0x672a, 0x672b, 0x672c,
-  0x672d, 0x672e, 0x672f, 0x6730, 0x6731, 0x6732, 0x6733, 0x6734,
-  0x6735, 0x6736, 0x6737, 0x6738, 0x6739, 0x673a, 0x673b, 0x673c,
-  0x673d, 0x673e, 0x673f, 0x6740, 0x6741, 0x6742, 0x6743, 0x6744,
-  0x6745, 0x6746, 0x6747, 0x6748, 0x6749, 0x674a, 0x674b, 0x674c,
-  0x674d, 0x674e, 0x674f, 0x6750, 0x6751, 0x6752, 0x6753, 0x6754,
-  0x6755, 0x6756, 0x6757, 0x6758, 0x6759, 0x675a, 0x675b, 0x675c,
-  0x675d, 0x675e, 0x675f, 0x6760, 0x6761, 0x6762, 0x6763, 0x6764,
-  0x6765, 0x6766, 0x676a, 0x6767, 0x6768, 0x6769, 0x676b, 0x676c,
-  0x676d, 0x676e, 0x676f, 0x6770, 0x6771, 0x6772, 0x6773, 0x6774,
-  0x6776, 0x6777, 0x6778, 0x6779, 0x6775, 0x677a, 0x677b, 0x677c,
-  0x677d, 0x6828, 0x677e, 0x6821, 0x6822, 0x6823, 0x6824, 0x6825,
-  0x6826, 0x6827, 0x6829, 0x682a, 0x682b, 0x682c, 0x682d, 0x682e,
-  0x682f, 0x6830, 0x6831, 0x6832, 0x6833, 0x6834, 0x6835, 0x6836,
-  0x6837, 0x6838, 0x6839, 0x683a, 0x683b, 0x683c, 0x683d, 0x683e,
-  0x683f, 0x6840, 0x6841, 0x6842, 0x6843, 0x6844, 0x6845, 0x6846,
-  0x6847, 0x6848, 0x6849, 0x684a, 0x684b, 0x684c, 0x684d, 0x684e,
-  0x684f, 0x6850, 0x6851, 0x6852, 0x6853, 0x6854, 0x6855, 0x6856,
-  0x6857, 0x6858, 0x6859, 0x685a, 0x685b, 0x685c, 0x685d, 0x685e,
-  0x685f, 0x6860, 0x6861, 0x6862, 0x6863, 0x6864, 0x6865, 0x6866,
-  0x6867, 0x6868, 0x6869, 0x686a, 0x686b, 0x686c, 0x686d, 0x686e,
-  0x686f, 0x6870, 0x6871, 0x6872, 0x6873, 0x6874, 0x6875, 0x6876,
-  0x6877, 0x6878, 0x6879, 0x687a, 0x687b, 0x687c, 0x687d, 0x687e,
-  0x6921, 0x6922, 0x6923, 0x6924, 0x6925, 0x6926, 0x6927, 0x6928,
-  0x6929, 0x692a, 0x692b, 0x692c, 0x692d, 0x692e, 0x692f, 0x6930,
-  0x6931, 0x6932, 0x6933, 0x6934, 0x6935, 0x6936, 0x6937, 0x6938,
-  0x6939, 0x693a, 0x693b, 0x693c, 0x693d, 0x693e, 0x693f, 0x6940,
-  0x6941, 0x6942, 0x6943, 0x6944, 0x6945, 0x6946, 0x6947, 0x6948,
-  0x6949, 0x694a, 0x694c, 0x694d, 0x694b, 0x694e, 0x694f, 0x6950,
-  0x6951, 0x6952, 0x6953, 0x6954, 0x6955, 0x6956, 0x6957, 0x6958,
-  0x6959, 0x695a, 0x695b, 0x695c, 0x695d, 0x695e, 0x695f, 0x6960,
-  0x6961, 0x6962, 0x6963, 0x6964, 0x6965, 0x6966, 0x6967, 0x6968,
-  0x6969, 0x696a, 0x696b, 0x696c, 0x696d, 0x696e, 0x696f, 0x6970,
-  0x6971, 0x6972, 0x6973, 0x6974, 0x6975, 0x6976, 0x6977, 0x6978,
-  0x6979, 0x697a, 0x697b, 0x697c, 0x697d, 0x697e, 0x6a21, 0x6a22,
-  0x6a23, 0x6a24, 0x6a25, 0x6a26, 0x6a27, 0x6a28, 0x6a29, 0x6a2a,
-  0x6a2b, 0x6a2c, 0x6a2d, 0x6a2e, 0x6a2f, 0x6a30, 0x6a31, 0x6a32,
-  0x6a33, 0x6a34, 0x6a35, 0x6a36, 0x6a37, 0x6a38, 0x6a39, 0x6a3a,
-  0x6a3b, 0x6a3c, 0x6a3d, 0x6a3e, 0x6a3f, 0x6a40, 0x6a41, 0x6a42,
-  0x6a43, 0x6a44, 0x6a45, 0x6a46, 0x6a47, 0x6a48, 0x6a49, 0x6a4a,
-  0x6a4b, 0x6a4c, 0x6a4d, 0x6a4e, 0x6a4f, 0x6a50, 0x6a51, 0x6a52,
-  0x6a53, 0x6a54, 0x6a55, 0x6a56, 0x6a57, 0x6a58, 0x6a59, 0x6a5a,
-  0x6a5b, 0x6a5c, 0x6a5d, 0x6a5e, 0x6a5f, 0x6a60, 0x6a61, 0x6a62,
-  0x6a63, 0x6a64, 0x6a65, 0x6a66, 0x6a67, 0x6a68, 0x6a69, 0x6a6a,
-  0x6a6b, 0x6a6c, 0x6a6d, 0x6a6e, 0x6a6f, 0x6a70, 0x6a71, 0x6a72,
-  0x6a73, 0x6a74, 0x6a75, 0x6a76, 0x6a77, 0x6a78, 0x6a79, 0x6a7a,
-  0x6a7b, 0x6a7c, 0x6a7d, 0x6a7e, 0x6b21, 0x6b22, 0x6b23, 0x6b24,
-  0x6b25, 0x6b26, 0x6b27, 0x6b28, 0x6b29, 0x6b2a, 0x6b2b, 0x6b2c,
-  0x6b2d, 0x6b2e, 0x6b2f, 0x6b30, 0x6b31, 0x6b32, 0x6b33, 0x6b34,
-  0x6b35, 0x6b36, 0x6b37, 0x6b38, 0x6b39, 0x6b3a, 0x6b3b, 0x6b3c,
-  0x6b3d, 0x6b3e, 0x6b3f, 0x6b40, 0x6b41, 0x6b42, 0x6b43, 0x6b44,
-  0x6b45, 0x6b46, 0x6b47, 0x6b48, 0x6b49, 0x6b50, 0x6b4a, 0x6b4b,
-  0x6b4c, 0x6b4d, 0x6b52, 0x6b4e, 0x6b4f, 0x6b51, 0x6b53, 0x6b54,
-  0x6b55, 0x6b56, 0x6b57, 0x6b58, 0x6b59, 0x6b5a, 0x6b5b, 0x6b5c,
-  0x6b5e, 0x6b5d, 0x6b5f, 0x6b60, 0x6b61, 0x6b62, 0x6b63, 0x6b64,
-  0x6b65, 0x6b66, 0x6b67, 0x6b68, 0x6b69, 0x6b6a, 0x6b6b, 0x6b6d,
-  0x6b6e, 0x6b6f, 0x6b6c, 0x6b70, 0x6b71, 0x6b72, 0x6b73, 0x6b74,
-  0x6b76, 0x6b75, 0x6b77, 0x6b78, 0x6b79, 0x6b7a, 0x6b7b, 0x6b7c,
-  0x6b7d, 0x6b7e, 0x6c21, 0x6c22, 0x6c23, 0x6c24, 0x6c25, 0x6c26,
-  0x6c27, 0x6c28, 0x6c29, 0x6c2a, 0x6c2b, 0x6c2c, 0x6c2d, 0x6c2e,
-  0x6c2f, 0x6c30, 0x6c31, 0x6c32, 0x6c33, 0x6c34, 0x6c35, 0x6c36,
-  0x6c37, 0x6c38, 0x6c39, 0x6c3a, 0x6c3b, 0x6c3c, 0x6c3d, 0x6c3e,
-  0x6c3f, 0x6c40, 0x6c41, 0x6c42, 0x6c43, 0x6c44, 0x6c45, 0x6c46,
-  0x6c47, 0x6c48, 0x6c49, 0x6c4a, 0x6c4b, 0x6c4c, 0x6c4e, 0x6c4f,
-  0x6c4d, 0x6c50, 0x6c51, 0x6c52, 0x6c53, 0x6c54, 0x6c55, 0x6c56,
-  0x6c57, 0x6c58, 0x6c59, 0x6c5a, 0x6c5b, 0x6c5c, 0x6c5d, 0x6c5e,
-  0x6c5f, 0x6c60, 0x6c61, 0x6c62, 0x6c63, 0x6c64, 0x6c65, 0x6c66,
-  0x6c67, 0x6c68, 0x6c69, 0x6c6a, 0x6c6b, 0x6c6c, 0x6c6d, 0x6c6e,
-  0x6c6f, 0x6c70, 0x6c71, 0x6c72, 0x6c73, 0x6c74, 0x6c75, 0x6c76,
-  0x6c77, 0x6c78, 0x6c79, 0x6c7a, 0x6c7b, 0x6c7c, 0x6c7d, 0x6c7e,
-  0x6d21, 0x6d22, 0x6d23, 0x6d24, 0x6d25, 0x6d26, 0x6d27, 0x6d28,
-  0x6d29, 0x6d2a, 0x6d2b, 0x6d2c, 0x6d2d, 0x6d2e, 0x6d2f, 0x6d30,
-  0x6d31, 0x6d32, 0x6d33, 0x6d34, 0x6d35, 0x6d36, 0x6d37, 0x6d38,
-  0x6d39, 0x6d3a, 0x6d3b, 0x6d3c, 0x6d3d, 0x6d3e, 0x6d3f, 0x6d40,
-  0x6d41, 0x6d42, 0x6d43, 0x6d44, 0x6d45, 0x6d46, 0x6d47, 0x6d48,
-  0x6d49, 0x6d4a, 0x6d4b, 0x6d4c, 0x6d4d, 0x6d4e, 0x6d4f, 0x6d50,
-  0x6d51, 0x6d52, 0x6d53, 0x6d54, 0x6d55, 0x6d56, 0x6d57, 0x6d58,
-  0x6d59, 0x6d5a, 0x6d5b, 0x6d5c, 0x6d5d, 0x6d5e, 0x6d5f, 0x6d60,
-  0x6d61, 0x6d62, 0x6d63,
-};
-
-static const Summary16 jisx0212_uni2indx_page00[70] = {
-  /* 0x0000 */
-  {    0, 0x0000 }, {    0, 0x0000 }, {    0, 0x0000 }, {    0, 0x0000 },
-  {    0, 0x0000 }, {    0, 0x0000 }, {    0, 0x0000 }, {    0, 0x4000 },
-  {    1, 0x0000 }, {    1, 0x0000 }, {    1, 0xc652 }, {    8, 0x8500 },
-  {   11, 0xffff }, {   27, 0xff7e }, {   41, 0xffff }, {   57, 0xff7f },
-  /* 0x0100 */
-  {   72, 0xffff }, {   88, 0xffcf }, {  102, 0xcff7 }, {  115, 0xffff },
-  {  131, 0x3fff }, {  145, 0xffff }, {  161, 0xffff }, {  177, 0x7fff },
-  {  192, 0x0000 }, {  192, 0x0000 }, {  192, 0x0000 }, {  192, 0x0000 },
-  {  192, 0xe000 }, {  195, 0x1fff }, {  208, 0x0000 }, {  208, 0x0020 },
-  /* 0x0200 */
-  {  209, 0x0000 }, {  209, 0x0000 }, {  209, 0x0000 }, {  209, 0x0000 },
-  {  209, 0x0000 }, {  209, 0x0000 }, {  209, 0x0000 }, {  209, 0x0000 },
-  {  209, 0x0000 }, {  209, 0x0000 }, {  209, 0x0000 }, {  209, 0x0000 },
-  {  209, 0x0080 }, {  210, 0x2f00 }, {  215, 0x0000 }, {  215, 0x0000 },
-  /* 0x0300 */
-  {  215, 0x0000 }, {  215, 0x0000 }, {  215, 0x0000 }, {  215, 0x0000 },
-  {  215, 0x0000 }, {  215, 0x0000 }, {  215, 0x0000 }, {  215, 0x0000 },
-  {  215, 0xd770 }, {  224, 0x0001 }, {  225, 0xfc00 }, {  231, 0x0001 },
-  {  232, 0x7c04 }, {  238, 0x0000 }, {  238, 0x0000 }, {  238, 0x0000 },
-  /* 0x0400 */
-  {  238, 0xdffc }, {  251, 0x0000 }, {  251, 0x0000 }, {  251, 0x0000 },
-  {  251, 0x0000 }, {  251, 0xdffc },
-};
-static const Summary16 jisx0212_uni2indx_page21[3] = {
-  /* 0x2100 */
-  {  264, 0x0000 }, {  264, 0x0040 }, {  265, 0x0004 },
-};
-static const Summary16 jisx0212_uni2indx_page4e[1307] = {
-  /* 0x4e00 */
-  {  266, 0x1034 }, {  270, 0x8004 }, {  272, 0xc918 }, {  278, 0x0021 },
-  {  280, 0x0093 }, {  284, 0x1402 }, {  287, 0x0308 }, {  290, 0x8230 },
-  {  294, 0x2000 }, {  295, 0x20c0 }, {  298, 0x8000 }, {  299, 0x0200 },
-  {  300, 0x0008 }, {  301, 0x0c01 }, {  304, 0x8107 }, {  309, 0xe02a },
-  /* 0x4f00 */
-  {  315, 0x190d }, {  321, 0x02e4 }, {  326, 0x4000 }, {  327, 0x4aaa },
-  {  334, 0x1b05 }, {  340, 0x8154 }, {  345, 0x5409 }, {  350, 0x6782 },
-  {  357, 0x5636 }, {  365, 0xc69d }, {  374, 0x0000 }, {  374, 0x7a84 },
-  {  381, 0xbb63 }, {  391, 0x1004 }, {  393, 0x0005 }, {  395, 0xb005 },
-  /* 0x5000 */
-  {  400, 0x5493 }, {  407, 0x7989 }, {  415, 0x4084 }, {  418, 0x082d },
-  {  423, 0x5467 }, {  431, 0x828e }, {  437, 0x24cd }, {  444, 0x0003 },
-  {  446, 0xc45a }, {  453, 0xd85d }, {  462, 0x8407 }, {  467, 0x2601 },
-  {  471, 0x5099 }, {  477, 0xb119 }, {  484, 0x8354 }, {  490, 0x4446 },
-  /* 0x5100 */
-  {  495, 0x79c8 }, {  503, 0x7a81 }, {  510, 0xb188 }, {  516, 0x033a },
-  {  522, 0x8404 }, {  525, 0x81a8 }, {  530, 0x0050 }, {  532, 0x4000 },
-  {  533, 0x4818 }, {  537, 0x2100 }, {  539, 0x200a }, {  542, 0xd500 },
-  {  547, 0x8104 }, {  550, 0x412e }, {  556, 0x4024 }, {  559, 0x009c },
-  /* 0x5200 */
-  {  563, 0x0026 }, {  566, 0x016c }, {  571, 0x0104 }, {  573, 0x1026 },
-  {  577, 0x0220 }, {  579, 0x95a0 }, {  585, 0x4043 }, {  589, 0x0380 },
-  {  592, 0x1425 }, {  597, 0x15e8 }, {  604, 0x80f0 }, {  609, 0x2dc1 },
-  {  616, 0x9151 }, {  622, 0x1852 }, {  627, 0x1722 }, {  633, 0x00d3 },
-  /* 0x5300 */
-  {  638, 0x1c09 }, {  643, 0xd90a }, {  650, 0x3ba0 }, {  657, 0x7025 },
-  {  663, 0x1804 }, {  666, 0x0a00 }, {  668, 0x302a }, {  673, 0x4204 },
-  {  676, 0x4188 }, {  680, 0x2218 }, {  684, 0x8c12 }, {  689, 0x25b4 },
-  {  696, 0x8021 }, {  699, 0x642c }, {  705, 0x00c1 }, {  708, 0x0020 },
-  /* 0x5400 */
-  {  709, 0x0004 }, {  710, 0x0408 }, {  712, 0x8582 }, {  717, 0x0032 },
-  {  720, 0xa098 }, {  725, 0x4000 }, {  726, 0x6ad4 }, {  734, 0x8010 },
-  {  736, 0x232a }, {  742, 0x9062 }, {  747, 0x66c2 }, {  754, 0x8e82 },
-  {  760, 0x6440 }, {  764, 0x0000 }, {  764, 0x9401 }, {  768, 0xd040 },
-  /* 0x5500 */
-  {  772, 0x7323 }, {  780, 0x0020 }, {  781, 0x0c00 }, {  783, 0x3864 },
-  {  789, 0x2682 }, {  794, 0x4d03 }, {  800, 0x0053 }, {  804, 0x8000 },
-  {  805, 0xc146 }, {  811, 0x009e }, {  816, 0x2018 }, {  819, 0x8004 },
-  {  821, 0x5a4a }, {  828, 0x498e }, {  835, 0x0204 }, {  837, 0x8040 },
-  /* 0x5600 */
-  {  839, 0xe520 }, {  845, 0x0207 }, {  849, 0x1000 }, {  850, 0xbaa9 },
-  {  859, 0xaa5b }, {  868, 0x4010 }, {  870, 0xa24f }, {  878, 0x0026 },
-  {  881, 0x1930 }, {  886, 0xe620 }, {  892, 0x3bc0 }, {  899, 0x408a },
-  {  903, 0xbe20 }, {  910, 0xb201 }, {  915, 0x29f2 }, {  923, 0x00c2 },
-  /* 0x5700 */
-  {  926, 0x1486 }, {  931, 0x2c22 }, {  936, 0xd63d }, {  946, 0xe018 },
-  {  951, 0x3060 }, {  955, 0x0004 }, {  956, 0xe9a4 }, {  964, 0x5ebb },
-  {  975, 0x100a }, {  978, 0xf6b0 }, {  987, 0x1382 }, {  992, 0x2100 },
-  {  994, 0x9180 }, {  998, 0x6020 }, { 1001, 0x22d2 }, { 1007, 0xe161 },
-  /* 0x5800 */
-  { 1014, 0x3318 }, { 1020, 0xc800 }, { 1023, 0x20c1 }, { 1027, 0x8204 },
-  { 1030, 0xb200 }, { 1034, 0x8021 }, { 1037, 0x0192 }, { 1041, 0x9100 },
-  { 1044, 0xb783 }, { 1053, 0x2051 }, { 1057, 0x0247 }, { 1062, 0x1006 },
-  { 1065, 0x6114 }, { 1070, 0x2455 }, { 1076, 0x0206 }, { 1079, 0x0008 },
-  /* 0x5900 */
-  { 1080, 0x1860 }, { 1084, 0x201c }, { 1088, 0x811a }, { 1093, 0x8069 },
-  { 1098, 0x0048 }, { 1100, 0xea0c }, { 1107, 0xa80a }, { 1112, 0x1a64 },
-  { 1118, 0x5800 }, { 1121, 0x80a4 }, { 1125, 0xe090 }, { 1130, 0x1489 },
-  { 1135, 0x251a }, { 1141, 0xe004 }, { 1145, 0xc098 }, { 1150, 0x0096 },
-  /* 0x5a00 */
-  { 1154, 0x7011 }, { 1159, 0x400c }, { 1162, 0x2598 }, { 1168, 0x0001 },
-  { 1169, 0x11b0 }, { 1174, 0x4021 }, { 1177, 0x20a8 }, { 1181, 0x4c80 },
-  { 1185, 0x0800 }, { 1186, 0xd249 }, { 1193, 0x1085 }, { 1197, 0x8d2e },
-  { 1205, 0x8150 }, { 1209, 0x1400 }, { 1211, 0x4421 }, { 1215, 0x2060 },
-  /* 0x5b00 */
-  { 1218, 0x0103 }, { 1221, 0x2a80 }, { 1225, 0x2022 }, { 1228, 0x0110 },
-  { 1230, 0x1802 }, { 1233, 0x4044 }, { 1236, 0xc100 }, { 1239, 0xf000 },
-  { 1243, 0x4452 }, { 1248, 0x005b }, { 1253, 0xb300 }, { 1258, 0x1486 },
-  { 1263, 0xa003 }, { 1267, 0x07c0 }, { 1272, 0x8001 }, { 1274, 0x2012 },
-  /* 0x5c00 */
-  { 1277, 0x1000 }, { 1278, 0xc080 }, { 1281, 0x5a48 }, { 1287, 0x0065 },
-  { 1291, 0x0000 }, { 1291, 0x1600 }, { 1294, 0x238c }, { 1300, 0x3c31 },
-  { 1307, 0x8580 }, { 1311, 0xa004 }, { 1314, 0x044d }, { 1319, 0x0434 },
-  { 1323, 0x0a00 }, { 1325, 0x2084 }, { 1328, 0x4000 }, { 1329, 0x0016 },
-  /* 0x5d00 */
-  { 1332, 0x2042 }, { 1335, 0x0004 }, { 1336, 0x08d8 }, { 1341, 0xa212 },
-  { 1346, 0x054c }, { 1351, 0x8222 }, { 1355, 0x2417 }, { 1361, 0xc601 },
-  { 1366, 0x050a }, { 1370, 0x8a3c }, { 1377, 0x0881 }, { 1380, 0x0315 },
-  { 1385, 0x4888 }, { 1389, 0x0301 }, { 1392, 0x0211 }, { 1395, 0x0300 },
-  /* 0x5e00 */
-  { 1397, 0x2081 }, { 1400, 0x8134 }, { 1405, 0x4101 }, { 1408, 0x4024 },
-  { 1411, 0x0a00 }, { 1413, 0x5943 }, { 1420, 0x7d00 }, { 1426, 0x0001 },
-  { 1427, 0x4801 }, { 1430, 0x0000 }, { 1430, 0x1534 }, { 1436, 0xe00a },
-  { 1441, 0x5840 }, { 1445, 0x5036 }, { 1451, 0x0820 }, { 1453, 0x0000 },
-  /* 0x5f00 */
-  { 1453, 0x41c4 }, { 1458, 0x3200 }, { 1461, 0x591e }, { 1469, 0xa851 },
-  { 1475, 0x20b1 }, { 1480, 0x0911 }, { 1484, 0x8099 }, { 1489, 0x6534 },
-  { 1496, 0xa200 }, { 1499, 0x3040 }, { 1502, 0x9894 }, { 1508, 0x0103 },
-  { 1511, 0x0b90 }, { 1516, 0x401f }, { 1522, 0xf706 }, { 1531, 0x144c },
-  /* 0x6000 */
-  { 1536, 0x2480 }, { 1539, 0x8598 }, { 1545, 0x2010 }, { 1547, 0x0028 },
-  { 1549, 0x1381 }, { 1554, 0x20d2 }, { 1559, 0x0082 }, { 1561, 0xc002 },
-  { 1564, 0x4544 }, { 1569, 0x612a }, { 1575, 0x0134 }, { 1579, 0x4883 },
-  { 1584, 0xcf14 }, { 1592, 0x6a30 }, { 1598, 0x0024 }, { 1600, 0x3124 },
-  /* 0x6100 */
-  { 1605, 0x1484 }, { 1609, 0x52df }, { 1619, 0x0c04 }, { 1622, 0x02e3 },
-  { 1628, 0x0262 }, { 1632, 0x4000 }, { 1633, 0x1001 }, { 1635, 0x9904 },
-  { 1640, 0x281b }, { 1646, 0xb18c }, { 1653, 0x2521 }, { 1658, 0x1300 },
-  { 1661, 0xc007 }, { 1666, 0xf020 }, { 1671, 0xb2a6 }, { 1679, 0x0000 },
-  /* 0x6200 */
-  { 1679, 0x009a }, { 1683, 0x1028 }, { 1686, 0x0a8d }, { 1692, 0x2200 },
-  { 1694, 0x105c }, { 1699, 0x1457 }, { 1706, 0xa010 }, { 1709, 0x2408 },
-  { 1712, 0xe000 }, { 1715, 0x0001 }, { 1716, 0x0140 }, { 1718, 0xc4c8 },
-  { 1724, 0x4010 }, { 1726, 0x0460 }, { 1729, 0x0400 }, { 1730, 0x3014 },
-  /* 0x6300 */
-  { 1734, 0x2c18 }, { 1739, 0x0149 }, { 1743, 0x2600 }, { 1746, 0x1260 },
-  { 1750, 0x4c5e }, { 1758, 0x091c }, { 1763, 0x3060 }, { 1767, 0xb132 },
-  { 1774, 0x0494 }, { 1778, 0x4631 }, { 1784, 0xe050 }, { 1789, 0x2000 },
-  { 1790, 0x4122 }, { 1794, 0x103a }, { 1799, 0x1421 }, { 1803, 0x032c },
-  /* 0x6400 */
-  { 1808, 0x0600 }, { 1810, 0x4115 }, { 1815, 0x8635 }, { 1822, 0xa021 },
-  { 1826, 0x8800 }, { 1828, 0xbc1e }, { 1837, 0x200b }, { 1841, 0x2818 },
-  { 1845, 0x80a0 }, { 1848, 0xab03 }, { 1855, 0x114a }, { 1860, 0xe008 },
-  { 1864, 0x5e10 }, { 1870, 0x00a3 }, { 1874, 0x2630 }, { 1879, 0x88a1 },
-  /* 0x6500 */
-  { 1884, 0x8712 }, { 1890, 0xca58 }, { 1897, 0x4244 }, { 1901, 0x3402 },
-  { 1905, 0x0288 }, { 1908, 0x8015 }, { 1912, 0x0881 }, { 1915, 0x2400 },
-  { 1917, 0x0422 }, { 1920, 0x2124 }, { 1924, 0x4049 }, { 1928, 0x801c },
-  { 1932, 0x4304 }, { 1936, 0x8151 }, { 1941, 0x0000 }, { 1941, 0xc235 },
-  /* 0x6600 */
-  { 1948, 0x2311 }, { 1953, 0x6066 }, { 1959, 0x5e5e }, { 1969, 0x028b },
-  { 1974, 0x5461 }, { 1980, 0x1b82 }, { 1986, 0x1c03 }, { 1991, 0xdba8 },
-  { 2000, 0x3801 }, { 2004, 0x9e05 }, { 2011, 0x2011 }, { 2014, 0x8826 },
-  { 2019, 0xd10d }, { 2026, 0x8810 }, { 2029, 0x5900 }, { 2033, 0x0c00 },
-  /* 0x6700 */
-  { 2035, 0x40a0 }, { 2038, 0x1208 }, { 2041, 0x0005 }, { 2043, 0x4008 },
-  { 2045, 0x11a0 }, { 2049, 0x2030 }, { 2052, 0x5040 }, { 2055, 0x0850 },
-  { 2058, 0xc012 }, { 2062, 0x0b4a }, { 2068, 0x0000 }, { 2068, 0x3827 },
-  { 2075, 0x032d }, { 2081, 0x1284 }, { 2085, 0x0042 }, { 2087, 0x02c5 },
-  /* 0x6800 */
-  { 2092, 0x0000 }, { 2092, 0xa210 }, { 2096, 0xb180 }, { 2101, 0x880b },
-  { 2106, 0x1430 }, { 2110, 0x09a4 }, { 2115, 0xc800 }, { 2118, 0x1e27 },
-  { 2126, 0x0154 }, { 2130, 0x1540 }, { 2134, 0x462a }, { 2140, 0x0804 },
-  { 2142, 0x9120 }, { 2146, 0x324b }, { 2153, 0x3d20 }, { 2159, 0x3863 },
-  /* 0x6900 */
-  { 2166, 0x0640 }, { 2169, 0x00cb }, { 2174, 0x0000 }, { 2174, 0x092a },
-  { 2179, 0x4224 }, { 2183, 0x0880 }, { 2185, 0x1378 }, { 2192, 0x8c07 },
-  { 2198, 0x2001 }, { 2200, 0x0144 }, { 2203, 0xa962 }, { 2210, 0x1580 },
-  { 2214, 0x0120 }, { 2216, 0x00c2 }, { 2219, 0xc024 }, { 2223, 0x402a },
-  /* 0x6a00 */
-  { 2227, 0x800b }, { 2231, 0x2422 }, { 2235, 0x0111 }, { 2238, 0xc895 },
-  { 2245, 0x4660 }, { 2250, 0x0867 }, { 2256, 0x0490 }, { 2259, 0x400a },
-  { 2262, 0x0aca }, { 2268, 0xe802 }, { 2273, 0x8820 }, { 2276, 0xe013 },
-  { 2282, 0x1340 }, { 2286, 0x3071 }, { 2292, 0x1090 }, { 2295, 0x3007 },
-  /* 0x6b00 */
-  { 2300, 0x82cc }, { 2306, 0x4883 }, { 2311, 0x9910 }, { 2316, 0x8860 },
-  { 2320, 0x2440 }, { 2323, 0x2144 }, { 2327, 0x4881 }, { 2331, 0x6021 },
-  { 2335, 0x0024 }, { 2337, 0x8880 }, { 2340, 0x730d }, { 2348, 0x6301 },
-  { 2353, 0x1218 }, { 2357, 0x0440 }, { 2359, 0x40ca }, { 2364, 0x8282 },
-  /* 0x6c00 */
-  { 2368, 0x6234 }, { 2374, 0x8205 }, { 2378, 0x51c0 }, { 2383, 0x8c68 },
-  { 2389, 0xac00 }, { 2393, 0x1a14 }, { 2398, 0xa880 }, { 2402, 0x0b50 },
-  { 2407, 0x02e0 }, { 2411, 0x91b0 }, { 2417, 0x0000 }, { 2417, 0x0015 },
-  { 2420, 0xa044 }, { 2424, 0x1457 }, { 2431, 0x5a81 }, { 2437, 0x0014 },
-  /* 0x6d00 */
-  { 2439, 0xc490 }, { 2444, 0x040a }, { 2447, 0xc1c0 }, { 2452, 0x9202 },
-  { 2456, 0x0000 }, { 2456, 0xc080 }, { 2459, 0x80a2 }, { 2463, 0x1001 },
-  { 2465, 0x0084 }, { 2467, 0x01d6 }, { 2473, 0x1400 }, { 2475, 0xa290 },
-  { 2480, 0xc510 }, { 2485, 0xa840 }, { 2489, 0x8225 }, { 2494, 0x1051 },
-  /* 0x6e00 */
-  { 2498, 0x0011 }, { 2500, 0x4000 }, { 2501, 0x0084 }, { 2503, 0x1a44 },
-  { 2508, 0x8b30 }, { 2514, 0x709e }, { 2522, 0x010c }, { 2525, 0x2808 },
-  { 2528, 0x2000 }, { 2529, 0x0208 }, { 2531, 0x6081 }, { 2535, 0x880a },
-  { 2539, 0xe58b }, { 2548, 0x0000 }, { 2548, 0x6800 }, { 2551, 0x2a00 },
-  /* 0x6f00 */
-  { 2554, 0x3510 }, { 2559, 0x0d40 }, { 2563, 0xa640 }, { 2568, 0x1849 },
-  { 2573, 0x8000 }, { 2574, 0x668e }, { 2582, 0x1106 }, { 2586, 0x6000 },
-  { 2588, 0x3988 }, { 2594, 0x845d }, { 2601, 0xc1e1 }, { 2608, 0x1061 },
-  { 2612, 0x05a0 }, { 2616, 0x4400 }, { 2618, 0x0300 }, { 2620, 0x3221 },
-  /* 0x7000 */
-  { 2625, 0x20e1 }, { 2630, 0x0080 }, { 2631, 0x8009 }, { 2634, 0x1290 },
-  { 2638, 0x4f18 }, { 2645, 0x6030 }, { 2649, 0x5030 }, { 2653, 0x4060 },
-  { 2656, 0x0062 }, { 2659, 0x09f0 }, { 2665, 0x0810 }, { 2667, 0x0093 },
-  { 2671, 0x0400 }, { 2672, 0x117a }, { 2679, 0x0010 }, { 2680, 0x0400 },
-  /* 0x7100 */
-  { 2681, 0x98f8 }, { 2689, 0x4000 }, { 2690, 0xa801 }, { 2694, 0x0103 },
-  { 2697, 0x0ce2 }, { 2703, 0x5485 }, { 2709, 0x0101 }, { 2711, 0x0200 },
-  { 2712, 0x10a1 }, { 2716, 0x0c04 }, { 2719, 0x8005 }, { 2722, 0x840d },
-  { 2727, 0x1813 }, { 2732, 0x1648 }, { 2737, 0x0000 }, { 2737, 0x4100 },
-  /* 0x7200 */
-  { 2739, 0x0381 }, { 2743, 0xa488 }, { 2748, 0x8810 }, { 2751, 0x0310 },
-  { 2754, 0xc02e }, { 2760, 0x5469 }, { 2767, 0xc909 }, { 2773, 0x9982 },
-  { 2779, 0x6210 }, { 2783, 0x0808 }, { 2785, 0x6100 }, { 2788, 0x4012 },
-  { 2791, 0x1282 }, { 2795, 0x8160 }, { 2799, 0x0020 }, { 2800, 0x4c18 },
-  /* 0x7300 */
-  { 2805, 0x28b4 }, { 2811, 0x430c }, { 2816, 0x1194 }, { 2821, 0x2c26 },
-  { 2827, 0x2008 }, { 2829, 0xe145 }, { 2836, 0xdac1 }, { 2844, 0x1282 },
-  { 2848, 0x406b }, { 2854, 0xd1a9 }, { 2862, 0x2c65 }, { 2869, 0xb2a0 },
-  { 2875, 0x9a60 }, { 2881, 0x224c }, { 2886, 0x02ca }, { 2891, 0xaeb0 },
-  /* 0x7400 */
-  { 2899, 0x0493 }, { 2904, 0x0c02 }, { 2907, 0xff50 }, { 2917, 0x0203 },
-  { 2920, 0x28d9 }, { 2927, 0x2086 }, { 2931, 0x69c4 }, { 2938, 0x0006 },
-  { 2940, 0x82e3 }, { 2947, 0x9707 }, { 2955, 0xcf4b }, { 2965, 0x8a26 },
-  { 2971, 0x1300 }, { 2974, 0xcd09 }, { 2981, 0x8d10 }, { 2986, 0x9c10 },
-  /* 0x7500 */
-  { 2991, 0x0040 }, { 2992, 0x00c4 }, { 2995, 0x8693 }, { 3002, 0xe240 },
-  { 3007, 0x4189 }, { 3012, 0xc085 }, { 3017, 0x8002 }, { 3019, 0x7e02 },
-  { 3026, 0x0022 }, { 3028, 0x122d }, { 3034, 0x0014 }, { 3036, 0x8410 },
-  { 3039, 0xd053 }, { 3046, 0x9080 }, { 3049, 0xd093 }, { 3056, 0x0202 },
-  /* 0x7600 */
-  { 3058, 0x959d }, { 3067, 0x7a6c }, { 3076, 0x2268 }, { 3081, 0x172c },
-  { 3088, 0x0e3b }, { 3096, 0x8220 }, { 3099, 0xe030 }, { 3104, 0x0012 },
-  { 3106, 0x3022 }, { 3110, 0xb820 }, { 3115, 0x25fd }, { 3125, 0x2000 },
-  { 3126, 0x5a22 }, { 3132, 0x0210 }, { 3134, 0x1141 }, { 3138, 0x1243 },
-  /* 0x7700 */
-  { 3143, 0x4441 }, { 3147, 0x16b4 }, { 3154, 0xe104 }, { 3159, 0x6270 },
-  { 3165, 0xe464 }, { 3172, 0xd0c4 }, { 3178, 0x1495 }, { 3184, 0x241d },
-  { 3190, 0x3011 }, { 3194, 0x8470 }, { 3199, 0xc484 }, { 3204, 0x4022 },
-  { 3207, 0x0208 }, { 3209, 0xc226 }, { 3215, 0x1451 }, { 3220, 0x0913 },
-  /* 0x7800 */
-  { 3225, 0x6260 }, { 3230, 0x2002 }, { 3232, 0x600e }, { 3237, 0x00a1 },
-  { 3240, 0x5198 }, { 3246, 0x5004 }, { 3249, 0x451b }, { 3256, 0x4400 },
-  { 3258, 0x8400 }, { 3260, 0xe110 }, { 3265, 0x3112 }, { 3270, 0xa80f },
-  { 3277, 0x5380 }, { 3282, 0x886c }, { 3288, 0x0453 }, { 3293, 0x8ccc },
-  /* 0x7900 */
-  { 3300, 0x1041 }, { 3303, 0xd401 }, { 3308, 0x22a1 }, { 3313, 0xa832 },
-  { 3319, 0x8c70 }, { 3325, 0x1912 }, { 3330, 0x0a80 }, { 3333, 0x5a04 },
-  { 3338, 0x1800 }, { 3340, 0x197a }, { 3348, 0x8b02 }, { 3353, 0x0912 },
-  { 3357, 0x8594 }, { 3363, 0x6450 }, { 3368, 0x2c25 }, { 3374, 0x1102 },
-  /* 0x7a00 */
-  { 3377, 0x168c }, { 3383, 0x4822 }, { 3387, 0xa882 }, { 3392, 0x0731 },
-  { 3398, 0x11b0 }, { 3403, 0xb260 }, { 3409, 0x24a1 }, { 3414, 0x4120 },
-  { 3417, 0x0c65 }, { 3423, 0x4013 }, { 3427, 0x1009 }, { 3430, 0x1a28 },
-  { 3435, 0x5240 }, { 3439, 0x0802 }, { 3441, 0x1b00 }, { 3445, 0x6812 },
-  /* 0x7b00 */
-  { 3450, 0x0080 }, { 3451, 0x8010 }, { 3453, 0xee88 }, { 3461, 0xa013 },
-  { 3466, 0x4083 }, { 3470, 0x0020 }, { 3471, 0xa651 }, { 3478, 0x008c },
-  { 3481, 0x4210 }, { 3484, 0x4843 }, { 3489, 0x9021 }, { 3493, 0x3c65 },
-  { 3501, 0x0524 }, { 3505, 0x0ed0 }, { 3511, 0x0500 }, { 3513, 0x5734 },
-  /* 0x7c00 */
-  { 3521, 0xda5e }, { 3531, 0x0a00 }, { 3533, 0x1161 }, { 3538, 0x065a },
-  { 3544, 0x0440 }, { 3546, 0x7e2e }, { 3556, 0x628a }, { 3562, 0x3205 },
-  { 3567, 0x80c0 }, { 3570, 0x4010 }, { 3572, 0x0041 }, { 3574, 0x9cc1 },
-  { 3581, 0xa390 }, { 3587, 0x26b8 }, { 3594, 0x0a40 }, { 3597, 0x0020 },
-  /* 0x7d00 */
-  { 3598, 0x8388 }, { 3603, 0x604e }, { 3609, 0x2448 }, { 3613, 0x7002 },
-  { 3617, 0x2183 }, { 3622, 0x368a }, { 3629, 0x04a0 }, { 3632, 0x8d01 },
-  { 3637, 0x396e }, { 3646, 0x60c2 }, { 3651, 0x04c0 }, { 3654, 0x02c8 },
-  { 3658, 0x707c }, { 3666, 0x0280 }, { 3668, 0x2c64 }, { 3674, 0x0662 },
-  /* 0x7e00 */
-  { 3679, 0x0101 }, { 3681, 0x30a3 }, { 3687, 0xb181 }, { 3693, 0x8048 },
-  { 3696, 0x40b0 }, { 3700, 0x8105 }, { 3704, 0xc826 }, { 3710, 0x4108 },
-  { 3713, 0x24c2 }, { 3718, 0x6522 }, { 3724, 0x0000 }, { 3724, 0x0000 },
-  { 3724, 0x0000 }, { 3724, 0x0000 }, { 3724, 0x0000 }, { 3724, 0x0000 },
-  /* 0x7f00 */
-  { 3724, 0x0000 }, { 3724, 0x0000 }, { 3724, 0x0000 }, { 3724, 0xf800 },
-  { 3729, 0x8098 }, { 3733, 0x380c }, { 3738, 0x207a }, { 3744, 0xe002 },
-  { 3748, 0xa801 }, { 3752, 0x10c3 }, { 3757, 0x2446 }, { 3762, 0x9010 },
-  { 3765, 0xc109 }, { 3770, 0x8800 }, { 3772, 0xd128 }, { 3778, 0xe404 },
-  /* 0x8000 */
-  { 3783, 0xe580 }, { 3789, 0xe05a }, { 3796, 0x5051 }, { 3801, 0x56b1 },
-  { 3809, 0x0011 }, { 3811, 0x0000 }, { 3811, 0x2051 }, { 3815, 0x0022 },
-  { 3817, 0x4102 }, { 3820, 0x5000 }, { 3822, 0x08c0 }, { 3825, 0x0300 },
-  { 3827, 0xa100 }, { 3830, 0x01b4 }, { 3835, 0x6001 }, { 3838, 0x464d },
-  /* 0x8100 */
-  { 3845, 0x0808 }, { 3847, 0x51c0 }, { 3852, 0x1091 }, { 3856, 0x1421 },
-  { 3860, 0x14a0 }, { 3864, 0x0084 }, { 3866, 0xa383 }, { 3873, 0x0080 },
-  { 3874, 0x4872 }, { 3880, 0x4941 }, { 3885, 0x4004 }, { 3887, 0x0814 },
-  { 3890, 0xcc28 }, { 3896, 0x68a0 }, { 3901, 0x1812 }, { 3905, 0xa367 },
-  /* 0x8200 */
-  { 3914, 0x8009 }, { 3917, 0x2618 }, { 3922, 0x0106 }, { 3925, 0x0414 },
-  { 3928, 0xc878 }, { 3935, 0x1042 }, { 3938, 0x2089 }, { 3942, 0xa810 },
-  { 3946, 0x469b }, { 3954, 0x0d52 }, { 3960, 0x479b }, { 3969, 0xd495 },
-  { 3977, 0x0040 }, { 3978, 0x0421 }, { 3981, 0xa515 }, { 3988, 0x60c0 },
-  /* 0x8300 */
-  { 3992, 0x0d83 }, { 3998, 0xe800 }, { 4002, 0x7006 }, { 4007, 0x3489 },
-  { 4013, 0x609c }, { 4019, 0x00fa }, { 4025, 0x0000 }, { 4025, 0xa101 },
-  { 4029, 0x2055 }, { 4034, 0x3b34 }, { 4042, 0x32c0 }, { 4047, 0xc000 },
-  { 4049, 0x8281 }, { 4053, 0x2013 }, { 4057, 0x0500 }, { 4059, 0x1340 },
-  /* 0x8400 */
-  { 4063, 0x8442 }, { 4067, 0x0222 }, { 4070, 0x8000 }, { 4071, 0x0200 },
-  { 4072, 0xa5a0 }, { 4078, 0x1746 }, { 4085, 0x04b1 }, { 4090, 0x3159 },
-  { 4097, 0x0022 }, { 4099, 0x402c }, { 4103, 0x8740 }, { 4108, 0x6412 },
-  { 4113, 0x9185 }, { 4119, 0x1008 }, { 4121, 0x8480 }, { 4124, 0x2c87 },
-  /* 0x8500 */
-  { 4131, 0x508c }, { 4136, 0x5001 }, { 4139, 0x8cbc }, { 4147, 0x805c },
-  { 4152, 0x8040 }, { 4154, 0xf24f }, { 4164, 0x8817 }, { 4170, 0xae00 },
-  { 4175, 0x9a62 }, { 4182, 0xa108 }, { 4186, 0x20a5 }, { 4191, 0xf1d0 },
-  { 4199, 0x4c84 }, { 4204, 0x8500 }, { 4207, 0x2141 }, { 4211, 0x9048 },
-  /* 0x8600 */
-  { 4215, 0x6031 }, { 4220, 0x4b07 }, { 4227, 0x0282 }, { 4230, 0x3540 },
-  { 4235, 0x0047 }, { 4239, 0x23cc }, { 4246, 0x921f }, { 4254, 0x04e0 },
-  { 4258, 0x2100 }, { 4260, 0x1542 }, { 4265, 0x21c2 }, { 4270, 0x83ba },
-  { 4278, 0x002b }, { 4282, 0x14a6 }, { 4288, 0x00a9 }, { 4292, 0x3400 },
-  /* 0x8700 */
-  { 4295, 0xc8b0 }, { 4301, 0xc219 }, { 4307, 0xc10a }, { 4312, 0x7606 },
-  { 4319, 0x2029 }, { 4323, 0x2100 }, { 4325, 0x8032 }, { 4329, 0x0806 },
-  { 4332, 0x1bf8 }, { 4341, 0x43a9 }, { 4348, 0x7089 }, { 4354, 0xc022 },
-  { 4358, 0x4702 }, { 4363, 0x9660 }, { 4369, 0x2c1c }, { 4375, 0x850a },
-  /* 0x8800 */
-  { 4380, 0x0e4a }, { 4386, 0xdf1d }, { 4397, 0x6100 }, { 4400, 0x1425 },
-  { 4405, 0x4f2a }, { 4413, 0x9562 }, { 4420, 0x0211 }, { 4423, 0x0a02 },
-  { 4426, 0x0001 }, { 4427, 0x9d00 }, { 4432, 0x0501 }, { 4435, 0x6400 },
-  { 4438, 0x7c01 }, { 4444, 0x480e }, { 4449, 0x8080 }, { 4451, 0x00a3 },
-  /* 0x8900 */
-  { 4455, 0xe042 }, { 4460, 0x1760 }, { 4466, 0x01c1 }, { 4470, 0x4627 },
-  { 4477, 0x8265 }, { 4483, 0x1c84 }, { 4488, 0x480e }, { 4493, 0x3c29 },
-  { 4500, 0x2200 }, { 4502, 0x9831 }, { 4508, 0x0021 }, { 4510, 0x10f1 },
-  { 4516, 0x0000 }, { 4516, 0x01f0 }, { 4521, 0x2a20 }, { 4525, 0xa24a },
-  /* 0x8a00 */
-  { 4531, 0x80b0 }, { 4535, 0x4036 }, { 4540, 0x9855 }, { 4547, 0x60a0 },
-  { 4551, 0x62a9 }, { 4558, 0x31c8 }, { 4564, 0x00a2 }, { 4567, 0xcee0 },
-  { 4575, 0x8849 }, { 4580, 0x82c5 }, { 4586, 0xc280 }, { 4590, 0x48c8 },
-  { 4595, 0x0748 }, { 4600, 0xa0ba }, { 4607, 0x1000 }, { 4608, 0x9071 },
-  /* 0x8b00 */
-  { 4614, 0x0c60 }, { 4618, 0xd002 }, { 4622, 0x2000 }, { 4623, 0x1081 },
-  { 4626, 0x217c }, { 4633, 0x421c }, { 4638, 0x2008 }, { 4640, 0x5340 },
-  { 4645, 0xa832 }, { 4651, 0xd030 }, { 4656, 0x0000 }, { 4656, 0x0000 },
-  { 4656, 0x0000 }, { 4656, 0x0000 }, { 4656, 0x0000 }, { 4656, 0x0000 },
-  /* 0x8c00 */
-  { 4656, 0x0000 }, { 4656, 0x0000 }, { 4656, 0x0000 }, { 4656, 0x6300 },
-  { 4660, 0x8aa0 }, { 4665, 0x2b9a }, { 4673, 0x2358 }, { 4679, 0x4868 },
-  { 4684, 0x08c0 }, { 4687, 0x1a0d }, { 4693, 0x0010 }, { 4694, 0x0600 },
-  { 4696, 0x8a60 }, { 4701, 0x2260 }, { 4705, 0x9102 }, { 4709, 0xc1a5 },
-  /* 0x8d00 */
-  { 4716, 0x020a }, { 4719, 0x0884 }, { 4722, 0x0000 }, { 4722, 0x0000 },
-  { 4722, 0x0000 }, { 4722, 0x0000 }, { 4722, 0x5220 }, { 4726, 0x8000 },
-  { 4727, 0x2114 }, { 4731, 0xc023 }, { 4736, 0x9841 }, { 4741, 0x1aa4 },
-  { 4747, 0x45e1 }, { 4754, 0x02b2 }, { 4759, 0x10b0 }, { 4763, 0x2017 },
-  /* 0x8e00 */
-  { 4768, 0x0872 }, { 4773, 0x0052 }, { 4776, 0x00cf }, { 4782, 0x23ca },
-  { 4789, 0xe803 }, { 4795, 0x7810 }, { 4800, 0xb206 }, { 4806, 0x0e03 },
-  { 4811, 0x020c }, { 4814, 0x6c25 }, { 4821, 0x6284 }, { 4826, 0x0c28 },
-  { 4830, 0x809b }, { 4836, 0x1012 }, { 4839, 0x6100 }, { 4842, 0x0683 },
-  /* 0x8f00 */
-  { 4847, 0x8185 }, { 4852, 0x41c1 }, { 4857, 0x71ab }, { 4866, 0x04f0 },
-  { 4871, 0x808b }, { 4876, 0x613e }, { 4884, 0x0020 }, { 4885, 0x0000 },
-  { 4885, 0x0000 }, { 4885, 0x2000 }, { 4886, 0x0073 }, { 4891, 0x4160 },
-  { 4895, 0x2c43 }, { 4901, 0x002d }, { 4905, 0x4119 }, { 4910, 0x4862 },
-  /* 0x9000 */
-  { 4915, 0x1114 }, { 4919, 0x0900 }, { 4921, 0xb700 }, { 4927, 0x8098 },
-  { 4931, 0x1018 }, { 4934, 0x2800 }, { 4936, 0x10c4 }, { 4940, 0x0211 },
-  { 4943, 0x5920 }, { 4948, 0x0ba1 }, { 4954, 0x0027 }, { 4958, 0x605d },
-  { 4965, 0x11b8 }, { 4971, 0xb3a4 }, { 4979, 0x8820 }, { 4982, 0xc051 },
-  /* 0x9100 */
-  { 4987, 0x2171 }, { 4993, 0x55d1 }, { 5001, 0xc2ad }, { 5009, 0x36d2 },
-  { 5017, 0x8188 }, { 5021, 0x0e88 }, { 5026, 0x2092 }, { 5030, 0x0e10 },
-  { 5034, 0x446a }, { 5040, 0x413a }, { 5046, 0x7142 }, { 5052, 0xb84f },
-  { 5061, 0x002c }, { 5064, 0x4698 }, { 5070, 0xf630 }, { 5078, 0x2a83 },
-  /* 0x9200 */
-  { 5084, 0x16f3 }, { 5093, 0x314d }, { 5100, 0xc178 }, { 5107, 0x5769 },
-  { 5116, 0xe4cd }, { 5125, 0x3302 }, { 5130, 0xc3a3 }, { 5138, 0xbbe1 },
-  { 5148, 0x6700 }, { 5153, 0x8284 }, { 5157, 0x89b1 }, { 5164, 0xbd44 },
-  { 5172, 0x79ef }, { 5184, 0xb3a9 }, { 5193, 0x51ab }, { 5201, 0x8a01 },
-  /* 0x9300 */
-  { 5205, 0x2105 }, { 5209, 0xf032 }, { 5216, 0x06b2 }, { 5222, 0x00d8 },
-  { 5226, 0x0380 }, { 5229, 0x45a7 }, { 5237, 0xa6b0 }, { 5244, 0xa45b },
-  { 5252, 0xad07 }, { 5260, 0x4924 }, { 5265, 0x0b5a }, { 5272, 0x0470 },
-  { 5276, 0x3ef2 }, { 5286, 0xd208 }, { 5291, 0x00c4 }, { 5294, 0x2f80 },
-  /* 0x9400 */
-  { 5300, 0xe316 }, { 5308, 0x80e0 }, { 5312, 0xc000 }, { 5314, 0xa81e },
-  { 5321, 0x1528 }, { 5326, 0x9220 }, { 5330, 0xe90a }, { 5337, 0x0006 },
-  { 5339, 0x0018 }, { 5341, 0x0000 }, { 5341, 0x0000 }, { 5341, 0x0000 },
-  { 5341, 0x0000 }, { 5341, 0x0000 }, { 5341, 0x0000 }, { 5341, 0x0000 },
-  /* 0x9500 */
-  { 5341, 0x0000 }, { 5341, 0x0000 }, { 5341, 0x0000 }, { 5341, 0x0000 },
-  { 5341, 0x0000 }, { 5341, 0x0000 }, { 5341, 0x0000 }, { 5341, 0x4300 },
-  { 5344, 0x7110 }, { 5349, 0xe000 }, { 5352, 0x1a42 }, { 5357, 0xa450 },
-  { 5362, 0x0b40 }, { 5366, 0xe60f }, { 5375, 0x0051 }, { 5378, 0x0000 },
-  /* 0x9600 */
-  { 5378, 0x0000 }, { 5378, 0x6000 }, { 5380, 0x1074 }, { 5385, 0x378a },
-  { 5393, 0x0002 }, { 5394, 0x01d4 }, { 5399, 0x4002 }, { 5401, 0xd810 },
-  { 5406, 0x021e }, { 5411, 0xa442 }, { 5416, 0xc270 }, { 5422, 0x0408 },
-  { 5424, 0x0400 }, { 5425, 0xe504 }, { 5431, 0x8200 }, { 5433, 0x0402 },
-  /* 0x9700 */
-  { 5435, 0x022c }, { 5439, 0x2c00 }, { 5442, 0x010e }, { 5446, 0x000a },
-  { 5448, 0xc40a }, { 5453, 0x0da0 }, { 5458, 0x4488 }, { 5462, 0xa9c8 },
-  { 5469, 0x0201 }, { 5471, 0xc6e0 }, { 5478, 0x5004 }, { 5481, 0xd766 },
-  { 5491, 0x76b2 }, { 5500, 0x6b93 }, { 5509, 0x8013 }, { 5513, 0x0592 },
-  /* 0x9800 */
-  { 5518, 0x6480 }, { 5522, 0x5250 }, { 5527, 0xc869 }, { 5534, 0x402d },
-  { 5539, 0x0490 }, { 5542, 0x06ce }, { 5549, 0x146c }, { 5555, 0x0000 },
-  { 5555, 0x0000 }, { 5555, 0x0000 }, { 5555, 0x6800 }, { 5558, 0x8d91 },
-  { 5565, 0x1124 }, { 5569, 0x0000 }, { 5569, 0x04ea }, { 5575, 0x0048 },
-  /* 0x9900 */
-  { 5577, 0x0184 }, { 5580, 0x9ce2 }, { 5588, 0x08c4 }, { 5592, 0x1e3e },
-  { 5601, 0x61c3 }, { 5608, 0xdb10 }, { 5615, 0x0001 }, { 5616, 0x0000 },
-  { 5616, 0x0000 }, { 5616, 0xa800 }, { 5619, 0x0040 }, { 5620, 0xa627 },
-  { 5628, 0x0208 }, { 5630, 0x5618 }, { 5636, 0x1c80 }, { 5640, 0x6231 },
-  /* 0x9a00 */
-  { 5646, 0x181c }, { 5651, 0x4043 }, { 5655, 0x609d }, { 5662, 0x0168 },
-  { 5666, 0x5c92 }, { 5673, 0x2052 }, { 5677, 0x0000 }, { 5677, 0x0000 },
-  { 5677, 0x0000 }, { 5677, 0x0000 }, { 5677, 0xd400 }, { 5681, 0xca74 },
-  { 5689, 0x414a }, { 5694, 0x18e5 }, { 5701, 0x12b1 }, { 5707, 0xa62c },
-  /* 0x9b00 */
-  { 5714, 0x7b3f }, { 5726, 0x1a45 }, { 5732, 0x2841 }, { 5736, 0x26b8 },
-  { 5743, 0x1900 }, { 5746, 0x48e0 }, { 5751, 0x7d6a }, { 5761, 0x83a8 },
-  { 5767, 0xaef1 }, { 5777, 0x6411 }, { 5782, 0x12c0 }, { 5786, 0xd987 },
-  { 5795, 0x4182 }, { 5799, 0xa181 }, { 5804, 0x8ca0 }, { 5809, 0xa788 },
-  /* 0x9c00 */
-  { 5816, 0x8805 }, { 5820, 0x5742 }, { 5827, 0x07cc }, { 5834, 0x20e2 },
-  { 5839, 0xc63a }, { 5847, 0xf959 }, { 5857, 0x4f08 }, { 5863, 0x08a5 },
-  { 5868, 0x0000 }, { 5868, 0x0000 }, { 5868, 0x0000 }, { 5868, 0x0000 },
-  { 5868, 0x0000 }, { 5868, 0x0000 }, { 5868, 0x0040 }, { 5869, 0x0284 },
-  /* 0x9d00 */
-  { 5872, 0x0804 }, { 5874, 0x7182 }, { 5880, 0x8000 }, { 5881, 0x341d },
-  { 5888, 0x04ac }, { 5893, 0x8018 }, { 5896, 0x0e2c }, { 5902, 0x58c1 },
-  { 5908, 0x6458 }, { 5914, 0x01ec }, { 5920, 0x5402 }, { 5924, 0x9222 },
-  { 5929, 0x0688 }, { 5933, 0xc4f0 }, { 5940, 0x4aa1 }, { 5946, 0x4019 },
-  /* 0x9e00 */
-  { 5950, 0x4484 }, { 5954, 0x3267 }, { 5962, 0x0000 }, { 5962, 0x0000 },
-  { 5962, 0x0000 }, { 5962, 0x0000 }, { 5962, 0x0000 }, { 5962, 0x1c00 },
-  { 5965, 0xc0bd }, { 5973, 0x4940 }, { 5977, 0xd110 }, { 5982, 0x0039 },
-  { 5986, 0x0940 }, { 5989, 0x8020 }, { 5991, 0x7090 }, { 5996, 0x8127 },
-  /* 0x9f00 */
-  { 6002, 0x820c }, { 6006, 0x8ed7 }, { 6016, 0x8c44 }, { 6021, 0xb696 },
-  { 6030, 0x00fa }, { 6036, 0x65e8 }, { 6044, 0xe300 }, { 6049, 0x242b },
-  { 6055, 0x8000 }, { 6056, 0x40d7 }, { 6063, 0x002e },
-};
-
-static int
-jisx0212_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  if (n >= 2) {
-    const Summary16 *summary = NULL;
-    if (wc >= 0x0000 && wc < 0x0460)
-      summary = &jisx0212_uni2indx_page00[(wc>>4)];
-    else if (wc >= 0x2100 && wc < 0x2130)
-      summary = &jisx0212_uni2indx_page21[(wc>>4)-0x210];
-    else if (wc >= 0x4e00 && wc < 0x9fb0)
-      summary = &jisx0212_uni2indx_page4e[(wc>>4)-0x4e0];
-    if (summary) {
-      unsigned short used = summary->used;
-      unsigned int i = wc & 0x0f;
-      if (used & ((unsigned short) 1 << i)) {
-        unsigned short c;
-        /* Keep in `used' only the bits 0..i-1. */
-        used &= ((unsigned short) 1 << i) - 1;
-        /* Add `summary->indx' and the number of bits set in `used'. */
-        used = (used & 0x5555) + ((used & 0xaaaa) >> 1);
-        used = (used & 0x3333) + ((used & 0xcccc) >> 2);
-        used = (used & 0x0f0f) + ((used & 0xf0f0) >> 4);
-        used = (used & 0x00ff) + (used >> 8);
-        c = jisx0212_2charset[summary->indx + used];
-        r[0] = (c >> 8); r[1] = (c & 0xff);
-        return 2;
-      }
-    }
-    return RET_ILSEQ;
-  }
-  return RET_TOOSMALL;
-}
diff --git a/xc/lib/X11/lcUniConv/koi8_c.h b/xc/lib/X11/lcUniConv/koi8_c.h
deleted file mode 100644
index e31c36840..000000000
--- a/xc/lib/X11/lcUniConv/koi8_c.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* $XFree86: xc/lib/X11/lcUniConv/koi8_c.h,v 1.2 2000/11/28 16:10:29 dawes Exp $ */
-
-/*
- * KOI8-C
- */
-
-static const unsigned short koi8_c_2uni[128] = {
-  /* 0x80 */
-  0x0493, 0x0497, 0x049b, 0x049d, 0x04a3, 0x04af, 0x04b1, 0x04b3,
-  0x04b7, 0x04b9, 0x04bb, 0x2580, 0x04d9, 0x04e3, 0x04e9, 0x04ef,
-  /* 0x90 */
-  0x0492, 0x0496, 0x049a, 0x049c, 0x04a2, 0x04ae, 0x04b0, 0x04b2,
-  0x04b6, 0x04b8, 0x04ba, 0x2321, 0x04d8, 0x04e2, 0x04e8, 0x04ee,
-  /* 0xa0 */
-  0x00a0, 0x0452, 0x0453, 0x0451, 0x0454, 0x0455, 0x0456, 0x0457,
-  0x0458, 0x0459, 0x045a, 0x045b, 0x045c, 0x0491, 0x045e, 0x045f,
-  /* 0xb0 */
-  0x2116, 0x0402, 0x0403, 0x0401, 0x0404, 0x0405, 0x0406, 0x0407,
-  0x0486, 0x0409, 0x040a, 0x040b, 0x040c, 0x0490, 0x040e, 0x040f,
-  /* 0xc0 */
-  0x044e, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433,
-  0x0445, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e,
-  /* 0xd0 */
-  0x043f, 0x044f, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432,
-  0x044c, 0x044b, 0x0437, 0x0448, 0x044d, 0x0449, 0x0447, 0x044a,
-  /* 0xe0 */
-  0x042e, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413,
-  0x0425, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e,
-  /* 0xf0 */
-  0x041f, 0x042f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412,
-  0x042c, 0x042b, 0x0417, 0x0428, 0x042d, 0x0429, 0x0427, 0x042a,
-};
-
-static int
-koi8_c_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c < 0x80)
-    *pwc = (ucs4_t) c;
-  else
-    *pwc = (ucs4_t) koi8_c_2uni[c-0x80];
-  return 1;
-}
-
-static const unsigned char koi8_c_page00[1] = {
-  0xa0,                                           /* 0xa0-0xa7 */
-};
-static const unsigned char koi8_c_page04[240] = {
-  0x00, 0xb3, 0xb1, 0xb2, 0xb4, 0xb5, 0xb6, 0xb7, /* 0x00-0x07 */
-  0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0x00, 0xbe, 0xbf, /* 0x08-0x0f */
-  0xe1, 0xe2, 0xf7, 0xe7, 0xe4, 0xe5, 0xf6, 0xfa, /* 0x10-0x17 */
-  0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, /* 0x18-0x1f */
-  0xf2, 0xf3, 0xf4, 0xf5, 0xe6, 0xe8, 0xe3, 0xfe, /* 0x20-0x27 */
-  0xfb, 0xfd, 0xff, 0xf9, 0xf8, 0xfc, 0xe0, 0xf1, /* 0x28-0x2f */
-  0xc1, 0xc2, 0xd7, 0xc7, 0xc4, 0xc5, 0xd6, 0xda, /* 0x30-0x37 */
-  0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, /* 0x38-0x3f */
-  0xd2, 0xd3, 0xd4, 0xd5, 0xc6, 0xc8, 0xc3, 0xde, /* 0x40-0x47 */
-  0xdb, 0xdd, 0xdf, 0xd9, 0xd8, 0xdc, 0xc0, 0xd1, /* 0x48-0x4f */
-  0x00, 0xa3, 0xa1, 0xa2, 0xa4, 0xa5, 0xa6, 0xa7, /* 0x50-0x57 */
-  0xa8, 0xa9, 0xaa, 0xab, 0xac, 0x00, 0xae, 0xaf, /* 0x58-0x5f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x67 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x77 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x87 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8f */
-  0xbd, 0xad, 0x90, 0x80, 0x00, 0x00, 0x91, 0x81, /* 0x90-0x97 */
-  0x00, 0x00, 0x92, 0x82, 0x93, 0x83, 0x00, 0x00, /* 0x98-0x9f */
-  0x00, 0x00, 0x94, 0x84, 0x00, 0x00, 0x00, 0x00, /* 0xa0-0xa7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x95, 0x85, /* 0xa8-0xaf */
-  0x96, 0x86, 0x97, 0x87, 0x00, 0x00, 0x98, 0x88, /* 0xb0-0xb7 */
-  0x99, 0x89, 0x9a, 0x8a, 0x00, 0x00, 0x00, 0x00, /* 0xb8-0xbf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc0-0xc7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc8-0xcf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd0-0xd7 */
-  0x9c, 0x8c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd8-0xdf */
-  0x00, 0x00, 0x9d, 0x8d, 0x00, 0x00, 0x00, 0x00, /* 0xe0-0xe7 */
-  0x9e, 0x8e, 0x00, 0x00, 0x00, 0x00, 0x9f, 0x8f, /* 0xe8-0xef */
-};
-static const unsigned char koi8_c_page22[1] = {
-                                      0xb0,       /* 0x16-0x16 */
-};
-
-static int
-koi8_c_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x0080) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc >= 0x00a0 && wc < 0x00a1)
-    c = koi8_c_page00[wc-0x00a0];
-  else if (wc >= 0x0400 && wc < 0x04ef)
-    c = koi8_c_page04[wc-0x0400];
-  else if (wc >= 0x2216 && wc < 0x2217)
-    c = koi8_c_page22[wc-0x2216];
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/koi8_r.h b/xc/lib/X11/lcUniConv/koi8_r.h
deleted file mode 100644
index b0c802ee5..000000000
--- a/xc/lib/X11/lcUniConv/koi8_r.h
+++ /dev/null
@@ -1,134 +0,0 @@
-
-/*
- * KOI8-R
- */
-
-/* Specification: RFC 1489 */
-
-static const unsigned short koi8_r_2uni[128] = {
-  /* 0x80 */
-  0x2500, 0x2502, 0x250c, 0x2510, 0x2514, 0x2518, 0x251c, 0x2524,
-  0x252c, 0x2534, 0x253c, 0x2580, 0x2584, 0x2588, 0x258c, 0x2590,
-  /* 0x90 */
-  0x2591, 0x2592, 0x2593, 0x2320, 0x25a0, 0x2219, 0x221a, 0x2248,
-  0x2264, 0x2265, 0x00a0, 0x2321, 0x00b0, 0x00b2, 0x00b7, 0x00f7,
-  /* 0xa0 */
-  0x2550, 0x2551, 0x2552, 0x0451, 0x2553, 0x2554, 0x2555, 0x2556,
-  0x2557, 0x2558, 0x2559, 0x255a, 0x255b, 0x255c, 0x255d, 0x255e,
-  /* 0xb0 */
-  0x255f, 0x2560, 0x2561, 0x0401, 0x2562, 0x2563, 0x2564, 0x2565,
-  0x2566, 0x2567, 0x2568, 0x2569, 0x256a, 0x256b, 0x256c, 0x00a9,
-  /* 0xc0 */
-  0x044e, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433,
-  0x0445, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e,
-  /* 0xd0 */
-  0x043f, 0x044f, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432,
-  0x044c, 0x044b, 0x0437, 0x0448, 0x044d, 0x0449, 0x0447, 0x044a,
-  /* 0xe0 */
-  0x042e, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413,
-  0x0425, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e,
-  /* 0xf0 */
-  0x041f, 0x042f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412,
-  0x042c, 0x042b, 0x0417, 0x0428, 0x042d, 0x0429, 0x0427, 0x042a,
-};
-
-static int
-koi8_r_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c < 0x80)
-    *pwc = (wchar_t) c;
-  else
-    *pwc = (wchar_t) koi8_r_2uni[c-0x80];
-  return 1;
-}
-
-static const unsigned char koi8_r_page00[88] = {
-  0x9a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa0-0xa7 */
-  0x00, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa8-0xaf */
-  0x9c, 0x00, 0x9d, 0x00, 0x00, 0x00, 0x00, 0x9e, /* 0xb0-0xb7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xb8-0xbf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc0-0xc7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc8-0xcf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd0-0xd7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd8-0xdf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xe0-0xe7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xe8-0xef */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9f, /* 0xf0-0xf7 */
-};
-static const unsigned char koi8_r_page04[88] = {
-  0x00, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x07 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0f */
-  0xe1, 0xe2, 0xf7, 0xe7, 0xe4, 0xe5, 0xf6, 0xfa, /* 0x10-0x17 */
-  0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, /* 0x18-0x1f */
-  0xf2, 0xf3, 0xf4, 0xf5, 0xe6, 0xe8, 0xe3, 0xfe, /* 0x20-0x27 */
-  0xfb, 0xfd, 0xff, 0xf9, 0xf8, 0xfc, 0xe0, 0xf1, /* 0x28-0x2f */
-  0xc1, 0xc2, 0xd7, 0xc7, 0xc4, 0xc5, 0xd6, 0xda, /* 0x30-0x37 */
-  0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, /* 0x38-0x3f */
-  0xd2, 0xd3, 0xd4, 0xd5, 0xc6, 0xc8, 0xc3, 0xde, /* 0x40-0x47 */
-  0xdb, 0xdd, 0xdf, 0xd9, 0xd8, 0xdc, 0xc0, 0xd1, /* 0x48-0x4f */
-  0x00, 0xa3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x57 */
-};
-static const unsigned char koi8_r_page22[80] = {
-  0x00, 0x95, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x27 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x37 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x47 */
-  0x97, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x57 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5f */
-  0x00, 0x00, 0x00, 0x00, 0x98, 0x99, 0x00, 0x00, /* 0x60-0x67 */
-};
-static const unsigned char koi8_r_page23[8] = {
-  0x93, 0x9b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x27 */
-};
-static const unsigned char koi8_r_page25[168] = {
-  0x80, 0x00, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x07 */
-  0x00, 0x00, 0x00, 0x00, 0x82, 0x00, 0x00, 0x00, /* 0x08-0x0f */
-  0x83, 0x00, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00, /* 0x10-0x17 */
-  0x85, 0x00, 0x00, 0x00, 0x86, 0x00, 0x00, 0x00, /* 0x18-0x1f */
-  0x00, 0x00, 0x00, 0x00, 0x87, 0x00, 0x00, 0x00, /* 0x20-0x27 */
-  0x00, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, /* 0x28-0x2f */
-  0x00, 0x00, 0x00, 0x00, 0x89, 0x00, 0x00, 0x00, /* 0x30-0x37 */
-  0x00, 0x00, 0x00, 0x00, 0x8a, 0x00, 0x00, 0x00, /* 0x38-0x3f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x47 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4f */
-  0xa0, 0xa1, 0xa2, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, /* 0x50-0x57 */
-  0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, /* 0x58-0x5f */
-  0xb1, 0xb2, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, /* 0x60-0x67 */
-  0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0x00, 0x00, 0x00, /* 0x68-0x6f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x77 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7f */
-  0x8b, 0x00, 0x00, 0x00, 0x8c, 0x00, 0x00, 0x00, /* 0x80-0x87 */
-  0x8d, 0x00, 0x00, 0x00, 0x8e, 0x00, 0x00, 0x00, /* 0x88-0x8f */
-  0x8f, 0x90, 0x91, 0x92, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x97 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9f */
-  0x94, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa0-0xa7 */
-};
-
-static int
-koi8_r_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x0080) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc >= 0x00a0 && wc < 0x00f8)
-    c = koi8_r_page00[wc-0x00a0];
-  else if (wc >= 0x0400 && wc < 0x0458)
-    c = koi8_r_page04[wc-0x0400];
-  else if (wc >= 0x2218 && wc < 0x2268)
-    c = koi8_r_page22[wc-0x2218];
-  else if (wc >= 0x2320 && wc < 0x2328)
-    c = koi8_r_page23[wc-0x2320];
-  else if (wc >= 0x2500 && wc < 0x25a8)
-    c = koi8_r_page25[wc-0x2500];
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/koi8_u.h b/xc/lib/X11/lcUniConv/koi8_u.h
deleted file mode 100644
index bc0bfd044..000000000
--- a/xc/lib/X11/lcUniConv/koi8_u.h
+++ /dev/null
@@ -1,142 +0,0 @@
-
-/*
- * KOI8-U
- */
-
-/* Specification: RFC 2319 */
-
-static const unsigned short koi8_u_2uni[128] = {
-  /* 0x80 */
-  0x2500, 0x2502, 0x250c, 0x2510, 0x2514, 0x2518, 0x251c, 0x2524,
-  0x252c, 0x2534, 0x253c, 0x2580, 0x2584, 0x2588, 0x258c, 0x2590,
-  /* 0x90 */
-  0x2591, 0x2592, 0x2593, 0x2320, 0x25a0, 0x2219, 0x221a, 0x2248,
-  0x2264, 0x2265, 0x00a0, 0x2321, 0x00b0, 0x00b2, 0x00b7, 0x00f7,
-  /* 0xa0 */
-  0x2550, 0x2551, 0x2552, 0x0451, 0x0454, 0x2554, 0x0456, 0x0457,
-  0x2557, 0x2558, 0x2559, 0x255a, 0x255b, 0x0491, 0x255d, 0x255e,
-  /* 0xb0 */
-  0x255f, 0x2560, 0x2561, 0x0401, 0x0404, 0x2563, 0x0406, 0x0407,
-  0x2566, 0x2567, 0x2568, 0x2569, 0x256a, 0x0490, 0x256c, 0x00a9,
-  /* 0xc0 */
-  0x044e, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433,
-  0x0445, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e,
-  /* 0xd0 */
-  0x043f, 0x044f, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432,
-  0x044c, 0x044b, 0x0437, 0x0448, 0x044d, 0x0449, 0x0447, 0x044a,
-  /* 0xe0 */
-  0x042e, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413,
-  0x0425, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e,
-  /* 0xf0 */
-  0x041f, 0x042f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412,
-  0x042c, 0x042b, 0x0417, 0x0428, 0x042d, 0x0429, 0x0427, 0x042a,
-};
-
-static int
-koi8_u_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c < 0x80)
-    *pwc = (wchar_t) c;
-  else
-    *pwc = (wchar_t) koi8_u_2uni[c-0x80];
-  return 1;
-}
-
-static const unsigned char koi8_u_page00[88] = {
-  0x9a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa0-0xa7 */
-  0x00, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa8-0xaf */
-  0x9c, 0x00, 0x9d, 0x00, 0x00, 0x00, 0x00, 0x9e, /* 0xb0-0xb7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xb8-0xbf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc0-0xc7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc8-0xcf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd0-0xd7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd8-0xdf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xe0-0xe7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xe8-0xef */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9f, /* 0xf0-0xf7 */
-};
-static const unsigned char koi8_u_page04[152] = {
-  0x00, 0xb3, 0x00, 0x00, 0xb4, 0x00, 0xb6, 0xb7, /* 0x00-0x07 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0f */
-  0xe1, 0xe2, 0xf7, 0xe7, 0xe4, 0xe5, 0xf6, 0xfa, /* 0x10-0x17 */
-  0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, /* 0x18-0x1f */
-  0xf2, 0xf3, 0xf4, 0xf5, 0xe6, 0xe8, 0xe3, 0xfe, /* 0x20-0x27 */
-  0xfb, 0xfd, 0xff, 0xf9, 0xf8, 0xfc, 0xe0, 0xf1, /* 0x28-0x2f */
-  0xc1, 0xc2, 0xd7, 0xc7, 0xc4, 0xc5, 0xd6, 0xda, /* 0x30-0x37 */
-  0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, /* 0x38-0x3f */
-  0xd2, 0xd3, 0xd4, 0xd5, 0xc6, 0xc8, 0xc3, 0xde, /* 0x40-0x47 */
-  0xdb, 0xdd, 0xdf, 0xd9, 0xd8, 0xdc, 0xc0, 0xd1, /* 0x48-0x4f */
-  0x00, 0xa3, 0x00, 0x00, 0xa4, 0x00, 0xa6, 0xa7, /* 0x50-0x57 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x67 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x77 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x87 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8f */
-  0xbd, 0xad, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x97 */
-};
-static const unsigned char koi8_u_page22[80] = {
-  0x00, 0x95, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x27 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x37 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x47 */
-  0x97, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x57 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5f */
-  0x00, 0x00, 0x00, 0x00, 0x98, 0x99, 0x00, 0x00, /* 0x60-0x67 */
-};
-static const unsigned char koi8_u_page23[8] = {
-  0x93, 0x9b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x27 */
-};
-static const unsigned char koi8_u_page25[168] = {
-  0x80, 0x00, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x07 */
-  0x00, 0x00, 0x00, 0x00, 0x82, 0x00, 0x00, 0x00, /* 0x08-0x0f */
-  0x83, 0x00, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00, /* 0x10-0x17 */
-  0x85, 0x00, 0x00, 0x00, 0x86, 0x00, 0x00, 0x00, /* 0x18-0x1f */
-  0x00, 0x00, 0x00, 0x00, 0x87, 0x00, 0x00, 0x00, /* 0x20-0x27 */
-  0x00, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, /* 0x28-0x2f */
-  0x00, 0x00, 0x00, 0x00, 0x89, 0x00, 0x00, 0x00, /* 0x30-0x37 */
-  0x00, 0x00, 0x00, 0x00, 0x8a, 0x00, 0x00, 0x00, /* 0x38-0x3f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x47 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4f */
-  0xa0, 0xa1, 0xa2, 0x00, 0xa5, 0x00, 0x00, 0xa8, /* 0x50-0x57 */
-  0xa9, 0xaa, 0xab, 0xac, 0x00, 0xae, 0xaf, 0xb0, /* 0x58-0x5f */
-  0xb1, 0xb2, 0x00, 0xb5, 0x00, 0x00, 0xb8, 0xb9, /* 0x60-0x67 */
-  0xba, 0xbb, 0xbc, 0x00, 0xbe, 0x00, 0x00, 0x00, /* 0x68-0x6f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x77 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7f */
-  0x8b, 0x00, 0x00, 0x00, 0x8c, 0x00, 0x00, 0x00, /* 0x80-0x87 */
-  0x8d, 0x00, 0x00, 0x00, 0x8e, 0x00, 0x00, 0x00, /* 0x88-0x8f */
-  0x8f, 0x90, 0x91, 0x92, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x97 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9f */
-  0x94, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa0-0xa7 */
-};
-
-static int
-koi8_u_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x0080) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc >= 0x00a0 && wc < 0x00f8)
-    c = koi8_u_page00[wc-0x00a0];
-  else if (wc >= 0x0400 && wc < 0x0498)
-    c = koi8_u_page04[wc-0x0400];
-  else if (wc >= 0x2218 && wc < 0x2268)
-    c = koi8_u_page22[wc-0x2218];
-  else if (wc >= 0x2320 && wc < 0x2328)
-    c = koi8_u_page23[wc-0x2320];
-  else if (wc >= 0x2500 && wc < 0x25a8)
-    c = koi8_u_page25[wc-0x2500];
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/ksc5601.h b/xc/lib/X11/lcUniConv/ksc5601.h
deleted file mode 100644
index 0e387feea..000000000
--- a/xc/lib/X11/lcUniConv/ksc5601.h
+++ /dev/null
@@ -1,3002 +0,0 @@
-
-/*
- * KSC5601.1987-0
- */
-
-static const unsigned short ksc5601_2uni_page21[1115] = {
-  /* 0x21 */
-  0x3000, 0x3001, 0x3002, 0x00b7, 0x2025, 0x2026, 0x00a8, 0x3003,
-  0x00ad, 0x2015, 0x2225, 0xff3c, 0x223c, 0x2018, 0x2019, 0x201c,
-  0x201d, 0x3014, 0x3015, 0x3008, 0x3009, 0x300a, 0x300b, 0x300c,
-  0x300d, 0x300e, 0x300f, 0x3010, 0x3011, 0x00b1, 0x00d7, 0x00f7,
-  0x2260, 0x2264, 0x2265, 0x221e, 0x2234, 0x00b0, 0x2032, 0x2033,
-  0x2103, 0x212b, 0xffe0, 0xffe1, 0xffe5, 0x2642, 0x2640, 0x2220,
-  0x22a5, 0x2312, 0x2202, 0x2207, 0x2261, 0x2252, 0x00a7, 0x203b,
-  0x2606, 0x2605, 0x25cb, 0x25cf, 0x25ce, 0x25c7, 0x25c6, 0x25a1,
-  0x25a0, 0x25b3, 0x25b2, 0x25bd, 0x25bc, 0x2192, 0x2190, 0x2191,
-  0x2193, 0x2194, 0x3013, 0x226a, 0x226b, 0x221a, 0x223d, 0x221d,
-  0x2235, 0x222b, 0x222c, 0x2208, 0x220b, 0x2286, 0x2287, 0x2282,
-  0x2283, 0x222a, 0x2229, 0x2227, 0x2228, 0xffe2,
-  /* 0x22 */
-  0x21d2, 0x21d4, 0x2200, 0x2203, 0x00b4, 0xff5e, 0x02c7, 0x02d8,
-  0x02dd, 0x02da, 0x02d9, 0x00b8, 0x02db, 0x00a1, 0x00bf, 0x02d0,
-  0x222e, 0x2211, 0x220f, 0x00a4, 0x2109, 0x2030, 0x25c1, 0x25c0,
-  0x25b7, 0x25b6, 0x2664, 0x2660, 0x2661, 0x2665, 0x2667, 0x2663,
-  0x2299, 0x25c8, 0x25a3, 0x25d0, 0x25d1, 0x2592, 0x25a4, 0x25a5,
-  0x25a8, 0x25a7, 0x25a6, 0x25a9, 0x2668, 0x260f, 0x260e, 0x261c,
-  0x261e, 0x00b6, 0x2020, 0x2021, 0x2195, 0x2197, 0x2199, 0x2196,
-  0x2198, 0x266d, 0x2669, 0x266a, 0x266c, 0x327f, 0x321c, 0x2116,
-  0x33c7, 0x2122, 0x33c2, 0x33d8, 0x2121, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  /* 0x23 */
-  0xff01, 0xff02, 0xff03, 0xff04, 0xff05, 0xff06, 0xff07, 0xff08,
-  0xff09, 0xff0a, 0xff0b, 0xff0c, 0xff0d, 0xff0e, 0xff0f, 0xff10,
-  0xff11, 0xff12, 0xff13, 0xff14, 0xff15, 0xff16, 0xff17, 0xff18,
-  0xff19, 0xff1a, 0xff1b, 0xff1c, 0xff1d, 0xff1e, 0xff1f, 0xff20,
-  0xff21, 0xff22, 0xff23, 0xff24, 0xff25, 0xff26, 0xff27, 0xff28,
-  0xff29, 0xff2a, 0xff2b, 0xff2c, 0xff2d, 0xff2e, 0xff2f, 0xff30,
-  0xff31, 0xff32, 0xff33, 0xff34, 0xff35, 0xff36, 0xff37, 0xff38,
-  0xff39, 0xff3a, 0xff3b, 0xffe6, 0xff3d, 0xff3e, 0xff3f, 0xff40,
-  0xff41, 0xff42, 0xff43, 0xff44, 0xff45, 0xff46, 0xff47, 0xff48,
-  0xff49, 0xff4a, 0xff4b, 0xff4c, 0xff4d, 0xff4e, 0xff4f, 0xff50,
-  0xff51, 0xff52, 0xff53, 0xff54, 0xff55, 0xff56, 0xff57, 0xff58,
-  0xff59, 0xff5a, 0xff5b, 0xff5c, 0xff5d, 0xffe3,
-  /* 0x24 */
-  0x3131, 0x3132, 0x3133, 0x3134, 0x3135, 0x3136, 0x3137, 0x3138,
-  0x3139, 0x313a, 0x313b, 0x313c, 0x313d, 0x313e, 0x313f, 0x3140,
-  0x3141, 0x3142, 0x3143, 0x3144, 0x3145, 0x3146, 0x3147, 0x3148,
-  0x3149, 0x314a, 0x314b, 0x314c, 0x314d, 0x314e, 0x314f, 0x3150,
-  0x3151, 0x3152, 0x3153, 0x3154, 0x3155, 0x3156, 0x3157, 0x3158,
-  0x3159, 0x315a, 0x315b, 0x315c, 0x315d, 0x315e, 0x315f, 0x3160,
-  0x3161, 0x3162, 0x3163, 0x3164, 0x3165, 0x3166, 0x3167, 0x3168,
-  0x3169, 0x316a, 0x316b, 0x316c, 0x316d, 0x316e, 0x316f, 0x3170,
-  0x3171, 0x3172, 0x3173, 0x3174, 0x3175, 0x3176, 0x3177, 0x3178,
-  0x3179, 0x317a, 0x317b, 0x317c, 0x317d, 0x317e, 0x317f, 0x3180,
-  0x3181, 0x3182, 0x3183, 0x3184, 0x3185, 0x3186, 0x3187, 0x3188,
-  0x3189, 0x318a, 0x318b, 0x318c, 0x318d, 0x318e,
-  /* 0x25 */
-  0x2170, 0x2171, 0x2172, 0x2173, 0x2174, 0x2175, 0x2176, 0x2177,
-  0x2178, 0x2179, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0x2160,
-  0x2161, 0x2162, 0x2163, 0x2164, 0x2165, 0x2166, 0x2167, 0x2168,
-  0x2169, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, 0x0398,
-  0x0399, 0x039a, 0x039b, 0x039c, 0x039d, 0x039e, 0x039f, 0x03a0,
-  0x03a1, 0x03a3, 0x03a4, 0x03a5, 0x03a6, 0x03a7, 0x03a8, 0x03a9,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0x03b1, 0x03b2, 0x03b3, 0x03b4, 0x03b5, 0x03b6, 0x03b7, 0x03b8,
-  0x03b9, 0x03ba, 0x03bb, 0x03bc, 0x03bd, 0x03be, 0x03bf, 0x03c0,
-  0x03c1, 0x03c3, 0x03c4, 0x03c5, 0x03c6, 0x03c7, 0x03c8, 0x03c9,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  /* 0x26 */
-  0x2500, 0x2502, 0x250c, 0x2510, 0x2518, 0x2514, 0x251c, 0x252c,
-  0x2524, 0x2534, 0x253c, 0x2501, 0x2503, 0x250f, 0x2513, 0x251b,
-  0x2517, 0x2523, 0x2533, 0x252b, 0x253b, 0x254b, 0x2520, 0x252f,
-  0x2528, 0x2537, 0x253f, 0x251d, 0x2530, 0x2525, 0x2538, 0x2542,
-  0x2512, 0x2511, 0x251a, 0x2519, 0x2516, 0x2515, 0x250e, 0x250d,
-  0x251e, 0x251f, 0x2521, 0x2522, 0x2526, 0x2527, 0x2529, 0x252a,
-  0x252d, 0x252e, 0x2531, 0x2532, 0x2535, 0x2536, 0x2539, 0x253a,
-  0x253d, 0x253e, 0x2540, 0x2541, 0x2543, 0x2544, 0x2545, 0x2546,
-  0x2547, 0x2548, 0x2549, 0x254a, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  /* 0x27 */
-  0x3395, 0x3396, 0x3397, 0x2113, 0x3398, 0x33c4, 0x33a3, 0x33a4,
-  0x33a5, 0x33a6, 0x3399, 0x339a, 0x339b, 0x339c, 0x339d, 0x339e,
-  0x339f, 0x33a0, 0x33a1, 0x33a2, 0x33ca, 0x338d, 0x338e, 0x338f,
-  0x33cf, 0x3388, 0x3389, 0x33c8, 0x33a7, 0x33a8, 0x33b0, 0x33b1,
-  0x33b2, 0x33b3, 0x33b4, 0x33b5, 0x33b6, 0x33b7, 0x33b8, 0x33b9,
-  0x3380, 0x3381, 0x3382, 0x3383, 0x3384, 0x33ba, 0x33bb, 0x33bc,
-  0x33bd, 0x33be, 0x33bf, 0x3390, 0x3391, 0x3392, 0x3393, 0x3394,
-  0x2126, 0x33c0, 0x33c1, 0x338a, 0x338b, 0x338c, 0x33d6, 0x33c5,
-  0x33ad, 0x33ae, 0x33af, 0x33db, 0x33a9, 0x33aa, 0x33ab, 0x33ac,
-  0x33dd, 0x33d0, 0x33d3, 0x33c3, 0x33c9, 0x33dc, 0x33c6, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  /* 0x28 */
-  0x00c6, 0x00d0, 0x00aa, 0x0126, 0xfffd, 0x0132, 0xfffd, 0x013f,
-  0x0141, 0x00d8, 0x0152, 0x00ba, 0x00de, 0x0166, 0x014a, 0xfffd,
-  0x3260, 0x3261, 0x3262, 0x3263, 0x3264, 0x3265, 0x3266, 0x3267,
-  0x3268, 0x3269, 0x326a, 0x326b, 0x326c, 0x326d, 0x326e, 0x326f,
-  0x3270, 0x3271, 0x3272, 0x3273, 0x3274, 0x3275, 0x3276, 0x3277,
-  0x3278, 0x3279, 0x327a, 0x327b, 0x24d0, 0x24d1, 0x24d2, 0x24d3,
-  0x24d4, 0x24d5, 0x24d6, 0x24d7, 0x24d8, 0x24d9, 0x24da, 0x24db,
-  0x24dc, 0x24dd, 0x24de, 0x24df, 0x24e0, 0x24e1, 0x24e2, 0x24e3,
-  0x24e4, 0x24e5, 0x24e6, 0x24e7, 0x24e8, 0x24e9, 0x2460, 0x2461,
-  0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467, 0x2468, 0x2469,
-  0x246a, 0x246b, 0x246c, 0x246d, 0x246e, 0x00bd, 0x2153, 0x2154,
-  0x00bc, 0x00be, 0x215b, 0x215c, 0x215d, 0x215e,
-  /* 0x29 */
-  0x00e6, 0x0111, 0x00f0, 0x0127, 0x0131, 0x0133, 0x0138, 0x0140,
-  0x0142, 0x00f8, 0x0153, 0x00df, 0x00fe, 0x0167, 0x014b, 0x0149,
-  0x3200, 0x3201, 0x3202, 0x3203, 0x3204, 0x3205, 0x3206, 0x3207,
-  0x3208, 0x3209, 0x320a, 0x320b, 0x320c, 0x320d, 0x320e, 0x320f,
-  0x3210, 0x3211, 0x3212, 0x3213, 0x3214, 0x3215, 0x3216, 0x3217,
-  0x3218, 0x3219, 0x321a, 0x321b, 0x249c, 0x249d, 0x249e, 0x249f,
-  0x24a0, 0x24a1, 0x24a2, 0x24a3, 0x24a4, 0x24a5, 0x24a6, 0x24a7,
-  0x24a8, 0x24a9, 0x24aa, 0x24ab, 0x24ac, 0x24ad, 0x24ae, 0x24af,
-  0x24b0, 0x24b1, 0x24b2, 0x24b3, 0x24b4, 0x24b5, 0x2474, 0x2475,
-  0x2476, 0x2477, 0x2478, 0x2479, 0x247a, 0x247b, 0x247c, 0x247d,
-  0x247e, 0x247f, 0x2480, 0x2481, 0x2482, 0x00b9, 0x00b2, 0x00b3,
-  0x2074, 0x207f, 0x2081, 0x2082, 0x2083, 0x2084,
-  /* 0x2a */
-  0x3041, 0x3042, 0x3043, 0x3044, 0x3045, 0x3046, 0x3047, 0x3048,
-  0x3049, 0x304a, 0x304b, 0x304c, 0x304d, 0x304e, 0x304f, 0x3050,
-  0x3051, 0x3052, 0x3053, 0x3054, 0x3055, 0x3056, 0x3057, 0x3058,
-  0x3059, 0x305a, 0x305b, 0x305c, 0x305d, 0x305e, 0x305f, 0x3060,
-  0x3061, 0x3062, 0x3063, 0x3064, 0x3065, 0x3066, 0x3067, 0x3068,
-  0x3069, 0x306a, 0x306b, 0x306c, 0x306d, 0x306e, 0x306f, 0x3070,
-  0x3071, 0x3072, 0x3073, 0x3074, 0x3075, 0x3076, 0x3077, 0x3078,
-  0x3079, 0x307a, 0x307b, 0x307c, 0x307d, 0x307e, 0x307f, 0x3080,
-  0x3081, 0x3082, 0x3083, 0x3084, 0x3085, 0x3086, 0x3087, 0x3088,
-  0x3089, 0x308a, 0x308b, 0x308c, 0x308d, 0x308e, 0x308f, 0x3090,
-  0x3091, 0x3092, 0x3093, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  /* 0x2b */
-  0x30a1, 0x30a2, 0x30a3, 0x30a4, 0x30a5, 0x30a6, 0x30a7, 0x30a8,
-  0x30a9, 0x30aa, 0x30ab, 0x30ac, 0x30ad, 0x30ae, 0x30af, 0x30b0,
-  0x30b1, 0x30b2, 0x30b3, 0x30b4, 0x30b5, 0x30b6, 0x30b7, 0x30b8,
-  0x30b9, 0x30ba, 0x30bb, 0x30bc, 0x30bd, 0x30be, 0x30bf, 0x30c0,
-  0x30c1, 0x30c2, 0x30c3, 0x30c4, 0x30c5, 0x30c6, 0x30c7, 0x30c8,
-  0x30c9, 0x30ca, 0x30cb, 0x30cc, 0x30cd, 0x30ce, 0x30cf, 0x30d0,
-  0x30d1, 0x30d2, 0x30d3, 0x30d4, 0x30d5, 0x30d6, 0x30d7, 0x30d8,
-  0x30d9, 0x30da, 0x30db, 0x30dc, 0x30dd, 0x30de, 0x30df, 0x30e0,
-  0x30e1, 0x30e2, 0x30e3, 0x30e4, 0x30e5, 0x30e6, 0x30e7, 0x30e8,
-  0x30e9, 0x30ea, 0x30eb, 0x30ec, 0x30ed, 0x30ee, 0x30ef, 0x30f0,
-  0x30f1, 0x30f2, 0x30f3, 0x30f4, 0x30f5, 0x30f6, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  /* 0x2c */
-  0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0401, 0x0416,
-  0x0417, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e,
-  0x041f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426,
-  0x0427, 0x0428, 0x0429, 0x042a, 0x042b, 0x042c, 0x042d, 0x042e,
-  0x042f, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0451, 0x0436,
-  0x0437, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e,
-  0x043f, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446,
-  0x0447, 0x0448, 0x0449, 0x044a, 0x044b, 0x044c, 0x044d, 0x044e,
-  0x044f,
-};
-static const unsigned short ksc5601_2uni_page30[2350] = {
-  /* 0x30 */
-  0xac00, 0xac01, 0xac04, 0xac07, 0xac08, 0xac09, 0xac0a, 0xac10,
-  0xac11, 0xac12, 0xac13, 0xac14, 0xac15, 0xac16, 0xac17, 0xac19,
-  0xac1a, 0xac1b, 0xac1c, 0xac1d, 0xac20, 0xac24, 0xac2c, 0xac2d,
-  0xac2f, 0xac30, 0xac31, 0xac38, 0xac39, 0xac3c, 0xac40, 0xac4b,
-  0xac4d, 0xac54, 0xac58, 0xac5c, 0xac70, 0xac71, 0xac74, 0xac77,
-  0xac78, 0xac7a, 0xac80, 0xac81, 0xac83, 0xac84, 0xac85, 0xac86,
-  0xac89, 0xac8a, 0xac8b, 0xac8c, 0xac90, 0xac94, 0xac9c, 0xac9d,
-  0xac9f, 0xaca0, 0xaca1, 0xaca8, 0xaca9, 0xacaa, 0xacac, 0xacaf,
-  0xacb0, 0xacb8, 0xacb9, 0xacbb, 0xacbc, 0xacbd, 0xacc1, 0xacc4,
-  0xacc8, 0xaccc, 0xacd5, 0xacd7, 0xace0, 0xace1, 0xace4, 0xace7,
-  0xace8, 0xacea, 0xacec, 0xacef, 0xacf0, 0xacf1, 0xacf3, 0xacf5,
-  0xacf6, 0xacfc, 0xacfd, 0xad00, 0xad04, 0xad06,
-  /* 0x31 */
-  0xad0c, 0xad0d, 0xad0f, 0xad11, 0xad18, 0xad1c, 0xad20, 0xad29,
-  0xad2c, 0xad2d, 0xad34, 0xad35, 0xad38, 0xad3c, 0xad44, 0xad45,
-  0xad47, 0xad49, 0xad50, 0xad54, 0xad58, 0xad61, 0xad63, 0xad6c,
-  0xad6d, 0xad70, 0xad73, 0xad74, 0xad75, 0xad76, 0xad7b, 0xad7c,
-  0xad7d, 0xad7f, 0xad81, 0xad82, 0xad88, 0xad89, 0xad8c, 0xad90,
-  0xad9c, 0xad9d, 0xada4, 0xadb7, 0xadc0, 0xadc1, 0xadc4, 0xadc8,
-  0xadd0, 0xadd1, 0xadd3, 0xaddc, 0xade0, 0xade4, 0xadf8, 0xadf9,
-  0xadfc, 0xadff, 0xae00, 0xae01, 0xae08, 0xae09, 0xae0b, 0xae0d,
-  0xae14, 0xae30, 0xae31, 0xae34, 0xae37, 0xae38, 0xae3a, 0xae40,
-  0xae41, 0xae43, 0xae45, 0xae46, 0xae4a, 0xae4c, 0xae4d, 0xae4e,
-  0xae50, 0xae54, 0xae56, 0xae5c, 0xae5d, 0xae5f, 0xae60, 0xae61,
-  0xae65, 0xae68, 0xae69, 0xae6c, 0xae70, 0xae78,
-  /* 0x32 */
-  0xae79, 0xae7b, 0xae7c, 0xae7d, 0xae84, 0xae85, 0xae8c, 0xaebc,
-  0xaebd, 0xaebe, 0xaec0, 0xaec4, 0xaecc, 0xaecd, 0xaecf, 0xaed0,
-  0xaed1, 0xaed8, 0xaed9, 0xaedc, 0xaee8, 0xaeeb, 0xaeed, 0xaef4,
-  0xaef8, 0xaefc, 0xaf07, 0xaf08, 0xaf0d, 0xaf10, 0xaf2c, 0xaf2d,
-  0xaf30, 0xaf32, 0xaf34, 0xaf3c, 0xaf3d, 0xaf3f, 0xaf41, 0xaf42,
-  0xaf43, 0xaf48, 0xaf49, 0xaf50, 0xaf5c, 0xaf5d, 0xaf64, 0xaf65,
-  0xaf79, 0xaf80, 0xaf84, 0xaf88, 0xaf90, 0xaf91, 0xaf95, 0xaf9c,
-  0xafb8, 0xafb9, 0xafbc, 0xafc0, 0xafc7, 0xafc8, 0xafc9, 0xafcb,
-  0xafcd, 0xafce, 0xafd4, 0xafdc, 0xafe8, 0xafe9, 0xaff0, 0xaff1,
-  0xaff4, 0xaff8, 0xb000, 0xb001, 0xb004, 0xb00c, 0xb010, 0xb014,
-  0xb01c, 0xb01d, 0xb028, 0xb044, 0xb045, 0xb048, 0xb04a, 0xb04c,
-  0xb04e, 0xb053, 0xb054, 0xb055, 0xb057, 0xb059,
-  /* 0x33 */
-  0xb05d, 0xb07c, 0xb07d, 0xb080, 0xb084, 0xb08c, 0xb08d, 0xb08f,
-  0xb091, 0xb098, 0xb099, 0xb09a, 0xb09c, 0xb09f, 0xb0a0, 0xb0a1,
-  0xb0a2, 0xb0a8, 0xb0a9, 0xb0ab, 0xb0ac, 0xb0ad, 0xb0ae, 0xb0af,
-  0xb0b1, 0xb0b3, 0xb0b4, 0xb0b5, 0xb0b8, 0xb0bc, 0xb0c4, 0xb0c5,
-  0xb0c7, 0xb0c8, 0xb0c9, 0xb0d0, 0xb0d1, 0xb0d4, 0xb0d8, 0xb0e0,
-  0xb0e5, 0xb108, 0xb109, 0xb10b, 0xb10c, 0xb110, 0xb112, 0xb113,
-  0xb118, 0xb119, 0xb11b, 0xb11c, 0xb11d, 0xb123, 0xb124, 0xb125,
-  0xb128, 0xb12c, 0xb134, 0xb135, 0xb137, 0xb138, 0xb139, 0xb140,
-  0xb141, 0xb144, 0xb148, 0xb150, 0xb151, 0xb154, 0xb155, 0xb158,
-  0xb15c, 0xb160, 0xb178, 0xb179, 0xb17c, 0xb180, 0xb182, 0xb188,
-  0xb189, 0xb18b, 0xb18d, 0xb192, 0xb193, 0xb194, 0xb198, 0xb19c,
-  0xb1a8, 0xb1cc, 0xb1d0, 0xb1d4, 0xb1dc, 0xb1dd,
-  /* 0x34 */
-  0xb1df, 0xb1e8, 0xb1e9, 0xb1ec, 0xb1f0, 0xb1f9, 0xb1fb, 0xb1fd,
-  0xb204, 0xb205, 0xb208, 0xb20b, 0xb20c, 0xb214, 0xb215, 0xb217,
-  0xb219, 0xb220, 0xb234, 0xb23c, 0xb258, 0xb25c, 0xb260, 0xb268,
-  0xb269, 0xb274, 0xb275, 0xb27c, 0xb284, 0xb285, 0xb289, 0xb290,
-  0xb291, 0xb294, 0xb298, 0xb299, 0xb29a, 0xb2a0, 0xb2a1, 0xb2a3,
-  0xb2a5, 0xb2a6, 0xb2aa, 0xb2ac, 0xb2b0, 0xb2b4, 0xb2c8, 0xb2c9,
-  0xb2cc, 0xb2d0, 0xb2d2, 0xb2d8, 0xb2d9, 0xb2db, 0xb2dd, 0xb2e2,
-  0xb2e4, 0xb2e5, 0xb2e6, 0xb2e8, 0xb2eb, 0xb2ec, 0xb2ed, 0xb2ee,
-  0xb2ef, 0xb2f3, 0xb2f4, 0xb2f5, 0xb2f7, 0xb2f8, 0xb2f9, 0xb2fa,
-  0xb2fb, 0xb2ff, 0xb300, 0xb301, 0xb304, 0xb308, 0xb310, 0xb311,
-  0xb313, 0xb314, 0xb315, 0xb31c, 0xb354, 0xb355, 0xb356, 0xb358,
-  0xb35b, 0xb35c, 0xb35e, 0xb35f, 0xb364, 0xb365,
-  /* 0x35 */
-  0xb367, 0xb369, 0xb36b, 0xb36e, 0xb370, 0xb371, 0xb374, 0xb378,
-  0xb380, 0xb381, 0xb383, 0xb384, 0xb385, 0xb38c, 0xb390, 0xb394,
-  0xb3a0, 0xb3a1, 0xb3a8, 0xb3ac, 0xb3c4, 0xb3c5, 0xb3c8, 0xb3cb,
-  0xb3cc, 0xb3ce, 0xb3d0, 0xb3d4, 0xb3d5, 0xb3d7, 0xb3d9, 0xb3db,
-  0xb3dd, 0xb3e0, 0xb3e4, 0xb3e8, 0xb3fc, 0xb410, 0xb418, 0xb41c,
-  0xb420, 0xb428, 0xb429, 0xb42b, 0xb434, 0xb450, 0xb451, 0xb454,
-  0xb458, 0xb460, 0xb461, 0xb463, 0xb465, 0xb46c, 0xb480, 0xb488,
-  0xb49d, 0xb4a4, 0xb4a8, 0xb4ac, 0xb4b5, 0xb4b7, 0xb4b9, 0xb4c0,
-  0xb4c4, 0xb4c8, 0xb4d0, 0xb4d5, 0xb4dc, 0xb4dd, 0xb4e0, 0xb4e3,
-  0xb4e4, 0xb4e6, 0xb4ec, 0xb4ed, 0xb4ef, 0xb4f1, 0xb4f8, 0xb514,
-  0xb515, 0xb518, 0xb51b, 0xb51c, 0xb524, 0xb525, 0xb527, 0xb528,
-  0xb529, 0xb52a, 0xb530, 0xb531, 0xb534, 0xb538,
-  /* 0x36 */
-  0xb540, 0xb541, 0xb543, 0xb544, 0xb545, 0xb54b, 0xb54c, 0xb54d,
-  0xb550, 0xb554, 0xb55c, 0xb55d, 0xb55f, 0xb560, 0xb561, 0xb5a0,
-  0xb5a1, 0xb5a4, 0xb5a8, 0xb5aa, 0xb5ab, 0xb5b0, 0xb5b1, 0xb5b3,
-  0xb5b4, 0xb5b5, 0xb5bb, 0xb5bc, 0xb5bd, 0xb5c0, 0xb5c4, 0xb5cc,
-  0xb5cd, 0xb5cf, 0xb5d0, 0xb5d1, 0xb5d8, 0xb5ec, 0xb610, 0xb611,
-  0xb614, 0xb618, 0xb625, 0xb62c, 0xb634, 0xb648, 0xb664, 0xb668,
-  0xb69c, 0xb69d, 0xb6a0, 0xb6a4, 0xb6ab, 0xb6ac, 0xb6b1, 0xb6d4,
-  0xb6f0, 0xb6f4, 0xb6f8, 0xb700, 0xb701, 0xb705, 0xb728, 0xb729,
-  0xb72c, 0xb72f, 0xb730, 0xb738, 0xb739, 0xb73b, 0xb744, 0xb748,
-  0xb74c, 0xb754, 0xb755, 0xb760, 0xb764, 0xb768, 0xb770, 0xb771,
-  0xb773, 0xb775, 0xb77c, 0xb77d, 0xb780, 0xb784, 0xb78c, 0xb78d,
-  0xb78f, 0xb790, 0xb791, 0xb792, 0xb796, 0xb797,
-  /* 0x37 */
-  0xb798, 0xb799, 0xb79c, 0xb7a0, 0xb7a8, 0xb7a9, 0xb7ab, 0xb7ac,
-  0xb7ad, 0xb7b4, 0xb7b5, 0xb7b8, 0xb7c7, 0xb7c9, 0xb7ec, 0xb7ed,
-  0xb7f0, 0xb7f4, 0xb7fc, 0xb7fd, 0xb7ff, 0xb800, 0xb801, 0xb807,
-  0xb808, 0xb809, 0xb80c, 0xb810, 0xb818, 0xb819, 0xb81b, 0xb81d,
-  0xb824, 0xb825, 0xb828, 0xb82c, 0xb834, 0xb835, 0xb837, 0xb838,
-  0xb839, 0xb840, 0xb844, 0xb851, 0xb853, 0xb85c, 0xb85d, 0xb860,
-  0xb864, 0xb86c, 0xb86d, 0xb86f, 0xb871, 0xb878, 0xb87c, 0xb88d,
-  0xb8a8, 0xb8b0, 0xb8b4, 0xb8b8, 0xb8c0, 0xb8c1, 0xb8c3, 0xb8c5,
-  0xb8cc, 0xb8d0, 0xb8d4, 0xb8dd, 0xb8df, 0xb8e1, 0xb8e8, 0xb8e9,
-  0xb8ec, 0xb8f0, 0xb8f8, 0xb8f9, 0xb8fb, 0xb8fd, 0xb904, 0xb918,
-  0xb920, 0xb93c, 0xb93d, 0xb940, 0xb944, 0xb94c, 0xb94f, 0xb951,
-  0xb958, 0xb959, 0xb95c, 0xb960, 0xb968, 0xb969,
-  /* 0x38 */
-  0xb96b, 0xb96d, 0xb974, 0xb975, 0xb978, 0xb97c, 0xb984, 0xb985,
-  0xb987, 0xb989, 0xb98a, 0xb98d, 0xb98e, 0xb9ac, 0xb9ad, 0xb9b0,
-  0xb9b4, 0xb9bc, 0xb9bd, 0xb9bf, 0xb9c1, 0xb9c8, 0xb9c9, 0xb9cc,
-  0xb9ce, 0xb9cf, 0xb9d0, 0xb9d1, 0xb9d2, 0xb9d8, 0xb9d9, 0xb9db,
-  0xb9dd, 0xb9de, 0xb9e1, 0xb9e3, 0xb9e4, 0xb9e5, 0xb9e8, 0xb9ec,
-  0xb9f4, 0xb9f5, 0xb9f7, 0xb9f8, 0xb9f9, 0xb9fa, 0xba00, 0xba01,
-  0xba08, 0xba15, 0xba38, 0xba39, 0xba3c, 0xba40, 0xba42, 0xba48,
-  0xba49, 0xba4b, 0xba4d, 0xba4e, 0xba53, 0xba54, 0xba55, 0xba58,
-  0xba5c, 0xba64, 0xba65, 0xba67, 0xba68, 0xba69, 0xba70, 0xba71,
-  0xba74, 0xba78, 0xba83, 0xba84, 0xba85, 0xba87, 0xba8c, 0xbaa8,
-  0xbaa9, 0xbaab, 0xbaac, 0xbab0, 0xbab2, 0xbab8, 0xbab9, 0xbabb,
-  0xbabd, 0xbac4, 0xbac8, 0xbad8, 0xbad9, 0xbafc,
-  /* 0x39 */
-  0xbb00, 0xbb04, 0xbb0d, 0xbb0f, 0xbb11, 0xbb18, 0xbb1c, 0xbb20,
-  0xbb29, 0xbb2b, 0xbb34, 0xbb35, 0xbb36, 0xbb38, 0xbb3b, 0xbb3c,
-  0xbb3d, 0xbb3e, 0xbb44, 0xbb45, 0xbb47, 0xbb49, 0xbb4d, 0xbb4f,
-  0xbb50, 0xbb54, 0xbb58, 0xbb61, 0xbb63, 0xbb6c, 0xbb88, 0xbb8c,
-  0xbb90, 0xbba4, 0xbba8, 0xbbac, 0xbbb4, 0xbbb7, 0xbbc0, 0xbbc4,
-  0xbbc8, 0xbbd0, 0xbbd3, 0xbbf8, 0xbbf9, 0xbbfc, 0xbbff, 0xbc00,
-  0xbc02, 0xbc08, 0xbc09, 0xbc0b, 0xbc0c, 0xbc0d, 0xbc0f, 0xbc11,
-  0xbc14, 0xbc15, 0xbc16, 0xbc17, 0xbc18, 0xbc1b, 0xbc1c, 0xbc1d,
-  0xbc1e, 0xbc1f, 0xbc24, 0xbc25, 0xbc27, 0xbc29, 0xbc2d, 0xbc30,
-  0xbc31, 0xbc34, 0xbc38, 0xbc40, 0xbc41, 0xbc43, 0xbc44, 0xbc45,
-  0xbc49, 0xbc4c, 0xbc4d, 0xbc50, 0xbc5d, 0xbc84, 0xbc85, 0xbc88,
-  0xbc8b, 0xbc8c, 0xbc8e, 0xbc94, 0xbc95, 0xbc97,
-  /* 0x3a */
-  0xbc99, 0xbc9a, 0xbca0, 0xbca1, 0xbca4, 0xbca7, 0xbca8, 0xbcb0,
-  0xbcb1, 0xbcb3, 0xbcb4, 0xbcb5, 0xbcbc, 0xbcbd, 0xbcc0, 0xbcc4,
-  0xbccd, 0xbccf, 0xbcd0, 0xbcd1, 0xbcd5, 0xbcd8, 0xbcdc, 0xbcf4,
-  0xbcf5, 0xbcf6, 0xbcf8, 0xbcfc, 0xbd04, 0xbd05, 0xbd07, 0xbd09,
-  0xbd10, 0xbd14, 0xbd24, 0xbd2c, 0xbd40, 0xbd48, 0xbd49, 0xbd4c,
-  0xbd50, 0xbd58, 0xbd59, 0xbd64, 0xbd68, 0xbd80, 0xbd81, 0xbd84,
-  0xbd87, 0xbd88, 0xbd89, 0xbd8a, 0xbd90, 0xbd91, 0xbd93, 0xbd95,
-  0xbd99, 0xbd9a, 0xbd9c, 0xbda4, 0xbdb0, 0xbdb8, 0xbdd4, 0xbdd5,
-  0xbdd8, 0xbddc, 0xbde9, 0xbdf0, 0xbdf4, 0xbdf8, 0xbe00, 0xbe03,
-  0xbe05, 0xbe0c, 0xbe0d, 0xbe10, 0xbe14, 0xbe1c, 0xbe1d, 0xbe1f,
-  0xbe44, 0xbe45, 0xbe48, 0xbe4c, 0xbe4e, 0xbe54, 0xbe55, 0xbe57,
-  0xbe59, 0xbe5a, 0xbe5b, 0xbe60, 0xbe61, 0xbe64,
-  /* 0x3b */
-  0xbe68, 0xbe6a, 0xbe70, 0xbe71, 0xbe73, 0xbe74, 0xbe75, 0xbe7b,
-  0xbe7c, 0xbe7d, 0xbe80, 0xbe84, 0xbe8c, 0xbe8d, 0xbe8f, 0xbe90,
-  0xbe91, 0xbe98, 0xbe99, 0xbea8, 0xbed0, 0xbed1, 0xbed4, 0xbed7,
-  0xbed8, 0xbee0, 0xbee3, 0xbee4, 0xbee5, 0xbeec, 0xbf01, 0xbf08,
-  0xbf09, 0xbf18, 0xbf19, 0xbf1b, 0xbf1c, 0xbf1d, 0xbf40, 0xbf41,
-  0xbf44, 0xbf48, 0xbf50, 0xbf51, 0xbf55, 0xbf94, 0xbfb0, 0xbfc5,
-  0xbfcc, 0xbfcd, 0xbfd0, 0xbfd4, 0xbfdc, 0xbfdf, 0xbfe1, 0xc03c,
-  0xc051, 0xc058, 0xc05c, 0xc060, 0xc068, 0xc069, 0xc090, 0xc091,
-  0xc094, 0xc098, 0xc0a0, 0xc0a1, 0xc0a3, 0xc0a5, 0xc0ac, 0xc0ad,
-  0xc0af, 0xc0b0, 0xc0b3, 0xc0b4, 0xc0b5, 0xc0b6, 0xc0bc, 0xc0bd,
-  0xc0bf, 0xc0c0, 0xc0c1, 0xc0c5, 0xc0c8, 0xc0c9, 0xc0cc, 0xc0d0,
-  0xc0d8, 0xc0d9, 0xc0db, 0xc0dc, 0xc0dd, 0xc0e4,
-  /* 0x3c */
-  0xc0e5, 0xc0e8, 0xc0ec, 0xc0f4, 0xc0f5, 0xc0f7, 0xc0f9, 0xc100,
-  0xc104, 0xc108, 0xc110, 0xc115, 0xc11c, 0xc11d, 0xc11e, 0xc11f,
-  0xc120, 0xc123, 0xc124, 0xc126, 0xc127, 0xc12c, 0xc12d, 0xc12f,
-  0xc130, 0xc131, 0xc136, 0xc138, 0xc139, 0xc13c, 0xc140, 0xc148,
-  0xc149, 0xc14b, 0xc14c, 0xc14d, 0xc154, 0xc155, 0xc158, 0xc15c,
-  0xc164, 0xc165, 0xc167, 0xc168, 0xc169, 0xc170, 0xc174, 0xc178,
-  0xc185, 0xc18c, 0xc18d, 0xc18e, 0xc190, 0xc194, 0xc196, 0xc19c,
-  0xc19d, 0xc19f, 0xc1a1, 0xc1a5, 0xc1a8, 0xc1a9, 0xc1ac, 0xc1b0,
-  0xc1bd, 0xc1c4, 0xc1c8, 0xc1cc, 0xc1d4, 0xc1d7, 0xc1d8, 0xc1e0,
-  0xc1e4, 0xc1e8, 0xc1f0, 0xc1f1, 0xc1f3, 0xc1fc, 0xc1fd, 0xc200,
-  0xc204, 0xc20c, 0xc20d, 0xc20f, 0xc211, 0xc218, 0xc219, 0xc21c,
-  0xc21f, 0xc220, 0xc228, 0xc229, 0xc22b, 0xc22d,
-  /* 0x3d */
-  0xc22f, 0xc231, 0xc232, 0xc234, 0xc248, 0xc250, 0xc251, 0xc254,
-  0xc258, 0xc260, 0xc265, 0xc26c, 0xc26d, 0xc270, 0xc274, 0xc27c,
-  0xc27d, 0xc27f, 0xc281, 0xc288, 0xc289, 0xc290, 0xc298, 0xc29b,
-  0xc29d, 0xc2a4, 0xc2a5, 0xc2a8, 0xc2ac, 0xc2ad, 0xc2b4, 0xc2b5,
-  0xc2b7, 0xc2b9, 0xc2dc, 0xc2dd, 0xc2e0, 0xc2e3, 0xc2e4, 0xc2eb,
-  0xc2ec, 0xc2ed, 0xc2ef, 0xc2f1, 0xc2f6, 0xc2f8, 0xc2f9, 0xc2fb,
-  0xc2fc, 0xc300, 0xc308, 0xc309, 0xc30c, 0xc30d, 0xc313, 0xc314,
-  0xc315, 0xc318, 0xc31c, 0xc324, 0xc325, 0xc328, 0xc329, 0xc345,
-  0xc368, 0xc369, 0xc36c, 0xc370, 0xc372, 0xc378, 0xc379, 0xc37c,
-  0xc37d, 0xc384, 0xc388, 0xc38c, 0xc3c0, 0xc3d8, 0xc3d9, 0xc3dc,
-  0xc3df, 0xc3e0, 0xc3e2, 0xc3e8, 0xc3e9, 0xc3ed, 0xc3f4, 0xc3f5,
-  0xc3f8, 0xc408, 0xc410, 0xc424, 0xc42c, 0xc430,
-  /* 0x3e */
-  0xc434, 0xc43c, 0xc43d, 0xc448, 0xc464, 0xc465, 0xc468, 0xc46c,
-  0xc474, 0xc475, 0xc479, 0xc480, 0xc494, 0xc49c, 0xc4b8, 0xc4bc,
-  0xc4e9, 0xc4f0, 0xc4f1, 0xc4f4, 0xc4f8, 0xc4fa, 0xc4ff, 0xc500,
-  0xc501, 0xc50c, 0xc510, 0xc514, 0xc51c, 0xc528, 0xc529, 0xc52c,
-  0xc530, 0xc538, 0xc539, 0xc53b, 0xc53d, 0xc544, 0xc545, 0xc548,
-  0xc549, 0xc54a, 0xc54c, 0xc54d, 0xc54e, 0xc553, 0xc554, 0xc555,
-  0xc557, 0xc558, 0xc559, 0xc55d, 0xc55e, 0xc560, 0xc561, 0xc564,
-  0xc568, 0xc570, 0xc571, 0xc573, 0xc574, 0xc575, 0xc57c, 0xc57d,
-  0xc580, 0xc584, 0xc587, 0xc58c, 0xc58d, 0xc58f, 0xc591, 0xc595,
-  0xc597, 0xc598, 0xc59c, 0xc5a0, 0xc5a9, 0xc5b4, 0xc5b5, 0xc5b8,
-  0xc5b9, 0xc5bb, 0xc5bc, 0xc5bd, 0xc5be, 0xc5c4, 0xc5c5, 0xc5c6,
-  0xc5c7, 0xc5c8, 0xc5c9, 0xc5ca, 0xc5cc, 0xc5ce,
-  /* 0x3f */
-  0xc5d0, 0xc5d1, 0xc5d4, 0xc5d8, 0xc5e0, 0xc5e1, 0xc5e3, 0xc5e5,
-  0xc5ec, 0xc5ed, 0xc5ee, 0xc5f0, 0xc5f4, 0xc5f6, 0xc5f7, 0xc5fc,
-  0xc5fd, 0xc5fe, 0xc5ff, 0xc600, 0xc601, 0xc605, 0xc606, 0xc607,
-  0xc608, 0xc60c, 0xc610, 0xc618, 0xc619, 0xc61b, 0xc61c, 0xc624,
-  0xc625, 0xc628, 0xc62c, 0xc62d, 0xc62e, 0xc630, 0xc633, 0xc634,
-  0xc635, 0xc637, 0xc639, 0xc63b, 0xc640, 0xc641, 0xc644, 0xc648,
-  0xc650, 0xc651, 0xc653, 0xc654, 0xc655, 0xc65c, 0xc65d, 0xc660,
-  0xc66c, 0xc66f, 0xc671, 0xc678, 0xc679, 0xc67c, 0xc680, 0xc688,
-  0xc689, 0xc68b, 0xc68d, 0xc694, 0xc695, 0xc698, 0xc69c, 0xc6a4,
-  0xc6a5, 0xc6a7, 0xc6a9, 0xc6b0, 0xc6b1, 0xc6b4, 0xc6b8, 0xc6b9,
-  0xc6ba, 0xc6c0, 0xc6c1, 0xc6c3, 0xc6c5, 0xc6cc, 0xc6cd, 0xc6d0,
-  0xc6d4, 0xc6dc, 0xc6dd, 0xc6e0, 0xc6e1, 0xc6e8,
-  /* 0x40 */
-  0xc6e9, 0xc6ec, 0xc6f0, 0xc6f8, 0xc6f9, 0xc6fd, 0xc704, 0xc705,
-  0xc708, 0xc70c, 0xc714, 0xc715, 0xc717, 0xc719, 0xc720, 0xc721,
-  0xc724, 0xc728, 0xc730, 0xc731, 0xc733, 0xc735, 0xc737, 0xc73c,
-  0xc73d, 0xc740, 0xc744, 0xc74a, 0xc74c, 0xc74d, 0xc74f, 0xc751,
-  0xc752, 0xc753, 0xc754, 0xc755, 0xc756, 0xc757, 0xc758, 0xc75c,
-  0xc760, 0xc768, 0xc76b, 0xc774, 0xc775, 0xc778, 0xc77c, 0xc77d,
-  0xc77e, 0xc783, 0xc784, 0xc785, 0xc787, 0xc788, 0xc789, 0xc78a,
-  0xc78e, 0xc790, 0xc791, 0xc794, 0xc796, 0xc797, 0xc798, 0xc79a,
-  0xc7a0, 0xc7a1, 0xc7a3, 0xc7a4, 0xc7a5, 0xc7a6, 0xc7ac, 0xc7ad,
-  0xc7b0, 0xc7b4, 0xc7bc, 0xc7bd, 0xc7bf, 0xc7c0, 0xc7c1, 0xc7c8,
-  0xc7c9, 0xc7cc, 0xc7ce, 0xc7d0, 0xc7d8, 0xc7dd, 0xc7e4, 0xc7e8,
-  0xc7ec, 0xc800, 0xc801, 0xc804, 0xc808, 0xc80a,
-  /* 0x41 */
-  0xc810, 0xc811, 0xc813, 0xc815, 0xc816, 0xc81c, 0xc81d, 0xc820,
-  0xc824, 0xc82c, 0xc82d, 0xc82f, 0xc831, 0xc838, 0xc83c, 0xc840,
-  0xc848, 0xc849, 0xc84c, 0xc84d, 0xc854, 0xc870, 0xc871, 0xc874,
-  0xc878, 0xc87a, 0xc880, 0xc881, 0xc883, 0xc885, 0xc886, 0xc887,
-  0xc88b, 0xc88c, 0xc88d, 0xc894, 0xc89d, 0xc89f, 0xc8a1, 0xc8a8,
-  0xc8bc, 0xc8bd, 0xc8c4, 0xc8c8, 0xc8cc, 0xc8d4, 0xc8d5, 0xc8d7,
-  0xc8d9, 0xc8e0, 0xc8e1, 0xc8e4, 0xc8f5, 0xc8fc, 0xc8fd, 0xc900,
-  0xc904, 0xc905, 0xc906, 0xc90c, 0xc90d, 0xc90f, 0xc911, 0xc918,
-  0xc92c, 0xc934, 0xc950, 0xc951, 0xc954, 0xc958, 0xc960, 0xc961,
-  0xc963, 0xc96c, 0xc970, 0xc974, 0xc97c, 0xc988, 0xc989, 0xc98c,
-  0xc990, 0xc998, 0xc999, 0xc99b, 0xc99d, 0xc9c0, 0xc9c1, 0xc9c4,
-  0xc9c7, 0xc9c8, 0xc9ca, 0xc9d0, 0xc9d1, 0xc9d3,
-  /* 0x42 */
-  0xc9d5, 0xc9d6, 0xc9d9, 0xc9da, 0xc9dc, 0xc9dd, 0xc9e0, 0xc9e2,
-  0xc9e4, 0xc9e7, 0xc9ec, 0xc9ed, 0xc9ef, 0xc9f0, 0xc9f1, 0xc9f8,
-  0xc9f9, 0xc9fc, 0xca00, 0xca08, 0xca09, 0xca0b, 0xca0c, 0xca0d,
-  0xca14, 0xca18, 0xca29, 0xca4c, 0xca4d, 0xca50, 0xca54, 0xca5c,
-  0xca5d, 0xca5f, 0xca60, 0xca61, 0xca68, 0xca7d, 0xca84, 0xca98,
-  0xcabc, 0xcabd, 0xcac0, 0xcac4, 0xcacc, 0xcacd, 0xcacf, 0xcad1,
-  0xcad3, 0xcad8, 0xcad9, 0xcae0, 0xcaec, 0xcaf4, 0xcb08, 0xcb10,
-  0xcb14, 0xcb18, 0xcb20, 0xcb21, 0xcb41, 0xcb48, 0xcb49, 0xcb4c,
-  0xcb50, 0xcb58, 0xcb59, 0xcb5d, 0xcb64, 0xcb78, 0xcb79, 0xcb9c,
-  0xcbb8, 0xcbd4, 0xcbe4, 0xcbe7, 0xcbe9, 0xcc0c, 0xcc0d, 0xcc10,
-  0xcc14, 0xcc1c, 0xcc1d, 0xcc21, 0xcc22, 0xcc27, 0xcc28, 0xcc29,
-  0xcc2c, 0xcc2e, 0xcc30, 0xcc38, 0xcc39, 0xcc3b,
-  /* 0x43 */
-  0xcc3c, 0xcc3d, 0xcc3e, 0xcc44, 0xcc45, 0xcc48, 0xcc4c, 0xcc54,
-  0xcc55, 0xcc57, 0xcc58, 0xcc59, 0xcc60, 0xcc64, 0xcc66, 0xcc68,
-  0xcc70, 0xcc75, 0xcc98, 0xcc99, 0xcc9c, 0xcca0, 0xcca8, 0xcca9,
-  0xccab, 0xccac, 0xccad, 0xccb4, 0xccb5, 0xccb8, 0xccbc, 0xccc4,
-  0xccc5, 0xccc7, 0xccc9, 0xccd0, 0xccd4, 0xcce4, 0xccec, 0xccf0,
-  0xcd01, 0xcd08, 0xcd09, 0xcd0c, 0xcd10, 0xcd18, 0xcd19, 0xcd1b,
-  0xcd1d, 0xcd24, 0xcd28, 0xcd2c, 0xcd39, 0xcd5c, 0xcd60, 0xcd64,
-  0xcd6c, 0xcd6d, 0xcd6f, 0xcd71, 0xcd78, 0xcd88, 0xcd94, 0xcd95,
-  0xcd98, 0xcd9c, 0xcda4, 0xcda5, 0xcda7, 0xcda9, 0xcdb0, 0xcdc4,
-  0xcdcc, 0xcdd0, 0xcde8, 0xcdec, 0xcdf0, 0xcdf8, 0xcdf9, 0xcdfb,
-  0xcdfd, 0xce04, 0xce08, 0xce0c, 0xce14, 0xce19, 0xce20, 0xce21,
-  0xce24, 0xce28, 0xce30, 0xce31, 0xce33, 0xce35,
-  /* 0x44 */
-  0xce58, 0xce59, 0xce5c, 0xce5f, 0xce60, 0xce61, 0xce68, 0xce69,
-  0xce6b, 0xce6d, 0xce74, 0xce75, 0xce78, 0xce7c, 0xce84, 0xce85,
-  0xce87, 0xce89, 0xce90, 0xce91, 0xce94, 0xce98, 0xcea0, 0xcea1,
-  0xcea3, 0xcea4, 0xcea5, 0xceac, 0xcead, 0xcec1, 0xcee4, 0xcee5,
-  0xcee8, 0xceeb, 0xceec, 0xcef4, 0xcef5, 0xcef7, 0xcef8, 0xcef9,
-  0xcf00, 0xcf01, 0xcf04, 0xcf08, 0xcf10, 0xcf11, 0xcf13, 0xcf15,
-  0xcf1c, 0xcf20, 0xcf24, 0xcf2c, 0xcf2d, 0xcf2f, 0xcf30, 0xcf31,
-  0xcf38, 0xcf54, 0xcf55, 0xcf58, 0xcf5c, 0xcf64, 0xcf65, 0xcf67,
-  0xcf69, 0xcf70, 0xcf71, 0xcf74, 0xcf78, 0xcf80, 0xcf85, 0xcf8c,
-  0xcfa1, 0xcfa8, 0xcfb0, 0xcfc4, 0xcfe0, 0xcfe1, 0xcfe4, 0xcfe8,
-  0xcff0, 0xcff1, 0xcff3, 0xcff5, 0xcffc, 0xd000, 0xd004, 0xd011,
-  0xd018, 0xd02d, 0xd034, 0xd035, 0xd038, 0xd03c,
-  /* 0x45 */
-  0xd044, 0xd045, 0xd047, 0xd049, 0xd050, 0xd054, 0xd058, 0xd060,
-  0xd06c, 0xd06d, 0xd070, 0xd074, 0xd07c, 0xd07d, 0xd081, 0xd0a4,
-  0xd0a5, 0xd0a8, 0xd0ac, 0xd0b4, 0xd0b5, 0xd0b7, 0xd0b9, 0xd0c0,
-  0xd0c1, 0xd0c4, 0xd0c8, 0xd0c9, 0xd0d0, 0xd0d1, 0xd0d3, 0xd0d4,
-  0xd0d5, 0xd0dc, 0xd0dd, 0xd0e0, 0xd0e4, 0xd0ec, 0xd0ed, 0xd0ef,
-  0xd0f0, 0xd0f1, 0xd0f8, 0xd10d, 0xd130, 0xd131, 0xd134, 0xd138,
-  0xd13a, 0xd140, 0xd141, 0xd143, 0xd144, 0xd145, 0xd14c, 0xd14d,
-  0xd150, 0xd154, 0xd15c, 0xd15d, 0xd15f, 0xd161, 0xd168, 0xd16c,
-  0xd17c, 0xd184, 0xd188, 0xd1a0, 0xd1a1, 0xd1a4, 0xd1a8, 0xd1b0,
-  0xd1b1, 0xd1b3, 0xd1b5, 0xd1ba, 0xd1bc, 0xd1c0, 0xd1d8, 0xd1f4,
-  0xd1f8, 0xd207, 0xd209, 0xd210, 0xd22c, 0xd22d, 0xd230, 0xd234,
-  0xd23c, 0xd23d, 0xd23f, 0xd241, 0xd248, 0xd25c,
-  /* 0x46 */
-  0xd264, 0xd280, 0xd281, 0xd284, 0xd288, 0xd290, 0xd291, 0xd295,
-  0xd29c, 0xd2a0, 0xd2a4, 0xd2ac, 0xd2b1, 0xd2b8, 0xd2b9, 0xd2bc,
-  0xd2bf, 0xd2c0, 0xd2c2, 0xd2c8, 0xd2c9, 0xd2cb, 0xd2d4, 0xd2d8,
-  0xd2dc, 0xd2e4, 0xd2e5, 0xd2f0, 0xd2f1, 0xd2f4, 0xd2f8, 0xd300,
-  0xd301, 0xd303, 0xd305, 0xd30c, 0xd30d, 0xd30e, 0xd310, 0xd314,
-  0xd316, 0xd31c, 0xd31d, 0xd31f, 0xd320, 0xd321, 0xd325, 0xd328,
-  0xd329, 0xd32c, 0xd330, 0xd338, 0xd339, 0xd33b, 0xd33c, 0xd33d,
-  0xd344, 0xd345, 0xd37c, 0xd37d, 0xd380, 0xd384, 0xd38c, 0xd38d,
-  0xd38f, 0xd390, 0xd391, 0xd398, 0xd399, 0xd39c, 0xd3a0, 0xd3a8,
-  0xd3a9, 0xd3ab, 0xd3ad, 0xd3b4, 0xd3b8, 0xd3bc, 0xd3c4, 0xd3c5,
-  0xd3c8, 0xd3c9, 0xd3d0, 0xd3d8, 0xd3e1, 0xd3e3, 0xd3ec, 0xd3ed,
-  0xd3f0, 0xd3f4, 0xd3fc, 0xd3fd, 0xd3ff, 0xd401,
-  /* 0x47 */
-  0xd408, 0xd41d, 0xd440, 0xd444, 0xd45c, 0xd460, 0xd464, 0xd46d,
-  0xd46f, 0xd478, 0xd479, 0xd47c, 0xd47f, 0xd480, 0xd482, 0xd488,
-  0xd489, 0xd48b, 0xd48d, 0xd494, 0xd4a9, 0xd4cc, 0xd4d0, 0xd4d4,
-  0xd4dc, 0xd4df, 0xd4e8, 0xd4ec, 0xd4f0, 0xd4f8, 0xd4fb, 0xd4fd,
-  0xd504, 0xd508, 0xd50c, 0xd514, 0xd515, 0xd517, 0xd53c, 0xd53d,
-  0xd540, 0xd544, 0xd54c, 0xd54d, 0xd54f, 0xd551, 0xd558, 0xd559,
-  0xd55c, 0xd560, 0xd565, 0xd568, 0xd569, 0xd56b, 0xd56d, 0xd574,
-  0xd575, 0xd578, 0xd57c, 0xd584, 0xd585, 0xd587, 0xd588, 0xd589,
-  0xd590, 0xd5a5, 0xd5c8, 0xd5c9, 0xd5cc, 0xd5d0, 0xd5d2, 0xd5d8,
-  0xd5d9, 0xd5db, 0xd5dd, 0xd5e4, 0xd5e5, 0xd5e8, 0xd5ec, 0xd5f4,
-  0xd5f5, 0xd5f7, 0xd5f9, 0xd600, 0xd601, 0xd604, 0xd608, 0xd610,
-  0xd611, 0xd613, 0xd614, 0xd615, 0xd61c, 0xd620,
-  /* 0x48 */
-  0xd624, 0xd62d, 0xd638, 0xd639, 0xd63c, 0xd640, 0xd645, 0xd648,
-  0xd649, 0xd64b, 0xd64d, 0xd651, 0xd654, 0xd655, 0xd658, 0xd65c,
-  0xd667, 0xd669, 0xd670, 0xd671, 0xd674, 0xd683, 0xd685, 0xd68c,
-  0xd68d, 0xd690, 0xd694, 0xd69d, 0xd69f, 0xd6a1, 0xd6a8, 0xd6ac,
-  0xd6b0, 0xd6b9, 0xd6bb, 0xd6c4, 0xd6c5, 0xd6c8, 0xd6cc, 0xd6d1,
-  0xd6d4, 0xd6d7, 0xd6d9, 0xd6e0, 0xd6e4, 0xd6e8, 0xd6f0, 0xd6f5,
-  0xd6fc, 0xd6fd, 0xd700, 0xd704, 0xd711, 0xd718, 0xd719, 0xd71c,
-  0xd720, 0xd728, 0xd729, 0xd72b, 0xd72d, 0xd734, 0xd735, 0xd738,
-  0xd73c, 0xd744, 0xd747, 0xd749, 0xd750, 0xd751, 0xd754, 0xd756,
-  0xd757, 0xd758, 0xd759, 0xd760, 0xd761, 0xd763, 0xd765, 0xd769,
-  0xd76c, 0xd770, 0xd774, 0xd77c, 0xd77d, 0xd781, 0xd788, 0xd789,
-  0xd78c, 0xd790, 0xd798, 0xd799, 0xd79b, 0xd79d,
-};
-static const unsigned short ksc5601_2uni_page4a[4888] = {
-  /* 0x4a */
-  0x4f3d, 0x4f73, 0x5047, 0x50f9, 0x52a0, 0x53ef, 0x5475, 0x54e5,
-  0x5609, 0x5ac1, 0x5bb6, 0x6687, 0x67b6, 0x67b7, 0x67ef, 0x6b4c,
-  0x73c2, 0x75c2, 0x7a3c, 0x82db, 0x8304, 0x8857, 0x8888, 0x8a36,
-  0x8cc8, 0x8dcf, 0x8efb, 0x8fe6, 0x99d5, 0x523b, 0x5374, 0x5404,
-  0x606a, 0x6164, 0x6bbc, 0x73cf, 0x811a, 0x89ba, 0x89d2, 0x95a3,
-  0x4f83, 0x520a, 0x58be, 0x5978, 0x59e6, 0x5e72, 0x5e79, 0x61c7,
-  0x63c0, 0x6746, 0x67ec, 0x687f, 0x6f97, 0x764e, 0x770b, 0x78f5,
-  0x7a08, 0x7aff, 0x7c21, 0x809d, 0x826e, 0x8271, 0x8aeb, 0x9593,
-  0x4e6b, 0x559d, 0x66f7, 0x6e34, 0x78a3, 0x7aed, 0x845b, 0x8910,
-  0x874e, 0x97a8, 0x52d8, 0x574e, 0x582a, 0x5d4c, 0x611f, 0x61be,
-  0x6221, 0x6562, 0x67d1, 0x6a44, 0x6e1b, 0x7518, 0x75b3, 0x76e3,
-  0x77b0, 0x7d3a, 0x90af, 0x9451, 0x9452, 0x9f95,
-  /* 0x4b */
-  0x5323, 0x5cac, 0x7532, 0x80db, 0x9240, 0x9598, 0x525b, 0x5808,
-  0x59dc, 0x5ca1, 0x5d17, 0x5eb7, 0x5f3a, 0x5f4a, 0x6177, 0x6c5f,
-  0x757a, 0x7586, 0x7ce0, 0x7d73, 0x7db1, 0x7f8c, 0x8154, 0x8221,
-  0x8591, 0x8941, 0x8b1b, 0x92fc, 0x964d, 0x9c47, 0x4ecb, 0x4ef7,
-  0x500b, 0x51f1, 0x584f, 0x6137, 0x613e, 0x6168, 0x6539, 0x69ea,
-  0x6f11, 0x75a5, 0x7686, 0x76d6, 0x7b87, 0x82a5, 0x84cb, 0xf900,
-  0x93a7, 0x958b, 0x5580, 0x5ba2, 0x5751, 0xf901, 0x7cb3, 0x7fb9,
-  0x91b5, 0x5028, 0x53bb, 0x5c45, 0x5de8, 0x62d2, 0x636e, 0x64da,
-  0x64e7, 0x6e20, 0x70ac, 0x795b, 0x8ddd, 0x8e1e, 0xf902, 0x907d,
-  0x9245, 0x92f8, 0x4e7e, 0x4ef6, 0x5065, 0x5dfe, 0x5efa, 0x6106,
-  0x6957, 0x8171, 0x8654, 0x8e47, 0x9375, 0x9a2b, 0x4e5e, 0x5091,
-  0x6770, 0x6840, 0x5109, 0x528d, 0x5292, 0x6aa2,
-  /* 0x4c */
-  0x77bc, 0x9210, 0x9ed4, 0x52ab, 0x602f, 0x8ff2, 0x5048, 0x61a9,
-  0x63ed, 0x64ca, 0x683c, 0x6a84, 0x6fc0, 0x8188, 0x89a1, 0x9694,
-  0x5805, 0x727d, 0x72ac, 0x7504, 0x7d79, 0x7e6d, 0x80a9, 0x898b,
-  0x8b74, 0x9063, 0x9d51, 0x6289, 0x6c7a, 0x6f54, 0x7d50, 0x7f3a,
-  0x8a23, 0x517c, 0x614a, 0x7b9d, 0x8b19, 0x9257, 0x938c, 0x4eac,
-  0x4fd3, 0x501e, 0x50be, 0x5106, 0x52c1, 0x52cd, 0x537f, 0x5770,
-  0x5883, 0x5e9a, 0x5f91, 0x6176, 0x61ac, 0x64ce, 0x656c, 0x666f,
-  0x66bb, 0x66f4, 0x6897, 0x6d87, 0x7085, 0x70f1, 0x749f, 0x74a5,
-  0x74ca, 0x75d9, 0x786c, 0x78ec, 0x7adf, 0x7af6, 0x7d45, 0x7d93,
-  0x8015, 0x803f, 0x811b, 0x8396, 0x8b66, 0x8f15, 0x9015, 0x93e1,
-  0x9803, 0x9838, 0x9a5a, 0x9be8, 0x4fc2, 0x5553, 0x583a, 0x5951,
-  0x5b63, 0x5c46, 0x60b8, 0x6212, 0x6842, 0x68b0,
-  /* 0x4d */
-  0x68e8, 0x6eaa, 0x754c, 0x7678, 0x78ce, 0x7a3d, 0x7cfb, 0x7e6b,
-  0x7e7c, 0x8a08, 0x8aa1, 0x8c3f, 0x968e, 0x9dc4, 0x53e4, 0x53e9,
-  0x544a, 0x5471, 0x56fa, 0x59d1, 0x5b64, 0x5c3b, 0x5eab, 0x62f7,
-  0x6537, 0x6545, 0x6572, 0x66a0, 0x67af, 0x69c1, 0x6cbd, 0x75fc,
-  0x7690, 0x777e, 0x7a3f, 0x7f94, 0x8003, 0x80a1, 0x818f, 0x82e6,
-  0x82fd, 0x83f0, 0x85c1, 0x8831, 0x88b4, 0x8aa5, 0xf903, 0x8f9c,
-  0x932e, 0x96c7, 0x9867, 0x9ad8, 0x9f13, 0x54ed, 0x659b, 0x66f2,
-  0x688f, 0x7a40, 0x8c37, 0x9d60, 0x56f0, 0x5764, 0x5d11, 0x6606,
-  0x68b1, 0x68cd, 0x6efe, 0x7428, 0x889e, 0x9be4, 0x6c68, 0xf904,
-  0x9aa8, 0x4f9b, 0x516c, 0x5171, 0x529f, 0x5b54, 0x5de5, 0x6050,
-  0x606d, 0x62f1, 0x63a7, 0x653b, 0x73d9, 0x7a7a, 0x86a3, 0x8ca2,
-  0x978f, 0x4e32, 0x5be1, 0x6208, 0x679c, 0x74dc,
-  /* 0x4e */
-  0x79d1, 0x83d3, 0x8a87, 0x8ab2, 0x8de8, 0x904e, 0x934b, 0x9846,
-  0x5ed3, 0x69e8, 0x85ff, 0x90ed, 0xf905, 0x51a0, 0x5b98, 0x5bec,
-  0x6163, 0x68fa, 0x6b3e, 0x704c, 0x742f, 0x74d8, 0x7ba1, 0x7f50,
-  0x83c5, 0x89c0, 0x8cab, 0x95dc, 0x9928, 0x522e, 0x605d, 0x62ec,
-  0x9002, 0x4f8a, 0x5149, 0x5321, 0x58d9, 0x5ee3, 0x66e0, 0x6d38,
-  0x709a, 0x72c2, 0x73d6, 0x7b50, 0x80f1, 0x945b, 0x5366, 0x639b,
-  0x7f6b, 0x4e56, 0x5080, 0x584a, 0x58de, 0x602a, 0x6127, 0x62d0,
-  0x69d0, 0x9b41, 0x5b8f, 0x7d18, 0x80b1, 0x8f5f, 0x4ea4, 0x50d1,
-  0x54ac, 0x55ac, 0x5b0c, 0x5da0, 0x5de7, 0x652a, 0x654e, 0x6821,
-  0x6a4b, 0x72e1, 0x768e, 0x77ef, 0x7d5e, 0x7ff9, 0x81a0, 0x854e,
-  0x86df, 0x8f03, 0x8f4e, 0x90ca, 0x9903, 0x9a55, 0x9bab, 0x4e18,
-  0x4e45, 0x4e5d, 0x4ec7, 0x4ff1, 0x5177, 0x52fe,
-  /* 0x4f */
-  0x5340, 0x53e3, 0x53e5, 0x548e, 0x5614, 0x5775, 0x57a2, 0x5bc7,
-  0x5d87, 0x5ed0, 0x61fc, 0x62d8, 0x6551, 0x67b8, 0x67e9, 0x69cb,
-  0x6b50, 0x6bc6, 0x6bec, 0x6c42, 0x6e9d, 0x7078, 0x72d7, 0x7396,
-  0x7403, 0x77bf, 0x77e9, 0x7a76, 0x7d7f, 0x8009, 0x81fc, 0x8205,
-  0x820a, 0x82df, 0x8862, 0x8b33, 0x8cfc, 0x8ec0, 0x9011, 0x90b1,
-  0x9264, 0x92b6, 0x99d2, 0x9a45, 0x9ce9, 0x9dd7, 0x9f9c, 0x570b,
-  0x5c40, 0x83ca, 0x97a0, 0x97ab, 0x9eb4, 0x541b, 0x7a98, 0x7fa4,
-  0x88d9, 0x8ecd, 0x90e1, 0x5800, 0x5c48, 0x6398, 0x7a9f, 0x5bae,
-  0x5f13, 0x7a79, 0x7aae, 0x828e, 0x8eac, 0x5026, 0x5238, 0x52f8,
-  0x5377, 0x5708, 0x62f3, 0x6372, 0x6b0a, 0x6dc3, 0x7737, 0x53a5,
-  0x7357, 0x8568, 0x8e76, 0x95d5, 0x673a, 0x6ac3, 0x6f70, 0x8a6d,
-  0x8ecc, 0x994b, 0xf906, 0x6677, 0x6b78, 0x8cb4,
-  /* 0x50 */
-  0x9b3c, 0xf907, 0x53eb, 0x572d, 0x594e, 0x63c6, 0x69fb, 0x73ea,
-  0x7845, 0x7aba, 0x7ac5, 0x7cfe, 0x8475, 0x898f, 0x8d73, 0x9035,
-  0x95a8, 0x52fb, 0x5747, 0x7547, 0x7b60, 0x83cc, 0x921e, 0xf908,
-  0x6a58, 0x514b, 0x524b, 0x5287, 0x621f, 0x68d8, 0x6975, 0x9699,
-  0x50c5, 0x52a4, 0x52e4, 0x61c3, 0x65a4, 0x6839, 0x69ff, 0x747e,
-  0x7b4b, 0x82b9, 0x83eb, 0x89b2, 0x8b39, 0x8fd1, 0x9949, 0xf909,
-  0x4eca, 0x5997, 0x64d2, 0x6611, 0x6a8e, 0x7434, 0x7981, 0x79bd,
-  0x82a9, 0x887e, 0x887f, 0x895f, 0xf90a, 0x9326, 0x4f0b, 0x53ca,
-  0x6025, 0x6271, 0x6c72, 0x7d1a, 0x7d66, 0x4e98, 0x5162, 0x77dc,
-  0x80af, 0x4f01, 0x4f0e, 0x5176, 0x5180, 0x55dc, 0x5668, 0x573b,
-  0x57fa, 0x57fc, 0x5914, 0x5947, 0x5993, 0x5bc4, 0x5c90, 0x5d0e,
-  0x5df1, 0x5e7e, 0x5fcc, 0x6280, 0x65d7, 0x65e3,
-  /* 0x51 */
-  0x671e, 0x671f, 0x675e, 0x68cb, 0x68c4, 0x6a5f, 0x6b3a, 0x6c23,
-  0x6c7d, 0x6c82, 0x6dc7, 0x7398, 0x7426, 0x742a, 0x7482, 0x74a3,
-  0x7578, 0x757f, 0x7881, 0x78ef, 0x7941, 0x7947, 0x7948, 0x797a,
-  0x7b95, 0x7d00, 0x7dba, 0x7f88, 0x8006, 0x802d, 0x808c, 0x8a18,
-  0x8b4f, 0x8c48, 0x8d77, 0x9321, 0x9324, 0x98e2, 0x9951, 0x9a0e,
-  0x9a0f, 0x9a65, 0x9e92, 0x7dca, 0x4f76, 0x5409, 0x62ee, 0x6854,
-  0x91d1, 0x55ab, 0x513a, 0xf90b, 0xf90c, 0x5a1c, 0x61e6, 0xf90d,
-  0x62cf, 0x62ff, 0xf90e, 0xf90f, 0xf910, 0xf911, 0xf912, 0xf913,
-  0x90a3, 0xf914, 0xf915, 0xf916, 0xf917, 0xf918, 0x8afe, 0xf919,
-  0xf91a, 0xf91b, 0xf91c, 0x6696, 0xf91d, 0x7156, 0xf91e, 0xf91f,
-  0x96e3, 0xf920, 0x634f, 0x637a, 0x5357, 0xf921, 0x678f, 0x6960,
-  0x6e73, 0xf922, 0x7537, 0xf923, 0xf924, 0xf925,
-  /* 0x52 */
-  0x7d0d, 0xf926, 0xf927, 0x8872, 0x56ca, 0x5a18, 0xf928, 0xf929,
-  0xf92a, 0xf92b, 0xf92c, 0x4e43, 0xf92d, 0x5167, 0x5948, 0x67f0,
-  0x8010, 0xf92e, 0x5973, 0x5e74, 0x649a, 0x79ca, 0x5ff5, 0x606c,
-  0x62c8, 0x637b, 0x5be7, 0x5bd7, 0x52aa, 0xf92f, 0x5974, 0x5f29,
-  0x6012, 0xf930, 0xf931, 0xf932, 0x7459, 0xf933, 0xf934, 0xf935,
-  0xf936, 0xf937, 0xf938, 0x99d1, 0xf939, 0xf93a, 0xf93b, 0xf93c,
-  0xf93d, 0xf93e, 0xf93f, 0xf940, 0xf941, 0xf942, 0xf943, 0x6fc3,
-  0xf944, 0xf945, 0x81bf, 0x8fb2, 0x60f1, 0xf946, 0xf947, 0x8166,
-  0xf948, 0xf949, 0x5c3f, 0xf94a, 0xf94b, 0xf94c, 0xf94d, 0xf94e,
-  0xf94f, 0xf950, 0xf951, 0x5ae9, 0x8a25, 0x677b, 0x7d10, 0xf952,
-  0xf953, 0xf954, 0xf955, 0xf956, 0xf957, 0x80fd, 0xf958, 0xf959,
-  0x5c3c, 0x6ce5, 0x533f, 0x6eba, 0x591a, 0x8336,
-  /* 0x53 */
-  0x4e39, 0x4eb6, 0x4f46, 0x55ae, 0x5718, 0x58c7, 0x5f56, 0x65b7,
-  0x65e6, 0x6a80, 0x6bb5, 0x6e4d, 0x77ed, 0x7aef, 0x7c1e, 0x7dde,
-  0x86cb, 0x8892, 0x9132, 0x935b, 0x64bb, 0x6fbe, 0x737a, 0x75b8,
-  0x9054, 0x5556, 0x574d, 0x61ba, 0x64d4, 0x66c7, 0x6de1, 0x6e5b,
-  0x6f6d, 0x6fb9, 0x75f0, 0x8043, 0x81bd, 0x8541, 0x8983, 0x8ac7,
-  0x8b5a, 0x931f, 0x6c93, 0x7553, 0x7b54, 0x8e0f, 0x905d, 0x5510,
-  0x5802, 0x5858, 0x5e62, 0x6207, 0x649e, 0x68e0, 0x7576, 0x7cd6,
-  0x87b3, 0x9ee8, 0x4ee3, 0x5788, 0x576e, 0x5927, 0x5c0d, 0x5cb1,
-  0x5e36, 0x5f85, 0x6234, 0x64e1, 0x73b3, 0x81fa, 0x888b, 0x8cb8,
-  0x968a, 0x9edb, 0x5b85, 0x5fb7, 0x60b3, 0x5012, 0x5200, 0x5230,
-  0x5716, 0x5835, 0x5857, 0x5c0e, 0x5c60, 0x5cf6, 0x5d8b, 0x5ea6,
-  0x5f92, 0x60bc, 0x6311, 0x6389, 0x6417, 0x6843,
-  /* 0x54 */
-  0x68f9, 0x6ac2, 0x6dd8, 0x6e21, 0x6ed4, 0x6fe4, 0x71fe, 0x76dc,
-  0x7779, 0x79b1, 0x7a3b, 0x8404, 0x89a9, 0x8ced, 0x8df3, 0x8e48,
-  0x9003, 0x9014, 0x9053, 0x90fd, 0x934d, 0x9676, 0x97dc, 0x6bd2,
-  0x7006, 0x7258, 0x72a2, 0x7368, 0x7763, 0x79bf, 0x7be4, 0x7e9b,
-  0x8b80, 0x58a9, 0x60c7, 0x6566, 0x65fd, 0x66be, 0x6c8c, 0x711e,
-  0x71c9, 0x8c5a, 0x9813, 0x4e6d, 0x7a81, 0x4edd, 0x51ac, 0x51cd,
-  0x52d5, 0x540c, 0x61a7, 0x6771, 0x6850, 0x68df, 0x6d1e, 0x6f7c,
-  0x75bc, 0x77b3, 0x7ae5, 0x80f4, 0x8463, 0x9285, 0x515c, 0x6597,
-  0x675c, 0x6793, 0x75d8, 0x7ac7, 0x8373, 0xf95a, 0x8c46, 0x9017,
-  0x982d, 0x5c6f, 0x81c0, 0x829a, 0x9041, 0x906f, 0x920d, 0x5f97,
-  0x5d9d, 0x6a59, 0x71c8, 0x767b, 0x7b49, 0x85e4, 0x8b04, 0x9127,
-  0x9a30, 0x5587, 0x61f6, 0xf95b, 0x7669, 0x7f85,
-  /* 0x55 */
-  0x863f, 0x87ba, 0x88f8, 0x908f, 0xf95c, 0x6d1b, 0x70d9, 0x73de,
-  0x7d61, 0x843d, 0xf95d, 0x916a, 0x99f1, 0xf95e, 0x4e82, 0x5375,
-  0x6b04, 0x6b12, 0x703e, 0x721b, 0x862d, 0x9e1e, 0x524c, 0x8fa3,
-  0x5d50, 0x64e5, 0x652c, 0x6b16, 0x6feb, 0x7c43, 0x7e9c, 0x85cd,
-  0x8964, 0x89bd, 0x62c9, 0x81d8, 0x881f, 0x5eca, 0x6717, 0x6d6a,
-  0x72fc, 0x7405, 0x746f, 0x8782, 0x90de, 0x4f86, 0x5d0d, 0x5fa0,
-  0x840a, 0x51b7, 0x63a0, 0x7565, 0x4eae, 0x5006, 0x5169, 0x51c9,
-  0x6881, 0x6a11, 0x7cae, 0x7cb1, 0x7ce7, 0x826f, 0x8ad2, 0x8f1b,
-  0x91cf, 0x4fb6, 0x5137, 0x52f5, 0x5442, 0x5eec, 0x616e, 0x623e,
-  0x65c5, 0x6ada, 0x6ffe, 0x792a, 0x85dc, 0x8823, 0x95ad, 0x9a62,
-  0x9a6a, 0x9e97, 0x9ece, 0x529b, 0x66c6, 0x6b77, 0x701d, 0x792b,
-  0x8f62, 0x9742, 0x6190, 0x6200, 0x6523, 0x6f23,
-  /* 0x56 */
-  0x7149, 0x7489, 0x7df4, 0x806f, 0x84ee, 0x8f26, 0x9023, 0x934a,
-  0x51bd, 0x5217, 0x52a3, 0x6d0c, 0x70c8, 0x88c2, 0x5ec9, 0x6582,
-  0x6bae, 0x6fc2, 0x7c3e, 0x7375, 0x4ee4, 0x4f36, 0x56f9, 0xf95f,
-  0x5cba, 0x5dba, 0x601c, 0x73b2, 0x7b2d, 0x7f9a, 0x7fce, 0x8046,
-  0x901e, 0x9234, 0x96f6, 0x9748, 0x9818, 0x9f61, 0x4f8b, 0x6fa7,
-  0x79ae, 0x91b4, 0x96b7, 0x52de, 0xf960, 0x6488, 0x64c4, 0x6ad3,
-  0x6f5e, 0x7018, 0x7210, 0x76e7, 0x8001, 0x8606, 0x865c, 0x8def,
-  0x8f05, 0x9732, 0x9b6f, 0x9dfa, 0x9e75, 0x788c, 0x797f, 0x7da0,
-  0x83c9, 0x9304, 0x9e7f, 0x9e93, 0x8ad6, 0x58df, 0x5f04, 0x6727,
-  0x7027, 0x74cf, 0x7c60, 0x807e, 0x5121, 0x7028, 0x7262, 0x78ca,
-  0x8cc2, 0x8cda, 0x8cf4, 0x96f7, 0x4e86, 0x50da, 0x5bee, 0x5ed6,
-  0x6599, 0x71ce, 0x7642, 0x77ad, 0x804a, 0x84fc,
-  /* 0x57 */
-  0x907c, 0x9b27, 0x9f8d, 0x58d8, 0x5a41, 0x5c62, 0x6a13, 0x6dda,
-  0x6f0f, 0x763b, 0x7d2f, 0x7e37, 0x851e, 0x8938, 0x93e4, 0x964b,
-  0x5289, 0x65d2, 0x67f3, 0x69b4, 0x6d41, 0x6e9c, 0x700f, 0x7409,
-  0x7460, 0x7559, 0x7624, 0x786b, 0x8b2c, 0x985e, 0x516d, 0x622e,
-  0x9678, 0x4f96, 0x502b, 0x5d19, 0x6dea, 0x7db8, 0x8f2a, 0x5f8b,
-  0x6144, 0x6817, 0xf961, 0x9686, 0x52d2, 0x808b, 0x51dc, 0x51cc,
-  0x695e, 0x7a1c, 0x7dbe, 0x83f1, 0x9675, 0x4fda, 0x5229, 0x5398,
-  0x540f, 0x550e, 0x5c65, 0x60a7, 0x674e, 0x68a8, 0x6d6c, 0x7281,
-  0x72f8, 0x7406, 0x7483, 0xf962, 0x75e2, 0x7c6c, 0x7f79, 0x7fb8,
-  0x8389, 0x88cf, 0x88e1, 0x91cc, 0x91d0, 0x96e2, 0x9bc9, 0x541d,
-  0x6f7e, 0x71d0, 0x7498, 0x85fa, 0x8eaa, 0x96a3, 0x9c57, 0x9e9f,
-  0x6797, 0x6dcb, 0x7433, 0x81e8, 0x9716, 0x782c,
-  /* 0x58 */
-  0x7acb, 0x7b20, 0x7c92, 0x6469, 0x746a, 0x75f2, 0x78bc, 0x78e8,
-  0x99ac, 0x9b54, 0x9ebb, 0x5bde, 0x5e55, 0x6f20, 0x819c, 0x83ab,
-  0x9088, 0x4e07, 0x534d, 0x5a29, 0x5dd2, 0x5f4e, 0x6162, 0x633d,
-  0x6669, 0x66fc, 0x6eff, 0x6f2b, 0x7063, 0x779e, 0x842c, 0x8513,
-  0x883b, 0x8f13, 0x9945, 0x9c3b, 0x551c, 0x62b9, 0x672b, 0x6cab,
-  0x8309, 0x896a, 0x977a, 0x4ea1, 0x5984, 0x5fd8, 0x5fd9, 0x671b,
-  0x7db2, 0x7f54, 0x8292, 0x832b, 0x83bd, 0x8f1e, 0x9099, 0x57cb,
-  0x59b9, 0x5a92, 0x5bd0, 0x6627, 0x679a, 0x6885, 0x6bcf, 0x7164,
-  0x7f75, 0x8cb7, 0x8ce3, 0x9081, 0x9b45, 0x8108, 0x8c8a, 0x964c,
-  0x9a40, 0x9ea5, 0x5b5f, 0x6c13, 0x731b, 0x76f2, 0x76df, 0x840c,
-  0x51aa, 0x8993, 0x514d, 0x5195, 0x52c9, 0x68c9, 0x6c94, 0x7704,
-  0x7720, 0x7dbf, 0x7dec, 0x9762, 0x9eb5, 0x6ec5,
-  /* 0x59 */
-  0x8511, 0x51a5, 0x540d, 0x547d, 0x660e, 0x669d, 0x6927, 0x6e9f,
-  0x76bf, 0x7791, 0x8317, 0x84c2, 0x879f, 0x9169, 0x9298, 0x9cf4,
-  0x8882, 0x4fae, 0x5192, 0x52df, 0x59c6, 0x5e3d, 0x6155, 0x6478,
-  0x6479, 0x66ae, 0x67d0, 0x6a21, 0x6bcd, 0x6bdb, 0x725f, 0x7261,
-  0x7441, 0x7738, 0x77db, 0x8017, 0x82bc, 0x8305, 0x8b00, 0x8b28,
-  0x8c8c, 0x6728, 0x6c90, 0x7267, 0x76ee, 0x7766, 0x7a46, 0x9da9,
-  0x6b7f, 0x6c92, 0x5922, 0x6726, 0x8499, 0x536f, 0x5893, 0x5999,
-  0x5edf, 0x63cf, 0x6634, 0x6773, 0x6e3a, 0x732b, 0x7ad7, 0x82d7,
-  0x9328, 0x52d9, 0x5deb, 0x61ae, 0x61cb, 0x620a, 0x62c7, 0x64ab,
-  0x65e0, 0x6959, 0x6b66, 0x6bcb, 0x7121, 0x73f7, 0x755d, 0x7e46,
-  0x821e, 0x8302, 0x856a, 0x8aa3, 0x8cbf, 0x9727, 0x9d61, 0x58a8,
-  0x9ed8, 0x5011, 0x520e, 0x543b, 0x554f, 0x6587,
-  /* 0x5a */
-  0x6c76, 0x7d0a, 0x7d0b, 0x805e, 0x868a, 0x9580, 0x96ef, 0x52ff,
-  0x6c95, 0x7269, 0x5473, 0x5a9a, 0x5c3e, 0x5d4b, 0x5f4c, 0x5fae,
-  0x672a, 0x68b6, 0x6963, 0x6e3c, 0x6e44, 0x7709, 0x7c73, 0x7f8e,
-  0x8587, 0x8b0e, 0x8ff7, 0x9761, 0x9ef4, 0x5cb7, 0x60b6, 0x610d,
-  0x61ab, 0x654f, 0x65fb, 0x65fc, 0x6c11, 0x6cef, 0x739f, 0x73c9,
-  0x7de1, 0x9594, 0x5bc6, 0x871c, 0x8b10, 0x525d, 0x535a, 0x62cd,
-  0x640f, 0x64b2, 0x6734, 0x6a38, 0x6cca, 0x73c0, 0x749e, 0x7b94,
-  0x7c95, 0x7e1b, 0x818a, 0x8236, 0x8584, 0x8feb, 0x96f9, 0x99c1,
-  0x4f34, 0x534a, 0x53cd, 0x53db, 0x62cc, 0x642c, 0x6500, 0x6591,
-  0x69c3, 0x6cee, 0x6f58, 0x73ed, 0x7554, 0x7622, 0x76e4, 0x76fc,
-  0x78d0, 0x78fb, 0x792c, 0x7d46, 0x822c, 0x87e0, 0x8fd4, 0x9812,
-  0x98ef, 0x52c3, 0x62d4, 0x64a5, 0x6e24, 0x6f51,
-  /* 0x5b */
-  0x767c, 0x8dcb, 0x91b1, 0x9262, 0x9aee, 0x9b43, 0x5023, 0x508d,
-  0x574a, 0x59a8, 0x5c28, 0x5e47, 0x5f77, 0x623f, 0x653e, 0x65b9,
-  0x65c1, 0x6609, 0x678b, 0x699c, 0x6ec2, 0x78c5, 0x7d21, 0x80aa,
-  0x8180, 0x822b, 0x82b3, 0x84a1, 0x868c, 0x8a2a, 0x8b17, 0x90a6,
-  0x9632, 0x9f90, 0x500d, 0x4ff3, 0xf963, 0x57f9, 0x5f98, 0x62dc,
-  0x6392, 0x676f, 0x6e43, 0x7119, 0x76c3, 0x80cc, 0x80da, 0x88f4,
-  0x88f5, 0x8919, 0x8ce0, 0x8f29, 0x914d, 0x966a, 0x4f2f, 0x4f70,
-  0x5e1b, 0x67cf, 0x6822, 0x767d, 0x767e, 0x9b44, 0x5e61, 0x6a0a,
-  0x7169, 0x71d4, 0x756a, 0xf964, 0x7e41, 0x8543, 0x85e9, 0x98dc,
-  0x4f10, 0x7b4f, 0x7f70, 0x95a5, 0x51e1, 0x5e06, 0x68b5, 0x6c3e,
-  0x6c4e, 0x6cdb, 0x72af, 0x7bc4, 0x8303, 0x6cd5, 0x743a, 0x50fb,
-  0x5288, 0x58c1, 0x64d8, 0x6a97, 0x74a7, 0x7656,
-  /* 0x5c */
-  0x78a7, 0x8617, 0x95e2, 0x9739, 0xf965, 0x535e, 0x5f01, 0x8b8a,
-  0x8fa8, 0x8faf, 0x908a, 0x5225, 0x77a5, 0x9c49, 0x9f08, 0x4e19,
-  0x5002, 0x5175, 0x5c5b, 0x5e77, 0x661e, 0x663a, 0x67c4, 0x68c5,
-  0x70b3, 0x7501, 0x75c5, 0x79c9, 0x7add, 0x8f27, 0x9920, 0x9a08,
-  0x4fdd, 0x5821, 0x5831, 0x5bf6, 0x666e, 0x6b65, 0x6d11, 0x6e7a,
-  0x6f7d, 0x73e4, 0x752b, 0x83e9, 0x88dc, 0x8913, 0x8b5c, 0x8f14,
-  0x4f0f, 0x50d5, 0x5310, 0x535c, 0x5b93, 0x5fa9, 0x670d, 0x798f,
-  0x8179, 0x832f, 0x8514, 0x8907, 0x8986, 0x8f39, 0x8f3b, 0x99a5,
-  0x9c12, 0x672c, 0x4e76, 0x4ff8, 0x5949, 0x5c01, 0x5cef, 0x5cf0,
-  0x6367, 0x68d2, 0x70fd, 0x71a2, 0x742b, 0x7e2b, 0x84ec, 0x8702,
-  0x9022, 0x92d2, 0x9cf3, 0x4e0d, 0x4ed8, 0x4fef, 0x5085, 0x5256,
-  0x526f, 0x5426, 0x5490, 0x57e0, 0x592b, 0x5a66,
-  /* 0x5d */
-  0x5b5a, 0x5b75, 0x5bcc, 0x5e9c, 0xf966, 0x6276, 0x6577, 0x65a7,
-  0x6d6e, 0x6ea5, 0x7236, 0x7b26, 0x7c3f, 0x7f36, 0x8150, 0x8151,
-  0x819a, 0x8240, 0x8299, 0x83a9, 0x8a03, 0x8ca0, 0x8ce6, 0x8cfb,
-  0x8d74, 0x8dba, 0x90e8, 0x91dc, 0x961c, 0x9644, 0x99d9, 0x9ce7,
-  0x5317, 0x5206, 0x5429, 0x5674, 0x58b3, 0x5954, 0x596e, 0x5fff,
-  0x61a4, 0x626e, 0x6610, 0x6c7e, 0x711a, 0x76c6, 0x7c89, 0x7cde,
-  0x7d1b, 0x82ac, 0x8cc1, 0x96f0, 0xf967, 0x4f5b, 0x5f17, 0x5f7f,
-  0x62c2, 0x5d29, 0x670b, 0x68da, 0x787c, 0x7e43, 0x9d6c, 0x4e15,
-  0x5099, 0x5315, 0x532a, 0x5351, 0x5983, 0x5a62, 0x5e87, 0x60b2,
-  0x618a, 0x6249, 0x6279, 0x6590, 0x6787, 0x69a7, 0x6bd4, 0x6bd6,
-  0x6bd7, 0x6bd8, 0x6cb8, 0xf968, 0x7435, 0x75fa, 0x7812, 0x7891,
-  0x79d5, 0x79d8, 0x7c83, 0x7dcb, 0x7fe1, 0x80a5,
-  /* 0x5e */
-  0x813e, 0x81c2, 0x83f2, 0x871a, 0x88e8, 0x8ab9, 0x8b6c, 0x8cbb,
-  0x9119, 0x975e, 0x98db, 0x9f3b, 0x56ac, 0x5b2a, 0x5f6c, 0x658c,
-  0x6ab3, 0x6baf, 0x6d5c, 0x6ff1, 0x7015, 0x725d, 0x73ad, 0x8ca7,
-  0x8cd3, 0x983b, 0x6191, 0x6c37, 0x8058, 0x9a01, 0x4e4d, 0x4e8b,
-  0x4e9b, 0x4ed5, 0x4f3a, 0x4f3c, 0x4f7f, 0x4fdf, 0x50ff, 0x53f2,
-  0x53f8, 0x5506, 0x55e3, 0x56db, 0x58eb, 0x5962, 0x5a11, 0x5beb,
-  0x5bfa, 0x5c04, 0x5df3, 0x5e2b, 0x5f99, 0x601d, 0x6368, 0x659c,
-  0x65af, 0x67f6, 0x67fb, 0x68ad, 0x6b7b, 0x6c99, 0x6cd7, 0x6e23,
-  0x7009, 0x7345, 0x7802, 0x793e, 0x7940, 0x7960, 0x79c1, 0x7be9,
-  0x7d17, 0x7d72, 0x8086, 0x820d, 0x838e, 0x84d1, 0x86c7, 0x88df,
-  0x8a50, 0x8a5e, 0x8b1d, 0x8cdc, 0x8d66, 0x8fad, 0x90aa, 0x98fc,
-  0x99df, 0x9e9d, 0x524a, 0xf969, 0x6714, 0xf96a,
-  /* 0x5f */
-  0x5098, 0x522a, 0x5c71, 0x6563, 0x6c55, 0x73ca, 0x7523, 0x759d,
-  0x7b97, 0x849c, 0x9178, 0x9730, 0x4e77, 0x6492, 0x6bba, 0x715e,
-  0x85a9, 0x4e09, 0xf96b, 0x6749, 0x68ee, 0x6e17, 0x829f, 0x8518,
-  0x886b, 0x63f7, 0x6f81, 0x9212, 0x98af, 0x4e0a, 0x50b7, 0x50cf,
-  0x511f, 0x5546, 0x55aa, 0x5617, 0x5b40, 0x5c19, 0x5ce0, 0x5e38,
-  0x5e8a, 0x5ea0, 0x5ec2, 0x60f3, 0x6851, 0x6a61, 0x6e58, 0x723d,
-  0x7240, 0x72c0, 0x76f8, 0x7965, 0x7bb1, 0x7fd4, 0x88f3, 0x89f4,
-  0x8a73, 0x8c61, 0x8cde, 0x971c, 0x585e, 0x74bd, 0x8cfd, 0x55c7,
-  0xf96c, 0x7a61, 0x7d22, 0x8272, 0x7272, 0x751f, 0x7525, 0xf96d,
-  0x7b19, 0x5885, 0x58fb, 0x5dbc, 0x5e8f, 0x5eb6, 0x5f90, 0x6055,
-  0x6292, 0x637f, 0x654d, 0x6691, 0x66d9, 0x66f8, 0x6816, 0x68f2,
-  0x7280, 0x745e, 0x7b6e, 0x7d6e, 0x7dd6, 0x7f72,
-  /* 0x60 */
-  0x80e5, 0x8212, 0x85af, 0x897f, 0x8a93, 0x901d, 0x92e4, 0x9ecd,
-  0x9f20, 0x5915, 0x596d, 0x5e2d, 0x60dc, 0x6614, 0x6673, 0x6790,
-  0x6c50, 0x6dc5, 0x6f5f, 0x77f3, 0x78a9, 0x84c6, 0x91cb, 0x932b,
-  0x4ed9, 0x50ca, 0x5148, 0x5584, 0x5b0b, 0x5ba3, 0x6247, 0x657e,
-  0x65cb, 0x6e32, 0x717d, 0x7401, 0x7444, 0x7487, 0x74bf, 0x766c,
-  0x79aa, 0x7dda, 0x7e55, 0x7fa8, 0x817a, 0x81b3, 0x8239, 0x861a,
-  0x87ec, 0x8a75, 0x8de3, 0x9078, 0x9291, 0x9425, 0x994d, 0x9bae,
-  0x5368, 0x5c51, 0x6954, 0x6cc4, 0x6d29, 0x6e2b, 0x820c, 0x859b,
-  0x893b, 0x8a2d, 0x8aaa, 0x96ea, 0x9f67, 0x5261, 0x66b9, 0x6bb2,
-  0x7e96, 0x87fe, 0x8d0d, 0x9583, 0x965d, 0x651d, 0x6d89, 0x71ee,
-  0xf96e, 0x57ce, 0x59d3, 0x5bac, 0x6027, 0x60fa, 0x6210, 0x661f,
-  0x665f, 0x7329, 0x73f9, 0x76db, 0x7701, 0x7b6c,
-  /* 0x61 */
-  0x8056, 0x8072, 0x8165, 0x8aa0, 0x9192, 0x4e16, 0x52e2, 0x6b72,
-  0x6d17, 0x7a05, 0x7b39, 0x7d30, 0xf96f, 0x8cb0, 0x53ec, 0x562f,
-  0x5851, 0x5bb5, 0x5c0f, 0x5c11, 0x5de2, 0x6240, 0x6383, 0x6414,
-  0x662d, 0x68b3, 0x6cbc, 0x6d88, 0x6eaf, 0x701f, 0x70a4, 0x71d2,
-  0x7526, 0x758f, 0x758e, 0x7619, 0x7b11, 0x7be0, 0x7c2b, 0x7d20,
-  0x7d39, 0x852c, 0x856d, 0x8607, 0x8a34, 0x900d, 0x9061, 0x90b5,
-  0x92b7, 0x97f6, 0x9a37, 0x4fd7, 0x5c6c, 0x675f, 0x6d91, 0x7c9f,
-  0x7e8c, 0x8b16, 0x8d16, 0x901f, 0x5b6b, 0x5dfd, 0x640d, 0x84c0,
-  0x905c, 0x98e1, 0x7387, 0x5b8b, 0x609a, 0x677e, 0x6dde, 0x8a1f,
-  0x8aa6, 0x9001, 0x980c, 0x5237, 0xf970, 0x7051, 0x788e, 0x9396,
-  0x8870, 0x91d7, 0x4fee, 0x53d7, 0x55fd, 0x56da, 0x5782, 0x58fd,
-  0x5ac2, 0x5b88, 0x5cab, 0x5cc0, 0x5e25, 0x6101,
-  /* 0x62 */
-  0x620d, 0x624b, 0x6388, 0x641c, 0x6536, 0x6578, 0x6a39, 0x6b8a,
-  0x6c34, 0x6d19, 0x6f31, 0x71e7, 0x72e9, 0x7378, 0x7407, 0x74b2,
-  0x7626, 0x7761, 0x79c0, 0x7a57, 0x7aea, 0x7cb9, 0x7d8f, 0x7dac,
-  0x7e61, 0x7f9e, 0x8129, 0x8331, 0x8490, 0x84da, 0x85ea, 0x8896,
-  0x8ab0, 0x8b90, 0x8f38, 0x9042, 0x9083, 0x916c, 0x9296, 0x92b9,
-  0x968b, 0x96a7, 0x96a8, 0x96d6, 0x9700, 0x9808, 0x9996, 0x9ad3,
-  0x9b1a, 0x53d4, 0x587e, 0x5919, 0x5b70, 0x5bbf, 0x6dd1, 0x6f5a,
-  0x719f, 0x7421, 0x74b9, 0x8085, 0x83fd, 0x5de1, 0x5f87, 0x5faa,
-  0x6042, 0x65ec, 0x6812, 0x696f, 0x6a53, 0x6b89, 0x6d35, 0x6df3,
-  0x73e3, 0x76fe, 0x77ac, 0x7b4d, 0x7d14, 0x8123, 0x821c, 0x8340,
-  0x84f4, 0x8563, 0x8a62, 0x8ac4, 0x9187, 0x931e, 0x9806, 0x99b4,
-  0x620c, 0x8853, 0x8ff0, 0x9265, 0x5d07, 0x5d27,
-  /* 0x63 */
-  0x5d69, 0x745f, 0x819d, 0x8768, 0x6fd5, 0x62fe, 0x7fd2, 0x8936,
-  0x8972, 0x4e1e, 0x4e58, 0x50e7, 0x52dd, 0x5347, 0x627f, 0x6607,
-  0x7e69, 0x8805, 0x965e, 0x4f8d, 0x5319, 0x5636, 0x59cb, 0x5aa4,
-  0x5c38, 0x5c4e, 0x5c4d, 0x5e02, 0x5f11, 0x6043, 0x65bd, 0x662f,
-  0x6642, 0x67be, 0x67f4, 0x731c, 0x77e2, 0x793a, 0x7fc5, 0x8494,
-  0x84cd, 0x8996, 0x8a66, 0x8a69, 0x8ae1, 0x8c55, 0x8c7a, 0x57f4,
-  0x5bd4, 0x5f0f, 0x606f, 0x62ed, 0x690d, 0x6b96, 0x6e5c, 0x7184,
-  0x7bd2, 0x8755, 0x8b58, 0x8efe, 0x98df, 0x98fe, 0x4f38, 0x4f81,
-  0x4fe1, 0x547b, 0x5a20, 0x5bb8, 0x613c, 0x65b0, 0x6668, 0x71fc,
-  0x7533, 0x795e, 0x7d33, 0x814e, 0x81e3, 0x8398, 0x85aa, 0x85ce,
-  0x8703, 0x8a0a, 0x8eab, 0x8f9b, 0xf971, 0x8fc5, 0x5931, 0x5ba4,
-  0x5be6, 0x6089, 0x5be9, 0x5c0b, 0x5fc3, 0x6c81,
-  /* 0x64 */
-  0xf972, 0x6df1, 0x700b, 0x751a, 0x82af, 0x8af6, 0x4ec0, 0x5341,
-  0xf973, 0x96d9, 0x6c0f, 0x4e9e, 0x4fc4, 0x5152, 0x555e, 0x5a25,
-  0x5ce8, 0x6211, 0x7259, 0x82bd, 0x83aa, 0x86fe, 0x8859, 0x8a1d,
-  0x963f, 0x96c5, 0x9913, 0x9d09, 0x9d5d, 0x580a, 0x5cb3, 0x5dbd,
-  0x5e44, 0x60e1, 0x6115, 0x63e1, 0x6a02, 0x6e25, 0x9102, 0x9354,
-  0x984e, 0x9c10, 0x9f77, 0x5b89, 0x5cb8, 0x6309, 0x664f, 0x6848,
-  0x773c, 0x96c1, 0x978d, 0x9854, 0x9b9f, 0x65a1, 0x8b01, 0x8ecb,
-  0x95bc, 0x5535, 0x5ca9, 0x5dd6, 0x5eb5, 0x6697, 0x764c, 0x83f4,
-  0x95c7, 0x58d3, 0x62bc, 0x72ce, 0x9d28, 0x4ef0, 0x592e, 0x600f,
-  0x663b, 0x6b83, 0x79e7, 0x9d26, 0x5393, 0x54c0, 0x57c3, 0x5d16,
-  0x611b, 0x66d6, 0x6daf, 0x788d, 0x827e, 0x9698, 0x9744, 0x5384,
-  0x627c, 0x6396, 0x6db2, 0x7e0a, 0x814b, 0x984d,
-  /* 0x65 */
-  0x6afb, 0x7f4c, 0x9daf, 0x9e1a, 0x4e5f, 0x503b, 0x51b6, 0x591c,
-  0x60f9, 0x63f6, 0x6930, 0x723a, 0x8036, 0xf974, 0x91ce, 0x5f31,
-  0xf975, 0xf976, 0x7d04, 0x82e5, 0x846f, 0x84bb, 0x85e5, 0x8e8d,
-  0xf977, 0x4f6f, 0xf978, 0xf979, 0x58e4, 0x5b43, 0x6059, 0x63da,
-  0x6518, 0x656d, 0x6698, 0xf97a, 0x694a, 0x6a23, 0x6d0b, 0x7001,
-  0x716c, 0x75d2, 0x760d, 0x79b3, 0x7a70, 0xf97b, 0x7f8a, 0xf97c,
-  0x8944, 0xf97d, 0x8b93, 0x91c0, 0x967d, 0xf97e, 0x990a, 0x5704,
-  0x5fa1, 0x65bc, 0x6f01, 0x7600, 0x79a6, 0x8a9e, 0x99ad, 0x9b5a,
-  0x9f6c, 0x5104, 0x61b6, 0x6291, 0x6a8d, 0x81c6, 0x5043, 0x5830,
-  0x5f66, 0x7109, 0x8a00, 0x8afa, 0x5b7c, 0x8616, 0x4ffa, 0x513c,
-  0x56b4, 0x5944, 0x63a9, 0x6df9, 0x5daa, 0x696d, 0x5186, 0x4e88,
-  0x4f59, 0xf97f, 0xf980, 0xf981, 0x5982, 0xf982,
-  /* 0x66 */
-  0xf983, 0x6b5f, 0x6c5d, 0xf984, 0x74b5, 0x7916, 0xf985, 0x8207,
-  0x8245, 0x8339, 0x8f3f, 0x8f5d, 0xf986, 0x9918, 0xf987, 0xf988,
-  0xf989, 0x4ea6, 0xf98a, 0x57df, 0x5f79, 0x6613, 0xf98b, 0xf98c,
-  0x75ab, 0x7e79, 0x8b6f, 0xf98d, 0x9006, 0x9a5b, 0x56a5, 0x5827,
-  0x59f8, 0x5a1f, 0x5bb4, 0xf98e, 0x5ef6, 0xf98f, 0xf990, 0x6350,
-  0x633b, 0xf991, 0x693d, 0x6c87, 0x6cbf, 0x6d8e, 0x6d93, 0x6df5,
-  0x6f14, 0xf992, 0x70df, 0x7136, 0x7159, 0xf993, 0x71c3, 0x71d5,
-  0xf994, 0x784f, 0x786f, 0xf995, 0x7b75, 0x7de3, 0xf996, 0x7e2f,
-  0xf997, 0x884d, 0x8edf, 0xf998, 0xf999, 0xf99a, 0x925b, 0xf99b,
-  0x9cf6, 0xf99c, 0xf99d, 0xf99e, 0x6085, 0x6d85, 0xf99f, 0x71b1,
-  0xf9a0, 0xf9a1, 0x95b1, 0x53ad, 0xf9a2, 0xf9a3, 0xf9a4, 0x67d3,
-  0xf9a5, 0x708e, 0x7130, 0x7430, 0x8276, 0x82d2,
-  /* 0x67 */
-  0xf9a6, 0x95bb, 0x9ae5, 0x9e7d, 0x66c4, 0xf9a7, 0x71c1, 0x8449,
-  0xf9a8, 0xf9a9, 0x584b, 0xf9aa, 0xf9ab, 0x5db8, 0x5f71, 0xf9ac,
-  0x6620, 0x668e, 0x6979, 0x69ae, 0x6c38, 0x6cf3, 0x6e36, 0x6f41,
-  0x6fda, 0x701b, 0x702f, 0x7150, 0x71df, 0x7370, 0xf9ad, 0x745b,
-  0xf9ae, 0x74d4, 0x76c8, 0x7a4e, 0x7e93, 0xf9af, 0xf9b0, 0x82f1,
-  0x8a60, 0x8fce, 0xf9b1, 0x9348, 0xf9b2, 0x9719, 0xf9b3, 0xf9b4,
-  0x4e42, 0x502a, 0xf9b5, 0x5208, 0x53e1, 0x66f3, 0x6c6d, 0x6fca,
-  0x730a, 0x777f, 0x7a62, 0x82ae, 0x85dd, 0x8602, 0xf9b6, 0x88d4,
-  0x8a63, 0x8b7d, 0x8c6b, 0xf9b7, 0x92b3, 0xf9b8, 0x9713, 0x9810,
-  0x4e94, 0x4f0d, 0x4fc9, 0x50b2, 0x5348, 0x543e, 0x5433, 0x55da,
-  0x5862, 0x58ba, 0x5967, 0x5a1b, 0x5be4, 0x609f, 0xf9b9, 0x61ca,
-  0x6556, 0x65ff, 0x6664, 0x68a7, 0x6c5a, 0x6fb3,
-  /* 0x68 */
-  0x70cf, 0x71ac, 0x7352, 0x7b7d, 0x8708, 0x8aa4, 0x9c32, 0x9f07,
-  0x5c4b, 0x6c83, 0x7344, 0x7389, 0x923a, 0x6eab, 0x7465, 0x761f,
-  0x7a69, 0x7e15, 0x860a, 0x5140, 0x58c5, 0x64c1, 0x74ee, 0x7515,
-  0x7670, 0x7fc1, 0x9095, 0x96cd, 0x9954, 0x6e26, 0x74e6, 0x7aa9,
-  0x7aaa, 0x81e5, 0x86d9, 0x8778, 0x8a1b, 0x5a49, 0x5b8c, 0x5b9b,
-  0x68a1, 0x6900, 0x6d63, 0x73a9, 0x7413, 0x742c, 0x7897, 0x7de9,
-  0x7feb, 0x8118, 0x8155, 0x839e, 0x8c4c, 0x962e, 0x9811, 0x66f0,
-  0x5f80, 0x65fa, 0x6789, 0x6c6a, 0x738b, 0x502d, 0x5a03, 0x6b6a,
-  0x77ee, 0x5916, 0x5d6c, 0x5dcd, 0x7325, 0x754f, 0xf9ba, 0xf9bb,
-  0x50e5, 0x51f9, 0x582f, 0x592d, 0x5996, 0x59da, 0x5be5, 0xf9bc,
-  0xf9bd, 0x5da2, 0x62d7, 0x6416, 0x6493, 0x64fe, 0xf9be, 0x66dc,
-  0xf9bf, 0x6a48, 0xf9c0, 0x71ff, 0x7464, 0xf9c1,
-  /* 0x69 */
-  0x7a88, 0x7aaf, 0x7e47, 0x7e5e, 0x8000, 0x8170, 0xf9c2, 0x87ef,
-  0x8981, 0x8b20, 0x9059, 0xf9c3, 0x9080, 0x9952, 0x617e, 0x6b32,
-  0x6d74, 0x7e1f, 0x8925, 0x8fb1, 0x4fd1, 0x50ad, 0x5197, 0x52c7,
-  0x57c7, 0x5889, 0x5bb9, 0x5eb8, 0x6142, 0x6995, 0x6d8c, 0x6e67,
-  0x6eb6, 0x7194, 0x7462, 0x7528, 0x752c, 0x8073, 0x8338, 0x84c9,
-  0x8e0a, 0x9394, 0x93de, 0xf9c4, 0x4e8e, 0x4f51, 0x5076, 0x512a,
-  0x53c8, 0x53cb, 0x53f3, 0x5b87, 0x5bd3, 0x5c24, 0x611a, 0x6182,
-  0x65f4, 0x725b, 0x7397, 0x7440, 0x76c2, 0x7950, 0x7991, 0x79b9,
-  0x7d06, 0x7fbd, 0x828b, 0x85d5, 0x865e, 0x8fc2, 0x9047, 0x90f5,
-  0x91ea, 0x9685, 0x96e8, 0x96e9, 0x52d6, 0x5f67, 0x65ed, 0x6631,
-  0x682f, 0x715c, 0x7a36, 0x90c1, 0x980a, 0x4e91, 0xf9c5, 0x6a52,
-  0x6b9e, 0x6f90, 0x7189, 0x8018, 0x82b8, 0x8553,
-  /* 0x6a */
-  0x904b, 0x9695, 0x96f2, 0x97fb, 0x851a, 0x9b31, 0x4e90, 0x718a,
-  0x96c4, 0x5143, 0x539f, 0x54e1, 0x5713, 0x5712, 0x57a3, 0x5a9b,
-  0x5ac4, 0x5bc3, 0x6028, 0x613f, 0x63f4, 0x6c85, 0x6d39, 0x6e72,
-  0x6e90, 0x7230, 0x733f, 0x7457, 0x82d1, 0x8881, 0x8f45, 0x9060,
-  0xf9c6, 0x9662, 0x9858, 0x9d1b, 0x6708, 0x8d8a, 0x925e, 0x4f4d,
-  0x5049, 0x50de, 0x5371, 0x570d, 0x59d4, 0x5a01, 0x5c09, 0x6170,
-  0x6690, 0x6e2d, 0x7232, 0x744b, 0x7def, 0x80c3, 0x840e, 0x8466,
-  0x853f, 0x875f, 0x885b, 0x8918, 0x8b02, 0x9055, 0x97cb, 0x9b4f,
-  0x4e73, 0x4f91, 0x5112, 0x516a, 0xf9c7, 0x552f, 0x55a9, 0x5b7a,
-  0x5ba5, 0x5e7c, 0x5e7d, 0x5ebe, 0x60a0, 0x60df, 0x6108, 0x6109,
-  0x63c4, 0x6538, 0x6709, 0xf9c8, 0x67d4, 0x67da, 0xf9c9, 0x6961,
-  0x6962, 0x6cb9, 0x6d27, 0xf9ca, 0x6e38, 0xf9cb,
-  /* 0x6b */
-  0x6fe1, 0x7336, 0x7337, 0xf9cc, 0x745c, 0x7531, 0xf9cd, 0x7652,
-  0xf9ce, 0xf9cf, 0x7dad, 0x81fe, 0x8438, 0x88d5, 0x8a98, 0x8adb,
-  0x8aed, 0x8e30, 0x8e42, 0x904a, 0x903e, 0x907a, 0x9149, 0x91c9,
-  0x936e, 0xf9d0, 0xf9d1, 0x5809, 0xf9d2, 0x6bd3, 0x8089, 0x80b2,
-  0xf9d3, 0xf9d4, 0x5141, 0x596b, 0x5c39, 0xf9d5, 0xf9d6, 0x6f64,
-  0x73a7, 0x80e4, 0x8d07, 0xf9d7, 0x9217, 0x958f, 0xf9d8, 0xf9d9,
-  0xf9da, 0xf9db, 0x807f, 0x620e, 0x701c, 0x7d68, 0x878d, 0xf9dc,
-  0x57a0, 0x6069, 0x6147, 0x6bb7, 0x8abe, 0x9280, 0x96b1, 0x4e59,
-  0x541f, 0x6deb, 0x852d, 0x9670, 0x97f3, 0x98ee, 0x63d6, 0x6ce3,
-  0x9091, 0x51dd, 0x61c9, 0x81ba, 0x9df9, 0x4f9d, 0x501a, 0x5100,
-  0x5b9c, 0x610f, 0x61ff, 0x64ec, 0x6905, 0x6bc5, 0x7591, 0x77e3,
-  0x7fa9, 0x8264, 0x858f, 0x87fb, 0x8863, 0x8abc,
-  /* 0x6c */
-  0x8b70, 0x91ab, 0x4e8c, 0x4ee5, 0x4f0a, 0xf9dd, 0xf9de, 0x5937,
-  0x59e8, 0xf9df, 0x5df2, 0x5f1b, 0x5f5b, 0x6021, 0xf9e0, 0xf9e1,
-  0xf9e2, 0xf9e3, 0x723e, 0x73e5, 0xf9e4, 0x7570, 0x75cd, 0xf9e5,
-  0x79fb, 0xf9e6, 0x800c, 0x8033, 0x8084, 0x82e1, 0x8351, 0xf9e7,
-  0xf9e8, 0x8cbd, 0x8cb3, 0x9087, 0xf9e9, 0xf9ea, 0x98f4, 0x990c,
-  0xf9eb, 0xf9ec, 0x7037, 0x76ca, 0x7fca, 0x7fcc, 0x7ffc, 0x8b1a,
-  0x4eba, 0x4ec1, 0x5203, 0x5370, 0xf9ed, 0x54bd, 0x56e0, 0x59fb,
-  0x5bc5, 0x5f15, 0x5fcd, 0x6e6e, 0xf9ee, 0xf9ef, 0x7d6a, 0x8335,
-  0xf9f0, 0x8693, 0x8a8d, 0xf9f1, 0x976d, 0x9777, 0xf9f2, 0xf9f3,
-  0x4e00, 0x4f5a, 0x4f7e, 0x58f9, 0x65e5, 0x6ea2, 0x9038, 0x93b0,
-  0x99b9, 0x4efb, 0x58ec, 0x598a, 0x59d9, 0x6041, 0xf9f4, 0xf9f5,
-  0x7a14, 0xf9f6, 0x834f, 0x8cc3, 0x5165, 0x5344,
-  /* 0x6d */
-  0xf9f7, 0xf9f8, 0xf9f9, 0x4ecd, 0x5269, 0x5b55, 0x82bf, 0x4ed4,
-  0x523a, 0x54a8, 0x59c9, 0x59ff, 0x5b50, 0x5b57, 0x5b5c, 0x6063,
-  0x6148, 0x6ecb, 0x7099, 0x716e, 0x7386, 0x74f7, 0x75b5, 0x78c1,
-  0x7d2b, 0x8005, 0x81ea, 0x8328, 0x8517, 0x85c9, 0x8aee, 0x8cc7,
-  0x96cc, 0x4f5c, 0x52fa, 0x56bc, 0x65ab, 0x6628, 0x707c, 0x70b8,
-  0x7235, 0x7dbd, 0x828d, 0x914c, 0x96c0, 0x9d72, 0x5b71, 0x68e7,
-  0x6b98, 0x6f7a, 0x76de, 0x5c91, 0x66ab, 0x6f5b, 0x7bb4, 0x7c2a,
-  0x8836, 0x96dc, 0x4e08, 0x4ed7, 0x5320, 0x5834, 0x58bb, 0x58ef,
-  0x596c, 0x5c07, 0x5e33, 0x5e84, 0x5f35, 0x638c, 0x66b2, 0x6756,
-  0x6a1f, 0x6aa3, 0x6b0c, 0x6f3f, 0x7246, 0xf9fa, 0x7350, 0x748b,
-  0x7ae0, 0x7ca7, 0x8178, 0x81df, 0x81e7, 0x838a, 0x846c, 0x8523,
-  0x8594, 0x85cf, 0x88dd, 0x8d13, 0x91ac, 0x9577,
-  /* 0x6e */
-  0x969c, 0x518d, 0x54c9, 0x5728, 0x5bb0, 0x624d, 0x6750, 0x683d,
-  0x6893, 0x6e3d, 0x6ed3, 0x707d, 0x7e21, 0x88c1, 0x8ca1, 0x8f09,
-  0x9f4b, 0x9f4e, 0x722d, 0x7b8f, 0x8acd, 0x931a, 0x4f47, 0x4f4e,
-  0x5132, 0x5480, 0x59d0, 0x5e95, 0x62b5, 0x6775, 0x696e, 0x6a17,
-  0x6cae, 0x6e1a, 0x72d9, 0x732a, 0x75bd, 0x7bb8, 0x7d35, 0x82e7,
-  0x83f9, 0x8457, 0x85f7, 0x8a5b, 0x8caf, 0x8e87, 0x9019, 0x90b8,
-  0x96ce, 0x9f5f, 0x52e3, 0x540a, 0x5ae1, 0x5bc2, 0x6458, 0x6575,
-  0x6ef4, 0x72c4, 0xf9fb, 0x7684, 0x7a4d, 0x7b1b, 0x7c4d, 0x7e3e,
-  0x7fdf, 0x837b, 0x8b2b, 0x8cca, 0x8d64, 0x8de1, 0x8e5f, 0x8fea,
-  0x8ff9, 0x9069, 0x93d1, 0x4f43, 0x4f7a, 0x50b3, 0x5168, 0x5178,
-  0x524d, 0x526a, 0x5861, 0x587c, 0x5960, 0x5c08, 0x5c55, 0x5edb,
-  0x609b, 0x6230, 0x6813, 0x6bbf, 0x6c08, 0x6fb1,
-  /* 0x6f */
-  0x714e, 0x7420, 0x7530, 0x7538, 0x7551, 0x7672, 0x7b4c, 0x7b8b,
-  0x7bad, 0x7bc6, 0x7e8f, 0x8a6e, 0x8f3e, 0x8f49, 0x923f, 0x9293,
-  0x9322, 0x942b, 0x96fb, 0x985a, 0x986b, 0x991e, 0x5207, 0x622a,
-  0x6298, 0x6d59, 0x7664, 0x7aca, 0x7bc0, 0x7d76, 0x5360, 0x5cbe,
-  0x5e97, 0x6f38, 0x70b9, 0x7c98, 0x9711, 0x9b8e, 0x9ede, 0x63a5,
-  0x647a, 0x8776, 0x4e01, 0x4e95, 0x4ead, 0x505c, 0x5075, 0x5448,
-  0x59c3, 0x5b9a, 0x5e40, 0x5ead, 0x5ef7, 0x5f81, 0x60c5, 0x633a,
-  0x653f, 0x6574, 0x65cc, 0x6676, 0x6678, 0x67fe, 0x6968, 0x6a89,
-  0x6b63, 0x6c40, 0x6dc0, 0x6de8, 0x6e1f, 0x6e5e, 0x701e, 0x70a1,
-  0x738e, 0x73fd, 0x753a, 0x775b, 0x7887, 0x798e, 0x7a0b, 0x7a7d,
-  0x7cbe, 0x7d8e, 0x8247, 0x8a02, 0x8aea, 0x8c9e, 0x912d, 0x914a,
-  0x91d8, 0x9266, 0x92cc, 0x9320, 0x9706, 0x9756,
-  /* 0x70 */
-  0x975c, 0x9802, 0x9f0e, 0x5236, 0x5291, 0x557c, 0x5824, 0x5e1d,
-  0x5f1f, 0x608c, 0x63d0, 0x68af, 0x6fdf, 0x796d, 0x7b2c, 0x81cd,
-  0x85ba, 0x88fd, 0x8af8, 0x8e44, 0x918d, 0x9664, 0x969b, 0x973d,
-  0x984c, 0x9f4a, 0x4fce, 0x5146, 0x51cb, 0x52a9, 0x5632, 0x5f14,
-  0x5f6b, 0x63aa, 0x64cd, 0x65e9, 0x6641, 0x66fa, 0x66f9, 0x671d,
-  0x689d, 0x68d7, 0x69fd, 0x6f15, 0x6f6e, 0x7167, 0x71e5, 0x722a,
-  0x74aa, 0x773a, 0x7956, 0x795a, 0x79df, 0x7a20, 0x7a95, 0x7c97,
-  0x7cdf, 0x7d44, 0x7e70, 0x8087, 0x85fb, 0x86a4, 0x8a54, 0x8abf,
-  0x8d99, 0x8e81, 0x9020, 0x906d, 0x91e3, 0x963b, 0x96d5, 0x9ce5,
-  0x65cf, 0x7c07, 0x8db3, 0x93c3, 0x5b58, 0x5c0a, 0x5352, 0x62d9,
-  0x731d, 0x5027, 0x5b97, 0x5f9e, 0x60b0, 0x616b, 0x68d5, 0x6dd9,
-  0x742e, 0x7a2e, 0x7d42, 0x7d9c, 0x7e31, 0x816b,
-  /* 0x71 */
-  0x8e2a, 0x8e35, 0x937e, 0x9418, 0x4f50, 0x5750, 0x5de6, 0x5ea7,
-  0x632b, 0x7f6a, 0x4e3b, 0x4f4f, 0x4f8f, 0x505a, 0x59dd, 0x80c4,
-  0x546a, 0x5468, 0x55fe, 0x594f, 0x5b99, 0x5dde, 0x5eda, 0x665d,
-  0x6731, 0x67f1, 0x682a, 0x6ce8, 0x6d32, 0x6e4a, 0x6f8d, 0x70b7,
-  0x73e0, 0x7587, 0x7c4c, 0x7d02, 0x7d2c, 0x7da2, 0x821f, 0x86db,
-  0x8a3b, 0x8a85, 0x8d70, 0x8e8a, 0x8f33, 0x9031, 0x914e, 0x9152,
-  0x9444, 0x99d0, 0x7af9, 0x7ca5, 0x4fca, 0x5101, 0x51c6, 0x57c8,
-  0x5bef, 0x5cfb, 0x6659, 0x6a3d, 0x6d5a, 0x6e96, 0x6fec, 0x710c,
-  0x756f, 0x7ae3, 0x8822, 0x9021, 0x9075, 0x96cb, 0x99ff, 0x8301,
-  0x4e2d, 0x4ef2, 0x8846, 0x91cd, 0x537d, 0x6adb, 0x696b, 0x6c41,
-  0x847a, 0x589e, 0x618e, 0x66fe, 0x62ef, 0x70dd, 0x7511, 0x75c7,
-  0x7e52, 0x84b8, 0x8b49, 0x8d08, 0x4e4b, 0x53ea,
-  /* 0x72 */
-  0x54ab, 0x5730, 0x5740, 0x5fd7, 0x6301, 0x6307, 0x646f, 0x652f,
-  0x65e8, 0x667a, 0x679d, 0x67b3, 0x6b62, 0x6c60, 0x6c9a, 0x6f2c,
-  0x77e5, 0x7825, 0x7949, 0x7957, 0x7d19, 0x80a2, 0x8102, 0x81f3,
-  0x829d, 0x82b7, 0x8718, 0x8a8c, 0xf9fc, 0x8d04, 0x8dbe, 0x9072,
-  0x76f4, 0x7a19, 0x7a37, 0x7e54, 0x8077, 0x5507, 0x55d4, 0x5875,
-  0x632f, 0x6422, 0x6649, 0x664b, 0x686d, 0x699b, 0x6b84, 0x6d25,
-  0x6eb1, 0x73cd, 0x7468, 0x74a1, 0x755b, 0x75b9, 0x76e1, 0x771e,
-  0x778b, 0x79e6, 0x7e09, 0x7e1d, 0x81fb, 0x852f, 0x8897, 0x8a3a,
-  0x8cd1, 0x8eeb, 0x8fb0, 0x9032, 0x93ad, 0x9663, 0x9673, 0x9707,
-  0x4f84, 0x53f1, 0x59ea, 0x5ac9, 0x5e19, 0x684e, 0x74c6, 0x75be,
-  0x79e9, 0x7a92, 0x81a3, 0x86ed, 0x8cea, 0x8dcc, 0x8fed, 0x659f,
-  0x6715, 0xf9fd, 0x57f7, 0x6f57, 0x7ddd, 0x8f2f,
-  /* 0x73 */
-  0x93f6, 0x96c6, 0x5fb5, 0x61f2, 0x6f84, 0x4e14, 0x4f98, 0x501f,
-  0x53c9, 0x55df, 0x5d6f, 0x5dee, 0x6b21, 0x6b64, 0x78cb, 0x7b9a,
-  0xf9fe, 0x8e49, 0x8eca, 0x906e, 0x6349, 0x643e, 0x7740, 0x7a84,
-  0x932f, 0x947f, 0x9f6a, 0x64b0, 0x6faf, 0x71e6, 0x74a8, 0x74da,
-  0x7ac4, 0x7c12, 0x7e82, 0x7cb2, 0x7e98, 0x8b9a, 0x8d0a, 0x947d,
-  0x9910, 0x994c, 0x5239, 0x5bdf, 0x64e6, 0x672d, 0x7d2e, 0x50ed,
-  0x53c3, 0x5879, 0x6158, 0x6159, 0x61fa, 0x65ac, 0x7ad9, 0x8b92,
-  0x8b96, 0x5009, 0x5021, 0x5275, 0x5531, 0x5a3c, 0x5ee0, 0x5f70,
-  0x6134, 0x655e, 0x660c, 0x6636, 0x66a2, 0x69cd, 0x6ec4, 0x6f32,
-  0x7316, 0x7621, 0x7a93, 0x8139, 0x8259, 0x83d6, 0x84bc, 0x50b5,
-  0x57f0, 0x5bc0, 0x5be8, 0x5f69, 0x63a1, 0x7826, 0x7db5, 0x83dc,
-  0x8521, 0x91c7, 0x91f5, 0x518a, 0x67f5, 0x7b56,
-  /* 0x74 */
-  0x8cac, 0x51c4, 0x59bb, 0x60bd, 0x8655, 0x501c, 0xf9ff, 0x5254,
-  0x5c3a, 0x617d, 0x621a, 0x62d3, 0x64f2, 0x65a5, 0x6ecc, 0x7620,
-  0x810a, 0x8e60, 0x965f, 0x96bb, 0x4edf, 0x5343, 0x5598, 0x5929,
-  0x5ddd, 0x64c5, 0x6cc9, 0x6dfa, 0x7394, 0x7a7f, 0x821b, 0x85a6,
-  0x8ce4, 0x8e10, 0x9077, 0x91e7, 0x95e1, 0x9621, 0x97c6, 0x51f8,
-  0x54f2, 0x5586, 0x5fb9, 0x64a4, 0x6f88, 0x7db4, 0x8f1f, 0x8f4d,
-  0x9435, 0x50c9, 0x5c16, 0x6cbe, 0x6dfb, 0x751b, 0x77bb, 0x7c3d,
-  0x7c64, 0x8a79, 0x8ac2, 0x581e, 0x59be, 0x5e16, 0x6377, 0x7252,
-  0x758a, 0x776b, 0x8adc, 0x8cbc, 0x8f12, 0x5ef3, 0x6674, 0x6df8,
-  0x807d, 0x83c1, 0x8acb, 0x9751, 0x9bd6, 0xfa00, 0x5243, 0x66ff,
-  0x6d95, 0x6eef, 0x7de0, 0x8ae6, 0x902e, 0x905e, 0x9ad4, 0x521d,
-  0x527f, 0x54e8, 0x6194, 0x6284, 0x62db, 0x68a2,
-  /* 0x75 */
-  0x6912, 0x695a, 0x6a35, 0x7092, 0x7126, 0x785d, 0x7901, 0x790e,
-  0x79d2, 0x7a0d, 0x8096, 0x8278, 0x82d5, 0x8349, 0x8549, 0x8c82,
-  0x8d85, 0x9162, 0x918b, 0x91ae, 0x4fc3, 0x56d1, 0x71ed, 0x77d7,
-  0x8700, 0x89f8, 0x5bf8, 0x5fd6, 0x6751, 0x90a8, 0x53e2, 0x585a,
-  0x5bf5, 0x60a4, 0x6181, 0x6460, 0x7e3d, 0x8070, 0x8525, 0x9283,
-  0x64ae, 0x50ac, 0x5d14, 0x6700, 0x589c, 0x62bd, 0x63a8, 0x690e,
-  0x6978, 0x6a1e, 0x6e6b, 0x76ba, 0x79cb, 0x82bb, 0x8429, 0x8acf,
-  0x8da8, 0x8ffd, 0x9112, 0x914b, 0x919c, 0x9310, 0x9318, 0x939a,
-  0x96db, 0x9a36, 0x9c0d, 0x4e11, 0x755c, 0x795d, 0x7afa, 0x7b51,
-  0x7bc9, 0x7e2e, 0x84c4, 0x8e59, 0x8e74, 0x8ef8, 0x9010, 0x6625,
-  0x693f, 0x7443, 0x51fa, 0x672e, 0x9edc, 0x5145, 0x5fe0, 0x6c96,
-  0x87f2, 0x885d, 0x8877, 0x60b4, 0x81b5, 0x8403,
-  /* 0x76 */
-  0x8d05, 0x53d6, 0x5439, 0x5634, 0x5a36, 0x5c31, 0x708a, 0x7fe0,
-  0x805a, 0x8106, 0x81ed, 0x8da3, 0x9189, 0x9a5f, 0x9df2, 0x5074,
-  0x4ec4, 0x53a0, 0x60fb, 0x6e2c, 0x5c64, 0x4f88, 0x5024, 0x55e4,
-  0x5cd9, 0x5e5f, 0x6065, 0x6894, 0x6cbb, 0x6dc4, 0x71be, 0x75d4,
-  0x75f4, 0x7661, 0x7a1a, 0x7a49, 0x7dc7, 0x7dfb, 0x7f6e, 0x81f4,
-  0x86a9, 0x8f1c, 0x96c9, 0x99b3, 0x9f52, 0x5247, 0x52c5, 0x98ed,
-  0x89aa, 0x4e03, 0x67d2, 0x6f06, 0x4fb5, 0x5be2, 0x6795, 0x6c88,
-  0x6d78, 0x741b, 0x7827, 0x91dd, 0x937c, 0x87c4, 0x79e4, 0x7a31,
-  0x5feb, 0x4ed6, 0x54a4, 0x553e, 0x58ae, 0x59a5, 0x60f0, 0x6253,
-  0x62d6, 0x6736, 0x6955, 0x8235, 0x9640, 0x99b1, 0x99dd, 0x502c,
-  0x5353, 0x5544, 0x577c, 0xfa01, 0x6258, 0xfa02, 0x64e2, 0x666b,
-  0x67dd, 0x6fc1, 0x6fef, 0x7422, 0x7438, 0x8a17,
-  /* 0x77 */
-  0x9438, 0x5451, 0x5606, 0x5766, 0x5f48, 0x619a, 0x6b4e, 0x7058,
-  0x70ad, 0x7dbb, 0x8a95, 0x596a, 0x812b, 0x63a2, 0x7708, 0x803d,
-  0x8caa, 0x5854, 0x642d, 0x69bb, 0x5b95, 0x5e11, 0x6e6f, 0xfa03,
-  0x8569, 0x514c, 0x53f0, 0x592a, 0x6020, 0x614b, 0x6b86, 0x6c70,
-  0x6cf0, 0x7b1e, 0x80ce, 0x82d4, 0x8dc6, 0x90b0, 0x98b1, 0xfa04,
-  0x64c7, 0x6fa4, 0x6491, 0x6504, 0x514e, 0x5410, 0x571f, 0x8a0e,
-  0x615f, 0x6876, 0xfa05, 0x75db, 0x7b52, 0x7d71, 0x901a, 0x5806,
-  0x69cc, 0x817f, 0x892a, 0x9000, 0x9839, 0x5078, 0x5957, 0x59ac,
-  0x6295, 0x900f, 0x9b2a, 0x615d, 0x7279, 0x95d6, 0x5761, 0x5a46,
-  0x5df4, 0x628a, 0x64ad, 0x64fa, 0x6777, 0x6ce2, 0x6d3e, 0x722c,
-  0x7436, 0x7834, 0x7f77, 0x82ad, 0x8ddb, 0x9817, 0x5224, 0x5742,
-  0x677f, 0x7248, 0x74e3, 0x8ca9, 0x8fa6, 0x9211,
-  /* 0x78 */
-  0x962a, 0x516b, 0x53ed, 0x634c, 0x4f69, 0x5504, 0x6096, 0x6557,
-  0x6c9b, 0x6d7f, 0x724c, 0x72fd, 0x7a17, 0x8987, 0x8c9d, 0x5f6d,
-  0x6f8e, 0x70f9, 0x81a8, 0x610e, 0x4fbf, 0x504f, 0x6241, 0x7247,
-  0x7bc7, 0x7de8, 0x7fe9, 0x904d, 0x97ad, 0x9a19, 0x8cb6, 0x576a,
-  0x5e73, 0x67b0, 0x840d, 0x8a55, 0x5420, 0x5b16, 0x5e63, 0x5ee2,
-  0x5f0a, 0x6583, 0x80ba, 0x853d, 0x9589, 0x965b, 0x4f48, 0x5305,
-  0x530d, 0x530f, 0x5486, 0x54fa, 0x5703, 0x5e03, 0x6016, 0x629b,
-  0x62b1, 0x6355, 0xfa06, 0x6ce1, 0x6d66, 0x75b1, 0x7832, 0x80de,
-  0x812f, 0x82de, 0x8461, 0x84b2, 0x888d, 0x8912, 0x900b, 0x92ea,
-  0x98fd, 0x9b91, 0x5e45, 0x66b4, 0x66dd, 0x7011, 0x7206, 0xfa07,
-  0x4ff5, 0x527d, 0x5f6a, 0x6153, 0x6753, 0x6a19, 0x6f02, 0x74e2,
-  0x7968, 0x8868, 0x8c79, 0x98c7, 0x98c4, 0x9a43,
-  /* 0x79 */
-  0x54c1, 0x7a1f, 0x6953, 0x8af7, 0x8c4a, 0x98a8, 0x99ae, 0x5f7c,
-  0x62ab, 0x75b2, 0x76ae, 0x88ab, 0x907f, 0x9642, 0x5339, 0x5f3c,
-  0x5fc5, 0x6ccc, 0x73cc, 0x7562, 0x758b, 0x7b46, 0x82fe, 0x999d,
-  0x4e4f, 0x903c, 0x4e0b, 0x4f55, 0x53a6, 0x590f, 0x5ec8, 0x6630,
-  0x6cb3, 0x7455, 0x8377, 0x8766, 0x8cc0, 0x9050, 0x971e, 0x9c15,
-  0x58d1, 0x5b78, 0x8650, 0x8b14, 0x9db4, 0x5bd2, 0x6068, 0x608d,
-  0x65f1, 0x6c57, 0x6f22, 0x6fa3, 0x701a, 0x7f55, 0x7ff0, 0x9591,
-  0x9592, 0x9650, 0x97d3, 0x5272, 0x8f44, 0x51fd, 0x542b, 0x54b8,
-  0x5563, 0x558a, 0x6abb, 0x6db5, 0x7dd8, 0x8266, 0x929c, 0x9677,
-  0x9e79, 0x5408, 0x54c8, 0x76d2, 0x86e4, 0x95a4, 0x95d4, 0x965c,
-  0x4ea2, 0x4f09, 0x59ee, 0x5ae6, 0x5df7, 0x6052, 0x6297, 0x676d,
-  0x6841, 0x6c86, 0x6e2f, 0x7f38, 0x809b, 0x822a,
-  /* 0x7a */
-  0xfa08, 0xfa09, 0x9805, 0x4ea5, 0x5055, 0x54b3, 0x5793, 0x595a,
-  0x5b69, 0x5bb3, 0x61c8, 0x6977, 0x6d77, 0x7023, 0x87f9, 0x89e3,
-  0x8a72, 0x8ae7, 0x9082, 0x99ed, 0x9ab8, 0x52be, 0x6838, 0x5016,
-  0x5e78, 0x674f, 0x8347, 0x884c, 0x4eab, 0x5411, 0x56ae, 0x73e6,
-  0x9115, 0x97ff, 0x9909, 0x9957, 0x9999, 0x5653, 0x589f, 0x865b,
-  0x8a31, 0x61b2, 0x6af6, 0x737b, 0x8ed2, 0x6b47, 0x96aa, 0x9a57,
-  0x5955, 0x7200, 0x8d6b, 0x9769, 0x4fd4, 0x5cf4, 0x5f26, 0x61f8,
-  0x665b, 0x6ceb, 0x70ab, 0x7384, 0x73b9, 0x73fe, 0x7729, 0x774d,
-  0x7d43, 0x7d62, 0x7e23, 0x8237, 0x8852, 0xfa0a, 0x8ce2, 0x9249,
-  0x986f, 0x5b51, 0x7a74, 0x8840, 0x9801, 0x5acc, 0x4fe0, 0x5354,
-  0x593e, 0x5cfd, 0x633e, 0x6d79, 0x72f9, 0x8105, 0x8107, 0x83a2,
-  0x92cf, 0x9830, 0x4ea8, 0x5144, 0x5211, 0x578b,
-  /* 0x7b */
-  0x5f62, 0x6cc2, 0x6ece, 0x7005, 0x7050, 0x70af, 0x7192, 0x73e9,
-  0x7469, 0x834a, 0x87a2, 0x8861, 0x9008, 0x90a2, 0x93a3, 0x99a8,
-  0x516e, 0x5f57, 0x60e0, 0x6167, 0x66b3, 0x8559, 0x8e4a, 0x91af,
-  0x978b, 0x4e4e, 0x4e92, 0x547c, 0x58d5, 0x58fa, 0x597d, 0x5cb5,
-  0x5f27, 0x6236, 0x6248, 0x660a, 0x6667, 0x6beb, 0x6d69, 0x6dcf,
-  0x6e56, 0x6ef8, 0x6f94, 0x6fe0, 0x6fe9, 0x705d, 0x72d0, 0x7425,
-  0x745a, 0x74e0, 0x7693, 0x795c, 0x7cca, 0x7e1e, 0x80e1, 0x82a6,
-  0x846b, 0x84bf, 0x864e, 0x865f, 0x8774, 0x8b77, 0x8c6a, 0x93ac,
-  0x9800, 0x9865, 0x60d1, 0x6216, 0x9177, 0x5a5a, 0x660f, 0x6df7,
-  0x6e3e, 0x743f, 0x9b42, 0x5ffd, 0x60da, 0x7b0f, 0x54c4, 0x5f18,
-  0x6c5e, 0x6cd3, 0x6d2a, 0x70d8, 0x7d05, 0x8679, 0x8a0c, 0x9d3b,
-  0x5316, 0x548c, 0x5b05, 0x6a3a, 0x706b, 0x7575,
-  /* 0x7c */
-  0x798d, 0x79be, 0x82b1, 0x83ef, 0x8a71, 0x8b41, 0x8ca8, 0x9774,
-  0xfa0b, 0x64f4, 0x652b, 0x78ba, 0x78bb, 0x7a6b, 0x4e38, 0x559a,
-  0x5950, 0x5ba6, 0x5e7b, 0x60a3, 0x63db, 0x6b61, 0x6665, 0x6853,
-  0x6e19, 0x7165, 0x74b0, 0x7d08, 0x9084, 0x9a69, 0x9c25, 0x6d3b,
-  0x6ed1, 0x733e, 0x8c41, 0x95ca, 0x51f0, 0x5e4c, 0x5fa8, 0x604d,
-  0x60f6, 0x6130, 0x614c, 0x6643, 0x6644, 0x69a5, 0x6cc1, 0x6e5f,
-  0x6ec9, 0x6f62, 0x714c, 0x749c, 0x7687, 0x7bc1, 0x7c27, 0x8352,
-  0x8757, 0x9051, 0x968d, 0x9ec3, 0x532f, 0x56de, 0x5efb, 0x5f8a,
-  0x6062, 0x6094, 0x61f7, 0x6666, 0x6703, 0x6a9c, 0x6dee, 0x6fae,
-  0x7070, 0x736a, 0x7e6a, 0x81be, 0x8334, 0x86d4, 0x8aa8, 0x8cc4,
-  0x5283, 0x7372, 0x5b96, 0x6a6b, 0x9404, 0x54ee, 0x5686, 0x5b5d,
-  0x6548, 0x6585, 0x66c9, 0x689f, 0x6d8d, 0x6dc6,
-  /* 0x7d */
-  0x723b, 0x80b4, 0x9175, 0x9a4d, 0x4faf, 0x5019, 0x539a, 0x540e,
-  0x543c, 0x5589, 0x55c5, 0x5e3f, 0x5f8c, 0x673d, 0x7166, 0x73dd,
-  0x9005, 0x52db, 0x52f3, 0x5864, 0x58ce, 0x7104, 0x718f, 0x71fb,
-  0x85b0, 0x8a13, 0x6688, 0x85a8, 0x55a7, 0x6684, 0x714a, 0x8431,
-  0x5349, 0x5599, 0x6bc1, 0x5f59, 0x5fbd, 0x63ee, 0x6689, 0x7147,
-  0x8af1, 0x8f1d, 0x9ebe, 0x4f11, 0x643a, 0x70cb, 0x7566, 0x8667,
-  0x6064, 0x8b4e, 0x9df8, 0x5147, 0x51f6, 0x5308, 0x6d36, 0x80f8,
-  0x9ed1, 0x6615, 0x6b23, 0x7098, 0x75d5, 0x5403, 0x5c79, 0x7d07,
-  0x8a16, 0x6b20, 0x6b3d, 0x6b46, 0x5438, 0x6070, 0x6d3d, 0x7fd5,
-  0x8208, 0x50d6, 0x51de, 0x559c, 0x566b, 0x56cd, 0x59ec, 0x5b09,
-  0x5e0c, 0x6199, 0x6198, 0x6231, 0x665e, 0x66e6, 0x7199, 0x71b9,
-  0x71ba, 0x72a7, 0x79a7, 0x7a00, 0x7fb2, 0x8a70,
-};
-
-static int
-ksc5601_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c1 = s[0];
-  if ((c1 >= 0x21 && c1 <= 0x2c) || (c1 >= 0x30 && c1 <= 0x48) || (c1 >= 0x4a && c1 <= 0x7d)) {
-    if (n >= 2) {
-      unsigned char c2 = s[1];
-      if (c2 >= 0x21 && c2 < 0x7f) {
-        unsigned int i = 94 * (c1 - 0x21) + (c2 - 0x21);
-        unsigned short wc = 0xfffd;
-        if (i < 1410) {
-          if (i < 1115)
-            wc = ksc5601_2uni_page21[i];
-        } else if (i < 3854) {
-          if (i < 3760)
-            wc = ksc5601_2uni_page30[i-1410];
-        } else {
-          if (i < 8742)
-            wc = ksc5601_2uni_page4a[i-3854];
-        }
-        if (wc != 0xfffd) {
-          *pwc = (wchar_t) wc;
-          return 2;
-        }
-      }
-      return RET_ILSEQ;
-    }
-    return RET_TOOFEW(0);
-  }
-  return RET_ILSEQ;
-}
-
-static const unsigned short ksc5601_2charset[8224] = {
-  0x222e, 0x2234, 0x2157, 0x2127, 0x2823, 0x2129, 0x2146, 0x213e,
-  0x2977, 0x2978, 0x2225, 0x2252, 0x2124, 0x222c, 0x2976, 0x282c,
-  0x2879, 0x2876, 0x287a, 0x222f, 0x2821, 0x2822, 0x213f, 0x282a,
-  0x282d, 0x292c, 0x2921, 0x2923, 0x2140, 0x292a, 0x292d, 0x2922,
-  0x2824, 0x2924, 0x2925, 0x2826, 0x2926, 0x2927, 0x2828, 0x2928,
-  0x2829, 0x2929, 0x2930, 0x282f, 0x292f, 0x282b, 0x292b, 0x282e,
-  0x292e, 0x2227, 0x2230, 0x2228, 0x222b, 0x222a, 0x222d, 0x2229,
-  0x2541, 0x2542, 0x2543, 0x2544, 0x2545, 0x2546, 0x2547, 0x2548,
-  0x2549, 0x254a, 0x254b, 0x254c, 0x254d, 0x254e, 0x254f, 0x2550,
-  0x2551, 0x2552, 0x2553, 0x2554, 0x2555, 0x2556, 0x2557, 0x2558,
-  0x2561, 0x2562, 0x2563, 0x2564, 0x2565, 0x2566, 0x2567, 0x2568,
-  0x2569, 0x256a, 0x256b, 0x256c, 0x256d, 0x256e, 0x256f, 0x2570,
-  0x2571, 0x2572, 0x2573, 0x2574, 0x2575, 0x2576, 0x2577, 0x2578,
-  0x2c27, 0x2c21, 0x2c22, 0x2c23, 0x2c24, 0x2c25, 0x2c26, 0x2c28,
-  0x2c29, 0x2c2a, 0x2c2b, 0x2c2c, 0x2c2d, 0x2c2e, 0x2c2f, 0x2c30,
-  0x2c31, 0x2c32, 0x2c33, 0x2c34, 0x2c35, 0x2c36, 0x2c37, 0x2c38,
-  0x2c39, 0x2c3a, 0x2c3b, 0x2c3c, 0x2c3d, 0x2c3e, 0x2c3f, 0x2c40,
-  0x2c41, 0x2c51, 0x2c52, 0x2c53, 0x2c54, 0x2c55, 0x2c56, 0x2c58,
-  0x2c59, 0x2c5a, 0x2c5b, 0x2c5c, 0x2c5d, 0x2c5e, 0x2c5f, 0x2c60,
-  0x2c61, 0x2c62, 0x2c63, 0x2c64, 0x2c65, 0x2c66, 0x2c67, 0x2c68,
-  0x2c69, 0x2c6a, 0x2c6b, 0x2c6c, 0x2c6d, 0x2c6e, 0x2c6f, 0x2c70,
-  0x2c71, 0x2c57, 0x212a, 0x212e, 0x212f, 0x2130, 0x2131, 0x2253,
-  0x2254, 0x2125, 0x2126, 0x2236, 0x2147, 0x2148, 0x2158, 0x2979,
-  0x297a, 0x297b, 0x297c, 0x297d, 0x297e, 0x2149, 0x2235, 0x2724,
-  0x2260, 0x2265, 0x2262, 0x2759, 0x214a, 0x2877, 0x2878, 0x287b,
-  0x287c, 0x287d, 0x287e, 0x2530, 0x2531, 0x2532, 0x2533, 0x2534,
-  0x2535, 0x2536, 0x2537, 0x2538, 0x2539, 0x2521, 0x2522, 0x2523,
-  0x2524, 0x2525, 0x2526, 0x2527, 0x2528, 0x2529, 0x252a, 0x2167,
-  0x2168, 0x2166, 0x2169, 0x216a, 0x2255, 0x2258, 0x2256, 0x2259,
-  0x2257, 0x2221, 0x2222, 0x2223, 0x2153, 0x2224, 0x2154, 0x2174,
-  0x2175, 0x2233, 0x2232, 0x216e, 0x2170, 0x2144, 0x2150, 0x212b,
-  0x217c, 0x217d, 0x217b, 0x217a, 0x2172, 0x2173, 0x2231, 0x2145,
-  0x2171, 0x212d, 0x216f, 0x2156, 0x2141, 0x2155, 0x2142, 0x2143,
-  0x216c, 0x216d, 0x2178, 0x2179, 0x2176, 0x2177, 0x2241, 0x2151,
-  0x2152, 0x2867, 0x2868, 0x2869, 0x286a, 0x286b, 0x286c, 0x286d,
-  0x286e, 0x286f, 0x2870, 0x2871, 0x2872, 0x2873, 0x2874, 0x2875,
-  0x2967, 0x2968, 0x2969, 0x296a, 0x296b, 0x296c, 0x296d, 0x296e,
-  0x296f, 0x2970, 0x2971, 0x2972, 0x2973, 0x2974, 0x2975, 0x294d,
-  0x294e, 0x294f, 0x2950, 0x2951, 0x2952, 0x2953, 0x2954, 0x2955,
-  0x2956, 0x2957, 0x2958, 0x2959, 0x295a, 0x295b, 0x295c, 0x295d,
-  0x295e, 0x295f, 0x2960, 0x2961, 0x2962, 0x2963, 0x2964, 0x2965,
-  0x2966, 0x284d, 0x284e, 0x284f, 0x2850, 0x2851, 0x2852, 0x2853,
-  0x2854, 0x2855, 0x2856, 0x2857, 0x2858, 0x2859, 0x285a, 0x285b,
-  0x285c, 0x285d, 0x285e, 0x285f, 0x2860, 0x2861, 0x2862, 0x2863,
-  0x2864, 0x2865, 0x2866, 0x2621, 0x262c, 0x2622, 0x262d, 0x2623,
-  0x2648, 0x2647, 0x262e, 0x2624, 0x2642, 0x2641, 0x262f, 0x2626,
-  0x2646, 0x2645, 0x2631, 0x2625, 0x2644, 0x2643, 0x2630, 0x2627,
-  0x263c, 0x2649, 0x264a, 0x2637, 0x264b, 0x264c, 0x2632, 0x2629,
-  0x263e, 0x264d, 0x264e, 0x2639, 0x264f, 0x2650, 0x2634, 0x2628,
-  0x2651, 0x2652, 0x2638, 0x263d, 0x2653, 0x2654, 0x2633, 0x262a,
-  0x2655, 0x2656, 0x263a, 0x263f, 0x2657, 0x2658, 0x2635, 0x262b,
-  0x2659, 0x265a, 0x263b, 0x265b, 0x265c, 0x2640, 0x265d, 0x265e,
-  0x265f, 0x2660, 0x2661, 0x2662, 0x2663, 0x2664, 0x2636, 0x2246,
-  0x2161, 0x2160, 0x2243, 0x2247, 0x2248, 0x224b, 0x224a, 0x2249,
-  0x224c, 0x2163, 0x2162, 0x223a, 0x2239, 0x2165, 0x2164, 0x2238,
-  0x2237, 0x215f, 0x215e, 0x2242, 0x215b, 0x215d, 0x215c, 0x2244,
-  0x2245, 0x215a, 0x2159, 0x224f, 0x224e, 0x2250, 0x2251, 0x214f,
-  0x214e, 0x223c, 0x223d, 0x2240, 0x223b, 0x223e, 0x223f, 0x224d,
-  0x225b, 0x225c, 0x225d, 0x225a, 0x2121, 0x2122, 0x2123, 0x2128,
-  0x2134, 0x2135, 0x2136, 0x2137, 0x2138, 0x2139, 0x213a, 0x213b,
-  0x213c, 0x213d, 0x216b, 0x2132, 0x2133, 0x2a21, 0x2a22, 0x2a23,
-  0x2a24, 0x2a25, 0x2a26, 0x2a27, 0x2a28, 0x2a29, 0x2a2a, 0x2a2b,
-  0x2a2c, 0x2a2d, 0x2a2e, 0x2a2f, 0x2a30, 0x2a31, 0x2a32, 0x2a33,
-  0x2a34, 0x2a35, 0x2a36, 0x2a37, 0x2a38, 0x2a39, 0x2a3a, 0x2a3b,
-  0x2a3c, 0x2a3d, 0x2a3e, 0x2a3f, 0x2a40, 0x2a41, 0x2a42, 0x2a43,
-  0x2a44, 0x2a45, 0x2a46, 0x2a47, 0x2a48, 0x2a49, 0x2a4a, 0x2a4b,
-  0x2a4c, 0x2a4d, 0x2a4e, 0x2a4f, 0x2a50, 0x2a51, 0x2a52, 0x2a53,
-  0x2a54, 0x2a55, 0x2a56, 0x2a57, 0x2a58, 0x2a59, 0x2a5a, 0x2a5b,
-  0x2a5c, 0x2a5d, 0x2a5e, 0x2a5f, 0x2a60, 0x2a61, 0x2a62, 0x2a63,
-  0x2a64, 0x2a65, 0x2a66, 0x2a67, 0x2a68, 0x2a69, 0x2a6a, 0x2a6b,
-  0x2a6c, 0x2a6d, 0x2a6e, 0x2a6f, 0x2a70, 0x2a71, 0x2a72, 0x2a73,
-  0x2b21, 0x2b22, 0x2b23, 0x2b24, 0x2b25, 0x2b26, 0x2b27, 0x2b28,
-  0x2b29, 0x2b2a, 0x2b2b, 0x2b2c, 0x2b2d, 0x2b2e, 0x2b2f, 0x2b30,
-  0x2b31, 0x2b32, 0x2b33, 0x2b34, 0x2b35, 0x2b36, 0x2b37, 0x2b38,
-  0x2b39, 0x2b3a, 0x2b3b, 0x2b3c, 0x2b3d, 0x2b3e, 0x2b3f, 0x2b40,
-  0x2b41, 0x2b42, 0x2b43, 0x2b44, 0x2b45, 0x2b46, 0x2b47, 0x2b48,
-  0x2b49, 0x2b4a, 0x2b4b, 0x2b4c, 0x2b4d, 0x2b4e, 0x2b4f, 0x2b50,
-  0x2b51, 0x2b52, 0x2b53, 0x2b54, 0x2b55, 0x2b56, 0x2b57, 0x2b58,
-  0x2b59, 0x2b5a, 0x2b5b, 0x2b5c, 0x2b5d, 0x2b5e, 0x2b5f, 0x2b60,
-  0x2b61, 0x2b62, 0x2b63, 0x2b64, 0x2b65, 0x2b66, 0x2b67, 0x2b68,
-  0x2b69, 0x2b6a, 0x2b6b, 0x2b6c, 0x2b6d, 0x2b6e, 0x2b6f, 0x2b70,
-  0x2b71, 0x2b72, 0x2b73, 0x2b74, 0x2b75, 0x2b76, 0x2421, 0x2422,
-  0x2423, 0x2424, 0x2425, 0x2426, 0x2427, 0x2428, 0x2429, 0x242a,
-  0x242b, 0x242c, 0x242d, 0x242e, 0x242f, 0x2430, 0x2431, 0x2432,
-  0x2433, 0x2434, 0x2435, 0x2436, 0x2437, 0x2438, 0x2439, 0x243a,
-  0x243b, 0x243c, 0x243d, 0x243e, 0x243f, 0x2440, 0x2441, 0x2442,
-  0x2443, 0x2444, 0x2445, 0x2446, 0x2447, 0x2448, 0x2449, 0x244a,
-  0x244b, 0x244c, 0x244d, 0x244e, 0x244f, 0x2450, 0x2451, 0x2452,
-  0x2453, 0x2454, 0x2455, 0x2456, 0x2457, 0x2458, 0x2459, 0x245a,
-  0x245b, 0x245c, 0x245d, 0x245e, 0x245f, 0x2460, 0x2461, 0x2462,
-  0x2463, 0x2464, 0x2465, 0x2466, 0x2467, 0x2468, 0x2469, 0x246a,
-  0x246b, 0x246c, 0x246d, 0x246e, 0x246f, 0x2470, 0x2471, 0x2472,
-  0x2473, 0x2474, 0x2475, 0x2476, 0x2477, 0x2478, 0x2479, 0x247a,
-  0x247b, 0x247c, 0x247d, 0x247e, 0x2931, 0x2932, 0x2933, 0x2934,
-  0x2935, 0x2936, 0x2937, 0x2938, 0x2939, 0x293a, 0x293b, 0x293c,
-  0x293d, 0x293e, 0x293f, 0x2940, 0x2941, 0x2942, 0x2943, 0x2944,
-  0x2945, 0x2946, 0x2947, 0x2948, 0x2949, 0x294a, 0x294b, 0x294c,
-  0x225f, 0x2831, 0x2832, 0x2833, 0x2834, 0x2835, 0x2836, 0x2837,
-  0x2838, 0x2839, 0x283a, 0x283b, 0x283c, 0x283d, 0x283e, 0x283f,
-  0x2840, 0x2841, 0x2842, 0x2843, 0x2844, 0x2845, 0x2846, 0x2847,
-  0x2848, 0x2849, 0x284a, 0x284b, 0x284c, 0x225e, 0x2749, 0x274a,
-  0x274b, 0x274c, 0x274d, 0x273a, 0x273b, 0x275c, 0x275d, 0x275e,
-  0x2736, 0x2737, 0x2738, 0x2754, 0x2755, 0x2756, 0x2757, 0x2758,
-  0x2721, 0x2722, 0x2723, 0x2725, 0x272b, 0x272c, 0x272d, 0x272e,
-  0x272f, 0x2730, 0x2731, 0x2732, 0x2733, 0x2734, 0x2727, 0x2728,
-  0x2729, 0x272a, 0x273d, 0x273e, 0x2765, 0x2766, 0x2767, 0x2768,
-  0x2761, 0x2762, 0x2763, 0x273f, 0x2740, 0x2741, 0x2742, 0x2743,
-  0x2744, 0x2745, 0x2746, 0x2747, 0x2748, 0x274e, 0x274f, 0x2750,
-  0x2751, 0x2752, 0x2753, 0x275a, 0x275b, 0x2263, 0x276c, 0x2726,
-  0x2760, 0x276f, 0x2261, 0x273c, 0x276d, 0x2735, 0x2739, 0x276a,
-  0x276b, 0x275f, 0x2264, 0x2764, 0x276e, 0x2769, 0x6c69, 0x6f4b,
-  0x7652, 0x5832, 0x6d5b, 0x5f32, 0x5f3e, 0x793b, 0x5c74, 0x7564,
-  0x7326, 0x5d60, 0x6126, 0x4e78, 0x5c30, 0x632a, 0x7169, 0x4d7a,
-  0x7c2f, 0x5321, 0x712b, 0x6751, 0x522c, 0x4e79, 0x717d, 0x5e3f,
-  0x7b3a, 0x7939, 0x4e52, 0x632b, 0x6b60, 0x4e7a, 0x4b77, 0x6525,
-  0x4a61, 0x544c, 0x6a61, 0x5c63, 0x5f2d, 0x4b6b, 0x552f, 0x5675,
-  0x6578, 0x5e40, 0x6c23, 0x694d, 0x6a27, 0x6976, 0x7b3b, 0x6769,
-  0x6f4c, 0x5066, 0x5e41, 0x642c, 0x584c, 0x7971, 0x4e5f, 0x7a24,
-  0x6632, 0x7a7b, 0x7a3d, 0x4c48, 0x6f4d, 0x5555, 0x5322, 0x6c51,
-  0x6427, 0x6c52, 0x7631, 0x4e7b, 0x5051, 0x4b3f, 0x6d24, 0x6d28,
-  0x5e42, 0x7662, 0x6d5c, 0x5c75, 0x6039, 0x544e, 0x7435, 0x535b,
-  0x5635, 0x6c24, 0x6466, 0x716a, 0x4b6c, 0x4b40, 0x6c72, 0x506a,
-  0x7972, 0x6c25, 0x505f, 0x676a, 0x506b, 0x5c51, 0x5b69, 0x7d4c,
-  0x5b57, 0x5a61, 0x5636, 0x635f, 0x5e43, 0x5e44, 0x4a21, 0x6e6c,
-  0x5323, 0x6e37, 0x784f, 0x6a48, 0x6e38, 0x712c, 0x7125, 0x694e,
-  0x793c, 0x6579, 0x6c6a, 0x5d56, 0x6d42, 0x7825, 0x653a, 0x5b58,
-  0x4a22, 0x514d, 0x6e6d, 0x6c6b, 0x5e45, 0x6360, 0x4a49, 0x7269,
-  0x554e, 0x7636, 0x4e42, 0x5647, 0x6334, 0x712d, 0x6a62, 0x5742,
-  0x7327, 0x4d6a, 0x6b6e, 0x5932, 0x7d25, 0x7655, 0x5562, 0x7835,
-  0x4c75, 0x7535, 0x642d, 0x676b, 0x7155, 0x703b, 0x6935, 0x4c49,
-  0x7a55, 0x6154, 0x5756, 0x5c41, 0x5e46, 0x7a6f, 0x6361, 0x6173,
-  0x5c76, 0x4e7c, 0x5b44, 0x7871, 0x5c64, 0x656f, 0x5c31, 0x5556,
-  0x735a, 0x4b41, 0x5b43, 0x597a, 0x536e, 0x7a38, 0x7d26, 0x6b6f,
-  0x7426, 0x4c4a, 0x7328, 0x735b, 0x5b27, 0x7637, 0x4f66, 0x7072,
-  0x4b5a, 0x6752, 0x5743, 0x7670, 0x685e, 0x6526, 0x6567, 0x4a23,
-  0x4c27, 0x6a49, 0x7836, 0x7a25, 0x712e, 0x6f4e, 0x4b6d, 0x7630,
-  0x6f4f, 0x694f, 0x775e, 0x4e53, 0x5c77, 0x5b28, 0x4b78, 0x5f21,
-  0x5d61, 0x754a, 0x6936, 0x676c, 0x6e6e, 0x7370, 0x5f3f, 0x4c4b,
-  0x5041, 0x7452, 0x603a, 0x5f40, 0x4e60, 0x5c52, 0x7d6a, 0x5676,
-  0x6a4a, 0x6869, 0x632c, 0x7350, 0x4a24, 0x5b78, 0x5e47, 0x6b70,
-  0x7156, 0x6562, 0x4c4c, 0x4b7b, 0x6a63, 0x5f41, 0x566d, 0x6950,
-  0x6e39, 0x5563, 0x5153, 0x6570, 0x6834, 0x6b43, 0x6a2a, 0x7a7c,
-  0x7576, 0x703c, 0x7d54, 0x603b, 0x4e43, 0x503a, 0x773a, 0x5873,
-  0x774d, 0x642e, 0x545f, 0x5067, 0x6c7d, 0x522e, 0x6e6f, 0x5557,
-  0x6a64, 0x7822, 0x4d6b, 0x573f, 0x7b31, 0x4d6c, 0x5c32, 0x506c,
-  0x4e7d, 0x6e70, 0x4c42, 0x506d, 0x6577, 0x737c, 0x6e22, 0x5933,
-  0x5874, 0x6937, 0x4e2e, 0x5922, 0x5871, 0x544f, 0x6527, 0x5552,
-  0x5629, 0x7422, 0x7157, 0x5558, 0x703d, 0x5750, 0x5450, 0x574f,
-  0x6b6a, 0x7d6b, 0x5b6d, 0x7c45, 0x4b42, 0x7d55, 0x7448, 0x686a,
-  0x7573, 0x795e, 0x536f, 0x6c53, 0x5d42, 0x6f37, 0x6754, 0x4a4a,
-  0x597b, 0x7a7d, 0x562a, 0x7478, 0x7777, 0x5c2c, 0x5757, 0x5f22,
-  0x4e3e, 0x5370, 0x7024, 0x616c, 0x4f67, 0x734b, 0x6d29, 0x4a3e,
-  0x746f, 0x764e, 0x5e7b, 0x503b, 0x5537, 0x6e71, 0x7428, 0x5c78,
-  0x4b27, 0x5a4e, 0x6066, 0x6d25, 0x6e72, 0x5c79, 0x795c, 0x735c,
-  0x7872, 0x7479, 0x7c71, 0x503c, 0x5b79, 0x5731, 0x4b7c, 0x7025,
-  0x4b7d, 0x5574, 0x4d6d, 0x4a25, 0x562b, 0x5042, 0x703e, 0x523d,
-  0x4c24, 0x7a36, 0x4c4d, 0x5a7a, 0x764f, 0x6938, 0x5875, 0x4c4e,
-  0x574d, 0x5451, 0x696d, 0x4a6b, 0x5962, 0x7d32, 0x632d, 0x564c,
-  0x5934, 0x6127, 0x6e53, 0x5043, 0x7d33, 0x5564, 0x4f68, 0x6d43,
-  0x5032, 0x4e7e, 0x5a28, 0x7850, 0x7d56, 0x7851, 0x7852, 0x5c53,
-  0x5d62, 0x7b79, 0x5d41, 0x6335, 0x6d5d, 0x4e44, 0x4b21, 0x5d63,
-  0x7c5d, 0x792f, 0x527b, 0x4f21, 0x6428, 0x7436, 0x6c7e, 0x632e,
-  0x676d, 0x7d41, 0x5a62, 0x5833, 0x5d64, 0x706f, 0x7671, 0x7a70,
-  0x5175, 0x5a4f, 0x5c54, 0x5c26, 0x6f3f, 0x4e4f, 0x6059, 0x5956,
-  0x6c54, 0x6a4b, 0x4a3f, 0x5530, 0x4f69, 0x716d, 0x4c4f, 0x6478,
-  0x646d, 0x5758, 0x7d27, 0x6a2b, 0x7632, 0x4f70, 0x793d, 0x6674,
-  0x4b5b, 0x7351, 0x6951, 0x7329, 0x5060, 0x6952, 0x5a63, 0x6252,
-  0x7622, 0x6174, 0x5a64, 0x6755, 0x753f, 0x4f22, 0x4d2f, 0x4f23,
-  0x4d30, 0x717e, 0x5023, 0x612f, 0x7823, 0x4a26, 0x773b, 0x726a,
-  0x5e48, 0x6953, 0x5e49, 0x7d5e, 0x4a40, 0x796a, 0x514e, 0x6e54,
-  0x5452, 0x5923, 0x7d28, 0x5759, 0x774e, 0x7a3e, 0x4f56, 0x5770,
-  0x6b61, 0x7845, 0x5c7a, 0x5d43, 0x795f, 0x676f, 0x7d65, 0x7623,
-  0x597c, 0x7d29, 0x676e, 0x5565, 0x6f50, 0x4d31, 0x7722, 0x7132,
-  0x7131, 0x4d32, 0x5a2b, 0x4a27, 0x6362, 0x7b3c, 0x5924, 0x6e3a,
-  0x7853, 0x7b7a, 0x4f24, 0x5c7b, 0x7663, 0x6d2a, 0x7221, 0x4e61,
-  0x7a26, 0x7960, 0x6c56, 0x646e, 0x7921, 0x7b6f, 0x796b, 0x6e23,
-  0x6a2c, 0x4a28, 0x747a, 0x4d56, 0x7c76, 0x7449, 0x7854, 0x7826,
-  0x5e4a, 0x7246, 0x575a, 0x5350, 0x5845, 0x6a66, 0x735d, 0x645a,
-  0x7664, 0x7672, 0x5f42, 0x597d, 0x4c76, 0x533a, 0x642f, 0x7961,
-  0x7026, 0x4b53, 0x603c, 0x744a, 0x547a, 0x7d2a, 0x7962, 0x7437,
-  0x7d42, 0x7c30, 0x7d6c, 0x4a62, 0x7d3d, 0x6a67, 0x5f43, 0x5152,
-  0x4e62, 0x5324, 0x7d2b, 0x5f60, 0x7247, 0x6770, 0x506e, 0x732a,
-  0x5e4b, 0x7638, 0x6175, 0x7133, 0x7723, 0x4a29, 0x4f25, 0x5f44,
-  0x6130, 0x703f, 0x7624, 0x6336, 0x7a46, 0x506f, 0x7d6d, 0x5d44,
-  0x7c77, 0x663f, 0x5e2d, 0x7a3f, 0x6571, 0x6d44, 0x5225, 0x7d6e,
-  0x7536, 0x6176, 0x5e4c, 0x7c5e, 0x6c57, 0x4d5d, 0x5637, 0x4d33,
-  0x7855, 0x6558, 0x4f6a, 0x4f50, 0x6a4c, 0x6a2e, 0x6a2d, 0x5371,
-  0x5325, 0x774f, 0x6e24, 0x5024, 0x7222, 0x5070, 0x7223, 0x7778,
-  0x5033, 0x5b29, 0x533b, 0x4a6c, 0x7126, 0x4b55, 0x7767, 0x4d5e,
-  0x7724, 0x7840, 0x535d, 0x4c50, 0x4f26, 0x7673, 0x6177, 0x535c,
-  0x7a7e, 0x7a27, 0x6b59, 0x4f27, 0x6a2f, 0x646f, 0x6939, 0x7158,
-  0x5858, 0x6072, 0x6634, 0x5c7c, 0x7371, 0x6350, 0x727b, 0x5b46,
-  0x5071, 0x5072, 0x4f5c, 0x5351, 0x4c31, 0x7758, 0x4b28, 0x6b3c,
-  0x643e, 0x745c, 0x5c42, 0x7027, 0x6640, 0x4a6d, 0x686b, 0x6568,
-  0x5c43, 0x6d5e, 0x5372, 0x4c77, 0x4e54, 0x672b, 0x4b43, 0x6131,
-  0x7732, 0x5373, 0x5352, 0x7540, 0x5f5d, 0x6e73, 0x6771, 0x7d34,
-  0x7248, 0x7352, 0x6e74, 0x6253, 0x4c51, 0x5f6a, 0x693a, 0x5957,
-  0x754d, 0x7172, 0x7a47, 0x5978, 0x5442, 0x7665, 0x5d45, 0x6772,
-  0x6d5f, 0x4a4b, 0x5b7a, 0x6835, 0x5326, 0x7d35, 0x7949, 0x6462,
-  0x7b3d, 0x5724, 0x4e45, 0x4e55, 0x5666, 0x653d, 0x5e4d, 0x6c73,
-  0x6d60, 0x6c6c, 0x7b3e, 0x5f6b, 0x6178, 0x793e, 0x5073, 0x602a,
-  0x6862, 0x6254, 0x527d, 0x6528, 0x5953, 0x535e, 0x7438, 0x773c,
-  0x5c7d, 0x686c, 0x6467, 0x6377, 0x6c28, 0x7a71, 0x6572, 0x5074,
-  0x522f, 0x5c65, 0x5025, 0x7134, 0x7c31, 0x4c78, 0x5d46, 0x7a51,
-  0x775f, 0x7a28, 0x6e75, 0x5e4e, 0x6773, 0x772c, 0x6b44, 0x6d61,
-  0x602b, 0x5d47, 0x5233, 0x523f, 0x4a4c, 0x7b3f, 0x657d, 0x5d65,
-  0x584d, 0x6c74, 0x5075, 0x686d, 0x5052, 0x5958, 0x7666, 0x5b2a,
-  0x7760, 0x5859, 0x7423, 0x745d, 0x6f51, 0x5935, 0x6d2b, 0x6337,
-  0x6e3b, 0x4d34, 0x6073, 0x6a4d, 0x6c75, 0x686e, 0x4b29, 0x712f,
-  0x4a4d, 0x6c29, 0x726b, 0x7d6f, 0x7973, 0x6641, 0x6c58, 0x6d2c,
-  0x6a4e, 0x685f, 0x5e4f, 0x5226, 0x6774, 0x5156, 0x6642, 0x6363,
-  0x6430, 0x5834, 0x7625, 0x735e, 0x5725, 0x7768, 0x6846, 0x7b66,
-  0x5d66, 0x5c7e, 0x585a, 0x5a2c, 0x6a30, 0x6338, 0x4a2a, 0x6179,
-  0x6a31, 0x726c, 0x7a6e, 0x6e55, 0x7974, 0x526c, 0x7b7b, 0x7d70,
-  0x603d, 0x4e63, 0x7846, 0x5e2e, 0x5f45, 0x653e, 0x6d2d, 0x7a6a,
-  0x4d6e, 0x6d26, 0x6d2e, 0x706d, 0x5d21, 0x6d2f, 0x7c78, 0x586b,
-  0x4c79, 0x4d35, 0x7a29, 0x615d, 0x6255, 0x6d4f, 0x5d22, 0x794a,
-  0x6a68, 0x656d, 0x536b, 0x6954, 0x617a, 0x644c, 0x6164, 0x6847,
-  0x4e5b, 0x5c55, 0x7735, 0x7c73, 0x7073, 0x4e2f, 0x7135, 0x6f52,
-  0x6848, 0x6b71, 0x4b54, 0x603e, 0x6378, 0x6a69, 0x7c32, 0x6074,
-  0x4f60, 0x6e25, 0x7a2a, 0x6643, 0x6132, 0x4a2b, 0x6364, 0x693b,
-  0x6256, 0x7372, 0x6e56, 0x6a32, 0x5076, 0x6c59, 0x5a4b, 0x4f28,
-  0x5d23, 0x585b, 0x794e, 0x6955, 0x6351, 0x523c, 0x582c, 0x734c,
-  0x4d7b, 0x7656, 0x6775, 0x686f, 0x6379, 0x523b, 0x7373, 0x637b,
-  0x5e50, 0x4e30, 0x5677, 0x7159, 0x7541, 0x5c44, 0x753b, 0x5e51,
-  0x5c66, 0x5e52, 0x6d62, 0x6e76, 0x6a4f, 0x706e, 0x637c, 0x535f,
-  0x5374, 0x6133, 0x6134, 0x7453, 0x5f46, 0x6956, 0x5b2b, 0x7626,
-  0x6339, 0x6b45, 0x7429, 0x4d36, 0x5279, 0x5a2d, 0x5263, 0x4f51,
-  0x4b5c, 0x4c7a, 0x4f5d, 0x6829, 0x633b, 0x633a, 0x605a, 0x6e77,
-  0x5c33, 0x5375, 0x5726, 0x7635, 0x575b, 0x6155, 0x546a, 0x5f23,
-  0x7d5f, 0x5077, 0x6d54, 0x4b2a, 0x645b, 0x617b, 0x4b22, 0x5360,
-  0x643f, 0x7b40, 0x5a3e, 0x644d, 0x5639, 0x6f40, 0x617c, 0x7639,
-  0x5f47, 0x6431, 0x5c67, 0x5c68, 0x7a56, 0x5376, 0x715a, 0x7a72,
-  0x627d, 0x554f, 0x5078, 0x4d5f, 0x754b, 0x6470, 0x4b2b, 0x5744,
-  0x627e, 0x5d5a, 0x5a2e, 0x4a6e, 0x5539, 0x6321, 0x6863, 0x732b,
-  0x4f29, 0x5377, 0x5471, 0x4e64, 0x6872, 0x6575, 0x672e, 0x563a,
-  0x5f6c, 0x6440, 0x6864, 0x5835, 0x645c, 0x7439, 0x7136, 0x625e,
-  0x6135, 0x4d6f, 0x7127, 0x4e65, 0x4b5d, 0x5963, 0x732c, 0x5079,
-  0x6c2b, 0x5e53, 0x7769, 0x7975, 0x615e, 0x4b6e, 0x633c, 0x7856,
-  0x5b6e, 0x7d71, 0x7736, 0x745e, 0x726d, 0x5b59, 0x7028, 0x617d,
-  0x5e54, 0x602c, 0x6d63, 0x5361, 0x5f48, 0x5936, 0x7d2c, 0x6f53,
-  0x6441, 0x786b, 0x5b2c, 0x7c46, 0x582d, 0x763a, 0x5b5f, 0x5353,
-  0x7847, 0x4a4e, 0x7841, 0x5234, 0x5c34, 0x7a39, 0x4a4f, 0x7c33,
-  0x6a6a, 0x6a6b, 0x507a, 0x6d64, 0x5d67, 0x5f49, 0x5f6d, 0x6e3c,
-  0x6f41, 0x4c52, 0x5d24, 0x5f4a, 0x5378, 0x7128, 0x4d37, 0x6f54,
-  0x645d, 0x5f6e, 0x4b2c, 0x693c, 0x6a6c, 0x5f4b, 0x793f, 0x562f,
-  0x5546, 0x4f2a, 0x4e29, 0x5678, 0x7137, 0x6e78, 0x5959, 0x735f,
-  0x7848, 0x4e46, 0x5566, 0x7466, 0x6645, 0x6f55, 0x4b6f, 0x7c5f,
-  0x5c27, 0x5667, 0x7849, 0x6352, 0x633d, 0x4f61, 0x7040, 0x6c5a,
-  0x5d57, 0x7b70, 0x6c2c, 0x7029, 0x7a57, 0x7b41, 0x5240, 0x6530,
-  0x6d65, 0x4b2d, 0x7930, 0x7725, 0x4b2e, 0x5a2f, 0x5836, 0x5327,
-  0x7b32, 0x7d44, 0x6c2d, 0x7b21, 0x6569, 0x696e, 0x7374, 0x7873,
-  0x7041, 0x5e2f, 0x7830, 0x7360, 0x672f, 0x5b2d, 0x6635, 0x7928,
-  0x5d58, 0x6859, 0x6f56, 0x5362, 0x625f, 0x7c60, 0x5748, 0x7d2d,
-  0x5f6f, 0x4c53, 0x5379, 0x5470, 0x5b47, 0x5e55, 0x7074, 0x5550,
-  0x6559, 0x7c47, 0x5c56, 0x6260, 0x5a30, 0x7323, 0x536c, 0x744b,
-  0x7d45, 0x637d, 0x7931, 0x507b, 0x6c5b, 0x753c, 0x7224, 0x584e,
-  0x584f, 0x7577, 0x7661, 0x5237, 0x7b6c, 0x5d48, 0x6468, 0x5241,
-  0x7857, 0x563b, 0x5e56, 0x773d, 0x6c2e, 0x5061, 0x6075, 0x6a33,
-  0x4e56, 0x4c25, 0x6c76, 0x6261, 0x633e, 0x7c48, 0x4d70, 0x7976,
-  0x5f70, 0x653f, 0x4e3f, 0x7c61, 0x6d30, 0x7d51, 0x763b, 0x794f,
-  0x6b5a, 0x4a41, 0x5238, 0x4d71, 0x6353, 0x7d66, 0x666d, 0x637a,
-  0x702a, 0x7950, 0x7c62, 0x7827, 0x6165, 0x6e79, 0x6776, 0x6a6d,
-  0x7c34, 0x7542, 0x575c, 0x7075, 0x5d68, 0x536d, 0x757c, 0x5a3f,
-  0x4c7b, 0x537a, 0x7424, 0x6f57, 0x5443, 0x7b63, 0x7b6d, 0x602d,
-  0x6a6e, 0x7b33, 0x6442, 0x7667, 0x525d, 0x5f4c, 0x7c49, 0x6529,
-  0x6076, 0x7633, 0x617e, 0x4b70, 0x6a6f, 0x6a70, 0x5a40, 0x7834,
-  0x6b72, 0x6443, 0x6957, 0x6471, 0x4a6f, 0x4e57, 0x7c4a, 0x7361,
-  0x4b44, 0x6365, 0x4b45, 0x6a34, 0x693d, 0x5749, 0x6b5b, 0x6d31,
-  0x4c43, 0x773e, 0x7c4b, 0x7874, 0x5937, 0x7353, 0x7354, 0x7764,
-  0x7751, 0x5837, 0x4e31, 0x4a42, 0x7b34, 0x4b46, 0x7076, 0x5567,
-  0x6a50, 0x4c54, 0x4b2f, 0x742a, 0x692f, 0x7543, 0x6958, 0x5d69,
-  0x7173, 0x557b, 0x5e3b, 0x747b, 0x7d73, 0x7d72, 0x7726, 0x5d49,
-  0x5453, 0x4c28, 0x5a41, 0x4c55, 0x5964, 0x7a4a, 0x6563, 0x533c,
-  0x4a70, 0x5044, 0x4a50, 0x7a2b, 0x6b6b, 0x6778, 0x5965, 0x5157,
-  0x7324, 0x547b, 0x7c63, 0x7a58, 0x7355, 0x4f2b, 0x6b73, 0x557c,
-  0x5354, 0x4d7c, 0x5966, 0x6279, 0x6221, 0x6b54, 0x6077, 0x6432,
-  0x4c7c, 0x7b64, 0x742b, 0x503d, 0x4a71, 0x6f38, 0x5740, 0x6e7a,
-  0x7d74, 0x5363, 0x7b42, 0x5568, 0x5b2e, 0x6136, 0x7837, 0x603f,
-  0x7b43, 0x5d6a, 0x6222, 0x6e26, 0x7668, 0x7675, 0x5d4a, 0x5062,
-  0x5d26, 0x5d6b, 0x6479, 0x632f, 0x507c, 0x747c, 0x4c3c, 0x776a,
-  0x6564, 0x5f71, 0x7761, 0x7977, 0x6f39, 0x7858, 0x7929, 0x7859,
-  0x6e3d, 0x5846, 0x6463, 0x754e, 0x5d59, 0x5967, 0x5239, 0x5543,
-  0x5a65, 0x5a50, 0x5159, 0x4e58, 0x4b5e, 0x742c, 0x5a7b, 0x7669,
-  0x6873, 0x4f2c, 0x7070, 0x747d, 0x5b48, 0x4e40, 0x6354, 0x514f,
-  0x7175, 0x4d72, 0x4f6b, 0x4d38, 0x6326, 0x515a, 0x7225, 0x7226,
-  0x644e, 0x537b, 0x7129, 0x7249, 0x6f58, 0x6649, 0x5838, 0x7a73,
-  0x7335, 0x7824, 0x5173, 0x6648, 0x785a, 0x5c69, 0x5e57, 0x4b5f,
-  0x4f6c, 0x745f, 0x5174, 0x523a, 0x5f72, 0x6137, 0x6223, 0x537c,
-  0x6d66, 0x5b49, 0x647a, 0x4f5e, 0x4e50, 0x5553, 0x7375, 0x772e,
-  0x6f48, 0x4d73, 0x754f, 0x6573, 0x7042, 0x4a51, 0x6a71, 0x5026,
-  0x595a, 0x702b, 0x6b67, 0x6540, 0x7c35, 0x6444, 0x4c29, 0x7d46,
-  0x6a35, 0x652a, 0x5f3a, 0x615f, 0x5a51, 0x6138, 0x6874, 0x537d,
-  0x6224, 0x724a, 0x5a66, 0x7733, 0x7d4d, 0x7336, 0x6e57, 0x7544,
-  0x5824, 0x7227, 0x5938, 0x5939, 0x6f49, 0x564e, 0x774b, 0x5f2e,
-  0x6875, 0x5235, 0x5355, 0x744c, 0x5a7c, 0x5968, 0x776b, 0x7549,
-  0x733c, 0x5a52, 0x5335, 0x6836, 0x564f, 0x743a, 0x7749, 0x4c2a,
-  0x7043, 0x4c56, 0x5053, 0x533d, 0x5b7b, 0x4b60, 0x5364, 0x7677,
-  0x553a, 0x734d, 0x4b61, 0x6b74, 0x742d, 0x7c2a, 0x776c, 0x6876,
-  0x5a67, 0x774c, 0x6541, 0x606e, 0x557d, 0x4e66, 0x7c2b, 0x553b,
-  0x7228, 0x6225, 0x4d39, 0x6a72, 0x4b47, 0x4d74, 0x5b2f, 0x6f59,
-  0x4d3a, 0x7c79, 0x5f73, 0x4e67, 0x5a42, 0x4f2d, 0x6779, 0x7828,
-  0x7362, 0x4a72, 0x5f24, 0x5444, 0x4c57, 0x6542, 0x4d3b, 0x6f5a,
-  0x6e58, 0x5d27, 0x6226, 0x6040, 0x5630, 0x784a, 0x7c7a, 0x597e,
-  0x5e30, 0x5d6c, 0x5a68, 0x5460, 0x5679, 0x4d57, 0x5e58, 0x7278,
-  0x6456, 0x5045, 0x742e, 0x5d28, 0x6d45, 0x7356, 0x5e59, 0x6366,
-  0x5328, 0x5b30, 0x655a, 0x633f, 0x5b31, 0x5569, 0x6041, 0x6f5b,
-  0x7069, 0x5732, 0x507d, 0x5969, 0x507e, 0x6c6d, 0x5329, 0x7229,
-  0x7044, 0x6262, 0x696f, 0x7951, 0x6959, 0x685a, 0x5a43, 0x5a44,
-  0x5445, 0x677a, 0x4d60, 0x6330, 0x5b32, 0x7b44, 0x7363, 0x5925,
-  0x7b67, 0x5d4b, 0x5054, 0x6636, 0x602e, 0x7d5a, 0x5c35, 0x6078,
-  0x6731, 0x7570, 0x585c, 0x6d46, 0x6139, 0x6340, 0x7940, 0x6970,
-  0x595b, 0x7364, 0x5c36, 0x6469, 0x7045, 0x6341, 0x7c4c, 0x7c4d,
-  0x724b, 0x724c, 0x644f, 0x715b, 0x7a59, 0x7138, 0x7d75, 0x6079,
-  0x677b, 0x7c37, 0x7c64, 0x7b45, 0x6367, 0x5839, 0x7678, 0x5c45,
-  0x4c58, 0x602f, 0x7467, 0x6f5c, 0x4f7c, 0x6f5d, 0x722a, 0x7d3e,
-  0x4a2c, 0x7d3b, 0x7d47, 0x6732, 0x6a51, 0x5f74, 0x516c, 0x645e,
-  0x6543, 0x5926, 0x4d3c, 0x7365, 0x6d55, 0x593a, 0x6d67, 0x7b35,
-  0x786c, 0x6067, 0x4c59, 0x5446, 0x6725, 0x5575, 0x533e, 0x7c7b,
-  0x6472, 0x5f75, 0x6878, 0x786d, 0x4e47, 0x7d76, 0x6858, 0x4d58,
-  0x6756, 0x4c5a, 0x4a63, 0x5f76, 0x7047, 0x7046, 0x583a, 0x7174,
-  0x7470, 0x754c, 0x7c65, 0x6a45, 0x6a73, 0x5d5b, 0x5c57, 0x5e7d,
-  0x7279, 0x5547, 0x5850, 0x7048, 0x5121, 0x5122, 0x5954, 0x5668,
-  0x594a, 0x5a31, 0x5847, 0x5c62, 0x734e, 0x7574, 0x7139, 0x5a53,
-  0x766a, 0x4f75, 0x7d2e, 0x4a52, 0x5f34, 0x575d, 0x7a3a, 0x6e27,
-  0x753d, 0x7875, 0x6d68, 0x5461, 0x5123, 0x6156, 0x7978, 0x5b4a,
-  0x4b79, 0x5454, 0x595c, 0x6e3e, 0x776d, 0x526e, 0x6166, 0x7779,
-  0x5d6d, 0x685b, 0x5b33, 0x5177, 0x6030, 0x5462, 0x7657, 0x5779,
-  0x585d, 0x4d7d, 0x722b, 0x4d3d, 0x7842, 0x722c, 0x4a2d, 0x4a2e,
-  0x4f2e, 0x6342, 0x5c37, 0x5b5a, 0x593b, 0x4a73, 0x7653, 0x6678,
-  0x6a75, 0x6a76, 0x7679, 0x4f2f, 0x4a53, 0x4a2f, 0x5230, 0x713a,
-  0x5733, 0x6343, 0x737d, 0x5e5a, 0x5e5b, 0x6f5e, 0x6263, 0x6e7b,
-  0x5f77, 0x574a, 0x4e68, 0x5b5b, 0x713b, 0x6971, 0x7a37, 0x5046,
-  0x4c2b, 0x6e28, 0x4b7a, 0x7979, 0x4c7d, 0x537e, 0x6450, 0x726e,
-  0x5455, 0x5f4d, 0x7c38, 0x5150, 0x724d, 0x7752, 0x4a54, 0x5559,
-  0x585e, 0x4d59, 0x6e29, 0x763c, 0x4c5b, 0x7049, 0x7c7c, 0x6849,
-  0x747e, 0x677c, 0x575e, 0x5e5c, 0x702c, 0x4c7e, 0x4d61, 0x613a,
-  0x5b6f, 0x5a32, 0x5125, 0x5c38, 0x5876, 0x5124, 0x4d62, 0x5c6a,
-  0x7077, 0x704a, 0x503e, 0x5d5c, 0x5456, 0x5356, 0x6d50, 0x4d21,
-  0x5f35, 0x5f78, 0x5421, 0x4e32, 0x684a, 0x6b75, 0x6355, 0x7550,
-  0x7521, 0x5927, 0x652b, 0x664b, 0x7571, 0x6545, 0x7923, 0x605b,
-  0x766b, 0x4b71, 0x596a, 0x7522, 0x5751, 0x5178, 0x6a78, 0x6a79,
-  0x5a33, 0x6f5f, 0x716f, 0x6576, 0x6e3f, 0x6264, 0x503f, 0x7a2c,
-  0x7551, 0x6733, 0x693e, 0x724e, 0x5b34, 0x7c4e, 0x5d6e, 0x6734,
-  0x5734, 0x7734, 0x4d3e, 0x5a69, 0x4f30, 0x7759, 0x7366, 0x4e59,
-  0x4e2a, 0x4b48, 0x5027, 0x704b, 0x5047, 0x6445, 0x5b60, 0x555a,
-  0x5727, 0x6e40, 0x7876, 0x7552, 0x6d69, 0x593c, 0x6546, 0x7523,
-  0x5a54, 0x6227, 0x7b7c, 0x715c, 0x4a74, 0x687a, 0x4e69, 0x6978,
-  0x6265, 0x5039, 0x5472, 0x5126, 0x5f4e, 0x7c74, 0x532a, 0x4c2c,
-  0x6f60, 0x6565, 0x5055, 0x5b7c, 0x7c66, 0x4b7e, 0x6d6a, 0x5e31,
-  0x7963, 0x5422, 0x4f76, 0x5650, 0x556a, 0x716e, 0x7a4b, 0x6521,
-  0x5531, 0x4f6d, 0x6d6b, 0x5532, 0x553c, 0x7d62, 0x732d, 0x7d5b,
-  0x6930, 0x5127, 0x7d63, 0x4e33, 0x7d64, 0x7a4e, 0x4a30, 0x7727,
-  0x4f31, 0x6622, 0x7c36, 0x722d, 0x6f61, 0x732e, 0x5c46, 0x596b,
-  0x6860, 0x6128, 0x5576, 0x4f7d, 0x5e5d, 0x5951, 0x646a, 0x724f,
-  0x773f, 0x6266, 0x6228, 0x6356, 0x6d51, 0x6979, 0x5631, 0x5e32,
-  0x6068, 0x532b, 0x6b5c, 0x5f2f, 0x4a43, 0x6e7c, 0x7d43, 0x6b76,
-  0x4f32, 0x596c, 0x593d, 0x585f, 0x5438, 0x6b3e, 0x5d6f, 0x5d70,
-  0x5d71, 0x5d72, 0x593e, 0x7b46, 0x4f33, 0x6e7d, 0x642b, 0x5a45,
-  0x586c, 0x5128, 0x6229, 0x5e3c, 0x6735, 0x5b70, 0x6f62, 0x7170,
-  0x4f34, 0x5b71, 0x6031, 0x5f25, 0x7952, 0x677d, 0x6623, 0x7b71,
-  0x4b30, 0x722e, 0x4d67, 0x685c, 0x6757, 0x7740, 0x5063, 0x5a21,
-  0x4c3d, 0x5129, 0x5d4c, 0x637e, 0x512a, 0x682a, 0x6a36, 0x797a,
-  0x664c, 0x7658, 0x5447, 0x594b, 0x5952, 0x534b, 0x5877, 0x5a29,
-  0x7578, 0x5e5e, 0x722f, 0x7829, 0x5848, 0x6e41, 0x7941, 0x5d73,
-  0x6a7a, 0x763d, 0x613b, 0x4d3f, 0x7454, 0x664d, 0x7c4f, 0x7b22,
-  0x605c, 0x743b, 0x5a55, 0x7932, 0x7b72, 0x5b76, 0x5e5f, 0x5b72,
-  0x785c, 0x776e, 0x6b68, 0x527a, 0x713c, 0x7a5a, 0x5a6a, 0x5a46,
-  0x7741, 0x6736, 0x6547, 0x562c, 0x5c47, 0x6129, 0x622a, 0x5526,
-  0x5457, 0x7250, 0x6a7b, 0x605d, 0x7b73, 0x713d, 0x6267, 0x7d57,
-  0x4e48, 0x6a37, 0x7c40, 0x7d67, 0x776f, 0x5735, 0x6f3a, 0x715d,
-  0x5e33, 0x684b, 0x785d, 0x7b47, 0x5548, 0x575f, 0x5d29, 0x6931,
-  0x7a2d, 0x7659, 0x7a74, 0x782a, 0x666e, 0x4c5c, 0x613c, 0x606f,
-  0x693f, 0x7c7d, 0x664e, 0x6157, 0x664f, 0x7471, 0x6473, 0x647b,
-  0x7964, 0x6f63, 0x4f6e, 0x763e, 0x6032, 0x7c7e, 0x512b, 0x577a,
-  0x7b48, 0x6257, 0x5423, 0x7078, 0x5728, 0x6167, 0x533f, 0x6f64,
-  0x5745, 0x6b62, 0x7c67, 0x6422, 0x6268, 0x6650, 0x7b68, 0x7468,
-  0x6574, 0x743c, 0x7455, 0x5f36, 0x7c39, 0x6e42, 0x4a75, 0x6f65,
-  0x4b62, 0x5424, 0x5e60, 0x5a7d, 0x6446, 0x683e, 0x605e, 0x7634,
-  0x6a52, 0x797b, 0x6042, 0x4a64, 0x6737, 0x6a7d, 0x595d, 0x5a34,
-  0x6e2a, 0x7b69, 0x5b4b, 0x5a35, 0x713e, 0x532c, 0x7b49, 0x5f4f,
-  0x5340, 0x6357, 0x6f66, 0x7c50, 0x6940, 0x7553, 0x6c5c, 0x7737,
-  0x6a38, 0x5179, 0x5c48, 0x6a39, 0x715e, 0x5736, 0x4f35, 0x5928,
-  0x6c6e, 0x5d2a, 0x4d22, 0x682e, 0x613d, 0x7251, 0x6941, 0x527c,
-  0x5b35, 0x7367, 0x587e, 0x7c51, 0x6d32, 0x742f, 0x7b23, 0x7c41,
-  0x6e2b, 0x5425, 0x7472, 0x6e59, 0x7b4a, 0x4d63, 0x583b, 0x655b,
-  0x7877, 0x7654, 0x5729, 0x4b49, 0x6651, 0x704c, 0x582e, 0x7953,
-  0x557e, 0x583c, 0x7230, 0x622b, 0x7368, 0x6f42, 0x6d6c, 0x6738,
-  0x5a7e, 0x4c3e, 0x727c, 0x5a6b, 0x6258, 0x6d56, 0x5651, 0x6033,
-  0x7c52, 0x6b48, 0x5341, 0x704d, 0x4f77, 0x6d52, 0x5458, 0x5c49,
-  0x5771, 0x5f3b, 0x7325, 0x744d, 0x713f, 0x7831, 0x697a, 0x7b4b,
-  0x4a55, 0x7954, 0x774a, 0x5648, 0x7c68, 0x733d, 0x6e7e, 0x677e,
-  0x5342, 0x5336, 0x4c2d, 0x767a, 0x5632, 0x5258, 0x6758, 0x6325,
-  0x6739, 0x702d, 0x7b4c, 0x6b21, 0x5426, 0x7b4d, 0x553d, 0x715f,
-  0x767b, 0x5e34, 0x556b, 0x6548, 0x7b24, 0x5439, 0x5e61, 0x6423,
-  0x5737, 0x786e, 0x5e35, 0x5652, 0x7955, 0x673a, 0x6b55, 0x5577,
-  0x6f67, 0x613e, 0x7a2e, 0x5669, 0x566e, 0x673b, 0x6c4b, 0x5533,
-  0x4e34, 0x7b25, 0x616e, 0x7728, 0x7b4e, 0x583d, 0x7b7d, 0x7c69,
-  0x4f36, 0x6d47, 0x6e2c, 0x4c5d, 0x7627, 0x667a, 0x7524, 0x7d5c,
-  0x6d33, 0x4e49, 0x6f68, 0x613f, 0x7a5b, 0x4b63, 0x7729, 0x7b26,
-  0x5c39, 0x7140, 0x6d48, 0x6f43, 0x562d, 0x7d4e, 0x6821, 0x7b74,
-  0x5527, 0x7176, 0x6653, 0x4c5e, 0x7832, 0x5c6b, 0x7d36, 0x656a,
-  0x7160, 0x5b4c, 0x5d4d, 0x5448, 0x596d, 0x7525, 0x667b, 0x6654,
-  0x7d48, 0x5621, 0x7d3f, 0x7c53, 0x6f21, 0x673c, 0x516e, 0x6655,
-  0x6972, 0x5f30, 0x5860, 0x7c3a, 0x7d2f, 0x704e, 0x5b61, 0x6549,
-  0x6d34, 0x6043, 0x6358, 0x697b, 0x6a28, 0x7d37, 0x7b27, 0x6942,
-  0x7d77, 0x6259, 0x5c6c, 0x6822, 0x6670, 0x7d78, 0x7d79, 0x763f,
-  0x6727, 0x6657, 0x5473, 0x5449, 0x567a, 0x5772, 0x6140, 0x5b62,
-  0x6658, 0x673d, 0x704f, 0x733e, 0x622c, 0x7537, 0x6070, 0x7d38,
-  0x6368, 0x5427, 0x687c, 0x7a52, 0x786f, 0x5653, 0x5534, 0x7050,
-  0x7770, 0x6e33, 0x6a3a, 0x6a53, 0x6d49, 0x5d2b, 0x652c, 0x7d21,
-  0x5f50, 0x6c33, 0x5f51, 0x6d6d, 0x7838, 0x777a, 0x782b, 0x7460,
-  0x543a, 0x6433, 0x695a, 0x5e36, 0x593f, 0x5940, 0x566f, 0x594c,
-  0x5a2a, 0x5f65, 0x7765, 0x4c32, 0x5f79, 0x5760, 0x543b, 0x7d7a,
-  0x4c33, 0x5b73, 0x5f52, 0x4e4a, 0x6e5a, 0x6464, 0x7b4f, 0x4f37,
-  0x6e43, 0x4e6a, 0x622d, 0x5761, 0x7a75, 0x5549, 0x782c, 0x6759,
-  0x7369, 0x586d, 0x6344, 0x7071, 0x6865, 0x607a, 0x6e44, 0x595e,
-  0x6b22, 0x6b23, 0x7c42, 0x6a3b, 0x682b, 0x5e62, 0x6d6f, 0x6823,
-  0x4f71, 0x543c, 0x7c6a, 0x673e, 0x7c72, 0x5634, 0x622e, 0x5337,
-  0x7a4c, 0x7a5c, 0x6d35, 0x6163, 0x682c, 0x685d, 0x6f69, 0x743d,
-  0x4f38, 0x695b, 0x512c, 0x5a47, 0x6b49, 0x684c, 0x5e37, 0x563c,
-  0x5365, 0x7a5d, 0x5a56, 0x4a31, 0x5a48, 0x5f26, 0x7933, 0x7252,
-  0x4a44, 0x4e4b, 0x4d75, 0x7d30, 0x5528, 0x7141, 0x6269, 0x5c4a,
-  0x6c34, 0x7a40, 0x7b28, 0x5028, 0x5a6c, 0x596e, 0x607b, 0x6f6a,
-  0x7a5e, 0x6044, 0x4f39, 0x554a, 0x5762, 0x622f, 0x5738, 0x684d,
-  0x765a, 0x6f22, 0x625a, 0x767c, 0x7b50, 0x512d, 0x4d64, 0x512e,
-  0x5c6d, 0x684e, 0x7079, 0x4e35, 0x667c, 0x577b, 0x5056, 0x5d75,
-  0x7771, 0x767d, 0x5b77, 0x7b6a, 0x695c, 0x5941, 0x7572, 0x6045,
-  0x6a54, 0x7942, 0x6a3c, 0x5245, 0x7b51, 0x6740, 0x6b25, 0x5f7a,
-  0x6322, 0x5739, 0x6943, 0x687d, 0x682f, 0x7253, 0x7b29, 0x5825,
-  0x554b, 0x5048, 0x512f, 0x5763, 0x6046, 0x5622, 0x6d70, 0x5773,
-  0x7c54, 0x5a57, 0x4c5f, 0x7254, 0x5130, 0x4c60, 0x5b7d, 0x733f,
-  0x7051, 0x7c3b, 0x6230, 0x6625, 0x625b, 0x5f5e, 0x6047, 0x726f,
-  0x4c61, 0x566a, 0x6742, 0x4e36, 0x7340, 0x4d7e, 0x7b52, 0x7878,
-  0x777b, 0x683f, 0x6837, 0x6d36, 0x5c3a, 0x4c34, 0x7177, 0x6838,
-  0x4a76, 0x6424, 0x7456, 0x5f66, 0x5f27, 0x5f67, 0x6141, 0x6944,
-  0x5c4b, 0x6945, 0x6f23, 0x6b26, 0x4b23, 0x6369, 0x517b, 0x6f24,
-  0x6f6b, 0x5034, 0x4d23, 0x6866, 0x6f25, 0x534c, 0x5a6d, 0x573a,
-  0x7255, 0x7565, 0x596f, 0x7934, 0x5554, 0x7d4f, 0x5b63, 0x7161,
-  0x6c36, 0x7b7e, 0x5357, 0x5131, 0x4b31, 0x5132, 0x4b32, 0x7142,
-  0x7461, 0x7935, 0x6143, 0x6142, 0x6b77, 0x5f28, 0x4b4a, 0x6639,
-  0x785e, 0x792a, 0x4a77, 0x6d37, 0x5338, 0x7256, 0x5459, 0x6e45,
-  0x7270, 0x4a32, 0x5c3b, 0x7178, 0x6c37, 0x654a, 0x7640, 0x7d5d,
-  0x5463, 0x4c62, 0x7754, 0x5765, 0x5343, 0x5826, 0x7641, 0x5d76,
-  0x4d40, 0x655c, 0x654b, 0x6144, 0x6830, 0x7430, 0x736a, 0x5a6e,
-  0x573b, 0x6231, 0x572a, 0x567b, 0x645f, 0x4a56, 0x6b28, 0x5b7e,
-  0x7642, 0x6f3b, 0x547d, 0x6048, 0x6839, 0x6f26, 0x4d24, 0x5474,
-  0x5b21, 0x5b5c, 0x5b5d, 0x6e5c, 0x4b4b, 0x7c55, 0x4e6b, 0x4d41,
-  0x7b53, 0x792b, 0x7554, 0x5929, 0x695d, 0x5b4d, 0x5d4e, 0x6743,
-  0x6c4c, 0x796c, 0x4b4c, 0x607c, 0x5428, 0x6d53, 0x586f, 0x7257,
-  0x4a78, 0x5a6f, 0x5654, 0x594d, 0x586e, 0x7241, 0x5f53, 0x5a70,
-  0x626a, 0x607d, 0x5878, 0x772f, 0x5a36, 0x4a57, 0x7258, 0x5879,
-  0x7a5f, 0x4f6f, 0x5942, 0x7052, 0x6451, 0x7337, 0x7a60, 0x6f6c,
-  0x6232, 0x543d, 0x594e, 0x7462, 0x5429, 0x4d42, 0x675a, 0x7259,
-  0x592a, 0x583e, 0x5c2d, 0x626b, 0x567c, 0x4a79, 0x545a, 0x7457,
-  0x4c21, 0x4f3a, 0x7538, 0x5943, 0x5068, 0x6345, 0x6b78, 0x7231,
-  0x4f3b, 0x532d, 0x6861, 0x4e6c, 0x6034, 0x5e63, 0x5d77, 0x7232,
-  0x7376, 0x765b, 0x577e, 0x785f, 0x7772, 0x5029, 0x665a, 0x7526,
-  0x573c, 0x4c63, 0x665b, 0x5d5d, 0x5133, 0x6f6d, 0x565e, 0x6474,
-  0x616f, 0x5d78, 0x684f, 0x4a65, 0x5c21, 0x6035, 0x7c2c, 0x7c2d,
-  0x5827, 0x6d38, 0x5b36, 0x5670, 0x732f, 0x4d25, 0x5a71, 0x5828,
-  0x4c64, 0x5134, 0x4a58, 0x5a72, 0x7527, 0x7528, 0x6626, 0x556c,
-  0x5578, 0x5a73, 0x6346, 0x5e64, 0x5e65, 0x5135, 0x5136, 0x5137,
-  0x7233, 0x695e, 0x7053, 0x7234, 0x7054, 0x4b64, 0x7b54, 0x7566,
-  0x636a, 0x5e66, 0x5f54, 0x7879, 0x702e, 0x5138, 0x565f, 0x5057,
-  0x7c21, 0x6f6e, 0x5c58, 0x695f, 0x655d, 0x7d7b, 0x6049, 0x5649,
-  0x542a, 0x654c, 0x6960, 0x5058, 0x7c22, 0x543e, 0x6233, 0x5e67,
-  0x5c3c, 0x5236, 0x7555, 0x4e21, 0x7529, 0x5d79, 0x5d7a, 0x7055,
-  0x765f, 0x725a, 0x646b, 0x7271, 0x6c39, 0x7d7c, 0x612a, 0x4a59,
-  0x6f6f, 0x752a, 0x6c79, 0x782d, 0x7242, 0x7643, 0x5752, 0x7922,
-  0x7056, 0x707a, 0x7660, 0x6973, 0x7243, 0x542b, 0x4a33, 0x4d26,
-  0x4d43, 0x4d5a, 0x594f, 0x7644, 0x6e5d, 0x6744, 0x6234, 0x5f62,
-  0x675b, 0x6831, 0x7c2e, 0x654d, 0x7a6b, 0x4f3c, 0x4f62, 0x4d76,
-  0x6f70, 0x743e, 0x544d, 0x7338, 0x6921, 0x7272, 0x736b, 0x7057,
-  0x4f57, 0x4f5f, 0x6840, 0x6841, 0x4f63, 0x6922, 0x502a, 0x7341,
-  0x502b, 0x5464, 0x6f3c, 0x5821, 0x595f, 0x7357, 0x5c3d, 0x4c65,
-  0x6d71, 0x7162, 0x545b, 0x6235, 0x4a66, 0x532e, 0x4c66, 0x7153,
-  0x7567, 0x4a5a, 0x7b6e, 0x6145, 0x5f69, 0x6e5e, 0x7742, 0x5822,
-  0x5d2c, 0x702f, 0x563d, 0x612b, 0x7936, 0x5475, 0x5049, 0x6f27,
-  0x626c, 0x5b6a, 0x4e4c, 0x7568, 0x7755, 0x534d, 0x737e, 0x5035,
-  0x607e, 0x5f7b, 0x665d, 0x6824, 0x4b4d, 0x6f28, 0x6e34, 0x5a58,
-  0x5139, 0x5f29, 0x7330, 0x4c44, 0x4e37, 0x6f29, 0x5f55, 0x6d57,
-  0x6e46, 0x6f3d, 0x7c56, 0x5b74, 0x6f2a, 0x7839, 0x7569, 0x6359,
-  0x6146, 0x543f, 0x5e68, 0x706a, 0x7342, 0x532f, 0x4a5b, 0x7c57,
-  0x6d58, 0x6147, 0x7458, 0x5633, 0x5d2d, 0x553e, 0x7143, 0x6e5f,
-  0x566b, 0x7459, 0x5766, 0x5a37, 0x5d7b, 0x5d4f, 0x5823, 0x5a59,
-  0x7058, 0x6f44, 0x6158, 0x7154, 0x6d72, 0x555b, 0x555c, 0x7344,
-  0x4b57, 0x6236, 0x6f71, 0x7b55, 0x5358, 0x5d50, 0x7059, 0x4b33,
-  0x555d, 0x4d27, 0x502c, 0x513a, 0x7144, 0x6533, 0x7b75, 0x6961,
-  0x7d60, 0x7c3c, 0x5a22, 0x5a23, 0x5221, 0x526f, 0x626d, 0x5e69,
-  0x4e5c, 0x7235, 0x5064, 0x5d51, 0x6148, 0x5b37, 0x5f63, 0x6d39,
-  0x7145, 0x734f, 0x572b, 0x612c, 0x636b, 0x6e47, 0x6149, 0x4a7a,
-  0x707b, 0x7a61, 0x705a, 0x4c67, 0x5a74, 0x4c3f, 0x4e6d, 0x5529,
-  0x7a62, 0x5065, 0x6b56, 0x6c5f, 0x5f7c, 0x7756, 0x5e6a, 0x4b34,
-  0x6f3e, 0x4c35, 0x4f3d, 0x6f72, 0x6237, 0x4c68, 0x707c, 0x5660,
-  0x7146, 0x6238, 0x6b2b, 0x4b35, 0x5851, 0x744e, 0x7377, 0x5746,
-  0x513b, 0x772a, 0x6d4a, 0x5753, 0x587a, 0x7645, 0x514c, 0x5d7c,
-  0x5f7d, 0x7965, 0x604a, 0x727d, 0x5330, 0x7473, 0x5a49, 0x665e,
-  0x783a, 0x6850, 0x587b, 0x6a55, 0x5623, 0x7646, 0x725b, 0x647c,
-  0x6832, 0x5a5a, 0x725c, 0x7b56, 0x6932, 0x6e2d, 0x7a63, 0x5c6e,
-  0x756a, 0x6660, 0x707d, 0x572c, 0x7545, 0x6e60, 0x5b65, 0x5d5e,
-  0x5970, 0x6923, 0x7179, 0x7244, 0x604b, 0x6924, 0x6239, 0x6331,
-  0x7c6b, 0x4d28, 0x4c36, 0x705b, 0x663a, 0x4d29, 0x7343, 0x6159,
-  0x6f2b, 0x6745, 0x6069, 0x7345, 0x5440, 0x553f, 0x5d2e, 0x797c,
-  0x4c40, 0x6522, 0x4e38, 0x5852, 0x7956, 0x712a, 0x4e51, 0x7647,
-  0x5b6b, 0x5f7e, 0x5861, 0x7773, 0x5767, 0x547e, 0x513c, 0x654f,
-  0x4b36, 0x5a38, 0x4d44, 0x563e, 0x623a, 0x4f58, 0x604c, 0x6b79,
-  0x7d7d, 0x5768, 0x4b58, 0x6962, 0x683a, 0x6347, 0x6c4d, 0x6c4e,
-  0x563f, 0x6327, 0x5f56, 0x7d68, 0x6e61, 0x7628, 0x5d7d, 0x783b,
-  0x6851, 0x7957, 0x4e6e, 0x6c4f, 0x6925, 0x5655, 0x4d45, 0x6d3a,
-  0x513d, 0x4f3e, 0x6c3b, 0x5231, 0x4c69, 0x5944, 0x697c, 0x513e,
-  0x6c3c, 0x652d, 0x7730, 0x4c6a, 0x5344, 0x5640, 0x567d, 0x6121,
-  0x5e3d, 0x7629, 0x5a24, 0x5624, 0x7546, 0x6122, 0x6946, 0x7245,
-  0x7469, 0x566c, 0x6b53, 0x6c3d, 0x625c, 0x5e6b, 0x705c, 0x6b3f,
-  0x574e, 0x513f, 0x752b, 0x797d, 0x4a5c, 0x4d46, 0x7236, 0x5d7e,
-  0x4c37, 0x5b38, 0x5069, 0x4e5d, 0x6b40, 0x7d22, 0x784b, 0x6a56,
-  0x7130, 0x5b4e, 0x7743, 0x5b4f, 0x4b24, 0x7860, 0x7b57, 0x6b4a,
-  0x6021, 0x4e4d, 0x545c, 0x7d58, 0x5276, 0x7237, 0x7a76, 0x762a,
-  0x7a77, 0x5866, 0x7431, 0x6852, 0x4a45, 0x4c6b, 0x626e, 0x623b,
-  0x772d, 0x7861, 0x736c, 0x5e21, 0x647d, 0x636c, 0x5d2f, 0x5d30,
-  0x4b37, 0x6853, 0x6123, 0x5260, 0x707e, 0x6926, 0x4b72, 0x6d73,
-  0x5c59, 0x604d, 0x775a, 0x5b39, 0x4c2e, 0x5a5b, 0x4d47, 0x5d31,
-  0x582f, 0x6323, 0x4e6f, 0x7273, 0x7833, 0x604e, 0x757d, 0x6b6c,
-  0x5345, 0x7c6c, 0x525b, 0x546b, 0x5e22, 0x6566, 0x7030, 0x5544,
-  0x6d74, 0x636d, 0x6842, 0x6d75, 0x577c, 0x6d3b, 0x762b, 0x7238,
-  0x7648, 0x5366, 0x725d, 0x4f3f, 0x6b2c, 0x4f40, 0x6628, 0x7d69,
-  0x4f41, 0x605f, 0x5e6c, 0x6022, 0x743f, 0x626f, 0x5971, 0x7147,
-  0x4b38, 0x797e, 0x5b3a, 0x5a75, 0x766c, 0x5a5c, 0x7a64, 0x604f,
-  0x5d32, 0x6629, 0x6f73, 0x736d, 0x6b7a, 0x7966, 0x4a5d, 0x555e,
-  0x4a5e, 0x5f64, 0x667d, 0x752c, 0x6475, 0x6963, 0x6d4b, 0x4f64,
-  0x5853, 0x5d33, 0x546c, 0x7239, 0x5f37, 0x4b4e, 0x7b58, 0x5059,
-  0x5d52, 0x7774, 0x675c, 0x6425, 0x7c23, 0x5b3b, 0x723a, 0x697d,
-  0x504a, 0x7556, 0x5945, 0x6434, 0x6d27, 0x6a3d, 0x667e, 0x7744,
-  0x752d, 0x5960, 0x4a34, 0x7862, 0x4f42, 0x6c3e, 0x6534, 0x4d48,
-  0x6e48, 0x6748, 0x4d49, 0x7937, 0x7168, 0x5972, 0x5b75, 0x4a35,
-  0x5946, 0x5849, 0x592b, 0x6d3c, 0x5854, 0x5c5a, 0x623c, 0x7c6d,
-  0x6c60, 0x527e, 0x6947, 0x662a, 0x6270, 0x7a3b, 0x752e, 0x7b2a,
-  0x6c7b, 0x6c3f, 0x7c58, 0x5465, 0x7943, 0x6e62, 0x5769, 0x6d76,
-  0x5e6d, 0x4c6c, 0x636e, 0x6854, 0x7a78, 0x5d34, 0x6435, 0x5830,
-  0x5855, 0x746a, 0x4e39, 0x5661, 0x4f52, 0x5036, 0x4e22, 0x736e,
-  0x7378, 0x5c4c, 0x504b, 0x7c24, 0x4d4a, 0x5754, 0x5e23, 0x6460,
-  0x6e49, 0x625d, 0x757e, 0x542c, 0x5551, 0x5870, 0x7843, 0x6a57,
-  0x7557, 0x583f, 0x7d40, 0x6b2d, 0x552a, 0x6728, 0x6e4a, 0x4a67,
-  0x7863, 0x545d, 0x6a58, 0x7b59, 0x6d77, 0x6535, 0x502d, 0x7171,
-  0x623d, 0x6348, 0x5955, 0x5f2a, 0x5b3c, 0x7864, 0x717a, 0x6536,
-  0x736f, 0x7b5a, 0x6160, 0x592c, 0x756b, 0x6036, 0x6948, 0x4b4f,
-  0x6349, 0x5e6e, 0x623e, 0x5c6f, 0x5625, 0x6271, 0x567e, 0x5921,
-  0x5840, 0x5c5b, 0x6d3d, 0x5f38, 0x6a25, 0x572d, 0x7379, 0x6d78,
-  0x7547, 0x614a, 0x6b63, 0x725e, 0x784c, 0x6a59, 0x5346, 0x5b66,
-  0x752f, 0x4e70, 0x697e, 0x7b36, 0x6272, 0x4f72, 0x7739, 0x5973,
-  0x614b, 0x5a5d, 0x5a39, 0x6b7b, 0x4b39, 0x6d79, 0x6060, 0x7440,
-  0x7d3c, 0x5f31, 0x636f, 0x6023, 0x7d39, 0x7031, 0x4d4b, 0x6d3e,
-  0x5540, 0x6370, 0x6d7a, 0x6964, 0x556d, 0x675d, 0x5476, 0x6537,
-  0x5b67, 0x623f, 0x6e4b, 0x5774, 0x705d, 0x4e2b, 0x675e, 0x5656,
-  0x614c, 0x6833, 0x656e, 0x5c22, 0x6050, 0x5535, 0x5521, 0x7b5b,
-  0x794b, 0x4b73, 0x7425, 0x7a48, 0x5657, 0x6965, 0x7b5c, 0x7d50,
-  0x7b76, 0x5a25, 0x5b3d, 0x6c62, 0x4d77, 0x705e, 0x7649, 0x5e6f,
-  0x5331, 0x7c6e, 0x6843, 0x7148, 0x4e71, 0x796d, 0x7274, 0x6436,
-  0x7539, 0x5c70, 0x6371, 0x6825, 0x723b, 0x5e24, 0x5a4c, 0x4a69,
-  0x635a, 0x7c59, 0x6a5a, 0x7944, 0x6324, 0x7b5d, 0x6f4a, 0x6844,
-  0x554c, 0x6b57, 0x592d, 0x7b2b, 0x5359, 0x5522, 0x765e, 0x5a76,
-  0x6051, 0x6928, 0x7579, 0x7a2f, 0x6b7c, 0x606a, 0x6332, 0x5545,
-  0x7163, 0x556e, 0x4d4c, 0x6d59, 0x5841, 0x7a6c, 0x716b, 0x7a3c,
-  0x6662, 0x7a65, 0x627a, 0x4a36, 0x6437, 0x6a5b, 0x757a, 0x7b2c,
-  0x4f43, 0x6b7d, 0x787a, 0x5f39, 0x6171, 0x5224, 0x757b, 0x505a,
-  0x505b, 0x6a3e, 0x5931, 0x4a37, 0x5367, 0x7865, 0x5332, 0x6240,
-  0x725f, 0x4d65, 0x792c, 0x4d4d, 0x6e2e, 0x562e, 0x576a, 0x6760,
-  0x6b2e, 0x4f59, 0x5c4d, 0x6d7b, 0x5e70, 0x576b, 0x5e25, 0x5f57,
-  0x5b50, 0x5b51, 0x5523, 0x7032, 0x5c5c, 0x4a68, 0x7866, 0x5c4e,
-  0x6a5c, 0x5b52, 0x6933, 0x775b, 0x6328, 0x572e, 0x6061, 0x4b3a,
-  0x6551, 0x505c, 0x5541, 0x584a, 0x6329, 0x6024, 0x6929, 0x5347,
-  0x5c5d, 0x782e, 0x4c38, 0x502e, 0x5872, 0x634a, 0x4c2f, 0x542d,
-  0x7651, 0x504c, 0x4a46, 0x5542, 0x4e3a, 0x4a47, 0x7a30, 0x5f58,
-  0x753a, 0x656b, 0x6f74, 0x5d35, 0x4d2a, 0x6372, 0x7b77, 0x7750,
-  0x7d3a, 0x7d61, 0x767e, 0x5140, 0x6845, 0x6438, 0x6168, 0x4c41,
-  0x526d, 0x5b3e, 0x6062, 0x7a49, 0x614d, 0x4a38, 0x7260, 0x7149,
-  0x5e71, 0x705f, 0x7844, 0x6e4c, 0x5e72, 0x6749, 0x6273, 0x6761,
-  0x634b, 0x634c, 0x4f78, 0x6f2c, 0x7d7e, 0x7c25, 0x7a31, 0x5f59,
-  0x6052, 0x745a, 0x714a, 0x4e23, 0x723c, 0x6c63, 0x6025, 0x772b,
-  0x6b2f, 0x655e, 0x6124, 0x4d2b, 0x5974, 0x6826, 0x4d4e, 0x6169,
-  0x7c6f, 0x6063, 0x6241, 0x4e24, 0x5e26, 0x6b7e, 0x6b5d, 0x7060,
-  0x745b, 0x6274, 0x5348, 0x746b, 0x6e35, 0x7558, 0x555f, 0x5665,
-  0x6b30, 0x7463, 0x634d, 0x7474, 0x7a32, 0x6f75, 0x4a5f, 0x6b31,
-  0x6d3f, 0x7d49, 0x6426, 0x7924, 0x7033, 0x656c, 0x5167, 0x5947,
-  0x6457, 0x6a5d, 0x5477, 0x5a3a, 0x5a4d, 0x794c, 0x615a, 0x5b3f,
-  0x4c45, 0x6c50, 0x4b3b, 0x5e73, 0x692a, 0x5948, 0x6e63, 0x573d,
-  0x4f44, 0x504d, 0x7c26, 0x717b, 0x7d52, 0x5141, 0x635b, 0x5349,
-  0x5c4f, 0x4c6d, 0x5e27, 0x663b, 0x6c21, 0x4c39, 0x7b5e, 0x6762,
-  0x5441, 0x5c28, 0x6242, 0x7358, 0x6553, 0x7359, 0x7346, 0x4d5b,
-  0x4d2c, 0x7c43, 0x5467, 0x5142, 0x7925, 0x6855, 0x634e, 0x544a,
-  0x5f5a, 0x7b5f, 0x6763, 0x787b, 0x634f, 0x7530, 0x5867, 0x5949,
-  0x782f, 0x6f76, 0x5d36, 0x6e2f, 0x4d78, 0x5e38, 0x7c27, 0x777c,
-  0x7731, 0x4e3b, 0x7421, 0x6e4d, 0x612e, 0x6c43, 0x4f7e, 0x783f,
-  0x5862, 0x5368, 0x5e28, 0x7464, 0x6c42, 0x5975, 0x7945, 0x5d53,
-  0x5671, 0x6c7c, 0x7c70, 0x6d40, 0x4a39, 0x6e64, 0x7261, 0x5e39,
-  0x5672, 0x5e74, 0x5f5b, 0x5b53, 0x7a67, 0x5863, 0x7441, 0x5d37,
-  0x7275, 0x542e, 0x5673, 0x5d38, 0x4f45, 0x5f5f, 0x723e, 0x7621,
-  0x6b4b, 0x717c, 0x7347, 0x606b, 0x6d7c, 0x615b, 0x6e65, 0x5e75,
-  0x7a53, 0x714b, 0x502f, 0x5d39, 0x5143, 0x7531, 0x6a46, 0x7061,
-  0x762c, 0x7559, 0x706b, 0x5d3a, 0x723f, 0x7745, 0x5b22, 0x7276,
-  0x4a3a, 0x7775, 0x4b65, 0x6e66, 0x6053, 0x4e25, 0x5658, 0x542f,
-  0x6949, 0x534e, 0x7442, 0x4b66, 0x7121, 0x6b32, 0x7122, 0x6b33,
-  0x7034, 0x4b74, 0x5430, 0x7332, 0x7b37, 0x756c, 0x6e67, 0x7432,
-  0x756d, 0x4f73, 0x7062, 0x6e4e, 0x714c, 0x6538, 0x5775, 0x6373,
-  0x4f65, 0x4f46, 0x7333, 0x6458, 0x4f79, 0x4f5a, 0x7a4d, 0x6663,
-  0x7262, 0x756e, 0x4a3b, 0x635c, 0x4e72, 0x5659, 0x6e30, 0x7465,
-  0x5842, 0x5c50, 0x4c6e, 0x5560, 0x764a, 0x7d4a, 0x5856, 0x744f,
-  0x5626, 0x5c3e, 0x5b54, 0x5747, 0x727e, 0x714d, 0x6243, 0x5c5e,
-  0x5c5f, 0x6f2d, 0x662b, 0x795d, 0x6a3f, 0x6f2e, 0x7450, 0x4e73,
-  0x662c, 0x4e5e, 0x5579, 0x6374, 0x4d50, 0x5538, 0x777d, 0x5c29,
-  0x5e76, 0x5c2a, 0x7263, 0x6934, 0x525c, 0x6966, 0x6376, 0x674a,
-  0x504e, 0x5a77, 0x4a3c, 0x6e68, 0x5a5e, 0x7277, 0x627b, 0x4c26,
-  0x5a3b, 0x6e69, 0x755a, 0x775c, 0x616a, 0x4e41, 0x5431, 0x7d31,
-  0x663d, 0x7b2d, 0x7867, 0x614e, 0x7762, 0x756f, 0x4f47, 0x5432,
-  0x4c6f, 0x5468, 0x6e4f, 0x7757, 0x6026, 0x5641, 0x615c, 0x7063,
-  0x7164, 0x5c71, 0x5627, 0x7475, 0x714e, 0x7264, 0x5030, 0x6c6f,
-  0x793a, 0x6b35, 0x546d, 0x6244, 0x6967, 0x6b34, 0x6a21, 0x783c,
-  0x4e26, 0x7946, 0x7c5a, 0x5433, 0x5339, 0x6a5e, 0x692b, 0x6161,
-  0x534f, 0x7476, 0x6a40, 0x614f, 0x4c3a, 0x6e6a, 0x7064, 0x7334,
-  0x546e, 0x7240, 0x7165, 0x7443, 0x6054, 0x6b36, 0x5721, 0x4b68,
-  0x792d, 0x692d, 0x5864, 0x7a33, 0x6245, 0x7c3d, 0x6c44, 0x5831,
-  0x5c2b, 0x5524, 0x6b69, 0x683b, 0x5857, 0x7b2e, 0x5161, 0x5b40,
-  0x753e, 0x5e77, 0x4a7b, 0x7746, 0x4f48, 0x6150, 0x6e50, 0x6974,
-  0x4e74, 0x554d, 0x4f5b, 0x5d3b, 0x4e2c, 0x6968, 0x5434, 0x6447,
-  0x755b, 0x7a41, 0x5e29, 0x5478, 0x6f77, 0x5333, 0x6b37, 0x6f78,
-  0x755c, 0x6d4c, 0x5b55, 0x714f, 0x7150, 0x7532, 0x592e, 0x552c,
-  0x6246, 0x7d23, 0x7b65, 0x5f2b, 0x6275, 0x762d, 0x7533, 0x7035,
-  0x6125, 0x755d, 0x6c22, 0x6d7d, 0x7534, 0x7b38, 0x5b23, 0x564a,
-  0x4b59, 0x6554, 0x737a, 0x6b38, 0x6037, 0x576c, 0x716c, 0x652f,
-  0x5561, 0x576d, 0x5151, 0x6172, 0x6f79, 0x5d3c, 0x765c, 0x7065,
-  0x7444, 0x6969, 0x737b, 0x546f, 0x4c22, 0x777e, 0x5f3c, 0x6b4d,
-  0x5037, 0x5642, 0x682d, 0x6f2f, 0x4b25, 0x4b69, 0x7a68, 0x4c46,
-  0x6667, 0x6a47, 0x5b24, 0x4f49, 0x627c, 0x6f7a, 0x6b5e, 0x7548,
-  0x545e, 0x6055, 0x6f30, 0x6247, 0x592f, 0x7967, 0x6765, 0x4f4a,
-  0x6151, 0x6248, 0x6f7b, 0x7a79, 0x5c72, 0x6027, 0x7868, 0x4b6a,
-  0x4b3c, 0x5662, 0x755e, 0x755f, 0x6e36, 0x6276, 0x534a, 0x6f7c,
-  0x5144, 0x6f31, 0x5145, 0x505e, 0x5961, 0x6038, 0x4d51, 0x7339,
-  0x674c, 0x5628, 0x4e27, 0x5435, 0x6448, 0x5334, 0x6b39, 0x4b75,
-  0x765d, 0x7123, 0x4c47, 0x694a, 0x6170, 0x7560, 0x7b2f, 0x4b51,
-  0x7b60, 0x7265, 0x6c70, 0x706c, 0x6e6b, 0x694b, 0x4c70, 0x572f,
-  0x7321, 0x7c75, 0x7124, 0x6056, 0x6f32, 0x7451, 0x7721, 0x7151,
-  0x4a7c, 0x4a7d, 0x4e4e, 0x7348, 0x733a, 0x6d7e, 0x5a26, 0x606c,
-  0x784d, 0x4b52, 0x6b4e, 0x7958, 0x7959, 0x4a60, 0x5a4a, 0x4b26,
-  0x4a48, 0x796e, 0x5b6c, 0x5031, 0x556f, 0x6673, 0x6722, 0x6459,
-  0x6461, 0x7c44, 0x796f, 0x4f74, 0x7766, 0x4e3c, 0x7445, 0x5c23,
-  0x5d3d, 0x7446, 0x7821, 0x6856, 0x5b41, 0x7066, 0x6439, 0x766d,
-  0x792e, 0x5d3e, 0x5730, 0x5868, 0x4b3d, 0x795a, 0x784e, 0x7970,
-  0x606d, 0x6333, 0x7433, 0x6a42, 0x7266, 0x7036, 0x5b56, 0x6b64,
-  0x7267, 0x5755, 0x5436, 0x7968, 0x5741, 0x6555, 0x696a, 0x574c,
-  0x5369, 0x6249, 0x7c5b, 0x4d2d, 0x4c30, 0x6a22, 0x6476, 0x5040,
-  0x7037, 0x6e21, 0x5776, 0x624a, 0x624b, 0x7a4f, 0x6b5f, 0x564b,
-  0x7434, 0x6d4d, 0x6452, 0x6a29, 0x643a, 0x7322, 0x4d52, 0x764b,
-  0x7166, 0x6d41, 0x683c, 0x6e51, 0x7067, 0x624c, 0x642a, 0x7561,
-  0x6d5a, 0x576e, 0x5171, 0x696b, 0x696c, 0x6064, 0x5a27, 0x5d54,
-  0x6a23, 0x5643, 0x5674, 0x5a5f, 0x6f33, 0x624d, 0x6f7d, 0x7268,
-  0x6f45, 0x6767, 0x577d, 0x674e, 0x5f5c, 0x7947, 0x5976, 0x5f2c,
-  0x565a, 0x5c24, 0x7038, 0x557a, 0x6477, 0x5644, 0x746c, 0x6f7e,
-  0x7021, 0x5e2a, 0x5a3c, 0x587c, 0x7a54, 0x6c65, 0x7c28, 0x6c66,
-  0x584b, 0x7b39, 0x6453, 0x4d79, 0x4f53, 0x4a6a, 0x4f54, 0x783d,
-  0x7447, 0x6a5f, 0x795b, 0x5437, 0x6b65, 0x6152, 0x6a24, 0x7a42,
-  0x7b61, 0x7a6d, 0x7022, 0x4c71, 0x7a23, 0x6277, 0x624e, 0x6975,
-  0x616b, 0x6768, 0x6857, 0x5a78, 0x544b, 0x7776, 0x5645, 0x5469,
-  0x7a7a, 0x4c72, 0x775d, 0x5e3a, 0x4e28, 0x7039, 0x647e, 0x6449,
-  0x6454, 0x6a43, 0x6f34, 0x573e, 0x7b62, 0x4d53, 0x6f35, 0x7a69,
-  0x7926, 0x5f3d, 0x7747, 0x787d, 0x787c, 0x5e2b, 0x5b68, 0x635d,
-  0x6162, 0x5146, 0x7650, 0x6b66, 0x5a79, 0x6c47, 0x5e78, 0x7869,
-  0x635e, 0x4e75, 0x7a43, 0x6557, 0x6c48, 0x7349, 0x643b, 0x662e,
-  0x6f36, 0x5c3f, 0x4e3d, 0x5843, 0x504f, 0x4f7a, 0x734a, 0x6057,
-  0x5147, 0x692e, 0x683d, 0x7a44, 0x624f, 0x7a45, 0x7938, 0x5c60,
-  0x7b30, 0x5829, 0x655f, 0x7927, 0x766e, 0x764c, 0x6278, 0x6c71,
-  0x5a60, 0x7152, 0x524c, 0x4f4b, 0x4a3d, 0x5d3f, 0x766f, 0x5e79,
-  0x7a34, 0x552d, 0x7167, 0x5e3e, 0x5c40, 0x5148, 0x5149, 0x783e,
-  0x4b76, 0x5479, 0x7562, 0x6153, 0x5869, 0x787e, 0x4f4c, 0x7d24,
-  0x4e76, 0x7a50, 0x4c73, 0x663e, 0x762e, 0x5570, 0x514a, 0x7c3e,
-  0x5571, 0x4d69, 0x7a35, 0x6250, 0x7477, 0x4d54, 0x6723, 0x5b25,
-  0x6251, 0x5722, 0x7763, 0x6a26, 0x5021, 0x4e5a, 0x7b6b, 0x5b26,
-  0x5b5e, 0x5865, 0x6a60, 0x582a, 0x6560, 0x565b, 0x6f46, 0x786a,
-  0x6455, 0x4e77, 0x6058, 0x576f, 0x746d, 0x4d66, 0x4c74, 0x7563,
-  0x644a, 0x5c61, 0x7948, 0x7c3f, 0x6827, 0x5844, 0x4b3e, 0x5c2e,
-  0x5777, 0x7068, 0x5d40, 0x4f4d, 0x5c73, 0x5930, 0x6669, 0x643c,
-  0x6a44, 0x646c, 0x6465, 0x7b78, 0x4c3b, 0x643d, 0x4d5c, 0x5977,
-  0x5d5f, 0x6d4e, 0x5950, 0x6523, 0x794d, 0x4d2e, 0x4f4e, 0x762f,
-  0x7d53, 0x6b6d, 0x565c, 0x6524, 0x5536, 0x565d, 0x7969, 0x6724,
-  0x5663, 0x514b, 0x5664, 0x5572, 0x5e7a, 0x5778, 0x586a, 0x4f55,
-  0x587d, 0x582b, 0x7d4b, 0x7c5c, 0x6028, 0x5573, 0x7d59, 0x4c23,
-  0x5979, 0x536a, 0x7575, 0x6f47, 0x535a, 0x5a3d, 0x6828, 0x5c2f,
-  0x7023, 0x4d55, 0x6029, 0x5e2c, 0x703a, 0x6e31, 0x6e32, 0x764d,
-  0x6e52, 0x5646, 0x6065, 0x733b, 0x6561, 0x644b, 0x5723, 0x5b42,
-  0x4a7e, 0x4f4f, 0x3021, 0x3022, 0x3023, 0x3024, 0x3025, 0x3026,
-  0x3027, 0x3028, 0x3029, 0x302a, 0x302b, 0x302c, 0x302d, 0x302e,
-  0x302f, 0x3030, 0x3031, 0x3032, 0x3033, 0x3034, 0x3035, 0x3036,
-  0x3037, 0x3038, 0x3039, 0x303a, 0x303b, 0x303c, 0x303d, 0x303e,
-  0x303f, 0x3040, 0x3041, 0x3042, 0x3043, 0x3044, 0x3045, 0x3046,
-  0x3047, 0x3048, 0x3049, 0x304a, 0x304b, 0x304c, 0x304d, 0x304e,
-  0x304f, 0x3050, 0x3051, 0x3052, 0x3053, 0x3054, 0x3055, 0x3056,
-  0x3057, 0x3058, 0x3059, 0x305a, 0x305b, 0x305c, 0x305d, 0x305e,
-  0x305f, 0x3060, 0x3061, 0x3062, 0x3063, 0x3064, 0x3065, 0x3066,
-  0x3067, 0x3068, 0x3069, 0x306a, 0x306b, 0x306c, 0x306d, 0x306e,
-  0x306f, 0x3070, 0x3071, 0x3072, 0x3073, 0x3074, 0x3075, 0x3076,
-  0x3077, 0x3078, 0x3079, 0x307a, 0x307b, 0x307c, 0x307d, 0x307e,
-  0x3121, 0x3122, 0x3123, 0x3124, 0x3125, 0x3126, 0x3127, 0x3128,
-  0x3129, 0x312a, 0x312b, 0x312c, 0x312d, 0x312e, 0x312f, 0x3130,
-  0x3131, 0x3132, 0x3133, 0x3134, 0x3135, 0x3136, 0x3137, 0x3138,
-  0x3139, 0x313a, 0x313b, 0x313c, 0x313d, 0x313e, 0x313f, 0x3140,
-  0x3141, 0x3142, 0x3143, 0x3144, 0x3145, 0x3146, 0x3147, 0x3148,
-  0x3149, 0x314a, 0x314b, 0x314c, 0x314d, 0x314e, 0x314f, 0x3150,
-  0x3151, 0x3152, 0x3153, 0x3154, 0x3155, 0x3156, 0x3157, 0x3158,
-  0x3159, 0x315a, 0x315b, 0x315c, 0x315d, 0x315e, 0x315f, 0x3160,
-  0x3161, 0x3162, 0x3163, 0x3164, 0x3165, 0x3166, 0x3167, 0x3168,
-  0x3169, 0x316a, 0x316b, 0x316c, 0x316d, 0x316e, 0x316f, 0x3170,
-  0x3171, 0x3172, 0x3173, 0x3174, 0x3175, 0x3176, 0x3177, 0x3178,
-  0x3179, 0x317a, 0x317b, 0x317c, 0x317d, 0x317e, 0x3221, 0x3222,
-  0x3223, 0x3224, 0x3225, 0x3226, 0x3227, 0x3228, 0x3229, 0x322a,
-  0x322b, 0x322c, 0x322d, 0x322e, 0x322f, 0x3230, 0x3231, 0x3232,
-  0x3233, 0x3234, 0x3235, 0x3236, 0x3237, 0x3238, 0x3239, 0x323a,
-  0x323b, 0x323c, 0x323d, 0x323e, 0x323f, 0x3240, 0x3241, 0x3242,
-  0x3243, 0x3244, 0x3245, 0x3246, 0x3247, 0x3248, 0x3249, 0x324a,
-  0x324b, 0x324c, 0x324d, 0x324e, 0x324f, 0x3250, 0x3251, 0x3252,
-  0x3253, 0x3254, 0x3255, 0x3256, 0x3257, 0x3258, 0x3259, 0x325a,
-  0x325b, 0x325c, 0x325d, 0x325e, 0x325f, 0x3260, 0x3261, 0x3262,
-  0x3263, 0x3264, 0x3265, 0x3266, 0x3267, 0x3268, 0x3269, 0x326a,
-  0x326b, 0x326c, 0x326d, 0x326e, 0x326f, 0x3270, 0x3271, 0x3272,
-  0x3273, 0x3274, 0x3275, 0x3276, 0x3277, 0x3278, 0x3279, 0x327a,
-  0x327b, 0x327c, 0x327d, 0x327e, 0x3321, 0x3322, 0x3323, 0x3324,
-  0x3325, 0x3326, 0x3327, 0x3328, 0x3329, 0x332a, 0x332b, 0x332c,
-  0x332d, 0x332e, 0x332f, 0x3330, 0x3331, 0x3332, 0x3333, 0x3334,
-  0x3335, 0x3336, 0x3337, 0x3338, 0x3339, 0x333a, 0x333b, 0x333c,
-  0x333d, 0x333e, 0x333f, 0x3340, 0x3341, 0x3342, 0x3343, 0x3344,
-  0x3345, 0x3346, 0x3347, 0x3348, 0x3349, 0x334a, 0x334b, 0x334c,
-  0x334d, 0x334e, 0x334f, 0x3350, 0x3351, 0x3352, 0x3353, 0x3354,
-  0x3355, 0x3356, 0x3357, 0x3358, 0x3359, 0x335a, 0x335b, 0x335c,
-  0x335d, 0x335e, 0x335f, 0x3360, 0x3361, 0x3362, 0x3363, 0x3364,
-  0x3365, 0x3366, 0x3367, 0x3368, 0x3369, 0x336a, 0x336b, 0x336c,
-  0x336d, 0x336e, 0x336f, 0x3370, 0x3371, 0x3372, 0x3373, 0x3374,
-  0x3375, 0x3376, 0x3377, 0x3378, 0x3379, 0x337a, 0x337b, 0x337c,
-  0x337d, 0x337e, 0x3421, 0x3422, 0x3423, 0x3424, 0x3425, 0x3426,
-  0x3427, 0x3428, 0x3429, 0x342a, 0x342b, 0x342c, 0x342d, 0x342e,
-  0x342f, 0x3430, 0x3431, 0x3432, 0x3433, 0x3434, 0x3435, 0x3436,
-  0x3437, 0x3438, 0x3439, 0x343a, 0x343b, 0x343c, 0x343d, 0x343e,
-  0x343f, 0x3440, 0x3441, 0x3442, 0x3443, 0x3444, 0x3445, 0x3446,
-  0x3447, 0x3448, 0x3449, 0x344a, 0x344b, 0x344c, 0x344d, 0x344e,
-  0x344f, 0x3450, 0x3451, 0x3452, 0x3453, 0x3454, 0x3455, 0x3456,
-  0x3457, 0x3458, 0x3459, 0x345a, 0x345b, 0x345c, 0x345d, 0x345e,
-  0x345f, 0x3460, 0x3461, 0x3462, 0x3463, 0x3464, 0x3465, 0x3466,
-  0x3467, 0x3468, 0x3469, 0x346a, 0x346b, 0x346c, 0x346d, 0x346e,
-  0x346f, 0x3470, 0x3471, 0x3472, 0x3473, 0x3474, 0x3475, 0x3476,
-  0x3477, 0x3478, 0x3479, 0x347a, 0x347b, 0x347c, 0x347d, 0x347e,
-  0x3521, 0x3522, 0x3523, 0x3524, 0x3525, 0x3526, 0x3527, 0x3528,
-  0x3529, 0x352a, 0x352b, 0x352c, 0x352d, 0x352e, 0x352f, 0x3530,
-  0x3531, 0x3532, 0x3533, 0x3534, 0x3535, 0x3536, 0x3537, 0x3538,
-  0x3539, 0x353a, 0x353b, 0x353c, 0x353d, 0x353e, 0x353f, 0x3540,
-  0x3541, 0x3542, 0x3543, 0x3544, 0x3545, 0x3546, 0x3547, 0x3548,
-  0x3549, 0x354a, 0x354b, 0x354c, 0x354d, 0x354e, 0x354f, 0x3550,
-  0x3551, 0x3552, 0x3553, 0x3554, 0x3555, 0x3556, 0x3557, 0x3558,
-  0x3559, 0x355a, 0x355b, 0x355c, 0x355d, 0x355e, 0x355f, 0x3560,
-  0x3561, 0x3562, 0x3563, 0x3564, 0x3565, 0x3566, 0x3567, 0x3568,
-  0x3569, 0x356a, 0x356b, 0x356c, 0x356d, 0x356e, 0x356f, 0x3570,
-  0x3571, 0x3572, 0x3573, 0x3574, 0x3575, 0x3576, 0x3577, 0x3578,
-  0x3579, 0x357a, 0x357b, 0x357c, 0x357d, 0x357e, 0x3621, 0x3622,
-  0x3623, 0x3624, 0x3625, 0x3626, 0x3627, 0x3628, 0x3629, 0x362a,
-  0x362b, 0x362c, 0x362d, 0x362e, 0x362f, 0x3630, 0x3631, 0x3632,
-  0x3633, 0x3634, 0x3635, 0x3636, 0x3637, 0x3638, 0x3639, 0x363a,
-  0x363b, 0x363c, 0x363d, 0x363e, 0x363f, 0x3640, 0x3641, 0x3642,
-  0x3643, 0x3644, 0x3645, 0x3646, 0x3647, 0x3648, 0x3649, 0x364a,
-  0x364b, 0x364c, 0x364d, 0x364e, 0x364f, 0x3650, 0x3651, 0x3652,
-  0x3653, 0x3654, 0x3655, 0x3656, 0x3657, 0x3658, 0x3659, 0x365a,
-  0x365b, 0x365c, 0x365d, 0x365e, 0x365f, 0x3660, 0x3661, 0x3662,
-  0x3663, 0x3664, 0x3665, 0x3666, 0x3667, 0x3668, 0x3669, 0x366a,
-  0x366b, 0x366c, 0x366d, 0x366e, 0x366f, 0x3670, 0x3671, 0x3672,
-  0x3673, 0x3674, 0x3675, 0x3676, 0x3677, 0x3678, 0x3679, 0x367a,
-  0x367b, 0x367c, 0x367d, 0x367e, 0x3721, 0x3722, 0x3723, 0x3724,
-  0x3725, 0x3726, 0x3727, 0x3728, 0x3729, 0x372a, 0x372b, 0x372c,
-  0x372d, 0x372e, 0x372f, 0x3730, 0x3731, 0x3732, 0x3733, 0x3734,
-  0x3735, 0x3736, 0x3737, 0x3738, 0x3739, 0x373a, 0x373b, 0x373c,
-  0x373d, 0x373e, 0x373f, 0x3740, 0x3741, 0x3742, 0x3743, 0x3744,
-  0x3745, 0x3746, 0x3747, 0x3748, 0x3749, 0x374a, 0x374b, 0x374c,
-  0x374d, 0x374e, 0x374f, 0x3750, 0x3751, 0x3752, 0x3753, 0x3754,
-  0x3755, 0x3756, 0x3757, 0x3758, 0x3759, 0x375a, 0x375b, 0x375c,
-  0x375d, 0x375e, 0x375f, 0x3760, 0x3761, 0x3762, 0x3763, 0x3764,
-  0x3765, 0x3766, 0x3767, 0x3768, 0x3769, 0x376a, 0x376b, 0x376c,
-  0x376d, 0x376e, 0x376f, 0x3770, 0x3771, 0x3772, 0x3773, 0x3774,
-  0x3775, 0x3776, 0x3777, 0x3778, 0x3779, 0x377a, 0x377b, 0x377c,
-  0x377d, 0x377e, 0x3821, 0x3822, 0x3823, 0x3824, 0x3825, 0x3826,
-  0x3827, 0x3828, 0x3829, 0x382a, 0x382b, 0x382c, 0x382d, 0x382e,
-  0x382f, 0x3830, 0x3831, 0x3832, 0x3833, 0x3834, 0x3835, 0x3836,
-  0x3837, 0x3838, 0x3839, 0x383a, 0x383b, 0x383c, 0x383d, 0x383e,
-  0x383f, 0x3840, 0x3841, 0x3842, 0x3843, 0x3844, 0x3845, 0x3846,
-  0x3847, 0x3848, 0x3849, 0x384a, 0x384b, 0x384c, 0x384d, 0x384e,
-  0x384f, 0x3850, 0x3851, 0x3852, 0x3853, 0x3854, 0x3855, 0x3856,
-  0x3857, 0x3858, 0x3859, 0x385a, 0x385b, 0x385c, 0x385d, 0x385e,
-  0x385f, 0x3860, 0x3861, 0x3862, 0x3863, 0x3864, 0x3865, 0x3866,
-  0x3867, 0x3868, 0x3869, 0x386a, 0x386b, 0x386c, 0x386d, 0x386e,
-  0x386f, 0x3870, 0x3871, 0x3872, 0x3873, 0x3874, 0x3875, 0x3876,
-  0x3877, 0x3878, 0x3879, 0x387a, 0x387b, 0x387c, 0x387d, 0x387e,
-  0x3921, 0x3922, 0x3923, 0x3924, 0x3925, 0x3926, 0x3927, 0x3928,
-  0x3929, 0x392a, 0x392b, 0x392c, 0x392d, 0x392e, 0x392f, 0x3930,
-  0x3931, 0x3932, 0x3933, 0x3934, 0x3935, 0x3936, 0x3937, 0x3938,
-  0x3939, 0x393a, 0x393b, 0x393c, 0x393d, 0x393e, 0x393f, 0x3940,
-  0x3941, 0x3942, 0x3943, 0x3944, 0x3945, 0x3946, 0x3947, 0x3948,
-  0x3949, 0x394a, 0x394b, 0x394c, 0x394d, 0x394e, 0x394f, 0x3950,
-  0x3951, 0x3952, 0x3953, 0x3954, 0x3955, 0x3956, 0x3957, 0x3958,
-  0x3959, 0x395a, 0x395b, 0x395c, 0x395d, 0x395e, 0x395f, 0x3960,
-  0x3961, 0x3962, 0x3963, 0x3964, 0x3965, 0x3966, 0x3967, 0x3968,
-  0x3969, 0x396a, 0x396b, 0x396c, 0x396d, 0x396e, 0x396f, 0x3970,
-  0x3971, 0x3972, 0x3973, 0x3974, 0x3975, 0x3976, 0x3977, 0x3978,
-  0x3979, 0x397a, 0x397b, 0x397c, 0x397d, 0x397e, 0x3a21, 0x3a22,
-  0x3a23, 0x3a24, 0x3a25, 0x3a26, 0x3a27, 0x3a28, 0x3a29, 0x3a2a,
-  0x3a2b, 0x3a2c, 0x3a2d, 0x3a2e, 0x3a2f, 0x3a30, 0x3a31, 0x3a32,
-  0x3a33, 0x3a34, 0x3a35, 0x3a36, 0x3a37, 0x3a38, 0x3a39, 0x3a3a,
-  0x3a3b, 0x3a3c, 0x3a3d, 0x3a3e, 0x3a3f, 0x3a40, 0x3a41, 0x3a42,
-  0x3a43, 0x3a44, 0x3a45, 0x3a46, 0x3a47, 0x3a48, 0x3a49, 0x3a4a,
-  0x3a4b, 0x3a4c, 0x3a4d, 0x3a4e, 0x3a4f, 0x3a50, 0x3a51, 0x3a52,
-  0x3a53, 0x3a54, 0x3a55, 0x3a56, 0x3a57, 0x3a58, 0x3a59, 0x3a5a,
-  0x3a5b, 0x3a5c, 0x3a5d, 0x3a5e, 0x3a5f, 0x3a60, 0x3a61, 0x3a62,
-  0x3a63, 0x3a64, 0x3a65, 0x3a66, 0x3a67, 0x3a68, 0x3a69, 0x3a6a,
-  0x3a6b, 0x3a6c, 0x3a6d, 0x3a6e, 0x3a6f, 0x3a70, 0x3a71, 0x3a72,
-  0x3a73, 0x3a74, 0x3a75, 0x3a76, 0x3a77, 0x3a78, 0x3a79, 0x3a7a,
-  0x3a7b, 0x3a7c, 0x3a7d, 0x3a7e, 0x3b21, 0x3b22, 0x3b23, 0x3b24,
-  0x3b25, 0x3b26, 0x3b27, 0x3b28, 0x3b29, 0x3b2a, 0x3b2b, 0x3b2c,
-  0x3b2d, 0x3b2e, 0x3b2f, 0x3b30, 0x3b31, 0x3b32, 0x3b33, 0x3b34,
-  0x3b35, 0x3b36, 0x3b37, 0x3b38, 0x3b39, 0x3b3a, 0x3b3b, 0x3b3c,
-  0x3b3d, 0x3b3e, 0x3b3f, 0x3b40, 0x3b41, 0x3b42, 0x3b43, 0x3b44,
-  0x3b45, 0x3b46, 0x3b47, 0x3b48, 0x3b49, 0x3b4a, 0x3b4b, 0x3b4c,
-  0x3b4d, 0x3b4e, 0x3b4f, 0x3b50, 0x3b51, 0x3b52, 0x3b53, 0x3b54,
-  0x3b55, 0x3b56, 0x3b57, 0x3b58, 0x3b59, 0x3b5a, 0x3b5b, 0x3b5c,
-  0x3b5d, 0x3b5e, 0x3b5f, 0x3b60, 0x3b61, 0x3b62, 0x3b63, 0x3b64,
-  0x3b65, 0x3b66, 0x3b67, 0x3b68, 0x3b69, 0x3b6a, 0x3b6b, 0x3b6c,
-  0x3b6d, 0x3b6e, 0x3b6f, 0x3b70, 0x3b71, 0x3b72, 0x3b73, 0x3b74,
-  0x3b75, 0x3b76, 0x3b77, 0x3b78, 0x3b79, 0x3b7a, 0x3b7b, 0x3b7c,
-  0x3b7d, 0x3b7e, 0x3c21, 0x3c22, 0x3c23, 0x3c24, 0x3c25, 0x3c26,
-  0x3c27, 0x3c28, 0x3c29, 0x3c2a, 0x3c2b, 0x3c2c, 0x3c2d, 0x3c2e,
-  0x3c2f, 0x3c30, 0x3c31, 0x3c32, 0x3c33, 0x3c34, 0x3c35, 0x3c36,
-  0x3c37, 0x3c38, 0x3c39, 0x3c3a, 0x3c3b, 0x3c3c, 0x3c3d, 0x3c3e,
-  0x3c3f, 0x3c40, 0x3c41, 0x3c42, 0x3c43, 0x3c44, 0x3c45, 0x3c46,
-  0x3c47, 0x3c48, 0x3c49, 0x3c4a, 0x3c4b, 0x3c4c, 0x3c4d, 0x3c4e,
-  0x3c4f, 0x3c50, 0x3c51, 0x3c52, 0x3c53, 0x3c54, 0x3c55, 0x3c56,
-  0x3c57, 0x3c58, 0x3c59, 0x3c5a, 0x3c5b, 0x3c5c, 0x3c5d, 0x3c5e,
-  0x3c5f, 0x3c60, 0x3c61, 0x3c62, 0x3c63, 0x3c64, 0x3c65, 0x3c66,
-  0x3c67, 0x3c68, 0x3c69, 0x3c6a, 0x3c6b, 0x3c6c, 0x3c6d, 0x3c6e,
-  0x3c6f, 0x3c70, 0x3c71, 0x3c72, 0x3c73, 0x3c74, 0x3c75, 0x3c76,
-  0x3c77, 0x3c78, 0x3c79, 0x3c7a, 0x3c7b, 0x3c7c, 0x3c7d, 0x3c7e,
-  0x3d21, 0x3d22, 0x3d23, 0x3d24, 0x3d25, 0x3d26, 0x3d27, 0x3d28,
-  0x3d29, 0x3d2a, 0x3d2b, 0x3d2c, 0x3d2d, 0x3d2e, 0x3d2f, 0x3d30,
-  0x3d31, 0x3d32, 0x3d33, 0x3d34, 0x3d35, 0x3d36, 0x3d37, 0x3d38,
-  0x3d39, 0x3d3a, 0x3d3b, 0x3d3c, 0x3d3d, 0x3d3e, 0x3d3f, 0x3d40,
-  0x3d41, 0x3d42, 0x3d43, 0x3d44, 0x3d45, 0x3d46, 0x3d47, 0x3d48,
-  0x3d49, 0x3d4a, 0x3d4b, 0x3d4c, 0x3d4d, 0x3d4e, 0x3d4f, 0x3d50,
-  0x3d51, 0x3d52, 0x3d53, 0x3d54, 0x3d55, 0x3d56, 0x3d57, 0x3d58,
-  0x3d59, 0x3d5a, 0x3d5b, 0x3d5c, 0x3d5d, 0x3d5e, 0x3d5f, 0x3d60,
-  0x3d61, 0x3d62, 0x3d63, 0x3d64, 0x3d65, 0x3d66, 0x3d67, 0x3d68,
-  0x3d69, 0x3d6a, 0x3d6b, 0x3d6c, 0x3d6d, 0x3d6e, 0x3d6f, 0x3d70,
-  0x3d71, 0x3d72, 0x3d73, 0x3d74, 0x3d75, 0x3d76, 0x3d77, 0x3d78,
-  0x3d79, 0x3d7a, 0x3d7b, 0x3d7c, 0x3d7d, 0x3d7e, 0x3e21, 0x3e22,
-  0x3e23, 0x3e24, 0x3e25, 0x3e26, 0x3e27, 0x3e28, 0x3e29, 0x3e2a,
-  0x3e2b, 0x3e2c, 0x3e2d, 0x3e2e, 0x3e2f, 0x3e30, 0x3e31, 0x3e32,
-  0x3e33, 0x3e34, 0x3e35, 0x3e36, 0x3e37, 0x3e38, 0x3e39, 0x3e3a,
-  0x3e3b, 0x3e3c, 0x3e3d, 0x3e3e, 0x3e3f, 0x3e40, 0x3e41, 0x3e42,
-  0x3e43, 0x3e44, 0x3e45, 0x3e46, 0x3e47, 0x3e48, 0x3e49, 0x3e4a,
-  0x3e4b, 0x3e4c, 0x3e4d, 0x3e4e, 0x3e4f, 0x3e50, 0x3e51, 0x3e52,
-  0x3e53, 0x3e54, 0x3e55, 0x3e56, 0x3e57, 0x3e58, 0x3e59, 0x3e5a,
-  0x3e5b, 0x3e5c, 0x3e5d, 0x3e5e, 0x3e5f, 0x3e60, 0x3e61, 0x3e62,
-  0x3e63, 0x3e64, 0x3e65, 0x3e66, 0x3e67, 0x3e68, 0x3e69, 0x3e6a,
-  0x3e6b, 0x3e6c, 0x3e6d, 0x3e6e, 0x3e6f, 0x3e70, 0x3e71, 0x3e72,
-  0x3e73, 0x3e74, 0x3e75, 0x3e76, 0x3e77, 0x3e78, 0x3e79, 0x3e7a,
-  0x3e7b, 0x3e7c, 0x3e7d, 0x3e7e, 0x3f21, 0x3f22, 0x3f23, 0x3f24,
-  0x3f25, 0x3f26, 0x3f27, 0x3f28, 0x3f29, 0x3f2a, 0x3f2b, 0x3f2c,
-  0x3f2d, 0x3f2e, 0x3f2f, 0x3f30, 0x3f31, 0x3f32, 0x3f33, 0x3f34,
-  0x3f35, 0x3f36, 0x3f37, 0x3f38, 0x3f39, 0x3f3a, 0x3f3b, 0x3f3c,
-  0x3f3d, 0x3f3e, 0x3f3f, 0x3f40, 0x3f41, 0x3f42, 0x3f43, 0x3f44,
-  0x3f45, 0x3f46, 0x3f47, 0x3f48, 0x3f49, 0x3f4a, 0x3f4b, 0x3f4c,
-  0x3f4d, 0x3f4e, 0x3f4f, 0x3f50, 0x3f51, 0x3f52, 0x3f53, 0x3f54,
-  0x3f55, 0x3f56, 0x3f57, 0x3f58, 0x3f59, 0x3f5a, 0x3f5b, 0x3f5c,
-  0x3f5d, 0x3f5e, 0x3f5f, 0x3f60, 0x3f61, 0x3f62, 0x3f63, 0x3f64,
-  0x3f65, 0x3f66, 0x3f67, 0x3f68, 0x3f69, 0x3f6a, 0x3f6b, 0x3f6c,
-  0x3f6d, 0x3f6e, 0x3f6f, 0x3f70, 0x3f71, 0x3f72, 0x3f73, 0x3f74,
-  0x3f75, 0x3f76, 0x3f77, 0x3f78, 0x3f79, 0x3f7a, 0x3f7b, 0x3f7c,
-  0x3f7d, 0x3f7e, 0x4021, 0x4022, 0x4023, 0x4024, 0x4025, 0x4026,
-  0x4027, 0x4028, 0x4029, 0x402a, 0x402b, 0x402c, 0x402d, 0x402e,
-  0x402f, 0x4030, 0x4031, 0x4032, 0x4033, 0x4034, 0x4035, 0x4036,
-  0x4037, 0x4038, 0x4039, 0x403a, 0x403b, 0x403c, 0x403d, 0x403e,
-  0x403f, 0x4040, 0x4041, 0x4042, 0x4043, 0x4044, 0x4045, 0x4046,
-  0x4047, 0x4048, 0x4049, 0x404a, 0x404b, 0x404c, 0x404d, 0x404e,
-  0x404f, 0x4050, 0x4051, 0x4052, 0x4053, 0x4054, 0x4055, 0x4056,
-  0x4057, 0x4058, 0x4059, 0x405a, 0x405b, 0x405c, 0x405d, 0x405e,
-  0x405f, 0x4060, 0x4061, 0x4062, 0x4063, 0x4064, 0x4065, 0x4066,
-  0x4067, 0x4068, 0x4069, 0x406a, 0x406b, 0x406c, 0x406d, 0x406e,
-  0x406f, 0x4070, 0x4071, 0x4072, 0x4073, 0x4074, 0x4075, 0x4076,
-  0x4077, 0x4078, 0x4079, 0x407a, 0x407b, 0x407c, 0x407d, 0x407e,
-  0x4121, 0x4122, 0x4123, 0x4124, 0x4125, 0x4126, 0x4127, 0x4128,
-  0x4129, 0x412a, 0x412b, 0x412c, 0x412d, 0x412e, 0x412f, 0x4130,
-  0x4131, 0x4132, 0x4133, 0x4134, 0x4135, 0x4136, 0x4137, 0x4138,
-  0x4139, 0x413a, 0x413b, 0x413c, 0x413d, 0x413e, 0x413f, 0x4140,
-  0x4141, 0x4142, 0x4143, 0x4144, 0x4145, 0x4146, 0x4147, 0x4148,
-  0x4149, 0x414a, 0x414b, 0x414c, 0x414d, 0x414e, 0x414f, 0x4150,
-  0x4151, 0x4152, 0x4153, 0x4154, 0x4155, 0x4156, 0x4157, 0x4158,
-  0x4159, 0x415a, 0x415b, 0x415c, 0x415d, 0x415e, 0x415f, 0x4160,
-  0x4161, 0x4162, 0x4163, 0x4164, 0x4165, 0x4166, 0x4167, 0x4168,
-  0x4169, 0x416a, 0x416b, 0x416c, 0x416d, 0x416e, 0x416f, 0x4170,
-  0x4171, 0x4172, 0x4173, 0x4174, 0x4175, 0x4176, 0x4177, 0x4178,
-  0x4179, 0x417a, 0x417b, 0x417c, 0x417d, 0x417e, 0x4221, 0x4222,
-  0x4223, 0x4224, 0x4225, 0x4226, 0x4227, 0x4228, 0x4229, 0x422a,
-  0x422b, 0x422c, 0x422d, 0x422e, 0x422f, 0x4230, 0x4231, 0x4232,
-  0x4233, 0x4234, 0x4235, 0x4236, 0x4237, 0x4238, 0x4239, 0x423a,
-  0x423b, 0x423c, 0x423d, 0x423e, 0x423f, 0x4240, 0x4241, 0x4242,
-  0x4243, 0x4244, 0x4245, 0x4246, 0x4247, 0x4248, 0x4249, 0x424a,
-  0x424b, 0x424c, 0x424d, 0x424e, 0x424f, 0x4250, 0x4251, 0x4252,
-  0x4253, 0x4254, 0x4255, 0x4256, 0x4257, 0x4258, 0x4259, 0x425a,
-  0x425b, 0x425c, 0x425d, 0x425e, 0x425f, 0x4260, 0x4261, 0x4262,
-  0x4263, 0x4264, 0x4265, 0x4266, 0x4267, 0x4268, 0x4269, 0x426a,
-  0x426b, 0x426c, 0x426d, 0x426e, 0x426f, 0x4270, 0x4271, 0x4272,
-  0x4273, 0x4274, 0x4275, 0x4276, 0x4277, 0x4278, 0x4279, 0x427a,
-  0x427b, 0x427c, 0x427d, 0x427e, 0x4321, 0x4322, 0x4323, 0x4324,
-  0x4325, 0x4326, 0x4327, 0x4328, 0x4329, 0x432a, 0x432b, 0x432c,
-  0x432d, 0x432e, 0x432f, 0x4330, 0x4331, 0x4332, 0x4333, 0x4334,
-  0x4335, 0x4336, 0x4337, 0x4338, 0x4339, 0x433a, 0x433b, 0x433c,
-  0x433d, 0x433e, 0x433f, 0x4340, 0x4341, 0x4342, 0x4343, 0x4344,
-  0x4345, 0x4346, 0x4347, 0x4348, 0x4349, 0x434a, 0x434b, 0x434c,
-  0x434d, 0x434e, 0x434f, 0x4350, 0x4351, 0x4352, 0x4353, 0x4354,
-  0x4355, 0x4356, 0x4357, 0x4358, 0x4359, 0x435a, 0x435b, 0x435c,
-  0x435d, 0x435e, 0x435f, 0x4360, 0x4361, 0x4362, 0x4363, 0x4364,
-  0x4365, 0x4366, 0x4367, 0x4368, 0x4369, 0x436a, 0x436b, 0x436c,
-  0x436d, 0x436e, 0x436f, 0x4370, 0x4371, 0x4372, 0x4373, 0x4374,
-  0x4375, 0x4376, 0x4377, 0x4378, 0x4379, 0x437a, 0x437b, 0x437c,
-  0x437d, 0x437e, 0x4421, 0x4422, 0x4423, 0x4424, 0x4425, 0x4426,
-  0x4427, 0x4428, 0x4429, 0x442a, 0x442b, 0x442c, 0x442d, 0x442e,
-  0x442f, 0x4430, 0x4431, 0x4432, 0x4433, 0x4434, 0x4435, 0x4436,
-  0x4437, 0x4438, 0x4439, 0x443a, 0x443b, 0x443c, 0x443d, 0x443e,
-  0x443f, 0x4440, 0x4441, 0x4442, 0x4443, 0x4444, 0x4445, 0x4446,
-  0x4447, 0x4448, 0x4449, 0x444a, 0x444b, 0x444c, 0x444d, 0x444e,
-  0x444f, 0x4450, 0x4451, 0x4452, 0x4453, 0x4454, 0x4455, 0x4456,
-  0x4457, 0x4458, 0x4459, 0x445a, 0x445b, 0x445c, 0x445d, 0x445e,
-  0x445f, 0x4460, 0x4461, 0x4462, 0x4463, 0x4464, 0x4465, 0x4466,
-  0x4467, 0x4468, 0x4469, 0x446a, 0x446b, 0x446c, 0x446d, 0x446e,
-  0x446f, 0x4470, 0x4471, 0x4472, 0x4473, 0x4474, 0x4475, 0x4476,
-  0x4477, 0x4478, 0x4479, 0x447a, 0x447b, 0x447c, 0x447d, 0x447e,
-  0x4521, 0x4522, 0x4523, 0x4524, 0x4525, 0x4526, 0x4527, 0x4528,
-  0x4529, 0x452a, 0x452b, 0x452c, 0x452d, 0x452e, 0x452f, 0x4530,
-  0x4531, 0x4532, 0x4533, 0x4534, 0x4535, 0x4536, 0x4537, 0x4538,
-  0x4539, 0x453a, 0x453b, 0x453c, 0x453d, 0x453e, 0x453f, 0x4540,
-  0x4541, 0x4542, 0x4543, 0x4544, 0x4545, 0x4546, 0x4547, 0x4548,
-  0x4549, 0x454a, 0x454b, 0x454c, 0x454d, 0x454e, 0x454f, 0x4550,
-  0x4551, 0x4552, 0x4553, 0x4554, 0x4555, 0x4556, 0x4557, 0x4558,
-  0x4559, 0x455a, 0x455b, 0x455c, 0x455d, 0x455e, 0x455f, 0x4560,
-  0x4561, 0x4562, 0x4563, 0x4564, 0x4565, 0x4566, 0x4567, 0x4568,
-  0x4569, 0x456a, 0x456b, 0x456c, 0x456d, 0x456e, 0x456f, 0x4570,
-  0x4571, 0x4572, 0x4573, 0x4574, 0x4575, 0x4576, 0x4577, 0x4578,
-  0x4579, 0x457a, 0x457b, 0x457c, 0x457d, 0x457e, 0x4621, 0x4622,
-  0x4623, 0x4624, 0x4625, 0x4626, 0x4627, 0x4628, 0x4629, 0x462a,
-  0x462b, 0x462c, 0x462d, 0x462e, 0x462f, 0x4630, 0x4631, 0x4632,
-  0x4633, 0x4634, 0x4635, 0x4636, 0x4637, 0x4638, 0x4639, 0x463a,
-  0x463b, 0x463c, 0x463d, 0x463e, 0x463f, 0x4640, 0x4641, 0x4642,
-  0x4643, 0x4644, 0x4645, 0x4646, 0x4647, 0x4648, 0x4649, 0x464a,
-  0x464b, 0x464c, 0x464d, 0x464e, 0x464f, 0x4650, 0x4651, 0x4652,
-  0x4653, 0x4654, 0x4655, 0x4656, 0x4657, 0x4658, 0x4659, 0x465a,
-  0x465b, 0x465c, 0x465d, 0x465e, 0x465f, 0x4660, 0x4661, 0x4662,
-  0x4663, 0x4664, 0x4665, 0x4666, 0x4667, 0x4668, 0x4669, 0x466a,
-  0x466b, 0x466c, 0x466d, 0x466e, 0x466f, 0x4670, 0x4671, 0x4672,
-  0x4673, 0x4674, 0x4675, 0x4676, 0x4677, 0x4678, 0x4679, 0x467a,
-  0x467b, 0x467c, 0x467d, 0x467e, 0x4721, 0x4722, 0x4723, 0x4724,
-  0x4725, 0x4726, 0x4727, 0x4728, 0x4729, 0x472a, 0x472b, 0x472c,
-  0x472d, 0x472e, 0x472f, 0x4730, 0x4731, 0x4732, 0x4733, 0x4734,
-  0x4735, 0x4736, 0x4737, 0x4738, 0x4739, 0x473a, 0x473b, 0x473c,
-  0x473d, 0x473e, 0x473f, 0x4740, 0x4741, 0x4742, 0x4743, 0x4744,
-  0x4745, 0x4746, 0x4747, 0x4748, 0x4749, 0x474a, 0x474b, 0x474c,
-  0x474d, 0x474e, 0x474f, 0x4750, 0x4751, 0x4752, 0x4753, 0x4754,
-  0x4755, 0x4756, 0x4757, 0x4758, 0x4759, 0x475a, 0x475b, 0x475c,
-  0x475d, 0x475e, 0x475f, 0x4760, 0x4761, 0x4762, 0x4763, 0x4764,
-  0x4765, 0x4766, 0x4767, 0x4768, 0x4769, 0x476a, 0x476b, 0x476c,
-  0x476d, 0x476e, 0x476f, 0x4770, 0x4771, 0x4772, 0x4773, 0x4774,
-  0x4775, 0x4776, 0x4777, 0x4778, 0x4779, 0x477a, 0x477b, 0x477c,
-  0x477d, 0x477e, 0x4821, 0x4822, 0x4823, 0x4824, 0x4825, 0x4826,
-  0x4827, 0x4828, 0x4829, 0x482a, 0x482b, 0x482c, 0x482d, 0x482e,
-  0x482f, 0x4830, 0x4831, 0x4832, 0x4833, 0x4834, 0x4835, 0x4836,
-  0x4837, 0x4838, 0x4839, 0x483a, 0x483b, 0x483c, 0x483d, 0x483e,
-  0x483f, 0x4840, 0x4841, 0x4842, 0x4843, 0x4844, 0x4845, 0x4846,
-  0x4847, 0x4848, 0x4849, 0x484a, 0x484b, 0x484c, 0x484d, 0x484e,
-  0x484f, 0x4850, 0x4851, 0x4852, 0x4853, 0x4854, 0x4855, 0x4856,
-  0x4857, 0x4858, 0x4859, 0x485a, 0x485b, 0x485c, 0x485d, 0x485e,
-  0x485f, 0x4860, 0x4861, 0x4862, 0x4863, 0x4864, 0x4865, 0x4866,
-  0x4867, 0x4868, 0x4869, 0x486a, 0x486b, 0x486c, 0x486d, 0x486e,
-  0x486f, 0x4870, 0x4871, 0x4872, 0x4873, 0x4874, 0x4875, 0x4876,
-  0x4877, 0x4878, 0x4879, 0x487a, 0x487b, 0x487c, 0x487d, 0x487e,
-  0x4b50, 0x4b56, 0x4b67, 0x4d4f, 0x4d68, 0x4e2d, 0x4f7b, 0x5022,
-  0x5038, 0x5050, 0x505d, 0x5154, 0x5155, 0x5158, 0x515b, 0x515c,
-  0x515d, 0x515e, 0x515f, 0x5160, 0x5162, 0x5163, 0x5164, 0x5165,
-  0x5166, 0x5168, 0x5169, 0x516a, 0x516b, 0x516d, 0x516f, 0x5170,
-  0x5172, 0x5176, 0x517a, 0x517c, 0x517d, 0x517e, 0x5222, 0x5223,
-  0x5227, 0x5228, 0x5229, 0x522a, 0x522b, 0x522d, 0x5232, 0x523e,
-  0x5242, 0x5243, 0x5244, 0x5246, 0x5247, 0x5248, 0x5249, 0x524a,
-  0x524b, 0x524d, 0x524e, 0x524f, 0x5250, 0x5251, 0x5252, 0x5253,
-  0x5254, 0x5255, 0x5256, 0x5257, 0x5259, 0x525a, 0x525e, 0x525f,
-  0x5261, 0x5262, 0x5264, 0x5265, 0x5266, 0x5267, 0x5268, 0x5269,
-  0x526a, 0x526b, 0x5270, 0x5271, 0x5272, 0x5273, 0x5274, 0x5275,
-  0x5277, 0x5278, 0x5466, 0x547c, 0x5525, 0x552b, 0x552e, 0x5638,
-  0x564d, 0x574b, 0x5764, 0x5b45, 0x5b64, 0x5c25, 0x5d25, 0x5d55,
-  0x5d74, 0x5e7c, 0x5e7e, 0x5f33, 0x5f61, 0x5f68, 0x6071, 0x612d,
-  0x616d, 0x6375, 0x6421, 0x6429, 0x652e, 0x6531, 0x6532, 0x6539,
-  0x653b, 0x653c, 0x6544, 0x654e, 0x6550, 0x6552, 0x6556, 0x657a,
-  0x657b, 0x657c, 0x657e, 0x6621, 0x6624, 0x6627, 0x662d, 0x662f,
-  0x6630, 0x6631, 0x6633, 0x6637, 0x6638, 0x663c, 0x6644, 0x6646,
-  0x6647, 0x664a, 0x6652, 0x6656, 0x6659, 0x665c, 0x665f, 0x6661,
-  0x6664, 0x6665, 0x6666, 0x6668, 0x666a, 0x666b, 0x666c, 0x666f,
-  0x6671, 0x6672, 0x6675, 0x6676, 0x6677, 0x6679, 0x6721, 0x6726,
-  0x6729, 0x672a, 0x672c, 0x672d, 0x6730, 0x673f, 0x6741, 0x6746,
-  0x6747, 0x674b, 0x674d, 0x674f, 0x6750, 0x6753, 0x675f, 0x6764,
-  0x6766, 0x6777, 0x6867, 0x6868, 0x6870, 0x6871, 0x6877, 0x6879,
-  0x687b, 0x687e, 0x6927, 0x692c, 0x694c, 0x6977, 0x6a41, 0x6a65,
-  0x6a74, 0x6a77, 0x6a7c, 0x6a7e, 0x6b24, 0x6b27, 0x6b29, 0x6b2a,
-  0x6b3a, 0x6b3b, 0x6b3d, 0x6b41, 0x6b42, 0x6b46, 0x6b47, 0x6b4c,
-  0x6b4f, 0x6b50, 0x6b51, 0x6b52, 0x6b58, 0x6c26, 0x6c27, 0x6c2a,
-  0x6c2f, 0x6c30, 0x6c31, 0x6c32, 0x6c35, 0x6c38, 0x6c3a, 0x6c40,
-  0x6c41, 0x6c45, 0x6c46, 0x6c49, 0x6c4a, 0x6c55, 0x6c5d, 0x6c5e,
-  0x6c61, 0x6c64, 0x6c67, 0x6c68, 0x6c77, 0x6c78, 0x6c7a, 0x6d21,
-  0x6d22, 0x6d23, 0x6d6e, 0x6e5b, 0x723d, 0x727a, 0x7331, 0x7427,
-  0x746e, 0x7674, 0x7676, 0x7738, 0x7748, 0x7753, 0x785b, 0x7870,
-  0x7a21, 0x7a22, 0x7a66, 0x7c29, 0x2321, 0x2322, 0x2323, 0x2324,
-  0x2325, 0x2326, 0x2327, 0x2328, 0x2329, 0x232a, 0x232b, 0x232c,
-  0x232d, 0x232e, 0x232f, 0x2330, 0x2331, 0x2332, 0x2333, 0x2334,
-  0x2335, 0x2336, 0x2337, 0x2338, 0x2339, 0x233a, 0x233b, 0x233c,
-  0x233d, 0x233e, 0x233f, 0x2340, 0x2341, 0x2342, 0x2343, 0x2344,
-  0x2345, 0x2346, 0x2347, 0x2348, 0x2349, 0x234a, 0x234b, 0x234c,
-  0x234d, 0x234e, 0x234f, 0x2350, 0x2351, 0x2352, 0x2353, 0x2354,
-  0x2355, 0x2356, 0x2357, 0x2358, 0x2359, 0x235a, 0x235b, 0x212c,
-  0x235d, 0x235e, 0x235f, 0x2360, 0x2361, 0x2362, 0x2363, 0x2364,
-  0x2365, 0x2366, 0x2367, 0x2368, 0x2369, 0x236a, 0x236b, 0x236c,
-  0x236d, 0x236e, 0x236f, 0x2370, 0x2371, 0x2372, 0x2373, 0x2374,
-  0x2375, 0x2376, 0x2377, 0x2378, 0x2379, 0x237a, 0x237b, 0x237c,
-  0x237d, 0x2226, 0x214b, 0x214c, 0x217e, 0x237e, 0x214d, 0x235c,
-};
-
-static const Summary16 ksc5601_uni2indx_page00[70] = {
-  /* 0x0000 */
-  {    0, 0x0000 }, {    0, 0x0000 }, {    0, 0x0000 }, {    0, 0x0000 },
-  {    0, 0x0000 }, {    0, 0x0000 }, {    0, 0x0000 }, {    0, 0x0000 },
-  {    0, 0x0000 }, {    0, 0x0000 }, {    0, 0x2592 }, {    6, 0xf7df },
-  {   20, 0x0040 }, {   21, 0xc181 }, {   26, 0x0040 }, {   27, 0x4181 },
-  /* 0x0100 */
-  {   31, 0x0000 }, {   31, 0x0002 }, {   32, 0x00c0 }, {   34, 0x810e },
-  {   39, 0x0e07 }, {   45, 0x000c }, {   47, 0x00c0 }, {   49, 0x0000 },
-  {   49, 0x0000 }, {   49, 0x0000 }, {   49, 0x0000 }, {   49, 0x0000 },
-  {   49, 0x0000 }, {   49, 0x0000 }, {   49, 0x0000 }, {   49, 0x0000 },
-  /* 0x0200 */
-  {   49, 0x0000 }, {   49, 0x0000 }, {   49, 0x0000 }, {   49, 0x0000 },
-  {   49, 0x0000 }, {   49, 0x0000 }, {   49, 0x0000 }, {   49, 0x0000 },
-  {   49, 0x0000 }, {   49, 0x0000 }, {   49, 0x0000 }, {   49, 0x0000 },
-  {   49, 0x0080 }, {   50, 0x2f01 }, {   56, 0x0000 }, {   56, 0x0000 },
-  /* 0x0300 */
-  {   56, 0x0000 }, {   56, 0x0000 }, {   56, 0x0000 }, {   56, 0x0000 },
-  {   56, 0x0000 }, {   56, 0x0000 }, {   56, 0x0000 }, {   56, 0x0000 },
-  {   56, 0x0000 }, {   56, 0xfffe }, {   71, 0x03fb }, {   80, 0xfffe },
-  {   95, 0x03fb }, {  104, 0x0000 }, {  104, 0x0000 }, {  104, 0x0000 },
-  /* 0x0400 */
-  {  104, 0x0002 }, {  105, 0xffff }, {  121, 0xffff }, {  137, 0xffff },
-  {  153, 0xffff }, {  169, 0x0002 },
-};
-static const Summary16 ksc5601_uni2indx_page20[103] = {
-  /* 0x2000 */
-  {  170, 0x0000 }, {  170, 0x3320 }, {  175, 0x0063 }, {  179, 0x080d },
-  {  183, 0x0000 }, {  183, 0x0000 }, {  183, 0x0000 }, {  183, 0x8010 },
-  {  185, 0x001e }, {  189, 0x0000 }, {  189, 0x0000 }, {  189, 0x0000 },
-  {  189, 0x0000 }, {  189, 0x0000 }, {  189, 0x0000 }, {  189, 0x0000 },
-  /* 0x2100 */
-  {  189, 0x0208 }, {  191, 0x0048 }, {  193, 0x0846 }, {  197, 0x0000 },
-  {  197, 0x0000 }, {  197, 0x7818 }, {  203, 0x03ff }, {  213, 0x03ff },
-  {  223, 0x0000 }, {  223, 0x03ff }, {  233, 0x0000 }, {  233, 0x0000 },
-  {  233, 0x0000 }, {  233, 0x0014 }, {  235, 0x0000 }, {  235, 0x0000 },
-  /* 0x2200 */
-  {  235, 0x898d }, {  242, 0x6402 }, {  246, 0x5fa1 }, {  255, 0x3030 },
-  {  259, 0x0000 }, {  259, 0x0004 }, {  260, 0x0c33 }, {  266, 0x0000 },
-  {  266, 0x00cc }, {  270, 0x0200 }, {  271, 0x0020 }, {  272, 0x0000 },
-  {  272, 0x0000 }, {  272, 0x0000 }, {  272, 0x0000 }, {  272, 0x0000 },
-  /* 0x2300 */
-  {  272, 0x0000 }, {  272, 0x0004 }, {  273, 0x0000 }, {  273, 0x0000 },
-  {  273, 0x0000 }, {  273, 0x0000 }, {  273, 0x0000 }, {  273, 0x0000 },
-  {  273, 0x0000 }, {  273, 0x0000 }, {  273, 0x0000 }, {  273, 0x0000 },
-  {  273, 0x0000 }, {  273, 0x0000 }, {  273, 0x0000 }, {  273, 0x0000 },
-  /* 0x2400 */
-  {  273, 0x0000 }, {  273, 0x0000 }, {  273, 0x0000 }, {  273, 0x0000 },
-  {  273, 0x0000 }, {  273, 0x0000 }, {  273, 0x7fff }, {  288, 0xfff0 },
-  {  300, 0x0007 }, {  303, 0xf000 }, {  307, 0xffff }, {  323, 0x003f },
-  {  329, 0x0000 }, {  329, 0xffff }, {  345, 0x03ff }, {  355, 0x0000 },
-  /* 0x2500 */
-  {  355, 0xf00f }, {  363, 0xffff }, {  379, 0xffff }, {  395, 0xffff },
-  {  411, 0x0fff }, {  423, 0x0000 }, {  423, 0x0000 }, {  423, 0x0000 },
-  {  423, 0x0000 }, {  423, 0x0004 }, {  424, 0x03fb }, {  433, 0x30cc },
-  {  439, 0xc9c3 }, {  447, 0x0003 }, {  449, 0x0000 }, {  449, 0x0000 },
-  /* 0x2600 */
-  {  449, 0xc060 }, {  453, 0x5000 }, {  455, 0x0000 }, {  455, 0x0000 },
-  {  455, 0x0005 }, {  457, 0x0000 }, {  457, 0x37bb },
-};
-static const Summary16 ksc5601_uni2indx_page30[62] = {
-  /* 0x3000 */
-  {  468, 0xff0f }, {  480, 0x003b }, {  485, 0x0000 }, {  485, 0x0000 },
-  {  485, 0xfffe }, {  500, 0xffff }, {  516, 0xffff }, {  532, 0xffff },
-  {  548, 0xffff }, {  564, 0x000f }, {  568, 0xfffe }, {  583, 0xffff },
-  {  599, 0xffff }, {  615, 0xffff }, {  631, 0xffff }, {  647, 0x007f },
-  /* 0x3100 */
-  {  654, 0x0000 }, {  654, 0x0000 }, {  654, 0x0000 }, {  654, 0xfffe },
-  {  669, 0xffff }, {  685, 0xffff }, {  701, 0xffff }, {  717, 0xffff },
-  {  733, 0x7fff }, {  748, 0x0000 }, {  748, 0x0000 }, {  748, 0x0000 },
-  {  748, 0x0000 }, {  748, 0x0000 }, {  748, 0x0000 }, {  748, 0x0000 },
-  /* 0x3200 */
-  {  748, 0xffff }, {  764, 0x1fff }, {  777, 0x0000 }, {  777, 0x0000 },
-  {  777, 0x0000 }, {  777, 0x0000 }, {  777, 0xffff }, {  793, 0x8fff },
-  {  806, 0x0000 }, {  806, 0x0000 }, {  806, 0x0000 }, {  806, 0x0000 },
-  {  806, 0x0000 }, {  806, 0x0000 }, {  806, 0x0000 }, {  806, 0x0000 },
-  /* 0x3300 */
-  {  806, 0x0000 }, {  806, 0x0000 }, {  806, 0x0000 }, {  806, 0x0000 },
-  {  806, 0x0000 }, {  806, 0x0000 }, {  806, 0x0000 }, {  806, 0x0000 },
-  {  806, 0xff1f }, {  819, 0xffff }, {  835, 0xffff }, {  851, 0xffff },
-  {  867, 0x87ff }, {  879, 0x3949 },
-};
-static const Summary16 ksc5601_uni2indx_page4e[1306] = {
-  /* 0x4e00 */
-  {  886, 0x2f8b }, {  895, 0x4372 }, {  902, 0x2000 }, {  903, 0x0b04 },
-  {  907, 0xe82c }, {  914, 0xe340 }, {  920, 0x2800 }, {  922, 0x40c8 },
-  {  926, 0x5944 }, {  932, 0x4937 }, {  940, 0x7976 }, {  950, 0x0440 },
-  {  952, 0x2c93 }, {  959, 0xa3f0 }, {  967, 0x0038 }, {  970, 0x08c5 },
-  /* 0x4f00 */
-  {  975, 0xee02 }, {  982, 0x0003 }, {  984, 0x8000 }, {  985, 0x3550 },
-  {  991, 0xe1c8 }, {  998, 0x1e23 }, { 1005, 0x8200 }, { 1007, 0xc449 },
-  { 1013, 0xad5a }, { 1022, 0x2942 }, { 1027, 0xc000 }, { 1029, 0x8060 },
-  { 1032, 0x461c }, { 1038, 0xa49a }, { 1045, 0xc003 }, { 1049, 0x052a },
-  /* 0x5000 */
-  { 1054, 0x2a44 }, { 1059, 0xd646 }, { 1067, 0x3dda }, { 1077, 0x0800 },
-  { 1078, 0x8388 }, { 1083, 0x1420 }, { 1086, 0x0020 }, { 1087, 0x0170 },
-  { 1091, 0x2021 }, { 1094, 0x0302 }, { 1097, 0x3000 }, { 1099, 0x40ac },
-  { 1104, 0x8620 }, { 1108, 0x4462 }, { 1113, 0x20a0 }, { 1116, 0x8a00 },
-  /* 0x5100 */
-  { 1119, 0x0253 }, { 1124, 0x8004 }, { 1126, 0x0402 }, { 1128, 0x1484 },
-  { 1132, 0x7bfb }, { 1145, 0x1004 }, { 1147, 0x7fa4 }, { 1157, 0x11e2 },
-  { 1163, 0x2441 }, { 1167, 0x00a4 }, { 1170, 0x1421 }, { 1174, 0x20c0 },
-  { 1177, 0x3a50 }, { 1183, 0x7000 }, { 1186, 0x0002 }, { 1187, 0x2743 },
-  /* 0x5200 */
-  { 1194, 0x45c9 }, { 1201, 0x2082 }, { 1204, 0x4630 }, { 1209, 0x0fc1 },
-  { 1216, 0x3c88 }, { 1222, 0x2850 }, { 1226, 0x8602 }, { 1230, 0xa024 },
-  { 1234, 0x2388 }, { 1239, 0x8806 }, { 1243, 0x0e19 }, { 1249, 0x4000 },
-  { 1250, 0x22aa }, { 1256, 0xeb64 }, { 1265, 0x001c }, { 1268, 0xcd28 },
-  /* 0x5300 */
-  { 1275, 0xa120 }, { 1279, 0x02e1 }, { 1284, 0x840b }, { 1289, 0x8200 },
-  { 1291, 0x279b }, { 1300, 0x549e }, { 1308, 0x8141 }, { 1312, 0xa0b3 },
-  { 1319, 0x0010 }, { 1320, 0x8508 }, { 1324, 0x2061 }, { 1328, 0x0800 },
-  { 1329, 0x2f08 }, { 1335, 0x08d0 }, { 1339, 0xbe3e }, { 1350, 0x010f },
-  /* 0x5400 */
-  { 1355, 0xf718 }, { 1364, 0xa803 }, { 1369, 0x0a41 }, { 1373, 0x5b08 },
-  { 1379, 0x0504 }, { 1382, 0x0002 }, { 1383, 0x0500 }, { 1385, 0x382a },
-  { 1391, 0x5041 }, { 1395, 0x0001 }, { 1396, 0x1910 }, { 1400, 0x2108 },
-  { 1403, 0x0313 }, { 1408, 0x0000 }, { 1408, 0x6122 }, { 1413, 0x0404 },
-  /* 0x5500 */
-  { 1415, 0x40d0 }, { 1419, 0x1001 }, { 1421, 0x8000 }, { 1422, 0x4022 },
-  { 1425, 0x8050 }, { 1428, 0x4048 }, { 1431, 0x0008 }, { 1432, 0x1000 },
-  { 1433, 0x06d1 }, { 1439, 0x3700 }, { 1444, 0x5e80 }, { 1450, 0x0000 },
-  { 1450, 0x00a0 }, { 1452, 0x9410 }, { 1456, 0x0018 }, { 1458, 0x6000 },
-  /* 0x5600 */
-  { 1460, 0x0240 }, { 1462, 0x0090 }, { 1464, 0x8000 }, { 1465, 0x0054 },
-  { 1468, 0x0000 }, { 1468, 0x0008 }, { 1469, 0x0900 }, { 1471, 0x0010 },
-  { 1472, 0x0040 }, { 1473, 0x0000 }, { 1473, 0x5020 }, { 1476, 0x1010 },
-  { 1478, 0x2400 }, { 1480, 0x4c02 }, { 1484, 0x0001 }, { 1485, 0x0601 },
-  /* 0x5700 */
-  { 1488, 0x2918 }, { 1493, 0x814c }, { 1498, 0x2100 }, { 1500, 0x0801 },
-  { 1502, 0x6485 }, { 1508, 0x0003 }, { 1510, 0x4452 }, { 1515, 0x1021 },
-  { 1518, 0x0904 }, { 1521, 0x0008 }, { 1522, 0x000d }, { 1525, 0x0000 },
-  { 1525, 0x4988 }, { 1530, 0x8000 }, { 1531, 0x0001 }, { 1532, 0x1691 },
-  /* 0x5800 */
-  { 1538, 0x0765 }, { 1545, 0x4000 }, { 1546, 0x8492 }, { 1551, 0x0433 },
-  { 1556, 0x8c00 }, { 1559, 0x4592 }, { 1565, 0x0016 }, { 1568, 0x5220 },
-  { 1572, 0x0228 }, { 1575, 0xd008 }, { 1579, 0x4300 }, { 1582, 0x4c08 },
-  { 1586, 0x40a2 }, { 1590, 0xc32a }, { 1597, 0x9810 }, { 1601, 0x2e00 },
-  /* 0x5900 */
-  { 1605, 0x8000 }, { 1606, 0x1670 }, { 1612, 0x6e84 }, { 1619, 0x4082 },
-  { 1622, 0xc390 }, { 1628, 0x04b3 }, { 1634, 0x7c85 }, { 1642, 0x2118 },
-  { 1646, 0x041c }, { 1650, 0x02c8 }, { 1654, 0x1120 }, { 1657, 0x4a00 },
-  { 1660, 0x0a48 }, { 1664, 0x361b }, { 1672, 0x5540 }, { 1677, 0x8900 },
-  /* 0x5a00 */
-  { 1680, 0x000a }, { 1682, 0x9902 }, { 1687, 0x0221 }, { 1690, 0x1040 },
-  { 1692, 0x0242 }, { 1695, 0x0400 }, { 1696, 0x0044 }, { 1698, 0x0000 },
-  { 1698, 0x0000 }, { 1698, 0x0c04 }, { 1701, 0x0010 }, { 1702, 0x0000 },
-  { 1702, 0x1216 }, { 1707, 0x0000 }, { 1707, 0x0242 }, { 1710, 0x0000 },
-  /* 0x5b00 */
-  { 1710, 0x1a20 }, { 1714, 0x0040 }, { 1715, 0x0400 }, { 1716, 0x0000 },
-  { 1716, 0x0009 }, { 1718, 0xb5b3 }, { 1728, 0x0a18 }, { 1732, 0x1523 },
-  { 1738, 0x9ba0 }, { 1745, 0x1fe8 }, { 1754, 0x507c }, { 1761, 0x8379 },
-  { 1769, 0x10fd }, { 1777, 0xc09d }, { 1784, 0xdbf6 }, { 1796, 0x0560 },
-  /* 0x5c00 */
-  { 1800, 0xef92 }, { 1810, 0x0242 }, { 1813, 0x0110 }, { 1815, 0xdf02 },
-  { 1823, 0x6961 }, { 1830, 0x0822 }, { 1833, 0x9035 }, { 1839, 0x0202 },
-  { 1841, 0x0000 }, { 1841, 0x0003 }, { 1843, 0x1a02 }, { 1847, 0x45aa },
-  { 1854, 0x0001 }, { 1855, 0x0200 }, { 1856, 0x8101 }, { 1859, 0x2851 },
-  /* 0x5d00 */
-  { 1864, 0x6080 }, { 1867, 0x02d2 }, { 1872, 0x0280 }, { 1874, 0x0000 },
-  { 1874, 0x1800 }, { 1876, 0x0001 }, { 1877, 0x9200 }, { 1880, 0x0000 },
-  { 1880, 0x0880 }, { 1882, 0x2000 }, { 1883, 0x0405 }, { 1886, 0x3500 },
-  { 1890, 0x2000 }, { 1891, 0x6044 }, { 1895, 0x49e6 }, { 1903, 0x609e },
-  /* 0x5e00 */
-  { 1910, 0x104c }, { 1914, 0x2a42 }, { 1919, 0x2820 }, { 1922, 0xa148 },
-  { 1927, 0x10b1 }, { 1932, 0x8020 }, { 1934, 0x000e }, { 1937, 0x7b9c },
-  { 1947, 0x8490 }, { 1951, 0x14a0 }, { 1955, 0x28c1 }, { 1960, 0x41e0 },
-  { 1965, 0x0704 }, { 1969, 0x8c49 }, { 1975, 0x100d }, { 1979, 0x0cc8 },
-  /* 0x5f00 */
-  { 1984, 0x8412 }, { 1988, 0x89ba }, { 1996, 0x02c0 }, { 1999, 0x1422 },
-  { 2003, 0x5500 }, { 2007, 0x0ac0 }, { 2011, 0x3ec4 }, { 2019, 0x9283 },
-  { 2025, 0x1ca3 }, { 2032, 0x4387 }, { 2039, 0x4703 }, { 2045, 0x22a0 },
-  { 2049, 0x3028 }, { 2053, 0x03c0 }, { 2057, 0x0801 }, { 2059, 0xa020 },
-  /* 0x6000 */
-  { 2062, 0x8000 }, { 2063, 0x3044 }, { 2067, 0x85a3 }, { 2074, 0x0000 },
-  { 2074, 0x200e }, { 2078, 0x2225 }, { 2083, 0xb73c }, { 2093, 0x0001 },
-  { 2094, 0x3220 }, { 2098, 0x8c50 }, { 2103, 0x0099 }, { 2107, 0x315d },
-  { 2115, 0x00a0 }, { 2117, 0x9402 }, { 2121, 0x0003 }, { 2123, 0x0e4b },
-  /* 0x6100 */
-  { 2130, 0xe342 }, { 2137, 0x8c20 }, { 2141, 0x0080 }, { 2142, 0xd091 },
-  { 2148, 0x1d94 }, { 2155, 0xa328 }, { 2161, 0x499c }, { 2168, 0x60c1 },
-  { 2173, 0x4406 }, { 2177, 0x0713 }, { 2183, 0x5a90 }, { 2189, 0x4444 },
-  { 2193, 0x0f88 }, { 2199, 0x0000 }, { 2199, 0x0040 }, { 2200, 0x95c4 },
-  /* 0x6200 */
-  { 2207, 0x7581 }, { 2214, 0x8447 }, { 2220, 0x4402 }, { 2223, 0xc053 },
-  { 2229, 0x2b83 }, { 2236, 0x0108 }, { 2238, 0x4000 }, { 2239, 0x9242 },
-  { 2244, 0x0611 }, { 2248, 0x09a6 }, { 2254, 0x0800 }, { 2255, 0x3222 },
-  { 2260, 0xb384 }, { 2267, 0x1bdd }, { 2277, 0xf000 }, { 2281, 0xc08a },
-  /* 0x6300 */
-  { 2286, 0x0282 }, { 2289, 0x0002 }, { 2290, 0x8800 }, { 2292, 0x6c00 },
-  { 2296, 0x9200 }, { 2299, 0x0021 }, { 2301, 0x4180 }, { 2304, 0x8c84 },
-  { 2309, 0x1308 }, { 2313, 0x0944 }, { 2317, 0x07a7 }, { 2325, 0x0000 },
-  { 2325, 0x8051 }, { 2329, 0x0c41 }, { 2333, 0x6002 }, { 2336, 0x00d0 },
-  /* 0x6400 */
-  { 2339, 0xa000 }, { 2341, 0x10d0 }, { 2345, 0x3004 }, { 2348, 0x4400 },
-  { 2350, 0x0000 }, { 2350, 0x0100 }, { 2351, 0x8201 }, { 2354, 0x0700 },
-  { 2357, 0x0100 }, { 2358, 0x440e }, { 2363, 0x6830 }, { 2368, 0x0805 },
-  { 2371, 0x64b2 }, { 2378, 0x0514 }, { 2382, 0x10e6 }, { 2388, 0x4414 },
-  /* 0x6500 */
-  { 2392, 0x0011 }, { 2394, 0x2100 }, { 2396, 0x9c08 }, { 2401, 0xcbc0 },
-  { 2408, 0xe120 }, { 2413, 0x40c2 }, { 2417, 0x304c }, { 2422, 0x41b4 },
-  { 2428, 0x10ac }, { 2433, 0x9a83 }, { 2440, 0x98b2 }, { 2447, 0x3281 },
-  { 2452, 0x9822 }, { 2457, 0x0084 }, { 2459, 0x3369 }, { 2467, 0xbc12 },
-  /* 0x6600 */
-  { 2474, 0xd6c0 }, { 2481, 0xc03b }, { 2488, 0xa1a1 }, { 2494, 0x0c53 },
-  { 2500, 0x8a1e }, { 2507, 0xea00 }, { 2512, 0xcbf0 }, { 2521, 0x05d8 },
-  { 2527, 0x4390 }, { 2532, 0x21c3 }, { 2538, 0x4805 }, { 2542, 0x4a1c },
-  { 2548, 0x02d0 }, { 2552, 0x3240 }, { 2556, 0x0041 }, { 2558, 0xd79d },
-  /* 0x6700 */
-  { 2569, 0x2b09 }, { 2575, 0xe8b0 }, { 2582, 0x7dc0 }, { 2590, 0x2452 },
-  { 2595, 0xc240 }, { 2599, 0xd04b }, { 2606, 0xa000 }, { 2608, 0xc8ab },
-  { 2616, 0x8a80 }, { 2620, 0x34a9 }, { 2627, 0x8000 }, { 2628, 0x41c9 },
-  { 2634, 0x8010 }, { 2636, 0x241f }, { 2643, 0x9200 }, { 2646, 0x487b },
-  /* 0x6800 */
-  { 2654, 0x0000 }, { 2654, 0x00cc }, { 2658, 0x8406 }, { 2662, 0x3300 },
-  { 2666, 0x410f }, { 2672, 0x001b }, { 2676, 0x2000 }, { 2677, 0x8040 },
-  { 2679, 0x8022 }, { 2682, 0xa098 }, { 2687, 0xa186 }, { 2693, 0x006b },
-  { 2698, 0x2a30 }, { 2703, 0x85a4 }, { 2709, 0x4181 }, { 2713, 0x0604 },
-  /* 0x6900 */
-  { 2716, 0x6021 }, { 2720, 0x0004 }, { 2721, 0x0080 }, { 2722, 0xa001 },
-  { 2725, 0x0400 }, { 2726, 0x46b8 }, { 2733, 0xe90f }, { 2742, 0x03a0 },
-  { 2746, 0x0000 }, { 2746, 0x1820 }, { 2749, 0x40a0 }, { 2752, 0x0810 },
-  { 2754, 0x380a }, { 2759, 0x0001 }, { 2760, 0x0500 }, { 2762, 0xa800 },
-  /* 0x6a00 */
-  { 2765, 0x0404 }, { 2767, 0xc28a }, { 2773, 0x000a }, { 2775, 0x2720 },
-  { 2780, 0x0910 }, { 2783, 0x830c }, { 2788, 0x0802 }, { 2790, 0x0000 },
-  { 2790, 0x6211 }, { 2795, 0x1080 }, { 2797, 0x000c }, { 2799, 0x0808 },
-  { 2801, 0x000c }, { 2803, 0x0c08 }, { 2806, 0x0000 }, { 2806, 0x0840 },
-  /* 0x6b00 */
-  { 2808, 0x1410 }, { 2811, 0x0044 }, { 2813, 0x000b }, { 2816, 0x6404 },
-  { 2820, 0x50c0 }, { 2824, 0x8001 }, { 2826, 0x047e }, { 2833, 0x8984 },
-  { 2838, 0x0658 }, { 2843, 0x4140 }, { 2846, 0xc000 }, { 2848, 0x94a4 },
-  { 2854, 0xa862 }, { 2860, 0x09dc }, { 2867, 0x1800 }, { 2869, 0x0000 },
-  /* 0x6c00 */
-  { 2869, 0x8100 }, { 2871, 0x000a }, { 2873, 0x0008 }, { 2874, 0x4190 },
-  { 2878, 0x4007 }, { 2882, 0xe4a1 }, { 2889, 0x2501 }, { 2893, 0x6445 },
-  { 2899, 0x11ee }, { 2907, 0x0e7d }, { 2916, 0x4800 }, { 2918, 0xfb08 },
-  { 2926, 0x1616 }, { 2932, 0x08a8 }, { 2936, 0xc92e }, { 2944, 0x0009 },
-  /* 0x6d00 */
-  { 2946, 0x1800 }, { 2948, 0x4a82 }, { 2953, 0x06a0 }, { 2957, 0x6b64 },
-  { 2965, 0x0002 }, { 2966, 0x1600 }, { 2969, 0x5648 }, { 2975, 0x8390 },
-  { 2980, 0x73a0 }, { 2987, 0x002a }, { 2990, 0x8000 }, { 2991, 0x0024 },
-  { 2993, 0x88f9 }, { 3001, 0x4702 }, { 3006, 0x4d02 }, { 3011, 0x0faa },
-  /* 0x6e00 */
-  { 3019, 0x0000 }, { 3019, 0x8e80 }, { 3024, 0xb87b }, { 3034, 0x7554 },
-  { 3042, 0x2418 }, { 3046, 0xd940 }, { 3052, 0xc880 }, { 3056, 0x040c },
-  { 3059, 0x0000 }, { 3059, 0xb041 }, { 3064, 0x8c24 }, { 3069, 0x0442 },
-  { 3072, 0x5a34 }, { 3079, 0x001a }, { 3082, 0x8000 }, { 3083, 0xc110 },
-  /* 0x6f00 */
-  { 3087, 0x8046 }, { 3091, 0x0032 }, { 3094, 0x180d }, { 3099, 0x8106 },
-  { 3103, 0x0002 }, { 3104, 0xcd92 }, { 3112, 0x6014 }, { 3116, 0x7401 },
-  { 3121, 0x6112 }, { 3126, 0x0091 }, { 3129, 0xc098 }, { 3134, 0x420a },
-  { 3138, 0x040f }, { 3143, 0x8420 }, { 3146, 0x9a13 }, { 3153, 0x4002 },
-  /* 0x7000 */
-  { 3155, 0x8a62 }, { 3161, 0xfd22 }, { 3170, 0x8188 }, { 3174, 0x4080 },
-  { 3176, 0x1000 }, { 3177, 0x2103 }, { 3181, 0x0808 }, { 3183, 0x3101 },
-  { 3187, 0x4420 }, { 3190, 0x0704 }, { 3194, 0xb812 }, { 3200, 0x0388 },
-  { 3204, 0x8900 }, { 3207, 0xa300 }, { 3211, 0x0000 }, { 3211, 0x2202 },
-  /* 0x7100 */
-  { 3214, 0x1210 }, { 3217, 0x4600 }, { 3220, 0x0042 }, { 3222, 0x0041 },
-  { 3224, 0x5680 }, { 3229, 0x5241 }, { 3234, 0x52f0 }, { 3241, 0x2000 },
-  { 3242, 0x8610 }, { 3246, 0x8214 }, { 3250, 0x1004 }, { 3252, 0x4602 },
-  { 3256, 0x430a }, { 3261, 0x8035 }, { 3266, 0x60e0 }, { 3271, 0xd800 },
-  /* 0x7200 */
-  { 3275, 0x0041 }, { 3277, 0x0801 }, { 3279, 0x3400 }, { 3282, 0x6c65 },
-  { 3290, 0x11c1 }, { 3295, 0xab04 }, { 3301, 0x0286 }, { 3305, 0x2204 },
-  { 3308, 0x0003 }, { 3310, 0x0000 }, { 3310, 0x9084 }, { 3314, 0x0000 },
-  { 3314, 0x4015 }, { 3318, 0x0281 }, { 3321, 0x0202 }, { 3323, 0x3300 },
-  /* 0x7300 */
-  { 3327, 0x0400 }, { 3328, 0x3840 }, { 3332, 0x0e20 }, { 3336, 0xc0c0 },
-  { 3340, 0x0030 }, { 3342, 0x0085 }, { 3345, 0x0500 }, { 3347, 0x0d25 },
-  { 3353, 0x4ad0 }, { 3359, 0x81d0 }, { 3364, 0x2280 }, { 3367, 0x020c },
-  { 3370, 0xb605 }, { 3377, 0x6240 }, { 3381, 0x2679 }, { 3389, 0x6280 },
-  /* 0x7400 */
-  { 3393, 0x02ea }, { 3399, 0x0808 }, { 3401, 0xdd67 }, { 3412, 0x8579 },
-  { 3420, 0x081b }, { 3425, 0xdea0 }, { 3433, 0x8735 }, { 3441, 0x4000 },
-  { 3442, 0x0a8c }, { 3447, 0xd100 }, { 3451, 0x05aa }, { 3457, 0xa225 },
-  { 3463, 0x8440 }, { 3466, 0x1510 }, { 3470, 0x404d }, { 3475, 0x0080 },
-  /* 0x7500 */
-  { 3476, 0x0012 }, { 3478, 0x8d22 }, { 3484, 0x1968 }, { 3490, 0x058f },
-  { 3497, 0x9080 }, { 3500, 0x3a1a }, { 3507, 0x8464 }, { 3512, 0x8561 },
-  { 3518, 0xccc0 }, { 3524, 0x2002 }, { 3526, 0x0820 }, { 3528, 0x732e },
-  { 3537, 0x20a4 }, { 3541, 0x0b34 }, { 3547, 0x0004 }, { 3548, 0x1415 },
-  /* 0x7600 */
-  { 3553, 0x2001 }, { 3555, 0x8200 }, { 3557, 0x0057 }, { 3562, 0x0800 },
-  { 3563, 0x5004 }, { 3566, 0x0044 }, { 3568, 0x1212 }, { 3572, 0x7905 },
-  { 3579, 0x40d0 }, { 3583, 0x0009 }, { 3585, 0x4000 }, { 3586, 0x8400 },
-  { 3588, 0x054c }, { 3593, 0xd844 }, { 3599, 0x409a }, { 3604, 0x5114 },
-  /* 0x7700 */
-  { 3609, 0x0b12 }, { 3614, 0x4000 }, { 3615, 0x0201 }, { 3617, 0x1580 },
-  { 3621, 0x2001 }, { 3623, 0x0800 }, { 3624, 0x084a }, { 3628, 0xc200 },
-  { 3631, 0x0800 }, { 3632, 0x4002 }, { 3634, 0x3020 }, { 3637, 0x9809 },
-  { 3642, 0x0000 }, { 3642, 0x1880 }, { 3645, 0xe22c }, { 3652, 0x0008 },
-  /* 0x7800 */
-  { 3653, 0x0004 }, { 3654, 0x0004 }, { 3655, 0x10e0 }, { 3659, 0x0014 },
-  { 3661, 0x8020 }, { 3663, 0x2000 }, { 3664, 0x9800 }, { 3667, 0x1000 },
-  { 3668, 0x7082 }, { 3673, 0x0082 }, { 3675, 0x0288 }, { 3678, 0x1c00 },
-  { 3681, 0x4c22 }, { 3686, 0x0001 }, { 3687, 0x9100 }, { 3690, 0x0820 },
-  /* 0x7900 */
-  { 3692, 0x4002 }, { 3694, 0x0040 }, { 3695, 0x1c00 }, { 3698, 0x4400 },
-  { 3700, 0x0383 }, { 3705, 0x7cc1 }, { 3713, 0x2121 }, { 3717, 0x8400 },
-  { 3719, 0xe002 }, { 3723, 0x0002 }, { 3724, 0x44c0 }, { 3728, 0xe20a },
-  { 3734, 0x0e03 }, { 3739, 0x8126 }, { 3744, 0x02d0 }, { 3748, 0x0800 },
-  /* 0x7a00 */
-  { 3749, 0x2921 }, { 3754, 0x9690 }, { 3760, 0x4001 }, { 3762, 0xb8c2 },
-  { 3769, 0x6241 }, { 3774, 0x0080 }, { 3775, 0x0a06 }, { 3779, 0xa651 },
-  { 3786, 0x0112 }, { 3789, 0x812c }, { 3794, 0xc600 }, { 3798, 0x0400 },
-  { 3799, 0x0cb0 }, { 3804, 0xa280 }, { 3808, 0xa429 }, { 3814, 0x8640 },
-  /* 0x7b00 */
-  { 3818, 0x8000 }, { 3819, 0x4a02 }, { 3823, 0x3041 }, { 3827, 0x0200 },
-  { 3828, 0xba40 }, { 3834, 0x0057 }, { 3839, 0x5001 }, { 3842, 0x2020 },
-  { 3844, 0x8880 }, { 3847, 0x24b0 }, { 3852, 0x2002 }, { 3854, 0x0112 },
-  { 3857, 0x02d3 }, { 3863, 0x0004 }, { 3864, 0x0211 }, { 3867, 0x0000 },
-  /* 0x7c00 */
-  { 3867, 0x0080 }, { 3868, 0x4004 }, { 3870, 0x0c82 }, { 3874, 0xe000 },
-  { 3877, 0x3008 }, { 3880, 0x0000 }, { 3880, 0x1011 }, { 3883, 0x0008 },
-  { 3884, 0x0208 }, { 3886, 0x81a4 }, { 3891, 0x40a0 }, { 3894, 0x420e },
-  { 3899, 0x0400 }, { 3900, 0xc040 }, { 3903, 0x0081 }, { 3905, 0x4800 },
-  /* 0x7d00 */
-  { 3907, 0x2df5 }, { 3917, 0x0f91 }, { 3924, 0xd807 }, { 3931, 0x0629 },
-  { 3936, 0x007c }, { 3941, 0x4001 }, { 3943, 0x4546 }, { 3949, 0x824e },
-  { 3955, 0xc000 }, { 3957, 0x1008 }, { 3959, 0x3005 }, { 3963, 0xed36 },
-  { 3973, 0x0c80 }, { 3976, 0x6540 }, { 3981, 0x930b }, { 3988, 0x0810 },
-  /* 0x7e00 */
-  { 3990, 0x0600 }, { 3992, 0xe820 }, { 3997, 0xc80a }, { 4002, 0x6082 },
-  { 4006, 0x00ca }, { 4010, 0x4034 }, { 4014, 0x2e02 }, { 4019, 0x1201 },
-  { 4022, 0x9004 }, { 4025, 0x1948 }, { 4030, 0x0000 }, { 4030, 0x0000 },
-  { 4030, 0x0000 }, { 4030, 0x0000 }, { 4030, 0x0000 }, { 4030, 0x0000 },
-  /* 0x7f00 */
-  { 4030, 0x0000 }, { 4030, 0x0000 }, { 4030, 0x0000 }, { 4030, 0x0540 },
-  { 4033, 0x1000 }, { 4034, 0x0031 }, { 4037, 0x4c00 }, { 4040, 0x02a5 },
-  { 4045, 0x5520 }, { 4050, 0x4410 }, { 4053, 0x0310 }, { 4056, 0x2304 },
-  { 4060, 0x5422 }, { 4065, 0x8034 }, { 4069, 0x0a03 }, { 4073, 0x1201 },
-  /* 0x8000 */
-  { 4076, 0x126b }, { 4083, 0x01a1 }, { 4087, 0x2000 }, { 4088, 0xa048 },
-  { 4092, 0x0448 }, { 4095, 0x4540 }, { 4099, 0x8000 }, { 4100, 0xe08d },
-  { 4107, 0x1af0 }, { 4114, 0x2840 }, { 4117, 0x8626 }, { 4123, 0x0416 },
-  { 4127, 0x5018 }, { 4131, 0x4c00 }, { 4134, 0x0032 }, { 4137, 0x2112 },
-  /* 0x8100 */
-  { 4141, 0x05e4 }, { 4147, 0x0d00 }, { 4150, 0x8a08 }, { 4154, 0x4200 },
-  { 4156, 0x4800 }, { 4158, 0x0033 }, { 4162, 0x0860 }, { 4165, 0x8703 },
-  { 4171, 0x8501 }, { 4175, 0x3400 }, { 4178, 0x0109 }, { 4181, 0xe428 },
-  { 4187, 0x2045 }, { 4191, 0x8100 }, { 4193, 0x25a8 }, { 4199, 0x5c18 },
-  /* 0x8200 */
-  { 4205, 0x35a0 }, { 4211, 0xd804 }, { 4216, 0x1c02 }, { 4220, 0x02e0 },
-  { 4224, 0x00a1 }, { 4227, 0x0200 }, { 4228, 0xc050 }, { 4232, 0x4146 },
-  { 4237, 0x6800 }, { 4240, 0xa604 }, { 4245, 0xf260 }, { 4252, 0xbb8a },
-  { 4261, 0x0000 }, { 4261, 0xc8b6 }, { 4269, 0x00e2 }, { 4273, 0x6002 },
-  /* 0x8300 */
-  { 4276, 0x023e }, { 4282, 0x0080 }, { 4283, 0x8900 }, { 4286, 0x0372 },
-  { 4292, 0x8681 }, { 4297, 0x0006 }, { 4299, 0x0000 }, { 4299, 0x0888 },
-  { 4302, 0x4600 }, { 4305, 0x4140 }, { 4308, 0x0e04 }, { 4312, 0x2000 },
-  { 4313, 0x1622 }, { 4318, 0x1048 }, { 4321, 0x8a00 }, { 4324, 0x2217 },
-  /* 0x8400 */
-  { 4330, 0x7418 }, { 4336, 0x0000 }, { 4336, 0x1200 }, { 4338, 0x2102 },
-  { 4341, 0x0200 }, { 4342, 0x0880 }, { 4344, 0x984a }, { 4350, 0x0420 },
-  { 4352, 0x0000 }, { 4352, 0x1211 }, { 4356, 0x0002 }, { 4357, 0x9904 },
-  { 4362, 0x2a55 }, { 4369, 0x0402 }, { 4371, 0x5000 }, { 4373, 0x1010 },
-  /* 0x8500 */
-  { 4375, 0x0000 }, { 4375, 0x459a }, { 4382, 0xb02a }, { 4388, 0xa000 },
-  { 4390, 0x420a }, { 4394, 0x0208 }, { 4396, 0x2708 }, { 4401, 0x0000 },
-  { 4401, 0x8090 }, { 4404, 0x0812 }, { 4407, 0x8740 }, { 4412, 0x0401 },
-  { 4414, 0xe202 }, { 4419, 0x3020 }, { 4422, 0x0630 }, { 4426, 0x8c80 },
-  /* 0x8600 */
-  { 4430, 0x04c4 }, { 4434, 0x04c0 }, { 4437, 0x2000 }, { 4438, 0x8000 },
-  { 4439, 0x4000 }, { 4440, 0xd831 }, { 4447, 0x0080 }, { 4448, 0x0200 },
-  { 4449, 0x1400 }, { 4451, 0x0008 }, { 4452, 0x0218 }, { 4455, 0x0000 },
-  { 4455, 0x0880 }, { 4457, 0x8a10 }, { 4461, 0x2010 }, { 4463, 0x4000 },
-  /* 0x8700 */
-  { 4464, 0x010d }, { 4468, 0x1500 }, { 4471, 0x0000 }, { 4471, 0x0000 },
-  { 4471, 0x4000 }, { 4472, 0x80a0 }, { 4475, 0x0140 }, { 4477, 0x0150 },
-  { 4480, 0x2004 }, { 4482, 0x8000 }, { 4483, 0x0004 }, { 4484, 0x0408 },
-  { 4486, 0x0010 }, { 4487, 0x0000 }, { 4487, 0x9001 }, { 4490, 0x4a04 },
-  /* 0x8800 */
-  { 4494, 0x0020 }, { 4495, 0x8000 }, { 4496, 0x000c }, { 4498, 0x0842 },
-  { 4501, 0x3041 }, { 4505, 0x2a8c }, { 4511, 0x090e }, { 4516, 0xc085 },
-  { 4521, 0x2906 }, { 4526, 0x40c4 }, { 4530, 0x0800 }, { 4531, 0x0010 },
-  { 4532, 0x8006 }, { 4535, 0xb230 }, { 4541, 0x0102 }, { 4543, 0x2138 },
-  /* 0x8900 */
-  { 4548, 0x0080 }, { 4549, 0x030d }, { 4554, 0x0420 }, { 4556, 0x0940 },
-  { 4559, 0x0012 }, { 4561, 0x8000 }, { 4562, 0x0410 }, { 4564, 0x8004 },
-  { 4566, 0x88ca }, { 4572, 0x0048 }, { 4574, 0x0602 }, { 4577, 0x2404 },
-  { 4580, 0x0001 }, { 4581, 0x0004 }, { 4582, 0x0008 }, { 4583, 0x0110 },
-  /* 0x8a00 */
-  { 4585, 0x550d }, { 4592, 0xa9c8 }, { 4599, 0x2428 }, { 4603, 0x0c52 },
-  { 4608, 0x0000 }, { 4608, 0x4831 }, { 4613, 0x624d }, { 4620, 0x022f },
-  { 4626, 0x30a0 }, { 4630, 0x4128 }, { 4634, 0x057b }, { 4642, 0xd205 },
-  { 4648, 0xa894 }, { 4654, 0x1844 }, { 4658, 0x6cc2 }, { 4665, 0x45c2 },
-  /* 0x8b00 */
-  { 4671, 0x4017 }, { 4676, 0x2ed1 }, { 4684, 0x1901 }, { 4688, 0x0208 },
-  { 4690, 0xc202 }, { 4694, 0x1500 }, { 4697, 0x9040 }, { 4700, 0x2091 },
-  { 4704, 0x0401 }, { 4706, 0x044d }, { 4711, 0x0000 }, { 4711, 0x0000 },
-  { 4711, 0x0000 }, { 4711, 0x0000 }, { 4711, 0x0000 }, { 4711, 0x0000 },
-  /* 0x8c00 */
-  { 4711, 0x0000 }, { 4711, 0x0000 }, { 4711, 0x0000 }, { 4711, 0x8080 },
-  { 4713, 0x1542 }, { 4718, 0x0420 }, { 4720, 0x0c02 }, { 4723, 0x0600 },
-  { 4725, 0x1404 }, { 4728, 0x6000 }, { 4730, 0x9f87 }, { 4740, 0xb9d9 },
-  { 4750, 0x059f }, { 4758, 0x540a }, { 4763, 0x245d }, { 4770, 0x3810 },
-  /* 0x8d00 */
-  { 4774, 0x25b0 }, { 4780, 0x0048 }, { 4782, 0x0000 }, { 4782, 0x0000 },
-  { 4782, 0x0000 }, { 4782, 0x0000 }, { 4782, 0x0850 }, { 4785, 0x0099 },
-  { 4789, 0x0420 }, { 4791, 0x0200 }, { 4792, 0x0108 }, { 4794, 0x4408 },
-  { 4797, 0x9840 }, { 4801, 0x2800 }, { 4803, 0x810a }, { 4807, 0x0008 },
-  /* 0x8e00 */
-  { 4808, 0x8400 }, { 4810, 0x4001 }, { 4812, 0x0400 }, { 4813, 0x0021 },
-  { 4815, 0x0794 }, { 4821, 0x8200 }, { 4823, 0x0001 }, { 4824, 0x0050 },
-  { 4826, 0x2482 }, { 4830, 0x0000 }, { 4830, 0x1c00 }, { 4833, 0x0000 },
-  { 4833, 0x3c01 }, { 4838, 0x8004 }, { 4840, 0x0800 }, { 4841, 0x4900 },
-  /* 0x8f00 */
-  { 4844, 0x0228 }, { 4847, 0xf83c }, { 4856, 0x86c0 }, { 4861, 0xcb08 },
-  { 4867, 0x6230 }, { 4872, 0xa000 }, { 4874, 0x0004 }, { 4875, 0x0000 },
-  { 4875, 0x0000 }, { 4875, 0x1800 }, { 4877, 0xa148 }, { 4882, 0x0007 },
-  { 4885, 0x4024 }, { 4888, 0x0012 }, { 4890, 0x2c40 }, { 4894, 0x2285 },
-  /* 0x9000 */
-  { 4899, 0xa96f }, { 4909, 0xe6b3 }, { 4919, 0x400f }, { 4924, 0x5126 },
-  { 4930, 0x6c86 }, { 4937, 0x723b }, { 4946, 0xe20b }, { 4953, 0xb5a4 },
-  { 4961, 0x859f }, { 4970, 0x0222 }, { 4973, 0x854c }, { 4979, 0x0123 },
-  { 4983, 0x0402 }, { 4985, 0x4000 }, { 4986, 0x2102 }, { 4989, 0x2020 },
-  /* 0x9100 */
-  { 4991, 0x0004 }, { 4992, 0x0224 }, { 4995, 0x2080 }, { 4997, 0x0004 },
-  { 4998, 0x7e00 }, { 5004, 0x0004 }, { 5005, 0x1604 }, { 5009, 0x01a0 },
-  { 5012, 0x2a80 }, { 5016, 0x1004 }, { 5018, 0xd800 }, { 5022, 0x0032 },
-  { 5025, 0xfa81 }, { 5033, 0x3183 }, { 5039, 0x0488 }, { 5042, 0x0020 },
-  /* 0x9200 */
-  { 5043, 0x2000 }, { 5044, 0x4087 }, { 5049, 0x0000 }, { 5049, 0x8410 },
-  { 5052, 0x0221 }, { 5055, 0x4880 }, { 5058, 0x0074 }, { 5062, 0x0000 },
-  { 5062, 0x0029 }, { 5065, 0x114a }, { 5070, 0x0000 }, { 5070, 0x02c8 },
-  { 5074, 0x9000 }, { 5076, 0x0004 }, { 5077, 0x0410 }, { 5079, 0x1100 },
-  /* 0x9300 */
-  { 5081, 0x0010 }, { 5082, 0xc501 }, { 5087, 0xc957 }, { 5096, 0x0000 },
-  { 5096, 0x2d00 }, { 5100, 0x0810 }, { 5102, 0x4000 }, { 5103, 0x5020 },
-  { 5106, 0x1000 }, { 5107, 0x0450 }, { 5110, 0x3088 }, { 5114, 0x0001 },
-  { 5115, 0x0008 }, { 5116, 0x4002 }, { 5118, 0x0012 }, { 5120, 0x0040 },
-  /* 0x9400 */
-  { 5121, 0x0010 }, { 5122, 0x0100 }, { 5123, 0x0820 }, { 5125, 0x0120 },
-  { 5127, 0x0010 }, { 5128, 0x0806 }, { 5131, 0x0000 }, { 5131, 0xa000 },
-  { 5133, 0x0000 }, { 5133, 0x0000 }, { 5133, 0x0000 }, { 5133, 0x0000 },
-  { 5133, 0x0000 }, { 5133, 0x0000 }, { 5133, 0x0000 }, { 5133, 0x0000 },
-  /* 0x9500 */
-  { 5133, 0x0000 }, { 5133, 0x0000 }, { 5133, 0x0000 }, { 5133, 0x0000 },
-  { 5133, 0x0000 }, { 5133, 0x0000 }, { 5133, 0x0000 }, { 5133, 0x0080 },
-  { 5134, 0x8a09 }, { 5139, 0x011e }, { 5144, 0x2138 }, { 5149, 0x1802 },
-  { 5152, 0x0480 }, { 5154, 0x1070 }, { 5158, 0x0006 }, { 5160, 0x0000 },
-  /* 0x9600 */
-  { 5160, 0x0000 }, { 5160, 0x1000 }, { 5161, 0x4402 }, { 5164, 0x8804 },
-  { 5167, 0x3815 }, { 5173, 0xf801 }, { 5179, 0x041c }, { 5183, 0x21e9 },
-  { 5190, 0x6c60 }, { 5196, 0x1b30 }, { 5202, 0x0588 }, { 5206, 0x0882 },
-  { 5209, 0x7af3 }, { 5220, 0x1a60 }, { 5225, 0x870c }, { 5231, 0x0ac5 },
-  /* 0x9700 */
-  { 5237, 0x00c1 }, { 5240, 0x524a }, { 5246, 0x0080 }, { 5247, 0x2205 },
-  { 5251, 0x0114 }, { 5254, 0x5042 }, { 5258, 0x2206 }, { 5262, 0x0490 },
-  { 5265, 0xa800 }, { 5268, 0x0000 }, { 5268, 0x2901 }, { 5272, 0x0000 },
-  { 5272, 0x0840 }, { 5274, 0x1008 }, { 5276, 0x0000 }, { 5276, 0x8848 },
-  /* 0x9800 */
-  { 5280, 0x156f }, { 5289, 0x018f }, { 5295, 0x2000 }, { 5296, 0x0b01 },
-  { 5300, 0x7040 }, { 5304, 0x4510 }, { 5308, 0x88a0 }, { 5312, 0x0000 },
-  { 5312, 0x0000 }, { 5312, 0x0000 }, { 5312, 0x8100 }, { 5314, 0x0002 },
-  { 5315, 0x0090 }, { 5317, 0x9800 }, { 5320, 0xe006 }, { 5325, 0x7010 },
-  /* 0x9900 */
-  { 5329, 0x1608 }, { 5333, 0x4109 }, { 5337, 0x0101 }, { 5339, 0x0000 },
-  { 5339, 0x3a20 }, { 5344, 0x0096 }, { 5348, 0x0000 }, { 5348, 0x0000 },
-  { 5348, 0x0000 }, { 5348, 0x2240 }, { 5351, 0x7120 }, { 5356, 0x021a },
-  { 5360, 0x0002 }, { 5361, 0xa227 }, { 5368, 0x2000 }, { 5369, 0x8002 },
-  /* 0x9a00 */
-  { 5371, 0xc102 }, { 5375, 0x0200 }, { 5376, 0x0800 }, { 5377, 0x00c1 },
-  { 5380, 0x2029 }, { 5384, 0x8ca0 }, { 5389, 0x0624 }, { 5393, 0x0000 },
-  { 5393, 0x0000 }, { 5393, 0x0000 }, { 5393, 0x0100 }, { 5394, 0x0100 },
-  { 5395, 0x0000 }, { 5395, 0x0118 }, { 5398, 0x4020 }, { 5400, 0x0000 },
-  /* 0x9b00 */
-  { 5400, 0x0000 }, { 5400, 0x0400 }, { 5401, 0x0480 }, { 5403, 0x1002 },
-  { 5405, 0x803e }, { 5411, 0x0410 }, { 5413, 0x8000 }, { 5414, 0x0000 },
-  { 5414, 0x4000 }, { 5415, 0x8002 }, { 5417, 0x4800 }, { 5419, 0x0000 },
-  { 5419, 0x0200 }, { 5420, 0x0040 }, { 5421, 0x0110 }, { 5423, 0x0000 },
-  /* 0x9c00 */
-  { 5423, 0x2000 }, { 5424, 0x0025 }, { 5427, 0x0020 }, { 5428, 0x0804 },
-  { 5430, 0x0280 }, { 5432, 0x0080 }, { 5433, 0x0000 }, { 5433, 0x0000 },
-  { 5433, 0x0000 }, { 5433, 0x0000 }, { 5433, 0x0000 }, { 5433, 0x0000 },
-  { 5433, 0x0000 }, { 5433, 0x0000 }, { 5433, 0x02a0 }, { 5436, 0x0058 },
-  /* 0x9d00 */
-  { 5439, 0x0200 }, { 5440, 0x0800 }, { 5441, 0x0140 }, { 5443, 0x0800 },
-  { 5444, 0x0000 }, { 5444, 0x2002 }, { 5446, 0x1003 }, { 5449, 0x0004 },
-  { 5450, 0x0000 }, { 5450, 0x0000 }, { 5450, 0x8200 }, { 5452, 0x0010 },
-  { 5453, 0x0010 }, { 5454, 0x0080 }, { 5455, 0x0000 }, { 5455, 0x0704 },
-  /* 0x9e00 */
-  { 5459, 0x0000 }, { 5459, 0x4400 }, { 5461, 0x0000 }, { 5461, 0x0000 },
-  { 5461, 0x0000 }, { 5461, 0x0000 }, { 5461, 0x0000 }, { 5461, 0xa220 },
-  { 5465, 0x0000 }, { 5465, 0xa08c }, { 5470, 0x0020 }, { 5471, 0x4830 },
-  { 5475, 0x6008 }, { 5478, 0x5912 }, { 5484, 0x0100 }, { 5485, 0x0010 },
-  /* 0x9f00 */
-  { 5486, 0x4180 }, { 5489, 0x0008 }, { 5490, 0x0001 }, { 5491, 0x0800 },
-  { 5492, 0x4c00 }, { 5495, 0x8004 }, { 5497, 0x1482 }, { 5501, 0x0080 },
-  { 5502, 0x2000 }, { 5503, 0x1021 },
-};
-static const Summary16 ksc5601_uni2indx_pageac[698] = {
-  /* 0xac00 */
-  { 5506, 0x0793 }, { 5513, 0x3eff }, { 5526, 0xb011 }, { 5531, 0x1303 },
-  { 5536, 0x2801 }, { 5539, 0x1110 }, { 5542, 0x0000 }, { 5542, 0x0593 },
-  { 5548, 0x1e7b }, { 5558, 0xb011 }, { 5563, 0x9703 }, { 5570, 0x3b01 },
-  { 5576, 0x1112 }, { 5580, 0x00a0 }, { 5582, 0x9593 }, { 5590, 0x306b },
-  /* 0xad00 */
-  { 5597, 0xb051 }, { 5603, 0x1102 }, { 5606, 0x3201 }, { 5610, 0x1130 },
-  { 5614, 0x02b0 }, { 5618, 0x0111 }, { 5621, 0x300a }, { 5625, 0xb879 },
-  { 5634, 0x1306 }, { 5639, 0x3001 }, { 5642, 0x0010 }, { 5643, 0x0080 },
-  { 5644, 0x0113 }, { 5648, 0x100b }, { 5652, 0x0011 }, { 5654, 0x9300 },
-  /* 0xae00 */
-  { 5658, 0x2b03 }, { 5664, 0x0010 }, { 5665, 0x0000 }, { 5665, 0x0593 },
-  { 5671, 0x746b }, { 5680, 0xb051 }, { 5686, 0x1323 }, { 5692, 0x3b01 },
-  { 5698, 0x1030 }, { 5701, 0x0000 }, { 5701, 0x0000 }, { 5701, 0x7000 },
-  { 5704, 0xb011 }, { 5709, 0x1303 }, { 5714, 0x2900 }, { 5717, 0x1110 },
-  /* 0xaf00 */
-  { 5720, 0x2180 }, { 5723, 0x0001 }, { 5724, 0x3000 }, { 5726, 0xb015 },
-  { 5732, 0x030e }, { 5737, 0x3001 }, { 5740, 0x0030 }, { 5742, 0x0200 },
-  { 5743, 0x0111 }, { 5746, 0x1023 }, { 5750, 0x0000 }, { 5750, 0x1300 },
-  { 5753, 0x6b81 }, { 5760, 0x1010 }, { 5762, 0x0300 }, { 5764, 0x0113 },
-  /* 0xb000 */
-  { 5768, 0x1013 }, { 5772, 0x3011 }, { 5776, 0x0100 }, { 5777, 0x0000 },
-  { 5777, 0x5530 }, { 5783, 0x22b8 }, { 5789, 0x0000 }, { 5789, 0x3000 },
-  { 5791, 0xb011 }, { 5796, 0x9702 }, { 5802, 0xfb07 }, { 5812, 0x113a },
-  { 5818, 0x03b0 }, { 5823, 0x0113 }, { 5827, 0x0021 }, { 5829, 0x0000 },
-  /* 0xb100 */
-  { 5829, 0x1b00 }, { 5833, 0x3b0d }, { 5841, 0x1138 }, { 5846, 0x03b0 },
-  { 5851, 0x0113 }, { 5855, 0x1133 }, { 5861, 0x0001 }, { 5862, 0x1300 },
-  { 5865, 0x2b05 }, { 5871, 0x111c }, { 5876, 0x0100 }, { 5877, 0x0000 },
-  { 5877, 0x1000 }, { 5878, 0xb011 }, { 5883, 0x1300 }, { 5886, 0x2a01 },
-  /* 0xb200 */
-  { 5890, 0x1930 }, { 5895, 0x02b0 }, { 5899, 0x0001 }, { 5900, 0x1010 },
-  { 5902, 0x0000 }, { 5902, 0x1100 }, { 5904, 0x0301 }, { 5907, 0x1030 },
-  { 5910, 0x0230 }, { 5913, 0x0713 }, { 5919, 0x146b }, { 5926, 0x0011 },
-  { 5928, 0x1300 }, { 5931, 0x2b05 }, { 5937, 0xf974 }, { 5947, 0x8fb8 },
-  /* 0xb300 */
-  { 5956, 0x0113 }, { 5960, 0x103b }, { 5966, 0x0000 }, { 5966, 0x0000 },
-  { 5966, 0x0000 }, { 5966, 0xd970 }, { 5974, 0x4ab0 }, { 5980, 0x0113 },
-  { 5984, 0x103b }, { 5990, 0x0011 }, { 5992, 0x1103 }, { 5996, 0x0000 },
-  { 5996, 0x5930 }, { 6002, 0x2ab1 }, { 6009, 0x0111 }, { 6012, 0x1000 },
-  /* 0xb400 */
-  { 6013, 0x0000 }, { 6013, 0x1101 }, { 6016, 0x0b01 }, { 6020, 0x0010 },
-  { 6021, 0x0000 }, { 6021, 0x0113 }, { 6025, 0x102b }, { 6030, 0x0000 },
-  { 6030, 0x0101 }, { 6032, 0x2000 }, { 6033, 0x1110 }, { 6036, 0x02a0 },
-  { 6039, 0x0111 }, { 6042, 0x3021 }, { 6046, 0xb059 }, { 6053, 0x0102 },
-  /* 0xb500 */
-  { 6055, 0x0000 }, { 6055, 0x1930 }, { 6060, 0x07b0 }, { 6066, 0x0113 },
-  { 6070, 0x383b }, { 6078, 0xb011 }, { 6083, 0x0003 }, { 6085, 0x0000 },
-  { 6085, 0x0000 }, { 6085, 0x0000 }, { 6085, 0x0d13 }, { 6091, 0x383b },
-  { 6099, 0xb011 }, { 6104, 0x0103 }, { 6107, 0x1000 }, { 6108, 0x0000 },
-  /* 0xb600 */
-  { 6108, 0x0000 }, { 6108, 0x0113 }, { 6112, 0x1020 }, { 6114, 0x0010 },
-  { 6115, 0x0100 }, { 6116, 0x0000 }, { 6116, 0x0110 }, { 6118, 0x0000 },
-  { 6118, 0x0000 }, { 6118, 0x3000 }, { 6120, 0x1811 }, { 6124, 0x0002 },
-  { 6125, 0x0000 }, { 6125, 0x0010 }, { 6126, 0x0000 }, { 6126, 0x0111 },
-  /* 0xb700 */
-  { 6129, 0x0023 }, { 6132, 0x0000 }, { 6132, 0x9300 }, { 6136, 0x0b01 },
-  { 6140, 0x1110 }, { 6143, 0x0030 }, { 6145, 0x0111 }, { 6148, 0x302b },
-  { 6154, 0xb011 }, { 6159, 0x13c7 }, { 6167, 0x3b01 }, { 6173, 0x0130 },
-  { 6176, 0x0280 }, { 6178, 0x0000 }, { 6178, 0x3000 }, { 6180, 0xb011 },
-  /* 0xb800 */
-  { 6185, 0x1383 }, { 6191, 0x2b01 }, { 6196, 0x1130 }, { 6200, 0x03b0 },
-  { 6205, 0x0011 }, { 6207, 0x300a }, { 6211, 0xb011 }, { 6216, 0x1102 },
-  { 6219, 0x2000 }, { 6220, 0x0000 }, { 6220, 0x0100 }, { 6221, 0x0111 },
-  { 6224, 0x102b }, { 6229, 0xa011 }, { 6233, 0x1302 }, { 6237, 0x2b01 },
-  /* 0xb900 */
-  { 6242, 0x0010 }, { 6243, 0x0100 }, { 6244, 0x0001 }, { 6245, 0x3000 },
-  { 6247, 0x9011 }, { 6251, 0x1302 }, { 6255, 0x2b01 }, { 6260, 0x1130 },
-  { 6264, 0x66b0 }, { 6271, 0x0000 }, { 6271, 0x3000 }, { 6273, 0xb011 },
-  { 6278, 0xd302 }, { 6284, 0x6b07 }, { 6292, 0x113a }, { 6298, 0x07b0 },
-  /* 0xba00 */
-  { 6304, 0x0103 }, { 6307, 0x0020 }, { 6308, 0x0000 }, { 6308, 0x1300 },
-  { 6311, 0x6b05 }, { 6318, 0x1138 }, { 6323, 0x03b0 }, { 6328, 0x0113 },
-  { 6332, 0x10b8 }, { 6337, 0x0000 }, { 6337, 0x1b00 }, { 6341, 0x2b05 },
-  { 6347, 0x0110 }, { 6349, 0x0300 }, { 6351, 0x0000 }, { 6351, 0x1000 },
-  /* 0xbb00 */
-  { 6352, 0xa011 }, { 6356, 0x1102 }, { 6359, 0x0a01 }, { 6362, 0x7970 },
-  { 6370, 0xa2b0 }, { 6376, 0x0111 }, { 6379, 0x100a }, { 6382, 0x0000 },
-  { 6382, 0x1100 }, { 6384, 0x0001 }, { 6385, 0x1110 }, { 6388, 0x0090 },
-  { 6390, 0x0111 }, { 6393, 0x0009 }, { 6395, 0x0000 }, { 6395, 0x9300 },
-  /* 0xbc00 */
-  { 6399, 0xbb05 }, { 6407, 0xf9f2 }, { 6418, 0x22b0 }, { 6423, 0x0113 },
-  { 6427, 0x323b }, { 6435, 0x2001 }, { 6437, 0x0000 }, { 6437, 0x0000 },
-  { 6437, 0x5930 }, { 6443, 0x06b0 }, { 6448, 0x0193 }, { 6453, 0x303b },
-  { 6460, 0xa011 }, { 6464, 0x1123 }, { 6469, 0x0000 }, { 6469, 0x1170 },
-  /* 0xbd00 */
-  { 6474, 0x02b0 }, { 6478, 0x0011 }, { 6480, 0x1010 }, { 6482, 0x0000 },
-  { 6482, 0x1301 }, { 6486, 0x0301 }, { 6489, 0x0110 }, { 6491, 0x0000 },
-  { 6491, 0x0793 }, { 6498, 0x162b }, { 6505, 0x0010 }, { 6506, 0x0101 },
-  { 6508, 0x0000 }, { 6508, 0x1130 }, { 6512, 0x0200 }, { 6513, 0x0111 },
-  /* 0xbe00 */
-  { 6516, 0x3029 }, { 6521, 0xb011 }, { 6526, 0x0000 }, { 6526, 0x0000 },
-  { 6526, 0x5130 }, { 6531, 0x0eb0 }, { 6537, 0x0513 }, { 6542, 0x383b },
-  { 6550, 0xb011 }, { 6555, 0x0303 }, { 6559, 0x0100 }, { 6560, 0x0000 },
-  { 6560, 0x0000 }, { 6560, 0x0193 }, { 6565, 0x1039 }, { 6570, 0x0000 },
-  /* 0xbf00 */
-  { 6570, 0x0302 }, { 6573, 0x3b00 }, { 6578, 0x0000 }, { 6578, 0x0000 },
-  { 6578, 0x0113 }, { 6582, 0x0023 }, { 6585, 0x0000 }, { 6585, 0x0000 },
-  { 6585, 0x0000 }, { 6585, 0x0010 }, { 6586, 0x0000 }, { 6586, 0x0001 },
-  { 6587, 0x3020 }, { 6590, 0x9011 }, { 6594, 0x0002 }, { 6595, 0x0000 },
-  /* 0xc000 */
-  { 6595, 0x0000 }, { 6595, 0x0000 }, { 6595, 0x0000 }, { 6595, 0x1000 },
-  { 6596, 0x0000 }, { 6596, 0x1102 }, { 6599, 0x0301 }, { 6602, 0x0000 },
-  { 6602, 0x0000 }, { 6602, 0x0113 }, { 6606, 0xb02b }, { 6613, 0xb079 },
-  { 6621, 0x1323 }, { 6627, 0x3b01 }, { 6633, 0x1130 }, { 6637, 0x02b0 },
-  /* 0xc100 */
-  { 6641, 0x0111 }, { 6644, 0xf021 }, { 6650, 0xb0d9 }, { 6658, 0x1343 },
-  { 6664, 0x3b01 }, { 6670, 0x1130 }, { 6674, 0x03b0 }, { 6679, 0x0111 },
-  { 6682, 0x7020 }, { 6686, 0xb051 }, { 6692, 0x1322 }, { 6697, 0x2001 },
-  { 6699, 0x1110 }, { 6702, 0x0190 }, { 6705, 0x0111 }, { 6708, 0x300b },
-  /* 0xc200 */
-  { 6713, 0xb011 }, { 6718, 0x9302 }, { 6723, 0xab01 }, { 6729, 0x0016 },
-  { 6732, 0x0100 }, { 6733, 0x0113 }, { 6737, 0x3021 }, { 6741, 0xb011 },
-  { 6746, 0x0302 }, { 6749, 0x2901 }, { 6753, 0x3130 }, { 6758, 0x02b0 },
-  { 6762, 0x0000 }, { 6762, 0x3000 }, { 6764, 0xb819 }, { 6771, 0x1b42 },
-  /* 0xc300 */
-  { 6777, 0x3301 }, { 6782, 0x1138 }, { 6787, 0x0330 }, { 6791, 0x0000 },
-  { 6791, 0x0020 }, { 6792, 0x0000 }, { 6792, 0x1300 }, { 6795, 0x3305 },
-  { 6801, 0x1110 }, { 6804, 0x0000 }, { 6804, 0x0000 }, { 6804, 0x0000 },
-  { 6804, 0x0001 }, { 6805, 0x9300 }, { 6809, 0x2305 }, { 6814, 0x0130 },
-  /* 0xc400 */
-  { 6817, 0x0100 }, { 6818, 0x0001 }, { 6819, 0x1010 }, { 6821, 0x3011 },
-  { 6825, 0x0100 }, { 6826, 0x0000 }, { 6826, 0x1130 }, { 6830, 0x0230 },
-  { 6833, 0x0001 }, { 6834, 0x1010 }, { 6836, 0x0000 }, { 6836, 0x1100 },
-  { 6838, 0x0000 }, { 6838, 0x0000 }, { 6838, 0x0200 }, { 6839, 0x8513 },
-  /* 0xc500 */
-  { 6845, 0x1003 }, { 6848, 0x1011 }, { 6851, 0x1300 }, { 6854, 0x2b01 },
-  { 6859, 0x7730 }, { 6867, 0x63b8 }, { 6875, 0x0113 }, { 6879, 0x303b },
-  { 6886, 0xb091 }, { 6892, 0x11a2 }, { 6897, 0x0201 }, { 6899, 0x7b30 },
-  { 6907, 0x57f0 }, { 6916, 0x0113 }, { 6920, 0x702b }, { 6927, 0xf0d1 },
-  /* 0xc600 */
-  { 6935, 0x11e3 }, { 6942, 0x1b01 }, { 6947, 0x7130 }, { 6953, 0x0ab9 },
-  { 6960, 0x0113 }, { 6964, 0x303b }, { 6971, 0x9001 }, { 6974, 0x1302 },
-  { 6978, 0x2b01 }, { 6983, 0x1130 }, { 6987, 0x02b0 }, { 6991, 0x0713 },
-  { 6997, 0x302b }, { 7003, 0x3011 }, { 7007, 0x1303 }, { 7012, 0x2301 },
-  /* 0xc700 */
-  { 7016, 0x1130 }, { 7020, 0x02b0 }, { 7024, 0x0113 }, { 7028, 0x30ab },
-  { 7035, 0xb411 }, { 7041, 0x11fe }, { 7050, 0x0901 }, { 7053, 0x7130 },
-  { 7059, 0x47b8 }, { 7067, 0x05d3 }, { 7074, 0x307b }, { 7082, 0xb011 },
-  { 7087, 0x5303 }, { 7093, 0x2101 }, { 7096, 0x1110 }, { 7099, 0x0000 },
-  /* 0xc800 */
-  { 7099, 0x0513 }, { 7104, 0x306b }, { 7111, 0xb011 }, { 7116, 0x1102 },
-  { 7119, 0x3301 }, { 7124, 0x0010 }, { 7125, 0x0000 }, { 7125, 0x0513 },
-  { 7130, 0x38eb }, { 7139, 0xa010 }, { 7142, 0x0102 }, { 7144, 0x3000 },
-  { 7146, 0x1110 }, { 7149, 0x02b0 }, { 7153, 0x0013 }, { 7156, 0x3020 },
-  /* 0xc900 */
-  { 7159, 0xb071 }, { 7166, 0x0102 }, { 7168, 0x1000 }, { 7169, 0x0010 },
-  { 7170, 0x0000 }, { 7170, 0x0113 }, { 7174, 0x100b }, { 7178, 0x1011 },
-  { 7181, 0x1300 }, { 7184, 0x2b01 }, { 7189, 0x0000 }, { 7189, 0x0000 },
-  { 7189, 0x0593 }, { 7195, 0x366b }, { 7204, 0xb095 }, { 7211, 0x1303 },
-  /* 0xca00 */
-  { 7216, 0x3b01 }, { 7222, 0x0110 }, { 7224, 0x0200 }, { 7225, 0x0000 },
-  { 7225, 0x3000 }, { 7227, 0xb011 }, { 7232, 0x0103 }, { 7235, 0x2000 },
-  { 7236, 0x0010 }, { 7237, 0x0100 }, { 7238, 0x0000 }, { 7238, 0x3000 },
-  { 7240, 0xb011 }, { 7245, 0x030a }, { 7249, 0x1001 }, { 7251, 0x0010 },
-  /* 0xcb00 */
-  { 7252, 0x0100 }, { 7253, 0x0111 }, { 7256, 0x0003 }, { 7258, 0x0000 },
-  { 7258, 0x1302 }, { 7262, 0x2301 }, { 7266, 0x0010 }, { 7267, 0x0300 },
-  { 7269, 0x0000 }, { 7269, 0x1000 }, { 7270, 0x0000 }, { 7270, 0x0100 },
-  { 7271, 0x0000 }, { 7271, 0x0010 }, { 7272, 0x0290 }, { 7275, 0x0000 },
-  /* 0xcc00 */
-  { 7275, 0x3000 }, { 7277, 0x3011 }, { 7281, 0x5386 }, { 7288, 0x7b01 },
-  { 7295, 0x1130 }, { 7299, 0x03b0 }, { 7304, 0x0151 }, { 7308, 0x0021 },
-  { 7310, 0x0000 }, { 7310, 0x1300 }, { 7313, 0x3b01 }, { 7319, 0x1130 },
-  { 7323, 0x02b0 }, { 7327, 0x0011 }, { 7329, 0x1010 }, { 7331, 0x0001 },
-  /* 0xcd00 */
-  { 7332, 0x1302 }, { 7336, 0x2b01 }, { 7341, 0x1110 }, { 7344, 0x0200 },
-  { 7345, 0x0000 }, { 7345, 0x1000 }, { 7346, 0xb011 }, { 7351, 0x0102 },
-  { 7353, 0x0100 }, { 7354, 0x1130 }, { 7358, 0x02b0 }, { 7362, 0x0001 },
-  { 7363, 0x1010 }, { 7365, 0x0001 }, { 7366, 0x1100 }, { 7368, 0x2b01 },
-  /* 0xce00 */
-  { 7373, 0x1110 }, { 7376, 0x0210 }, { 7378, 0x0113 }, { 7382, 0x002b },
-  { 7386, 0x0000 }, { 7386, 0x9300 }, { 7390, 0x2b03 }, { 7396, 0x1130 },
-  { 7400, 0x02b0 }, { 7404, 0x0113 }, { 7408, 0x303b }, { 7415, 0x0000 },
-  { 7415, 0x0002 }, { 7416, 0x0000 }, { 7416, 0x1930 }, { 7421, 0x03b0 },
-  /* 0xcf00 */
-  { 7426, 0x0113 }, { 7430, 0x102b }, { 7435, 0xb011 }, { 7440, 0x0103 },
-  { 7443, 0x0000 }, { 7443, 0x1130 }, { 7447, 0x02b0 }, { 7451, 0x0113 },
-  { 7455, 0x1021 }, { 7458, 0x0000 }, { 7458, 0x0102 }, { 7460, 0x0001 },
-  { 7461, 0x0010 }, { 7462, 0x0000 }, { 7462, 0x0113 }, { 7466, 0x102b },
-  /* 0xd000 */
-  { 7471, 0x0011 }, { 7473, 0x0102 }, { 7475, 0x2000 }, { 7476, 0x1130 },
-  { 7480, 0x02b0 }, { 7484, 0x0111 }, { 7487, 0x3001 }, { 7490, 0x3011 },
-  { 7494, 0x0002 }, { 7495, 0x0000 }, { 7495, 0x1130 }, { 7499, 0x02b0 },
-  { 7503, 0x0313 }, { 7508, 0x303b }, { 7515, 0xb011 }, { 7520, 0x0103 },
-  /* 0xd100 */
-  { 7523, 0x2000 }, { 7524, 0x0000 }, { 7524, 0x0000 }, { 7524, 0x0513 },
-  { 7529, 0x303b }, { 7536, 0xb011 }, { 7541, 0x1102 }, { 7544, 0x1000 },
-  { 7545, 0x0110 }, { 7547, 0x0000 }, { 7547, 0x0113 }, { 7551, 0x142b },
-  { 7557, 0x0001 }, { 7558, 0x0100 }, { 7559, 0x0000 }, { 7559, 0x0110 },
-  /* 0xd200 */
-  { 7561, 0x0280 }, { 7563, 0x0001 }, { 7564, 0x3000 }, { 7566, 0xb011 },
-  { 7571, 0x0102 }, { 7573, 0x1000 }, { 7574, 0x0010 }, { 7575, 0x0000 },
-  { 7575, 0x0113 }, { 7579, 0x1023 }, { 7583, 0x1011 }, { 7586, 0x9302 },
-  { 7591, 0x0b05 }, { 7596, 0x1110 }, { 7599, 0x0030 }, { 7601, 0x0113 },
-  /* 0xd300 */
-  { 7605, 0x702b }, { 7612, 0xb051 }, { 7618, 0x1323 }, { 7624, 0x3b01 },
-  { 7630, 0x0030 }, { 7632, 0x0000 }, { 7632, 0x0000 }, { 7632, 0x3000 },
-  { 7634, 0xb011 }, { 7639, 0x1303 }, { 7644, 0x2b01 }, { 7649, 0x1110 },
-  { 7652, 0x0330 }, { 7656, 0x0101 }, { 7658, 0x300a }, { 7662, 0xb011 },
-  /* 0xd400 */
-  { 7667, 0x0102 }, { 7669, 0x2000 }, { 7670, 0x0000 }, { 7670, 0x0000 },
-  { 7670, 0x0011 }, { 7672, 0x1000 }, { 7673, 0xa011 }, { 7677, 0x9300 },
-  { 7681, 0x2b05 }, { 7687, 0x0010 }, { 7688, 0x0200 }, { 7689, 0x0000 },
-  { 7689, 0x1000 }, { 7690, 0x9011 }, { 7694, 0x1100 }, { 7696, 0x2901 },
-  /* 0xd500 */
-  { 7700, 0x1110 }, { 7703, 0x00b0 }, { 7706, 0x0000 }, { 7706, 0x3000 },
-  { 7708, 0xb011 }, { 7713, 0x1302 }, { 7717, 0x2b21 }, { 7723, 0x1130 },
-  { 7727, 0x03b0 }, { 7732, 0x0001 }, { 7733, 0x0020 }, { 7734, 0x0000 },
-  { 7734, 0x1300 }, { 7737, 0x2b05 }, { 7743, 0x1130 }, { 7747, 0x02b0 },
-  /* 0xd600 */
-  { 7751, 0x0113 }, { 7755, 0x103b }, { 7761, 0x2011 }, { 7764, 0x1300 },
-  { 7767, 0x2b21 }, { 7773, 0x1132 }, { 7778, 0x0280 }, { 7780, 0x0013 },
-  { 7783, 0x3028 }, { 7787, 0xa011 }, { 7791, 0x1102 }, { 7794, 0x0a01 },
-  { 7797, 0x1130 }, { 7801, 0x0292 }, { 7805, 0x0111 }, { 7808, 0x3021 },
-  /* 0xd700 */
-  { 7812, 0x0011 }, { 7814, 0x1302 }, { 7818, 0x2b01 }, { 7823, 0x1130 },
-  { 7827, 0x0290 }, { 7830, 0x03d3 }, { 7837, 0x122b }, { 7843, 0x3011 },
-  { 7847, 0x1302 }, { 7851, 0x2b01 },
-};
-static const Summary16 ksc5601_uni2indx_pagef9[17] = {
-  /* 0xf900 */
-  { 7856, 0xffff }, { 7872, 0xffff }, { 7888, 0xffff }, { 7904, 0xffff },
-  { 7920, 0xffff }, { 7936, 0xffff }, { 7952, 0xffff }, { 7968, 0xffff },
-  { 7984, 0xffff }, { 8000, 0xffff }, { 8016, 0xffff }, { 8032, 0xffff },
-  { 8048, 0xffff }, { 8064, 0xffff }, { 8080, 0xffff }, { 8096, 0xffff },
-  /* 0xfa00 */
-  { 8112, 0x0fff },
-};
-static const Summary16 ksc5601_uni2indx_pageff[15] = {
-  /* 0xff00 */
-  { 8124, 0xfffe }, { 8139, 0xffff }, { 8155, 0xffff }, { 8171, 0xffff },
-  { 8187, 0xffff }, { 8203, 0x7fff }, { 8218, 0x0000 }, { 8218, 0x0000 },
-  { 8218, 0x0000 }, { 8218, 0x0000 }, { 8218, 0x0000 }, { 8218, 0x0000 },
-  { 8218, 0x0000 }, { 8218, 0x0000 }, { 8218, 0x006f },
-};
-
-static int
-ksc5601_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  if (n >= 2) {
-    const Summary16 *summary = NULL;
-    if (wc >= 0x0000 && wc < 0x0460)
-      summary = &ksc5601_uni2indx_page00[(wc>>4)];
-    else if (wc >= 0x2000 && wc < 0x2670)
-      summary = &ksc5601_uni2indx_page20[(wc>>4)-0x200];
-    else if (wc >= 0x3000 && wc < 0x33e0)
-      summary = &ksc5601_uni2indx_page30[(wc>>4)-0x300];
-    else if (wc >= 0x4e00 && wc < 0x9fa0)
-      summary = &ksc5601_uni2indx_page4e[(wc>>4)-0x4e0];
-    else if (wc >= 0xac00 && wc < 0xd7a0)
-      summary = &ksc5601_uni2indx_pageac[(wc>>4)-0xac0];
-    else if (wc >= 0xf900 && wc < 0xfa10)
-      summary = &ksc5601_uni2indx_pagef9[(wc>>4)-0xf90];
-    else if (wc >= 0xff00 && wc < 0xfff0)
-      summary = &ksc5601_uni2indx_pageff[(wc>>4)-0xff0];
-    if (summary) {
-      unsigned short used = summary->used;
-      unsigned int i = wc & 0x0f;
-      if (used & ((unsigned short) 1 << i)) {
-        unsigned short c;
-        /* Keep in `used' only the bits 0..i-1. */
-        used &= ((unsigned short) 1 << i) - 1;
-        /* Add `summary->indx' and the number of bits set in `used'. */
-        used = (used & 0x5555) + ((used & 0xaaaa) >> 1);
-        used = (used & 0x3333) + ((used & 0xcccc) >> 2);
-        used = (used & 0x0f0f) + ((used & 0xf0f0) >> 4);
-        used = (used & 0x00ff) + (used >> 8);
-        c = ksc5601_2charset[summary->indx + used];
-        r[0] = (c >> 8); r[1] = (c & 0xff);
-        return 2;
-      }
-    }
-    return RET_ILSEQ;
-  }
-  return RET_TOOSMALL;
-}
diff --git a/xc/lib/X11/lcUniConv/mulelao.h b/xc/lib/X11/lcUniConv/mulelao.h
deleted file mode 100644
index 03e138b6a..000000000
--- a/xc/lib/X11/lcUniConv/mulelao.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-/*
- * MULELAO-1
- */
-
-static const unsigned short mulelao_2uni[96] = {
-  /* 0xa0 */
-  0x00a0, 0x0e81, 0x0e82, 0xfffd, 0x0e84, 0xfffd, 0xfffd, 0x0e87,
-  0x0e88, 0xfffd, 0x0e8a, 0xfffd, 0xfffd, 0x0e8d, 0xfffd, 0xfffd,
-  /* 0xb0 */
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0x0e94, 0x0e95, 0x0e96, 0x0e97,
-  0xfffd, 0x0e99, 0x0e9a, 0x0e9b, 0x0e9c, 0x0e9d, 0x0e9e, 0x0e9f,
-  /* 0xc0 */
-  0xfffd, 0x0ea1, 0x0ea2, 0x0ea3, 0xfffd, 0x0ea5, 0xfffd, 0x0ea7,
-  0xfffd, 0xfffd, 0x0eaa, 0x0eab, 0xfffd, 0x0ead, 0x0eae, 0x0eaf,
-  /* 0xd0 */
-  0x0eb0, 0x0eb1, 0x0eb2, 0x0eb3, 0x0eb4, 0x0eb5, 0x0eb6, 0x0eb7,
-  0x0eb8, 0x0eb9, 0xfffd, 0x0ebb, 0x0ebc, 0x0ebd, 0xfffd, 0xfffd,
-  /* 0xe0 */
-  0x0ec0, 0x0ec1, 0x0ec2, 0x0ec3, 0x0ec4, 0xfffd, 0x0ec6, 0xfffd,
-  0x0ec8, 0x0ec9, 0x0eca, 0x0ecb, 0x0ecc, 0x0ecd, 0xfffd, 0xfffd,
-  /* 0xf0 */
-  0x0ed0, 0x0ed1, 0x0ed2, 0x0ed3, 0x0ed4, 0x0ed5, 0x0ed6, 0x0ed7,
-  0x0ed8, 0x0ed9, 0xfffd, 0xfffd, 0x0edc, 0x0edd, 0xfffd, 0xfffd,
-};
-
-static int
-mulelao_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c < 0xa0) {
-    *pwc = (wchar_t) c;
-    return 1;
-  }
-  else {
-    unsigned short wc = mulelao_2uni[c-0xa0];
-    if (wc != 0xfffd) {
-      *pwc = (wchar_t) wc;
-      return 1;
-    }
-  }
-  return RET_ILSEQ;
-}
-
-static const unsigned char mulelao_page0e[96] = {
-  0x00, 0xa1, 0xa2, 0x00, 0xa4, 0x00, 0x00, 0xa7, /* 0x80-0x87 */
-  0xa8, 0x00, 0xaa, 0x00, 0x00, 0xad, 0x00, 0x00, /* 0x88-0x8f */
-  0x00, 0x00, 0x00, 0x00, 0xb4, 0xb5, 0xb6, 0xb7, /* 0x90-0x97 */
-  0x00, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, /* 0x98-0x9f */
-  0x00, 0xc1, 0xc2, 0xc3, 0x00, 0xc5, 0x00, 0xc7, /* 0xa0-0xa7 */
-  0x00, 0x00, 0xca, 0xcb, 0x00, 0xcd, 0xce, 0xcf, /* 0xa8-0xaf */
-  0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, /* 0xb0-0xb7 */
-  0xd8, 0xd9, 0x00, 0xdb, 0xdc, 0xdd, 0x00, 0x00, /* 0xb8-0xbf */
-  0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0x00, 0xe6, 0x00, /* 0xc0-0xc7 */
-  0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0x00, 0x00, /* 0xc8-0xcf */
-  0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, /* 0xd0-0xd7 */
-  0xf8, 0xf9, 0x00, 0x00, 0xfc, 0xfd, 0x00, 0x00, /* 0xd8-0xdf */
-};
-
-static int
-mulelao_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x00a0) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc == 0x00a0)
-    c = 0xa0;
-  else if (wc >= 0x0e80 && wc < 0x0ee0)
-    c = mulelao_page0e[wc-0x0e80];
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/tatar_cyr.h b/xc/lib/X11/lcUniConv/tatar_cyr.h
deleted file mode 100644
index 536070056..000000000
--- a/xc/lib/X11/lcUniConv/tatar_cyr.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* $XFree86: xc/lib/X11/lcUniConv/tatar_cyr.h,v 1.3 2000/12/04 18:49:42 dawes Exp $ */
-
-/*
- * TATAR-CYR
- */
-
-static const unsigned short tatar_cyr_2uni[128] = {
-  /* 0x80 */
-  0x04d8, 0x0403, 0x201a, 0x0453, 0x201e, 0x2026, 0x2020, 0x2021,
-  0x20ac, 0x2030, 0x04e8, 0x2039, 0x04ae, 0x0496, 0x04a2, 0x04ba,
-  /* 0x90 */
-  0x04d9, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014,
-    0x98, 0x2122, 0x04e9, 0x203a, 0x04af, 0x0497, 0x04a3, 0x04bb,
-  /* 0xa0 */
-  0x00a0, 0x040e, 0x045e, 0x0408, 0x00a4, 0x0490, 0x00a6, 0x00a7,
-  0x0401, 0x00a9, 0x0404, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x0407,
-  /* 0xb0 */
-  0x00b0, 0x00b1, 0x0406, 0x0456, 0x0491, 0x00b5, 0x00b6, 0x00b7,
-  0x0451, 0x2116, 0x0454, 0x00bb, 0x0458, 0x0405, 0x0455, 0x0457,
-  /* 0xc0 */
-  0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
-  0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, 0x041f,
-  /* 0xd0 */
-  0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,
-  0x0428, 0x0429, 0x042a, 0x042b, 0x042c, 0x042d, 0x042e, 0x042f,
-  /* 0xe0 */
-  0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,
-  0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, 0x043f,
-  /* 0xf0 */
-  0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
-  0x0448, 0x0449, 0x044a, 0x044b, 0x044c, 0x044d, 0x044e, 0x044f,
-};
-
-static int
-tatar_cyr_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c < 0x80)
-    *pwc = (ucs4_t) c;
-  else
-    *pwc = (ucs4_t) tatar_cyr_2uni[c-0x80];
-  return 1;
-}
-
-static const unsigned char tatar_cyr_page00[32] = {
-  0xa0, 0x00, 0x00, 0x00, 0xa4, 0x00, 0xa6, 0xa7, /* 0xa0-0xa7 */
-  0x00, 0xa9, 0x00, 0xab, 0xac, 0xad, 0xae, 0x00, /* 0xa8-0xaf */
-  0xb0, 0xb1, 0x00, 0x00, 0x00, 0xb5, 0xb6, 0xb7, /* 0xb0-0xb7 */
-  0x00, 0x00, 0x00, 0xbb, 0x00, 0x00, 0x00, 0x00, /* 0xb8-0xbf */
-};
-static const unsigned char tatar_cyr_page04[240] = {
-  0x00, 0xa8, 0x00, 0x81, 0xaa, 0xbd, 0xb2, 0xaf, /* 0x00-0x07 */
-  0xa3, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa1, 0x00, /* 0x08-0x0f */
-  0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, /* 0x10-0x17 */
-  0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, /* 0x18-0x1f */
-  0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, /* 0x20-0x27 */
-  0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, /* 0x28-0x2f */
-  0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, /* 0x30-0x37 */
-  0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, /* 0x38-0x3f */
-  0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, /* 0x40-0x47 */
-  0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff, /* 0x48-0x4f */
-  0x00, 0xb8, 0x00, 0x83, 0xba, 0xbe, 0xb3, 0xbf, /* 0x50-0x57 */
-  0xbc, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x00, /* 0x58-0x5f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x67 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x77 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x87 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8f */
-  0xa5, 0xb4, 0x00, 0x00, 0x00, 0x00, 0x8d, 0x9d, /* 0x90-0x97 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9f */
-  0x00, 0x00, 0x8e, 0x9e, 0x00, 0x00, 0x00, 0x00, /* 0xa0-0xa7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8c, 0x9c, /* 0xa8-0xaf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xb0-0xb7 */
-  0x00, 0x00, 0x8f, 0x9f, 0x00, 0x00, 0x00, 0x00, /* 0xb8-0xbf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc0-0xc7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc8-0xcf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd0-0xd7 */
-  0x80, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd8-0xdf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xe0-0xe7 */
-  0x8a, 0x9a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xe8-0xef */
-};
-static const unsigned char tatar_cyr_page20[48] = {
-  0x00, 0x00, 0x00, 0x96, 0x97, 0x00, 0x00, 0x00, /* 0x10-0x17 */
-  0x91, 0x92, 0x82, 0x00, 0x93, 0x94, 0x84, 0x00, /* 0x18-0x1f */
-  0x86, 0x87, 0x95, 0x00, 0x00, 0x00, 0x85, 0x00, /* 0x20-0x27 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2f */
-  0x89, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x37 */
-  0x00, 0x8b, 0x9b, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3f */
-};
-static const unsigned char tatar_cyr_page21[24] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb9, 0x00, /* 0x10-0x17 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1f */
-  0x00, 0x00, 0x99, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x27 */
-};
-static const unsigned char tatar_cyr_page22[1] = {
-                                      0xb0,       /* 0x16-0x16 */
-};
-
-static int
-tatar_cyr_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x0080) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc >= 0x00a0 && wc < 0x00bc)
-    c = tatar_cyr_page00[wc-0x00a0];
-  else if (wc >= 0x0400 && wc < 0x04ef)
-    c = tatar_cyr_page04[wc-0x0400];
-  else if (wc >= 0x2010 && wc < 0x203b)
-    c = tatar_cyr_page20[wc-0x2010];
-  else if (wc == 0x20ac)
-    c = 0x88;
-  else if (wc >= 0x2110 && wc < 0x2123)
-    c = tatar_cyr_page21[wc-0x2110];
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/tcvn.h b/xc/lib/X11/lcUniConv/tcvn.h
deleted file mode 100644
index 32330bf3f..000000000
--- a/xc/lib/X11/lcUniConv/tcvn.h
+++ /dev/null
@@ -1,133 +0,0 @@
-
-/*
- * TCVN-5712
- */
-
-static const unsigned short tcvn_2uni_1[32] = {
-  /* 0x00 */
-  0x0000, 0x00da, 0x1ee4, 0x0003, 0x1eea, 0x1eec, 0x1eee, 0x0007,
-  0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
-  /* 0x10 */
-  0x0010, 0x1ee8, 0x1ef0, 0x1ef2, 0x1ef6, 0x1ef8, 0x00dd, 0x1ef4,
-  0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f,
-};
-static const unsigned short tcvn_2uni_2[128] = {
-  /* 0x80 */
-  0x00c0, 0x1ea2, 0x00c3, 0x00c1, 0x1ea0, 0x1eb6, 0x1eac, 0x00c8,
-  0x1eba, 0x1ebc, 0x00c9, 0x1eb8, 0x1ec6, 0x00cc, 0x1ec8, 0x0128,
-  /* 0x90 */
-  0x00cd, 0x1eca, 0x00d2, 0x1ece, 0x00d5, 0x00d3, 0x1ecc, 0x1ed8,
-  0x1edc, 0x1ede, 0x1ee0, 0x1eda, 0x1ee2, 0x00d9, 0x1ee6, 0x0168,
-  /* 0xa0 */
-  0x00a0, 0x0102, 0x00c2, 0x00ca, 0x00d4, 0x01a0, 0x01af, 0x0110,
-  0x0103, 0x00e2, 0x00ea, 0x00f4, 0x01a1, 0x01b0, 0x0111, 0x1eb0,
-  /* 0xb0 */
-  0x0300, 0x0309, 0x0303, 0x0301, 0x0323, 0x00e0, 0x1ea3, 0x00e3,
-  0x00e1, 0x1ea1, 0x1eb2, 0x1eb1, 0x1eb3, 0x1eb5, 0x1eaf, 0x1eb4,
-  /* 0xc0 */
-  0x1eae, 0x1ea6, 0x1ea8, 0x1eaa, 0x1ea4, 0x1ec0, 0x1eb7, 0x1ea7,
-  0x1ea9, 0x1eab, 0x1ea5, 0x1ead, 0x00e8, 0x1ec2, 0x1ebb, 0x1ebd,
-  /* 0xd0 */
-  0x00e9, 0x1eb9, 0x1ec1, 0x1ec3, 0x1ec5, 0x1ebf, 0x1ec7, 0x00ec,
-  0x1ec9, 0x1ec4, 0x1ebe, 0x1ed2, 0x0129, 0x00ed, 0x1ecb, 0x00f2,
-  /* 0xe0 */
-  0x1ed4, 0x1ecf, 0x00f5, 0x00f3, 0x1ecd, 0x1ed3, 0x1ed5, 0x1ed7,
-  0x1ed1, 0x1ed9, 0x1edd, 0x1edf, 0x1ee1, 0x1edb, 0x1ee3, 0x00f9,
-  /* 0xf0 */
-  0x1ed6, 0x1ee7, 0x0169, 0x00fa, 0x1ee5, 0x1eeb, 0x1eed, 0x1eef,
-  0x1ee9, 0x1ef1, 0x1ef3, 0x1ef7, 0x1ef9, 0x00fd, 0x1ef5, 0x1ed0,
-};
-
-static int
-tcvn_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c < 0x20)
-    *pwc = (wchar_t) tcvn_2uni_1[c];
-  else if (c < 0x80)
-    *pwc = (wchar_t) c;
-  else
-    *pwc = (wchar_t) tcvn_2uni_2[c-0x80];
-  return 1;
-}
-
-static const unsigned char tcvn_page00[96+184] = {
-  0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa0-0xa7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa8-0xaf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xb0-0xb7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xb8-0xbf */
-  0x80, 0x83, 0xa2, 0x82, 0x00, 0x00, 0x00, 0x00, /* 0xc0-0xc7 */
-  0x87, 0x8a, 0xa3, 0x00, 0x8d, 0x90, 0x00, 0x00, /* 0xc8-0xcf */
-  0x00, 0x00, 0x92, 0x95, 0xa4, 0x94, 0x00, 0x00, /* 0xd0-0xd7 */
-  0x00, 0x9d, 0x01, 0x00, 0x00, 0x16, 0x00, 0x00, /* 0xd8-0xdf */
-  0xb5, 0xb8, 0xa9, 0xb7, 0x00, 0x00, 0x00, 0x00, /* 0xe0-0xe7 */
-  0xcc, 0xd0, 0xaa, 0x00, 0xd7, 0xdd, 0x00, 0x00, /* 0xe8-0xef */
-  0x00, 0x00, 0xdf, 0xe3, 0xab, 0xe2, 0x00, 0x00, /* 0xf0-0xf7 */
-  0x00, 0xef, 0xf3, 0x00, 0x00, 0xfd, 0x00, 0x00, /* 0xf8-0xff */
-  /* 0x0100 */
-  0x00, 0x00, 0xa1, 0xa8, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x07 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0f */
-  0xa7, 0xae, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x17 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x27 */
-  0x8f, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x37 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x47 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x57 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x67 */
-  0x9f, 0xf2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x77 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x87 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x97 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9f */
-  0xa5, 0xac, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa0-0xa7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa6, /* 0xa8-0xaf */
-  0xad, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xb0-0xb7 */
-};
-static const unsigned char tcvn_page03[40] = {
-  0xb0, 0xb3, 0x00, 0xb2, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x07 */
-  0x00, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x17 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1f */
-  0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x27 */
-};
-static const unsigned char tcvn_page1e[96] = {
-  0x84, 0xb9, 0x81, 0xb6, 0xc4, 0xca, 0xc1, 0xc7, /* 0xa0-0xa7 */
-  0xc2, 0xc8, 0xc3, 0xc9, 0x86, 0xcb, 0xc0, 0xbe, /* 0xa8-0xaf */
-  0xaf, 0xbb, 0xba, 0xbc, 0xbf, 0xbd, 0x85, 0xc6, /* 0xb0-0xb7 */
-  0x8b, 0xd1, 0x88, 0xce, 0x89, 0xcf, 0xda, 0xd5, /* 0xb8-0xbf */
-  0xc5, 0xd2, 0xcd, 0xd3, 0xd9, 0xd4, 0x8c, 0xd6, /* 0xc0-0xc7 */
-  0x8e, 0xd8, 0x91, 0xde, 0x96, 0xe4, 0x93, 0xe1, /* 0xc8-0xcf */
-  0xff, 0xe8, 0xdb, 0xe5, 0xe0, 0xe6, 0xf0, 0xe7, /* 0xd0-0xd7 */
-  0x97, 0xe9, 0x9b, 0xed, 0x98, 0xea, 0x99, 0xeb, /* 0xd8-0xdf */
-  0x9a, 0xec, 0x9c, 0xee, 0x02, 0xf4, 0x9e, 0xf1, /* 0xe0-0xe7 */
-  0x11, 0xf8, 0x04, 0xf5, 0x05, 0xf6, 0x06, 0xf7, /* 0xe8-0xef */
-  0x12, 0xf9, 0x13, 0xfa, 0x17, 0xfe, 0x14, 0xfb, /* 0xf0-0xf7 */
-  0x15, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xf8-0xff */
-};
-
-static int
-tcvn_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x0080 && (wc >= 0x0020 || (0x00fe0076 & (1 << wc)) == 0)) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc >= 0x00a0 && wc < 0x01b8)
-    c = tcvn_page00[wc-0x00a0];
-  else if (wc >= 0x0300 && wc < 0x0328)
-    c = tcvn_page03[wc-0x0300];
-  else if (wc >= 0x1ea0 && wc < 0x1f00)
-    c = tcvn_page1e[wc-0x1ea0];
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/tis620.h b/xc/lib/X11/lcUniConv/tis620.h
deleted file mode 100644
index 830834b2e..000000000
--- a/xc/lib/X11/lcUniConv/tis620.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-/*
- * TIS620.2533-1
- */
-
-static const unsigned short tis620_2uni[96] = {
-  /* 0xa0 */
-  0xfffd, 0x0e01, 0x0e02, 0x0e03, 0x0e04, 0x0e05, 0x0e06, 0x0e07,
-  0x0e08, 0x0e09, 0x0e0a, 0x0e0b, 0x0e0c, 0x0e0d, 0x0e0e, 0x0e0f,
-  /* 0xb0 */
-  0x0e10, 0x0e11, 0x0e12, 0x0e13, 0x0e14, 0x0e15, 0x0e16, 0x0e17,
-  0x0e18, 0x0e19, 0x0e1a, 0x0e1b, 0x0e1c, 0x0e1d, 0x0e1e, 0x0e1f,
-  /* 0xc0 */
-  0x0e20, 0x0e21, 0x0e22, 0x0e23, 0x0e24, 0x0e25, 0x0e26, 0x0e27,
-  0x0e28, 0x0e29, 0x0e2a, 0x0e2b, 0x0e2c, 0x0e2d, 0x0e2e, 0x0e2f,
-  /* 0xd0 */
-  0x0e30, 0x0e31, 0x0e32, 0x0e33, 0x0e34, 0x0e35, 0x0e36, 0x0e37,
-  0x0e38, 0x0e39, 0x0e3a, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0x0e3f,
-  /* 0xe0 */
-  0x0e40, 0x0e41, 0x0e42, 0x0e43, 0x0e44, 0x0e45, 0x0e46, 0x0e47,
-  0x0e48, 0x0e49, 0x0e4a, 0x0e4b, 0x0e4c, 0x0e4d, 0x0e4e, 0x0e4f,
-  /* 0xf0 */
-  0x0e50, 0x0e51, 0x0e52, 0x0e53, 0x0e54, 0x0e55, 0x0e56, 0x0e57,
-  0x0e58, 0x0e59, 0x0e5a, 0x0e5b, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-};
-
-static int
-tis620_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c < 0x80) {
-    *pwc = (wchar_t) c;
-    return 1;
-  }
-  else if (c < 0xa0) {
-  }
-  else {
-    unsigned short wc = tis620_2uni[c-0xa0];
-    if (wc != 0xfffd) {
-      *pwc = (wchar_t) wc;
-      return 1;
-    }
-  }
-  return RET_ILSEQ;
-}
-
-static const unsigned char tis620_page0e[96] = {
-  0x00, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, /* 0x00-0x07 */
-  0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, /* 0x08-0x0f */
-  0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, /* 0x10-0x17 */
-  0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, /* 0x18-0x1f */
-  0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, /* 0x20-0x27 */
-  0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, /* 0x28-0x2f */
-  0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, /* 0x30-0x37 */
-  0xd8, 0xd9, 0xda, 0x00, 0x00, 0x00, 0x00, 0xdf, /* 0x38-0x3f */
-  0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, /* 0x40-0x47 */
-  0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, /* 0x48-0x4f */
-  0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, /* 0x50-0x57 */
-  0xf8, 0xf9, 0xfa, 0xfb, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5f */
-};
-
-static int
-tis620_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x0080) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc >= 0x0e00 && wc < 0x0e60)
-    c = tis620_page0e[wc-0x0e00];
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/ucs2be.h b/xc/lib/X11/lcUniConv/ucs2be.h
deleted file mode 100644
index af2a586b7..000000000
--- a/xc/lib/X11/lcUniConv/ucs2be.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * UCS-2BE = UCS-2 big endian
- */
-/* $XFree86: xc/lib/X11/lcUniConv/ucs2be.h,v 1.1 2000/11/28 17:25:09 dawes Exp $ */
-
-static int
-ucs2be_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)
-{
-  if (n >= 2) {
-    if (s[0] >= 0xd8 && s[0] < 0xe0) {
-      return RET_ILSEQ;
-    } else {
-      *pwc = (s[0] << 8) + s[1];
-      return 2;
-    }
-  }
-  return RET_TOOFEW(0);
-}
-
-static int
-ucs2be_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n)
-{
-  if (wc < 0x10000 && !(wc >= 0xd800 && wc < 0xe000)) {
-    if (n >= 2) {
-      r[0] = (unsigned char) (wc >> 8);
-      r[1] = (unsigned char) wc;
-      return 2;
-    } else
-      return RET_TOOSMALL;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUniConv/utf8.h b/xc/lib/X11/lcUniConv/utf8.h
deleted file mode 100644
index fe189cc2b..000000000
--- a/xc/lib/X11/lcUniConv/utf8.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* $XFree86: xc/lib/X11/lcUniConv/utf8.h,v 1.3 2000/11/28 18:50:07 dawes Exp $ */
-
-/*
- * UTF-8
- */
-
-/* Specification: RFC 2279 */
-
-static int
-utf8_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = s[0];
-
-  if (c < 0x80) {
-    *pwc = c;
-    return 1;
-  } else if (c < 0xc2) {
-    return RET_ILSEQ;
-  } else if (c < 0xe0) {
-    if (n < 2)
-      return RET_TOOFEW(0);
-    if (!((s[1] ^ 0x80) < 0x40))
-      return RET_ILSEQ;
-    *pwc = ((ucs4_t) (c & 0x1f) << 6)
-           | (ucs4_t) (s[1] ^ 0x80);
-    return 2;
-  } else if (c < 0xf0) {
-    if (n < 3)
-      return RET_TOOFEW(0);
-    if (!((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
-          && (c >= 0xe1 || s[1] >= 0xa0)))
-      return RET_ILSEQ;
-    *pwc = ((ucs4_t) (c & 0x0f) << 12)
-           | ((ucs4_t) (s[1] ^ 0x80) << 6)
-           | (ucs4_t) (s[2] ^ 0x80);
-    return 3;
-  } else if (c < 0xf8) {
-    if (n < 4)
-      return RET_TOOFEW(0);
-    if (!((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
-          && (s[3] ^ 0x80) < 0x40
-          && (c >= 0xf1 || s[1] >= 0x90)))
-      return RET_ILSEQ;
-    *pwc = ((ucs4_t) (c & 0x07) << 18)
-           | ((ucs4_t) (s[1] ^ 0x80) << 12)
-           | ((ucs4_t) (s[2] ^ 0x80) << 6)
-           | (ucs4_t) (s[3] ^ 0x80);
-    return 4;
-  } else if (c < 0xfc) {
-    if (n < 5)
-      return RET_TOOFEW(0);
-    if (!((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
-          && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
-          && (c >= 0xf9 || s[1] >= 0x88)))
-      return RET_ILSEQ;
-    *pwc = ((ucs4_t) (c & 0x03) << 24)
-           | ((ucs4_t) (s[1] ^ 0x80) << 18)
-           | ((ucs4_t) (s[2] ^ 0x80) << 12)
-           | ((ucs4_t) (s[3] ^ 0x80) << 6)
-           | (ucs4_t) (s[4] ^ 0x80);
-    return 5;
-  } else if (c < 0xfe) {
-    if (n < 6)
-      return RET_TOOFEW(0);
-    if (!((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
-          && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
-          && (s[5] ^ 0x80) < 0x40
-          && (c >= 0xfd || s[1] >= 0x84)))
-      return RET_ILSEQ;
-    *pwc = ((ucs4_t) (c & 0x01) << 30)
-           | ((ucs4_t) (s[1] ^ 0x80) << 24)
-           | ((ucs4_t) (s[2] ^ 0x80) << 18)
-           | ((ucs4_t) (s[3] ^ 0x80) << 12)
-           | ((ucs4_t) (s[4] ^ 0x80) << 6)
-           | (ucs4_t) (s[5] ^ 0x80);
-    return 6;
-  } else
-    return RET_ILSEQ;
-}
-
-static int
-utf8_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) /* n == 0 is acceptable */
-{
-  int count;
-  if (wc < 0x80)
-    count = 1;
-  else if (wc < 0x800)
-    count = 2;
-  else if (wc < 0x10000)
-    count = 3;
-  else if (wc < 0x200000)
-    count = 4;
-  else if (wc < 0x4000000)
-    count = 5;
-  else if (wc <= 0x7fffffff)
-    count = 6;
-  else
-    return RET_ILSEQ;
-  if (n < count)
-    return RET_TOOSMALL;
-  switch (count) { /* note: code falls through cases! */
-    case 6: r[5] = 0x80 | (wc & 0x3f); wc = wc >> 6; wc |= 0x4000000;
-    case 5: r[4] = 0x80 | (wc & 0x3f); wc = wc >> 6; wc |= 0x200000;
-    case 4: r[3] = 0x80 | (wc & 0x3f); wc = wc >> 6; wc |= 0x10000;
-    case 3: r[2] = 0x80 | (wc & 0x3f); wc = wc >> 6; wc |= 0x800;
-    case 2: r[1] = 0x80 | (wc & 0x3f); wc = wc >> 6; wc |= 0xc0;
-    case 1: r[0] = wc;
-  }
-  return count;
-}
diff --git a/xc/lib/X11/lcUniConv/viscii.h b/xc/lib/X11/lcUniConv/viscii.h
deleted file mode 100644
index b43bc620a..000000000
--- a/xc/lib/X11/lcUniConv/viscii.h
+++ /dev/null
@@ -1,122 +0,0 @@
-
-/*
- * VISCII1.1-1
- */
-
-/* Specification: RFC 1456 */
-
-static const unsigned short viscii_2uni_1[32] = {
-  /* 0x00 */
-  0x0000, 0x0001, 0x1eb2, 0x0003, 0x0004, 0x1eb4, 0x1eaa, 0x0007,
-  0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
-  /* 0x10 */
-  0x0010, 0x0011, 0x0012, 0x0013, 0x1ef6, 0x0015, 0x0016, 0x0017,
-  0x0018, 0x1ef8, 0x001a, 0x001b, 0x001c, 0x001d, 0x1ef4, 0x001f,
-};
-static const unsigned short viscii_2uni_2[128] = {
-  /* 0x80 */
-  0x1ea0, 0x1eae, 0x1eb0, 0x1eb6, 0x1ea4, 0x1ea6, 0x1ea8, 0x1eac,
-  0x1ebc, 0x1eb8, 0x1ebe, 0x1ec0, 0x1ec2, 0x1ec4, 0x1ec6, 0x1ed0,
-  /* 0x90 */
-  0x1ed2, 0x1ed4, 0x1ed6, 0x1ed8, 0x1ee2, 0x1eda, 0x1edc, 0x1ede,
-  0x1eca, 0x1ece, 0x1ecc, 0x1ec8, 0x1ee6, 0x0168, 0x1ee4, 0x1ef2,
-  /* 0xa0 */
-  0x00d5, 0x1eaf, 0x1eb1, 0x1eb7, 0x1ea5, 0x1ea7, 0x1ea9, 0x1ead,
-  0x1ebd, 0x1eb9, 0x1ebf, 0x1ec1, 0x1ec3, 0x1ec5, 0x1ec7, 0x1ed1,
-  /* 0xb0 */
-  0x1ed3, 0x1ed5, 0x1ed7, 0x1ee0, 0x01a0, 0x1ed9, 0x1edd, 0x1edf,
-  0x1ecb, 0x1ef0, 0x1ee8, 0x1eea, 0x1eec, 0x01a1, 0x1edb, 0x01af,
-  /* 0xc0 */
-  0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x1ea2, 0x0102, 0x1eb3, 0x1eb5,
-  0x00c8, 0x00c9, 0x00ca, 0x1eba, 0x00cc, 0x00cd, 0x0128, 0x1ef3,
-  /* 0xd0 */
-  0x0110, 0x1ee9, 0x00d2, 0x00d3, 0x00d4, 0x1ea1, 0x1ef7, 0x1eeb,
-  0x1eed, 0x00d9, 0x00da, 0x1ef9, 0x1ef5, 0x00dd, 0x1ee1, 0x01b0,
-  /* 0xe0 */
-  0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x1ea3, 0x0103, 0x1eef, 0x1eab,
-  0x00e8, 0x00e9, 0x00ea, 0x1ebb, 0x00ec, 0x00ed, 0x0129, 0x1ec9,
-  /* 0xf0 */
-  0x0111, 0x1ef1, 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x1ecf, 0x1ecd,
-  0x1ee5, 0x00f9, 0x00fa, 0x0169, 0x1ee7, 0x00fd, 0x1ee3, 0x1eee,
-};
-
-static int
-viscii_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c < 0x20)
-    *pwc = (wchar_t) viscii_2uni_1[c];
-  else if (c < 0x80)
-    *pwc = (wchar_t) c;
-  else
-    *pwc = (wchar_t) viscii_2uni_2[c-0x80];
-  return 1;
-}
-
-static const unsigned char viscii_page00[64+184] = {
-  0xc0, 0xc1, 0xc2, 0xc3, 0x00, 0x00, 0x00, 0x00, /* 0xc0-0xc7 */
-  0xc8, 0xc9, 0xca, 0x00, 0xcc, 0xcd, 0x00, 0x00, /* 0xc8-0xcf */
-  0x00, 0x00, 0xd2, 0xd3, 0xd4, 0xa0, 0x00, 0x00, /* 0xd0-0xd7 */
-  0x00, 0xd9, 0xda, 0x00, 0x00, 0xdd, 0x00, 0x00, /* 0xd8-0xdf */
-  0xe0, 0xe1, 0xe2, 0xe3, 0x00, 0x00, 0x00, 0x00, /* 0xe0-0xe7 */
-  0xe8, 0xe9, 0xea, 0x00, 0xec, 0xed, 0x00, 0x00, /* 0xe8-0xef */
-  0x00, 0x00, 0xf2, 0xf3, 0xf4, 0xf5, 0x00, 0x00, /* 0xf0-0xf7 */
-  0x00, 0xf9, 0xfa, 0x00, 0x00, 0xfd, 0x00, 0x00, /* 0xf8-0xff */
-  /* 0x0100 */
-  0x00, 0x00, 0xc5, 0xe5, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x07 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0f */
-  0xd0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x17 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x27 */
-  0xce, 0xee, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x37 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x47 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x57 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x67 */
-  0x9d, 0xfb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x77 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x87 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x97 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9f */
-  0xb4, 0xbd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa0-0xa7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbf, /* 0xa8-0xaf */
-  0xdf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xb0-0xb7 */
-};
-static const unsigned char viscii_page1e[96] = {
-  0x80, 0xd5, 0xc4, 0xe4, 0x84, 0xa4, 0x85, 0xa5, /* 0xa0-0xa7 */
-  0x86, 0xa6, 0x06, 0xe7, 0x87, 0xa7, 0x81, 0xa1, /* 0xa8-0xaf */
-  0x82, 0xa2, 0x02, 0xc6, 0x05, 0xc7, 0x83, 0xa3, /* 0xb0-0xb7 */
-  0x89, 0xa9, 0xcb, 0xeb, 0x88, 0xa8, 0x8a, 0xaa, /* 0xb8-0xbf */
-  0x8b, 0xab, 0x8c, 0xac, 0x8d, 0xad, 0x8e, 0xae, /* 0xc0-0xc7 */
-  0x9b, 0xef, 0x98, 0xb8, 0x9a, 0xf7, 0x99, 0xf6, /* 0xc8-0xcf */
-  0x8f, 0xaf, 0x90, 0xb0, 0x91, 0xb1, 0x92, 0xb2, /* 0xd0-0xd7 */
-  0x93, 0xb5, 0x95, 0xbe, 0x96, 0xb6, 0x97, 0xb7, /* 0xd8-0xdf */
-  0xb3, 0xde, 0x94, 0xfe, 0x9e, 0xf8, 0x9c, 0xfc, /* 0xe0-0xe7 */
-  0xba, 0xd1, 0xbb, 0xd7, 0xbc, 0xd8, 0xff, 0xe6, /* 0xe8-0xef */
-  0xb9, 0xf1, 0x9f, 0xcf, 0x1e, 0xdc, 0x14, 0xd6, /* 0xf0-0xf7 */
-  0x19, 0xdb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xf8-0xff */
-};
-
-static int
-viscii_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
-{
-  unsigned char c = 0;
-  if (wc < 0x0080 && (wc >= 0x0020 || (0x42100064 & (1 << wc)) == 0)) {
-    *r = wc;
-    return 1;
-  }
-  else if (wc >= 0x00c0 && wc < 0x01b8)
-    c = viscii_page00[wc-0x00c0];
-  else if (wc >= 0x1ea0 && wc < 0x1f00)
-    c = viscii_page1e[wc-0x1ea0];
-  if (c != 0) {
-    *r = c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
diff --git a/xc/lib/X11/lcUtil.c b/xc/lib/X11/lcUtil.c
deleted file mode 100644
index 26bea5a1d..000000000
--- a/xc/lib/X11/lcUtil.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* $XConsortium: lcUtil.c,v 1.3 94/01/20 18:07:47 rws Exp $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-
-#include <stdio.h>
-#include <ctype.h>
-#include <X11/Xos.h>
-#include "Xlibint.h"
-
-#ifdef X_NOT_STDC_ENV
-#ifndef toupper
-#define toupper(c)      ((int)(c) - 'a' + 'A')
-#endif
-#endif
-
-int 
-_XlcCompareISOLatin1(str1, str2)
-    char *str1, *str2;
-{
-    register char ch1, ch2;
-
-    for ( ; (ch1 = *str1) && (ch2 = *str2); str1++, str2++) {
-        if (islower(ch1))
-            ch1 = toupper(ch1);
-        if (islower(ch2))
-            ch2 = toupper(ch2);
-
-        if (ch1 != ch2)
-            break;
-    }
-
-    return *str1 - *str2;
-}
-
-int 
-_XlcNCompareISOLatin1(str1, str2, len)
-    char *str1, *str2;
-    int len;
-{
-    register char ch1, ch2;
-
-    for ( ; (ch1 = *str1) && (ch2 = *str2) && len; str1++, str2++, len--) {
-        if (islower(ch1))
-            ch1 = toupper(ch1);
-        if (islower(ch2))
-            ch2 = toupper(ch2);
-
-        if (ch1 != ch2)
-            break;
-    }
-
-    if (len == 0)
-        return 0;
-
-    return *str1 - *str2;
-}
diff --git a/xc/lib/X11/lcWrap.c b/xc/lib/X11/lcWrap.c
deleted file mode 100644
index 2bb97cbaa..000000000
--- a/xc/lib/X11/lcWrap.c
+++ /dev/null
@@ -1,618 +0,0 @@
-/* $TOG: lcWrap.c /main/28 1998/06/01 16:15:36 kaleb $ */
-/*
-
-Copyright 1991, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/*
- * Copyright 1991 by the Open Software Foundation
- * Copyright 1993 by the TOSHIBA Corp.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the names of Open Software Foundation and TOSHIBA
- * not be used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  Open Software
- * Foundation and TOSHIBA make no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without express or
- * implied warranty.
- *
- * OPEN SOFTWARE FOUNDATION AND TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL OPEN SOFTWARE FOUNDATIONN OR TOSHIBA BE
- * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- * 
- *		 M. Collins		OSF  
- *
- *		 Katsuhisa Yano		TOSHIBA Corp.
- */				
-/* $XFree86: xc/lib/X11/lcWrap.c,v 3.5 1999/05/09 10:50:41 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include <X11/Xlocale.h>
-#include <X11/Xos.h>
-#ifdef WIN32
-#undef close
-#endif
-#include <X11/Xutil.h>
-
-#ifdef __STDC__
-#define Const const
-#else
-#define Const /**/
-#endif
-
-#ifdef X_NOT_STDC_ENV
-extern char *getenv();
-#endif
-
-extern void _XlcInitLoader(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-#ifdef XTHREADS
-LockInfoPtr _Xi18n_lock;
-#endif
-
-#if NeedFunctionPrototypes
-char *
-XSetLocaleModifiers(
-    _Xconst char   *modifiers
-)
-#else
-char *
-XSetLocaleModifiers(modifiers)
-    char        *modifiers;
-#endif
-{
-    XLCd lcd = _XlcCurrentLC();
-    char *user_mods;
-
-    if (!lcd)
-	return (char *) NULL;
-    if (!modifiers)
-	return lcd->core->modifiers;
-    user_mods = getenv("XMODIFIERS");
-    modifiers = (*lcd->methods->map_modifiers) (lcd,
-						user_mods, (char *)modifiers);
-    if (modifiers) {
-	if (lcd->core->modifiers)
-	    Xfree(lcd->core->modifiers);
-	lcd->core->modifiers = (char *)modifiers;
-    }
-    return (char *)modifiers;
-}
-
-Bool
-XSupportsLocale()
-{
-    return _XlcCurrentLC() != (XLCd)NULL;
-}
-
-Bool _XlcValidModSyntax(mods, valid_mods)
-    char *mods;
-    char **valid_mods;
-{
-    int i;
-    char **ptr;
-
-    while (mods && (*mods == '@')) {
-	mods++;
-	if (*mods == '@')
-	    break;
-	for (ptr = valid_mods; *ptr; ptr++) {
-	    i = strlen(*ptr);
-	    if (strncmp(mods, *ptr, i) || ((mods[i] != '=')
-#ifdef WIN32
-					   && (mods[i] != '#')
-#endif
-					   ))
-		continue;
-	    mods = strchr(mods+i+1, '@');
-	    break;
-	}
-    }
-    return !mods || !*mods;
-}
-
-static Const char *im_valid[] = {"im", (char *)NULL};
-
-/*ARGSUSED*/
-char *
-_XlcDefaultMapModifiers (lcd, user_mods, prog_mods)
-    XLCd lcd;
-    char *user_mods;
-    char *prog_mods;
-{
-    int i;
-    char *mods;
-
-    if (!_XlcValidModSyntax(prog_mods, (char **)im_valid))
-	return (char *)NULL;
-    if (!_XlcValidModSyntax(user_mods, (char **)im_valid))
-	return (char *)NULL;
-    i = strlen(prog_mods) + 1;
-    if (user_mods)
-	i += strlen(user_mods);
-    mods = Xmalloc(i);
-    if (mods) {
-	strcpy(mods, prog_mods);
-	if (user_mods)
-	    strcat(mods, user_mods);
-#ifdef WIN32
-	{
-	    char *s;
-	    for (s = mods; s = strchr(s, '@'); s++) {
-		for (s++; *s && *s != '='; s++) {
-		    if (*s == '#') {
-			*s = '=';
-			break;
-		    }
-		}
-	    }
-	}
-#endif
-    }
-    return mods;
-}
-
-typedef struct _XLCdListRec {
-    struct _XLCdListRec *next;
-    XLCd lcd;
-    int ref_count;
-} XLCdListRec, *XLCdList;
-
-static XLCdList lcd_list = NULL;
-
-typedef struct _XlcLoaderListRec {
-    struct _XlcLoaderListRec *next;
-    XLCdLoadProc proc;
-} XlcLoaderListRec, *XlcLoaderList;
-
-static XlcLoaderList loader_list = NULL;
-
-void
-_XlcRemoveLoader(proc)
-    XLCdLoadProc proc;
-{
-    XlcLoaderList loader, prev;
-
-    if (loader_list == NULL)
-	return;
-
-    prev = loader = loader_list;
-    if (loader->proc == proc) {
-	loader_list = loader->next;
-	Xfree(loader);
-	return;
-    }
-
-    while ((loader = loader->next)) {
-	if (loader->proc == proc) {
-	    prev->next = loader->next;
-	    Xfree(loader);
-	    return;
-	}
-	prev = loader;
-    }
-
-    return;
-}
-
-Bool
-_XlcAddLoader(proc, position)
-    XLCdLoadProc proc;
-    XlcPosition position;
-{
-    XlcLoaderList loader, last;
-
-    _XlcRemoveLoader(proc);		/* remove old loader, if exist */
-
-    loader = (XlcLoaderList) Xmalloc(sizeof(XlcLoaderListRec));
-    if (loader == NULL)
-	return False;
-
-    loader->proc = proc;
-
-    if (loader_list == NULL)
-	position = XlcHead;
-
-    if (position == XlcHead) {
-	loader->next = loader_list;
-	loader_list = loader;
-    } else {
-	last = loader_list;
-	while (last->next)
-	    last = last->next;
-	
-	loader->next = NULL;
-	last->next = loader;
-    }
-
-    return True;
-}
-
-XLCd
-_XOpenLC(name)
-    _Xconst char *name;
-{
-    XLCd lcd;
-    XlcLoaderList loader;
-    XLCdList cur;
-#if !defined(X_NOT_STDC_ENV) && !defined(X_LOCALE)
-    int len;
-    char sinamebuf[256];
-    char* siname;
-    char *_XlcMapOSLocaleName();
-#endif
-
-    if (name == NULL) {
-	name = setlocale (LC_CTYPE, (char *)NULL);
-#if !defined(X_NOT_STDC_ENV) && !defined(X_LOCALE)
-    /* 
-     * _XlMapOSLOcaleName will return the same string or a substring 
-     * of name, so strlen(name) is okay 
-     */
-    if ((len = strlen(name)) < sizeof sinamebuf) siname = sinamebuf;
-    else siname = Xmalloc (len + 1);
-    if (siname == NULL) return NULL;
-    name = _XlcMapOSLocaleName(name, siname);
-#endif
-    }
-
-    _XLockMutex(_Xi18n_lock);
-
-    /*
-     * search for needed lcd, if found return it
-     */
-    for (cur = lcd_list; cur; cur = cur->next) {
-	if (!strcmp (cur->lcd->core->name, name)) {
-	    lcd = cur->lcd;
-	    cur->ref_count++;
-	    goto found;
-	}
-    }
-
-    if (!loader_list)
-	_XlcInitLoader();
-
-    /*
-     * not there, so try to get and add to list
-     */
-    for (loader = loader_list; loader; loader = loader->next) {
-	lcd = (*loader->proc)(name);
-	if (lcd) {
-	    cur = (XLCdList) Xmalloc (sizeof(XLCdListRec));
-	    if (cur) {
-		cur->lcd = lcd;
-		cur->ref_count = 1;
-		cur->next = lcd_list;
-		lcd_list = cur;
-	    } else {
-		(*lcd->methods->close)(lcd);
-		lcd = (XLCd) NULL;
-	    }
-	    break;
-	}
-    }
-
-found:
-    _XUnlockMutex(_Xi18n_lock);
-
-#if !defined(X_NOT_STDC_ENV) && !defined(X_LOCALE)
-    if (siname != sinamebuf) Xfree(siname);
-#endif
-
-    return lcd;
-}
-
-void
-_XCloseLC(lcd)
-    XLCd lcd;
-{
-    XLCdList cur, *prev;
-
-    for (prev = &lcd_list; (cur = *prev); prev = &cur->next) {
-	if (cur->lcd == lcd) {
-	    if (--cur->ref_count < 1) {
-		(*lcd->methods->close)(lcd);
-		*prev = cur->next;
-		Xfree(cur);
-	    }
-	    break;
-	}
-    }
-}
-
-/*
- * Get the XLCd for the current locale
- */
-
-XLCd
-_XlcCurrentLC()
-{
-    XLCd lcd;
-    static XLCd last_lcd = NULL;
-
-    lcd = _XOpenLC((char *) NULL);
-
-    if (last_lcd)
-	_XCloseLC(last_lcd);
-    
-    last_lcd = lcd;
-
-    return lcd;
-}
-
-XrmMethods
-_XrmInitParseInfo(state)
-    XPointer *state;
-{
-    XLCd lcd = _XOpenLC((char *) NULL);
-    
-    if (lcd == (XLCd) NULL)
-	return (XrmMethods) NULL;
-    
-    return (*lcd->methods->init_parse_info)(lcd, state);
-}
-
-int
-XmbTextPropertyToTextList(dpy, text_prop, list_ret, count_ret)
-    Display *dpy;
-    XTextProperty *text_prop;
-    char ***list_ret;
-    int *count_ret;
-{
-    XLCd lcd = _XlcCurrentLC();
-    
-    if (lcd == NULL)
-	return XLocaleNotSupported;
-
-    return (*lcd->methods->mb_text_prop_to_list)(lcd, dpy, text_prop, list_ret,
-						 count_ret);
-}
-
-int
-XwcTextPropertyToTextList(dpy, text_prop, list_ret, count_ret)
-    Display *dpy;
-    XTextProperty *text_prop;
-    wchar_t ***list_ret;
-    int *count_ret;
-{
-    XLCd lcd = _XlcCurrentLC();
-    
-    if (lcd == NULL)
-	return XLocaleNotSupported;
-
-    return (*lcd->methods->wc_text_prop_to_list)(lcd, dpy, text_prop, list_ret,
-						 count_ret);
-}
-
-int
-XmbTextListToTextProperty(dpy, list, count, style, text_prop)
-    Display *dpy;
-    char **list;
-    int count;
-    XICCEncodingStyle style;
-    XTextProperty *text_prop;
-{
-    XLCd lcd = _XlcCurrentLC();
-    
-    if (lcd == NULL)
-	return XLocaleNotSupported;
-
-    return (*lcd->methods->mb_text_list_to_prop)(lcd, dpy, list, count, style,
-						 text_prop);
-}
-
-int
-XwcTextListToTextProperty(dpy, list, count, style, text_prop)
-    Display *dpy;
-    wchar_t **list;
-    int count;
-    XICCEncodingStyle style;
-    XTextProperty *text_prop;
-{
-    XLCd lcd = _XlcCurrentLC();
-    
-    if (lcd == NULL)
-	return XLocaleNotSupported;
-
-    return (*lcd->methods->wc_text_list_to_prop)(lcd, dpy, list, count, style,
-						 text_prop);
-}
-
-void
-XwcFreeStringList(list)
-    wchar_t **list;
-{
-    XLCd lcd = _XlcCurrentLC();
-    
-    if (lcd == NULL)
-	return;
-
-    (*lcd->methods->wc_free_string_list)(lcd, list);
-}
-
-char *
-XDefaultString()
-{
-    XLCd lcd = _XlcCurrentLC();
-    
-    if (lcd == NULL)
-	return (char *) NULL;
-    
-    return (*lcd->methods->default_string)(lcd);
-}
-
-void
-_XlcCopyFromArg(src, dst, size)
-    char *src;
-    register char *dst;
-    register int size;
-{
-    if (size == sizeof(long))
-	*((long *) dst) = (long) src;
-#ifdef LONG64
-    else if (size == sizeof(int))
-	*((int *) dst) = (int) src;
-#endif
-    else if (size == sizeof(short))
-	*((short *) dst) = (short)(long) src;
-    else if (size == sizeof(char))
-	*((char *) dst) = (char)(long) src;
-    else if (size == sizeof(XPointer))
-	*((XPointer *) dst) = (XPointer) src;
-    else if (size > sizeof(XPointer))
-	memcpy(dst, (char *) src, size);
-    else
-	memcpy(dst, (char *) &src, size);
-}
-
-void
-_XlcCopyToArg(src, dst, size)
-    register char *src;
-    register char **dst;
-    register int size;
-{
-    if (size == sizeof(long))
-	*((long *) *dst) = *((long *) src);
-    else if (size == sizeof(short))
-	*((short *) *dst) = *((short *) src);
-    else if (size == sizeof(char))
-	*((char *) *dst) = *((char *) src);
-    else if (size == sizeof(XPointer))
-	*((XPointer *) *dst) = *((XPointer *) src);
-    else
-	memcpy(*dst, src, size);
-}
-
-void
-_XlcCountVaList(var, count_ret)
-    va_list var;
-    int *count_ret;
-{
-    register int count;
-
-    for (count = 0; va_arg(var, char *); count++)
-	va_arg(var, XPointer);
-    
-    *count_ret = count;
-}
-
-void
-_XlcVaToArgList(var, count, args_ret)
-    va_list var;
-    register int count;
-    XlcArgList *args_ret;
-{
-    register XlcArgList args;
-
-    *args_ret = args = (XlcArgList) Xmalloc(sizeof(XlcArg) * count);
-    if (args == (XlcArgList) NULL)
-	return;
-    
-    for ( ; count-- > 0; args++) {
-	args->name = va_arg(var, char *);
-	args->value = va_arg(var, XPointer);
-    }
-}
-
-void
-_XlcCompileResourceList(resources, num_resources)
-    register XlcResourceList resources;
-    register int num_resources;
-{
-    for ( ; num_resources-- > 0; resources++)
-	resources->xrm_name = XrmPermStringToQuark(resources->name);
-}
-
-char *
-_XlcGetValues(base, resources, num_resources, args, num_args, mask)
-    XPointer base;
-    XlcResourceList resources;
-    int num_resources;
-    XlcArgList args;
-    int num_args;
-    unsigned long mask;
-{
-    XlcResourceList res;
-    XrmQuark xrm_name;
-    int count;
-
-    for ( ; num_args-- > 0; args++) {
-	res = resources;
-	count = num_resources;
-	xrm_name = XrmPermStringToQuark(args->name);
-
-	for ( ; count-- > 0; res++) {
-	    if (xrm_name == res->xrm_name && (mask & res->mask)) {
-		    _XlcCopyToArg(base + res->offset, &args->value, res->size);
-		break;
-	    }
-	}
-
-	if (count < 0)
-	    return args->name;
-    }
-
-    return NULL;
-}
-
-char *
-_XlcSetValues(base, resources, num_resources, args, num_args, mask)
-    XPointer base;
-    XlcResourceList resources;
-    int num_resources;
-    XlcArgList args;
-    int num_args;
-    unsigned long mask;
-{
-    XlcResourceList res;
-    XrmQuark xrm_name;
-    int count;
-
-    for ( ; num_args-- > 0; args++) {
-	res = resources;
-	count = num_resources;
-	xrm_name = XrmPermStringToQuark(args->name);
-
-	for ( ; count-- > 0; res++) {
-	    if (xrm_name == res->xrm_name && (mask & res->mask)) {
-		_XlcCopyFromArg(args->value, base + res->offset, res->size);
-		break;
-	    }
-	}
-
-	if (count < 0)
-	    return args->name;
-    }
-
-    return NULL;
-}
diff --git a/xc/lib/X11/libX11.elist b/xc/lib/X11/libX11.elist
deleted file mode 100644
index 4e1fd5eed..000000000
--- a/xc/lib/X11/libX11.elist
+++ /dev/null
@@ -1,42 +0,0 @@
-/* $XConsortium: libX11.elist /main/1 1996/09/28 16:38:57 rws $ */
-
-/*************************************************************************
- * Export list for libX11
- * This list *must* be updated whenever a change is made to the API.
- * 
- * The syntax for the symbol declarations in this list is below.
- *      public       sym => Public   C   symbol, i.e., publicized API
- *      publicC++    sym => Public   C++ symbol, i.e., publicized API
- *      private      sym => Private  C   symbol, i.e., unpublicized API
- *      privateC++   sym => Private  C++ symbol, i.e., unpublicized API
- *      internal     sym => Internal C   symbol, i.e., not part of API
- *      internalC++  sym => Internal C++ symbol, i.e., not part of API
- *      force        sym => symbol to be exported even if not found.  Some
- *	                    restrictions may apply.  Avoid this directive.
- *
- * Note that exporting C++ symbols is not portable; different
- * compilers may use different name mangling schemes and different
- * hidden name (e.g. virtual function table) generation schemes.
- *
- * In addition a single "default" directive may appear, specifying how
- * unmentioned symbols should be treated.  The possible options are:
- *	default			Warn about implicit symbols and hide them.
- *	default public		Export public symbols implicitly.
- *	default private		Export public symbols implicitly.
- *	default internal	Hide public symbols implicitly.
- *
- *
- **************************************************************************/
-
-/* We will not be naming symbols; export all public symbols in the library. */
-default public
-
-#ifdef AIXV4
-/* 
- * In earlier releases of this library, IBM exported some standard
- * symbols from the system libraries.  We must keep re-exporting these
- * symbols for binary compatibility.
- */
-force setlocale
-force nl_langinfo
-#endif
diff --git a/xc/lib/X11/locking.c b/xc/lib/X11/locking.c
deleted file mode 100644
index f4cdd7107..000000000
--- a/xc/lib/X11/locking.c
+++ /dev/null
@@ -1,638 +0,0 @@
-/* $TOG: locking.c /main/37 1998/02/06 17:42:31 kaleb $ */
-/*
- 
-Copyright 1992, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-/*
- * Author: Stephen Gildea, MIT X Consortium
- *
- * locking.c - multi-thread locking routines implemented in C Threads
- */
-
-#include "Xlibint.h"
-#undef _XLockMutex
-#undef _XUnlockMutex
-#undef _XCreateMutex
-#undef _XFreeMutex
-
-#ifdef XTHREADS
-
-#include "locking.h"
-#ifdef XTHREADS_WARN
-#include <stdio.h>		/* for warn/debug stuff */
-#endif
-
-#define NUM_FREE_CVLS 4
-
-/* in XOpenDis.c */
-extern int  (*_XInitDisplayLock_fn)();
-extern void (*_XFreeDisplayLock_fn)();
-
-/* in lcWrap.c */
-extern LockInfoPtr _Xi18n_lock;
-
-#ifdef WIN32
-static DWORD _X_TlsIndex = (DWORD)-1;
-
-_Xthread_init()
-{
-    if (_X_TlsIndex == (DWORD)-1)
-	_X_TlsIndex = TlsAlloc();
-}
-
-struct _xthread_waiter *
-_Xthread_waiter()
-{
-    struct _xthread_waiter *me;
-
-    if (!(me = TlsGetValue(_X_TlsIndex))) {
-	me = (struct _xthread_waiter *)xmalloc(sizeof(struct _xthread_waiter));
-	me->sem = CreateSemaphore(NULL, 0, 1, NULL);
-	me->next = NULL;
-	TlsSetValue(_X_TlsIndex, me);
-    }
-    return me;
-}
-#endif /* WIN32 */
-
-static xthread_t _Xthread_self()
-{
-    return xthread_self();
-}
-
-static LockInfoRec global_lock;
-static LockInfoRec i18n_lock;
-
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-static void _XLockMutex(lip,file,line)
-    LockInfoPtr lip;
-    char* file;
-    int line;
-#else
-static void _XLockMutex(lip)
-    LockInfoPtr lip;
-#endif
-{
-    xmutex_lock(lip->lock);
-}
-
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-static void _XUnlockMutex(lip,file,line)
-    LockInfoPtr lip;
-    char* file;
-    int line;
-#else
-static void _XUnlockMutex(lip)
-    LockInfoPtr lip;
-#endif
-{
-    xmutex_unlock(lip->lock);
-}
-
-static void _XCreateMutex(lip)
-    LockInfoPtr lip;
-{
-    lip->lock = xmutex_malloc();
-    if (lip->lock) {
-	xmutex_init(lip->lock);
-	xmutex_set_name(lip->lock, "Xlib");
-    }
-}
-
-static void _XFreeMutex(lip)
-    LockInfoPtr lip;
-{
-    xmutex_clear(lip->lock);
-    xmutex_free(lip->lock);
-}
-
-#ifdef XTHREADS_WARN
-static char *locking_file;
-static int locking_line;
-static xthread_t locking_thread;
-static Bool xlibint_unlock = False; /* XlibInt.c may Unlock and re-Lock */
-
-/* history that is useful to examine in a debugger */
-#define LOCK_HIST_SIZE 21
-
-static struct {
-    Bool lockp;			/* True for lock, False for unlock */
-    xthread_t thread;
-    char *file;
-    int line;
-} locking_history[LOCK_HIST_SIZE];
-
-int lock_hist_loc = 0;		/* next slot to fill */
-
-static void _XLockDisplayWarn(dpy,file,line)
-    Display *dpy;
-    char *file;			/* source file, from macro */
-    int line;
-{
-    xthread_t self;
-    xthread_t old_locker;
-
-    self = xthread_self();
-    old_locker = locking_thread;
-    if (xthread_have_id(old_locker)) {
-	if (xthread_equal(old_locker, self))
-	    printf("Xlib ERROR: %s line %d thread %x: locking display already locked at %s line %d\n",
-		   file, line, self, locking_file, locking_line);
-#ifdef XTHREADS_DEBUG
-	else
-	    printf("%s line %d: thread %x waiting on lock held by %s line %d thread %x\n",
-		   file, line, self,
-		   locking_file, locking_line, old_locker);
-#endif /* XTHREADS_DEBUG */
-    }
-
-    xmutex_lock(dpy->lock->mutex);
-
-    if (strcmp(file, "XlibInt.c") == 0) {
-	if (!xlibint_unlock)
-	    printf("Xlib ERROR: XlibInt.c line %d thread %x locking display it did not unlock\n",
-		   line, self);
-	xlibint_unlock = False;
-    }
-
-#ifdef XTHREADS_DEBUG
-    /* if (old_locker  &&  old_locker != self) */
-    if (strcmp("XClearArea.c", file) && strcmp("XDrSegs.c", file)) /* ico */
-	printf("%s line %d: thread %x got display lock\n", file, line, self);
-#endif /* XTHREADS_DEBUG */
-
-    locking_thread = self;
-    if (strcmp(file, "XlibInt.c") != 0) {
-	locking_file = file;
-	locking_line = line;
-    }
-    locking_history[lock_hist_loc].file = file;
-    locking_history[lock_hist_loc].line = line;
-    locking_history[lock_hist_loc].thread = self;
-    locking_history[lock_hist_loc].lockp = True;
-    lock_hist_loc++;
-    if (lock_hist_loc >= LOCK_HIST_SIZE)
-	lock_hist_loc = 0;
-}
-#endif /* XTHREADS_WARN */
-
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-static void _XUnlockDisplay(dpy,file,line)
-    Display *dpy;
-    char *file;
-    int line;
-#else
-static void _XUnlockDisplay(dpy)
-    Display *dpy;
-#endif
-{
-#ifdef XTHREADS_WARN
-    xthread_t self = xthread_self();
-
-#ifdef XTHREADS_DEBUG
-    if (strcmp("XClearArea.c", file) && strcmp("XDrSegs.c", file)) /* ico */
-	printf("%s line %d: thread %x unlocking display\n", file, line, self);
-#endif /* XTHREADS_DEBUG */
-
-    if (!xthread_have_id(locking_thread))
-	printf("Xlib ERROR: %s line %d thread %x: unlocking display that is not locked\n",
-	       file, line, self);
-    else if (strcmp(file, "XlibInt.c") == 0)
-	xlibint_unlock = True;
-#ifdef XTHREADS_DEBUG
-    else if (strcmp(file, locking_file) != 0)
-	/* not always an error because locking_file is not per-thread */
-	printf("%s line %d: unlocking display locked from %s line %d (probably okay)\n",
-	       file, line, locking_file, locking_line);
-#endif /* XTHREADS_DEBUG */
-    xthread_clear_id(locking_thread);
-
-    locking_history[lock_hist_loc].file = file;
-    locking_history[lock_hist_loc].line = line;
-    locking_history[lock_hist_loc].thread = self;
-    locking_history[lock_hist_loc].lockp = False;
-    lock_hist_loc++;
-    if (lock_hist_loc >= LOCK_HIST_SIZE)
-	lock_hist_loc = 0;
-#endif /* XTHREADS_WARN */
-    xmutex_unlock(dpy->lock->mutex);
-}
-
-
-static struct _XCVList *_XCreateCVL(dpy)
-    Display *dpy;
-{
-    struct _XCVList *cvl;
-
-    if ((cvl = dpy->lock->free_cvls) != NULL) {
-	dpy->lock->free_cvls = cvl->next;
-	dpy->lock->num_free_cvls--;
-    } else {
-	cvl = (struct _XCVList *)Xmalloc(sizeof(struct _XCVList));
-	if (!cvl)
-	    return NULL;
-	cvl->cv = xcondition_malloc();
-	if (!cvl->cv) {
-	    Xfree(cvl);
-	    return NULL;
-	}
-	xcondition_init(cvl->cv);
-	xcondition_set_name(cvl->cv, "Xlib read queue");
-    }
-    cvl->next = NULL;
-    return cvl;
-}
-
-/* Put ourselves on the queue to read the connection.
-   Allocates and returns a queue element. */
-
-static struct _XCVList *
-_XPushReader(dpy, tail)
-    Display *dpy;
-    struct _XCVList ***tail;
-{
-    struct _XCVList *cvl;
-
-    cvl = _XCreateCVL(dpy);
-#ifdef XTHREADS_DEBUG
-    printf("_XPushReader called in thread %x, pushing %x\n",
-	   xthread_self(), cvl);
-#endif
-    **tail = cvl;
-    *tail = &cvl->next;
-    return cvl;
-}
-
-/* signal the next thread waiting to read the connection */
-
-static void _XPopReader(dpy, list, tail)
-    Display *dpy;
-    struct _XCVList **list;
-    struct _XCVList ***tail;
-{
-    register struct _XCVList *front = *list;
-
-#ifdef XTHREADS_DEBUG
-    printf("_XPopReader called in thread %x, popping %x\n",
-	   xthread_self(), front);
-#endif
-
-    if (dpy->flags & XlibDisplayProcConni)
-	/* we never added ourself in the first place */
-	return;
-
-    if (front) {		/* check "front" for paranoia */
-	*list = front->next;
-	if (*tail == &front->next)	/* did we free the last elt? */
-	    *tail = list;
-	if (dpy->lock->num_free_cvls < NUM_FREE_CVLS) {
-	    front->next = dpy->lock->free_cvls;
-	    dpy->lock->free_cvls = front;
-	    dpy->lock->num_free_cvls++;
-	} else {
-	    xcondition_clear(front->cv);
-	    Xfree((char *)front->cv);
-	    Xfree((char *)front);
-	}
-    }
-
-    /* signal new front after it is in place */
-    if (dpy->lock->reply_first = (dpy->lock->reply_awaiters != NULL)) {
-	ConditionSignal(dpy, dpy->lock->reply_awaiters->cv);
-    } else if (dpy->lock->event_awaiters) {
-	ConditionSignal(dpy, dpy->lock->event_awaiters->cv);
-    }
-}
-
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-static void _XConditionWait(cv, mutex,file,line)
-    xcondition_t cv;
-    xmutex_t mutex;
-    char *file;
-    int line;
-#else
-static void _XConditionWait(cv, mutex)
-    xcondition_t cv;
-    xmutex_t mutex;
-#endif
-{
-#ifdef XTHREADS_WARN
-    xthread_t self = xthread_self();
-    char *old_file = locking_file;
-    int old_line = locking_line;
-    
-#ifdef XTHREADS_DEBUG
-    printf("line %d thread %x in condition wait\n", line, self);
-#endif
-    xthread_clear_id(locking_thread);
-
-    locking_history[lock_hist_loc].file = file;
-    locking_history[lock_hist_loc].line = line;
-    locking_history[lock_hist_loc].thread = self;
-    locking_history[lock_hist_loc].lockp = False;
-    lock_hist_loc++;
-    if (lock_hist_loc >= LOCK_HIST_SIZE)
-	lock_hist_loc = 0;
-#endif /* XTHREADS_WARN */
-
-    xcondition_wait(cv, mutex);
-
-#ifdef XTHREADS_WARN
-    locking_thread = self;
-    locking_file = old_file;
-    locking_line = old_line;
-
-    locking_history[lock_hist_loc].file = file;
-    locking_history[lock_hist_loc].line = line;
-    locking_history[lock_hist_loc].thread = self;
-    locking_history[lock_hist_loc].lockp = True;
-    lock_hist_loc++;
-    if (lock_hist_loc >= LOCK_HIST_SIZE)
-	lock_hist_loc = 0;
-#ifdef XTHREADS_DEBUG
-    printf("line %d thread %x was signaled\n", line, self);
-#endif /* XTHREADS_DEBUG */
-#endif /* XTHREADS_WARN */
-}
-
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-static void _XConditionSignal(cv,file,line)
-    xcondition_t cv;
-    char *file;
-    int line;
-#else
-static void _XConditionSignal(cv)
-    xcondition_t cv;
-#endif
-{
-#ifdef XTHREADS_WARN
-#ifdef XTHREADS_DEBUG
-    printf("line %d thread %x is signalling\n", line, xthread_self());
-#endif
-#endif
-    xcondition_signal(cv);
-}
-    
-
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-static void _XConditionBroadcast(cv,file,line)
-    xcondition_t cv;
-    char *file;
-    int line;
-#else
-static void _XConditionBroadcast(cv)
-    xcondition_t cv;
-#endif
-{
-#ifdef XTHREADS_WARN
-#ifdef XTHREADS_DEBUG
-    printf("line %d thread %x is broadcasting\n", line, xthread_self());
-#endif
-#endif
-    xcondition_broadcast(cv);
-}
-    
-
-static void _XFreeDisplayLock(dpy)
-    Display *dpy;
-{
-    struct _XCVList *cvl;
-
-    if (dpy->lock != NULL) {
-	if (dpy->lock->mutex != NULL) {
-	    xmutex_clear(dpy->lock->mutex);
-	    xmutex_free(dpy->lock->mutex);
-	}
-	if (dpy->lock->cv != NULL) {
-	    xcondition_clear(dpy->lock->cv);
-	    xcondition_free(dpy->lock->cv);
-	}
-	if (dpy->lock->writers != NULL) {
-	    xcondition_clear(dpy->lock->writers);
-	    xcondition_free(dpy->lock->writers);
-	}
-	while (cvl = dpy->lock->free_cvls) {
-	    dpy->lock->free_cvls = cvl->next;
-	    xcondition_clear(cvl->cv);
-	    Xfree((char *)cvl->cv);
-	    Xfree((char *)cvl);
-	}
-	Xfree((char *)dpy->lock);
-	dpy->lock = NULL;
-    }
-    if (dpy->lock_fns != NULL) {
-	Xfree((char *)dpy->lock_fns);
-	dpy->lock_fns = NULL;
-    }
-}
-
-/*
- * wait for thread with user-level display lock to release it.
- */
-
-static void _XDisplayLockWait(dpy)
-    Display *dpy;
-{
-    xthread_t self;
-
-    while (dpy->lock->locking_level > 0) {
-	self = xthread_self();
-	if (xthread_equal(dpy->lock->locking_thread, self))
-	    break;
-	ConditionWait(dpy, dpy->lock->cv);
-    }
-}
-
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-static void _XLockDisplay(dpy, file, line)
-    Display *dpy;
-    char *file;			/* source file, from macro */
-    int line;
-#else
-static void _XLockDisplay(dpy)
-    Display *dpy;
-#endif
-{
-#ifdef XTHREADS_WARN
-    _XLockDisplayWarn(dpy, file, line);
-#else
-    xmutex_lock(dpy->lock->mutex);
-#endif
-    if (dpy->lock->locking_level > 0)
-	_XDisplayLockWait(dpy);
-}
-
-/*
- * _XReply is allowed to exit from select/poll and clean up even if a
- * user-level lock is in force, so it uses this instead of _XFancyLockDisplay.
- */
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-static void _XInternalLockDisplay(dpy, wskip, file, line)
-    Display *dpy;
-    Bool wskip;
-    char *file;			/* source file, from macro */
-    int line;
-#else
-static void _XInternalLockDisplay(dpy, wskip)
-    Display *dpy;
-    Bool wskip;
-#endif
-{
-#ifdef XTHREADS_WARN
-    _XLockDisplayWarn(dpy, file, line);
-#else
-    xmutex_lock(dpy->lock->mutex);
-#endif
-    if (!wskip && dpy->lock->locking_level > 0)
-	_XDisplayLockWait(dpy);
-}
-
-#if NeedFunctionPrototypes
-static void _XUserLockDisplay(
-    register Display* dpy)
-#else
-static void _XUserLockDisplay(dpy)
-    register Display* dpy;
-#endif
-{
-    if (++dpy->lock->locking_level == 1) {
-	dpy->lock->lock_wait = _XDisplayLockWait;
-	dpy->lock->locking_thread = xthread_self();
-    }
-}
-
-#if NeedFunctionPrototypes
-void _XUserUnlockDisplay(
-    register Display* dpy)
-#else
-void _XUserUnlockDisplay(dpy)
-    register Display* dpy;
-#endif
-{
-    if (dpy->lock->locking_level > 0 && --dpy->lock->locking_level == 0) {
-	/* signal other threads that might be waiting in XLockDisplay */
-	ConditionBroadcast(dpy, dpy->lock->cv);
-	dpy->lock->lock_wait = NULL;
-	xthread_clear_id(dpy->lock->locking_thread);
-    }
-}
-
-/* returns 0 if initialized ok, -1 if unable to allocate
-   a mutex or other memory */
-
-static int _XInitDisplayLock(dpy)
-    Display *dpy;
-{
-    dpy->lock_fns = (struct _XLockPtrs*)Xmalloc(sizeof(struct _XLockPtrs));
-    if (dpy->lock_fns == NULL)
-	return -1;
-    dpy->lock = (struct _XLockInfo *)Xmalloc(sizeof(struct _XLockInfo));
-    if (dpy->lock == NULL) {
-	_XFreeDisplayLock(dpy);
-	return -1;
-    }
-    dpy->lock->cv = xcondition_malloc();
-    dpy->lock->mutex = xmutex_malloc();
-    dpy->lock->writers = xcondition_malloc();
-    if (!dpy->lock->cv || !dpy->lock->mutex || !dpy->lock->writers) {
-	_XFreeDisplayLock(dpy);
-	return -1;
-    }
-
-    dpy->lock->reply_bytes_left = 0;
-    dpy->lock->reply_was_read = False;
-    dpy->lock->reply_awaiters = NULL;
-    dpy->lock->reply_awaiters_tail = &dpy->lock->reply_awaiters;
-    dpy->lock->event_awaiters = NULL;
-    dpy->lock->event_awaiters_tail = &dpy->lock->event_awaiters;
-    dpy->lock->reply_first = False;
-    dpy->lock->locking_level = 0;
-    dpy->lock->num_free_cvls = 0;
-    dpy->lock->free_cvls = NULL;
-    xthread_clear_id(dpy->lock->locking_thread);
-    xthread_clear_id(dpy->lock->reading_thread);
-    xthread_clear_id(dpy->lock->conni_thread);
-    xmutex_init(dpy->lock->mutex);
-    xmutex_set_name(dpy->lock->mutex, "Xlib Display");
-    xcondition_init(dpy->lock->cv);
-    xcondition_set_name(dpy->lock->cv, "XLockDisplay");
-    xcondition_init(dpy->lock->writers);
-    xcondition_set_name(dpy->lock->writers, "Xlib wait for writable");
-    dpy->lock_fns->lock_display = _XLockDisplay;
-    dpy->lock->internal_lock_display = _XInternalLockDisplay;
-    dpy->lock_fns->unlock_display = _XUnlockDisplay;
-    dpy->lock->user_lock_display = _XUserLockDisplay;
-    dpy->lock->user_unlock_display = _XUserUnlockDisplay;
-    dpy->lock->pop_reader = _XPopReader;
-    dpy->lock->push_reader = _XPushReader;
-    dpy->lock->condition_wait = _XConditionWait;
-    dpy->lock->condition_signal = _XConditionSignal;
-    dpy->lock->condition_broadcast = _XConditionBroadcast;
-    dpy->lock->create_cvl = _XCreateCVL;
-    dpy->lock->lock_wait = NULL; /* filled in by XLockDisplay() */
-
-    return 0;
-}
-
-
-Status XInitThreads()
-{
-    if (_Xglobal_lock)
-	return 1;
-#ifdef xthread_init
-    xthread_init();		/* return value? */
-#endif
-    if (!(global_lock.lock = xmutex_malloc()))
-	return 0;
-    if (!(i18n_lock.lock = xmutex_malloc())) {
-	xmutex_free(global_lock.lock);
-	global_lock.lock = NULL;
-	return 0;
-    }
-    _Xglobal_lock = &global_lock;
-    xmutex_init(_Xglobal_lock->lock);
-    xmutex_set_name(_Xglobal_lock->lock, "Xlib global");
-    _Xi18n_lock = &i18n_lock;
-    xmutex_init(_Xi18n_lock->lock);
-    xmutex_set_name(_Xi18n_lock->lock, "Xlib i18n");
-    _XLockMutex_fn = _XLockMutex;
-    _XUnlockMutex_fn = _XUnlockMutex;
-    _XCreateMutex_fn = _XCreateMutex;
-    _XFreeMutex_fn = _XFreeMutex;
-    _XInitDisplayLock_fn = _XInitDisplayLock;
-    _XFreeDisplayLock_fn = _XFreeDisplayLock;
-    _Xthread_self_fn = _Xthread_self;
-
-#ifdef XTHREADS_WARN
-#ifdef XTHREADS_DEBUG
-    setlinebuf(stdout);		/* for debugging messages */
-#endif
-#endif
-
-    return 1;
-}
-
-#else /* XTHREADS */
-Status XInitThreads()
-{
-    return 0;
-}
-#endif /* XTHREADS */
diff --git a/xc/lib/X11/locking.h b/xc/lib/X11/locking.h
deleted file mode 100644
index 945e94fe0..000000000
--- a/xc/lib/X11/locking.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/* $TOG: locking.h /main/16 1998/02/06 17:42:38 kaleb $ */
-/* 
-
-Copyright 1992, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-/*
- * Author: Stephen Gildea, MIT X Consortium
- *
- * locking.h - data types for C Threads locking.
- * Used by XlibInt.c, locking.c, LockDis.c
- */
-
-#ifndef _X_locking_H_
-#define _X_locking_H_
-
-#define xmalloc(s) Xmalloc(s)
-#define xfree(s) Xfree(s)
-#include <X11/Xthreads.h>
-
-struct _XCVList {
-    xcondition_t cv;
-    xReply *buf;
-    struct _XCVList *next;
-};
-
-extern xthread_t (*_Xthread_self_fn)( /* in XlibInt.c */
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-/* Display->lock is a pointer to one of these */
-
-struct _XLockInfo {
-	xmutex_t mutex;		/* mutex for critical sections */
-	int reply_bytes_left;	/* nbytes of the reply still to read */
-	Bool reply_was_read;	/* _XReadEvents read a reply for _XReply */
-	struct _XCVList *reply_awaiters; /* list of CVs for _XReply */
-	struct _XCVList **reply_awaiters_tail;
-	struct _XCVList *event_awaiters; /* list of CVs for _XReadEvents */
-	struct _XCVList **event_awaiters_tail;
-	Bool reply_first;	/* who may read, reply queue or event queue */
-	/* for XLockDisplay */
-	int locking_level;	/* how many times into XLockDisplay we are */
-	xthread_t locking_thread; /* thread that did XLockDisplay */
-	xcondition_t cv;	/* wait if another thread has XLockDisplay */
-	xthread_t reading_thread; /* cache */
-	xthread_t conni_thread;	/* thread in XProcessInternalConnection */
-	xcondition_t writers;	/* wait for writable */
-	int num_free_cvls;
-	struct _XCVList *free_cvls;
-	/* used only in XlibInt.c */
-	void (*pop_reader)(
-#if NeedNestedPrototypes
-			   Display* /* dpy */,
-			   struct _XCVList** /* list */,
-			   struct _XCVList*** /* tail */
-#endif
-			   );
-	struct _XCVList *(*push_reader)(
-#if NeedNestedPrototypes
-					Display *	   /* dpy */,
-					struct _XCVList*** /* tail */
-#endif
-					);
-	void (*condition_wait)(
-#if NeedNestedPrototypes
-			       xcondition_t /* cv */,
-			       xmutex_t /* mutex */
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-			       , char* /* file */,
-			       int /* line */
-#endif
-#endif
-			       );
-	void (*internal_lock_display)(
-#if NeedNestedPrototypes
-				      Display* /* dpy */,
-				      Bool /* wskip */
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-				      , char* /* file */,
-				      int /* line */
-#endif
-#endif
-				      );
-	/* used in XlibInt.c and locking.c */
-	void (*condition_signal)(
-#if NeedNestedPrototypes
-				 xcondition_t /* cv */
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-				 , char* /* file */,
-				 int /* line */
-#endif
-#endif
-				 );
-	void (*condition_broadcast)(
-#if NeedNestedPrototypes
-				 xcondition_t /* cv */
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-				 , char* /* file */,
-				 int /* line */
-#endif
-#endif
-				    );
-	/* used in XlibInt.c and XLockDis.c */
-	void (*lock_wait)(
-#if NeedNestedPrototypes
-			  Display* /* dpy */
-#endif
-			  );
-	void (*user_lock_display)(
-#if NeedNestedPrototypes
-				  Display* /* dpy */
-#endif
-				  );
-	void (*user_unlock_display)(
-#if NeedNestedPrototypes
-				    Display* /* dpy */
-#endif
-				    );
-	struct _XCVList *(*create_cvl)(
-#if NeedNestedPrototypes
-				       Display * /* dpy */
-#endif
-				       );
-};
-
-#define UnlockNextEventReader(d) if ((d)->lock) \
-    (*(d)->lock->pop_reader)((d),&(d)->lock->event_awaiters,&(d)->lock->event_awaiters_tail)
-
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-#define ConditionWait(d,c) if ((d)->lock) \
-	(*(d)->lock->condition_wait)(c, (d)->lock->mutex,__FILE__,__LINE__)
-#define ConditionSignal(d,c) if ((d)->lock) \
-	(*(d)->lock->condition_signal)(c,__FILE__,__LINE__)
-#define ConditionBroadcast(d,c) if ((d)->lock) \
-	(*(d)->lock->condition_broadcast)(c,__FILE__,__LINE__)
-#else
-#define ConditionWait(d,c) if ((d)->lock) \
-	(*(d)->lock->condition_wait)(c, (d)->lock->mutex)
-#define ConditionSignal(d,c) if ((d)->lock) \
-	(*(d)->lock->condition_signal)(c)
-#define ConditionBroadcast(d,c) if ((d)->lock) \
-	(*(d)->lock->condition_broadcast)(c)
-#endif
-
-typedef struct _LockInfoRec {
-	xmutex_t	lock;
-} LockInfoRec;
-
-#endif /* _X_locking_H_ */
diff --git a/xc/lib/X11/mbWMProps.c b/xc/lib/X11/mbWMProps.c
deleted file mode 100644
index 220ef2fe9..000000000
--- a/xc/lib/X11/mbWMProps.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* $TOG: mbWMProps.c /main/6 1998/02/06 17:44:24 kaleb $ */
-/*
-
-Copyright 1991, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-#include <X11/Xlocale.h>
-
-#if NeedFunctionPrototypes
-void XmbSetWMProperties (
-    Display *dpy,
-    Window w,
-    _Xconst char *windowName,
-    _Xconst char *iconName,
-    char **argv,
-    int argc,
-    XSizeHints *sizeHints,
-    XWMHints *wmHints,
-    XClassHint *classHints)
-#else
-void XmbSetWMProperties (dpy, w, windowName, iconName, argv, argc, sizeHints,
-			 wmHints, classHints)
-     Display *dpy;
-     Window w;			/* window to decorate */
-     char *windowName;		/* name of application */
-     char *iconName;		/* name string for icon */
-     char **argv;		/* command line */
-     int argc;			/* size of command line */
-     XSizeHints *sizeHints;	/* size hints for window in its normal state */
-     XWMHints *wmHints;		/* miscelaneous window manager hints */
-     XClassHint *classHints;	/* resource name and class */
-#endif
-{
-    XTextProperty wname, iname;
-    XTextProperty *wprop = NULL;
-    XTextProperty *iprop = NULL;
-    char *locale;
-
-    if (windowName &&
-	XmbTextListToTextProperty(dpy, (char**)&windowName, 1,
-				   XStdICCTextStyle, &wname) >= Success)
-	wprop = &wname;
-    if (iconName &&
-	XmbTextListToTextProperty(dpy, (char**)&iconName, 1,
-				   XStdICCTextStyle, &iname) >= Success)
-	iprop = &iname;
-    XSetWMProperties(dpy, w, wprop, iprop, argv, argc,
-		     sizeHints, wmHints, classHints);
-    if (wprop)
-	Xfree((char *)wname.value);
-    if (iprop)
-	Xfree((char *)iname.value);
-    locale = setlocale(LC_CTYPE, (char *)NULL);
-    if (locale)
-	XChangeProperty (dpy, w, XInternAtom(dpy, "WM_LOCALE_NAME", False),
-			 XA_STRING, 8, PropModeReplace,
-			 (unsigned char *)locale, strlen(locale));
-}
diff --git a/xc/lib/X11/mbWrap.c b/xc/lib/X11/mbWrap.c
deleted file mode 100644
index 852093dca..000000000
--- a/xc/lib/X11/mbWrap.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/* $TOG: mbWrap.c /main/7 1998/02/06 17:44:30 kaleb $ */
-/*
-
-Copyright 1991, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/*
- * Copyright 1991 by the Open Software Foundation
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Open Software Foundation 
- * not be used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  Open Software
- * Foundation makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without express or
- * implied warranty.
- *
- * OPEN SOFTWARE FOUNDATION DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL OPEN SOFTWARE FOUNDATIONN BE
- * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- * 
- *		 M. Collins		OSF  
- */				
-
-#include "Xlibint.h"
-#include "Xlcint.h"
-
-void
-XmbDrawText(dpy, d, gc, x, y, text_items, nitems)
-    Display            *dpy;
-    Drawable            d;
-    GC                  gc;
-    int                 x, y;
-    XmbTextItem        *text_items;
-    int                 nitems;
-{
-    register XFontSet fs;
-    register XmbTextItem *p = text_items;
-    register int i = nitems;
-    register int esc;
-
-    /* ignore leading items with no fontset */
-    while (i && !p->font_set) {
-	i--;
-	p++;
-    }
-
-    for (; --i >= 0; p++) {
-	if (p->font_set)
-	    fs = p->font_set;
-	x += p->delta;
-	esc = (*fs->methods->mb_draw_string) (dpy, d, fs, gc, x, y,
-					      p->chars, p->nchars);
-	if (!esc)
-	    esc = fs->methods->mb_escapement (fs, p->chars, p->nchars);
-	x += esc;
-    }
-}
-
-#if NeedFunctionPrototypes
-void
-XmbDrawString(
-    Display            *dpy,
-    Drawable            d,
-    XFontSet            font_set,
-    GC                  gc,
-    int                 x,
-    int                 y,
-    _Xconst char       *text,
-    int                 text_len)
-#else
-void
-XmbDrawString(dpy, d, font_set, gc, x, y, text, text_len)
-    Display            *dpy;
-    Drawable            d;
-    XFontSet            font_set;
-    GC                  gc;
-    int                 x, y;
-    char               *text;
-    int                 text_len;
-#endif
-{
-    (void)(*font_set->methods->mb_draw_string) (dpy, d, font_set, gc, x, y,
-						(char *)text, text_len);
-}
-
-
-#if NeedFunctionPrototypes
-void
-XmbDrawImageString(
-    Display            *dpy,
-    Drawable            d,
-    XFontSet            font_set,
-    GC                  gc,
-    int                 x,
-    int                 y,
-    _Xconst char       *text,
-    int                 text_len)
-#else
-void
-XmbDrawImageString(dpy, d, font_set, gc, x, y, text, text_len)
-    Display            *dpy;
-    Drawable            d;
-    XFontSet            font_set;
-    GC                  gc;
-    int                 x, y;
-    char               *text;
-    int                 text_len;
-#endif
-{
-    (*font_set->methods->mb_draw_image_string) (dpy, d, font_set, gc, x, y,
-						(char *)text, text_len);
-}
-
-#if NeedFunctionPrototypes
-int 
-XmbTextEscapement(
-    XFontSet        font_set,
-    _Xconst char   *text,
-    int             text_len)
-#else
-int 
-XmbTextEscapement(font_set, text, text_len)
-    XFontSet        font_set;
-    char           *text;
-    int             text_len;
-#endif
-{
-    return (*font_set->methods->mb_escapement) (font_set,
-						(char *)text, text_len);
-}
-
-#if NeedFunctionPrototypes
-int
-XmbTextExtents(
-    XFontSet        font_set,
-    _Xconst char   *text,
-    int             text_len,
-    XRectangle     *overall_ink_extents,
-    XRectangle     *overall_logical_extents)
-#else
-int
-XmbTextExtents(font_set, text, text_len,
-	       overall_ink_extents, overall_logical_extents)
-    XFontSet        font_set;
-    char           *text;
-    int             text_len;
-    XRectangle     *overall_ink_extents;
-    XRectangle     *overall_logical_extents;
-#endif
-{
-    return (*font_set->methods->mb_extents) (font_set,
-					     (char *)text, text_len,
-					     overall_ink_extents,
-					     overall_logical_extents);
-}
-
-#if NeedFunctionPrototypes
-Status
-XmbTextPerCharExtents(
-    XFontSet        font_set,
-    _Xconst char   *text,
-    int             text_len,
-    XRectangle     *ink_extents_buffer,
-    XRectangle     *logical_extents_buffer,
-    int             buffer_size,
-    int            *num_chars,
-    XRectangle     *max_ink_extents,
-    XRectangle     *max_logical_extents)
-#else
-Status
-XmbTextPerCharExtents(font_set, text, text_len,
-		      ink_extents_buffer, logical_extents_buffer,
-		      buffer_size, num_chars,
-		      max_ink_extents, max_logical_extents)
-    XFontSet        font_set;
-    char           *text;
-    int             text_len;
-    XRectangle     *ink_extents_buffer;
-    XRectangle     *logical_extents_buffer;
-    int             buffer_size;
-    int            *num_chars;
-    XRectangle     *max_ink_extents;
-    XRectangle     *max_logical_extents;
-#endif
-{
-    return (*font_set->methods->mb_extents_per_char)
-	     (font_set, (char *)text, text_len, 
-	      ink_extents_buffer, logical_extents_buffer,
-	      buffer_size, num_chars, max_ink_extents, max_logical_extents);
-}
diff --git a/xc/lib/X11/omDefault.c b/xc/lib/X11/omDefault.c
deleted file mode 100644
index 5d7658d00..000000000
--- a/xc/lib/X11/omDefault.c
+++ /dev/null
@@ -1,406 +0,0 @@
-/* $TOG: omDefault.c /main/6 1997/06/22 15:53:43 kaleb $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-/*
- *  (c) Copyright 1995 FUJITSU LIMITED
- *  This is source code modified by FUJITSU LIMITED under the Joint
- *  Development Agreement for the CDE/Motif PST.
- */
-
-#include "Xlibint.h"
-#include "XomGeneric.h"
-#include <X11/Xos.h>
-#include <X11/Xatom.h>
-#include <stdio.h>
-
-#define DefineLocalBuf		char local_buf[BUFSIZ]
-#define AllocLocalBuf(length)	(length > BUFSIZ ? (char *)Xmalloc(length) : local_buf)
-#define FreeLocalBuf(ptr)	if (ptr != local_buf) Xfree(ptr)
-
-static Bool
-wcs_to_mbs(oc, to, from, length)
-    XOC oc;
-    char *to;
-    wchar_t *from;
-    int length;
-{
-    XlcConv conv = XOC_GENERIC(oc)->wcs_to_cs;
-    XLCd lcd;
-    int ret, to_left = length;
-
-    if (conv == NULL) {
-	lcd = oc->core.om->core.lcd;
-	conv = _XlcOpenConverter(lcd, XlcNWideChar, lcd, XlcNMultiByte);
-	if (conv == NULL)
-	    return False;
-	XOC_GENERIC(oc)->wcs_to_cs = conv;
-    } else
-	_XlcResetConverter(conv);
-
-    ret = _XlcConvert(conv, (XPointer *) &from, &length, (XPointer *) &to,
-		      &to_left, NULL, 0);
-    if (ret != 0 || length > 0)
-	return False;
-    
-    return True;
-}
-
-int
-#if NeedFunctionPrototypes
-_XmbDefaultTextEscapement(XOC oc, _Xconst char *text, int length)
-#else
-_XmbDefaultTextEscapement(oc, text, length)
-    XOC oc;
-    char *text;
-    int length;
-#endif
-{
-    return XTextWidth(*oc->core.font_info.font_struct_list, text, length);
-}
-
-int
-#if NeedFunctionPrototypes
-_XwcDefaultTextEscapement(XOC oc, _Xconst wchar_t *text, int length)
-#else
-_XwcDefaultTextEscapement(oc, text, length)
-    XOC oc;
-    wchar_t *text;
-    int length;
-#endif
-{
-    DefineLocalBuf;
-    char *buf = AllocLocalBuf(length);
-    int ret;
-
-    if (buf == NULL)
-	return 0;
-
-    if (wcs_to_mbs(oc, buf, text, length) == False)
-	goto err;
-
-    ret = _XmbDefaultTextEscapement(oc, buf, length);
-
-err:
-    FreeLocalBuf(buf);
-
-    return ret;
-}
-
-int
-#if NeedFunctionPrototypes
-_XmbDefaultTextExtents(XOC oc, _Xconst char *text, int length,
-		       XRectangle *overall_ink, XRectangle *overall_logical)
-#else
-_XmbDefaultTextExtents(oc, text, length, overall_ink, overall_logical)
-    XOC oc;
-    char *text;
-    int length;
-    XRectangle *overall_ink;
-    XRectangle *overall_logical;
-#endif
-{
-    int direction, logical_ascent, logical_descent;
-    XCharStruct overall;
-
-    XTextExtents(*oc->core.font_info.font_struct_list, text, length, &direction,
-		 &logical_ascent, &logical_descent, &overall);
-
-    if (overall_ink) {
-	overall_ink->x = overall.lbearing;
-	overall_ink->y = -(overall.ascent);
-	overall_ink->width = overall.rbearing - overall.lbearing;
-	overall_ink->height = overall.ascent + overall.descent;
-    }
-
-    if (overall_logical) {
-	overall_logical->x = 0;
-        overall_logical->y = -(logical_ascent);
-	overall_logical->width = overall.width;
-        overall_logical->height = logical_ascent + logical_descent;
-    }
-
-    return overall.width;
-}
-
-int
-#if NeedFunctionPrototypes
-_XwcDefaultTextExtents(XOC oc, _Xconst wchar_t *text, int length,
-		       XRectangle *overall_ink, XRectangle *overall_logical)
-#else
-_XwcDefaultTextExtents(oc, text, length, overall_ink, overall_logical)
-    XOC oc;
-    wchar_t *text;
-    int length;
-    XRectangle *overall_ink;
-    XRectangle *overall_logical;
-#endif
-{
-    DefineLocalBuf;
-    char *buf = AllocLocalBuf(length);
-    int ret;
-
-    if (buf == NULL)
-	return 0;
-
-    if (wcs_to_mbs(oc, buf, text, length) == False)
-	goto err;
-
-    ret = _XmbDefaultTextExtents(oc, buf, length, overall_ink, overall_logical);
-
-err:
-    FreeLocalBuf(buf);
-
-    return ret;
-}
-
-Status
-#if NeedFunctionPrototypes
-_XmbDefaultTextPerCharExtents(XOC oc, _Xconst char *text, int length,
-			      XRectangle *ink_buf, XRectangle *logical_buf,
-			      int buf_size, int *num_chars,
-			      XRectangle *overall_ink,
-			      XRectangle *overall_logical)
-#else
-_XmbDefaultTextPerCharExtents(oc, text, length, ink_buf, logical_buf, buf_size,
-			      num_chars, overall_ink, overall_logical)
-    XOC oc;
-    char *text;	
-    int length;
-    XRectangle *ink_buf;
-    XRectangle *logical_buf;
-    int buf_size;
-    int *num_chars;
-    XRectangle *overall_ink;
-    XRectangle *overall_logical;
-#endif
-{
-    XFontStruct *font = *oc->core.font_info.font_struct_list;
-    XCharStruct *def, *cs, overall;
-    Bool first = True;
-
-    if (buf_size < length)
-	return 0;
-
-    bzero((char *) &overall, sizeof(XCharStruct));
-    *num_chars = 0;
-
-    CI_GET_DEFAULT_INFO_1D(font, def)
-
-    while (length-- > 0) {
-	CI_GET_CHAR_INFO_1D(font, *text, def, cs)
-	text++;
-	if (cs == NULL)
-	    continue;
-
-	ink_buf->x = overall.width + cs->lbearing;
-	ink_buf->y = -(cs->ascent);
-	ink_buf->width = cs->rbearing - cs->lbearing;
-	ink_buf->height = cs->ascent + cs->descent;
-	ink_buf++;
-
-	logical_buf->x = overall.width;
-	logical_buf->y = -(font->ascent);
-	logical_buf->width = cs->width;
-	logical_buf->height = font->ascent + font->descent;
-	logical_buf++;
-
-	if (first) {
-	    overall = *cs;
-	    first = False;
-	} else {
-	    overall.ascent = max(overall.ascent, cs->ascent);
-	    overall.descent = max(overall.descent, cs->descent);
-	    overall.lbearing = min(overall.lbearing, overall.width +
-				   cs->lbearing);
-	    overall.rbearing = max(overall.rbearing, overall.width +
-				   cs->rbearing);
-	    overall.width += cs->width;
-	}
-
-	(*num_chars)++;
-    }
-
-    if (overall_ink) {
-	overall_ink->x = overall.lbearing;
-	overall_ink->y = -(overall.ascent);
-	overall_ink->width = overall.rbearing - overall.lbearing;
-	overall_ink->height = overall.ascent + overall.descent;
-    }
-
-    if (overall_logical) {
-	overall_logical->x = 0;
-	overall_logical->y = -(font->ascent);
-	overall_logical->width = overall.width;
-	overall_logical->height = font->ascent + font->descent;
-    }
-
-    return 1;
-}
-
-Status
-#if NeedFunctionPrototypes
-_XwcDefaultTextPerCharExtents(XOC oc, _Xconst wchar_t *text, int length,
-			      XRectangle *ink_buf, XRectangle *logical_buf,
-			      int buf_size, int *num_chars,
-			      XRectangle *overall_ink,
-			      XRectangle *overall_logical)
-#else
-_XwcDefaultTextPerCharExtents(oc, text, length, ink_buf, logical_buf, buf_size,
-			      num_chars, overall_ink, overall_logical)
-    XOC oc;
-    wchar_t *text;
-    int length;
-    XRectangle *ink_buf;
-    XRectangle *logical_buf;
-    int buf_size;
-    int *num_chars;
-    XRectangle *overall_ink;
-    XRectangle *overall_logical;
-#endif
-{
-    DefineLocalBuf;
-    char *buf = AllocLocalBuf(length);
-    Status ret;
-
-    if (buf == NULL)
-	return 0;
-
-    if (wcs_to_mbs(oc, buf, text, length) == False)
-	goto err;
-
-    ret = _XmbDefaultTextPerCharExtents(oc, buf, length, ink_buf, logical_buf,
-					buf_size, num_chars, overall_ink,
-					overall_logical);
-
-err:
-    FreeLocalBuf(buf);
-
-    return ret;
-}
-
-int
-#if NeedFunctionPrototypes
-_XmbDefaultDrawString(Display *dpy, Drawable d, XOC oc, GC gc, int x, int y,
-		      _Xconst char *text, int length)
-#else
-_XmbDefaultDrawString(dpy, d, oc, gc, x, y, text, length)
-    Display *dpy;
-    Drawable d;
-    XOC oc;
-    GC gc;
-    int x, y;
-    char *text;
-    int length;
-#endif
-{
-    XFontStruct *font = *oc->core.font_info.font_struct_list;
-
-    XSetFont(dpy, gc, font->fid);
-    XDrawString(dpy, d, gc, x, y, text, length);
-
-    return XTextWidth(font, text, length);
-}
-
-int
-#if NeedFunctionPrototypes
-_XwcDefaultDrawString(Display *dpy, Drawable d, XOC oc, GC gc, int x, int y,
-		      _Xconst wchar_t *text, int length)
-#else
-_XwcDefaultDrawString(dpy, d, oc, gc, x, y, text, length)
-    Display *dpy;
-    Drawable d;
-    XOC oc;
-    GC gc;
-    int x, y;
-    wchar_t *text;
-    int length;
-#endif
-{
-    DefineLocalBuf;
-    char *buf = AllocLocalBuf(length);
-    int ret;
-
-    if (buf == NULL)
-	return 0;
-
-    if (wcs_to_mbs(oc, buf, text, length) == False)
-	goto err;
-
-    ret = _XmbDefaultDrawString(dpy, d, oc, gc, x, y, buf, length);
-
-err:
-    FreeLocalBuf(buf);
-
-    return ret;
-}
-
-void
-#if NeedFunctionPrototypes
-_XmbDefaultDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, int x,
-			   int y, _Xconst char *text, int length)
-#else
-_XmbDefaultDrawImageString(dpy, d, oc, gc, x, y, text, length)
-    Display *dpy;
-    Drawable d;
-    XOC oc;
-    GC gc;
-    int x, y;
-    char *text;
-    int length;
-#endif
-{
-    XSetFont(dpy, gc, (*oc->core.font_info.font_struct_list)->fid);
-    XDrawImageString(dpy, d, gc, x, y, text, length);
-}
-
-void
-#if NeedFunctionPrototypes
-_XwcDefaultDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, int x,
-			   int y, _Xconst wchar_t *text, int length)
-#else
-_XwcDefaultDrawImageString(dpy, d, oc, gc, x, y, text, length)
-    Display *dpy;
-    Drawable d;
-    XOC oc;
-    GC gc;
-    int x, y;
-    wchar_t *text;
-    int length;
-#endif
-{
-    DefineLocalBuf;
-    char *buf = AllocLocalBuf(length);
-
-    if (buf == NULL)
-	return;
-
-    if (wcs_to_mbs(oc, buf, text, length) == False)
-	goto err;
-
-    _XmbDefaultDrawImageString(dpy, d, oc, gc, x, y, buf, length);
-
-err:
-    FreeLocalBuf(buf);
-}
diff --git a/xc/lib/X11/omGeneric.c b/xc/lib/X11/omGeneric.c
deleted file mode 100644
index 5be5b3bd3..000000000
--- a/xc/lib/X11/omGeneric.c
+++ /dev/null
@@ -1,2184 +0,0 @@
-/* $TOG: omGeneric.c /main/28 1998/06/25 16:15:55 kaleb $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-/*
- * Copyright 1995 by FUJITSU LIMITED
- * This is source code modified by FUJITSU LIMITED under the Joint
- * Development Agreement for the CDE/Motif PST.
- *
- * Modifier:  Takanori Tateno   FUJITSU LIMITED
- *
- */
-/* $XFree86: xc/lib/X11/omGeneric.c,v 3.12 1999/05/09 10:50:41 dawes Exp $ */
-
-/*
- * Fixed the algorithms in parse_fontname() and parse_fontdata()
- * to improve the logic for determining which font should be
- * returned for a given CharSet.  We even added some comments
- * so that you can figure out what in the heck we're doing. We
- * realize this is a departure from the norm, but hey, we're
- * rebels! :-) :-)
- * 
- * Modifiers: Jeff Walls, Paul Anderson: HEWLETT-PACKARD
- */
-
-#include "Xlibint.h"
-#include "XomGeneric.h"
-#include <X11/Xos.h>
-#include <X11/Xatom.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
-#define MAXFONTS		100
-#define	PIXEL_SIZE_FIELD	 7
-#define	POINT_SIZE_FIELD	 8
-#define	CHARSET_ENCODING_FIELD	14
-
-extern int _XmbDefaultTextEscapement(), _XwcDefaultTextEscapement();
-extern int _XmbDefaultTextExtents(), _XwcDefaultTextExtents();
-extern Status _XmbDefaultTextPerCharExtents(), _XwcDefaultTextPerCharExtents();
-extern int _XmbDefaultDrawString(), _XwcDefaultDrawString();
-extern void _XmbDefaultDrawImageString(), _XwcDefaultDrawImageString();
-
-extern int _XmbGenericTextEscapement(), _XwcGenericTextEscapement();
-extern int _XmbGenericTextExtents(), _XwcGenericTextExtents();
-extern Status _XmbGenericTextPerCharExtents(), _XwcGenericTextPerCharExtents();
-extern int _XmbGenericDrawString(), _XwcGenericDrawString();
-extern void _XmbGenericDrawImageString(), _XwcGenericDrawImageString();
-
-extern void _XlcDbg_printValue();
-
-/* For VW/UDC start */
-
-static FontData
-init_fontdata(font_data, font_data_count)
-    FontData	font_data;
-    int		font_data_count;
-{
-    FontData	fd;
-    int		i;
-
-    fd = (FontData)Xmalloc(sizeof(FontDataRec) * font_data_count);
-    if(fd == (FontData) NULL)
-	return False;
-
-    memset(fd, 0x00, sizeof(FontData) * font_data_count);
-    for(i = 0 ; i < font_data_count ; i++)
-	fd[i] = font_data[i];
-
-    return fd;
-}
-
-static VRotate
-init_vrotate(font_data, font_data_count, type, code_range, code_range_num)
-    FontData	font_data;
-    int		font_data_count;
-    int		type;
-    CodeRange	code_range;
-    int		code_range_num;
-{
-    VRotate	vrotate;
-    int		i;
-
-    if(type == VROTATE_NONE)
-	return (VRotate)NULL;
-
-    vrotate = (VRotate)Xmalloc(sizeof(VRotateRec) * font_data_count);
-    if(vrotate == (VRotate) NULL)
-	return False;
-
-    memset(vrotate, 0x00, sizeof(VRotateRec) * font_data_count);
-    for(i = 0 ; i < font_data_count ; i++) {
-	vrotate[i].charset_name = font_data[i].name;
-	vrotate[i].side = font_data[i].side;
-	if(type == VROTATE_PART) {
-	    vrotate[i].num_cr = code_range_num;
-	    vrotate[i].code_range = code_range;
-	}
-    }
-
-    return vrotate;
-}
-
-static Bool
-init_fontset(oc)
-    XOC oc;
-{
-    XOCGenericPart *gen;
-    FontSet font_set;
-    OMData data;
-    int count;
-
-    count = XOM_GENERIC(oc->core.om)->data_num;
-    data = XOM_GENERIC(oc->core.om)->data;
-
-    font_set = (FontSet) Xmalloc(sizeof(FontSetRec) * count);
-    if (font_set == NULL)
-	return False;
-    memset((char *) font_set, 0x00, sizeof(FontSetRec) * count);
-
-    gen = XOC_GENERIC(oc);
-    gen->font_set_num = count;
-    gen->font_set = font_set;
-
-    for ( ; count-- > 0; data++, font_set++) {
-	font_set->charset_count = data->charset_count;
-	font_set->charset_list = data->charset_list;
-
-	if((font_set->font_data = init_fontdata(data->font_data,
-				  data->font_data_count)) == NULL)
-	    goto err;
-	font_set->font_data_count = data->font_data_count;
-	if((font_set->substitute = init_fontdata(data->substitute,
-				   data->substitute_num)) == NULL)
-	    goto err;
-	font_set->substitute_num = data->substitute_num;
-	if((font_set->vmap = init_fontdata(data->vmap,
-			     data->vmap_num)) == NULL)
-	    goto err;
-	font_set->vmap_num       = data->vmap_num;
-
-	if(data->vrotate_type != VROTATE_NONE) {
-	    /* A vrotate member is specified primary font data */
-	    /* as initial value.                               */
-	    if((font_set->vrotate = init_vrotate(data->font_data,
-						 data->font_data_count,
-						 data->vrotate_type,
-						 data->vrotate,
-						 data->vrotate_num)) == NULL)
-		goto err;
-	    font_set->vrotate_num = data->font_data_count;
-	}
-    }
-    return True;
-
-err:
-    if(font_set->font_data)
-	Xfree(font_set->font_data);
-    if(font_set->substitute)
-	Xfree(font_set->substitute);
-    if(font_set->vmap)
-	Xfree(font_set->vmap);
-    if(font_set->vrotate)
-	Xfree(font_set->vrotate);
-    if(font_set)
-	Xfree(font_set);
-    gen->font_set = (FontSet) NULL;
-    gen->font_set_num = 0;
-    return False;
-}
-
-/* For VW/UDC end */
-
-static char *
-get_prop_name(dpy, fs)
-    Display *dpy;
-    XFontStruct	*fs;
-{
-    unsigned long fp;
-
-    if (XGetFontProperty(fs, XA_FONT, &fp))
-	return XGetAtomName(dpy, fp); 
-
-    return (char *) NULL;
-}
-
-/* For VW/UDC start */
-
-static Bool
-load_fontdata(oc, font_data, font_data_num)
-    XOC		oc;
-    FontData	font_data;
-    int		font_data_num;
-{
-    Display	*dpy = oc->core.om->core.display;
-    FontData	fd = font_data;
-
-    if(font_data == NULL) return(True);
-    for( ; font_data_num-- ; fd++) {
-	if(fd->xlfd_name != (char *) NULL && fd->font == NULL) {
-	    fd->font = XLoadQueryFont(dpy, fd->xlfd_name);
-	    if (fd->font == NULL){
-		return False;
-	    }
-	}
-    }
-    return True;
-}
-
-static Bool
-load_fontset_data(oc, font_set)
-    XOC		oc;
-    FontSet	font_set;
-{
-    Display	*dpy = oc->core.om->core.display;
-
-    if(font_set->font_name == (char *)NULL) return False ;
-
-   /* If font_set->font is not NULL, it contains the *best*
-    * match font for this FontSet.  
-    * -- jjw/pma (HP)
-    */
-    if(font_set->font == NULL) {
-       font_set->font = XLoadQueryFont(dpy, font_set->font_name);
-       if (font_set->font == NULL){
-		return False;
-       }
-    }
-    return True;
-}
-
-static Bool
-load_font(oc)
-    XOC oc;
-{
-    XOCGenericPart *gen = XOC_GENERIC(oc);
-    FontSet font_set = gen->font_set;
-    int num = gen->font_set_num;
-
-    for ( ; num-- > 0; font_set++) {
-	if (font_set->font_name == NULL)
-	    continue;
-
-        if (load_fontset_data (oc, font_set) != True)
-	    return False;
-
-	if(load_fontdata(oc, font_set->font_data,
-			 font_set->font_data_count) != True)
-	    return False;
-
-	if(load_fontdata(oc, font_set->substitute,
-			 font_set->substitute_num) != True)
-	    return False;
-
-#if 0
-        /* ### This code is no longer needed.  This block essentially
-	 * ### took the font used for this FontSet and figured out
-	 * ### which font structure to use.  This is now accomplished
-	 * ### via load_fontset_data(), which takes the *best* font
-	 * ### for this FontSet and performs an XLoadQueryFont() to
-	 * ### obtain the font structure.  Note that this should work
-	 * ### for either Primary or Substitute fonts.
-	 * ### -- jjw/pma (HP)
-	 */
-	if(font_set->font_data_count > 0  && font_set->font_data->font ) {
-	    for (i=0; i<font_set->font_data_count; i++)
-	    {
-                 if (!strcmp (font_set->font_data[i].xlfd_name,
-			      font_set->font_name))
-		 {
-	              font_set->font = font_set->font_data[i].font;
-		      break;
-		 }
-	    }
-	} else if(font_set->substitute_num > 0 ) {
-	    for(i=0;i<font_set->substitute_num;i++){
-		if(font_set->substitute[i].font != NULL){
-		    font_set->font = font_set->substitute[i].font;
-		    break ;
-		}
-	    }
-	}
-#endif
-
-/* Add 1996.05.20 */
-        if( oc->core.orientation == XOMOrientation_TTB_RTL ||
-            oc->core.orientation == XOMOrientation_TTB_LTR ){
-	    if (font_set->vpart_initialize == 0) {
-	       load_fontdata(oc, font_set->vmap, font_set->vmap_num);
-	       load_fontdata(oc, (FontData) font_set->vrotate,
-			 font_set->vrotate_num);
-                font_set->vpart_initialize = 1;
-	    }
-        }
-
-	if (font_set->font->min_byte1 || font_set->font->max_byte1)
-	    font_set->is_xchar2b = True;
-	else
-	    font_set->is_xchar2b = False;
-    }
-
-    return True;
-}
-
-/* For VW/UDC end */
-
-static Bool
-load_font_info(oc)
-    XOC oc;
-{
-    Display *dpy = oc->core.om->core.display;
-    XOCGenericPart *gen = XOC_GENERIC(oc);
-    FontSet font_set = gen->font_set;
-    char **fn_list;
-    int fn_num, num = gen->font_set_num;
-
-    for ( ; num-- > 0; font_set++) {
-	if (font_set->font_name == NULL)
-	    continue;
-
-	if (font_set->info == NULL) {
-	    fn_list = XListFontsWithInfo(dpy, font_set->font_name, 1, &fn_num,
-					 &font_set->info);
-	    if (font_set->info == NULL)
-		return False;
-	    
-	    XFreeFontNames(fn_list);
-	}
-    }
-
-    return True;
-}
-
-/* For Vertical Writing start */
-
-static void
-check_fontset_extents(overall, logical_ascent, logical_descent, font)
-    XCharStruct		*overall;
-    int			*logical_ascent, *logical_descent;
-    XFontStruct		*font;
-{
-    overall->lbearing = min(overall->lbearing, font->min_bounds.lbearing);
-    overall->rbearing = max(overall->rbearing, font->max_bounds.rbearing);
-    overall->ascent   = max(overall->ascent,   font->max_bounds.ascent);
-    overall->descent  = max(overall->descent,  font->max_bounds.descent);
-    overall->width    = max(overall->width,    font->max_bounds.width);
-    *logical_ascent   = max(*logical_ascent,   font->ascent);
-    *logical_descent  = max(*logical_descent,  font->descent);
-}
-
-/* For Vertical Writing end */
-
-static void
-set_fontset_extents(oc)
-    XOC oc;
-{
-    XRectangle *ink = &oc->core.font_set_extents.max_ink_extent;
-    XRectangle *logical = &oc->core.font_set_extents.max_logical_extent;
-    XFontStruct **font_list, *font;
-    XCharStruct overall;
-    int logical_ascent, logical_descent;
-    int	num = oc->core.font_info.num_font;
-
-    font_list = oc->core.font_info.font_struct_list;
-    font = *font_list++;
-    overall = font->max_bounds;
-    overall.lbearing = font->min_bounds.lbearing;
-    logical_ascent = font->ascent;
-    logical_descent = font->descent;
-
-    /* For Vertical Writing start */
-
-    while (--num > 0) {
-	font = *font_list++;
-	check_fontset_extents(&overall, &logical_ascent, &logical_descent,
-			      font);
-    }
-
-    {
-	XOCGenericPart  *gen = XOC_GENERIC(oc);
-	FontSet		font_set = gen->font_set;
-	FontData	font_data;
-	int		font_set_num = gen->font_set_num;
-	int		font_data_count;
-
-	for( ; font_set_num-- ; font_set++) {
-	    if(font_set->vmap_num > 0) {
-		font_data = font_set->vmap;
-		font_data_count = font_set->vmap_num;
-		for( ; font_data_count-- ; font_data++) {
-		    if(font_data->font != NULL) {
-			check_fontset_extents(&overall, &logical_ascent,
-					      &logical_descent,
-					      font_data->font);
-		    }
-		}
-	    }
-
-	    if(font_set->vrotate_num > 0) {
-		font_data = (FontData) font_set->vrotate;
-		font_data_count = font_set->vrotate_num;
-		for( ; font_data_count-- ; font_data++) {
-		    if(font_data != NULL)
-		    if(font_data->font != NULL) {
-			check_fontset_extents(&overall, &logical_ascent,
-					      &logical_descent,
-					      font_data->font);
-		    }
-		}
-	    }
-	}
-    }
-
-    /* For Vertical Writing start */
-
-    ink->x = overall.lbearing;
-    ink->y = -(overall.ascent);
-    ink->width = overall.rbearing - overall.lbearing;
-    ink->height = overall.ascent + overall.descent;
-
-    logical->x = 0;
-    logical->y = -(logical_ascent);
-    logical->width = overall.width;
-    logical->height = logical_ascent + logical_descent;
-}
-
-static Bool
-init_core_part(oc)
-    XOC oc;
-{
-    XOCGenericPart *gen = XOC_GENERIC(oc);
-    FontSet font_set;
-    int font_set_num;
-    XFontStruct **font_struct_list;
-    char **font_name_list, *font_name_buf;
-    int	count, length;
-
-    font_set = gen->font_set;
-    font_set_num = gen->font_set_num;
-    count = length = 0;
-
-    for ( ; font_set_num-- > 0; font_set++) {
-	if (font_set->font_name == NULL)
-	    continue;
-
-	length += strlen(font_set->font_name) + 1;
-	count++;
-    }
-    if (count == 0)
-        return False;
-
-    font_struct_list = (XFontStruct **) Xmalloc(sizeof(XFontStruct *) * count);
-    if (font_struct_list == NULL)
-	return False;
-
-    font_name_list = (char **) Xmalloc(sizeof(char *) * count);
-    if (font_name_list == NULL)
-	goto err;
-
-    font_name_buf = (char *) Xmalloc(length);
-    if (font_name_buf == NULL)
-	goto err;
-
-    oc->core.font_info.num_font = count;
-    oc->core.font_info.font_name_list = font_name_list;
-    oc->core.font_info.font_struct_list = font_struct_list;
-
-    font_set = gen->font_set;
-    font_set_num = gen->font_set_num;
-
-    for (count = 0; font_set_num-- > 0; font_set++, count++) {
-	if (font_set->font_name == NULL)
-	    continue;
-
-	font_set->id = count;
-	if (font_set->font)
-	    *font_struct_list++ = font_set->font;
-	else
-	    *font_struct_list++ = font_set->info;
-	strcpy(font_name_buf, font_set->font_name);
-	Xfree(font_set->font_name);
-	*font_name_list++ = font_set->font_name = font_name_buf;
-	font_name_buf += strlen(font_name_buf) + 1;
-    }
-
-    set_fontset_extents(oc);
-
-    return True;
-
-err:
-    if (font_name_list)
-	Xfree(font_name_list);
-    Xfree(font_struct_list);
-
-    return False;
-}
-
-static char *
-get_font_name(oc, pattern)
-    XOC oc;
-    char *pattern;
-{
-    char **list, *name;
-    int count = 0;
-
-    list = XListFonts(oc->core.om->core.display, pattern, 1, &count);
-    if (list == NULL)
-	return NULL;
-
-    name = (char *) Xmalloc(strlen(*list) + 1);
-    if (name)
-	strcpy(name, *list);
-    
-    XFreeFontNames(list);
-
-    return name;
-}
-
-/* For VW/UDC start*/
-
-static char
-*get_rotate_fontname(font_name)
-    char *font_name;
-{
-    char *pattern = NULL, *ptr = NULL;
-    char *fields[CHARSET_ENCODING_FIELD];
-    char str_pixel[32], str_point[4];
-    char *rotate_font_ptr = NULL;
-    int pixel_size = 0;
-    int field_num = 0, len = 0;
-
-    if(font_name == (char *) NULL || (len = strlen(font_name)) <= 0 || len > 255)
-	return NULL;
-
-    pattern = (char *)Xmalloc(len + 1);
-    if(!pattern)
-	return NULL;
-    strcpy(pattern, font_name);
-
-    memset(fields, 0, sizeof(char *) * 14);
-    ptr = pattern;
-    while(isspace(*ptr)) {
-	ptr++;
-    }
-    if(*ptr == '-')
-	ptr++;
-
-    for(field_num = 0 ; field_num < CHARSET_ENCODING_FIELD && ptr && *ptr ;
-			ptr++, field_num++) {
-	fields[field_num] = ptr;
-
-	if((ptr = strchr(ptr, '-'))) {
-	    *ptr = '\0';
-	}
-    }
-
-    if(field_num < CHARSET_ENCODING_FIELD)
-	return NULL;
-
-    /* Pixel Size field : fields[6] */
-    for(ptr = fields[PIXEL_SIZE_FIELD - 1] ; ptr && *ptr; ptr++) {
-	if(!isdigit(*ptr)) {
-	    if(*ptr == '['){ /* 960730 */
-	        strcpy(pattern, font_name);
-		return(pattern);
-	    }
-	    if(pattern)
-		Xfree(pattern);
-	    return NULL;
-	}
-    }
-    pixel_size = atoi(fields[PIXEL_SIZE_FIELD - 1]);
-    sprintf(str_pixel, "[ 0 ~%d %d 0 ]", pixel_size, pixel_size);
-    fields[6] = str_pixel;
-
-    /* Point Size field : fields[7] */
-    strcpy(str_point, "*");
-    fields[POINT_SIZE_FIELD - 1] = str_point;
-
-    len = 0;
-    for (field_num = 0; field_num < CHARSET_ENCODING_FIELD &&
-			fields[field_num]; field_num++) {
-	len += 1 + strlen(fields[field_num]);
-    }
-
-    /* Max XLFD length is 255 */
-    if (len > 255) 
-	return NULL;
-
-    rotate_font_ptr = (char *)Xmalloc(len + 1);
-    if(!rotate_font_ptr)
-	return NULL;
-
-    rotate_font_ptr[0] = '\0';
-
-    for(field_num = 0 ; field_num < CHARSET_ENCODING_FIELD &&
-			fields[field_num] ; field_num++) {
-	sprintf(rotate_font_ptr, "%s-%s", rotate_font_ptr, fields[field_num]);
-    }
-
-    if(pattern)
-	Xfree(pattern);
-
-    return rotate_font_ptr;
-}
-
-static Bool
-is_match_charset(font_data, font_name)
-    FontData	font_data;
-    char	*font_name;
-{
-    char *last;
-    int length, name_len;
-
-    name_len = strlen(font_name);
-    last = font_name + name_len;
-
-    length = strlen(font_data->name);
-    if (length > name_len)
-	return False;
-	
-    if (_XlcCompareISOLatin1(last - length, font_data->name) == 0)
-	return True;
-
-    return False;
-}
-
-static char *
-get_font_name_from_list(oc, pattern, font_data)
-    XOC oc;
-    char *pattern;
-    FontData    font_data;
-{
-    char **list, *name = (char *)NULL, *fname;
-    int count = 0, i;
-
-    list = XListFonts(oc->core.om->core.display, pattern, MAXFONTS, &count);
-    if (list == NULL)
-	return NULL;
-
-    for (i = 0; i < count; i++) {
-        fname = list[i];
-        if(is_match_charset(font_data, fname) == True) {
-             name = (char *) Xmalloc(strlen(fname) + 1);
-             if (name)
-	         strcpy(name, fname);
-             break;
-        }
-    }
-    
-    XFreeFontNames(list);
-
-    return name;
-}
-
-static int
-parse_all_name(oc, font_data, pattern)
-    XOC		oc;
-    FontData	font_data;
-    char	*pattern;
-{
-
-#ifdef OLDCODE
-    if(is_match_charset(font_data, pattern) != True)
- 	return False;
-
-    font_data->xlfd_name = (char *)Xmalloc(strlen(pattern)+1);
-    if(font_data->xlfd_name == NULL)
-	return (-1);
-
-    strcpy(font_data->xlfd_name, pattern);
-    return True;
-#else  /* OLDCODE */
-    Display *dpy = oc->core.om->core.display;
-    char **fn_list = NULL, *prop_fname = NULL;
-    int list_num;
-    XFontStruct *fs_list;
-    if(is_match_charset(font_data, pattern) != True) {
-	if ((fn_list = XListFontsWithInfo(dpy, pattern,
-				      MAXFONTS,
-				      &list_num, &fs_list))
-	    && (prop_fname = get_prop_name(dpy, fs_list))
-	    && (is_match_charset(font_data, prop_fname) != True)) {
-	    if (fn_list) {
-	        XFreeFontInfo(fn_list, fs_list, list_num);
-	        fn_list = NULL;
-	    }
-	    return False;
-        }
-	font_data->xlfd_name = prop_fname;
-        if (fn_list) {
-	    XFreeFontInfo(fn_list, fs_list, list_num);
-	}
-	return True;
-    }
-
-    font_data->xlfd_name = (char *)Xmalloc(strlen(pattern)+1);
-    if(font_data->xlfd_name == NULL)
-	return (-1);
-
-    strcpy(font_data->xlfd_name, pattern);
-    return True;
-#endif /* OLDCODE */
-}
-
-static int
-parse_omit_name(oc, font_data, pattern)
-    XOC		oc;
-    FontData	font_data;
-    char	*pattern;
-{
-    char*	last = (char *) NULL;
-    char*	base_name;
-    char	buf[BUFSIZE]; /* no XLFD name should be this long */
-    int		length = 0;
-    int		num_fields;
-
-   /* If the font specified by "pattern" is expandable to be
-    * a member of "font_data"'s FontSet, we've found a match.
-    */
-    if(is_match_charset(font_data, pattern) == True) {
-	if ((font_data->xlfd_name = get_font_name(oc, pattern)) != NULL) {
-	    return True;
-	}
-    }
-
-    /* If an XLFD name is arbitrarily (too) long, allocate a buffer,
-     * and some extra space to tack stuff on the end.
-     *
-     * ### This is a hack.  What happens is, we substitute pattern's
-     * ### encoding with the default encoding for the FontSet and
-     * ### try to find a match.  For example, we may change pattern
-     * ### from:
-     * ###     -*-*-*-*-*-*-14-*-*-*-*-*-jisx0212.1990-0 to
-     * ###     -*-*-*-*-*-*-14-*-*-*-*-*-JISX0208.1990-0
-     * ### So, the length of the original pattern may not be enough
-     * ### to store the "new" encoding (e.g., going from ISO8859-1 to
-     * ### JISX0208.1990-0), so the author decided to simply allocate
-     * ### a *bunch* of extra space to handle the potentially longer
-     * ### encoding.
-     * ###
-     * ### The real way to do this would be to figure out the length
-     * ### of the original encoding and the length of the new encoding.
-     * ### Re-alloc the array with the difference.  Since it doesn't
-     * ### hurt anything keeping the extra-large buffer, I'll leave
-     * ### it the way it is. --jjw/pma (HP)
-     * ###
-     */
-
-    /* 
-     * since BUFSIZE is much bigger than any legal XLFD name
-     * we'll allow the first half for the XLFD pattern, and the
-     * second half for the charset-plus-encoding. If we wanted to
-     * be accomodating, we could allocate memory, but that's
-     * overkill for this. Hackers who are trying to do bad things
-     * don't deserve to be accomodated like that.
-     */
-    if ((length = strlen (pattern)) > BUFSIZE/2) return -1;
-
-    strcpy(buf, pattern);
-    last = buf + length - 1;
-
-    /* Replace the original encoding with the encoding for this FontSet. */
-
-    /* Figure out how many fields have been specified in this xlfd. */
-    for (num_fields = 0, base_name = buf; *base_name != '\0'; base_name++)
-	if (*base_name == '-') num_fields++;
-
-    switch (num_fields) {
-    case 12:
-	/* This is the best way to have specifed the fontset.  In this
-	 * case, there is no original encoding. E.g., 
-         *       -*-*-*-*-*-*-14-*-*-*-*-*
-	 * To this, we'll append a dash:
-         *       -*-*-*-*-*-*-14-*-*-*-*-*-
-	 * then append the encoding to get:
-         *       -*-*-*-*-*-*-14-*-*-*-*-*-JISX0208.1990-0 
-	 */
-	*++last = '-';
-	break;
-    case 13:
-	/* Got the charset, not the encoding, zap the charset  In this
-	 * case, there is no original encoding, but there is a charset. E.g., 
-         *       -*-*-*-*-*-*-14-*-*-*-*-*-jisx0212.1990
-	 * To this, we remove the charset:
-         *       -*-*-*-*-*-*-14-*-*-*-*-*-
-	 * then append the new encoding to get:
-         *       -*-*-*-*-*-*-14-*-*-*-*-*-JISX0208.1990-0
-	 */
-	last = strrchr (buf, '-');
-	num_fields = 12;
-	break;
-    case 14:
-	/* Both the charset and the encoding are specified.  Get rid
-	 * of them so that we can append the new charset encoding.  E.g.,
-         *       -*-*-*-*-*-*-14-*-*-*-*-*-jisx0212.1990-0 
-	 * To this, we'll remove the encoding and charset to get:
-         *       -*-*-*-*-*-*-14-*-*-*-*-*-
-	 * then append the new encoding to get:
-         *       -*-*-*-*-*-*-14-*-*-*-*-*-JISX0208.1990-0 
-	 */
-	last = strrchr (buf, '-');
-	*last = '\0';
-	last = strrchr (buf, '-');
-	num_fields = 12;
-	break;
-    default:
-	/* punt */
-	if (length > 1 && *last == '*' && *(last - 1) == '-') {
-	    if (length > 3 && *(last - 2) == '*' && *(last - 3) == '-')
-		last -= 3;
-	    else
-		last--;
-	} else {
-	    *++last = '-';
-	}
-	
-	break;
-    }
-    last++;
-
-   /* At this point, "last" is pointing to the last "-" in the 
-    * xlfd, and all xlfd's at this point take a form similar to:
-    *       -*-*-*-*-*-*-14-*-*-*-*-*-
-    * (i.e., no encoding).
-    * After the strcpy, we'll end up with something similar to:
-    *       -*-*-*-*-*-*-14-*-*-*-*-*-JISX0208.1990-0 
-    *
-    * If the modified font is found in the current FontSet, 
-    * we've found a match.
-    */
-
-    /* don't let hackers trounce the stack... */
-    if (strlen (font_data->name) > BUFSIZE/2)
-	return -1;
-
-    /* ...otherwise there's plenty of room to tack on the charset/encoding */
-    strcpy(last, font_data->name);
-    if ((font_data->xlfd_name = get_font_name(oc, buf)) != NULL)
-	return True;
-
-    /* This happens if the client specifies less than 12 fields
-     * (e.g., -*-*-*) for some reason.  We'll keep appending 
-     * "-*" until we find something that matches.  This "feels"
-     * as if we're being overly nice to "lazy" client programs,
-     * but that's the way X is...nice :-)
-     */
-    while (num_fields < 12) {
-	*last = '*';
-	*(last + 1) = '-';
-	strcpy(last + 2, font_data->name);
-	num_fields++; 
-	last+=2;
-	if ((font_data->xlfd_name = get_font_name(oc, buf)) != NULL)
-	    return True;
-    }
-
-/*
-    I'm not sure what Teeks was trying to do here.  It
-    seems to me that if "get_font_name()" fails, 
-    "get_font_name_from_list()" would also fail.  I wouldn't 
-    put this in the SI until I understood it better.  
-    -- jjw/pma (HP)
-
-    Couldn't resolve the wild base fontname !
-    -  Teeks
-*/
-    if ((font_data->xlfd_name = get_font_name_from_list(oc, buf, font_data)) != NULL)
-	return True;
-
-    return False;
-}
-
-
-typedef enum{C_PRIMARY, C_SUBSTITUTE, C_VMAP, C_VROTATE } ClassType;
-
-static int
-parse_fontdata(oc, font_set, font_data, font_data_count, name_list, name_list_count,
-		class, font_data_return)
-    XOC		 oc;
-    FontSet      font_set;
-    FontData	 font_data;
-    int		 font_data_count;
-    char	 **name_list;
-    int		 name_list_count;
-    ClassType	 class;
-    FontDataRec *font_data_return;
-{
-
-    char	**cur_name_list = name_list;
-    char	*font_name      = (char *) NULL;
-    char	*pattern        = (char *) NULL;
-    int		found_num       = 0, ret = 0;
-    int		count           = name_list_count;
-    Bool	is_found        = False;
-
-    if(name_list == NULL || count <= 0) {
-	return False;
-    }
-
-    if(font_data == NULL || font_data_count <= 0) {
-	return False;
-    }
-
-    /* Loop through each FontSet defined in the "font_data" CharSet. */
-    for ( ; font_data_count-- > 0; font_data++) {
-	is_found = False;
-	font_name = (char *) NULL;
-	count = name_list_count;
-	cur_name_list = name_list;
-
-       /* Loop through each font specified by the user in the call to XCreateFontset(). */
-	while (count-- > 0) {
-            pattern = *cur_name_list++;
-	    if (pattern == NULL || *pattern == '\0')
-		continue;
-
-
-	    /* If the current font is fully specified (i.e., the xlfd contains
-	     * no wildcards) and the font exists on the X Server, we have a match.
-	     */
-	    if (strchr(pattern, '*') == NULL &&
-		(font_name = get_font_name(oc, pattern))) {
-
-               /* Find the full xlfd name for this font.  If the font is already
-		* in xlfd format, it is simply returned.  If the font is an
-		* alias for another font, the xlfd of the aliased font is returned.
-		*/
-		ret = parse_all_name(oc, font_data, font_name);
-		Xfree(font_name);
-
-                if (ret == -1)    return -1;
-	        if (ret == False) continue;
-
-               /* Since there was an exact match of a fully-specified font
-		* or a font alias, we can return now since the desired font 
-		* was found for the current FontSet for this CharSet.
-		*
-		* Previous implementations of this algorithm would
-		* not return here. Instead, they continued searching 
-		* through the FontSets for this CharSet.  The side-effect 
-		* of that behavior is you may return a "substitute" match 
-		* instead of an "exact" match.  We believe there should be a 
-		* preference on exact matches.  Therefore, as soon as we
-		* find one, we bail. 
-		*
-		* Also, previous implementations seemed to think it was
-		* important to find either a primary or substitute font
-		* for each FontSet in the CharSet before returning an
-		* acceptable font.  We don't believe this is necessary.
-		* All the client cares about is finding a reasonable font
-		* for what was passed in.  If we find an exact match,
-		* there's no reason to look any further.  
-		*
-		* -- jjw/pma (HP)
-		*/
-		font_data_return->xlfd_name = (char *)Xmalloc
-			(strlen(font_data->xlfd_name) + 1);
-                if (!font_data_return->xlfd_name) return -1;
-
-	        strcpy (font_data_return->xlfd_name, font_data->xlfd_name);
-
-		font_data_return->side      = font_data->side;
-
-		return True;
-	    }
-
-	    /* If the font name is not fully specified (i.e., it has wildcards), 
-	     * we have more work to do.  See the comments in parse_omit_name()
-	     * for the list of things to do.
-	     */
-	    ret = parse_omit_name(oc, font_data, pattern);
-
-            if (ret == -1)    return -1;
-	    if (ret == False) continue;
-
-           /* A font which matched the wild-carded specification was found. 
-	    * Only update the return data if a font has not yet been found.
-	    * This maintains the convention that FontSets listed higher in
-	    * a CodeSet in the Locale Database have higher priority than
-	    * those FontSets listed lower in the CodeSet.  In the following
-	    * example:
-	    *
-	    * fs1 {
-	    *        charset     HP-JIS:GR
-	    *        font        JISX0208.1990-0:GL;\
-	    *                    JISX0208.1990-1:GR;\
-	    *                    JISX0208.1983-0:GL;\
-	    *                    JISX0208.1983-1:GR
-	    * }
-	    *
-	    * a font found in the JISX0208.1990-0 FontSet will have a
-	    * higher priority than a font found in the JISX0208.1983-0
-	    * FontSet.  
-	    */
-	    if (font_data_return->xlfd_name == NULL)
-	    {
-		
-		font_data_return->xlfd_name = (char *)Xmalloc
-			(strlen(font_data->xlfd_name) + 1);
-                if (!font_data_return->xlfd_name) return -1;
-
-	        strcpy (font_data_return->xlfd_name, font_data->xlfd_name);
-	        font_data_return->side      = font_data->side;
-	    }
-
-	    found_num++;
-	    is_found = True;
-	}
-
-	switch(class) {
-	  case C_PRIMARY:
-	       if(is_found == False)
-	       {
-		 /* Did not find a font for the current FontSet.  Check the
-		  * FontSet's "substitute" font for a match.  If we find a
-		  * match, we'll keep searching in hopes of finding an exact 
-		  * match later down the FontSet list.
-		  */
-		  ret = parse_fontdata(oc, font_set, font_set->substitute,
-				       font_set->substitute_num, name_list, 
-				       name_list_count, C_SUBSTITUTE, 
-				       font_data_return);
-                  if (ret == -1)    return -1;
-		  if (ret == False) continue;
-
-		  found_num++;
-		  is_found = True;
-               }
-
-	       break;
-
-	  case C_SUBSTITUTE:
-	  case C_VMAP:
-	       if(is_found == True)
-		  return True;
-	       break;
-
-	  case C_VROTATE:
-	       if(is_found == True) {
-		  char	*rotate_name;
-
-		  if((rotate_name = get_rotate_fontname(font_data->xlfd_name)) !=
-				  NULL) {
-		      Xfree(font_data->xlfd_name);
-		      font_data->xlfd_name = rotate_name;
-
-		      return True;
-		  }
-		  Xfree(font_data->xlfd_name);
-		  return False;
-	       }
-	       break;
-	}
-    }
-
-    if(class == C_PRIMARY && found_num >= 1)
-	return True;
-
-    return False;
-}
-
-
-static int
-parse_vw(oc, font_set, name_list, count)
-    XOC		oc;
-    FontSet	font_set;
-    char	**name_list;
-    int		count;
-{
-    FontData	vmap = font_set->vmap;
-    FontDataRec font_data_return;
-    VRotate	vrotate = font_set->vrotate;
-    int		vmap_num = font_set->vmap_num;
-    int		vrotate_num = font_set->vrotate_num;
-    int		ret = 0, i = 0;
-
-    if(vmap_num > 0) {
-	if(parse_fontdata(oc, font_set, vmap, vmap_num, name_list, count, C_VMAP) == -1)
-	    return (-1);
-    }
-
-    if(vrotate_num > 0) {
-	ret = parse_fontdata(oc, font_set, (FontData) vrotate, vrotate_num,
-			     name_list, count, C_VROTATE, &font_data_return);
-	if(ret == -1) {
-	    return (-1);
-	} else if(ret == False) {
-	    CodeRange	code_range;
-	    int		num_cr;
-	    int		sub_num = font_set->substitute_num;
-
-	    code_range = vrotate[i].code_range;
-	    num_cr = vrotate[i].num_cr;
-	    for(i = 0 ; i < vrotate_num ; i++) {
-		if(vrotate[i].xlfd_name)
-		    Xfree(vrotate[i].xlfd_name);
-	    }
-	    Xfree(vrotate);
-
-	    if(sub_num > 0) {
-		vrotate = font_set->vrotate = (VRotate)Xmalloc
-						(sizeof(VRotateRec) * sub_num);
-		if(font_set->vrotate == (VRotate)NULL)
-		    return (-1);
-
-		for(i = 0 ; i < sub_num ; i++) {
-		    vrotate[i].charset_name = font_set->substitute[i].name;
-		    vrotate[i].side = font_set->substitute[i].side;
-		    vrotate[i].code_range = code_range;
-		    vrotate[i].num_cr = num_cr;
-		}
-		vrotate_num = font_set->vrotate_num = sub_num;
-	    } else {
-		font_set->vrotate = (VRotate)NULL;
-	    }
-
-	    ret = parse_fontdata(oc, font_set, (FontData) vrotate, vrotate_num,
-				 name_list, count, C_VROTATE, &font_data_return);
-	    if(ret == -1)
-		return (-1);
-	}
-    }
-
-    return True;
-}
-
-static int
-parse_fontname(oc)
-    XOC oc;
-{
-    XOCGenericPart *gen = XOC_GENERIC(oc);
-    FontSet     font_set;
-    FontDataRec font_data_return;
-    char *base_name, **name_list;
-    int font_set_num = 0;
-    int found_num = 0;
-    int count = 0;
-    int	ret;
-    int i;
-
-    name_list = _XParseBaseFontNameList(oc->core.base_name_list, &count);
-    if (name_list == NULL)
-	return -1;
-
-    font_set = gen->font_set;
-    font_set_num = gen->font_set_num;
-
-   /* Loop through all of the CharSets defined in the Locale
-    * database for the current Locale.
-    */
-    for( ; font_set_num-- > 0 ; font_set++) {
-	if(font_set->font_name)
-	    continue;
-
-	if(font_set->font_data_count > 0) {
-
-           /* If there are a non-zero number of FontSets defined 
-	    * for this CharSet.
-	    */
-	    font_data_return.name       = NULL;
-	    font_data_return.side       = XlcUnknown;
-	    font_data_return.scopes_num = 0;
-	    font_data_return.scopes     = NULL;
-	    font_data_return.xlfd_name  = NULL;
-	    font_data_return.font       = NULL;
-
-           /* Try to find a font for this CharSet.  If we find an
-	    * acceptable font, we save the information for return
-	    * to the client.  If we do not find an acceptable font,
-	    * a "missing_charset" will be reported to the client 
-	    * for this CharSet.
-	    */
-	    ret = parse_fontdata(oc, font_set, font_set->font_data,
-				 font_set->font_data_count,
-				 name_list, count, C_PRIMARY,
-				 &font_data_return);
-	    if(ret == -1) {
-		goto err;
-	    } else if(ret == True) {
-		font_set->font_name = (char *)Xmalloc
-			(strlen(font_data_return.xlfd_name) + 1);
-		if(font_set->font_name == (char *) NULL)
-		    goto err;
-		strcpy(font_set->font_name, font_data_return.xlfd_name);
-		font_set->side = font_data_return.side;
-
-                Xfree (font_data_return.xlfd_name);
-
-		if(parse_vw(oc, font_set, name_list, count) == -1)
-		    goto err;
-		found_num++;
-	    }
-
-	} else if(font_set->substitute_num > 0) {
-
-           /* If there are no FontSets defined for this 
-	    * CharSet.  We can only find "substitute" fonts.
-	    */
-	    font_data_return.name       = NULL;
-	    font_data_return.side       = XlcUnknown;
-	    font_data_return.scopes_num = 0;
-	    font_data_return.scopes     = NULL;
-	    font_data_return.xlfd_name  = NULL;
-	    font_data_return.font       = NULL;
-
-	    ret = parse_fontdata(oc, font_set, font_set->substitute,
-				 font_set->substitute_num,
-				 name_list, count, C_SUBSTITUTE, &font_data_return);
-	    if(ret == -1) {
-		goto err;
-	    } else if(ret == True) {
-		for(i=0;i<font_set->substitute_num;i++){
-		    if(font_set->substitute[i].xlfd_name != NULL){
-			break;
-		    }
-		}
-		font_set->font_name = (char *)Xmalloc
-		    	(strlen(font_set->substitute[i].xlfd_name) + 1);
-		if(font_set->font_name == (char *) NULL)
-		    goto err;
-		strcpy(font_set->font_name,font_set->substitute[i].xlfd_name);
-		font_set->side = font_set->substitute[i].side;
-		if(parse_vw(oc, font_set, name_list, count) == -1)
-		    goto err;
-
-		found_num++;
-	    }
-	}
-    }
-
-    base_name = (char *) Xmalloc(strlen(oc->core.base_name_list) + 1);
-    if (base_name == NULL)
-	goto err;
-
-    strcpy(base_name, oc->core.base_name_list);
-    oc->core.base_name_list = base_name;
-
-    XFreeStringList(name_list);
-
-    return found_num;
-
-err:
-    XFreeStringList(name_list);
-    /* Prevent this from being freed twice */
-    oc->core.base_name_list = NULL;
-
-    return -1;
-}
-
-/* For VW/UDC end*/
-
-static Bool
-set_missing_list(oc)
-    XOC oc;
-{
-    XOCGenericPart *gen = XOC_GENERIC(oc);
-    FontSet font_set;
-    char **charset_list, *charset_buf;
-    int	count, length, font_set_num;
-    int result = 1;
-
-    font_set = gen->font_set;
-    font_set_num = gen->font_set_num;
-    count = length = 0;
-
-    for ( ; font_set_num-- > 0; font_set++) {
-	if (font_set->info || font_set->font) {
-	    continue;
-	}
-	
-	/* Change 1996.01.23 start */
-	if(font_set->font_data_count <= 0 ||
-	   font_set->font_data == (FontData)NULL) {
-	    if(font_set->substitute_num <= 0 ||
-	       font_set->substitute == (FontData)NULL) {
-		if(font_set->charset_list != NULL){
-		 length += 
-		  strlen(font_set->charset_list[0]->encoding_name) + 1;
-		} else {
-		  length += 1;
-		}
-	    } else {
-		length += strlen(font_set->substitute->name) + 1;
-	    }
-	} else {
-	    length += strlen(font_set->font_data->name) + 1;
-	}
-	/* Change 1996.01.23 end */
-	count++;
-    }
-
-    if (count < 1) {
-	return True;
-    }
-
-    charset_list = (char **) Xmalloc(sizeof(char *) * count);
-    if (charset_list == NULL) {
-	return False;
-    }
-
-    charset_buf = (char *) Xmalloc(length);
-    if (charset_buf == NULL) {
-	Xfree(charset_list);
-	return False;
-    }
-
-    oc->core.missing_list.charset_list = charset_list;
-    oc->core.missing_list.charset_count = count;
-
-    font_set = gen->font_set;
-    font_set_num = gen->font_set_num;
-
-    for ( ; font_set_num-- > 0; font_set++) {
-	if (font_set->info || font_set->font) {
-	    continue;
-	}
-
-	/* Change 1996.01.23 start */
-	if(font_set->font_data_count <= 0 ||
-	   font_set->font_data == (FontData)NULL) {
-	    if(font_set->substitute_num <= 0 ||
-	       font_set->substitute == (FontData)NULL) {
-		if(font_set->charset_list != NULL){
-		 strcpy(charset_buf,
-			font_set->charset_list[0]->encoding_name);
-		} else {
-		 strcpy(charset_buf, "");
-		}
-		result = 0;
-	    } else {
-		strcpy(charset_buf, font_set->substitute->name);
-	    }
-	} else {
-	    strcpy(charset_buf, font_set->font_data->name);
-	}
-	/* Change 1996.01.23 end */
-	*charset_list++ = charset_buf;
-	charset_buf += strlen(charset_buf) + 1;
-    } 
-
-    if(result == 0) {
-	return(False);
-    }
-
-    return True;
-}
-
-static Bool
-create_fontset(oc)
-    XOC oc;
-{
-    XOMGenericPart *gen = XOM_GENERIC(oc->core.om);
-    int found_num;
-
-    if (init_fontset(oc) == False)
-        return False;
-
-    found_num = parse_fontname(oc);
-    if (found_num <= 0) {
-	if (found_num == 0)
-	    set_missing_list(oc);
-	return False;
-    }
-
-    if (gen->on_demand_loading == True) {
-	if (load_font_info(oc) == False)
-	    return False;
-    } else {
-	if (load_font(oc) == False)
-	    return False;
-    }
-
-    if (init_core_part(oc) == False)
-	return False;
-
-    if (set_missing_list(oc) == False)
-	return False;
-
-    return True;
-}
-
-/* For VW/UDC start */
-static void
-free_fontdataOC(dpy,font_data, font_data_count)
-    Display	*dpy;
-    FontData	font_data;
-    int		font_data_count;
-{
-    for( ; font_data_count-- ; font_data++) {
-	if(font_data->xlfd_name){
-	    Xfree(font_data->xlfd_name);
-	    font_data->xlfd_name = NULL;
-	}
-	if(font_data->font){				/* ADD 1996.01.7 */
-	    if(font_data->font->fid)			/* Add 1996.01.23 */
-		XFreeFont(dpy,font_data->font);		/* ADD 1996.01.7 */
-	    else					/* Add 1996.01.23 */
-		XFreeFontInfo(NULL, font_data->font, 1);/* Add 1996.01.23 */
-	    font_data->font = NULL;
-	}
-/* XOM to kyoutuu shite shiyou sushiteiru ryouiki
-   kokoha free_fontdataOM() de free sareru
-
-	if(font_data->scopes){
-	    Xfree(font_data->scopes);
-	    font_data->scopes = NULL;
-	}
-	if(font_data->name){
-	    Xfree(font_data->name);
-	    font_data->name = NULL;
-	}
-*/
-    }
-}
-void destroy_fontdata(gen,dpy)
-    XOCGenericPart *gen ;
-    Display *dpy ;
-{
-    FontSet	font_set = (FontSet) NULL;
-    int		font_set_num = 0;
-
-    if (gen->font_set) {
-	font_set = gen->font_set;
-	font_set_num = gen->font_set_num;
-	for( ; font_set_num-- ; font_set++) {
-	    if(font_set->font_data) {
-		free_fontdataOC(dpy,
-			font_set->font_data, font_set->font_data_count);
-		Xfree(font_set->font_data);
-		font_set->font_data = NULL;
-	    }
-	    if(font_set->substitute) {
-		free_fontdataOC(dpy,
-			font_set->substitute, font_set->substitute_num);
-		Xfree(font_set->substitute);
-		font_set->substitute = NULL;
-	    }
-	    if(font_set->vmap) {
-		free_fontdataOC(dpy,
-			font_set->vmap, font_set->vmap_num);
-		Xfree(font_set->vmap);
-		font_set->vmap = NULL;
-	    }
-	    if(font_set->vrotate) {
-		free_fontdataOC(dpy,
-			(FontData)font_set->vrotate,
-			      font_set->vrotate_num);
-		Xfree(font_set->vrotate);
-		font_set->vrotate = NULL;
-	    }
-	}
-	Xfree(gen->font_set);
-	gen->font_set = NULL;
-    }
-}
-/* For VW/UDC end */
-
-static void
-destroy_oc(oc)
-    XOC oc;
-{
-    Display *dpy = oc->core.om->core.display;
-    XOCGenericPart *gen = XOC_GENERIC(oc);
-    XFontStruct **font_list;
-
-    if (gen->mbs_to_cs)
-	_XlcCloseConverter(gen->mbs_to_cs);
-
-    if (gen->wcs_to_cs)
-	_XlcCloseConverter(gen->wcs_to_cs);
-
-/* For VW/UDC start */ /* Change 1996.01.8 */
-    destroy_fontdata(gen,dpy); 
-/*
-*/
-/* For VW/UDC end */
-
-    if (oc->core.base_name_list)
-	Xfree(oc->core.base_name_list);
-
-    if (oc->core.font_info.font_name_list)
-	XFreeStringList(oc->core.font_info.font_name_list);
-
-    if ((font_list = oc->core.font_info.font_struct_list)) {
-	Xfree(oc->core.font_info.font_struct_list);
-    }
-
-    if (oc->core.missing_list.charset_list)
-	XFreeStringList(oc->core.missing_list.charset_list);
-
-#ifdef notdef
-    if (oc->core.res_name)
-	Xfree(oc->core.res_name);
-    if (oc->core.res_class)
-	Xfree(oc->core.res_class);
-#endif
-    
-    Xfree(oc);
-}
-
-static char *
-set_oc_values(oc, args, num_args)
-    XOC oc;
-    XlcArgList args;
-    int num_args;
-{
-    XOCGenericPart *gen = XOC_GENERIC(oc);
-    FontSet font_set = gen->font_set;
-    char *ret;
-    int num = gen->font_set_num;
-
-    if (oc->core.resources == NULL)
-	return NULL;
-
-    ret = _XlcSetValues((XPointer) oc, oc->core.resources,
-			oc->core.num_resources, args, num_args, XlcSetMask);
-    if(ret != NULL){
-	return(ret);
-    } else {
-	for ( ; num-- > 0; font_set++) {
-	    if (font_set->font_name == NULL)
-	        continue;
-	    if (font_set->vpart_initialize != 0)
-	        continue;
-	    if( oc->core.orientation == XOMOrientation_TTB_RTL ||
-		oc->core.orientation == XOMOrientation_TTB_LTR ){
-	    	load_fontdata(oc, font_set->vmap, font_set->vmap_num);
-		load_fontdata(oc, (FontData) font_set->vrotate,
-			    font_set->vrotate_num);
-		font_set->vpart_initialize = 1;
-	    }
-	}
-	return(NULL);
-    }
-}
-
-static char *
-get_oc_values(oc, args, num_args)
-    XOC oc;
-    XlcArgList args;
-    int num_args;
-{
-    if (oc->core.resources == NULL)
-	return NULL;
-
-    return _XlcGetValues((XPointer) oc, oc->core.resources,
-			 oc->core.num_resources, args, num_args, XlcGetMask);
-}
-
-static XOCMethodsRec oc_default_methods = {
-    destroy_oc,
-    set_oc_values,
-    get_oc_values,
-    _XmbDefaultTextEscapement,
-    _XmbDefaultTextExtents,
-    _XmbDefaultTextPerCharExtents,
-    _XmbDefaultDrawString,
-    _XmbDefaultDrawImageString,
-    _XwcDefaultTextEscapement,
-    _XwcDefaultTextExtents,
-    _XwcDefaultTextPerCharExtents,
-    _XwcDefaultDrawString,
-    _XwcDefaultDrawImageString
-};
-
-static XOCMethodsRec oc_generic_methods = {
-    destroy_oc,
-    set_oc_values,
-    get_oc_values,
-    _XmbGenericTextEscapement,
-    _XmbGenericTextExtents,
-    _XmbGenericTextPerCharExtents,
-    _XmbGenericDrawString,
-    _XmbGenericDrawImageString,
-    _XwcGenericTextEscapement,
-    _XwcGenericTextExtents,
-    _XwcGenericTextPerCharExtents,
-    _XwcGenericDrawString,
-    _XwcGenericDrawImageString
-};
-
-typedef struct _XOCMethodsListRec {
-    char *name;
-    XOCMethods methods;
-} XOCMethodsListRec, *XOCMethodsList;
-
-static XOCMethodsListRec oc_methods_list[] = {
-    { "default", &oc_default_methods },
-    { "generic", &oc_generic_methods }
-};
-
-static XlcResource oc_resources[] = {
-    { XNBaseFontName, NULLQUARK, sizeof(char *),
-      XOffsetOf(XOCRec, core.base_name_list), XlcCreateMask | XlcGetMask },
-    { XNOMAutomatic, NULLQUARK, sizeof(Bool),
-      XOffsetOf(XOCRec, core.om_automatic), XlcGetMask },
-    { XNMissingCharSet, NULLQUARK, sizeof(XOMCharSetList),
-      XOffsetOf(XOCRec, core.missing_list), XlcGetMask },
-    { XNDefaultString, NULLQUARK, sizeof(char *),
-      XOffsetOf(XOCRec, core.default_string), XlcGetMask },
-    { XNOrientation, NULLQUARK, sizeof(XOrientation),
-      XOffsetOf(XOCRec, core.orientation), XlcDefaultMask | XlcSetMask | XlcGetMask },
-    { XNResourceName, NULLQUARK, sizeof(char *),
-      XOffsetOf(XOCRec, core.res_name), XlcSetMask | XlcGetMask },
-    { XNResourceClass, NULLQUARK, sizeof(char *),
-      XOffsetOf(XOCRec, core.res_class), XlcSetMask | XlcGetMask },
-    { XNFontInfo, NULLQUARK, sizeof(XOMFontInfo),
-      XOffsetOf(XOCRec, core.font_info), XlcGetMask }
-};
-
-static XOC
-create_oc(om, args, num_args)
-    XOM om;
-    XlcArgList args;
-    int num_args;
-{
-    XOC oc;
-    XOMGenericPart *gen = XOM_GENERIC(om);
-    XOCMethodsList methods_list = oc_methods_list;
-    int count;
-
-    oc = (XOC) Xmalloc(sizeof(XOCGenericRec));
-    if (oc == NULL)
-	return (XOC) NULL;
-    bzero((char *) oc, sizeof(XOCGenericRec));
-    
-    oc->core.om = om;
-
-    if (oc_resources[0].xrm_name == NULLQUARK)
-	_XlcCompileResourceList(oc_resources, XlcNumber(oc_resources));
-    
-    if (_XlcSetValues((XPointer) oc, oc_resources, XlcNumber(oc_resources),
-		      args, num_args, XlcCreateMask | XlcDefaultMask))
-	goto err;
-
-    if (oc->core.base_name_list == NULL)
-	goto err;
-
-    oc->core.resources = oc_resources;
-    oc->core.num_resources = XlcNumber(oc_resources);
-
-    if (create_fontset(oc) == False)
-	goto err;
-
-    oc->methods = &oc_generic_methods;
-
-    if (gen->object_name) {
-	count = XlcNumber(oc_methods_list);
-
-	for ( ; count-- > 0; methods_list++) {
-	    if (!_XlcCompareISOLatin1(gen->object_name, methods_list->name)) {
-		oc->methods = methods_list->methods;
-		break;
-	    }
-	}
-    }
-
-    return oc;
-
-err:
-    destroy_oc(oc);
-
-    return (XOC) NULL;
-}
-
-static void
-free_fontdataOM(font_data, font_data_count)
-    FontData	font_data;
-    int		font_data_count;
-{
-    for( ; font_data_count-- ; font_data++) {
-	if(font_data->name){
-	    Xfree(font_data->name);
-	    font_data->name = NULL;
-	}
-	if(font_data->scopes){
-	    Xfree(font_data->scopes);
-	    font_data->scopes = NULL;
-	}
-    }
-}
-
-static Status
-close_om(om)
-    XOM om;
-{
-    XOMGenericPart *gen = XOM_GENERIC(om);
-    OMData data;
-    int count;
-
-    if ((data = gen->data)) {
-	for (count = gen->data_num; count-- > 0; data++) {
-	    if (data->charset_list){
-		Xfree(data->charset_list);
-		data->charset_list = NULL;
-	    }
-	    /* free font_data for om */
-	    if (data->font_data) {
-		free_fontdataOM(data->font_data,data->font_data_count);
-		Xfree(data->font_data);
-		data->font_data = NULL;
-	    }
-	    /* free substitute for om */
-	    if (data->substitute) {
-		free_fontdataOM(data->substitute,data->substitute_num);
-		Xfree(data->substitute);
-		data->substitute = NULL;
-	    }
-	    /* free vmap for om */
-	    if (data->vmap) {
-		free_fontdataOM(data->vmap,data->vmap_num);
-		Xfree(data->vmap);
-		data->vmap = NULL;
-	    }
-	    /* free vrotate for om */
-	    if (data->vrotate) {
-		Xfree(data->vrotate);
-		data->vrotate = NULL;
-	    }
-	}
-	Xfree(gen->data);
-	gen->data = NULL;
-    }
-
-    if (gen->object_name){
-	Xfree(gen->object_name);
-	gen->object_name = NULL;
-    }
-
-    if (om->core.res_name){
-	Xfree(om->core.res_name);
-	om->core.res_name = NULL;
-    }
-    if (om->core.res_class){
-	Xfree(om->core.res_class);
-	om->core.res_class = NULL;
-    }
-    if (om->core.required_charset.charset_list &&
-	om->core.required_charset.charset_count > 0){
-	XFreeStringList(om->core.required_charset.charset_list);
-	om->core.required_charset.charset_list = NULL;
-    } else {
-	Xfree((char*)om->core.required_charset.charset_list);
-	om->core.required_charset.charset_list = NULL;
-    }
-    if (om->core.orientation_list.orientation){
-	Xfree(om->core.orientation_list.orientation);
-	om->core.orientation_list.orientation = NULL;
-    }
-
-    Xfree(om);
-
-    return 1;
-}
-
-static char *
-set_om_values(om, args, num_args)
-    XOM om;
-    XlcArgList args;
-    int num_args;
-{
-    if (om->core.resources == NULL)
-	return NULL;
-
-    return _XlcSetValues((XPointer) om, om->core.resources,
-			 om->core.num_resources, args, num_args, XlcSetMask);
-}
-
-static char *
-get_om_values(om, args, num_args)
-    XOM om;
-    XlcArgList args;
-    int num_args;
-{
-    if (om->core.resources == NULL)
-	return NULL;
-
-    return _XlcGetValues((XPointer) om, om->core.resources,
-			 om->core.num_resources, args, num_args, XlcGetMask);
-}
-
-static XOMMethodsRec methods = {
-    close_om,
-    set_om_values,
-    get_om_values,
-    create_oc
-};
-
-static XlcResource om_resources[] = {
-    { XNRequiredCharSet, NULLQUARK, sizeof(XOMCharSetList),
-      XOffsetOf(XOMRec, core.required_charset), XlcGetMask },
-    { XNQueryOrientation, NULLQUARK, sizeof(XOMOrientation),
-      XOffsetOf(XOMRec, core.orientation_list), XlcGetMask },
-    { XNDirectionalDependentDrawing, NULLQUARK, sizeof(Bool),
-      XOffsetOf(XOMRec, core.directional_dependent), XlcGetMask },
-    { XNContextualDrawing, NULLQUARK, sizeof(Bool),
-      XOffsetOf(XOMRec, core.contextual_drawing), XlcGetMask }
-};
-
-static XOM
-create_om(lcd, dpy, rdb, res_name, res_class)
-    XLCd lcd;
-    Display *dpy;
-    XrmDatabase rdb;
-    char *res_name;
-    char *res_class;
-{
-    XOM om;
-
-    om = (XOM) Xmalloc(sizeof(XOMGenericRec));
-    if (om == NULL)
-	return (XOM) NULL;
-    bzero((char *) om, sizeof(XOMGenericRec));
-    
-    om->methods = &methods;
-    om->core.lcd = lcd;
-    om->core.display = dpy;
-    om->core.rdb = rdb;
-    if (res_name) {
-	om->core.res_name = (char *) Xmalloc(strlen(res_name) + 1);
-	if (om->core.res_name == NULL)
-	    goto err;
-	strcpy(om->core.res_name, res_name);
-    }
-    if (res_class) {
-	om->core.res_class = (char *) Xmalloc(strlen(res_class) + 1);
-	if (om->core.res_class == NULL)
-	    goto err;
-	strcpy(om->core.res_class, res_class);
-    }
-
-    if (om_resources[0].xrm_name == NULLQUARK)
-	_XlcCompileResourceList(om_resources, XlcNumber(om_resources));
-    
-    om->core.resources = om_resources;
-    om->core.num_resources = XlcNumber(om_resources);
-
-    return om;
-
-err:
-    close_om(om);
-
-    return (XOM) NULL;
-}
-
-static OMData
-add_data(om)
-    XOM om;
-{
-    XOMGenericPart *gen = XOM_GENERIC(om);
-    OMData new;
-    int num;
-
-    if ((num = gen->data_num))
-        new = (OMData) Xrealloc(gen->data, (num + 1) * sizeof(OMDataRec));
-    else
-        new = (OMData) Xmalloc(sizeof(OMDataRec));
-
-    if (new == NULL)
-        return NULL;
-
-    gen->data_num = num + 1;
-    gen->data = new;
-
-    new += num;
-    bzero((char *) new, sizeof(OMDataRec));
-
-    return new;
-}
-
-/* For VW/UDC */
-
-extern FontScope _XlcParse_scopemaps();
-
-FontData
-read_EncodingInfo(count,value)
-int count;
-char **value;
-{
-    FontData font_data,ret;
-    char *buf, *bufptr,*scp;
-    int len;
-    font_data = (FontData) Xmalloc(sizeof(FontDataRec) * count);
-    if (font_data == NULL)
-        return NULL;
-    bzero((char *) font_data, sizeof(FontDataRec) * count);
-
-    ret = font_data;
-    for ( ; count-- > 0; font_data++) {
-/*
-        strcpy(buf, *value++);
-*/
-	buf = *value; value++;
-        if ((bufptr = strchr(buf, ':'))) {
-	    len = (int)(bufptr - buf);
-            bufptr++ ;
-	}
-        font_data->name = (char *) Xmalloc(len + 1);
-        if (font_data->name == NULL)
-            return NULL;
-        strncpy(font_data->name, buf,len);
-	font_data->name[len] = 0;
-        if (bufptr && _XlcCompareISOLatin1(bufptr, "GL") == 0)
-            font_data->side = XlcGL;
-        else if (bufptr && _XlcCompareISOLatin1(bufptr, "GR") == 0)
-            font_data->side = XlcGR;
-        else
-            font_data->side = XlcGLGR;
-
-        if (bufptr && (scp = strchr(bufptr, '['))){
-            font_data->scopes = _XlcParse_scopemaps(scp,&(font_data->scopes_num));
-        }
-    }
-    return(ret);
-}
-
-static CodeRange read_vrotate(count,value,type,vrotate_num)
-int count;
-char **value;
-int *type;
-int *vrotate_num;
-{
-    CodeRange   range;
-    if(!strcmp(value[0],"all")){
-	*type 	     = VROTATE_ALL ;
-	*vrotate_num = 0 ;
-	return (NULL);
-    } else if(*(value[0]) == '['){
-	*type 	     = VROTATE_PART ;
-        range = (CodeRange) _XlcParse_scopemaps(value[0],vrotate_num);
-	return (range);
-    } else {
-	*type 	     = VROTATE_NONE ;
-	*vrotate_num = 0 ;
-	return (NULL);
-    }
-}
-
-static void read_vw(lcd,font_set,num)
-XLCd    lcd;
-OMData  font_set;
-int num;
-{
-    char **value, buf[BUFSIZ];
-    int count;
-
-    sprintf(buf, "fs%d.font.vertical_map", num);
-    _XlcGetResource(lcd, "XLC_FONTSET", buf, &value, &count);
-    if (count > 0){
-        _XlcDbg_printValue(buf,value,count);
-        font_set->vmap_num = count;
-        font_set->vmap = read_EncodingInfo(count,value);
-    }
-
-    sprintf(buf, "fs%d.font.vertical_rotate", num);
-    _XlcGetResource(lcd, "XLC_FONTSET", buf, &value, &count);
-    if (count > 0){
-        _XlcDbg_printValue(buf,value,count);
-        font_set->vrotate = read_vrotate(count,value,&(font_set->vrotate_type),
-				&(font_set->vrotate_num));
-    }
-}
-/* VW/UDC end */
-static Bool
-init_om(om)
-    XOM om;
-{
-    XLCd lcd = om->core.lcd;
-    XOMGenericPart *gen = XOM_GENERIC(om);
-    OMData data;
-    XlcCharSet *charset_list;
-    FontData font_data;
-    char **required_list;
-    XOrientation *orientation;
-    char **value, buf[BUFSIZ], *bufptr;
-    int count = 0, num = 0, length = 0;
-
-    _XlcGetResource(lcd, "XLC_FONTSET", "on_demand_loading", &value, &count);
-    if (count > 0 && _XlcCompareISOLatin1(*value, "True") == 0)
-	gen->on_demand_loading = True;
-
-    _XlcGetResource(lcd, "XLC_FONTSET", "object_name", &value, &count);
-    if (count > 0) {
-	gen->object_name = (char *) Xmalloc(strlen(*value) + 1);
-	if (gen->object_name == NULL)
-	    return False;
-	strcpy(gen->object_name, *value);
-    }
-
-    for (num = 0; ; num++) {
-
-        sprintf(buf, "fs%d.charset.name", num);
-        _XlcGetResource(lcd, "XLC_FONTSET", buf, &value, &count);
-
-        if( count < 1){
-            sprintf(buf, "fs%d.charset", num);
-            _XlcGetResource(lcd, "XLC_FONTSET", buf, &value, &count);
-            if (count < 1)
-                break;
-        }
-
-	data = add_data(om);
-	if (data == NULL)
-	    return False;
-	
-	charset_list = (XlcCharSet *) Xmalloc(sizeof(XlcCharSet) * count);
-	if (charset_list == NULL)
-	    return False;
-	data->charset_list = charset_list;
-	data->charset_count = count;
-
-	while (count-- > 0){
-	    *charset_list++ = _XlcGetCharSet(*value++);
-        }
-        sprintf(buf, "fs%d.charset.udc_area", num);
-        _XlcGetResource(lcd, "XLC_FONTSET", buf, &value, &count);
-        if( count > 0){
-            UDCArea udc;
-            int i,flag = 0;
-            udc = (UDCArea)Xmalloc(count * sizeof(UDCAreaRec));
-	    if (udc == NULL)
-	        return False;
-            for(i=0;i<count;i++){
-                sscanf(value[i],"\\x%lx,\\x%lx", &(udc[i].start),
-		       &(udc[i].end));
-            }
-            for(i=0;i<data->charset_count;i++){
-		if(data->charset_list[i]->udc_area == NULL){
-		    data->charset_list[i]->udc_area     = udc;
-		    data->charset_list[i]->udc_area_num = count;
-		    flag = 1;
-		}
-            }
-	    if(flag == 0){
-		Xfree(udc);
-	    }
-        }
-
-        sprintf(buf, "fs%d.font.primary", num);
-        _XlcGetResource(lcd, "XLC_FONTSET", buf, &value, &count);
-        if (count < 1){
-            sprintf(buf, "fs%d.font", num);
-            _XlcGetResource(lcd, "XLC_FONTSET", buf, &value, &count);
-            if (count < 1)
-                return False;
-        }
-
-	font_data = read_EncodingInfo(count,value);
-	if (font_data == NULL)
-	    return False;
-
-	data->font_data = font_data;
-	data->font_data_count = count;
-
-        sprintf(buf, "fs%d.font.substitute", num);
-        _XlcGetResource(lcd, "XLC_FONTSET", buf, &value, &count);
-        if (count > 0){
-            font_data = read_EncodingInfo(count,value);
-            if (font_data == NULL)
-	        return False;
-            data->substitute      = font_data;
-            data->substitute_num = count;
-        } else {
-            sprintf(buf, "fs%d.font", num);
-            _XlcGetResource(lcd, "XLC_FONTSET", buf, &value, &count);
-            if (count < 1) {
-                data->substitute      = NULL;
-                data->substitute_num = 0;
-	    } else {
-                font_data = read_EncodingInfo(count,value);
-                data->substitute      = font_data;
-                data->substitute_num = count;
-	    }
-	}
-        read_vw(lcd,data,num);
-	length += strlen(data->font_data->name) + 1;
-    }
-
-    /* required charset list */
-    required_list = (char **) Xmalloc(sizeof(char *) * gen->data_num);
-    if (required_list == NULL)
-	return False;
-
-    bufptr = (char *) Xmalloc(length);
-    if (bufptr == NULL) {
-	Xfree(required_list);
-	return False;
-    }
-
-    om->core.required_charset.charset_list = required_list;
-    om->core.required_charset.charset_count = gen->data_num;
-
-    count = gen->data_num;
-    data = gen->data;
-
-    for ( ; count-- > 0; data++) {
-	strcpy(bufptr, data->font_data->name);
-	*required_list++ = bufptr;
-	bufptr += strlen(bufptr) + 1;
-    }
-
-    /* orientation list */
-    orientation = (XOrientation *) Xmalloc(sizeof(XOrientation) * 2);
-    if (orientation == NULL)
-	return False;
-
-    orientation[0] = XOMOrientation_LTR_TTB;
-    orientation[1] = XOMOrientation_TTB_RTL;
-    om->core.orientation_list.orientation = orientation;
-    om->core.orientation_list.num_orientation = 2;
-
-    /* directional dependent drawing */
-    om->core.directional_dependent = False;
-
-    /* contexual drawing */
-    om->core.contextual_drawing = False;
-
-    /* context dependent */
-    om->core.context_dependent = False;
-
-    return True;
-}
-
-XOM
-#if NeedFunctionPrototypes
-_XomGenericOpenOM(XLCd lcd, Display *dpy, XrmDatabase rdb,
-		  _Xconst char *res_name, _Xconst char *res_class)
-#else
-_XomGenericOpenOM(lcd, dpy, rdb, res_name, res_class)
-    XLCd lcd;
-    Display *dpy;
-    XrmDatabase rdb;
-    char *res_name;
-    char *res_class;
-#endif
-{
-    XOM om;
-
-    om = create_om(lcd, dpy, rdb, res_name, res_class);
-    if (om == NULL)
-	return (XOM) NULL;
-    
-    if (init_om(om) == False)
-	goto err;
-
-    return om;
-
-err:
-    close_om(om);
-
-    return (XOM) NULL;
-}
-
-Bool
-_XInitOM(lcd)
-    XLCd lcd;
-{
-    lcd->methods->open_om = _XomGenericOpenOM;
-
-    return True;
-}
diff --git a/xc/lib/X11/omImText.c b/xc/lib/X11/omImText.c
deleted file mode 100644
index f8a5291fb..000000000
--- a/xc/lib/X11/omImText.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/* $XConsortium: omImText.c,v 1.2 94/01/20 18:08:09 rws Exp $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-
-#include "Xlibint.h"
-#include "XomGeneric.h"
-
-extern int _XomGenericTextExtents(), _XomGenericDrawString();
-
-#define GET_VALUE_MASK	(GCFunction | GCForeground | GCBackground | GCFillStyle)
-#define SET_VALUE_MASK	(GCFunction | GCForeground | GCFillStyle)
-
-static void
-_XomGenericDrawImageString(dpy, d, oc, gc, x, y, type, text, length)
-    Display *dpy;
-    Drawable d;
-    XOC oc;
-    GC gc;
-    int x, y;
-    XOMTextType type;
-    XPointer text;
-    int length;
-{
-    XGCValues values;
-    XRectangle extent;
-
-    XGetGCValues(dpy, gc, GET_VALUE_MASK, &values);
-
-    XSetFunction(dpy, gc, GXcopy);
-    XSetForeground(dpy, gc, values.background);
-    XSetFillStyle(dpy, gc, FillSolid);
-
-    _XomGenericTextExtents(oc, type, text, length, 0, &extent);
-    XFillRectangle(dpy, d, gc, x + extent.x, y + extent.y, extent.width,
-		   extent.height);
-
-    XChangeGC(dpy, gc, SET_VALUE_MASK, &values);
-
-    _XomGenericDrawString(dpy, d, oc, gc, x, y, type, text, length);
-}
-
-void
-#if NeedFunctionPrototypes
-_XmbGenericDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, int x,
-			   int y, _Xconst char *text, int length)
-#else
-_XmbGenericDrawImageString(dpy, d, oc, gc, x, y, text, length)
-    Display *dpy;
-    Drawable d;
-    XOC oc;
-    GC gc;
-    int x, y;
-    char *text;
-    int length;
-#endif
-{
-    _XomGenericDrawImageString(dpy, d, oc, gc, x, y, XOMMultiByte,
-			       (XPointer) text, length);
-}
-
-void
-#if NeedFunctionPrototypes
-_XwcGenericDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, int x,
-			   int y, _Xconst wchar_t *text, int length)
-#else
-_XwcGenericDrawImageString(dpy, d, oc, gc, x, y, text, length)
-    Display *dpy;
-    Drawable d;
-    XOC oc;
-    GC gc;
-    int x, y;
-    wchar_t *text;
-    int length;
-#endif
-{
-    _XomGenericDrawImageString(dpy, d, oc, gc, x, y, XOMWideChar,
-			       (XPointer) text, length);
-}
diff --git a/xc/lib/X11/omText.c b/xc/lib/X11/omText.c
deleted file mode 100644
index cf75fa768..000000000
--- a/xc/lib/X11/omText.c
+++ /dev/null
@@ -1,385 +0,0 @@
-/* $TOG: omText.c /main/6 1998/03/14 06:08:58 kaleb $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-/* $XFree86: xc/lib/X11/omText.c,v 1.2 1999/05/09 10:50:42 dawes Exp $ */
-/*
- * Copyright 1995 by FUJITSU LIMITED
- * This is source code modified by FUJITSU LIMITED under the Joint
- * Development Agreement for the CDE/Motif PST.
- */
-/*
- * Modifiers: Jeff Walls, Paul Anderson (HEWLETT-PACKARD)
- */
-
-#include "Xlibint.h"
-#include "XomGeneric.h"
-#include <stdio.h>
-
-/* For VW/UDC */
-
-static int
-is_rotate(oc, font)
-    XOC		oc;
-    XFontStruct	*font;
-{
-    XOCGenericPart	*gen = XOC_GENERIC(oc);
-    FontSet		font_set;
-    VRotate		vrotate;
-    int			font_set_count;
-    int			vrotate_num;
-
-    font_set = gen->font_set;
-    font_set_count = gen->font_set_num;
-    for( ; font_set_count-- ; font_set++) {
-	if((font_set->vrotate_num > 0) && (font_set->vrotate)) {
-	    vrotate = font_set->vrotate;
-	    vrotate_num = font_set->vrotate_num;
-	    for( ; vrotate_num-- ; vrotate++)
-		if(vrotate->font == font)
-		    return True;
-	}
-    }
-    return False;
-}
-
-static int
-is_codemap(oc, font)
-    XOC		oc;
-    XFontStruct	*font;
-{
-    XOCGenericPart	*gen = XOC_GENERIC(oc);
-    FontSet		font_set;
-    FontData		vmap;
-    int			font_set_count;
-    int			vmap_num;
-
-    font_set = gen->font_set;
-    font_set_count = gen->font_set_num;
-    for( ; font_set_count-- ; font_set++) {
-	if(font_set->vmap_num > 0) {
-	    vmap = font_set->vmap;
-	    vmap_num = font_set->vmap_num;
-	    for( ; vmap_num-- ; vmap++)
-		if(vmap->font == font)
-		    return True;
-	}
-    }
-    return False;
-}
-
-static int
-draw_vertical(dpy, d, oc, gc, font, is_xchar2b, x, y, text, length)
-    Display	*dpy;
-    Drawable	d;
-    XOC		oc;
-    GC		gc;
-    XFontStruct	*font;
-    Bool	is_xchar2b;
-    int		x, y;
-    XPointer	text;
-    int		length;
-{
-    XChar2b	*buf2b;
-    char	*buf;
-    int		wx = 0, wy = 0;
-    int		direction = 0;
-    int		font_ascent_return = 0, font_descent_return = 0;
-    int		i;
-    XCharStruct	overall;		
-
-    wy = y;
-    if (is_xchar2b) {
-	for(i = 0, buf2b = (XChar2b *) text ; i < length ; i++, buf2b++) {
-	    if(is_rotate(oc, font) == True) {
-		XTextExtents16(font, buf2b, 1,
-			       &direction, &font_ascent_return,
-			       &font_descent_return, &overall);
-		wx = x - (int)((overall.rbearing - overall.lbearing) >> 1) -
-			 (int) overall.lbearing;
-		wy += overall.ascent;
-		XDrawString16(dpy, d, gc, wx, wy, buf2b, 1);
-		wy += overall.descent;
-	    } else {
-		wx = x - (int)((font->max_bounds.rbearing -
-				font->min_bounds.lbearing) >> 1) -
-			 (int) font->min_bounds.lbearing;
-		wy += font->max_bounds.ascent;
-		XDrawString16(dpy, d, gc, wx, wy, buf2b, 1);
-		wy += font->max_bounds.descent;
-	    }
-	}
-    } else {
-	for(i = 0, buf = (char *)text ; i < length && *buf ; i++, buf++) {
-	    if(is_rotate(oc, font) == True) {
-		XTextExtents(font, buf, 1,
-			     &direction, &font_ascent_return,
-			     &font_descent_return, &overall);
-		wx = x - (int)((overall.rbearing - overall.lbearing) >> 1) -
-			 (int) overall.lbearing;
-		wy += overall.ascent;
-		XDrawString(dpy, d, gc, wx, wy, buf, 1);
-		wy += overall.descent;
-	    } else {
-		wx = x - (int)((font->max_bounds.rbearing -
-				font->min_bounds.lbearing) >> 1) -
-			 (int) font->min_bounds.lbearing;
-		wy += font->max_bounds.ascent;
-		XDrawString(dpy, d, gc, wx, wy, buf, 1);
-		wy += font->max_bounds.descent;
-	    }
-	}
-    }
-    return wy;
-}
-
-#define VMAP          0
-#define VROTATE       1
-#define FONTSCOPE     2
-
-extern FontData _XomGetFontDataFromFontSet();
-
-static int
-DrawStringWithFontSet(dpy, d, oc, fs, gc, x, y, text, length)
-    Display *dpy;
-    Drawable d;
-    XOC oc;
-    FontSet fs;
-    GC gc;
-    int x, y;
-    XPointer text;
-    int length;
-{
-    XFontStruct *font;
-    Bool is_xchar2b;
-    unsigned char *ptr;
-    int ptr_len, char_len = 0;
-    FontData fd;
-    int ret;
-
-    ptr = (unsigned char *)text;
-    is_xchar2b = fs->is_xchar2b;
-
-    while (length > 0) {
-        fd = _XomGetFontDataFromFontSet(fs,
-			(char *)ptr,length,&ptr_len,is_xchar2b,FONTSCOPE);
-	if(ptr_len <= 0)
-	    break;
-
-       /* First, see if the "Best Match" font for the FontSet was set.
-	* If it was, use that font.  If it was not set, then use the
-	* font defined by font_set->font_data[0] (which is what
-	* _XomGetFontDataFromFontSet() always seems to return for
-	* non-VW text).  Note that given the new algorithm in 
-	* parse_fontname() and parse_fontdata(), fs->font will
-	* *always* contain good data.   We should probably remove
-	* the check for "fd->font", but we won't :-) -- jjw/pma (HP)
-	*/
-        if(fd == (FontData) NULL ||
-	   (font = fs->font) == (XFontStruct *) NULL){
-
-	    if((font = fd->font) == (XFontStruct *) NULL)
-		break;
-        }
-
-	switch(oc->core.orientation) {
-	  case XOMOrientation_LTR_TTB:
-	  case XOMOrientation_RTL_TTB:
-            XSetFont(dpy, gc, font->fid);
-
-	    if (is_xchar2b) {
-		char_len = ptr_len / sizeof(XChar2b);
-		XDrawString16(dpy, d, gc, x, y, (XChar2b *)ptr, char_len);
-		x += XTextWidth16(font, (XChar2b *)ptr, char_len);
-            } else {
-		char_len = ptr_len;
-		XDrawString(dpy, d, gc, x, y, (char *)ptr, char_len);
-		x += XTextWidth(font, (char *)ptr, char_len);
-	    }
-	    break;
-	  case XOMOrientation_TTB_RTL:
-	  case XOMOrientation_TTB_LTR:
-	    if(fs->font == font) {
-		fd = _XomGetFontDataFromFontSet(fs,
-			(char *)ptr,length,&ptr_len,is_xchar2b,VMAP);
-		if(ptr_len <= 0)
-		    break;
-		if(fd == (FontData) NULL ||
-		   (font = fd->font) == (XFontStruct *) NULL)
-		    break;
-
-		if(is_codemap(oc, fd->font) == False) {
-		    fd = _XomGetFontDataFromFontSet(fs,
-			     (char *)ptr,length,&ptr_len,is_xchar2b,VROTATE);
-		    if(ptr_len <= 0)
-			break;
-		    if(fd == (FontData) NULL ||
-		       (font = fd->font) == (XFontStruct *) NULL)
-			break;
-		}
-
-	    case XOMOrientation_Context:
-	      /* never used? */
-	      break;
-	    }
-
-	    if(is_xchar2b)
-		char_len = ptr_len / sizeof(XChar2b);
-	    else
-		char_len = ptr_len;
-            XSetFont(dpy, gc, font->fid);
-	    y = draw_vertical(dpy, d, oc, gc, font, is_xchar2b, x, y,
-			       (char *)ptr, char_len);
-	    break;
-	}
-
-	if(char_len <= 0)
-	    break;
-
-        length -= char_len;
-        ptr += ptr_len;
-    }
-
-    switch(oc->core.orientation) {
-      case XOMOrientation_LTR_TTB:
-      case XOMOrientation_RTL_TTB:
-	ret = x;
-	break;
-      case XOMOrientation_TTB_RTL:
-      case XOMOrientation_TTB_LTR:
-	ret = y;
-	break;
-      case XOMOrientation_Context:
-	/* not used? */
-	break;
-    }
-    return ret;
-}
-
-/* For VW/UDC */
-
-int
-_XomGenericDrawString(dpy, d, oc, gc, x, y, type, text, length)
-    Display *dpy;
-    Drawable d;
-    XOC oc;
-    GC gc;
-    int x, y;
-    XOMTextType type;
-    XPointer text;
-    int length;
-{
-    XlcConv conv;
-    XFontStruct *font;
-    Bool is_xchar2b;
-/* VW/UDC */
-    XPointer args[3];
-    FontSet fs;
-/* VW/UDC */
-    XChar2b xchar2b_buf[BUFSIZ], *buf;
-    int start_x = x;
-    int start_y = y;
-    int left = 0, buf_len = 0;
-    int next = 0;
-
-    conv = _XomInitConverter(oc, type);
-    if (conv == NULL)
-	return -1;
-    
-    args[0] = (XPointer) &font;
-    args[1] = (XPointer) &is_xchar2b;
-    args[2] = (XPointer) &fs;
-
-    while (length > 0) {
-	buf = xchar2b_buf;
-	left = buf_len = BUFSIZ;
-
-	if (_XomConvert(oc, conv, (XPointer *) &text, &length,
-			(XPointer *) &buf, &left, args, 3) < 0)
-	    break;
-	buf_len -= left;
-
-/* For VW/UDC */
-	next = DrawStringWithFontSet(dpy, d, oc, fs, gc, x, y,
-				     (XPointer)xchar2b_buf, buf_len);
-
-	switch(oc->core.orientation) {
-	  case XOMOrientation_LTR_TTB:
-	  case XOMOrientation_RTL_TTB:
-	    x = next;
-	    break;
-	  case XOMOrientation_TTB_RTL:
-	  case XOMOrientation_TTB_LTR:
-	    y = next;
-	    break;
-          case XOMOrientation_Context:
-	    /* not used */
-	    break;
-	}
-/* For VW/UDC */
-    }
-
-    x -= start_x;
-    y -= start_y;
-
-    return x;
-}
-
-int
-#if NeedFunctionPrototypes
-_XmbGenericDrawString(Display *dpy, Drawable d, XOC oc, GC gc, int x, int y,
-		      _Xconst char *text, int length)
-#else
-_XmbGenericDrawString(dpy, d, oc, gc, x, y, text, length)
-    Display *dpy;
-    Drawable d;
-    XOC oc;
-    GC gc;
-    int x, y;
-    char *text;
-    int length;
-#endif
-{
-    return _XomGenericDrawString(dpy, d, oc, gc, x, y, XOMMultiByte,
-				 (XPointer) text, length);
-}
-
-int
-#if NeedFunctionPrototypes
-_XwcGenericDrawString(Display *dpy, Drawable d, XOC oc, GC gc, int x, int y,
-		      _Xconst wchar_t *text, int length)
-#else
-_XwcGenericDrawString(dpy, d, oc, gc, x, y, text, length)
-    Display *dpy;
-    Drawable d;
-    XOC oc;
-    GC gc;
-    int x, y;
-    wchar_t *text;
-    int length;
-#endif
-{
-    return _XomGenericDrawString(dpy, d, oc, gc, x, y, XOMWideChar,
-				 (XPointer) text, length);
-}
diff --git a/xc/lib/X11/omTextEsc.c b/xc/lib/X11/omTextEsc.c
deleted file mode 100644
index fb2ca5eeb..000000000
--- a/xc/lib/X11/omTextEsc.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/* $XConsortium: omTextEsc.c /main/4 1996/12/05 10:40:59 swick $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-/* $XFree86: xc/lib/X11/omTextEsc.c,v 1.2 1999/05/09 10:50:42 dawes Exp $ */
-/*
- * Copyright 1995 by FUJITSU LIMITED
- * This is source code modified by FUJITSU LIMITED under the Joint
- * Development Agreement for the CDE/Motif PST.
- */
-
-#include "Xlibint.h"
-#include "XomGeneric.h"
-#include <stdio.h>
-
-/* For VW/UDC start */
-
-#define	VMAP		0
-#define	VROTATE		1
-#define	FONTSCOPE	2
-
-static int
-is_rotate(oc, font)
-    XOC         oc;
-    XFontStruct *font;
-{
-    XOCGenericPart      *gen = XOC_GENERIC(oc);
-    FontSet             font_set;
-    VRotate             vrotate;
-    int                 font_set_count;
-    int                 vrotate_num;
-
-    font_set = gen->font_set;
-    font_set_count = gen->font_set_num;
-    for( ; font_set_count-- ; font_set++) {
-	if((font_set->vrotate_num > 0) && (font_set->vrotate != NULL)) {
-	    vrotate = font_set->vrotate;
-	    vrotate_num = font_set->vrotate_num;
-	    for( ; vrotate_num-- ; vrotate++)
-		if(vrotate->font == font)
-		    return True;
-	}
-    }
-    return False;
-}
-
-static int
-is_codemap(oc, font)
-    XOC         oc;
-    XFontStruct *font;
-{
-    XOCGenericPart      *gen = XOC_GENERIC(oc);
-    FontSet             font_set;
-    FontData            vmap;
-    int                 font_set_count;
-    int                 vmap_num;
-
-    font_set = gen->font_set;
-    font_set_count = gen->font_set_num;
-    for( ; font_set_count-- ; font_set++) {
-	if(font_set->vmap_num > 0) {
-	    vmap = font_set->vmap;
-	    vmap_num = font_set->vmap_num;
-	    for( ; vmap_num-- ; vmap++)
-		if(vmap->font == font)
-		    return True;
-	}
-    }
-    return False;
-}
-
-static int
-escapement_vertical(oc, font, is_xchar2b, text, length)
-    XOC         oc;
-    XFontStruct *font;
-    Bool        is_xchar2b;
-    XPointer    text;
-    int         length;
-{
-    XChar2b	*buf2b;
-    char	*buf;
-    int		escapement = 0, i;
-
-    if(is_xchar2b) {
-	for(i = 0, buf2b = (XChar2b *) text ; i < length ; i++, buf2b++) {
-	    if(is_rotate(oc, font) == True) {
-		escapement += _XTextHeight16(font, buf2b, 1);
-	    } else {
-		escapement += (int) (font->max_bounds.ascent +
-				     font->max_bounds.descent);
-	    }
-	}
-    } else {
-	for(i = 0, buf = (char *)text ; i < length && *buf ; i++, buf++) {
-	    if(is_rotate(oc, font) == True) {
-		escapement += _XTextHeight(font, buf, 1);
-	    } else {
-		escapement += (int) (font->max_bounds.ascent +
-				     font->max_bounds.descent);
-	    }
-	}
-    }
-    return escapement;
-}
-
-
-extern FontData _XomGetFontDataFromFontSet();
-
-static int
-TextWidthWithFontSet(font_set, oc, text, length)
-    FontSet	font_set;
-    XOC		oc;
-    XPointer    text;
-    int         length;
-{
-    FontData		fd;
-    XFontStruct		*font;
-    unsigned char	*ptr = (unsigned char *)text;
-    Bool        	is_xchar2b;
-    int			ptr_len = length;
-    int			escapement = 0, char_len = 0;
-
-    if(font_set == (FontSet) NULL)
-	return escapement;
-
-    is_xchar2b = font_set->is_xchar2b;
-
-    while(length > 0) {
-	fd = _XomGetFontDataFromFontSet(font_set, ptr, length, &ptr_len,
-					       is_xchar2b, FONTSCOPE);
-	if(ptr_len <= 0)
-	    break;
-	if(fd == (FontData) NULL ||
-	   (font = fd->font) == (XFontStruct *) NULL) {
-
-	    if((font = font_set->font) == (XFontStruct *) NULL)
-		break;
-	}
-
-	switch(oc->core.orientation) {
-	  case XOMOrientation_LTR_TTB:
-	  case XOMOrientation_RTL_TTB:
-	    if (is_xchar2b) {
-		char_len = ptr_len / sizeof(XChar2b);
-		escapement += XTextWidth16(font, (XChar2b *)ptr, char_len);
-	    } else {
-		char_len = ptr_len;
-		escapement += XTextWidth(font, (char *)ptr, char_len);
-	    }
-	    break;
-
-	  case XOMOrientation_TTB_LTR:
-	  case XOMOrientation_TTB_RTL:
-	    if(font_set->font == font) {
-		fd = _XomGetFontDataFromFontSet(font_set, ptr, length, &ptr_len,
-						is_xchar2b, VMAP);
-		if(ptr_len <= 0)
-		    break;
-		if(fd == (FontData) NULL ||
-		   (font = fd->font) == (XFontStruct *) NULL)
-		    break;
-
-		if(is_codemap(oc, fd->font) == False) {
-		    fd = _XomGetFontDataFromFontSet(font_set, ptr, length,
-						    &ptr_len, is_xchar2b,
-						    VROTATE);
-		    if(ptr_len <= 0)
-			break;
-		    if(fd == (FontData) NULL ||
-		       (font = fd->font) == (XFontStruct *) NULL)
-			break;
-		}
-	    }
-
-	    if(is_xchar2b)
-		char_len = ptr_len / sizeof(XChar2b);
-	    else
-		char_len = ptr_len;
-	    escapement += escapement_vertical(oc, font, is_xchar2b,
-					      (XPointer) ptr, char_len);
-	    break;
-
-	  case XOMOrientation_Context:
-	    /* not used? */
-            break;
-	}
-
-	if(char_len <= 0)
-	    break;
-
-	length -= char_len;
-	ptr += ptr_len;
-    }
-
-    return escapement;
-}
-
-/* For VW/UDC end */
-
-static int
-_XomGenericTextEscapement(oc, type, text, length)
-    XOC oc;
-    XOMTextType type;
-    XPointer text;
-    int length;
-{
-    XlcConv conv;
-    XFontStruct *font;
-    Bool is_xchar2b;
-/* VW/UDC */
-    XPointer args[3];
-    FontSet font_set;
-/* VW/UDC */
-    XChar2b xchar2b_buf[BUFSIZ], *buf;
-    int escapement = 0;
-    int buf_len = 0, left = 0;
-
-    conv = _XomInitConverter(oc, type);
-    if (conv == NULL)
-	return escapement;
-    
-    args[0] = (XPointer) &font;
-    args[1] = (XPointer) &is_xchar2b;
-    args[2] = (XPointer) &font_set;
-
-    while (length > 0) {
-	buf = xchar2b_buf;
-	left = buf_len = BUFSIZ;
-
-	if (_XomConvert(oc, conv, (XPointer *) &text, &length,
-			(XPointer *) &buf, &left, args, 3) < 0)
-	    break;
-	buf_len -= left;
-
-/* VW/UDC */
-	escapement += TextWidthWithFontSet(font_set, oc,
-					   (XPointer) xchar2b_buf, buf_len);
-/* VW/UDC */
-    }
-
-    return escapement;
-}
-
-int
-#if NeedFunctionPrototypes
-_XmbGenericTextEscapement(XOC oc, _Xconst char *text, int length)
-#else
-_XmbGenericTextEscapement(oc, text, length)
-    XOC oc;
-    char *text;
-    int length;
-#endif
-{
-    return _XomGenericTextEscapement(oc, XOMMultiByte, (XPointer) text, length);
-}
-
-int
-#if NeedFunctionPrototypes
-_XwcGenericTextEscapement(XOC oc, _Xconst wchar_t *text, int length)
-#else
-_XwcGenericTextEscapement(oc, text, length)
-    XOC oc;
-    wchar_t *text;
-    int length;
-#endif
-{
-    return _XomGenericTextEscapement(oc, XOMWideChar, (XPointer) text, length);
-}
diff --git a/xc/lib/X11/omTextExt.c b/xc/lib/X11/omTextExt.c
deleted file mode 100644
index 9a93a77bd..000000000
--- a/xc/lib/X11/omTextExt.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/* $XConsortium: omTextExt.c,v 1.2 94/01/20 18:08:23 rws Exp $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-
-#include "Xlibint.h"
-#include "XomGeneric.h"
-#include <stdio.h>
-
-int
-_XomGenericTextExtents(oc, type, text, length, overall_ink,
-		       overall_logical)
-    XOC oc;
-    XOMTextType type;
-    XPointer text;
-    int length;
-    XRectangle *overall_ink;
-    XRectangle *overall_logical;
-{
-    XlcConv conv;
-    XFontStruct *font;
-    Bool is_xchar2b;
-    XPointer args[2];
-    XChar2b xchar2b_buf[BUFSIZ], *buf;
-    int direction, logical_ascent, logical_descent, tmp_ascent, tmp_descent;
-    XCharStruct overall, tmp_overall;
-    int buf_len, left;
-    Bool first = True;
-
-    conv = _XomInitConverter(oc, type);
-    if (conv == NULL)
-	return 0;
-
-    bzero((char *) &overall, sizeof(XCharStruct));
-    logical_ascent = logical_descent = 0;
-
-    args[0] = (XPointer) &font;
-    args[1] = (XPointer) &is_xchar2b;
-
-    while (length > 0) {
-	buf = xchar2b_buf;
-	left = buf_len = BUFSIZ;
-
-	if (_XomConvert(oc, conv, (XPointer *) &text, &length,
-			(XPointer *) &buf, &left, args, 2) < 0)
-	    break;
-	buf_len -= left;
-
-	if (is_xchar2b)
-	    XTextExtents16(font, xchar2b_buf, buf_len, &direction,
-			   &tmp_ascent, &tmp_descent, &tmp_overall);
-	else
-	    XTextExtents(font, (char *) xchar2b_buf, buf_len, &direction,
-			 &tmp_ascent, &tmp_descent, &tmp_overall);
-
-	if (first) {	/* initialize overall */
-	    overall = tmp_overall;
-	    logical_ascent = tmp_ascent;
-	    logical_descent = tmp_descent;
-	    first = False;
-	} else {
-	    overall.lbearing = min(overall.lbearing,
-				   overall.width + tmp_overall.lbearing);
-	    overall.rbearing = max(overall.rbearing,
-				   overall.width + tmp_overall.rbearing);
-	    overall.ascent = max(overall.ascent, tmp_overall.ascent);
-	    overall.descent = max(overall.descent, tmp_overall.descent);
-	    overall.width += tmp_overall.width;
-	    logical_ascent = max(logical_ascent, tmp_ascent);
-	    logical_descent = max(logical_descent, tmp_descent);
-	}
-    }
-
-    if (overall_ink) {
-	overall_ink->x = overall.lbearing;
-	overall_ink->y = -(overall.ascent);
-	overall_ink->width = overall.rbearing - overall.lbearing;
-	overall_ink->height = overall.ascent + overall.descent;
-    }
-
-    if (overall_logical) {
-	overall_logical->x = 0;
-        overall_logical->y = -(logical_ascent);
-	overall_logical->width = overall.width;
-        overall_logical->height = logical_ascent + logical_descent;
-    }
-
-    return overall.width;
-}
-
-int
-#if NeedFunctionPrototypes
-_XmbGenericTextExtents(XOC oc, _Xconst char *text, int length,
-		       XRectangle *overall_ink, XRectangle *overall_logical)
-#else
-_XmbGenericTextExtents(oc, text, length, overall_ink, overall_logical)
-    XOC oc;
-    char *text;
-    int length;
-    XRectangle *overall_ink;
-    XRectangle *overall_logical;
-#endif
-{
-    return _XomGenericTextExtents(oc, XOMMultiByte, (XPointer) text, length,
-				  overall_ink, overall_logical);
-}
-
-int
-#if NeedFunctionPrototypes
-_XwcGenericTextExtents(XOC oc, _Xconst wchar_t *text, int length,
-		       XRectangle *overall_ink, XRectangle *overall_logical)
-#else
-_XwcGenericTextExtents(oc, text, length, overall_ink, overall_logical)
-    XOC oc;
-    wchar_t *text;
-    int length;
-    XRectangle *overall_ink;
-    XRectangle *overall_logical;
-#endif
-{
-    return _XomGenericTextExtents(oc, XOMWideChar, (XPointer) text, length,
-				  overall_ink, overall_logical);
-}
diff --git a/xc/lib/X11/omTextPer.c b/xc/lib/X11/omTextPer.c
deleted file mode 100644
index 8cdea532c..000000000
--- a/xc/lib/X11/omTextPer.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/* $XConsortium: omTextPer.c,v 1.2 94/01/20 18:08:28 rws Exp $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-
-#include "Xlibint.h"
-#include "XomGeneric.h"
-#include <stdio.h>
-
-static Status
-_XomGenericTextPerCharExtents(oc, type, text, length, ink_buf, logical_buf,
-			      buf_size, num_chars, overall_ink, overall_logical)
-    XOC oc;
-    XOMTextType type;
-    XPointer text;
-    int length;
-    XRectangle *ink_buf;
-    XRectangle *logical_buf;
-    int buf_size;
-    int *num_chars;
-    XRectangle *overall_ink;
-    XRectangle *overall_logical;
-{
-    XlcConv conv;
-    XFontStruct *font;
-    Bool is_xchar2b;
-    XPointer args[2];
-    XChar2b xchar2b_buf[BUFSIZ], *xchar2b_ptr;
-    char *xchar_ptr;
-    XCharStruct *def, *cs, overall;
-    int buf_len, left, require_num;
-    int logical_ascent, logical_descent;
-    Bool first = True;
-
-    conv = _XomInitConverter(oc, type);
-    if (conv == NULL)
-	return 0;
-    
-    bzero((char *) &overall, sizeof(XCharStruct));
-    logical_ascent = logical_descent = require_num = *num_chars = 0;
-
-    args[0] = (XPointer) &font;
-    args[1] = (XPointer) &is_xchar2b;
-
-    while (length > 0) {
-	xchar2b_ptr = xchar2b_buf;
-	left = buf_len = BUFSIZ;
-
-	if (_XomConvert(oc, conv, (XPointer *) &text, &length,
-			(XPointer *) &xchar2b_ptr, &left, args, 2) < 0)
-	    break;
-	buf_len -= left;
-
-	if (require_num) {
-	    require_num += buf_len;
-	    continue;
-	}
-	if (buf_size < buf_len) {
-	    require_num = *num_chars + buf_len;
-	    continue;
-	}
-	buf_size -= buf_len;
-
-	if (first) {
-	    logical_ascent = font->ascent;
-	    logical_descent = font->descent;
-	} else {
-	    logical_ascent = max(logical_ascent, font->ascent);
-	    logical_descent = max(logical_descent, font->descent);
-	}
-
-	if (is_xchar2b) {
-	    CI_GET_DEFAULT_INFO_2D(font, def)
-	    xchar2b_ptr = xchar2b_buf;
-	} else {
-	    CI_GET_DEFAULT_INFO_1D(font, def)
-	    xchar_ptr = (char *) xchar2b_buf;
-	}
-
-	while (buf_len-- > 0) {
-	    if (is_xchar2b) {
-		CI_GET_CHAR_INFO_2D(font, xchar2b_ptr->byte1,
-				    xchar2b_ptr->byte2, def, cs)
-		xchar2b_ptr++;
-	    } else {
-		CI_GET_CHAR_INFO_1D(font, *xchar_ptr, def, cs)
-		xchar_ptr++;
-	    }
-	    if (cs == NULL)
-		continue;
-
-	    ink_buf->x = overall.width + cs->lbearing;
-	    ink_buf->y = -(cs->ascent);
-	    ink_buf->width = cs->rbearing - cs->lbearing;
-	    ink_buf->height = cs->ascent + cs->descent;
-	    ink_buf++;
-
-	    logical_buf->x = overall.width;
-	    logical_buf->y = -(font->ascent);
-	    logical_buf->width = cs->width;
-	    logical_buf->height = font->ascent + font->descent;
-	    logical_buf++;
-
-	    if (first) {
-		overall = *cs;
-		first = False;
-	    } else {
-		overall.ascent = max(overall.ascent, cs->ascent);
-		overall.descent = max(overall.descent, cs->descent);
-		overall.lbearing = min(overall.lbearing,
-				       overall.width + cs->lbearing);
-		overall.rbearing = max(overall.rbearing,
-				       overall.width + cs->rbearing);
-		overall.width += cs->width;
-	    }
-
-	    (*num_chars)++;
-	}
-    }
-
-    if (require_num) {
-	*num_chars = require_num;
-	return 0;
-    } else {
-	if (overall_ink) {
-	    overall_ink->x = overall.lbearing;
-	    overall_ink->y = -(overall.ascent);
-	    overall_ink->width = overall.rbearing - overall.lbearing;
-	    overall_ink->height = overall.ascent + overall.descent;
-	}
-
-	if (overall_logical) {
-	    overall_logical->x = 0;
-	    overall_logical->y = -(logical_ascent);
-	    overall_logical->width = overall.width;
-	    overall_logical->height = logical_ascent + logical_descent;
-	}
-    }
-
-    return 1;
-}
-
-Status
-#if NeedFunctionPrototypes
-_XmbGenericTextPerCharExtents(XOC oc, _Xconst char *text, int length,
-			      XRectangle *ink_buf, XRectangle *logical_buf,
-			      int buf_size, int *num_chars,
-			      XRectangle *overall_ink,
-			      XRectangle *overall_logical)
-#else
-_XmbGenericTextPerCharExtents(oc, text, length, ink_buf, logical_buf,
-			      buf_size, num_chars, overall_ink, overall_logical)
-    XOC oc;
-    char *text;	
-    int length;
-    XRectangle *ink_buf;
-    XRectangle *logical_buf;
-    int buf_size;
-    int *num_chars;
-    XRectangle *overall_ink;
-    XRectangle *overall_logical;
-#endif
-{
-    return _XomGenericTextPerCharExtents(oc, XOMMultiByte, (XPointer) text,
-					 length, ink_buf, logical_buf, buf_size,
-					 num_chars, overall_ink,
-					 overall_logical);
-}
-
-Status
-#if NeedFunctionPrototypes
-_XwcGenericTextPerCharExtents(XOC oc, _Xconst wchar_t *text, int length,
-			      XRectangle *ink_buf, XRectangle *logical_buf,
-			      int buf_size, int *num_chars,
-			      XRectangle *overall_ink,
-			      XRectangle *overall_logical)
-#else
-_XwcGenericTextPerCharExtents(oc, text, length, ink_buf, logical_buf,
-			      buf_size, num_chars, overall_ink, overall_logical)
-    XOC oc;
-    wchar_t *text;
-    int length;
-    XRectangle *ink_buf;
-    XRectangle *logical_buf;
-    int buf_size;
-    int *num_chars;
-    XRectangle *overall_ink;
-    XRectangle *overall_logical;
-#endif
-{
-    return _XomGenericTextPerCharExtents(oc, XOMWideChar, (XPointer) text,
-					 length, ink_buf, logical_buf, buf_size,
-					 num_chars, overall_ink,
-					 overall_logical);
-}
diff --git a/xc/lib/X11/omXChar.c b/xc/lib/X11/omXChar.c
deleted file mode 100644
index 89c7f631f..000000000
--- a/xc/lib/X11/omXChar.c
+++ /dev/null
@@ -1,467 +0,0 @@
-/* $TOG: omXChar.c /main/8 1998/03/14 06:09:03 kaleb $ */
-/*
- * Copyright 1992, 1993 by TOSHIBA Corp.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of TOSHIBA not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. TOSHIBA make no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author: Katsuhisa Yano	TOSHIBA Corp.
- *			   	mopi@osa.ilab.toshiba.co.jp
- */
-/*
- * Copyright 1995 by FUJITSU LIMITED
- * This is source code modified by FUJITSU LIMITED under the Joint
- * Development Agreement for the CDE/Motif PST.
- *
- * Modifier: Takanori Tateno   FUJITSU LIMITED
- *
- */
-/*
- * Modifiers: Jeff Walls, Paul Anderson (HEWLETT-PACKARD)
- */
-
-#include "Xlibint.h"
-#include "XlcPublic.h"
-#include "XomGeneric.h"
-#include <stdio.h>
-
-/* for VW/UDC start */
-static Bool
-ismatch_scopes(fontdata,value, is_shift)
-    FontData      fontdata;
-    unsigned long *value;
-    Bool	  is_shift;
-{
-    register int side, scopes_num = fontdata->scopes_num;
-    FontScope scopes = fontdata->scopes;
-    if (!scopes_num)
-        return False;
-
-    if(fontdata->font == NULL)
-	return False;
-
-    side = fontdata->side;
-
-    for(;scopes_num--;scopes++)
-        if ((scopes->start <= (*value & 0x7f7f)) &&
-                        ((scopes->end) >= (*value & 0x7f7f))){
-	    if(is_shift == True) {
-                if(scopes->shift){
-                    if(scopes->shift_direction == '+'){
-                        *value += scopes->shift ;
-                    } else if( scopes->shift_direction == '-'){
-                        *value -= scopes->shift ;
-                    }
-                }
-            }
-            return True;
-        }
-
-    return False;
-}
-
-static int
-check_vertical_fonttype(name)
-    char	*name;
-{
-    char	*ptr;
-    int		type = 0;
-
-    if(name == (char *)NULL || (int) strlen(name) <= 0)
-	return False;
-
-    /* Obtains the pointer of CHARSET_ENCODING_FIELD. */
-    if((ptr = strchr(name, '-')) == (char *) NULL)
-	return False;
-    ptr++;
-
-    /* Obtains the pointer of vertical_map font type. */
-    if((ptr = strchr(ptr, '.')) == (char *) NULL)
-	return False;
-    ptr++;
-
-    switch(*ptr) {
-      case '1':
-	type = 1;	break;
-      case '2':
-	type = 2;	break;
-      case '3':
-	type = 3;	break;
-    }
-    return type;
-}
-
-/*
-*/
-#define VMAP          0
-#define VROTATE       1
-#define FONTSCOPE     2
-
-FontData
-_XomGetFontDataFromFontSet(fs,str,len,len_ret,is2b,type)
-FontSet fs;
-unsigned char *str;
-int len;
-int *len_ret;
-int is2b;     
-int type;          /* VMAP , VROTATE , else */
-{
-    unsigned long value;
-    int num,i,hit,csize;
-    FontData fontdata;
-    unsigned char *c;
-    int vfont_type;
-    
-    c = str;
-    hit = -1;
-    if(type == VMAP){
-	fontdata = fs->vmap;
-	num      = fs->vmap_num;
-    } else if(type == VROTATE){
-        fontdata = (FontData)fs->vrotate;
-	num      = fs->vrotate_num;
-    } else {
-	if(fs->font_data_count <= 0 || fs->font_data == (FontData)NULL) {
-	    fontdata = fs->substitute;
-	    num      = fs->substitute_num;
-	}else {
-            fontdata = fs->font_data;
-	    num      = fs->font_data_count;
-	}
-	/* CDExc20229 fix */
-	if(fontdata == NULL || num == 0){
-	    return(NULL);
-	}
-    }
-
-
-    if(is2b){
-        csize = 2;
-    } else {
-        csize = 1;
-    }
-
-    for(;len;len--){
-        if(is2b){
-            value = (((unsigned long)*c) << 8)|(unsigned long)*(c + 1);
-        } else {
-            value = (unsigned long)*c;
-        }
-    
-       /* ### NOTE: This routine DOES NOT WORK!
-	* ###       We can work around the problem in the calling routine,
-	* ###       but we really need to understand this better.  As it
-	* ###       stands, the algorithm ALWAYS returns "fontdata[0]"
-	* ###       for non-VW text!  This is clearly wrong.  In fact,
-	* ###       given the new parse_font[name|data]() algorithms,
-	* ###       we may not even need this routine to do anything
-	* ###       for non-VW text (since font_set->font always contains
-	* ###       the best font for this fontset).  -- jjw/pma (HP)
-	*/
-        for (i=0;i<num;i++) {
-	    if(type == VROTATE) {
-		if(fontdata[i].font) {
-		    /* If the num_cr equal zero, all character is rotated. */
-		    if(fontdata[i].scopes_num == 0) {
-			break;
-		    } else {
-			/* The vertical rotate glyph is not have code shift. */
-			if (ismatch_scopes(&(fontdata[i]),&value,False)) {
-			    break;
-			}
-		    }
-		}
-	    } else if(type == VMAP) {
-		if(fontdata[i].font) {
-		    vfont_type = check_vertical_fonttype(fontdata[i].name);
-		    if(vfont_type == 0 || vfont_type == 1) {
-			break;
-		    } else if(vfont_type == 2 || vfont_type == 3) {
-			if(fontdata[i].scopes_num <= 0)
-			    break;
-
-			if (ismatch_scopes(&(fontdata[i]),&value,True)) {
-			    break;
-			}
-		    }
-		}
-	    } else { /* FONTSCOPE */
-		if(fontdata[i].font) {
-		    if(fontdata[i].scopes_num <= 0)
-                        break;
-		    if (ismatch_scopes(&(fontdata[i]),&value,True)){
-		        break;
-                    }
-		}
-	    }
-        }
-        if((hit != -1) && (i != hit)){
-            break;
-        }
-        if(i == num){
-            if( type == VROTATE || type == VMAP){
-		/* Change 1996.01.23 start */
-		if(fs->font_data_count <= 0 ||
-		   fs->font_data == (FontData)NULL)
-		    fontdata = fs->substitute;
-		else
-		    fontdata = fs->font_data;
-		/* Change 1996.01.23 end */
-	    }
-	    hit = 0;
-            c += csize;
-	    break;
-        }
-        if( hit == -1 ) hit = i;
-        if(is2b){
-            *c = (unsigned char)(value >> 8);
-            *(c + 1) = (unsigned char)(value);
-        } else {
-            *c = (unsigned char)value;
-        }
-        c += csize;
-    }
-    *len_ret = (c - str);
-    return(&(fontdata[hit]));
-}
-/* for VW/UDC end   */
-
-static FontSet
-_XomGetFontSetFromCharSet(oc, charset)
-    XOC oc;
-    XlcCharSet charset;
-{
-    register FontSet font_set = XOC_GENERIC(oc)->font_set;
-    register int num = XOC_GENERIC(oc)->font_set_num;
-    XlcCharSet *charset_list;
-    int charset_count;
-
-    for ( ; num-- > 0; font_set++) {
-	charset_count = font_set->charset_count;
-	charset_list = font_set->charset_list;
-	for ( ; charset_count-- > 0; charset_list++)
-	    if (*charset_list == charset)
-		return font_set;
-    }
-
-    return (FontSet) NULL;
-}
-
-#ifdef MUSTCOPY
-static void
-cs_to_xchar2b(from, to, length)
-    register char *from;
-    register XChar2b *to;
-    register length;
-{
-    while (length-- > 0) {
-	to->byte1 = *from++;
-	to->byte2 = *from++;
-	to++;
-    }
-}
-
-static void
-cs_to_xchar2b_gl(from, to, length)
-    register char *from;
-    register XChar2b *to;
-    register length;
-{
-    while (length-- > 0) {
-	to->byte1 = *from++ & 0x7f;
-	to->byte2 = *from++ & 0x7f;
-	to++;
-    }
-}
-
-static void
-cs_to_xchar2b_gr(from, to, length)
-    register char *from;
-    register XChar2b *to;
-    register length;
-{
-    while (length-- > 0) {
-	to->byte1 = *from++ | 0x80;
-	to->byte2 = *from++ | 0x80;
-	to++;
-    }
-}
-#endif
-
-static void
-shift_to_gl(text, length)
-    register char *text;
-    register int length;
-{
-    while (length-- > 0)
-	*text++ &= 0x7f;
-}
-
-static void
-shift_to_gr(text, length)
-    register char *text;
-    register int length;
-{
-    while (length-- > 0)
-	*text++ |= 0x80;
-}
-
-static Bool
-load_font(oc, font_set)
-    XOC oc;
-    FontSet font_set;
-{
-    font_set->font = XLoadQueryFont(oc->core.om->core.display,
-			oc->core.font_info.font_name_list[font_set->id]);
-    if (font_set->font == NULL)
-	return False;
-    
-    oc->core.font_info.font_struct_list[font_set->id] = font_set->font;
-    XFreeFontInfo(NULL, font_set->info, 1);
-    font_set->info = NULL;
-
-    if (font_set->font->min_byte1 || font_set->font->max_byte1)
-	font_set->is_xchar2b = True;
-    else
-	font_set->is_xchar2b = False;
-
-    return True;
-}
-
-int
-_XomConvert(oc, conv, from, from_left, to, to_left, args, num_args)
-    XOC oc;
-    XlcConv conv;
-    XPointer *from;
-    int *from_left;
-    XPointer *to;
-    int *to_left;
-    XPointer *args;
-    int num_args;
-{
-    XPointer cs, lc_args[1];
-    XlcCharSet charset;
-    int length, cs_left, ret;
-    FontSet font_set;
-#ifdef MUSTCOPY
-    XChar2b *xchar2b;
-    char *buf, buf_local[BUFSIZ];
-#endif
-    
-    cs = *to;
-    cs_left = *to_left;
-    lc_args[0] = (XPointer) &charset;
-
-    ret = _XlcConvert(conv, from, from_left, &cs, &cs_left, lc_args, 1);
-    if (ret < 0)
-	return -1;
-
-    font_set = _XomGetFontSetFromCharSet(oc, charset);
-    if (font_set == NULL)
-	return -1;
-
-    if (font_set->font == NULL && load_font(oc, font_set) == False)
-	return -1;
-
-    length = *to_left - cs_left;
-
-#ifdef MUSTCOPY
-    if (font_set->is_xchar2b) {
-	buf = (length > BUFSIZ) ? Xmalloc(length) : buf_local;
-	if (buf == NULL)
-	    return -1;
-	memcpy(buf, (char *) *to, length);
-
-	xchar2b = (XChar2b *) *to;
-	length >>= 1;
-
-	if (font_set->side == charset->side)
-	    cs_to_xchar2b(buf, xchar2b, length);
-	else if (font_set->side == XlcGL)
-	    cs_to_xchar2b_gl(buf, xchar2b, length);
-	else if (font_set->side == XlcGR)
-	    cs_to_xchar2b_gr(buf, xchar2b, length);
-	else
-	    cs_to_xchar2b(buf, xchar2b, length);
-	
-	if (buf != buf_local)
-	    Xfree(buf);
-
-	*to = (XPointer) (xchar2b + length);
-	*to_left -= length;
-    } else
-#endif
-    {
-	if (font_set->side != charset->side) {
-	    if (font_set->side == XlcGL)
-		shift_to_gl(*to, length);
-	    else if (font_set->side == XlcGR)
-		shift_to_gr(*to, length);
-	}
-
-	if (font_set->is_xchar2b)
-	    length >>= 1;
-	*to = cs;
-	*to_left -= length;
-    }
-
-    *((XFontStruct **) args[0]) = font_set->font;
-    *((Bool *) args[1]) = font_set->is_xchar2b;
-    if(num_args >= 3){
-        *((FontSet *) args[2]) = font_set;
-    }
-
-    return ret;
-}
-
-XlcConv
-_XomInitConverter(oc, type)
-    XOC oc;
-    XOMTextType type;
-{
-    XOCGenericPart *gen = XOC_GENERIC(oc);
-    XlcConv conv;
-    char *conv_type;
-    XLCd lcd;
-
-    if (type == XOMWideChar) {
-	conv = gen->wcs_to_cs;
-	conv_type = XlcNWideChar;
-    } else {
-	conv = gen->mbs_to_cs;
-	conv_type = XlcNMultiByte;
-    }
-
-    if (conv) {
-	_XlcResetConverter(conv);
-	return conv;
-    }
-
-    lcd = oc->core.om->core.lcd;
-
-    conv = _XlcOpenConverter(lcd, conv_type, lcd, XlcNCharSet);
-    if (conv == (XlcConv) NULL)
-	return (XlcConv) NULL;
-
-    if (type == XOMWideChar)
-	gen->wcs_to_cs = conv;
-    else
-	gen->mbs_to_cs = conv;
-
-    return conv;
-}
diff --git a/xc/lib/X11/os2Stubs.c b/xc/lib/X11/os2Stubs.c
deleted file mode 100644
index 493727e60..000000000
--- a/xc/lib/X11/os2Stubs.c
+++ /dev/null
@@ -1,425 +0,0 @@
-/*
- * (c) Copyright 1996 by Sebastien Marineau and Holger Veit
- *			<marineau@genie.uottawa.ca>
- *                      <Holger.Veit@gmd.de>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a 
- * copy of this software and associated documentation files (the "Software"), 
- * to deal in the Software without restriction, including without limitation 
- * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
- * and/or sell copies of the Software, and to permit persons to whom the 
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL 
- * HOLGER VEIT  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF 
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
- * SOFTWARE.
- * 
- * Except as contained in this notice, the name of Sebastien Marineau or Holger Veit 
- * shall not be used in advertising or otherwise to promote the sale, use or other 
- * dealings in this Software without prior written authorization from Holger Veit or
- * Sebastien Marineau.
- *
- */
-
-/* $XFree86: xc/lib/X11/os2Stubs.c,v 3.0 1996/05/13 06:37:17 dawes Exp $ */
-
-/* A few OS/2 functions needed in the X11 lib. Mainly, the file path redirection
- * functions and the "optimized" select() for the clients */
-
-#include <X11/Xpoll.h>
-#include <stdio.h>
-#include <sys/errno.h>
-#define INCL_DOSSEMAPHORES
-#define INCL_DOSNPIPES
-#define INCL_DOSMISC
-#define INCL_DOSMODULEMGR
-#undef BOOL
-#undef BYTE
-#include <os2.h>
-#include <sys/select.h>
-#include <sys/time.h>
-
-char *__XOS2RedirRoot(char *fname)
-{
-    /* This adds a further redirection by allowing the ProjectRoot
-     * to be prepended by the content of the envvar X11ROOT.
-     * This is for the purpose to move the whole X11 stuff to a different
-     * disk drive.
-     * The feature was added despite various environment variables
-     * because not all file opens respect them.
-     */
-    static char redirname[300]; /* enough for long filenames */
-    char *root;
-
-    /* if name does not start with /, assume it is not root-based */
-    if (fname==0 || !(fname[0]=='/' || fname[0]=='\\'))
-	return fname;
-
-    root = (char*)getenv("X11ROOT");
-    if (root==0 || 
-	(fname[1]==':' && isalpha(fname[0])) ||
-        (strlen(fname)+strlen(root)+2) > 300)
-	return fname;
-    sprintf(redirname,"%s%s",root,fname);
-    return redirname;
-}
-
-char *__XOS2RedirRoot1(char *format, char *arg1, char *arg2, char *arg3)
-{
-    /* this first constructs a name from a format and up to three
-     * components, then adds a path
-     */
-    char buf[300];
-    sprintf(buf,format,arg1,arg2,arg3);
-    return __XOS2RedirRoot(buf);
-}
-
-/* This below implements select() for the calls in this file. It has been */
-/* somewhat optimized for improved performance, but assumes a few */
-/* things so it cannot be used as a general select. If both pipes and     */
-/* sockets are present, this may call the emx select                          */
-
-
-HEV hPipeSem;
-HMODULE hmod_so32dll;
-static int (*os2_tcp_select)(int*,int,int,int,long);
-ULONG os2_get_sys_millis();
-extern int _files[];
-
-#define MAX_TCP 256
-/* These lifted from sys/emx.h. Change if that changes there! */
-#define F_SOCKET 0x10000000
-#define F_PIPE 0x20000000
-
-struct select_data
-{
-   fd_set read_copy;
-   fd_set write_copy;
-   BOOL have_read;
-   BOOL have_write;
-   int tcp_select_mask[MAX_TCP];
-   int tcp_emx_handles[MAX_TCP];
-   int tcp_select_copy[MAX_TCP];
-   int socket_nread;
-   int socket_nwrite;
-   int socket_ntotal;
-   int pipe_ntotal;
-   int pipe_have_write;
-   int max_fds;
-};
-
-int os2ClientSelect(int nfds, fd_set *readfds, fd_set *writefds,
-        fd_set *exceptfds, struct timeval *timeout)
-{
-static BOOL FirstTime=TRUE;
-static haveTCPIP=TRUE;
-ULONG timeout_ms;
-ULONG postCount, start_millis,now_millis;
-char faildata[16];
-struct select_data sd;
-BOOL any_ready;
-int np,ns, i,ready_handles,n;
-APIRET rc;
-
-sd.have_read=FALSE; sd.have_write=FALSE; 
-sd.socket_nread=0; sd.socket_nwrite=0; sd.socket_ntotal=0;
-sd.max_fds=31; ready_handles=0; any_ready=FALSE;
-sd.pipe_ntotal=0; sd.pipe_have_write=FALSE;
-
-if(FirstTime){
-   /* First load the so32dll.dll module and get a pointer to the SELECT fn */
-
-   if((rc=DosLoadModule(faildata,sizeof(faildata),"SO32DLL",&hmod_so32dll))!=0){
-        fprintf(stderr, "Could not load module so32dll.dll, rc = %d. Error note %s\n",rc,faildata);
-        haveTCPIP=FALSE;
-        }
-   if((rc = DosQueryProcAddr(hmod_so32dll, 0, "SELECT", (PPFN)&os2_tcp_select))!=0){
-        fprintf(stderr, "Could not query address of SELECT, rc = %d.\n",rc);
-        haveTCPIP=FALSE;
-        }
-   /* Call these a first time to set the semaphore */
-    rc = DosCreateEventSem(NULL, &hPipeSem, DC_SEM_SHARED, FALSE);
-    if(rc) { 
-             fprintf(stderr, "Could not create event semaphore, rc=%d\n",rc);
-             return(-1);
-             }
-    rc = DosResetEventSem(hPipeSem, &postCount);
-    FirstTime = FALSE;
-}
-
-/* Set up the time delay structs */
-
-    if(timeout!=NULL) {
-	timeout_ms=timeout->tv_sec*1000+timeout->tv_usec/1000;
-	}
-    else { timeout_ms=1000000; }  /* This should be large enough... */
-    if(timeout_ms>0) start_millis=os2_get_sys_millis();
-
-/* Copy the masks */
-    {FD_ZERO(&sd.read_copy);}
-    {FD_ZERO(&sd.write_copy);}
-    if(readfds!=NULL){ XFD_COPYSET(readfds,&sd.read_copy); sd.have_read=TRUE;}
-    if(writefds!=NULL) {XFD_COPYSET(writefds,&sd.write_copy);sd.have_write=TRUE;}
-
-/* And zero the original masks */
-    if(sd.have_read){ FD_ZERO(readfds);}
-    if(sd.have_write) {FD_ZERO(writefds);}
-    if(exceptfds != NULL) {FD_ZERO(exceptfds);}
-
-/* Now we parse the fd_sets passed to select and separate pipe/sockets */
-        n = os2_parse_select(&sd,nfds);
-        if(n == -1) {
-           errno = EBADF;
-           return (-1);
-           }
-
-/* Now we have three cases: either we have sockets, pipes, or both */
-/* We handle all three cases differently to optimize things */
-
-/* Case 1: only pipes! */
-        if((sd.pipe_ntotal >0) && (!sd.socket_ntotal)){
-            np = os2_check_pipes(&sd,readfds,writefds);
-            if(np > 0){
-               return (np);
-               }
-            else if (np == -1) { return(-1); }
-            while(!any_ready){
-                 rc = DosWaitEventSem(hPipeSem, timeout_ms);
-                 if(rc == 640)  {
-                     return(0);
-                     }
-                 if((rc != 0) && (rc != 95)) {errno= EBADF; return(-1);}
-                 np = os2_check_pipes(&sd,readfds,writefds);
-                 if (np > 0){
-                    return(np);
-                    }
-                 else if (np < 0){ return(-1); }
-                 }
-          }
-
-/* Case 2: only sockets. Just let the os/2 tcp select do the work */
-        if((sd.socket_ntotal > 0) && (!sd.pipe_ntotal)){
-                ns = os2_check_sockets(&sd, readfds, writefds, timeout_ms);
-                return (ns);
-                }
-
-/* Case 3: combination of both */
-        if((sd.socket_ntotal > 0) && (sd.pipe_ntotal)){
-           np = os2_check_pipes(&sd,readfds,writefds);
-              if(np > 0){
-                 any_ready=TRUE;
-                 ready_handles += np;
-                 }
-              else if (np == -1) { return(-1); }
-
-           ns = os2_check_sockets(&sd,readfds,writefds, 0);
-           if(ns>0){
-               ready_handles+=ns;
-               any_ready = TRUE;
-               }
-           else if (ns == -1) {return(-1);}
-
-           while (!any_ready && timeout_ms){
-
-                rc = DosWaitEventSem(hPipeSem, 10L);
-                if(rc == 0){
-                        np = os2_check_pipes(&sd,readfds,writefds);
-                        if(np > 0){
-                        ready_handles+=np;
-                        any_ready = TRUE;
-                        }
-                        else if (np == -1) { 
-                                return(-1); }
-                      }
-
-                 ns = os2_check_sockets(&sd,readfds,writefds,exceptfds, 0);
-                 if(ns>0){
-                      ready_handles+=ns;
-                      any_ready = TRUE;
-                     }
-                 else if (ns == -1) {return(-1);}
-
-                  if (i%8 == 0) { 
-                    now_millis = os2_get_sys_millis();
-                    if((now_millis-start_millis) > timeout_ms) timeout_ms = 0;
-                    }
-                   i++;
-                  }
-        }
-
-return(ready_handles);
-}
-
-
-ULONG os2_get_sys_millis()
-{
-   APIRET rc;
-   ULONG milli;
-
-   rc = DosQuerySysInfo(14, 14, &milli, sizeof(milli));
-   if(rc) {
-        fprintf(stderr,"Bad return code querying the millisecond counter! rc=%d\n",rc);
-        return(0);
-        }
-   return(milli);
-}
-
-int os2_parse_select(sd,nfds)
-struct select_data *sd;
-int nfds;
-{
-   int i;
-   APIRET rc;
-/* First we determine up to which descriptor we need to check.              */
-/* No need to check up to 256 if we don't have to (and usually we dont...)*/
-/* Note: stuff here is hardcoded for fd_sets which are int[8] as in EMX!!!    */
-
-  if(nfds > sd->max_fds){
-     for(i=0;i<((FD_SETSIZE+31)/32);i++){
-        if(sd->read_copy.fds_bits[i] ||
-            sd->write_copy.fds_bits[i])
-                        sd->max_fds=(i*32) +32;
-        }
-     }
-   else { sd->max_fds = nfds; }
-/* Check if result is greater than specified in select() call */
-  if(sd->max_fds > nfds) sd->max_fds = nfds;
-
-  if (sd->have_read)
-    {
-      for (i = 0; i < sd->max_fds; ++i) {
-        if (FD_ISSET (i, &sd->read_copy)){
-         if(_files[i] & F_SOCKET)
-           {
-            sd->tcp_select_mask[sd->socket_ntotal]=_getsockhandle(i);
-            sd->tcp_emx_handles[sd->socket_ntotal]=i;
-            sd->socket_ntotal++; sd->socket_nread++;
-           }
-         else if (_files[i] & F_PIPE)
-          {
-            sd -> pipe_ntotal++;
-            rc = DosSetNPipeSem((HPIPE)i, (HSEM) hPipeSem, i);
-            if(rc) { fprintf(stderr,"Error SETNPIPE rc = %d\n",rc); return -1;}
-          }
-        }
-      }
-    }
-
-  if (sd->have_write)
-    {
-      for (i = 0; i < sd->max_fds; ++i) {
-        if (FD_ISSET (i, &sd->write_copy)){
-         if(_files[i] & F_SOCKET)
-         {
-            sd->tcp_select_mask[sd->socket_ntotal]=_getsockhandle(i);
-            sd->tcp_emx_handles[sd->socket_ntotal]=i;
-            sd->socket_ntotal++; sd->socket_nwrite++;
-         }
-         else if (_files[i] & F_PIPE)
-          {
-            sd -> pipe_ntotal++;
-            rc = DosSetNPipeSem((HPIPE)i, (HSEM) hPipeSem, i);
-            if(rc) { fprintf(stderr,"Error SETNPIPE rc = %d\n",rc); return -1;}
-            sd -> pipe_have_write=TRUE;
-          }
-        }
-      }
-    }
-
-
-return(sd->socket_ntotal);
-}
-
-
-int os2_check_sockets(sd,readfds,writefds)
-struct select_data *sd;
-fd_set *readfds,*writefds;
-{
-   int e,i;
-   int j,n;
-        memcpy(sd->tcp_select_copy,sd->tcp_select_mask,
-                sd->socket_ntotal*sizeof(int));
- 
-        e = os2_tcp_select(sd->tcp_select_copy,sd->socket_nread,
-                sd->socket_nwrite, 0, 0);
-
-        if(e == 0) return(e);
-/* We have something ready? */
-        if(e>0){
-            j = 0; n = 0;
-            for (i = 0; i < sd->socket_nread; ++i, ++j)
-                 if (sd->tcp_select_copy[j] != -1)
-                    {
-                    FD_SET (sd->tcp_emx_handles[j], readfds);
-                    n ++;
-                    }
-             for (i = 0; i < sd->socket_nwrite; ++i, ++j)
-                  if (sd->tcp_select_copy[j] != -1)
-                     {
-                     FD_SET (sd->tcp_emx_handles[j], writefds);
-                     n ++;
-                     }
-               errno = 0;
-               
-               return n;
-              }
-        if(e<0){
-           /*Error -- TODO */
-           fprintf(stderr,"Error in server select! e=%d\n",e);
-           errno = EBADF;
-           return (-1);
-           }
- }
-
-/* Check to see if anything is ready on pipes */
-
-int os2_check_pipes(sd,readfds,writefds)
-struct select_data *sd;
-fd_set *readfds,*writefds;
-{
-int i,e;
-ULONG ulPostCount;
-PIPESEMSTATE pipeSemState[128];
-APIRET rc;
-        e = 0;
-        rc = DosResetEventSem(hPipeSem,&ulPostCount);
-        rc = DosQueryNPipeSemState((HSEM) hPipeSem, (PPIPESEMSTATE)&pipeSemState, 
-                sizeof(pipeSemState));
-        if(rc) fprintf(stderr,"SELECT: rc from QueryNPipeSem: %d\n",rc);
-        i=0;
-        while (pipeSemState[i].fStatus != 0) {
-           /*fprintf(stderr,"SELECT: sem entry, stat=%d, flag=%d, key=%d,avail=%d\n",
-                pipeSemState[i].fStatus,pipeSemState[i].fFlag,pipeSemState[i].usKey,
-                pipeSemState[i].usAvail); */
-           if((pipeSemState[i].fStatus == 1) &&
-                    (FD_ISSET(pipeSemState[i].usKey,&sd->read_copy))){
-                FD_SET(pipeSemState[i].usKey,readfds);
-                e++;
-                }
-           else if((pipeSemState[i].fStatus == 2)  &&
-                    (FD_ISSET(pipeSemState[i].usKey,&sd->write_copy))){
-                FD_SET(pipeSemState[i].usKey,writefds);
-                e++;
-                }
-            else if( (pipeSemState[i].fStatus == 3) &&
-                ( (FD_ISSET(pipeSemState[i].usKey,&sd->read_copy)) ||
-                  (FD_ISSET(pipeSemState[i].usKey,&sd->write_copy)) )){
-                errno = EBADF;
-                return (-1);
-                }
-            i++;
-            } /* endwhile */
-        /*fprintf(stderr,"Done listing pipe sem entries, total %d entries, total ready entries %d\n",i,e);*/
-errno = 0;
-return(e);
-}
-
-
-
diff --git a/xc/lib/X11/poly.h b/xc/lib/X11/poly.h
deleted file mode 100644
index 660c689ad..000000000
--- a/xc/lib/X11/poly.h
+++ /dev/null
@@ -1,291 +0,0 @@
-/* $TOG: poly.h /main/5 1998/02/06 17:47:27 kaleb $ */
-/************************************************************************
-
-Copyright 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-************************************************************************/
-
-/*
- *     This file contains a few macros to help track
- *     the edge of a filled object.  The object is assumed
- *     to be filled in scanline order, and thus the
- *     algorithm used is an extension of Bresenham's line
- *     drawing algorithm which assumes that y is always the
- *     major axis.
- *     Since these pieces of code are the same for any filled shape,
- *     it is more convenient to gather the library in one
- *     place, but since these pieces of code are also in
- *     the inner loops of output primitives, procedure call
- *     overhead is out of the question.
- *     See the author for a derivation if needed.
- */
-
-
-/*
- *  In scan converting polygons, we want to choose those pixels
- *  which are inside the polygon.  Thus, we add .5 to the starting
- *  x coordinate for both left and right edges.  Now we choose the
- *  first pixel which is inside the pgon for the left edge and the
- *  first pixel which is outside the pgon for the right edge.
- *  Draw the left pixel, but not the right.
- *
- *  How to add .5 to the starting x coordinate:
- *      If the edge is moving to the right, then subtract dy from the
- *  error term from the general form of the algorithm.
- *      If the edge is moving to the left, then add dy to the error term.
- *
- *  The reason for the difference between edges moving to the left
- *  and edges moving to the right is simple:  If an edge is moving
- *  to the right, then we want the algorithm to flip immediately.
- *  If it is moving to the left, then we don't want it to flip until
- *  we traverse an entire pixel.
- */
-#define BRESINITPGON(dy, x1, x2, xStart, d, m, m1, incr1, incr2) { \
-    int dx;      /* local storage */ \
-\
-    /* \
-     *  if the edge is horizontal, then it is ignored \
-     *  and assumed not to be processed.  Otherwise, do this stuff. \
-     */ \
-    if ((dy) != 0) { \
-        xStart = (x1); \
-        dx = (x2) - xStart; \
-        if (dx < 0) { \
-            m = dx / (dy); \
-            m1 = m - 1; \
-            incr1 = -2 * dx + 2 * (dy) * m1; \
-            incr2 = -2 * dx + 2 * (dy) * m; \
-            d = 2 * m * (dy) - 2 * dx - 2 * (dy); \
-        } else { \
-            m = dx / (dy); \
-            m1 = m + 1; \
-            incr1 = 2 * dx - 2 * (dy) * m1; \
-            incr2 = 2 * dx - 2 * (dy) * m; \
-            d = -2 * m * (dy) + 2 * dx; \
-        } \
-    } \
-}
-
-#define BRESINCRPGON(d, minval, m, m1, incr1, incr2) { \
-    if (m1 > 0) { \
-        if (d > 0) { \
-            minval += m1; \
-            d += incr1; \
-        } \
-        else { \
-            minval += m; \
-            d += incr2; \
-        } \
-    } else {\
-        if (d >= 0) { \
-            minval += m1; \
-            d += incr1; \
-        } \
-        else { \
-            minval += m; \
-            d += incr2; \
-        } \
-    } \
-}
-
-
-/*
- *     This structure contains all of the information needed
- *     to run the bresenham algorithm.
- *     The variables may be hardcoded into the declarations
- *     instead of using this structure to make use of
- *     register declarations.
- */
-typedef struct {
-    int minor_axis;	/* minor axis        */
-    int d;		/* decision variable */
-    int m, m1;		/* slope and slope+1 */
-    int incr1, incr2;	/* error increments */
-} BRESINFO;
-
-
-#define BRESINITPGONSTRUCT(dmaj, min1, min2, bres) \
-	BRESINITPGON(dmaj, min1, min2, bres.minor_axis, bres.d, \
-                     bres.m, bres.m1, bres.incr1, bres.incr2)
-
-#define BRESINCRPGONSTRUCT(bres) \
-        BRESINCRPGON(bres.d, bres.minor_axis, bres.m, bres.m1, bres.incr1, bres.incr2)
-
-
-
-/*
- *     These are the data structures needed to scan
- *     convert regions.  Two different scan conversion
- *     methods are available -- the even-odd method, and
- *     the winding number method.
- *     The even-odd rule states that a point is inside
- *     the polygon if a ray drawn from that point in any
- *     direction will pass through an odd number of
- *     path segments.
- *     By the winding number rule, a point is decided
- *     to be inside the polygon if a ray drawn from that
- *     point in any direction passes through a different
- *     number of clockwise and counter-clockwise path
- *     segments.
- *
- *     These data structures are adapted somewhat from
- *     the algorithm in (Foley/Van Dam) for scan converting
- *     polygons.
- *     The basic algorithm is to start at the top (smallest y)
- *     of the polygon, stepping down to the bottom of
- *     the polygon by incrementing the y coordinate.  We
- *     keep a list of edges which the current scanline crosses,
- *     sorted by x.  This list is called the Active Edge Table (AET)
- *     As we change the y-coordinate, we update each entry in 
- *     in the active edge table to reflect the edges new xcoord.
- *     This list must be sorted at each scanline in case
- *     two edges intersect.
- *     We also keep a data structure known as the Edge Table (ET),
- *     which keeps track of all the edges which the current
- *     scanline has not yet reached.  The ET is basically a
- *     list of ScanLineList structures containing a list of
- *     edges which are entered at a given scanline.  There is one
- *     ScanLineList per scanline at which an edge is entered.
- *     When we enter a new edge, we move it from the ET to the AET.
- *
- *     From the AET, we can implement the even-odd rule as in
- *     (Foley/Van Dam).
- *     The winding number rule is a little trickier.  We also
- *     keep the EdgeTableEntries in the AET linked by the
- *     nextWETE (winding EdgeTableEntry) link.  This allows
- *     the edges to be linked just as before for updating
- *     purposes, but only uses the edges linked by the nextWETE
- *     link as edges representing spans of the polygon to
- *     drawn (as with the even-odd rule).
- */
-
-/*
- * for the winding number rule
- */
-#define CLOCKWISE          1
-#define COUNTERCLOCKWISE  -1 
-
-typedef struct _EdgeTableEntry {
-     int ymax;             /* ycoord at which we exit this edge. */
-     BRESINFO bres;        /* Bresenham info to run the edge     */
-     struct _EdgeTableEntry *next;       /* next in the list     */
-     struct _EdgeTableEntry *back;       /* for insertion sort   */
-     struct _EdgeTableEntry *nextWETE;   /* for winding num rule */
-     int ClockWise;        /* flag for winding number rule       */
-} EdgeTableEntry;
-
-
-typedef struct _ScanLineList{
-     int scanline;              /* the scanline represented */
-     EdgeTableEntry *edgelist;  /* header node              */
-     struct _ScanLineList *next;  /* next in the list       */
-} ScanLineList;
-
-
-typedef struct {
-     int ymax;                 /* ymax for the polygon     */
-     int ymin;                 /* ymin for the polygon     */
-     ScanLineList scanlines;   /* header node              */
-} EdgeTable;
-
-
-/*
- * Here is a struct to help with storage allocation
- * so we can allocate a big chunk at a time, and then take
- * pieces from this heap when we need to.
- */
-#define SLLSPERBLOCK 25
-
-typedef struct _ScanLineListBlock {
-     ScanLineList SLLs[SLLSPERBLOCK];
-     struct _ScanLineListBlock *next;
-} ScanLineListBlock;
-
-
-
-/*
- *
- *     a few macros for the inner loops of the fill code where
- *     performance considerations don't allow a procedure call.
- *
- *     Evaluate the given edge at the given scanline.
- *     If the edge has expired, then we leave it and fix up
- *     the active edge table; otherwise, we increment the
- *     x value to be ready for the next scanline.
- *     The winding number rule is in effect, so we must notify
- *     the caller when the edge has been removed so he
- *     can reorder the Winding Active Edge Table.
- */
-#define EVALUATEEDGEWINDING(pAET, pPrevAET, y, fixWAET) { \
-   if (pAET->ymax == y) {          /* leaving this edge */ \
-      pPrevAET->next = pAET->next; \
-      pAET = pPrevAET->next; \
-      fixWAET = 1; \
-      if (pAET) \
-         pAET->back = pPrevAET; \
-   } \
-   else { \
-      BRESINCRPGONSTRUCT(pAET->bres); \
-      pPrevAET = pAET; \
-      pAET = pAET->next; \
-   } \
-}
-
-
-/*
- *     Evaluate the given edge at the given scanline.
- *     If the edge has expired, then we leave it and fix up
- *     the active edge table; otherwise, we increment the
- *     x value to be ready for the next scanline.
- *     The even-odd rule is in effect.
- */
-#define EVALUATEEDGEEVENODD(pAET, pPrevAET, y) { \
-   if (pAET->ymax == y) {          /* leaving this edge */ \
-      pPrevAET->next = pAET->next; \
-      pAET = pPrevAET->next; \
-      if (pAET) \
-         pAET->back = pPrevAET; \
-   } \
-   else { \
-      BRESINCRPGONSTRUCT(pAET->bres); \
-      pPrevAET = pAET; \
-      pAET = pAET->next; \
-   } \
-}
diff --git a/xc/lib/X11/region.h b/xc/lib/X11/region.h
deleted file mode 100644
index c1a7fd5be..000000000
--- a/xc/lib/X11/region.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/* $TOG: region.h /main/9 1998/02/06 17:50:30 kaleb $ */
-/************************************************************************
-
-Copyright 1987, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-************************************************************************/
-
-#ifndef _XREGION_H
-#define _XREGION_H
-
-typedef struct {
-    short x1, x2, y1, y2;
-} Box, BOX, BoxRec, *BoxPtr;
-
-typedef struct {
-    short x, y, width, height;
-}RECTANGLE, RectangleRec, *RectanglePtr;
-
-#define TRUE 1
-#define FALSE 0
-#define MAXSHORT 32767
-#define MINSHORT -MAXSHORT
-#ifndef MAX
-#define MAX(a,b) (((a) > (b)) ? (a) : (b))
-#endif
-#ifndef MIN
-#define MIN(a,b) (((a) < (b)) ? (a) : (b))
-#endif
-
-
-/* 
- *   clip region
- */
-
-typedef struct _XRegion {
-    long size;
-    long numRects;
-    BOX *rects;
-    BOX extents;
-} REGION;
-
-/* Xutil.h contains the declaration: 
- * typedef struct _XRegion *Region; 
- */   
-
-/*  1 if two BOXs overlap.
- *  0 if two BOXs do not overlap.
- *  Remember, x2 and y2 are not in the region 
- */
-#define EXTENTCHECK(r1, r2) \
-	((r1)->x2 > (r2)->x1 && \
-	 (r1)->x1 < (r2)->x2 && \
-	 (r1)->y2 > (r2)->y1 && \
-	 (r1)->y1 < (r2)->y2)
-
-/*
- *  update region extents
- */
-#define EXTENTS(r,idRect){\
-            if((r)->x1 < (idRect)->extents.x1)\
-              (idRect)->extents.x1 = (r)->x1;\
-            if((r)->y1 < (idRect)->extents.y1)\
-              (idRect)->extents.y1 = (r)->y1;\
-            if((r)->x2 > (idRect)->extents.x2)\
-              (idRect)->extents.x2 = (r)->x2;\
-            if((r)->y2 > (idRect)->extents.y2)\
-              (idRect)->extents.y2 = (r)->y2;\
-        }
-
-/*
- *   Check to see if there is enough memory in the present region.
- */
-#define MEMCHECK(reg, rect, firstrect){\
-        if ((reg)->numRects >= ((reg)->size - 1)){\
-          (firstrect) = (BOX *) Xrealloc \
-          ((char *)(firstrect), (unsigned) (2 * (sizeof(BOX)) * ((reg)->size)));\
-          if ((firstrect) == 0)\
-            return(0);\
-          (reg)->size *= 2;\
-          (rect) = &(firstrect)[(reg)->numRects];\
-         }\
-       }
-
-/*  this routine checks to see if the previous rectangle is the same
- *  or subsumes the new rectangle to add.
- */
-
-#define CHECK_PREVIOUS(Reg, R, Rx1, Ry1, Rx2, Ry2)\
-               (!(((Reg)->numRects > 0)&&\
-                  ((R-1)->y1 == (Ry1)) &&\
-                  ((R-1)->y2 == (Ry2)) &&\
-                  ((R-1)->x1 <= (Rx1)) &&\
-                  ((R-1)->x2 >= (Rx2))))
-
-/*  add a rectangle to the given Region */
-#define ADDRECT(reg, r, rx1, ry1, rx2, ry2){\
-    if (((rx1) < (rx2)) && ((ry1) < (ry2)) &&\
-        CHECK_PREVIOUS((reg), (r), (rx1), (ry1), (rx2), (ry2))){\
-              (r)->x1 = (rx1);\
-              (r)->y1 = (ry1);\
-              (r)->x2 = (rx2);\
-              (r)->y2 = (ry2);\
-              EXTENTS((r), (reg));\
-              (reg)->numRects++;\
-              (r)++;\
-            }\
-        }
-
-
-
-/*  add a rectangle to the given Region */
-#define ADDRECTNOX(reg, r, rx1, ry1, rx2, ry2){\
-            if ((rx1 < rx2) && (ry1 < ry2) &&\
-                CHECK_PREVIOUS((reg), (r), (rx1), (ry1), (rx2), (ry2))){\
-              (r)->x1 = (rx1);\
-              (r)->y1 = (ry1);\
-              (r)->x2 = (rx2);\
-              (r)->y2 = (ry2);\
-              (reg)->numRects++;\
-              (r)++;\
-            }\
-        }
-
-#define EMPTY_REGION(pReg) pReg->numRects = 0
-
-#define REGION_NOT_EMPTY(pReg) pReg->numRects
-
-#define INBOX(r, x, y) \
-      ( ( ((r).x2 >  x)) && \
-        ( ((r).x1 <= x)) && \
-        ( ((r).y2 >  y)) && \
-        ( ((r).y1 <= y)) )
-
-/*
- * number of points to buffer before sending them off
- * to scanlines() :  Must be an even number
- */
-#define NUMPTSTOBUFFER 200
-
-/*
- * used to allocate buffers for points and link
- * the buffers together
- */
-typedef struct _POINTBLOCK {
-    XPoint pts[NUMPTSTOBUFFER];
-    struct _POINTBLOCK *next;
-} POINTBLOCK;
-
-#endif
diff --git a/xc/lib/X11/udcInf.c b/xc/lib/X11/udcInf.c
deleted file mode 100644
index 2f3c23c1b..000000000
--- a/xc/lib/X11/udcInf.c
+++ /dev/null
@@ -1,710 +0,0 @@
-/* $TOG: udcInf.c /main/4 1998/02/06 17:55:37 kaleb $ */
-/*
-Copyright 1996, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-*/
-/*
- * Copyright 1995 by FUJITSU LIMITED
- * This is source code modified by FUJITSU LIMITED under the Joint
- * Development Agreement for the CDE/Motif PST.
- *
- * Modifier: Takanori Tateno   FUJITSU LIMITED
- *
- */
-
-/* $XFree86: xc/lib/X11/udcInf.c,v 1.4 1998/10/03 08:41:45 dawes Exp $ */
-
-#include <stdio.h>
-#include <locale.h>
-#include <Xlib.h>
-#include <Xlibint.h>
-#include <Xlcint.h>
-#include <XlcPubI.h>
-#include <XlcGeneric.h>
-#include <XomGeneric.h>
-
-/*
-   external symbols 
-*/
-extern FontData read_EncodingInfo();
-extern int _xudc_get_codeset();
-
-extern int _xudc_utyderror ;
-extern int _xudc_utyerror ;
-
-extern unsigned long _xudc_utyerrno ;
-
-#define _XUDC_ERROR -1
-
-
-/*
-    UDC structure define
-*/
-typedef struct __XUDCGlyphRegion {
-    unsigned long  start;
-    unsigned long  end;
-} _XUDCGlyphRegion ;
-
-/*
- *  "code" no jyoui "i" byte me wo "unsigned char" toshite kaesu.
- */
-static unsigned char getbyte(code,i)
-unsigned long code;
-int	      i;
-{
-    unsigned long byteL;
-    unsigned char byte;
-    byteL = code  >> (8*(3-i));
-    byte = (unsigned char)(0x000000ff & byteL);
-    return(byte);
-}
-/*
-    get codeset which described by charset_str and locale.
-    for examples ...
-    locale          :  ja_JP
-    charset_str     :  JISX0208.1983-0
-*/
-
-_xudc_get_codeset(locale,charset_str,codeset,num_codeset)
-char *locale;
-char *charset_str;
-int  **codeset;
-int  *num_codeset;
-{
-    XLCdRec lcdrec;
-    XLCd     lcd;
-    XLCdPublicRec xlcdp;
-    XPointer rdb;
-    int num = 0,count,num_ret=0,i,*ret;
-    char **value,buf[128],*ptr;
-
-
-    _xudc_utyderror = 0;
-    _xudc_utyerror = 0;
-
-    if((locale == NULL) || (charset_str == NULL)){
-        _xudc_utyerror = 5;
-        _xudc_utyderror = 1;
-	_xudc_utyerrno = 0x04 ;
-        return(_XUDC_ERROR);
-    }
-    if(codeset == NULL){
-        _xudc_utyerror = 5;
-        _xudc_utyderror = 2;
-	_xudc_utyerrno = 0x04 ;
-        return(_XUDC_ERROR);
-    }
-
-    /*    create XLCd     */
-    xlcdp.pub.siname = locale;
-    lcdrec.core = (XLCdCore)&xlcdp;
-    lcd = &lcdrec;
-        /* create X RDB (X NLS DB) */
-    rdb = _XlcCreateLocaleDataBase(lcd);
-    if(rdb == NULL){
-        _xudc_utyerror = 1;
-	_xudc_utyerrno = 0x15 ;
-        return(_XUDC_ERROR);
-    }
-
-    for(num=0;;num++){
-        /* XLC_FONTSET */
-        sprintf(buf, "fs%d.font.primary", num);
-        _XlcGetLocaleDataBase(lcd, "XLC_FONTSET", buf, &value, &count);
-        if(count < 1){
-            break ;
-        }
-        for(i=0;i<count;i++){
-	    if (strlen(value[i]) >= sizeof(buf))
-		continue;
-            strcpy(buf,value[i]);
-            ptr = (char *)strchr(buf,(int)':');
-            *ptr = 0;
-            if(!_XlcCompareISOLatin1(charset_str,buf)){
-                num_ret += 1;
-                if(num_ret == 1){
-                    ret = (int *)Xmalloc(sizeof(int));
-                } else {
-		    int *prev_ret = ret;
-
-		    ret = 
-                        (int *)Xrealloc(ret,num_ret*sizeof(int)); 
-		    if (ret == NULL){
-			Xfree(prev_ret);
-		    }
-                }
-                if(ret == NULL){
-		    _xudc_utyerrno = 0x03 ;
-                    return(_XUDC_ERROR);
-                }
-		ret[num_ret-1]=num;
-                break ;
-            }
-        }
-    }
-    if(num_ret == 0){
-        *num_codeset = 0;
-        *codeset = NULL;
-        return (0xff);
-    }
-
-    *num_codeset = num_ret;
-    *codeset = ret;
-    return 0;
-}
-
-static Bool gi_to_vgi(gi,vgi,scope)
-unsigned long 	gi,*vgi;
-FontScope	scope;
-{
-    if(scope->shift_direction == (unsigned long)'+'){
-        gi  -= scope->shift;
-    } else {
-        gi  += scope->shift;
-    }
-    if(gi >= scope->start && gi <= scope->end){
-	*vgi = gi;
-        return(True);
-    }
-    return(False);
-}
-
-static void shift_area(udc,scope)
-_XUDCGlyphRegion *udc;
-FontScope scope;
-{
-    if(scope->shift_direction == (unsigned long)'+'){
-        udc->start += scope->shift;
-        udc->end   += scope->shift;
-    } else {
-        udc->start -= scope->shift;
-        udc->end   -= scope->shift;
-    }
-}
-
-/*
-    get UDC area with glyph index.
-    for examples ...
-    locale          :  ja_JP
-    charset_str     :  JISX0208.1983-0
-*/
-_XUDCGetUDCGIArea(locale,codeset,charset_str,gr,num_gr)
-char *locale;
-int codeset;
-char *charset_str;
-_XUDCGlyphRegion  **gr;
-int  *num_gr;
-{
-    XLCdRec lcdrec;
-    XLCd     lcd;
-    XLCdPublicRec xlcdp;
-    XPointer rdb;
-    _XUDCGlyphRegion *udc;
-    int num = 0,count,num_ret=0;
-    int i,j,k;
-    char **value,buf[128],ptr;
-    FontData font_data;
-
-
-    _xudc_utyderror = 0;
-    _xudc_utyerror = 0;
-    _xudc_utyerrno = 0x00 ;
-
-    if((locale == NULL) || (charset_str == NULL)){
-        _xudc_utyerror = 5;
-        _xudc_utyderror = 1;
-	_xudc_utyerrno = 0x04;
-	_xudc_utyerrno |= (0x0b<<8) ;
-        return(_XUDC_ERROR);
-    }
-    if(gr == NULL){
-        _xudc_utyerror = 5;
-        _xudc_utyderror = 1;
-	_xudc_utyerrno = 0x04;
-	_xudc_utyerrno |= (0x0b<<8) ;
-        return(_XUDC_ERROR);
-    }
-    if(num_gr == NULL){
-        _xudc_utyerror = 5;
-        _xudc_utyderror = 2;
-	_xudc_utyerrno = 0x04;
-	_xudc_utyerrno |= (0x0b<<8) ;
-        return(_XUDC_ERROR);
-    }
-
-        /* create XLCd */
-    xlcdp.pub.siname = locale;
-    lcdrec.core = (XLCdCore)&xlcdp;
-    lcd = &lcdrec;
-        /* create X RDB (X NLS DB) */
-    rdb = _XlcCreateLocaleDataBase(lcd);
-    if(rdb == NULL){
-        _xudc_utyerror = 1;
-	_xudc_utyerrno = 0x15 ;
-	_xudc_utyerrno |= (0x0b<<8) ;
-        return(_XUDC_ERROR);
-    }
-    udc = NULL;
-
-        /* XLC_FONTSET */
-        sprintf(buf, "fs%d.charset.udc_area", codeset-1);
-        _XlcGetLocaleDataBase(lcd, "XLC_FONTSET", buf, &value, &count);
-        if(count > 0){
-            udc = (_XUDCGlyphRegion *)Xmalloc(count * sizeof(_XUDCGlyphRegion));
-            if(udc == NULL){
-		_xudc_utyerrno = 0x03 ;
-		_xudc_utyerrno |= (0x0b<<8) ;
-		return(_XUDC_ERROR);
-            }
-            for(i=0;i<count;i++){
-                sscanf(value[i],"\\x%lx,\\x%lx", &(udc[i].start), &(udc[i].end));
-            }
-        }
-
-    *num_gr = count;
-
-        sprintf(buf, "fs%d.font.primary", codeset-1);
-        _XlcGetLocaleDataBase(lcd, "XLC_FONTSET", buf, &value, &count);
-        if(count > 0){
-	    font_data = read_EncodingInfo(count,value);
-            for(i=0;i<count;i++){
-                if( !_XlcCompareISOLatin1(font_data[i].name,charset_str)){
-                    for(j=0;j<(*num_gr);j++){
-                    	for(k=0;k<font_data[i].scopes_num;k++){
-			    if(udc[j].start == font_data[i].scopes[k].start
-                                  && font_data[i].scopes[k].shift){
-                                shift_area(&udc[j],&(font_data[i].scopes[k]));
-                            }
-			}
-		    }
-		}
-	    }
-        }
-
-    *gr = udc;
-    return 0;
-}
-
-/* 
- *      Code convert wo tomonau UDC area no kakutoku
- *      GetUDCCPArea() / glyph_to_code()           
- *
- */
-
-static int
-_xudc_gi_to_vgi(lcd,locale,charset_str,codeset,gi,vgi,charsetname,size)
-XLCd 	lcd;
-char 	*locale;
-char 	*charset_str;
-int 	codeset;
-unsigned long 	gi;
-unsigned long 	*vgi;
-char    *charsetname;
-int	size;
-{
-    _XUDCGlyphRegion *udc;
-    int num = 0,count,num_ret=0;
-    int i,j,k;
-    char **value,buf[128],ptr;
-    FontData font_data;
-
-
-    sprintf(buf, "fs%d.charset.name", codeset-1);
-    _XlcGetLocaleDataBase(lcd, "XLC_FONTSET", buf, &value, &count);
-    if(count > 0){
-        strcpy(charsetname,value[0]);
-    }
-    if (count >= size)
-	return False;
-    sprintf(buf, "fs%d.font.primary", codeset-1);
-    _XlcGetLocaleDataBase(lcd, "XLC_FONTSET", buf, &value, &count);
-    if(count > 0){
-	font_data = read_EncodingInfo(count,value);
-        for(i=0;i<count;i++){
-            if( !_XlcCompareISOLatin1(font_data[i].name,charset_str)){
-                for(k=0;k<font_data[i].scopes_num;k++){
-	            if( gi_to_vgi(gi,vgi,&(font_data[i].scopes[k])) == True){
-			return(True);
-                    }
-	        }
-	    }
-        }
-    }
-/*
-    free_fontdata(font_data);
-*/
-    *vgi = gi;
-    return(True);
-}
-
-Bool non_standard(lcd,charset)
-XLCd 	lcd;
-XlcCharSet 	charset;
-{
-    char buf[256];
-    int count,i;
-    char **value;
-    if(charset->ct_sequence == NULL){
-            return(False);
-    }
-    for(i=0;;i++){
-	sprintf(buf, "csd%d.charset_name", i);
-	_XlcGetLocaleDataBase(lcd, "XLC_CHARSET_DEFINE", buf, &value, &count);
-	if(count > 0){
-	    if(!_XlcNCompareISOLatin1(value[0], 
-			charset->name,strlen(value[0])) ){
-		return(True);
-	    }
-	} else {
-            return(False);
-	}
-    }
-}
-
-static Bool
-make_none_standard(from,charset,src,size)
-char *from;
-XlcCharSet 	charset;
-char *src;
-int size;
-{
-    int name_len,seq_len,i;
-    name_len = 2 + strlen(charset->encoding_name) + 1;
-    seq_len = strlen(charset->ct_sequence);
-    if (name_len + seq_len + strlen(src) >= size)
-	return False;
-    strcpy(from,charset->ct_sequence);
-    from[seq_len]    = name_len / 128 + 128;
-    from[seq_len+1]  = name_len % 128 + 128;
-    strcpy(&from[seq_len + 2],charset->encoding_name);
-    from[seq_len+name_len-1]  = 0x02;  /* STX */
-    strcpy(&from[seq_len + name_len],src);
-    return True;
-}
-int 
-_xudc_glyph_to_code(locale,charset_str,codeset,glyph_index,codepoint)
-char 	*locale;
-char 	*charset_str;
-int 	codeset;
-unsigned long 	glyph_index;
-unsigned long 	*codepoint;
-{
-    XLCd 	lcd;
-    unsigned char *from; int	from_left;
-    unsigned char *to  ; int 	to_left = 10;
-    unsigned char *dst;
-    unsigned char byte;
-    unsigned long from32[25];
-    unsigned long to32[25];
-    int	     i,j;
-    char charsetname[256],src[10];
-    XlcConv 	conv;
-    XlcCharSet 	charset;
-    XPointer args[2];
-
-    from = (unsigned char *)from32;
-    to   = (unsigned char *)to32;
-    dst  = (unsigned char *)to32;
-
-    memset(dst,0,25);
-	
-    lcd = (XLCd)_XlcGenericLoader(locale);
-
-    if (!_xudc_gi_to_vgi(lcd,locale,charset_str,codeset,
-	glyph_index,&glyph_index,charsetname,sizeof(charsetname)))
-	return(_XUDC_ERROR);
-
-    for(i=0,j=0;i<4;i++){
-	byte = getbyte(glyph_index,i);
-	if(byte){
-	    src[j] = byte;
-            j ++;
-	}
-    }
-    src[j] = 0;
-
-
-    /* get charset */
-/*
-    sprintf(tmp,"%s%s",charset_str,":GL");
-    charset_name = strdup(tmp);
-*/
-    charset = _XlcGetCharSet(charsetname);
-    if(charset == NULL){
-	_xudc_utyerrno = 0x16 ;
-	return(_XUDC_ERROR);
-    }
-    /* make ct */
-    if( non_standard(lcd,charset)) {
-        if (!make_none_standard(from,charset,src,sizeof(from32)))
-	    return(_XUDC_ERROR);
-    } else if(charset->ct_sequence){
-	if (strlen(charset->ct_sequence) + strlen(src) >= sizeof(from32))
-	    return(_XUDC_ERROR);
-        sprintf((char *)from,"%s%s",charset->ct_sequence,src);
-    } else {
-        sprintf((char *)from,"%s\0",src);
-    }
-    /* compound text -> multi byte */
-    conv = _XlcOpenConverter(lcd, XlcNCompoundText, lcd, XlcNMultiByte);
-    from_left = strlen((char *)from);
-    _XlcConvert(conv,(XPointer *)&from,&from_left,
-                     (XPointer *)&to,  &to_left,args,0);
-    _XlcCloseConverter(conv);
-    _XlcDestroyLC(lcd);
-
-    *codepoint = 0;
-    for(i=0;dst[i];i++){
-        *codepoint = ((*codepoint << 8) | dst[i]) ;
-    }
-    return(0);
-}
-
-typedef struct __XUDCCodeRegion {
-	unsigned long start,end;
-} _XUDCCodeRegion ;
-
-int
-_XUDCGetUDCCPArea(locale,codeset,charset_str,cr,num_cr)
-char 		*locale;
-int 		codeset;
-char 		*charset_str;
-_XUDCCodeRegion **cr;
-int  *num_cr;
-{
-    int i,num_gr,ret;
-    _XUDCGlyphRegion *gr;
-    _XUDCCodeRegion  *crr;
-
-    _xudc_utyerror  = 0;
-    _xudc_utyderror = 0;
-
-    if(cr == NULL){
-        _xudc_utyerror  = 5;
-        _xudc_utyderror = 1;
-	_xudc_utyerrno = 0x04 ;
-	_xudc_utyerrno |= (0x0a<<8) ;
-        return(_XUDC_ERROR);
-    }
-    if(num_cr == NULL){
-        _xudc_utyerror  = 5;
-        _xudc_utyderror = 2;
-	_xudc_utyerrno = 0x04 ;
-	_xudc_utyerrno |= (0x0a<<8) ;
-        return(_XUDC_ERROR);
-    }
-
-    ret = _XUDCGetUDCGIArea(locale,codeset,charset_str,&gr,&num_gr);
-    if(ret == _XUDC_ERROR){
-	_xudc_utyerrno &= 0xff ;
-	_xudc_utyerrno |= (0x0a<<8) ;
-	return(ret);
-    }
-
-    crr = (_XUDCCodeRegion *)Xmalloc(num_gr*sizeof(_XUDCCodeRegion));
-    if(crr == NULL){
-	Xfree(gr);
-	_xudc_utyerrno = 0x03 ;
-	_xudc_utyerrno |= (0x0a<<8) ;
-	return(_XUDC_ERROR);
-    }
-
-    for(i=0;i<num_gr;i++){
-	ret = _xudc_glyph_to_code(locale,charset_str,codeset,
-		gr[i].start, &(crr[i].start));
-	if(ret == _XUDC_ERROR){
-	    _xudc_utyerrno |= (0x0a<<8) ;
-	    Xfree(gr);
-	    Xfree(crr);
-	    return(ret);
-	}
-	ret = _xudc_glyph_to_code(locale,charset_str,codeset,
-		gr[i].end, &(crr[i].end));
-	if(ret == _XUDC_ERROR){
-	    _xudc_utyerrno |= (0x0a<<8) ;
-	    Xfree(gr);
-	    Xfree(crr);
-	    return(ret);
-	}
-    }
-    Xfree(gr);
-    *cr = crr;
-    *num_cr = num_gr;
-    return(0);
-}
-
-/*
- *    code_to_glyph()
- *    
- */
-typedef struct __XUDCGIInf {
-    char 		*charset_str;
-    unsigned long 	glyph_index;
-} _XUDCGIInf ;
-
-/*
- *
- *
- */
-static Bool vgi_to_gi(gi,vgi,scope)
-unsigned long 	*gi,vgi;
-FontScope	scope;
-{
-    if(vgi >= scope->start && vgi <= scope->end){
-        if(scope->shift_direction == (unsigned long)'+'){
-            *gi = vgi + scope->shift;
-        } else {
-            *gi = vgi - scope->shift;
-        }
-        return(True);
-    }
-    return(False);
-}
-/*
- *
- *
- */
-static Bool  
-_xudc_vgi_to_gi(lcd,locale,vglyph,glyph,charset,charsetname,size)
-XLCd    lcd;
-char    *locale;
-unsigned long   vglyph;
-unsigned long   *glyph;
-XlcCharSet	charset;
-char    *charsetname;
-int	size;
-{
-    int num = 0,count,num_ret=0;
-    int i,j,k;
-    char **value,buf[128],ptr;
-    FontData font_data;
-    CodeSet cs;
-
-    
-    for(i=0;;i++){
-        sprintf(buf, "fs%d.charset.name",i);
-        _XlcGetLocaleDataBase(lcd, "XLC_FONTSET", buf, &value, &count);
-        if(count > 0){
-            if(!_XlcNCompareISOLatin1(charset->name,value[0],
-			strlen(charset->name))){
-		break;
-	    }
-        } else {
-	    _xudc_utyerrno = 0x17 ;
-	    return(False);
-	}
-    }
-/*
-    sprintf(buf, "fs%d.charset.name", codeset-1);
-    _XlcGetLocaleDataBase(lcd, "XLC_FONTSET", buf, &value, &count);
-    if(count > 0){
-        strcpy(charsetname,value[0]);
-    }
-*/
-    sprintf(buf, "fs%d.font.primary", i);
-    _XlcGetLocaleDataBase(lcd, "XLC_FONTSET", buf, &value, &count);
-    if(count > 0){
-	font_data = read_EncodingInfo(count,value);
-        for(i=0;i<count;i++){
-            for(k=0;k<font_data[i].scopes_num;k++){
-	        if( vgi_to_gi(glyph,vglyph,&(font_data[i].scopes[k])) == True){
-		    if (strlen(font_data[i].name) >= size)
-			return(False);
-		    strcpy(charsetname,font_data[i].name);
-		    return(True);
-                }
-	    }
-        }
-    }
-    *glyph = vglyph;
-    return(True);
-}
-int
-_xudc_code_to_glyph(locale,codepoint,gi,num_gi)
-char 		*locale;
-unsigned long 	codepoint;
-_XUDCGIInf 	**gi;
-int 		*num_gi;
-{
-    XLCd        lcd;
-    unsigned char *from; int    from_left;
-    unsigned char *to  ; int    to_left = 10;
-    unsigned char *dst;
-    unsigned char byte;
-    unsigned int from32[25];
-    unsigned int to32[25];
-    int      i,j;
-    char charsetname[256],src[10];
-    XlcConv     conv;
-    XlcCharSet  charset;
-    XPointer args[2];
-    unsigned long glyph,vglyph;
-
-    from = (unsigned char *)from32;
-    to   = (unsigned char *)to32;
-    dst  = (unsigned char *)to32;
-    memset(dst,0,25);
-
-    lcd = (XLCd)_XlcGenericLoader(locale);
-
-    for(i=0,j=0;i<4;i++){
-	byte = getbyte(codepoint,i);
-	if(byte){
-	    src[j] = byte;
-            j ++;
-	}
-    }
-    src[j] = 0;
-    sprintf((char *)from,"%s\0",src);
-    /* multi byte -> vgi */
-    conv = _XlcOpenConverter(lcd, XlcNMultiByte, lcd, XlcNCharSet);
-    from_left = strlen((char *)from);
-    args[0] = (XPointer) &charset;
-    _XlcConvert(conv,(XPointer *)&from,&from_left,
-                     (XPointer *)&to,  &to_left,args,1);
-
-    /* vgi -> gi */
-    vglyph = 0;
-    for(i=0;dst[i];i++){
-        vglyph = ((vglyph << 8) | dst[i]) ;
-    }
-    if(_xudc_vgi_to_gi(lcd,locale,vglyph,&glyph,charset,charsetname,
-			sizeof(charsetname))==False){
-        _XlcCloseConverter(conv);
-	_XlcDestroyLC(lcd);
-        *num_gi = 0;
-	return(0);
-    }
-
-    _XlcCloseConverter(conv);
-    _XlcDestroyLC(lcd);
-
-    *gi = (_XUDCGIInf *)Xmalloc(sizeof(_XUDCGIInf));
-    (*gi)->charset_str = (char *)Xmalloc(strlen(charsetname)+1);
-    strcpy((*gi)->charset_str,charsetname);
-    (*gi)->glyph_index = glyph;
-    if(*gi == NULL){
-	_xudc_utyerrno = 0x03 ;
-        return(_XUDC_ERROR);
-    }
-    *num_gi = 1;
-    return(0);
-}
-
diff --git a/xc/lib/X11/utf8WMProps.c b/xc/lib/X11/utf8WMProps.c
deleted file mode 100644
index 0bccbdefd..000000000
--- a/xc/lib/X11/utf8WMProps.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/* $TOG: mbWMProps.c /main/6 1998/02/06 17:44:24 kaleb $ */
-/*
-
-Copyright 1991, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/*
- * Copyright 2000 by Bruno Haible
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation, and that the name of Bruno Haible not
- * be used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  Bruno Haible
- * makes no representations about the suitability of this software for
- * any purpose.  It is provided "as is" without express or implied
- * warranty.
- *
- * Bruno Haible DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL Bruno Haible BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
- * OR PERFORMANCE OF THIS SOFTWARE.
- */
-/* $XFree86: xc/lib/X11/utf8WMProps.c,v 1.1 2000/11/28 18:49:58 dawes Exp $ */
-
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-#include <X11/Xlocale.h>
-
-#if NeedFunctionPrototypes
-void Xutf8SetWMProperties (
-    Display *dpy,
-    Window w,
-    _Xconst char *windowName,
-    _Xconst char *iconName,
-    char **argv,
-    int argc,
-    XSizeHints *sizeHints,
-    XWMHints *wmHints,
-    XClassHint *classHints)
-#else
-void Xutf8SetWMProperties (dpy, w, windowName, iconName, argv, argc, sizeHints,
-			   wmHints, classHints)
-     Display *dpy;
-     Window w;			/* window to decorate */
-     _Xconst char *windowName;	/* name of application */
-     _Xconst char *iconName;	/* name string for icon */
-     char **argv;		/* command line */
-     int argc;			/* size of command line */
-     XSizeHints *sizeHints;	/* size hints for window in its normal state */
-     XWMHints *wmHints;		/* miscelaneous window manager hints */
-     XClassHint *classHints;	/* resource name and class */
-#endif
-{
-    XTextProperty wname, iname;
-    XTextProperty *wprop = NULL;
-    XTextProperty *iprop = NULL;
-
-    if (windowName &&
-	Xutf8TextListToTextProperty(dpy, (char**)&windowName, 1,
-				    XStdICCTextStyle, &wname) >= Success)
-	wprop = &wname;
-    if (iconName &&
-	Xutf8TextListToTextProperty(dpy, (char**)&iconName, 1,
-				    XStdICCTextStyle, &iname) >= Success)
-	iprop = &iname;
-    XSetWMProperties(dpy, w, wprop, iprop, argv, argc,
-		     sizeHints, wmHints, classHints);
-    if (wprop)
-	Xfree((char *)wname.value);
-    if (iprop)
-	Xfree((char *)iname.value);
-
-    /* Note: The WM_LOCALE_NAME property is set by XSetWMProperties. */
-}
diff --git a/xc/lib/X11/utf8Wrap.c b/xc/lib/X11/utf8Wrap.c
deleted file mode 100644
index a36829ff2..000000000
--- a/xc/lib/X11/utf8Wrap.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/* $TOG: mbWrap.c /main/7 1998/02/06 17:44:30 kaleb $ */
-/*
-
-Copyright 1991, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/*
- * Copyright 1991 by the Open Software Foundation
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Open Software Foundation 
- * not be used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  Open Software
- * Foundation makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without express or
- * implied warranty.
- *
- * OPEN SOFTWARE FOUNDATION DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL OPEN SOFTWARE FOUNDATIONN BE
- * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- * 
- *		 M. Collins		OSF  
- */				
-/*
- * Copyright 2000 by Bruno Haible
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation, and that the name of Bruno Haible not
- * be used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  Bruno Haible
- * makes no representations about the suitability of this software for
- * any purpose.  It is provided "as is" without express or implied
- * warranty.
- *
- * Bruno Haible DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL Bruno Haible BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
- * OR PERFORMANCE OF THIS SOFTWARE.
- */
-/* $XFree86: xc/lib/X11/utf8Wrap.c,v 1.1 2000/11/28 18:49:58 dawes Exp $ */
-
-#include "Xlibint.h"
-#include "Xlcint.h"
-
-#if NeedFunctionPrototypes
-void
-Xutf8DrawText(
-    Display            *dpy,
-    Drawable            d,
-    GC                  gc,
-    int                 x,
-    int                 y,
-    XmbTextItem        *text_items,
-    int                 nitems)
-#else
-void
-Xutf8DrawText(dpy, d, gc, x, y, text_items, nitems)
-    Display            *dpy;
-    Drawable            d;
-    GC                  gc;
-    int                 x, y;
-    XmbTextItem        *text_items;
-    int                 nitems;
-#endif
-{
-    register XFontSet fs;
-    register XmbTextItem *p = text_items;
-    register int i = nitems;
-    register int esc;
-
-    /* ignore leading items with no fontset */
-    while (i && !p->font_set) {
-	i--;
-	p++;
-    }
-
-    for (; --i >= 0; p++) {
-	if (p->font_set)
-	    fs = p->font_set;
-	x += p->delta;
-	esc = (*fs->methods->utf8_draw_string) (dpy, d, fs, gc, x, y,
-						p->chars, p->nchars);
-	if (!esc)
-	    esc = fs->methods->utf8_escapement (fs, p->chars, p->nchars);
-	x += esc;
-    }
-}
-
-#if NeedFunctionPrototypes
-void
-Xutf8DrawString(
-    Display            *dpy,
-    Drawable            d,
-    XFontSet            font_set,
-    GC                  gc,
-    int                 x,
-    int                 y,
-    _Xconst char       *text,
-    int                 text_len)
-#else
-void
-Xutf8DrawString(dpy, d, font_set, gc, x, y, text, text_len)
-    Display            *dpy;
-    Drawable            d;
-    XFontSet            font_set;
-    GC                  gc;
-    int                 x, y;
-    _Xconst char        *text;
-    int                 text_len;
-#endif
-{
-    (void)(*font_set->methods->utf8_draw_string) (dpy, d, font_set, gc, x, y,
-						  (char *)text, text_len);
-}
-
-
-#if NeedFunctionPrototypes
-void
-Xutf8DrawImageString(
-    Display            *dpy,
-    Drawable            d,
-    XFontSet            font_set,
-    GC                  gc,
-    int                 x,
-    int                 y,
-    _Xconst char       *text,
-    int                 text_len)
-#else
-void
-Xutf8DrawImageString(dpy, d, font_set, gc, x, y, text, text_len)
-    Display            *dpy;
-    Drawable            d;
-    XFontSet            font_set;
-    GC                  gc;
-    int                 x, y;
-    _Xconst char       *text;
-    int                 text_len;
-#endif
-{
-    (*font_set->methods->utf8_draw_image_string) (dpy, d, font_set, gc, x, y,
-						  (char *)text, text_len);
-}
-
-#if NeedFunctionPrototypes
-int 
-Xutf8TextEscapement(
-    XFontSet        font_set,
-    _Xconst char   *text,
-    int             text_len)
-#else
-int 
-Xutf8TextEscapement(font_set, text, text_len)
-    XFontSet        font_set;
-    _Xconst char   *text;
-    int             text_len;
-#endif
-{
-    return (*font_set->methods->utf8_escapement) (font_set,
-						  (char *)text, text_len);
-}
-
-#if NeedFunctionPrototypes
-int
-Xutf8TextExtents(
-    XFontSet        font_set,
-    _Xconst char   *text,
-    int             text_len,
-    XRectangle     *overall_ink_extents,
-    XRectangle     *overall_logical_extents)
-#else
-int
-Xutf8TextExtents(font_set, text, text_len,
-	       overall_ink_extents, overall_logical_extents)
-    XFontSet        font_set;
-    _Xconst char   *text;
-    int             text_len;
-    XRectangle     *overall_ink_extents;
-    XRectangle     *overall_logical_extents;
-#endif
-{
-    return (*font_set->methods->utf8_extents) (font_set,
-					       (char *)text, text_len,
-					       overall_ink_extents,
-					       overall_logical_extents);
-}
-
-#if NeedFunctionPrototypes
-Status
-Xutf8TextPerCharExtents(
-    XFontSet        font_set,
-    _Xconst char   *text,
-    int             text_len,
-    XRectangle     *ink_extents_buffer,
-    XRectangle     *logical_extents_buffer,
-    int             buffer_size,
-    int            *num_chars,
-    XRectangle     *max_ink_extents,
-    XRectangle     *max_logical_extents)
-#else
-Status
-Xutf8TextPerCharExtents(font_set, text, text_len,
-		      ink_extents_buffer, logical_extents_buffer,
-		      buffer_size, num_chars,
-		      max_ink_extents, max_logical_extents)
-    XFontSet        font_set;
-    _Xconst char   *text;
-    int             text_len;
-    XRectangle     *ink_extents_buffer;
-    XRectangle     *logical_extents_buffer;
-    int             buffer_size;
-    int            *num_chars;
-    XRectangle     *max_ink_extents;
-    XRectangle     *max_logical_extents;
-#endif
-{
-    return (*font_set->methods->utf8_extents_per_char)
-	     (font_set, (char *)text, text_len, 
-	      ink_extents_buffer, logical_extents_buffer,
-	      buffer_size, num_chars, max_ink_extents, max_logical_extents);
-}
diff --git a/xc/lib/X11/util/makekeys.c b/xc/lib/X11/util/makekeys.c
deleted file mode 100644
index 82a8449e1..000000000
--- a/xc/lib/X11/util/makekeys.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/* $TOG: makekeys.c /main/11 1998/02/09 09:22:41 kaleb $ */
-/*
-
-Copyright 1990, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/util/makekeys.c,v 3.4 1998/10/05 13:22:00 dawes Exp $ */
-
-/* Constructs hash tables for XStringToKeysym and XKeysymToString. */
-
-#include <X11/X.h>
-#include <X11/Xos.h>
-#include <X11/keysymdef.h>
-#include <stdio.h>
-
-#ifndef X_NOT_STDC_ENV
-#include <stdlib.h>
-#else
-char *malloc();
-#endif
-#if defined(macII) && !defined(__STDC__)  /* stdlib.h fails to define these */
-char *malloc();
-#endif /* macII */
-
-typedef unsigned long Signature;
-
-#define KTNUM 3000
-
-static struct info {
-    char	*name;
-    KeySym	val;
-} info[KTNUM];
-
-#define MIN_REHASH 10
-#define MATCHES 10
-
-char tab[KTNUM];
-unsigned short offsets[KTNUM];
-unsigned short indexes[KTNUM];
-KeySym values[KTNUM];
-char buf[1024];
-
-int
-main(int argc, char *argv[])
-{
-    int ksnum;
-    int max_rehash;
-    Signature sig;
-    register int i, j, k, z;
-    register char *name;
-    register char c;
-    int first;
-    int best_max_rehash;
-    int best_z = 0;
-    int num_found;
-    KeySym val;
-
-    for (ksnum = 0; 1; (void)fgets(buf, sizeof(buf), stdin)) {
-	i = scanf("#define XK_%s 0x%lx", buf, &info[ksnum].val);
-	if (i == EOF)
-	    break;
-	if (i != 2)
-	    continue;
-	if (info[ksnum].val == XK_VoidSymbol)
-	    info[ksnum].val = 0;
-	if (info[ksnum].val > 0xffff) {
-	    fprintf(stderr,
-		    "ignoring illegal keysym (%s), remove it from .h file!\n",
-		    buf);
-	    continue;
-	}
-	name = malloc((unsigned)strlen(buf)+1);
-	if (!name) {
-	    fprintf(stderr, "makekeys: out of memory!\n");
-	    exit(1);
-	}
-	(void)strcpy(name, buf);
-	info[ksnum].name = name;
-	ksnum++;
-	if (ksnum == KTNUM) {
-	    fprintf(stderr, "makekeys: too many keysyms!\n");
-	    exit(1);
-	}
-    }
-
-    printf("/* This file is generated from keysymdef.h. */\n");
-    printf("/* Do not edit. */\n");
-    printf("\n");
-
-    best_max_rehash = ksnum;
-    num_found = 0;
-    for (z = ksnum; z < KTNUM; z++) {
-	max_rehash = 0;
-	for (name = tab, i = z; --i >= 0;)
-		*name++ = 0;
-	for (i = 0; i < ksnum; i++) {
-	    name = info[i].name;
-	    sig = 0;
-	    while ((c = *name++))
-		sig = (sig << 1) + c;
-	    first = j = sig % z;
-	    for (k = 0; tab[j]; k++) {
-		j += first + 1;
-		if (j >= z)
-		    j -= z;
-		if (j == first)
-		    goto next1;
-	    }
-	    tab[j] = 1;
-	    if (k > max_rehash)
-		max_rehash = k;
-	}
-	if (max_rehash < MIN_REHASH) {
-	    if (max_rehash < best_max_rehash) {
-		best_max_rehash = max_rehash;
-		best_z = z;
-	    }
-	    num_found++;
-	    if (num_found >= MATCHES)
-		break;
-	}
-next1:	;
-    }
-
-    z = best_z;
-    printf("#ifdef NEEDKTABLE\n");
-    printf("Const unsigned char _XkeyTable[] = {\n");
-    printf("0,\n");
-    k = 1;
-    for (i = 0; i < ksnum; i++) {
-	name = info[i].name;
-	sig = 0;
-	while ((c = *name++))
-	    sig = (sig << 1) + c;
-	first = j = sig % z;
-	while (offsets[j]) {
-	    j += first + 1;
-	    if (j >= z)
-		j -= z;
-	}
-	offsets[j] = k;
-	indexes[i] = k;
-	val = info[i].val;
-	printf("0x%.2lx, 0x%.2lx, 0x%.2lx, 0x%.2lx, ",
-	       (sig >> 8) & 0xff, sig & 0xff,
-	       (val >> 8) & 0xff, val & 0xff);
-	for (name = info[i].name, k += 5; (c = *name++); k++)
-	    printf("'%c',", c);
-	printf((i == (ksnum-1)) ? "0\n" : "0,\n");
-    }
-    printf("};\n");
-    printf("\n");
-    printf("#define KTABLESIZE %d\n", z);
-    printf("#define KMAXHASH %d\n", best_max_rehash + 1);
-    printf("\n");
-    printf("static Const unsigned short hashString[KTABLESIZE] = {\n");
-    for (i = 0; i < z;) {
-	printf("0x%.4x", offsets[i]);
-	i++;
-	if (i == z)
-	    break;
-	printf((i & 7) ? ", " : ",\n");
-    }
-    printf("\n");
-    printf("};\n");
-    printf("#endif /* NEEDKTABLE */\n");
-
-    best_max_rehash = ksnum;
-    num_found = 0;
-    for (z = ksnum; z < KTNUM; z++) {
-	max_rehash = 0;
-	for (name = tab, i = z; --i >= 0;)
-		*name++ = 0;
-	for (i = 0; i < ksnum; i++) {
-	    val = info[i].val;
-	    first = j = val % z;
-	    for (k = 0; tab[j]; k++) {
-		if (values[j] == val)
-		    goto skip1;
-		j += first + 1;
-		if (j >= z)
-		    j -= z;
-		if (j == first)
-		    goto next2;
-	    }
-	    tab[j] = 1;
-	    values[j] = val;
-	    if (k > max_rehash)
-		max_rehash = k;
-skip1:	;
-	}
-	if (max_rehash < MIN_REHASH) {
-	    if (max_rehash < best_max_rehash) {
-		best_max_rehash = max_rehash;
-		best_z = z;
-	    }
-	    num_found++;
-	    if (num_found >= MATCHES)
-		break;
-	}
-next2:	;
-    }
-
-    z = best_z;
-    for (i = z; --i >= 0;)
-	offsets[i] = 0;
-    for (i = 0; i < ksnum; i++) {
-	val = info[i].val;
-	first = j = val % z;
-	while (offsets[j]) {
-	    if (values[j] == val)
-		goto skip2;
-	    j += first + 1;
-	    if (j >= z)
-		j -= z;
-	}
-	offsets[j] = indexes[i] + 2;
-	values[j] = val;
-skip2:	;
-    }
-    printf("\n");
-    printf("#ifdef NEEDVTABLE\n");
-    printf("#define VTABLESIZE %d\n", z);
-    printf("#define VMAXHASH %d\n", best_max_rehash + 1);
-    printf("\n");
-    printf("static Const unsigned short hashKeysym[VTABLESIZE] = {\n");
-    for (i = 0; i < z;) {
-	printf("0x%.4x", offsets[i]);
-	i++;
-	if (i == z)
-	    break;
-	printf((i & 7) ? ", " : ",\n");
-    }
-    printf("\n");
-    printf("};\n");
-    printf("#endif /* NEEDVTABLE */\n");
-
-    exit(0);
-}
diff --git a/xc/lib/X11/util/mkks.sh b/xc/lib/X11/util/mkks.sh
deleted file mode 100755
index 262cc9540..000000000
--- a/xc/lib/X11/util/mkks.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-cat $* | awk 'BEGIN { \
-    printf "/*\n * This file is generated from %s.  Do not edit.\n */\n", \
-	   "$(INCLUDESRC)/keysymdef.h";\
-} \
-/^#define/ { \
-	len = length($2)-3; \
-	printf("{ \"%s\", %s },\n", substr($2,4,len), $3); \
-}' 
-
diff --git a/xc/lib/X11/uvY.c b/xc/lib/X11/uvY.c
deleted file mode 100644
index 082afd7a0..000000000
--- a/xc/lib/X11/uvY.c
+++ /dev/null
@@ -1,418 +0,0 @@
-/* $XConsortium: uvY.c,v 1.10 93/09/07 21:33:36 rws Exp $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of XCMS based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	NAME
- *		CIEuvy.c
- *
- *	DESCRIPTION
- *		This file contains routines that support the CIE u'v'Y
- *		color space to include conversions to and from the CIE
- *		XYZ space.
- *
- *	DOCUMENTATION
- *		"TekColor Color Management System, System Implementor's Manual"
- */
-/* $XFree86: xc/lib/X11/uvY.c,v 1.2 1999/05/09 10:50:43 dawes Exp $ */
-
-#include <X11/Xos.h>
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-#include <stdio.h>
-
-
-/*
- *	EXTERNS
- */
-extern char	_XcmsCIEuvY_prefix[];
-
-/* CvCols.c */
-extern Status _XcmsDIConvertColors();
-
-/* XYZ.c */
-extern Status _XcmsCIEXYZ_ValidSpec();
-
-
-/*
- *	FORWARD DECLARATIONS
- */
-
-static int CIEuvY_ParseString();
-Status _XcmsCIEuvY_ValidSpec();
-/*
- *	DEFINES
- *		Internal definitions that need NOT be exported to any package
- *		or program using this package.
- */
-#ifdef DBL_EPSILON
-#  define XMY_DBL_EPSILON DBL_EPSILON
-#else
-#  define XMY_DBL_EPSILON 0.00001
-#endif
-
-
-/*
- *	LOCAL VARIABLES
- */
-
-    /*
-     * NULL terminated list of functions applied to get from CIEuvY to CIEXYZ
-     */
-static XcmsConversionProc Fl_CIEuvY_to_CIEXYZ[] = {
-    XcmsCIEuvYToCIEXYZ,
-    NULL
-};
-
-    /*
-     * NULL terminated list of functions applied to get from CIEXYZ to CIEuvY
-     */
-static XcmsConversionProc Fl_CIEXYZ_to_CIEuvY[] = {
-    XcmsCIEXYZToCIEuvY,
-    NULL
-};
-
-
-/*
- *	GLOBALS
- */
-
-    /*
-     * CIE uvY Color Space
-     */
-XcmsColorSpace	XcmsCIEuvYColorSpace =
-    {
-	_XcmsCIEuvY_prefix,		/* prefix */
-	XcmsCIEuvYFormat,		/* id */
-	CIEuvY_ParseString,	/* parseString */
-	Fl_CIEuvY_to_CIEXYZ,	/* to_CIEXYZ */
-	Fl_CIEXYZ_to_CIEuvY,	/* from_CIEXYZ */
-	1
-    };
-
-
-
-/************************************************************************
- *									*
- *			 PRIVATE ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		CIEuvY_ParseString
- *
- *	SYNOPSIS
- */
-static int
-CIEuvY_ParseString(spec, pColor)
-    register char *spec;
-    XcmsColor *pColor;
-/*
- *	DESCRIPTION
- *		This routines takes a string and attempts to convert
- *		it into a XcmsColor structure with XcmsCIEuvYFormat.
- *		The assumed CIEuvY string syntax is:
- *		    CIEuvY:<u>/<v>/<Y>
- *		Where u, v, and Y are in string input format for floats
- *		consisting of:
- *		    a. an optional sign
- *		    b. a string of numbers possibly containing a decimal point,
- *		    c. an optional exponent field containing an 'E' or 'e'
- *			followed by a possibly signed integer string.
- *
- *	RETURNS
- *		0 if failed, non-zero otherwise.
- */
-{
-    int n;
-    char *pchar;
-
-    if ((pchar = strchr(spec, ':')) == NULL) {
-	return(XcmsFailure);
-    }
-    n = (int)(pchar - spec);
-
-    /*
-     * Check for proper prefix.
-     */
-    if (strncmp(spec, _XcmsCIEuvY_prefix, n) != 0) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Attempt to parse the value portion.
-     */
-    if (sscanf(spec + n + 1, "%lf/%lf/%lf",
-	    &pColor->spec.CIEuvY.u_prime,
-	    &pColor->spec.CIEuvY.v_prime,
-	    &pColor->spec.CIEuvY.Y) != 3) {
-	return(XcmsFailure);
-    }
-    pColor->format = XcmsCIEuvYFormat;
-    pColor->pixel = 0;
-    return(_XcmsCIEuvY_ValidSpec(pColor));
-}
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		XcmsCIEuvY_ValidSpec
- *
- *	SYNOPSIS
- */
-Status
-_XcmsCIEuvY_ValidSpec(pColor)
-    XcmsColor *pColor;
-/*
- *	DESCRIPTION
- *		Checks if color specification valid for CIE u'v'Y.
- *
- *	RETURNS
- *		XcmsFailure if invalid,
- *		XcmsSuccess if valid.
- *
- */
-{
-    if (pColor->format != XcmsCIEuvYFormat
-	    ||
-	    (pColor->spec.CIEuvY.Y < 0.0 - XMY_DBL_EPSILON)
-	    ||
-	    (pColor->spec.CIEuvY.Y > 1.0 + XMY_DBL_EPSILON)) {
-	return(XcmsFailure);
-    }
-    return(XcmsSuccess);
-}
-
-
-/*
- *	NAME
- *		XcmsCIEuvYToCIEXYZ - convert CIEuvY to CIEXYZ
- *
- *	SYNOPSIS
- */
-Status
-XcmsCIEuvYToCIEXYZ(ccc, puvY_WhitePt, pColors_in_out, nColors)
-    XcmsCCC ccc;
-    XcmsColor *puvY_WhitePt;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-/*
- *	DESCRIPTION
- *		Converts color specifications in an array of XcmsColor
- *		structures from CIEuvY format to CIEXYZ format.
- *
- *	RETURNS
- *		XcmsFailure if failed,
- *		XcmsSuccess if succeeded.
- *
- */
-{
-    XcmsCIEXYZ XYZ_return;
-    XcmsColor whitePt;
-    int i;
-    XcmsColor *pColor = pColors_in_out;
-    XcmsFloat div, x, y, z, Y;
-
-    /*
-     * Check arguments
-     *	Postpone checking puvY_WhitePt until it is actually needed
-     *	otherwise converting between XYZ and uvY will fail.
-     */
-    if (pColors_in_out == NULL) {
-	return(XcmsFailure);
-    }
-
-
-    /*
-     * Now convert each XcmsColor structure to CIEXYZ form
-     */
-    for (i = 0; i < nColors; i++, pColor++) {
-
-	/* Make sure original format is CIEuvY */
-	if (!_XcmsCIEuvY_ValidSpec(pColor)) {
-	    return(XcmsFailure);
-	}
-
-	/*
-	 * Convert to CIEXYZ
-	 */
-
-	Y = pColor->spec.CIEuvY.Y;
-
-	/* Convert color u'v' to xyz space */
-	div = (6.0 * pColor->spec.CIEuvY.u_prime) - (16.0 * pColor->spec.CIEuvY.v_prime) + 12.0;
-	if (div == 0.0) {
-	    /* use white point since div == 0 */
-	    if (puvY_WhitePt == NULL ) {
-		return(XcmsFailure);
-	    }
-	    /*
-	     * Make sure white point is in CIEuvY form
-	     */
-	    if (puvY_WhitePt->format != XcmsCIEuvYFormat) {
-		/* Make copy of the white point because we're going to modify it */
-		memcpy((char *)&whitePt, (char *)puvY_WhitePt, sizeof(XcmsColor));
-		if (!_XcmsDIConvertColors(ccc, &whitePt, (XcmsColor *)NULL, 1,
-			XcmsCIEuvYFormat)) {
-		    return(XcmsFailure);
-		}
-		puvY_WhitePt = &whitePt;
-	    }
-	    /* Make sure it is a white point, i.e., Y == 1.0 */
-	    if (puvY_WhitePt->spec.CIEuvY.Y != 1.0) {
-		return(XcmsFailure);
-	    }
-	    div = (6.0 * puvY_WhitePt->spec.CIEuvY.u_prime) -
-		    (16.0 * puvY_WhitePt->spec.CIEuvY.v_prime) + 12.0;
-	    if (div == 0) {
-		/* internal error */
-		return(XcmsFailure);
-	    }
-	    x = 9.0 * puvY_WhitePt->spec.CIEuvY.u_prime / div;
-	    y = 4.0 * puvY_WhitePt->spec.CIEuvY.v_prime / div;
-	} else {
-	    x = 9.0 * pColor->spec.CIEuvY.u_prime / div;
-	    y = 4.0 * pColor->spec.CIEuvY.v_prime / div;
-	}
-	z = 1.0 - x - y;
-
-	/* Convert from xyz to XYZ */
-	/* Conversion uses color normalized lightness based on Y */
-	if (y != 0.0) {
-	    XYZ_return.X = x * Y / y;
-	} else {
-	    XYZ_return.X = x;
-	}
-	XYZ_return.Y = Y;
-	if (y != 0.0) {
-	    XYZ_return.Z = z * Y / y;
-	} else {
-	    XYZ_return.Z = z;
-	}
-
-	memcpy((char *)&pColor->spec.CIEXYZ, (char *)&XYZ_return, sizeof(XcmsCIEXYZ));
-	/* Identify that format is now CIEXYZ */
-	pColor->format = XcmsCIEXYZFormat;
-    }
-
-    return(XcmsSuccess);
-}
-
-
-/*
- *	NAME
- *		XcmsCIEXYZToCIEuvY - convert CIEXYZ to CIEuvY
- *
- *	SYNOPSIS
- */
-Status
-XcmsCIEXYZToCIEuvY(ccc, puvY_WhitePt, pColors_in_out, nColors)
-    XcmsCCC ccc;
-    XcmsColor *puvY_WhitePt;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-/*
- *	DESCRIPTION
- *		Converts color specifications in an array of XcmsColor
- *		structures from CIEXYZ format to CIEuvY format.
- *
- *	RETURNS
- *		XcmsFailure if failed,
- *		XcmsSuccess if succeeded.
- *
- */
-{
-    XcmsCIEuvY uvY_return;
-    XcmsColor whitePt;
-    int i;
-    XcmsColor *pColor = pColors_in_out;
-    XcmsFloat div;
-
-    /*
-     * Check arguments
-     *	Postpone checking puvY_WhitePt until it is actually needed
-     *	otherwise converting between XYZ and uvY will fail.
-     */
-    if (pColors_in_out == NULL) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Now convert each XcmsColor structure to CIEuvY form
-     */
-    for (i = 0; i < nColors; i++, pColor++) {
-
-	/* Make sure original format is CIEXYZ */
-	if (!_XcmsCIEXYZ_ValidSpec(pColor)) {
-	    return(XcmsFailure);
-	}
-
-	/* Convert to CIEuvY */
-	div = pColor->spec.CIEXYZ.X + (15.0 * pColor->spec.CIEXYZ.Y) +
-		(3.0 * pColor->spec.CIEXYZ.Z);
-	if (div == 0.0) {
-	    /* Use white point since div == 0.0 */
-	    if (puvY_WhitePt == NULL ) {
-		return(XcmsFailure);
-	    }
-	    /*
-	     * Make sure white point is in CIEuvY form
-	     */
-	    if (puvY_WhitePt->format != XcmsCIEuvYFormat) {
-		/* Make copy of the white point because we're going to modify it */
-		memcpy((char *)&whitePt, (char *)puvY_WhitePt, sizeof(XcmsColor));
-		if (!_XcmsDIConvertColors(ccc, &whitePt, (XcmsColor *)NULL, 1,
-			XcmsCIEuvYFormat)) {
-		    return(XcmsFailure);
-		}
-		puvY_WhitePt = &whitePt;
-	    }
-	    /* Make sure it is a white point, i.e., Y == 1.0 */
-	    if (puvY_WhitePt->spec.CIEuvY.Y != 1.0) {
-		return(XcmsFailure);
-	    }
-	    uvY_return.Y = pColor->spec.CIEXYZ.Y;
-	    uvY_return.u_prime = puvY_WhitePt->spec.CIEuvY.u_prime;
-	    uvY_return.v_prime = puvY_WhitePt->spec.CIEuvY.v_prime;
-	} else {
-	    uvY_return.u_prime = 4.0 * pColor->spec.CIEXYZ.X / div;
-	    uvY_return.v_prime = 9.0 * pColor->spec.CIEXYZ.Y / div;
-	    uvY_return.Y = pColor->spec.CIEXYZ.Y;
-	}
-
-	memcpy((char *)&pColor->spec.CIEuvY, (char *)&uvY_return, sizeof(XcmsCIEuvY));
-	/* Identify that format is now CIEuvY */
-	pColor->format = XcmsCIEuvYFormat;
-    }
-
-    return(XcmsSuccess);
-}
diff --git a/xc/lib/X11/wcWrap.c b/xc/lib/X11/wcWrap.c
deleted file mode 100644
index fff517210..000000000
--- a/xc/lib/X11/wcWrap.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/* $TOG: wcWrap.c /main/7 1998/02/06 17:57:03 kaleb $ */
-/*
-
-Copyright 1991, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-/*
- * Copyright 1991 by the Open Software Foundation
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Open Software Foundation
- * not be used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  Open Software
- * Foundation makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without express or
- * implied warranty.
- *
- * OPEN SOFTWARE FOUNDATION DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL OPEN SOFTWARE FOUNDATIONN BE
- * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- * 
- *		 M. Collins		OSF  
- */				
-
-#include "Xlibint.h"
-#include "Xlcint.h"
-
-void
-XwcDrawText(dpy, d, gc, x, y, text_items, nitems)
-    Display            *dpy;
-    Drawable            d;
-    GC                  gc;
-    int                 x, y;
-    XwcTextItem        *text_items;
-    int                 nitems;
-{
-    register XFontSet fs;
-    register XwcTextItem *p = text_items;
-    register int i = nitems;
-    register int esc;
-
-    /* ignore leading items with no fontset */
-    while (i && !p->font_set) {
-	i--;
-	p++;
-    }
-
-    for (; --i >= 0; p++) {
-	if (p->font_set)
-	    fs = p->font_set;
-	x += p->delta;
-	esc = (*fs->methods->wc_draw_string) (dpy, d, fs, gc, x, y,
-					      p->chars, p->nchars);
-	if (!esc)
-	    esc = fs->methods->wc_escapement (fs, p->chars, p->nchars);
-	x += esc;
-    }
-}
-
-#if NeedFunctionPrototypes
-void
-XwcDrawString(
-    Display            *dpy,
-    Drawable            d,
-    XFontSet            font_set,
-    GC                  gc,
-    int                 x,
-    int                 y,
-    _Xconst wchar_t    *text,
-    int                 text_len)
-#else
-void
-XwcDrawString(dpy, d, font_set, gc, x, y, text, text_len)
-    Display            *dpy;
-    Drawable            d;
-    XFontSet            font_set;
-    GC                  gc;
-    int                 x, y;
-    wchar_t            *text;
-    int                 text_len;
-#endif
-{
-    (void)(*font_set->methods->wc_draw_string) (dpy, d, font_set, gc, x, y,
-						text, text_len);
-}
-
-#if NeedFunctionPrototypes
-void
-XwcDrawImageString(
-    Display            *dpy,
-    Drawable            d,
-    XFontSet            font_set,
-    GC                  gc,
-    int                 x,
-    int                 y,
-    _Xconst wchar_t    *text,
-    int                 text_len)
-#else
-void
-XwcDrawImageString(dpy, d, font_set, gc, x, y, text, text_len)
-    Display            *dpy;
-    Drawable            d;
-    XFontSet            font_set;
-    GC                  gc;
-    int                 x, y;
-    wchar_t            *text;
-    int                 text_len;
-#endif
-{
-    (*font_set->methods->wc_draw_image_string) (dpy, d, font_set, gc, x, y,
-						text, text_len);
-}
-
-#if NeedFunctionPrototypes
-int 
-XwcTextEscapement(
-    XFontSet            font_set,
-    _Xconst wchar_t    *text,
-    int                 text_len)
-#else
-int 
-XwcTextEscapement(font_set, text, text_len)
-    XFontSet            font_set;
-    wchar_t            *text;
-    int                 text_len;
-#endif
-{
-    return (*font_set->methods->wc_escapement) (font_set, text, text_len);
-}
-
-#if NeedFunctionPrototypes
-int
-XwcTextExtents(
-    XFontSet            font_set,
-    _Xconst wchar_t    *text,
-    int                 text_len,
-    XRectangle         *overall_ink_extents,
-    XRectangle         *overall_logical_extents)
-#else
-int
-XwcTextExtents(font_set, text, text_len,
-	       overall_ink_extents, overall_logical_extents)
-    XFontSet            font_set;
-    wchar_t            *text;
-    int                 text_len;
-    XRectangle         *overall_ink_extents;
-    XRectangle         *overall_logical_extents;
-#endif
-{
-    return (*font_set->methods->wc_extents) (font_set, text, text_len,
-					     overall_ink_extents,
-					     overall_logical_extents);
-}
-
-#if NeedFunctionPrototypes
-Status
-XwcTextPerCharExtents(
-    XFontSet            font_set,
-    _Xconst wchar_t    *text,
-    int                 text_len,
-    XRectangle         *ink_extents_buffer,
-    XRectangle         *logical_extents_buffer,
-    int                 buffer_size,
-    int                *num_chars,
-    XRectangle         *max_ink_extents,
-    XRectangle         *max_logical_extents)
-#else
-Status
-XwcTextPerCharExtents(font_set, text, text_len,
-		      ink_extents_buffer, logical_extents_buffer,
-		      buffer_size, num_chars,
-		      max_ink_extents, max_logical_extents)
-    XFontSet            font_set;
-    wchar_t            *text;
-    int                 text_len;
-    XRectangle         *ink_extents_buffer;
-    XRectangle         *logical_extents_buffer;
-    int                 buffer_size;
-    int                *num_chars;
-    XRectangle         *max_ink_extents;
-    XRectangle         *max_logical_extents;
-#endif
-{
-    return (*font_set->methods->wc_extents_per_char) 
-	      (font_set, text, text_len, 
-	       ink_extents_buffer, logical_extents_buffer,
-	       buffer_size, num_chars, max_ink_extents, max_logical_extents);
-}
diff --git a/xc/lib/X11/xyY.c b/xc/lib/X11/xyY.c
deleted file mode 100644
index 57df63861..000000000
--- a/xc/lib/X11/xyY.c
+++ /dev/null
@@ -1,388 +0,0 @@
-/* $XConsortium: xyY.c,v 1.10 93/09/07 21:33:40 rws Exp $ */
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- * 
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- * 
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- * 
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *	NAME
- *		CIExyY.c
- *
- *	DESCRIPTION
- *		This file contains routines that support the CIE xyY
- *		color space to include conversions to and from the CIE
- *		XYZ space.
- *
- *	DOCUMENTATION
- *		"TekColor Color Management System, System Implementor's Manual"
- */
-/* $XFree86: xc/lib/X11/xyY.c,v 1.2 1999/05/09 10:50:43 dawes Exp $ */
-
-#include <stdio.h>
-#include <X11/Xos.h>
-#include "Xlibint.h"
-#include "Xcmsint.h"
-
-/*
- *	DEFINES
- */
-#define EPS 0.00001	/* some extremely small number */
-#ifdef DBL_EPSILON
-#  define XMY_DBL_EPSILON DBL_EPSILON
-#else
-#  define XMY_DBL_EPSILON 0.00001
-#endif
-
-/*
- *	EXTERNS
- */
-
-extern char _XcmsCIExyY_prefix[];
-
-/* CvCols.c */
-extern Status _XcmsDIConvertColors();
-
-/* XYZ.c */
-extern Status _XcmsCIEXYZ_ValidSpec();
-
-/*
- *	FORWARD DECLARATIONS
- */
-
-static int CIExyY_ParseString();
-static Status XcmsCIExyY_ValidSpec();
-
-
-/*
- *	LOCAL VARIABLES
- */
-
-    /*
-     * NULL terminated list of functions applied to get from CIExyY to CIEXYZ
-     */
-static XcmsConversionProc Fl_CIExyY_to_CIEXYZ[] = {
-    XcmsCIExyYToCIEXYZ,
-    NULL
-};
-
-    /*
-     * NULL terminated list of functions applied to get from CIEXYZ to CIExyY
-     */
-static XcmsConversionProc Fl_CIEXYZ_to_CIExyY[] = {
-    XcmsCIEXYZToCIExyY,
-    NULL
-};
-
-
-/*
- *	GLOBALS
- */
-
-    /*
-     * CIE xyY Color Space
-     */
-XcmsColorSpace	XcmsCIExyYColorSpace =
-    {
-	_XcmsCIExyY_prefix,	/* prefix */
-	XcmsCIExyYFormat,		/* id */
-	CIExyY_ParseString,	/* parseString */
-	Fl_CIExyY_to_CIEXYZ,	/* to_CIEXYZ */
-	Fl_CIEXYZ_to_CIExyY,	/* from_CIEXYZ */
-	1
-    };
-
-
-
-/************************************************************************
- *									*
- *			 PRIVATE ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		CIExyY_ParseString
- *
- *	SYNOPSIS
- */
-static int
-CIExyY_ParseString(spec, pColor)
-    register char *spec;
-    XcmsColor *pColor;
-/*
- *	DESCRIPTION
- *		This routines takes a string and attempts to convert
- *		it into a XcmsColor structure with XcmsCIExyYFormat.
- *		The assumed CIExyY string syntax is:
- *		    CIExyY:<x>/<y>/<Y>
- *		Where x, y, and Y are in string input format for floats
- *		consisting of:
- *		    a. an optional sign
- *		    b. a string of numbers possibly containing a decimal point,
- *		    c. an optional exponent field containing an 'E' or 'e'
- *			followed by a possibly signed integer string.
- *
- *	RETURNS
- *		0 if failed, non-zero otherwise.
- */
-{
-    int n;
-    char *pchar;
-
-    if ((pchar = strchr(spec, ':')) == NULL) {
-	return(XcmsFailure);
-    }
-    n = (int)(pchar - spec);
-
-    /*
-     * Check for proper prefix.
-     */
-    if (strncmp(spec, _XcmsCIExyY_prefix, n) != 0) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Attempt to parse the value portion.
-     */
-    if (sscanf(spec + n + 1, "%lf/%lf/%lf",
-	    &pColor->spec.CIExyY.x,
-	    &pColor->spec.CIExyY.y,
-	    &pColor->spec.CIExyY.Y) != 3) {
-	return(XcmsFailure);
-    }
-    pColor->format = XcmsCIExyYFormat;
-    pColor->pixel = 0;
-    return(XcmsCIExyY_ValidSpec(pColor));
-}
-
-
-
-/************************************************************************
- *									*
- *			 PUBLIC ROUTINES				*
- *									*
- ************************************************************************/
-
-/*
- *	NAME
- *		CIExyY_ValidSpec()
- *
- *	SYNOPSIS
- */
-static Status
-XcmsCIExyY_ValidSpec(pColor)
-    XcmsColor *pColor;
-/*
- *	DESCRIPTION
- *		Checks a valid CIExyY color specification.
- *
- *	RETURNS
- *		XcmsFailure if invalid.
- *		XcmsSuccess if valid.
- *
- */
-{
-    if (pColor->format != XcmsCIExyYFormat
-	    ||
-	    (pColor->spec.CIExyY.x < 0.0 - XMY_DBL_EPSILON)
-	    ||
-	    (pColor->spec.CIExyY.x > 1.0 + XMY_DBL_EPSILON)
-	    ||
-	    (pColor->spec.CIExyY.y < 0.0 - XMY_DBL_EPSILON)
-	    ||
-	    (pColor->spec.CIExyY.y > 1.0 + XMY_DBL_EPSILON)
-	    ||
-	    (pColor->spec.CIExyY.Y < 0.0 - XMY_DBL_EPSILON)
-	    ||
-	    (pColor->spec.CIExyY.Y > 1.0 + XMY_DBL_EPSILON)) {
-	return(XcmsFailure);
-    }
-    return(XcmsSuccess);
-}
-
-
-/*
- *	NAME
- *		XcmsCIExyYToCIEXYZ - convert CIExyY to CIEXYZ
- *
- *	SYNOPSIS
- */
-Status
-XcmsCIExyYToCIEXYZ(ccc, pxyY_WhitePt, pColors_in_out, nColors)
-    XcmsCCC ccc;
-    XcmsColor *pxyY_WhitePt;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-/*
- *	DESCRIPTION
- *		Converts color specifications in an array of XcmsColor
- *		structures from CIExyY format to CIEXYZ format.
- *
- *	RETURNS
- *		XcmsFailure if failed,
- *		XcmsSuccess if succeeded.
- */
-{
-    XcmsColor	*pColor = pColors_in_out;
-    XcmsColor	whitePt;
-    XcmsCIEXYZ	XYZ_return;
-    XcmsFloat	div;		/* temporary storage in case divisor is zero */
-    XcmsFloat	u, v, x, y, z;	/* temporary storage */
-    register int i;
-
-    /*
-     * Check arguments
-     */
-    if (pxyY_WhitePt == NULL || pColors_in_out == NULL) {
-	return(XcmsFailure);
-    }
-
-
-    /*
-     * Now convert each XcmsColor structure to CIEXYZ form
-     */
-    for (i = 0; i < nColors; i++, pColor++) {
-	/* Make sure original format is CIExyY and valid */
-	if (!XcmsCIExyY_ValidSpec(pColor)) {
-	    return(XcmsFailure);
-	}
-
-	if ((div = (-2 * pColor->spec.CIExyY.x) + (12 * pColor->spec.CIExyY.y) + 3) == 0.0) {
-	    /* Note that the divisor is zero */
-	    /* This return is abitrary. */
-	    XYZ_return.X = 0;
-	    XYZ_return.Y = 0;
-	    XYZ_return.Z = 0;
-	} else {
-	    /*
-	     * Make sure white point is in CIEXYZ form
-	     */
-	    if (pxyY_WhitePt->format != XcmsCIEXYZFormat) {
-		/* Make copy of the white point because we're going to modify it */
-		memcpy((char *)&whitePt, (char *)pxyY_WhitePt, sizeof(XcmsColor));
-		if (!_XcmsDIConvertColors(ccc, &whitePt, (XcmsColor *)NULL, 1,
-			XcmsCIEXYZFormat)) {
-		    return(XcmsFailure);
-		}
-		pxyY_WhitePt = &whitePt;
-	    }
-
-	    /* Make sure it is a white point, i.e., Y == 1.0 */
-	    if (pxyY_WhitePt->spec.CIEXYZ.Y != 1.0) {
-		return(XcmsFailure);
-	    }
-
-	    /* Convert from xyY to uvY to XYZ */
-	    u = (4 * pColor->spec.CIExyY.x) / div;
-	    v = (9 * pColor->spec.CIExyY.y) / div;
-	    div = (6.0 * u) - (16.0 * v) + 12.0;
-	    if (div == 0.0) {
-		/* Note that the divisor is zero */
-		/* This return is abitrary. */
-		if ((div = (6.0 * whitePt.spec.CIEuvY.u_prime) -
-		           (16.0 * whitePt.spec.CIEuvY.v_prime) + 12.0) == 0.0) {
-		    div = EPS;
-		}
-		x = 9.0 * whitePt.spec.CIEuvY.u_prime / div;
-		y = 4.0 * whitePt.spec.CIEuvY.u_prime / div;
-	    } else {
-		/* convert u, v to small xyz */
-		x = 9.0 * u / div;
-		y = 4.0 * v / div;
-	    }
-	    z = 1.0 - x - y;
-	    if (y == 0.0) y = EPS;	/* Have to worry about divide by 0 */
-	    XYZ_return.Y = pColor->spec.CIExyY.Y;
-	    XYZ_return.X = x * XYZ_return.Y / y;
-	    XYZ_return.Z = z * XYZ_return.Y / y;
-	}
-
-	/* Copy result to pColor */
-	memcpy ((char *)&pColor->spec, (char *)&XYZ_return, sizeof(XcmsCIEXYZ));
-
-	/* Identify that the format is now CIEXYZ */
-	pColor->format = XcmsCIEXYZFormat;
-    }
-    return(XcmsSuccess);
-}
-
-
-/*
- *	NAME
- *		XcmsCIEXYZToCIExyY - convert CIEXYZ to CIExyY
- *
- *	SYNOPSIS
- */
-/* ARGSUSED */
-Status
-XcmsCIEXYZToCIExyY(ccc, pxyY_WhitePt, pColors_in_out, nColors)
-    XcmsCCC ccc;
-    XcmsColor *pxyY_WhitePt;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-/*
- *	DESCRIPTION
- *		Converts color specifications in an array of XcmsColor
- *		structures from CIEXYZ format to CIExyY format.
- *
- *	RETURNS
- *		XcmsFailure if failed,
- *		XcmsSuccess if succeeded.
- *
- */
-{
-    XcmsColor	*pColor = pColors_in_out;
-    XcmsCIExyY	xyY_return;
-    XcmsFloat	div;		/* temporary storage in case divisor is zero */
-    register int i;
-
-    /*
-     * Check arguments
-     * 		pxyY_WhitePt ignored
-     */
-    if (pColors_in_out == NULL) {
-	return(XcmsFailure);
-    }
-
-    /*
-     * Now convert each XcmsColor structure to CIEXYZ form
-     */
-    for (i = 0; i < nColors; i++, pColor++) {
-
-	if (!_XcmsCIEXYZ_ValidSpec(pColor)) {
-	    return(XcmsFailure);
-	}
-	/* Now convert for XYZ to xyY */
-	if ((div = pColor->spec.CIEXYZ.X + pColor->spec.CIEXYZ.Y + pColor->spec.CIEXYZ.Z) == 0.0) {
-	    div = EPS;
-	} 
-	xyY_return.x = pColor->spec.CIEXYZ.X / div;
-	xyY_return.y = pColor->spec.CIEXYZ.Y / div;
-	xyY_return.Y = pColor->spec.CIEXYZ.Y;
-
-	/* Copy result to pColor */
-	memcpy ((char *)&pColor->spec, (char *)&xyY_return, sizeof(XcmsCIExyY));
-
-	/* Identify that the format is now CIEXYZ */
-	pColor->format = XcmsCIExyYFormat;
-    }
-    return(XcmsSuccess);
-}
diff --git a/xc/lib/XThrStub/Imakefile b/xc/lib/XThrStub/Imakefile
deleted file mode 100644
index 1652e4605..000000000
--- a/xc/lib/XThrStub/Imakefile
+++ /dev/null
@@ -1,34 +0,0 @@
-XCOMM $XFree86: xc/lib/XThrStub/Imakefile,v 3.2 1998/12/20 11:57:00 dawes Exp $
-#define DoNormalLib NormalLibXThrStub
-#define DoSharedLib SharedLibXThrStub
-#define DoExtraLib SharedLibXThrStub
-#define DoDebugLib DebugLibXThrStub
-#define DoProfileLib ProfileLibXThrStub
-#define LibName XThrStub
-#define SoRev SOXTHRSTUBREV
-#define LibHeaders NO
-
-#include <Threads.tmpl>
-
-#ifdef SharedXThrStubReqs
-REQUIREDLIBS = SharedXThrStubReqs
-#endif
-
-#if NeedUIThrStubs
-STUBSRCS = UIThrStubs.c
-STUBOBJS = UIThrStubs.o
-#endif
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
-      DEFINES = $(ALLOC_DEFINES)
-     INCLUDES = 
-         SRCS = $(STUBSRCS)
-         OBJS = $(STUBOBJS)
-     LINTLIBS = $(LINTXLIB)
-
-#include <Library.tmpl>
-
-DependTarget()
diff --git a/xc/lib/XThrStub/UIThrStubs.c b/xc/lib/XThrStub/UIThrStubs.c
deleted file mode 100644
index a22709148..000000000
--- a/xc/lib/XThrStub/UIThrStubs.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * $XFree86: xc/lib/XThrStub/UIThrStubs.c,v 3.0 1995/11/02 00:27:07 dawes Exp $
- *
- * Copyright (c) 1995 David E. Wexelblat.  All rights reserved
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL DAVID E. WEXELBLAT BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- * 
- * Except as contained in this notice, the name of David E. Wexelblat shall
- * not be used in advertising or otherwise to promote the sale, use or
- * other dealings in this Software without prior written authorization
- * from David E. Wexelblat.
- * 
- */
-
-/*
- * Stubs for thread functions needed by the X library.  Supports 
- * UnixWare 2.x threads; may support Solaris 2 threads as well, but not
- * tested.  Defining things this way removes the dependency of the X
- * library on the threads library, but still supports threads if the user
- * specificies the thread library on the link line.
- */
-
-#include <thread.h>
-#include <synch.h>
-
-#pragma weak thr_self = _Xthr_self_stub_
-thread_t 
-_Xthr_self_stub_()
-{
-    return((thread_t)0);
-}
-
-#pragma weak mutex_init = _Xmutex_init_stub_
-int 
-_Xmutex_init_stub_(m, t, a)
-    mutex_t *m;
-    int t;
-    void *a;
-{
-    return(0);
-}
-
-#pragma weak mutex_destroy = _Xmutex_destroy_stub_
-int
-_Xmutex_destroy_stub_(m)
-    mutex_t *m;
-{
-    return(0);
-}
-
-#pragma weak mutex_lock = _Xmutex_lock_stub_
-int
-_Xmutex_lock_stub_(m)
-    mutex_t *m;
-{
-    return(0);
-}
-
-#pragma weak mutex_unlock = _Xmutex_unlock_stub_
-int
-_Xmutex_unlock_stub_(m)
-    mutex_t *m;
-{
-    return(0);
-}
-
-#pragma weak cond_init = _Xcond_init_stub_
-int 
-_Xcond_init_stub_(c, t, a)
-    cond_t *c;
-    int t;
-    void *a;
-{
-    return(0);
-}
-
-#pragma weak cond_destroy = _Xcond_destroy_stub_
-int
-_Xcond_destroy_stub_(c)
-    cond_t *c;
-{
-    return(0);
-}
-
-#pragma weak cond_wait = _Xcond_wait_stub_
-int
-_Xcond_wait_stub_(c,m)
-    cond_t *c;
-    mutex_t *m;
-{
-    return(0);
-}
-
-#pragma weak cond_signal = _Xcond_signal_stub_
-int
-_Xcond_signal_stub_(c)
-    cond_t *c;
-{
-    return(0);
-}
-
-#pragma weak cond_broadcast = _Xcond_broadcast_stub_
-int
-_Xcond_broadcast_stub_(c)
-    cond_t *c;
-{
-    return(0);
-}
diff --git a/xc/lib/Xau/AuDispose.c b/xc/lib/Xau/AuDispose.c
deleted file mode 100644
index fa2afa99c..000000000
--- a/xc/lib/Xau/AuDispose.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* $TOG: AuDispose.c /main/6 1998/02/06 14:14:30 kaleb $ */
-
-/*
-
-Copyright 1988, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/Xau/AuDispose.c,v 1.2 1999/03/14 03:21:06 dawes Exp $ */
-
-#include <X11/Xauth.h>
-
-#ifdef X_NOT_STDC_ENV
-extern void free();
-#else
-#include <stdlib.h>
-#endif
-
-void
-XauDisposeAuth (auth)
-Xauth	*auth;
-{
-    if (auth) {
-	if (auth->address) (void) free (auth->address);
-	if (auth->number) (void) free (auth->number);
-	if (auth->name) (void) free (auth->name);
-	if (auth->data) {
-	    (void) bzero (auth->data, auth->data_length);
-	    (void) free (auth->data);
-	}
-	free ((char *) auth);
-    }
-    return;
-}
diff --git a/xc/lib/Xau/AuFileName.c b/xc/lib/Xau/AuFileName.c
deleted file mode 100644
index 26e86da6d..000000000
--- a/xc/lib/Xau/AuFileName.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* $TOG: AuFileName.c /main/9 1998/02/06 14:14:36 kaleb $ */
-
-/*
-
-Copyright 1988, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/Xau/AuFileName.c,v 3.4 1999/05/09 10:51:32 dawes Exp $ */
-
-#include <X11/Xauth.h>
-#include <X11/Xos.h>
-
-#ifdef X_NOT_STDC_ENV
-char *malloc (), *getenv ();
-#else
-#include <stdlib.h>
-#endif
-
-char *
-XauFileName ()
-{
-    char *slashDotXauthority = "/.Xauthority";
-    char    *name;
-    static char	*buf;
-    static int	bsize;
-#ifdef WIN32
-    char    dir[128];
-#endif
-    int	    size;
-
-    if ((name = getenv ("XAUTHORITY")))
-	return name;
-    name = getenv ("HOME");
-    if (!name) {
-#ifdef WIN32
-	(void) strcpy (dir, "/users/");
-	if (name = getenv("USERNAME")) {
-	    (void) strcat (dir, name);
-	    name = dir;
-	}
-	if (!name)
-#endif
-	return 0;
-    }
-    size = strlen (name) + strlen(&slashDotXauthority[1]) + 2;
-    if (size > bsize) {
-	if (buf)
-	    free (buf);
-	buf = malloc ((unsigned) size);
-	if (!buf)
-	    return 0;
-	bsize = size;
-    }
-    strcpy (buf, name);
-    strcat (buf, slashDotXauthority + (name[1] == '\0' ? 1 : 0));
-    return buf;
-}
diff --git a/xc/lib/Xau/AuGetAddr.c b/xc/lib/Xau/AuGetAddr.c
deleted file mode 100644
index 138d918c0..000000000
--- a/xc/lib/Xau/AuGetAddr.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* $TOG: AuGetAddr.c /main/14 1998/02/06 14:14:42 kaleb $ */
-
-/*
-
-Copyright 1988, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/Xau/AuGetAddr.c,v 1.2 1999/05/09 10:51:33 dawes Exp $ */
-
-#include <X11/Xauth.h>
-#include <X11/Xos.h>
-
-static int
-binaryEqual (_Xconst char *a, _Xconst char *b, int len)
-{
-    while (len--)
-	if (*a++ != *b++)
-	    return 0;
-    return 1;
-}
-
-#if NeedFunctionPrototypes
-Xauth *
-XauGetAuthByAddr (
-#if NeedWidePrototypes
-unsigned int	family,
-unsigned int	address_length,
-#else
-unsigned short	family,
-unsigned short	address_length,
-#endif
-_Xconst char*	address,
-#if NeedWidePrototypes
-unsigned int	number_length,
-#else
-unsigned short	number_length,
-#endif
-_Xconst char*	number,
-#if NeedWidePrototypes
-unsigned int	name_length,
-#else
-unsigned short	name_length,
-#endif
-_Xconst char*	name)
-#else
-Xauth *
-XauGetAuthByAddr (family, address_length, address,
-			  number_length, number,
-			  name_length, name)
-unsigned short	family;
-unsigned short	address_length;
-char	*address;
-unsigned short	number_length;
-char	*number;
-unsigned short	name_length;
-char	*name;
-#endif
-{
-    FILE    *auth_file;
-    char    *auth_name;
-    Xauth   *entry;
-
-    auth_name = XauFileName ();
-    if (!auth_name)
-	return 0;
-    if (access (auth_name, R_OK) != 0)		/* checks REAL id */
-	return 0;
-    auth_file = fopen (auth_name, "rb");
-    if (!auth_file)
-	return 0;
-    for (;;) {
-	entry = XauReadAuth (auth_file);
-	if (!entry)
-	    break;
-	/*
-	 * Match when:
-	 *   either family or entry->family are FamilyWild or
-	 *    family and entry->family are the same
-	 *  and
-	 *   either address or entry->address are empty or
-	 *    address and entry->address are the same
-	 *  and
-	 *   either number or entry->number are empty or
-	 *    number and entry->number are the same
-	 *  and
-	 *   either name or entry->name are empty or
-	 *    name and entry->name are the same
-	 */
-
-	if ((family == FamilyWild || entry->family == FamilyWild ||
-	     (entry->family == family &&
-	      address_length == entry->address_length &&
-	      binaryEqual (entry->address, address, (int)address_length))) &&
-	    (number_length == 0 || entry->number_length == 0 ||
-	     (number_length == entry->number_length &&
-	      binaryEqual (entry->number, number, (int)number_length))) &&
-	    (name_length == 0 || entry->name_length == 0 ||
-	     (entry->name_length == name_length &&
- 	      binaryEqual (entry->name, name, (int)name_length))))
-	    break;
-	XauDisposeAuth (entry);
-    }
-    (void) fclose (auth_file);
-    return entry;
-}
diff --git a/xc/lib/Xau/AuGetBest.c b/xc/lib/Xau/AuGetBest.c
deleted file mode 100644
index 514c47854..000000000
--- a/xc/lib/Xau/AuGetBest.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/* $TOG: AuGetBest.c /main/24 1998/02/06 14:14:47 kaleb $ */
-
-/*
-
-Copyright 1988, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/Xau/AuGetBest.c,v 1.2 1999/05/09 10:51:33 dawes Exp $ */
-
-#include <X11/Xauth.h>
-#include <X11/Xos.h>
-#ifdef XTHREADS
-#include <X11/Xthreads.h>
-#endif
-#ifdef hpux
-#define X_INCLUDE_NETDB_H
-#define XOS_USE_NO_LOCKING
-#include <X11/Xos_r.h>
-#endif
-
-static int
-binaryEqual (_Xconst char *a, _Xconst char *b, int len)
-{
-    while (len--)
-	if (*a++ != *b++)
-	    return 0;
-    return 1;
-}
-
-#if NeedFunctionPrototypes
-Xauth *
-XauGetBestAuthByAddr (
-#if NeedWidePrototypes
-    unsigned int	family,
-    unsigned int	address_length,
-#else
-    unsigned short	family,
-    unsigned short	address_length,
-#endif
-    _Xconst char*	address,
-#if NeedWidePrototypes
-    unsigned int	number_length,
-#else
-    unsigned short	number_length,
-#endif
-    _Xconst char*	number,
-    int			types_length,
-    char**		types,
-    _Xconst int*	type_lengths)
-#else
-Xauth *
-XauGetBestAuthByAddr (family, address_length, address,
-			  number_length, number,
-			  types_length, types, type_lengths)
-    unsigned short	family;
-    unsigned short	address_length;
-    char		*address;
-    unsigned short	number_length;
-    char		*number;
-    int			types_length;
-    char		**types;
-    int			*type_lengths;
-#endif
-{
-    FILE    *auth_file;
-    char    *auth_name;
-    Xauth   *entry;
-    Xauth   *best;
-    int	    best_type;
-    int	    type;
-#ifdef hpux
-    char		*fully_qual_address;
-    unsigned short	fully_qual_address_length;
-#endif
-
-    auth_name = XauFileName ();
-    if (!auth_name)
-	return 0;
-    if (access (auth_name, R_OK) != 0)		/* checks REAL id */
-	return 0;
-    auth_file = fopen (auth_name, "rb");
-    if (!auth_file)
-	return 0;
-
-#ifdef hpux
-    if (family == FamilyLocal) {
-	_Xgethostbynameparams hparams;
-	struct hostent *hostp;
-
-	/* make sure we try fully-qualified hostname */
-	if ((hostp = _XGethostbyname(address,hparams)) != NULL) {
-	    fully_qual_address = hostp->h_name;
-	    fully_qual_address_length = strlen(fully_qual_address);
-	}
-	else
-	{
-	    fully_qual_address = NULL;
-	    fully_qual_address_length = 0;
-	}
-    }
-#endif /* hpux */
-
-    best = 0;
-    best_type = types_length;
-    for (;;) {
-	entry = XauReadAuth (auth_file);
-	if (!entry)
-	    break;
-	/*
-	 * Match when:
-	 *   either family or entry->family are FamilyWild or
-	 *    family and entry->family are the same
-	 *  and
-	 *   either address or entry->address are empty or
-	 *    address and entry->address are the same
-	 *  and
-	 *   either number or entry->number are empty or
-	 *    number and entry->number are the same
-	 *  and
-	 *   name matches one of the specified names, or no names
-	 *    were specified
-	 */
-
-	if ((family == FamilyWild || entry->family == FamilyWild ||
-	     (entry->family == family &&
-	     ((address_length == entry->address_length &&
-	      binaryEqual (entry->address, address, (int)address_length))
-#ifdef hpux
-	     || (family == FamilyLocal &&
-		fully_qual_address_length == entry->address_length &&
-	     	binaryEqual (entry->address, fully_qual_address,
-		    (int) fully_qual_address_length))
-#endif
-	    ))) &&
-	    (number_length == 0 || entry->number_length == 0 ||
-	     (number_length == entry->number_length &&
-	      binaryEqual (entry->number, number, (int)number_length))))
-	{
-	    if (best_type == 0)
-	    {
-		best = entry;
-		break;
-	    }
-	    for (type = 0; type < best_type; type++)
-		if (type_lengths[type] == entry->name_length &&
-		    !(strncmp (types[type], entry->name, entry->name_length)))
-		{
-		    break;
-		}
-	    if (type < best_type)
-	    {
-		if (best)
-		    XauDisposeAuth (best);
-		best = entry;
-		best_type = type;
-		if (type == 0)
-		    break;
-		continue;
-	    }
-	}
-	XauDisposeAuth (entry);
-    }
-    (void) fclose (auth_file);
-    return best;
-}
diff --git a/xc/lib/Xau/AuLock.c b/xc/lib/Xau/AuLock.c
deleted file mode 100644
index 1b3daf125..000000000
--- a/xc/lib/Xau/AuLock.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* $TOG: AuLock.c /main/16 1998/02/06 14:14:52 kaleb $ */
-
-/*
-
-Copyright 1988, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/Xau/AuLock.c,v 3.1 1998/10/03 08:41:58 dawes Exp $ */
-
-#include <X11/Xauth.h>
-#include <X11/Xos.h>
-#include <sys/stat.h>
-#include <errno.h>
-#if defined(X_NOT_STDC_ENV)
-extern int errno;
-#define Time_t long
-extern Time_t time ();
-#else
-#include <time.h>
-#define Time_t time_t
-#endif
-#ifndef X_NOT_POSIX
-#include <unistd.h>
-#else
-#ifndef WIN32
-extern unsigned	sleep ();
-#else
-#define link rename
-#endif
-#endif
-#ifdef __EMX__
-#define link rename
-#endif
-
-#if NeedFunctionPrototypes
-int
-XauLockAuth (
-_Xconst char *file_name,
-int	retries,
-int	timeout,
-long	dead)
-#else
-int
-XauLockAuth (file_name, retries, timeout, dead)
-char	*file_name;
-int	retries;
-int	timeout;
-long	dead;
-#endif
-{
-    char	creat_name[1025], link_name[1025];
-    struct stat	statb;
-    Time_t	now;
-    int		creat_fd = -1;
-
-    if (strlen (file_name) > 1022)
-	return LOCK_ERROR;
-    (void) strcpy (creat_name, file_name);
-    (void) strcat (creat_name, "-c");
-    (void) strcpy (link_name, file_name);
-    (void) strcat (link_name, "-l");
-    if (stat (creat_name, &statb) != -1) {
-	now = time ((Time_t *) 0);
-	/*
-	 * NFS may cause ctime to be before now, special
-	 * case a 0 deadtime to force lock removal
-	 */
-	if (dead == 0 || now - statb.st_ctime > dead) {
-	    (void) unlink (creat_name);
-	    (void) unlink (link_name);
-	}
-    }
-    
-    while (retries > 0) {
-	if (creat_fd == -1) {
-	    creat_fd = creat (creat_name, 0666);
-	    if (creat_fd == -1) {
-		if (errno != EACCES)
-		    return LOCK_ERROR;
-	    } else
-		(void) close (creat_fd);
-	}
-	if (creat_fd != -1) {
-	    if (link (creat_name, link_name) != -1)
-		return LOCK_SUCCESS;
-	    if (errno == ENOENT) {
-		creat_fd = -1;	/* force re-creat next time around */
-		continue;
-	    }
-	    if (errno != EEXIST)
-		return LOCK_ERROR;
-	}
-	(void) sleep ((unsigned) timeout);
-	--retries;
-    }
-    return LOCK_TIMEOUT;
-}
diff --git a/xc/lib/Xau/AuRead.c b/xc/lib/Xau/AuRead.c
deleted file mode 100644
index 7e5e8dfea..000000000
--- a/xc/lib/Xau/AuRead.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* $TOG: AuRead.c /main/8 1998/02/06 14:14:57 kaleb $ */
-
-/*
-
-Copyright 1988, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/Xau/AuRead.c,v 1.3 1999/05/09 10:51:33 dawes Exp $ */
-
-#include <X11/Xauth.h>
-
-#ifdef X_NOT_STDC_ENV
-extern void free();
-extern char *malloc();
-#else
-#include <stdlib.h>
-#endif
-
-static int
-read_short (unsigned short *shortp, FILE *file)
-{
-    unsigned char   file_short[2];
-
-    if (fread ((char *) file_short, (int) sizeof (file_short), 1, file) != 1)
-	return 0;
-    *shortp = file_short[0] * 256 + file_short[1];
-    return 1;
-}
-
-static int
-read_counted_string (unsigned short *countp, char **stringp, FILE *file)
-{
-    unsigned short  len;
-    char	    *data;
-
-    if (read_short (&len, file) == 0)
-	return 0;
-    if (len == 0) {
-	data = 0;
-    } else {
-    	data = malloc ((unsigned) len);
-    	if (!data)
-	    return 0;
-    	if (fread (data, (int) sizeof (char), (int) len, file) != len) {
-	    bzero (data, len);
-	    free (data);
-	    return 0;
-    	}
-    }
-    *stringp = data;
-    *countp = len;
-    return 1;
-}
-
-Xauth *
-XauReadAuth (auth_file)
-FILE	*auth_file;
-{
-    Xauth   local;
-    Xauth   *ret;
-
-    if (read_short (&local.family, auth_file) == 0)
-	return 0;
-    if (read_counted_string (&local.address_length, &local.address, auth_file) == 0)
-	return 0;
-    if (read_counted_string (&local.number_length, &local.number, auth_file) == 0) {
-	if (local.address) free (local.address);
-	return 0;
-    }
-    if (read_counted_string (&local.name_length, &local.name, auth_file) == 0) {
-	if (local.address) free (local.address);
-	if (local.number) free (local.number);
-	return 0;
-    }
-    if (read_counted_string (&local.data_length, &local.data, auth_file) == 0) {
-	if (local.address) free (local.address);
-	if (local.number) free (local.number);
-	if (local.name) free (local.name);
-	return 0;
-    }
-    ret = (Xauth *) malloc (sizeof (Xauth));
-    if (!ret) {
-	if (local.address) free (local.address);
-	if (local.number) free (local.number);
-	if (local.name) free (local.name);
-	if (local.data) {
-	    bzero (local.data, local.data_length);
-	    free (local.data);
-	}
-	return 0;
-    }
-    *ret = local;
-    return ret;
-}
diff --git a/xc/lib/Xau/AuUnlock.c b/xc/lib/Xau/AuUnlock.c
deleted file mode 100644
index 00ff9108b..000000000
--- a/xc/lib/Xau/AuUnlock.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* $TOG: AuUnlock.c /main/11 1998/02/06 14:15:10 kaleb $ */
-
-/*
-
-Copyright 1988, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/Xau/AuUnlock.c,v 1.2 1999/05/09 10:51:34 dawes Exp $ */
-
-#include <X11/Xauth.h>
-#include <X11/Xos.h>
-
-int
-#if NeedFunctionPrototypes
-XauUnlockAuth (
-_Xconst char *file_name)
-#else
-XauUnlockAuth (file_name)
-char	*file_name;
-#endif
-{
-#ifndef WIN32
-    char	creat_name[1025];
-#endif
-    char	link_name[1025];
-
-    if (strlen (file_name) > 1022)
-	return 0;
-#ifndef WIN32
-    (void) strcpy (creat_name, file_name);
-    (void) strcat (creat_name, "-c");
-#endif
-    (void) strcpy (link_name, file_name);
-    (void) strcat (link_name, "-l");
-    /*
-     * I think this is the correct order
-     */
-#ifndef WIN32
-    (void) unlink (creat_name);
-#endif
-    (void) unlink (link_name);
-
-    return 1;
-}
diff --git a/xc/lib/Xau/AuWrite.c b/xc/lib/Xau/AuWrite.c
deleted file mode 100644
index f02008415..000000000
--- a/xc/lib/Xau/AuWrite.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* $TOG: AuWrite.c /main/7 1998/02/06 14:15:18 kaleb $ */
-
-/*
-
-Copyright 1988, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/Xau/AuWrite.c,v 1.2 1999/05/09 10:51:34 dawes Exp $ */
-
-#include <X11/Xauth.h>
-
-static int
-write_short (unsigned short s, FILE *file)
-{
-    unsigned char   file_short[2];
-
-    file_short[0] = (s & (unsigned)0xff00) >> 8;
-    file_short[1] = s & 0xff;
-    if (fwrite ((char *) file_short, (int) sizeof (file_short), 1, file) != 1)
-	return 0;
-    return 1;
-}
-
-static int
-write_counted_string (unsigned short count, char *string, FILE *file)
-{
-    if (write_short (count, file) == 0)
-	return 0;
-    if (fwrite (string, (int) sizeof (char), (int) count, file) != count)
-	return 0;
-    return 1;
-}
-
-int
-XauWriteAuth (auth_file, auth)
-FILE	*auth_file;
-Xauth	*auth;
-{
-    if (write_short (auth->family, auth_file) == 0)
-	return 0;
-    if (write_counted_string (auth->address_length, auth->address, auth_file) == 0)
-	return 0;
-    if (write_counted_string (auth->number_length, auth->number, auth_file) == 0)
-	return 0;
-    if (write_counted_string (auth->name_length, auth->name, auth_file) == 0)
-	return 0;
-    if (write_counted_string (auth->data_length, auth->data, auth_file) == 0)
-	return 0;
-    return 1;
-}
diff --git a/xc/lib/Xau/Autest.c b/xc/lib/Xau/Autest.c
deleted file mode 100644
index d6a1ce810..000000000
--- a/xc/lib/Xau/Autest.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* $TOG: Autest.c /main/5 1998/02/06 14:15:03 kaleb $ */
-
-/*
-
-Copyright 1988, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#include <X11/Xauth.h>
-
-main (argc, argv)
-char	**argv;
-{
-    Xauth   test_data;
-    char    *name, *data, *file;
-    int	    state = 0;
-    FILE    *output;
-
-    while (*++argv) {
-	if (!strcmp (*argv, "-file"))
-	    file = *++argv;
-	else if (state == 0) {
-	    name = *argv;
-	    ++state;
-	} else if (state == 1) {
-	    data = *argv;
-	    ++state;
-	}
-    }
-    if(!file) {
-	fprintf (stderr, "No file\n");
-	exit (1);
-    }
-    test_data.family = 0;
-    test_data.address_length = 0;
-    test_data.address = "";
-    test_data.number_length = 0;
-    test_data.number = "";
-    test_data.name_length = strlen (name);
-    test_data.name = name;
-    test_data.data_length = strlen (data);
-    test_data.data = data;
-    output = fopen (file, "w");
-    if (output) {
-	XauWriteAuth (output, &test_data);
-	fclose (output);
-    }
-}
diff --git a/xc/lib/Xau/Imakefile b/xc/lib/Xau/Imakefile
deleted file mode 100644
index a94ff94fc..000000000
--- a/xc/lib/Xau/Imakefile
+++ /dev/null
@@ -1,37 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/27 1996/09/28 16:43:28 rws $
-XCOMM $XFree86: xc/lib/Xau/Imakefile,v 3.5 1999/04/17 09:08:11 dawes Exp $
-#define DoNormalLib NormalLibXau
-#define DoSharedLib SharedLibXau
-#define DoExtraLib SharedLibXau
-#define DoDebugLib DebugLibXau
-#define DoProfileLib ProfileLibXau
-#define LibName Xau
-#define SoRev SOXAUTHREV
-#define IncSubdir X11
-
-#include <Threads.tmpl>
-
-       LINTLIBS = $(LINTXLIB)
-
-#if HasKrb5
-K5ENCSRC = k5encode.c
-K5ENCOBJ = k5encode.o
-INCLUDES = Krb5Includes
-#else
-K5ENCSRC =
-K5ENCOBJ =
-INCLUDES =
-#endif
-
-HEADERS = \
-	Xauth.h
-
-SRCS =	AuDispose.c AuFileName.c AuGetAddr.c AuGetBest.c AuLock.c \
-	AuRead.c AuUnlock.c AuWrite.c $(K5ENCSRC)
-
-OBJS =	AuDispose.o AuFileName.o AuGetAddr.o AuGetBest.o AuLock.o \
-	AuRead.o AuUnlock.o AuWrite.o $(K5ENCOBJ)
-
-#include <Library.tmpl>
-
-DependTarget()
diff --git a/xc/lib/Xau/README b/xc/lib/Xau/README
deleted file mode 100644
index 404eef079..000000000
--- a/xc/lib/Xau/README
+++ /dev/null
@@ -1,184 +0,0 @@
-
-
-		     A Sample Authorization Protocol for X
-
-
-Overview
-
-The following note describes a very simple mechanism for providing individual
-access to an X Window System display.  It uses existing core protocol and
-library hooks for specifying authorization data in the connection setup block
-to restrict use of the display to only those clients that show that they
-know a server-specific key called a "magic cookie".  This mechanism is *not*
-being proposed as an addition to the Xlib standard; among other reasons, a
-protocol extension is needed to support more flexible mechanisms.  We have
-implemented this mechanism already; if you have comments, please send them
-to us.
-
-This scheme involves changes to the following parts of the sample release:
-
-    o  xdm
-	-  generate random magic cookie and store in protected file
-	-  pass name of magic cookie file to server
-	-  when user logs in, add magic cookie to user's auth file
-	-  when user logs out, generate a new cookie for server
-
-    o  server
-	-  a new command line option to specify cookie file
-	-  check client authorization data against magic cookie
-	-  read in cookie whenever the server resets
-	-  do not add local machine to host list if magic cookie given
-
-    o  Xlib
-	-  read in authorization data from file
-	-  find data for appropriate server
-	-  send authorization data if found
-
-    o  xauth [new program to manage user auth file]
-	-  add entries to user's auth file
-	-  remove entries from user's auth file
-
-This mechanism assumes that the superuser and the transport layer between 
-the client and the server is secure.  Organizations that desire stricter
-security are encouraged to look at systems such as Kerberos (at Project
-Athena).
-
-
-Description
-
-The sample implementation will use the xdm Display Manager to set up and
-control the server's authorization file.  Sites that do not run xdm will
-need to build their own mechanisms.  
-
-Xdm uses a random key (seeded by the system time and check sum of /dev/kmem)
-to generate a unique sequence of characters at 16 bytes long.  This sequence
-will be written to a file which is made readable only by the server.  The
-server will then be started with a command line option instructing it to use
-the contents of the file as the magic cookie for connections that include
-authorization data.  This will also disable the server from adding the local
-machine's address to the initial host list.  Note that the actual cookie must
-not be stored on the command line or in an environment variable, to prevent
-it from being publicly obtainable by the "ps" command.
-
-If a client presents an authorization name of "MIT-MAGIC-COOKIE-1" and
-authorization data that matches the magic cookie, that client is allowed
-access.  If the name or data does not match and the host list is empty,
-that client will be denied access.  Otherwise, the existing host-based access
-control will be used.  Since any client that is making a connection from a
-machine on the host list will be granted access even if their authorization
-data is incorrect, sites are strongly urged not to set up any default hosts
-using the /etc/X*.hosts files.  Granting access to other machines should be
-done by the user's session manager instead.
-
-Assuming the server is configured with an empty host list, the existence of the
-cookie is sufficient to ensure there will be no unauthorized access to the
-display.  However, xdm will (continue to) work to minimize the chances of
-spoofing on servers that do not support this authorization mechanism.  This
-will be done by grabbing the server and the keyboard after opening the display.
-This action will be surrounded by a timer which will kill the server if the
-grabs cannot be done within several seconds.  [This level of security is now
-implemented in patches already sent out.]
-
-After the user logs in, xdm will add authorization entries for each of the
-server machine's network addresses to the user's authorization file (the format
-of which is described below).  This file will usually be named .Xauthority in
-the users's home directory; will be owned by the user (as specified by the
-pw_uid and pw_gid fields in the user's password entry), and will be accessible
-only to the user (no group access).  This file will contain authorization data
-for all of the displays opened by the user.
-
-When the session terminates, xdm will generate and store a new magic cookie
-for the server.  Then, xdm will shutdown its own connection and send a
-SIGHUP to the server process, which should cause the server to reset.  The
-server will then read in the new magic cookie.
-
-To support accesses (both read and write) from multiple machines (for use in
-environments that use distributed file systems), file locking is done using
-hard links.  This is done by creat'ing (sic) a lock file and then linking it
-to another name in the same directory.  If the link-target already exists,
-the link will fail, indicating failure to obtain the lock.  Linking is used
-instead of just creating the file read-only since link will fail even for
-the superuser.
-
-Problems and Solutions
-
-There are a few problems with .Xauthority as described.  If no home directory
-exists, or if xdm cannot create a file there (disk full), xdm stores the
-cookie in a file in a resource-specified back-up directory, and sets an
-environment variable in the user's session (called XAUTHORITY) naming this
-file.  There is also the problem that the locking attempts will need to be
-timed out, due to a leftover lock.  Xdm, again, creates a file and set an
-environment variable.  Finally, the back-up directory might be full.  Xdm,
-as a last resort, provides a function key binding that allows a user to log
-in without having the authorization data stored, and with host-based access
-control disabled.
-
-Xlib
-
-XOpenDisplay in Xlib was enhanced to allow specification of authorization
-information.  As implied above, Xlib looks for the data in the
-.Xauthority file of the home directory, or in the file pointed at by the
-XAUTHORITY environment variable instead if that is defined.  This required
-no programmatic interface change to Xlib.  In addition, a new Xlib routine
-is provided to explicitly specify authorization.
-
-	XSetAuthorization(name, namelen, data, datalen)
-		int namelen, datalen;
-		char *name, *data;
-
-There are three types of input:
-
-	name NULL, data don't care	- use default authorization mechanism.
-	name non-NULL, data NULL	- use the named authorization; get
-					  data from that mechanism's default.
-	name non-NULL, data non-NULL	- use the given authorization and data.
-					
-This interface is used by xdm and might also be used by any other
-applications that wish to explicitly set the authorization information.
-
-Authorization File
-
-The .Xauthority file is a binary file consisting of a sequence of entries
-in the following format:
-
-	2 bytes		Family value (second byte is as in protocol HOST)
-	2 bytes		address length (always MSB first)
-	A bytes		host address (as in protocol HOST)
-	2 bytes		display "number" length (always MSB first)
-	S bytes		display "number" string
-	2 bytes		name length (always MSB first)
-	N bytes		authorization name string
-	2 bytes		data length (always MSB first)
-	D bytes		authorization data string
-
-The format is binary for easy processing, since authorization information
-usually consists of arbitrary data.  Host addresses are used instead of
-names to eliminate potentially time-consuming name resolutions in
-XOpenDisplay.  Programs, such as xdm, that initialize the user's
-authorization file will have to do the same work as the server in finding
-addresses for all network interfaces.  If more than one entry matches the
-desired address, the entry that is chosen is implementation-dependent.  In
-our implementation, it is always the first in the file.
-
-The Family is specified in two bytes to allow out-of-band values
-(i.e. values not in the Protocol) to be used.  In particular,
-two new values "FamilyLocal" and "FamilyWild" are defined.  FamilyLocal
-refers to any connections using a non-network method of connetion from the
-local machine (Unix domain sockets, shared memory, loopback serial line).
-In this case the host address is specified by the data returned from
-gethostname() and better be unique in a collection of machines
-which share NFS directories.  FamilyWild is currently used only
-by xdm to communicate authorization data to the server.  It matches
-any family/host address pair.
-
-For FamilyInternet, the host address is the 4 byte internet address, for
-FamilyDecnet, the host address is the byte decnet address, for FamilyChaos
-the address is also two bytes.
-
-The Display Number is the ascii representation of the display number
-portion of the display name.  It is in ascii to allow future expansion
-to PseudoRoots or anything else that might happen.
-
-A utility called "xauth" will be provided for editing and viewing the
-contents of authorization files.  Note that the user's authorization file is
-not the same as the server's magic cookie file.
diff --git a/xc/lib/Xau/Xauth.h b/xc/lib/Xau/Xauth.h
deleted file mode 100644
index c20860f08..000000000
--- a/xc/lib/Xau/Xauth.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/* $TOG: Xauth.h /main/19 1998/02/06 14:15:45 kaleb $ */
-
-/*
-
-Copyright 1988, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-/* $XFree86: xc/lib/Xau/Xauth.h,v 1.3 1998/10/11 11:23:43 dawes Exp $ */
-
-#ifndef _Xauth_h
-#define _Xauth_h
-
-typedef struct xauth {
-    unsigned short   family;
-    unsigned short   address_length;
-    char    	    *address;
-    unsigned short   number_length;
-    char    	    *number;
-    unsigned short   name_length;
-    char    	    *name;
-    unsigned short   data_length;
-    char   	    *data;
-} Xauth;
-
-#ifndef _XAUTH_STRUCT_ONLY
-
-# include   <X11/Xfuncproto.h>
-# include   <X11/Xfuncs.h>
-
-# include   <stdio.h>
-
-# define FamilyLocal (256)	/* not part of X standard (i.e. X.h) */
-# define FamilyWild  (65535)
-# define FamilyNetname    (254)   /* not part of X standard */
-# define FamilyKrb5Principal (253) /* Kerberos 5 principal name */
-# define FamilyLocalHost (252)	/* for local non-net authentication */
-
-
-_XFUNCPROTOBEGIN
-
-char *XauFileName(void);
-
-Xauth *XauReadAuth(
-#if NeedFunctionPrototypes
-FILE*	/* auth_file */
-#endif
-);
-
-int XauLockAuth(
-#if NeedFunctionPrototypes
-_Xconst char*	/* file_name */,
-int		/* retries */,
-int		/* timeout */,
-long		/* dead */
-#endif
-);
-
-int XauUnlockAuth(
-#if NeedFunctionPrototypes
-_Xconst char*	/* file_name */
-#endif
-);
-
-int XauWriteAuth(
-#if NeedFunctionPrototypes
-FILE*		/* auth_file */,
-Xauth*		/* auth */
-#endif
-);
-
-Xauth *XauGetAuthByName(
-#if NeedFunctionPrototypes
-_Xconst char*	/* display_name */
-#endif
-);
-
-Xauth *XauGetAuthByAddr(
-#if NeedFunctionPrototypes
-#if NeedWidePrototypes
-unsigned int	/* family */,
-unsigned int	/* address_length */,
-#else
-unsigned short	/* family */,
-unsigned short	/* address_length */,
-#endif
-_Xconst char*	/* address */,
-#if NeedWidePrototypes
-unsigned int	/* number_length */,
-#else
-unsigned short	/* number_length */,
-#endif
-_Xconst char*	/* number */,
-#if NeedWidePrototypes
-unsigned int	/* name_length */,
-#else
-unsigned short	/* name_length */,
-#endif
-_Xconst char*	/* name */
-#endif
-);
-
-Xauth *XauGetBestAuthByAddr(
-#if NeedFunctionPrototypes
-#if NeedWidePrototypes
-unsigned int	/* family */,
-unsigned int	/* address_length */,
-#else
-unsigned short	/* family */,
-unsigned short	/* address_length */,
-#endif
-_Xconst char*	/* address */,
-#if NeedWidePrototypes
-unsigned int	/* number_length */,
-#else
-unsigned short	/* number_length */,
-#endif
-_Xconst char*	/* number */,
-int		/* types_length */,
-char**		/* type_names */,
-_Xconst int*	/* type_lengths */
-#endif
-);
-
-void XauDisposeAuth(
-#if NeedFunctionPrototypes
-Xauth*		/* auth */
-#endif
-);
-
-#ifdef K5AUTH
-#include <krb5/krb5.h>
-/* 9/93: krb5.h leaks some symbols */
-#undef BITS32
-#undef xfree
-
-int XauKrb5Encode(
-#if NeedFunctionPrototypes
-     krb5_principal	/* princ */,
-     krb5_data *	/* outbuf */
-#endif
-);
-
-int XauKrb5Decode(
-#if NeedFunctionPrototypes
-     krb5_data		/* inbuf */,
-     krb5_principal *	/* princ */
-#endif
-);
-#endif /* K5AUTH */
-
-_XFUNCPROTOEND
-
-/* Return values from XauLockAuth */
-
-# define LOCK_SUCCESS	0	/* lock succeeded */
-# define LOCK_ERROR	1	/* lock unexpectely failed, check errno */
-# define LOCK_TIMEOUT	2	/* lock failed, timeouts expired */
-
-#endif /* _XAUTH_STRUCT_ONLY */
-
-#endif /* _Xauth_h */
diff --git a/xc/lib/Xau/k5encode.c b/xc/lib/Xau/k5encode.c
deleted file mode 100644
index 723d064ec..000000000
--- a/xc/lib/Xau/k5encode.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/* $TOG: k5encode.c /main/7 1998/02/06 14:15:31 kaleb $ */
-
-/*
-
-Copyright 1993, 1994, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-/*
- * functions to encode/decode Kerberos V5 principals
- * into something that can be reasonable spewed over
- * the wire
- *
- * Author: Tom Yu <tlyu@MIT.EDU>
- *
- * Still needs to be fixed up wrt signed/unsigned lengths, but we'll worry
- * about that later.
- */
-
-#include <krb5/krb5.h>
-/* 9/93: krb5.h leaks some symbols */
-#undef BITS32
-#undef xfree
-
-#include <X11/X.h>
-#include <X11/Xos.h>
-#include <X11/Xmd.h>
-#include <X11/Xfuncs.h>
-
-/*
- * XauKrb5Encode
- *
- * this function encodes the principal passed to it in a format that can
- * easily be dealt with by stuffing it into an X packet.  Encoding is as
- * follows:
- *   length count of the realm name
- *   realm
- *   component count
- *   length of component
- *   actual principal component
- *   etc....
- *
- * Note that this function allocates a hunk of memory, which must be
- * freed to avoid nasty memory leak type things.  All counts are
- * byte-swapped if needed. (except for the total length returned)
- *
- * nevermind.... stuffing the encoded packet in net byte order just to
- * always do the right thing.  Don't have to frob with alignment that way.
- */
-int
-XauKrb5Encode(princ, outbuf)
-    krb5_principal princ;	/* principal to encode */
-    krb5_data *outbuf;		/* output buffer */
-{
-    CARD16 i, numparts, totlen = 0, plen, rlen;
-    char *cp, *pdata;
-
-    rlen = krb5_princ_realm(princ)->length;
-    numparts = krb5_princ_size(princ);
-    totlen = 2 + rlen + 2;	/* include room for realm length
-				   and component count */
-    for (i = 0; i < numparts; i++)
-	totlen += krb5_princ_component(princ, i)->length + 2;
-    /* add 2 bytes each time for length */
-    if ((outbuf->data = (char *)malloc(totlen)) == NULL)
-	return -1;
-    cp = outbuf->data;
-    *cp++ = (char)((int)(0xff00 & rlen) >> 8);
-    *cp++ = (char)(0x00ff & rlen);
-    memcpy(cp, krb5_princ_realm(princ)->data, rlen);
-    cp += rlen;
-    *cp++ = (char)((int)(0xff00 & numparts) >> 8);
-    *cp++ = (char)(0x00ff & numparts);
-    for (i = 0; i < numparts; i++)
-    {
-	plen = krb5_princ_component(princ, i)->length;
-	pdata = krb5_princ_component(princ, i)->data;
-	*cp++ = (char)((int)(0xff00 & plen) >> 8);
-	*cp++ = (char)(0x00ff & plen);
-	memcpy(cp, pdata, plen);
-	cp += plen;
-    }
-    outbuf->length = totlen;
-    return 0;
-}
-
-/*
- * XauKrb5Decode
- *
- * This function essentially reverses what XauKrb5Encode does.
- * return value: 0 if okay, -1 if malloc fails, -2 if inbuf format bad
- */
-int
-XauKrb5Decode(inbuf, princ)
-    krb5_data inbuf;
-    krb5_principal *princ;
-{
-    CARD16 i, numparts, plen, rlen;
-    CARD8 *cp, *pdata;
-    
-    if (inbuf.length < 4)
-    {
-	return -2;
-    }
-    *princ = (krb5_principal)malloc(sizeof (krb5_principal_data));
-    if (*princ == NULL)
-	return -1;
-    bzero(*princ, sizeof (krb5_principal_data));
-    cp = (CARD8 *)inbuf.data;
-    rlen = *cp++ << 8;
-    rlen |= *cp++;
-    if (inbuf.length < 4 + (int)rlen + 2)
-    {
-	krb5_free_principal(*princ);
-	return -2;
-    }
-    krb5_princ_realm(*princ)->data = (char *)malloc(rlen);
-    if (krb5_princ_realm(*princ)->data == NULL)
-    {
-	krb5_free_principal(*princ);
-	return -1;
-    }
-    krb5_princ_realm(*princ)->length = rlen;
-    memcpy(krb5_princ_realm(*princ)->data, cp, rlen);
-    cp += rlen;
-    numparts = *cp++ << 8;
-    numparts |= *cp++;
-    krb5_princ_name(*princ) =
-	(krb5_data *)malloc(numparts * sizeof (krb5_data));
-    if (krb5_princ_name(*princ) == NULL)
-    {
-	krb5_free_principal(*princ);
-	return -1;
-    }
-    krb5_princ_size(*princ) = 0;
-    for (i = 0; i < numparts; i++)
-    {
-	if (cp + 2 > (CARD8 *)inbuf.data + inbuf.length)
-	{
-	    krb5_free_principal(*princ);
-	    return -2;
-	}
-	plen = *cp++ << 8;
-	plen |= *cp++;
-	if (cp + plen > (CARD8 *)inbuf.data + inbuf.length)
-	{
-	    krb5_free_principal(*princ);
-	    return -2;
-	}
-	pdata = (CARD8 *)malloc(plen);
-	if (pdata == NULL)
-	{
-	    krb5_free_principal(*princ);
-	    return -1;
-	}
-	krb5_princ_component(*princ, i)->data = (char *)pdata;
-	krb5_princ_component(*princ, i)->length = plen;
-	memcpy(pdata, cp, plen);
-	cp += plen;
-	krb5_princ_size(*princ)++;
-    }
-    return 0;
-}
diff --git a/xc/lib/Xbsd/Berklib.c b/xc/lib/Xbsd/Berklib.c
deleted file mode 100644
index 254428fe6..000000000
--- a/xc/lib/Xbsd/Berklib.c
+++ /dev/null
@@ -1,327 +0,0 @@
-/* $TOG: Berklib.c /main/26 1998/02/06 14:20:17 kaleb $ */
-/*
-
-Copyright 1987, 1998 The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/* $XFree86: xc/lib/Xbsd/Berklib.c,v 3.6 1998/10/03 08:42:49 dawes Exp $ */
-
-
-/*
- * These are routines found in BSD but not on all other systems.  The core
- * MIT distribution does not use them except for ffs in the server, unless
- * the system is seriously deficient.  You should enable only the ones that
- * you need for your system.  Use Xfuncs.h in clients to avoid using the
- * slow versions of bcopy, bcmp, and bzero provided here.
- */
-
-#include <sys/types.h>
-
-#ifdef hpux
-#define WANT_RANDOM
-#define WANT_QUE
-#endif
-
-#ifdef macII
-/* silly bcopy in A/UX does not handle overlaps */
-#define WANT_BFUNCS
-#define WANT_MEMMOVE
-#define NO_BZERO
-#define WANT_RANDOM
-#endif
-
-#if defined(SVR4) && !defined(SCO325)
-#define WANT_BFUNCS
-#define WANT_FFS
-#define WANT_RANDOM
-#endif
-
-#ifdef hcx
-#define WANT_FFS
-#endif
-
-#ifdef SYSV
-#ifdef i386
-#ifndef SCO
-#define WANT_FFS
-#define WANT_MEMMOVE
-#endif
-#endif
-#endif
-
-#ifdef _SEQUENT_
-#define WANT_GTOD
-#define WANT_FFS
-#endif /* _SEQUENT_ */
-
-/* you should use Xfuncs.h in code instead of relying on Berklib */
-#ifdef WANT_BFUNCS
-
-#include <X11/Xosdefs.h>
-
-#if (__STDC__ && !defined(X_NOT_STDC_ENV)) || defined(SVR4) || defined(hpux)
-
-#include <string.h>
-
-void bcopy (b1, b2, length)
-    register char *b1, *b2;
-    register int length;
-{
-    memmove(b2, b1, (size_t)length);
-}
-
-int bcmp (b1, b2, length)
-    register char *b1, *b2;
-    register int length;
-{
-    return memcmp(b1, b2, (size_t)length);
-}
-
-void bzero (b, length)
-    register char *b;
-    register int length;
-{
-    memset(b, 0, (size_t)length);
-}
-
-#else
-
-void bcopy (b1, b2, length)
-    register char *b1, *b2;
-    register int length;
-{
-    if (b1 < b2) {
-	b2 += length;
-	b1 += length;
-	while (length--)
-	    *--b2 = *--b1;
-    } else {
-	while (length--)
-	    *b2++ = *b1++;
-    }
-}
-
-#if defined(SYSV)
-
-#include <memory.h>
-
-int bcmp (b1, b2, length)
-    register char *b1, *b2;
-    register int length;
-{
-    return memcmp(b1, b2, length);
-}
-
-#ifndef NO_BZERO
-
-bzero (b, length)
-    register char *b;
-    register int length;
-{
-    memset(b, 0, length);
-}
-
-#endif
-
-#else
-
-int bcmp (b1, b2, length)
-    register char *b1, *b2;
-    register int length;
-{
-    while (length--) {
-	if (*b1++ != *b2++) return 1;
-    }
-    return 0;
-}
-
-void bzero (b, length)
-    register char *b;
-    register int length;
-{
-    while (length--)
-	*b++ = '\0';
-}
-
-#endif
-#endif
-#endif /* WANT_BFUNCS */
-
-#ifdef WANT_MEMMOVE
-char *memmove (b1, b2, length)
-    register char *b1, *b2;
-    register int length;
-{
-    char *sb1 = b1;
-
-    if (b2 < b1) {
-	b1 += length;
-	b2 += length;
-	while (length--)
-	    *--b1 = *--b2;
-    } else {
-	while (length--)
-	    *b1++ = *b2++;
-    }
-    return sb1;
-}
-#endif
-
-#ifdef WANT_FFS
-int
-ffs(mask)
-unsigned int	mask;
-{
-    register i;
-
-    if ( ! mask ) return 0;
-    i = 1;
-    while (! (mask & 1)) {
-	i++;
-	mask = mask >> 1;
-    }
-    return i;
-}
-#endif
-
-#ifdef WANT_RANDOM
-#if defined(SYSV) || defined(SVR4) || defined(hpux)
-
-long lrand48();
-
-long random()
-{
-   return (lrand48());
-}
-
-void srandom(seed)
-    int seed;
-{
-   srand48(seed);
-}
-
-#else
-
-long random()
-{
-   return (rand());
-}
-
-void srandom(seed)
-    int seed;
-{
-   srand(seed);
-}
-
-#endif
-#endif /* WANT_RANDOM */
-
-/*
- * insque, remque - insert/remove element from a queue
- *
- * DESCRIPTION
- *      Insque and remque manipulate queues built from doubly linked
- *      lists.  Each element in the queue must in the form of
- *      ``struct qelem''.  Insque inserts elem in a queue immedi-
- *      ately after pred; remque removes an entry elem from a queue.
- *
- * SEE ALSO
- *      ``VAX Architecture Handbook'', pp. 228-235.
- */
-
-#ifdef WANT_QUE
-struct qelem {
-    struct    qelem *q_forw;
-    struct    qelem *q_back;
-    char *q_data;
-    };
-
-insque(elem, pred)
-register struct qelem *elem, *pred;
-{
-    register struct qelem *q;
-    /* Insert locking code here */
-    if ( elem->q_forw = q = (pred ? pred->q_forw : pred) )
-	q->q_back = elem;
-    if ( elem->q_back = pred )
-	pred->q_forw = elem;
-    /* Insert unlocking code here */
-}
-
-remque(elem)
-register struct qelem *elem;
-{
-    register struct qelem *q;
-    if ( ! elem ) return;
-    /* Insert locking code here */
-
-    if ( q = elem->q_back ) q->q_forw = elem->q_forw;
-    if ( q = elem->q_forw ) q->q_back = elem->q_back;
-
-    /* insert unlocking code here */
-}
-#endif /* WANT_QUE */
-
-/*
- * gettimeofday emulation
- * Caution -- emulation is incomplete
- *  - has only second, not microsecond, resolution.
- *  - does not return timezone info.
- */
-
-#ifdef WANT_GTOD
-
-#ifdef _SEQUENT_
-#include <X11/Xos.h>
-#endif /* _SEQUENT_ */
-
-int gettimeofday (tvp, tzp)
-    struct timeval *tvp;
-    struct timezone *tzp;
-{
-#ifdef _SEQUENT_
-    /*
-     * Sequent has microsecond resolution. Need to link with -lseq
-     */
-    get_process_stats (tvp, -1, NULL, NULL);
-#ifndef SVR4
-    if (tzp)
-    {
-        tzset ();
-        tzp->tz_minuteswest = timezone / 60;
-        tzp->tz_dsttime = daylight;
-    }
-#endif /* SVR4 */
-    return (0);
-#else /* _SEQUENT_ */
-    time (&tvp->tv_sec);
-    tvp->tv_usec = 0L;
-
-#ifndef SVR4
-    if (tzp) {
-	fprintf( stderr,
-		 "Warning: gettimeofday() emulation does not return timezone\n"
-		);
-    }
-#endif /* SVR4 */
-#endif /* _SEQUENT_ */
-}
-#endif /* WANT_GTOD */
diff --git a/xc/lib/Xbsd/Imakefile b/xc/lib/Xbsd/Imakefile
deleted file mode 100644
index 13c6056af..000000000
--- a/xc/lib/Xbsd/Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
-XCOMM $XConsortium: Imakefile,v 1.6 94/11/21 18:24:13 kaleb Exp $
-XCOMM $XFree86: xc/lib/Xbsd/Imakefile,v 3.2 1999/04/17 09:08:11 dawes Exp $
-SRCS = Berklib.c
-OBJS = Berklib.o
-
-#undef _LinkBuildLibrary
-#define _LinkBuildLibrary(lib) LinkBuildLibrary(lib)
-NormalLibraryTarget(Xbsd,$(OBJS))
-InstallLibrary(Xbsd,$(USRLIBDIR))
-
-DependTarget()
diff --git a/xc/lib/Xdmcp/A8Eq.c b/xc/lib/Xdmcp/A8Eq.c
deleted file mode 100644
index cbe11421e..000000000
--- a/xc/lib/Xdmcp/A8Eq.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * $TOG: A8Eq.c /main/5 1998/02/06 14:38:24 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-int
-XdmcpARRAY8Equal (array1, array2)
-    ARRAY8Ptr	array1, array2;
-{
-    int	i;
-
-    if (array1->length != array2->length)
-	return FALSE;
-    for (i = 0; i < (int)array1->length; i++)
-	if (array1->data[i] != array2->data[i])
-	    return FALSE;
-    return TRUE;
-}
diff --git a/xc/lib/Xdmcp/AA16.c b/xc/lib/Xdmcp/AA16.c
deleted file mode 100644
index b8ebfb865..000000000
--- a/xc/lib/Xdmcp/AA16.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * $TOG: AA16.c /main/4 1998/02/06 14:38:30 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-/* $XFree86: xc/lib/Xdmcp/AA16.c,v 1.2 1998/10/10 15:25:11 dawes Exp $ */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-int
-XdmcpAllocARRAY16 (ARRAY16Ptr array, int length)
-{
-    CARD16Ptr	newData;
-
-    newData = (CARD16Ptr) Xalloc (length * sizeof (CARD16));
-    if (!newData)
-	return FALSE;
-    array->length = length;
-    array->data = newData;
-    return TRUE;
-}
diff --git a/xc/lib/Xdmcp/AA32.c b/xc/lib/Xdmcp/AA32.c
deleted file mode 100644
index ce7d29d4f..000000000
--- a/xc/lib/Xdmcp/AA32.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * $TOG: AA32.c /main/4 1998/02/06 14:38:36 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-/* $XFree86: xc/lib/Xdmcp/AA32.c,v 1.2 1998/10/10 15:25:11 dawes Exp $ */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-int
-XdmcpAllocARRAY32 (ARRAY32Ptr array, int length)
-{
-    CARD32Ptr	newData;
-
-    newData = (CARD32Ptr) Xalloc (length * sizeof (CARD32));
-    if (!newData)
-	return FALSE;
-    array->length = length;
-    array->data = newData;
-    return TRUE;
-}
diff --git a/xc/lib/Xdmcp/AA8.c b/xc/lib/Xdmcp/AA8.c
deleted file mode 100644
index 0437e6cc9..000000000
--- a/xc/lib/Xdmcp/AA8.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * $TOG: AA8.c /main/4 1998/02/06 14:38:42 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-/* $XFree86: xc/lib/Xdmcp/AA8.c,v 1.2 1998/10/10 15:25:12 dawes Exp $ */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-int
-XdmcpAllocARRAY8 (ARRAY8Ptr array, int length)
-{
-    CARD8Ptr	newData;
-
-    newData = (CARD8Ptr) Xalloc (length * sizeof (CARD8));
-    if (!newData)
-	return FALSE;
-    array->length = length;
-    array->data = newData;
-    return TRUE;
-}
diff --git a/xc/lib/Xdmcp/Alloc.c b/xc/lib/Xdmcp/Alloc.c
deleted file mode 100644
index 9e5898402..000000000
--- a/xc/lib/Xdmcp/Alloc.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * $TOG: Alloc.c /main/3 1998/02/06 14:38:48 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-/* $XFree86: xc/lib/Xdmcp/Alloc.c,v 3.2 1998/10/10 15:25:13 dawes Exp $ */
-
-/* stubs for use when Xalloc, Xrealloc and Xfree are not defined */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-#ifndef X_NOT_STDC_ENV
-#include <stdlib.h>
-#else
-char *malloc(size_t), *realloc(char *, size_t);
-#endif
-
-void *
-Xalloc (unsigned long amount)
-{
-    if (amount == 0)
-	amount = 1;
-    return malloc (amount);
-}
-
-void *
-Xrealloc (void *old, unsigned long amount)
-{
-    if (amount == 0)
-	amount = 1;
-    if (!old)
-	return malloc (amount);
-    return realloc ((char *) old, amount);
-}
-
-void
-Xfree (void *old)
-{
-    if (old)
-	free ((char *) old);
-}
diff --git a/xc/lib/Xdmcp/AofA8.c b/xc/lib/Xdmcp/AofA8.c
deleted file mode 100644
index b0597b1e0..000000000
--- a/xc/lib/Xdmcp/AofA8.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * $TOG: AofA8.c /main/5 1998/02/06 14:38:53 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-/* $XFree86: xc/lib/Xdmcp/AofA8.c,v 1.2 1998/10/10 15:25:13 dawes Exp $ */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-int
-XdmcpAllocARRAYofARRAY8 (ARRAYofARRAY8Ptr array, int length)
-{
-    ARRAY8Ptr	newData;
-
-    newData = (ARRAY8Ptr) Xalloc (length * sizeof (ARRAY8));
-    if (!newData)
-	return FALSE;
-    array->length = length;
-    array->data = newData;
-    return TRUE;
-}
diff --git a/xc/lib/Xdmcp/CA8.c b/xc/lib/Xdmcp/CA8.c
deleted file mode 100644
index 8f20956bd..000000000
--- a/xc/lib/Xdmcp/CA8.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * $TOG: CA8.c /main/6 1998/02/06 14:38:59 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-#include <X11/Xfuncs.h>
-
-int
-XdmcpCopyARRAY8 (src, dst)
-    ARRAY8Ptr	src, dst;
-{
-    dst->length = src->length;
-    dst->data = (CARD8 *) Xalloc (dst->length * sizeof (CARD8));
-    if (!dst->data)
-	return FALSE;
-    memmove (dst->data, src->data, src->length * sizeof (CARD8));
-    return TRUE;
-}
diff --git a/xc/lib/Xdmcp/CmpKey.c b/xc/lib/Xdmcp/CmpKey.c
deleted file mode 100644
index dafe102de..000000000
--- a/xc/lib/Xdmcp/CmpKey.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * $TOG: CmpKey.c /main/4 1998/02/06 14:39:05 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-/* $XFree86: xc/lib/Xdmcp/CmpKey.c,v 1.2 1998/10/10 15:25:14 dawes Exp $ */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-int
-XdmcpCompareKeys (XdmAuthKeyPtr a, XdmAuthKeyPtr b)
-{
-    int	i;
-
-    for (i = 0; i < 8; i++)
-	if (a->data[i] != b->data[i])
-	    return FALSE;
-    return TRUE;
-}
diff --git a/xc/lib/Xdmcp/DA16.c b/xc/lib/Xdmcp/DA16.c
deleted file mode 100644
index 67333652a..000000000
--- a/xc/lib/Xdmcp/DA16.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * $TOG: DA16.c /main/5 1998/02/06 14:39:10 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-/* $XFree86: xc/lib/Xdmcp/DA16.c,v 1.4 1998/10/10 15:25:14 dawes Exp $ */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-void
-XdmcpDisposeARRAY16 (ARRAY16Ptr array)
-{
-    if (array->data != NULL) Xfree (array->data);
-    array->length = 0;
-    array->data = NULL;
-}
diff --git a/xc/lib/Xdmcp/DA32.c b/xc/lib/Xdmcp/DA32.c
deleted file mode 100644
index e4fcae831..000000000
--- a/xc/lib/Xdmcp/DA32.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * $TOG: DA32.c /main/5 1998/02/06 14:39:15 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-void
-XdmcpDisposeARRAY32 (array)
-    ARRAY32Ptr	array;
-{
-    if (array->data != NULL) Xfree (array->data);
-    array->length = 0;
-    array->data = NULL;
-}
diff --git a/xc/lib/Xdmcp/DA8.c b/xc/lib/Xdmcp/DA8.c
deleted file mode 100644
index 2af63d334..000000000
--- a/xc/lib/Xdmcp/DA8.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * $TOG: DA8.c /main/5 1998/02/06 14:39:20 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-void
-XdmcpDisposeARRAY8 (array)
-    ARRAY8Ptr	array;
-{
-    if (array->data != NULL) Xfree (array->data);
-    array->length = 0;
-    array->data = NULL;
-}
diff --git a/xc/lib/Xdmcp/DAofA8.c b/xc/lib/Xdmcp/DAofA8.c
deleted file mode 100644
index 69ac8a61c..000000000
--- a/xc/lib/Xdmcp/DAofA8.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * $TOG: DAofA8.c /main/7 1998/06/25 16:26:01 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-void
-XdmcpDisposeARRAYofARRAY8 (array)
-    ARRAYofARRAY8Ptr	array;
-{
-    int	i;
-
-    for (i = 0; i < (int)array->length; i++)
-	XdmcpDisposeARRAY8 (&array->data[i]);
-    if (array->data != NULL) Xfree (array->data);
-    array->length = 0;
-    array->data = NULL;
-}
diff --git a/xc/lib/Xdmcp/DecKey.c b/xc/lib/Xdmcp/DecKey.c
deleted file mode 100644
index 351bccaa8..000000000
--- a/xc/lib/Xdmcp/DecKey.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * $TOG: DecKey.c /main/4 1998/02/06 14:39:30 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-/* $XFree86: xc/lib/Xdmcp/DecKey.c,v 1.2 1998/10/10 15:25:14 dawes Exp $ */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-void
-XdmcpDecrementKey (XdmAuthKeyPtr key)
-{
-    int	i;
-
-    i = 7;
-    while (key->data[i]-- == 0)
-	if (--i < 0)
-	    break;
-}
diff --git a/xc/lib/Xdmcp/Fill.c b/xc/lib/Xdmcp/Fill.c
deleted file mode 100644
index 4fa8374a3..000000000
--- a/xc/lib/Xdmcp/Fill.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * $TOG: Fill.c /main/12 1998/02/06 14:39:37 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-/* $XFree86: xc/lib/Xdmcp/Fill.c,v 3.5 1998/10/03 08:42:51 dawes Exp $ */
-
-#ifdef WIN32
-#define _WILLWINSOCK_
-#endif
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-#ifdef STREAMSCONN
-#include <tiuser.h>
-#else
-#ifdef WIN32
-#include <X11/Xwinsock.h>
-#else
-#ifndef MINIX
-#ifndef Lynx
-#include <sys/socket.h>
-#else
-#include <socket.h>
-#endif /* !Lynx */
-#endif /* !MINIX */
-#endif
-#endif
-
-#ifndef MINIX
-int
-XdmcpFill (fd, buffer, from, fromlen)
-    int		    fd;
-    XdmcpBufferPtr  buffer;
-    XdmcpNetaddr    from;	/* return */
-    int		    *fromlen;	/* return */
-{
-    BYTE    *newBuf;
-#ifdef STREAMSCONN
-    struct t_unitdata dataunit;
-    int gotallflag, result;
-#endif
-
-    if (buffer->size < XDM_MAX_MSGLEN)
-    {
-	newBuf = (BYTE *) Xalloc (XDM_MAX_MSGLEN);
-	if (newBuf)
-	{
-	    Xfree (buffer->data);
-	    buffer->data = newBuf;
-	    buffer->size = XDM_MAX_MSGLEN;
-	}
-    }
-    buffer->pointer = 0;
-#ifdef STREAMSCONN
-    dataunit.addr.buf = from;
-    dataunit.addr.maxlen = *fromlen;
-    dataunit.opt.maxlen = 0;	/* don't care to know about options */
-    dataunit.udata.buf = (char *)buffer->data;
-    dataunit.udata.maxlen = buffer->size;
-    result = t_rcvudata (fd, &dataunit, &gotallflag);
-    if (result < 0) {
-	return FALSE;
-    }
-    buffer->count = dataunit.udata.len;
-    *fromlen = dataunit.addr.len;
-#else
-    buffer->count = recvfrom (fd, (char*)buffer->data, buffer->size, 0,
-			      (struct sockaddr *)from, fromlen);
-#endif
-    if (buffer->count < 6) {
-	buffer->count = 0;
-	return FALSE;
-    }
-    return TRUE;
-}
-#else /* MINIX */
-int
-MNX_XdmcpFill (fd, buffer, from, fromlen, data, datalen)
-    int		    fd;
-    XdmcpBufferPtr  buffer;
-    XdmcpNetaddr    from;	/* return */
-    int		    *fromlen;	/* return */
-    char	    *data;
-    int		    datalen;
-{
-    BYTE    *newBuf;
-    struct sockaddr_in *from_addr;
-    udp_io_hdr_t *udp_io_hdr;
-
-    if (buffer->size < XDM_MAX_MSGLEN)
-    {
-	newBuf = (BYTE *) Xalloc (XDM_MAX_MSGLEN);
-	if (newBuf)
-	{
-	    Xfree (buffer->data);
-	    buffer->data = newBuf;
-	    buffer->size = XDM_MAX_MSGLEN;
-	}
-    }
-    buffer->pointer = 0;
-    udp_io_hdr= (udp_io_hdr_t *)data;
-    data += sizeof(udp_io_hdr_t) + udp_io_hdr->uih_ip_opt_len;
-    datalen -= sizeof(udp_io_hdr_t) + udp_io_hdr->uih_ip_opt_len;
-    buffer->count= udp_io_hdr->uih_data_len;
-    if (buffer->count > datalen)
-    {
-    	buffer->count= 0;
-    	return FALSE;
-    }
-    bcopy(data, (char *)buffer->data, buffer->count);
-    from_addr= (struct sockaddr_in *)from;
-    from_addr->sin_family= AF_INET;
-    from_addr->sin_addr.s_addr= udp_io_hdr->uih_src_addr;
-    from_addr->sin_port= udp_io_hdr->uih_src_port;
-    if (buffer->count < 6) {
-	buffer->count = 0;
-	return FALSE;
-    }
-    return TRUE;
-}
-#endif /* !MINIX */
diff --git a/xc/lib/Xdmcp/Flush.c b/xc/lib/Xdmcp/Flush.c
deleted file mode 100644
index 9de902aab..000000000
--- a/xc/lib/Xdmcp/Flush.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * $TOG: Flush.c /main/12 1998/02/06 14:39:43 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-/* $XFree86: xc/lib/Xdmcp/Flush.c,v 3.5 1998/10/03 08:42:51 dawes Exp $ */
-
-#ifdef WIN32
-#define _WILLWINSOCK_
-#endif
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-#ifdef STREAMSCONN
-#include <tiuser.h>
-#else
-#ifdef WIN32
-#include <X11/Xwinsock.h>
-#else
-#ifndef MINIX
-#ifndef Lynx
-#include <sys/socket.h>
-#else
-#include <socket.h>
-#endif /* !Lynx */
-#endif /* !MINIX */
-#endif
-#endif
-
-int
-XdmcpFlush (fd, buffer, to, tolen)
-    int		    fd;
-    XdmcpBufferPtr  buffer;
-    XdmcpNetaddr    to;
-    int		    tolen;
-{
-    int result;
-#ifdef MINIX
-    struct sockaddr_in *to_addr;
-    char *b;
-    udp_io_hdr_t *udp_io_hdr;
-    int flags, s_errno;
-#endif /* MINIX */
-
-#ifdef STREAMSCONN
-    struct t_unitdata dataunit;
-
-    dataunit.addr.buf = to;
-    dataunit.addr.len = tolen;
-    dataunit.opt.len = 0;	/* default options */
-    dataunit.udata.buf = (char *)buffer->data;
-    dataunit.udata.len = buffer->pointer;
-    result = t_sndudata(fd, &dataunit);
-    if (result < 0)
-	return FALSE;
-#else
-#ifndef MINIX
-    result = sendto (fd, (char *)buffer->data, buffer->pointer, 0,
-		     (struct sockaddr *)to, tolen);
-    if (result != buffer->pointer)
-	return FALSE;
-#else /* MINIX */
-    to_addr= (struct sockaddr_in *)to;
-    b= (char *)Xalloc(buffer->pointer + sizeof(udp_io_hdr_t));
-    if (b == NULL)
-    	return FALSE;
-    udp_io_hdr= (udp_io_hdr_t *)b;
-    bcopy((char *)buffer->data, b+sizeof(udp_io_hdr_t), buffer->pointer);
-    udp_io_hdr->uih_dst_addr= to_addr->sin_addr.s_addr;
-    udp_io_hdr->uih_dst_port= to_addr->sin_port;
-    udp_io_hdr->uih_ip_opt_len= 0;
-    udp_io_hdr->uih_data_len= buffer->pointer;
-
-    /* Make the write synchronous by turning of asynch I/O */
-    flags= fcntl(fd, F_GETFD);
-    fcntl(fd, F_SETFD, flags & ~FD_ASYNCHIO);
-    result= write(fd, b, buffer->pointer + sizeof(udp_io_hdr_t));
-    s_errno= errno;
-    Xfree(b);
-    fcntl(fd, F_SETFD, flags);
-    if (result != buffer->pointer + sizeof(udp_io_hdr_t))
-    	return FALSE;
-#endif /* MINIX */
-#endif
-    return TRUE;
-}
diff --git a/xc/lib/Xdmcp/GenKey.c b/xc/lib/Xdmcp/GenKey.c
deleted file mode 100644
index 9c0f3add3..000000000
--- a/xc/lib/Xdmcp/GenKey.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * $TOG: GenKey.c /main/7 1998/02/06 14:39:49 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-/* $XFree86: xc/lib/Xdmcp/GenKey.c,v 3.4 1998/10/21 06:12:00 dawes Exp $ */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-static void
-getbits (long data, unsigned char *dst)
-{
-    dst[0] = (data      ) & 0xff;
-    dst[1] = (data >>  8) & 0xff;
-    dst[2] = (data >> 16) & 0xff;
-    dst[3] = (data >> 24) & 0xff;
-}
-
-/* EMX is not STDC, but sometimes it is */
-#if defined(X_NOT_STDC_ENV) && !defined(__EMX__)
-#define Time_t long
-extern Time_t time ();
-#else
-#define Time_t time_t
-#endif
-
-#if defined(linux) || defined(CSRG_BASED) || (defined(sun) && defined(SVR4))
-#include <stdlib.h>
-#else
-long random();
-#endif
-
-#if defined(SYSV) || defined(SVR4)
-#define srandom srand48
-#define random lrand48
-#endif
-
-void
-XdmcpGenerateKey (XdmAuthKeyPtr key)
-{
-    long    lowbits, highbits;
-
-    srandom ((int)getpid() ^ time((Time_t *)0));
-    lowbits = random ();
-    highbits = random ();
-    getbits (lowbits, key->data);
-    getbits (highbits, key->data + 4);
-}
diff --git a/xc/lib/Xdmcp/Imakefile b/xc/lib/Xdmcp/Imakefile
deleted file mode 100644
index 62e042db0..000000000
--- a/xc/lib/Xdmcp/Imakefile
+++ /dev/null
@@ -1,112 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/25 1996/09/28 16:43:40 rws $
-XCOMM $XFree86: xc/lib/Xdmcp/Imakefile,v 3.4 1999/04/17 09:08:12 dawes Exp $
-#define DoNormalLib NormalLibXdmcp
-#define DoSharedLib SharedLibXdmcp
-#define DoExtraLib SharedLibXdmcp
-#define DoDebugLib DebugLibXdmcp
-#define DoProfileLib ProfileLibXdmcp
-#define LibName Xdmcp
-#define SoRev SOXDMCPREV
-#define IncSubdir X11
-
-#if HasXdmAuth
-AUTHDEFS = -DHASXDMAUTH
-AUTHSRCS = Wrap.c Unwrap.c Wraphelp.c
-AUTHOBJS = Wrap.o Unwrap.o Wraphelp.o
-#endif
-
-DEFINES = $(AUTHDEFS)
-
-HEADERS = Xdmcp.h
-
-SRCS = \
-	A8Eq.c \
-	AA8.c \
-	AA16.c \
-	AA32.c \
-	AofA8.c \
-	CA8.c \
-	DA8.c \
-	DA16.c \
-	DA32.c \
-	DAofA8.c \
-	Fill.c \
-	Flush.c \
-	RA8.c \
-	RA16.c \
-	RA32.c \
-	RAofA8.c \
-	RC8.c \
-	RC16.c \
-	RC32.c \
-	RHead.c \
-	RR.c \
-	RaA8.c \
-	RaA16.c \
-	RaA32.c \
-	RaAoA8.c \
-	WA8.c \
-	WA16.c \
-	WA32.c \
-	WAofA8.c \
-	WC8.c \
-	WC16.c \
-	WC32.c \
-	Whead.c \
-	Alloc.c \
-	CmpKey.c \
-	DecKey.c \
-	GenKey.c \
-	IncKey.c \
-	$(AUTHSRCS)
-
-OBJS = \
-	A8Eq.o \
-	AA8.o \
-	AA16.o \
-	AA32.o \
-	AofA8.o \
-	CA8.o \
-	DA8.o \
-	DA16.o \
-	DA32.o \
-	DAofA8.o \
-	Fill.o \
-	Flush.o \
-	RA8.o \
-	RA16.o \
-	RA32.o \
-	RAofA8.o \
-	RC8.o \
-	RC16.o \
-	RC32.o \
-	RHead.o \
-	RR.o \
-	RaA8.o \
-	RaA16.o \
-	RaA32.o \
-	RaAoA8.o \
-	WA8.o \
-	WA16.o \
-	WA32.o \
-	WAofA8.o \
-	WC8.o \
-	WC16.o \
-	WC32.o \
-	Whead.o \
-	Alloc.o \
-	CmpKey.o \
-	DecKey.o \
-	GenKey.o \
-	IncKey.o \
-	$(AUTHOBJS)
-
-#include <Library.tmpl>
-
-#ifdef WraphelpSourceRule
-WraphelpSourceRule()
-#endif
-SpecialCLibObjectRule(Fill,$(ICONFIGFILES),$(CONNECTION_FLAGS))
-SpecialCLibObjectRule(Flush,$(ICONFIGFILES),$(CONNECTION_FLAGS))
-
-DependTarget()
diff --git a/xc/lib/Xdmcp/IncKey.c b/xc/lib/Xdmcp/IncKey.c
deleted file mode 100644
index 688051951..000000000
--- a/xc/lib/Xdmcp/IncKey.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * $TOG: IncKey.c /main/4 1998/02/06 14:39:54 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-/* $XFree86: xc/lib/Xdmcp/IncKey.c,v 1.2 1998/10/10 15:25:15 dawes Exp $ */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-void
-XdmcpIncrementKey (XdmAuthKeyPtr key)
-{
-    int	i;
-
-    i = 7;
-    while (++key->data[i] == 0)
-	if (--i < 0)
-	    break;
-}
diff --git a/xc/lib/Xdmcp/RA16.c b/xc/lib/Xdmcp/RA16.c
deleted file mode 100644
index 642b70dec..000000000
--- a/xc/lib/Xdmcp/RA16.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * $TOG: RA16.c /main/7 1998/06/25 16:26:16 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-int
-XdmcpReadARRAY16 (buffer, array)
-    XdmcpBufferPtr  buffer;
-    ARRAY16Ptr	    array;
-{
-    int	    i;
-
-    if (!XdmcpReadCARD8 (buffer, &array->length))
-	return FALSE;
-    if (!array->length)
-    {
-	array->data = NULL;
-	return TRUE;
-    }
-    array->data = (CARD16 *) Xalloc (array->length * sizeof (CARD16));
-    if (!array->data)
-	return FALSE;
-    for (i = 0; i < (int)array->length; i++)
-    {
-	if (!XdmcpReadCARD16 (buffer, &array->data[i]))
-	{
-	    Xfree (array->data);
-	    array->data = NULL;
-	    array->length = 0;
-	    return FALSE;
-	}
-    }
-    return TRUE;
-}
diff --git a/xc/lib/Xdmcp/RA32.c b/xc/lib/Xdmcp/RA32.c
deleted file mode 100644
index 5e4cd9cf5..000000000
--- a/xc/lib/Xdmcp/RA32.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * $TOG: RA32.c /main/7 1998/06/25 16:26:21 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-int
-XdmcpReadARRAY32 (buffer, array)
-    XdmcpBufferPtr  buffer;
-    ARRAY32Ptr	    array;
-{
-    int	    i;
-
-    if (!XdmcpReadCARD8 (buffer, &array->length))
-	return FALSE;
-    if (!array->length)
-    {
-	array->data = NULL;
-	return TRUE;
-    }
-    array->data = (CARD32 *) Xalloc (array->length * sizeof (CARD32));
-    if (!array->data)
-	return FALSE;
-    for (i = 0; i < (int)array->length; i++)
-    {
-	if (!XdmcpReadCARD32 (buffer, &array->data[i]))
-	{
-	    Xfree (array->data);
-	    array->data = NULL;
-	    array->length = 0;
-	    return FALSE;
-	}
-    }
-    return TRUE;
-}
diff --git a/xc/lib/Xdmcp/RA8.c b/xc/lib/Xdmcp/RA8.c
deleted file mode 100644
index cbba7f18e..000000000
--- a/xc/lib/Xdmcp/RA8.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * $TOG: RA8.c /main/7 1998/06/25 16:26:12 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-int
-XdmcpReadARRAY8 (buffer, array)
-    XdmcpBufferPtr  buffer;
-    ARRAY8Ptr	    array;
-{
-    int	    i;
-
-    if (!XdmcpReadCARD16 (buffer, &array->length))
-	return FALSE;
-    if (!array->length)
-    {
-	array->data = NULL;
-	return TRUE;
-    }
-    array->data = (CARD8 *) Xalloc (array->length * sizeof (CARD8));
-    if (!array->data)
-	return FALSE;
-    for (i = 0; i < (int)array->length; i++)
-    {
-	if (!XdmcpReadCARD8 (buffer, &array->data[i]))
-	{
-	    Xfree (array->data);
-	    array->data = NULL;
-	    array->length = 0;
-	    return FALSE;
-	}
-    }
-    return TRUE;
-}
diff --git a/xc/lib/Xdmcp/RAofA8.c b/xc/lib/Xdmcp/RAofA8.c
deleted file mode 100644
index e2e48c6d1..000000000
--- a/xc/lib/Xdmcp/RAofA8.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * $TOG: RAofA8.c /main/7 1998/06/25 16:26:07 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-int
-XdmcpReadARRAYofARRAY8 (buffer, array)
-    XdmcpBufferPtr	buffer;
-    ARRAYofARRAY8Ptr	array;
-{
-    int	    i;
-
-    if (!XdmcpReadCARD8 (buffer, &array->length))
-	return FALSE;
-    if (!array->length)
-    {
-	array->data = NULL;
-	return TRUE;
-    }
-    array->data = (ARRAY8 *) Xalloc (array->length * sizeof (ARRAY8));
-    if (!array->data)
-	return FALSE;
-    for (i = 0; i < (int)array->length; i++)
-    {
-	if (!XdmcpReadARRAY8 (buffer, &array->data[i]))
-	{
-	    Xfree (array->data);
-	    array->data = NULL;
-	    array->length = 0;
-	    return FALSE;
-	}
-    }
-    return TRUE;
-}
diff --git a/xc/lib/Xdmcp/RC16.c b/xc/lib/Xdmcp/RC16.c
deleted file mode 100644
index 0e5ddd404..000000000
--- a/xc/lib/Xdmcp/RC16.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * $TOG: RC16.c /main/4 1998/02/06 14:40:39 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-int
-XdmcpReadCARD16 (buffer, valuep)
-    XdmcpBufferPtr  buffer;
-    CARD16Ptr	    valuep;
-{
-    CARD8   high, low;
-
-    if (XdmcpReadCARD8 (buffer, &high) &&
-        XdmcpReadCARD8 (buffer, &low))
-    {
-	*valuep = (((CARD16) high) << 8) | ((CARD16) low);
-	return TRUE;
-    }
-    return FALSE;
-}
diff --git a/xc/lib/Xdmcp/RC32.c b/xc/lib/Xdmcp/RC32.c
deleted file mode 100644
index 364a3b8a7..000000000
--- a/xc/lib/Xdmcp/RC32.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * $TOG: RC32.c /main/4 1998/02/06 14:40:44 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-int
-XdmcpReadCARD32 (buffer, valuep)
-    XdmcpBufferPtr  buffer;
-    CARD32Ptr	    valuep;
-{
-    CARD8   byte0, byte1, byte2, byte3;
-    if (XdmcpReadCARD8 (buffer, &byte0) &&
-        XdmcpReadCARD8 (buffer, &byte1) &&
-	XdmcpReadCARD8 (buffer, &byte2) &&
-	XdmcpReadCARD8 (buffer, &byte3))
-    {
-	*valuep = (((CARD32) byte0) << 24) |
-		  (((CARD32) byte1) << 16) |
-		  (((CARD32) byte2) << 8) |
-		  (((CARD32) byte3));
-	return TRUE;
-    }
-    return FALSE;
-}
diff --git a/xc/lib/Xdmcp/RC8.c b/xc/lib/Xdmcp/RC8.c
deleted file mode 100644
index 47a263469..000000000
--- a/xc/lib/Xdmcp/RC8.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * $TOG: RC8.c /main/5 1998/02/06 14:40:49 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-int
-XdmcpReadCARD8 (buffer, valuep)
-    XdmcpBufferPtr  buffer;
-    CARD8Ptr	    valuep;
-{
-    if (buffer->pointer >= buffer->count)
-	return FALSE;
-    *valuep = (CARD8) buffer->data[buffer->pointer++];
-    return TRUE;
-}
diff --git a/xc/lib/Xdmcp/RHead.c b/xc/lib/Xdmcp/RHead.c
deleted file mode 100644
index 688d0f84d..000000000
--- a/xc/lib/Xdmcp/RHead.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * $TOG: RHead.c /main/4 1998/02/06 14:40:55 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-int
-XdmcpReadHeader (buffer, header)
-    XdmcpBufferPtr  buffer;
-    XdmcpHeaderPtr  header;
-{
-    if (XdmcpReadCARD16 (buffer, &header->version) &&
-        XdmcpReadCARD16 (buffer, &header->opcode) &&
-	XdmcpReadCARD16 (buffer, &header->length))
-	return TRUE;
-    return FALSE;
-}
diff --git a/xc/lib/Xdmcp/RR.c b/xc/lib/Xdmcp/RR.c
deleted file mode 100644
index dc5e1b931..000000000
--- a/xc/lib/Xdmcp/RR.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * $TOG: RR.c /main/4 1998/02/06 14:41:00 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-int
-XdmcpReadRemaining (buffer)
-    XdmcpBufferPtr  buffer;
-{
-    return buffer->count - buffer->pointer;
-}
diff --git a/xc/lib/Xdmcp/RaA16.c b/xc/lib/Xdmcp/RaA16.c
deleted file mode 100644
index 7a3db5b61..000000000
--- a/xc/lib/Xdmcp/RaA16.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * $TOG: RaA16.c /main/4 1998/02/06 14:40:14 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-/* $XFree86: xc/lib/Xdmcp/RaA16.c,v 1.2 1998/10/10 15:25:15 dawes Exp $ */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-int
-XdmcpReallocARRAY16 (ARRAY16Ptr array, int length)
-{
-    CARD16Ptr	newData;
-
-    newData = (CARD16Ptr) Xrealloc (array->data, length * sizeof (CARD16));
-    if (!newData)
-	return FALSE;
-    array->length = length;
-    array->data = newData;
-    return TRUE;
-}
diff --git a/xc/lib/Xdmcp/RaA32.c b/xc/lib/Xdmcp/RaA32.c
deleted file mode 100644
index ad53585d1..000000000
--- a/xc/lib/Xdmcp/RaA32.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * $TOG: RaA32.c /main/4 1998/02/06 14:40:18 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-/* $XFree86: xc/lib/Xdmcp/RaA32.c,v 1.2 1998/10/10 15:25:16 dawes Exp $ */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-int
-XdmcpReallocARRAY32 (ARRAY32Ptr array, int length)
-{
-    CARD32Ptr	newData;
-
-    newData = (CARD32Ptr) Xrealloc (array->data, length * sizeof (CARD32));
-    if (!newData)
-	return FALSE;
-    array->length = length;
-    array->data = newData;
-    return TRUE;
-}
diff --git a/xc/lib/Xdmcp/RaA8.c b/xc/lib/Xdmcp/RaA8.c
deleted file mode 100644
index eee2b37d9..000000000
--- a/xc/lib/Xdmcp/RaA8.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * $TOG: RaA8.c /main/4 1998/02/06 14:40:24 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-/* $XFree86: xc/lib/Xdmcp/RaA8.c,v 1.2 1998/10/10 15:25:16 dawes Exp $ */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-int
-XdmcpReallocARRAY8 (ARRAY8Ptr array, int length)
-{
-    CARD8Ptr	newData;
-
-    newData = (CARD8Ptr) Xrealloc (array->data, length * sizeof (CARD8));
-    if (!newData)
-	return FALSE;
-    array->length = length;
-    array->data = newData;
-    return TRUE;
-}
diff --git a/xc/lib/Xdmcp/RaAoA8.c b/xc/lib/Xdmcp/RaAoA8.c
deleted file mode 100644
index 21f6f96c3..000000000
--- a/xc/lib/Xdmcp/RaAoA8.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * $TOG: RaAoA8.c /main/4 1998/02/06 14:40:30 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-/* $XFree86: xc/lib/Xdmcp/RaAoA8.c,v 1.2 1998/10/10 15:25:16 dawes Exp $ */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-int
-XdmcpReallocARRAYofARRAY8 (ARRAYofARRAY8Ptr array, int length)
-{
-    ARRAY8Ptr	newData;
-
-    newData = (ARRAY8Ptr) Xrealloc (array->data, length * sizeof (ARRAY8));
-    if (!newData)
-	return FALSE;
-    array->length = length;
-    array->data = newData;
-    return TRUE;
-}
diff --git a/xc/lib/Xdmcp/Unwrap.c b/xc/lib/Xdmcp/Unwrap.c
deleted file mode 100644
index 76049a049..000000000
--- a/xc/lib/Xdmcp/Unwrap.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * $TOG: Unwrap.c /main/10 1998/02/06 14:41:06 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-/* $XFree86: xc/lib/Xdmcp/Unwrap.c,v 1.2 1998/10/10 15:25:16 dawes Exp $ */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-#ifdef HASXDMAUTH
-
-/*
- * The following function exists only to demonstrate the
- * desired functional interface for this routine.  You will
- * need to add the appropriate algorithm if you wish to
- * use XDM-AUTHENTICATION-1/XDM-AUTHORIZATION-1.
- *
- * The interface for this routine is quite simple.  All three
- * arguments are arrays of 8 unsigned characters, the first two
- * are 64 bits of useful data, the last is 56 bits of useful
- * data packed into 8 bytes, using the low 7 bits of each
- * byte, filling the high bit with odd parity.
- *
- * Examine the XDMCP specification for the correct algorithm
- */
-
-#include "Wrap.h"
-
-void
-XdmcpUnwrap (
-    unsigned char	*input,
-    unsigned char	*wrapper,
-    unsigned char	*output,
-    int			bytes)
-{
-    int			i, j, k;
-    unsigned char	tmp[8];
-    unsigned char	blocks[2][8];
-    unsigned char	expand_wrapper[8];
-    auth_wrapper_schedule	schedule;
-
-    _XdmcpWrapperToOddParity (wrapper, expand_wrapper);
-    _XdmcpAuthSetup (expand_wrapper, schedule);
-
-    k = 0;
-    for (j = 0; j < bytes; j += 8)
-    {
-	if (bytes - j < 8)
-	    return; /* bad input length */
-	for (i = 0; i < 8; i++)
-	    blocks[k][i] = input[j + i];
-	_XdmcpAuthDoIt ((unsigned char *) (input + j), (unsigned char *) tmp, schedule, 0);
-	/* block chaining */
-	k = (k == 0) ? 1 : 0;
-	for (i = 0; i < 8; i++)
-	{
-	    if (j == 0)
-		output[j + i] = tmp[i];
-	    else
-		output[j + i] = tmp[i] ^ blocks[k][i];
-	}
-    }
-}
-
-#endif /* HASXDMAUTH */
diff --git a/xc/lib/Xdmcp/WA16.c b/xc/lib/Xdmcp/WA16.c
deleted file mode 100644
index 07ad36faa..000000000
--- a/xc/lib/Xdmcp/WA16.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * $TOG: WA16.c /main/5 1998/02/06 14:41:12 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-int
-XdmcpWriteARRAY16 (buffer, array)
-    XdmcpBufferPtr  buffer;
-    ARRAY16Ptr	    array;
-{
-    int	i;
-
-    if (!XdmcpWriteCARD8 (buffer, array->length))
-	return FALSE;
-    for (i = 0; i < (int)array->length; i++)
-	if (!XdmcpWriteCARD16 (buffer, array->data[i]))
-	    return FALSE;
-    return TRUE;
-}
diff --git a/xc/lib/Xdmcp/WA32.c b/xc/lib/Xdmcp/WA32.c
deleted file mode 100644
index 12a57abd6..000000000
--- a/xc/lib/Xdmcp/WA32.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * $TOG: WA32.c /main/5 1998/02/06 14:41:17 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-int
-XdmcpWriteARRAY32 (buffer, array)
-    XdmcpBufferPtr  buffer;
-    ARRAY32Ptr	    array;
-{
-    int	i;
-
-    if (!XdmcpWriteCARD8 (buffer, array->length))
-	return FALSE;
-    for (i = 0; i < (int)array->length; i++)
-	if (!XdmcpWriteCARD32 (buffer, array->data[i]))
-	    return FALSE;
-    return TRUE;
-}
diff --git a/xc/lib/Xdmcp/WA8.c b/xc/lib/Xdmcp/WA8.c
deleted file mode 100644
index fe57f0b48..000000000
--- a/xc/lib/Xdmcp/WA8.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * $TOG: WA8.c /main/5 1998/02/06 14:41:21 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-int
-XdmcpWriteARRAY8 (buffer, array)
-    XdmcpBufferPtr  buffer;
-    ARRAY8Ptr	    array;
-{
-    int	i;
-
-    if (!XdmcpWriteCARD16 (buffer, array->length))
-	return FALSE;
-    for (i = 0; i < (int)array->length; i++)
-	if (!XdmcpWriteCARD8 (buffer, array->data[i]))
-	    return FALSE;
-    return TRUE;
-}
diff --git a/xc/lib/Xdmcp/WAofA8.c b/xc/lib/Xdmcp/WAofA8.c
deleted file mode 100644
index 5f2b1d8a1..000000000
--- a/xc/lib/Xdmcp/WAofA8.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * $TOG: WAofA8.c /main/6 1998/02/06 14:41:27 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-int
-XdmcpWriteARRAYofARRAY8 (buffer, array)
-    XdmcpBufferPtr	buffer;
-    ARRAYofARRAY8Ptr	array;
-{
-    int	i;
-
-    if (!XdmcpWriteCARD8 (buffer, array->length))
-	return FALSE;
-    for (i = 0; i < (int)array->length; i++)
-	if (!XdmcpWriteARRAY8 (buffer, &array->data[i]))
-	    return FALSE;
-    return TRUE;
-}
diff --git a/xc/lib/Xdmcp/WC16.c b/xc/lib/Xdmcp/WC16.c
deleted file mode 100644
index d89b813a8..000000000
--- a/xc/lib/Xdmcp/WC16.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * $TOG: WC16.c /main/4 1998/02/06 14:41:31 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-/* $XFree86: xc/lib/Xdmcp/WC16.c,v 1.3 1998/10/25 07:11:19 dawes Exp $ */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-int
-XdmcpWriteCARD16 (
-    XdmcpBufferPtr  buffer,
-    unsigned	    value)
-{
-    if (!XdmcpWriteCARD8 (buffer, value >> 8))
-	return FALSE;
-    if (!XdmcpWriteCARD8 (buffer, value & 0xff))
-	return FALSE;
-    return TRUE;
-}
diff --git a/xc/lib/Xdmcp/WC32.c b/xc/lib/Xdmcp/WC32.c
deleted file mode 100644
index ba8f50fea..000000000
--- a/xc/lib/Xdmcp/WC32.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * $TOG: WC32.c /main/4 1998/02/06 14:41:37 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-/* $XFree86: xc/lib/Xdmcp/WC32.c,v 1.3 1998/10/25 12:47:52 dawes Exp $ */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-int
-XdmcpWriteCARD32 (
-    XdmcpBufferPtr  buffer,
-    unsigned	    value)
-{
-    if (!XdmcpWriteCARD8 (buffer, value >> 24))
-	return FALSE;
-    if (!XdmcpWriteCARD8 (buffer, (value >> 16) & 0xff))
-	return FALSE;
-    if (!XdmcpWriteCARD8 (buffer, (value >> 8) & 0xff))
-	return FALSE;
-    if (!XdmcpWriteCARD8 (buffer, value & 0xff))
-	return FALSE;
-    return TRUE;
-}
diff --git a/xc/lib/Xdmcp/WC8.c b/xc/lib/Xdmcp/WC8.c
deleted file mode 100644
index b1a5a9b3a..000000000
--- a/xc/lib/Xdmcp/WC8.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * $TOG: WC8.c /main/4 1998/02/06 14:41:43 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-/* $XFree86: xc/lib/Xdmcp/WC8.c,v 1.3 1998/10/25 07:11:20 dawes Exp $ */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-int
-XdmcpWriteCARD8 (
-    XdmcpBufferPtr  buffer,
-    unsigned	    value)
-{
-    if (buffer->pointer >= buffer->size)
-	return FALSE;
-    buffer->data[buffer->pointer++] = (BYTE) value;
-    return TRUE;
-}
diff --git a/xc/lib/Xdmcp/Whead.c b/xc/lib/Xdmcp/Whead.c
deleted file mode 100644
index 980d92c12..000000000
--- a/xc/lib/Xdmcp/Whead.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * $TOG: Whead.c /main/5 1998/02/06 14:41:48 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-/* $XFree86: xc/lib/Xdmcp/Whead.c,v 1.2 1998/10/10 15:25:17 dawes Exp $ */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-int
-XdmcpWriteHeader (
-    XdmcpBufferPtr  buffer,
-    XdmcpHeaderPtr  header)
-{
-    BYTE    *newData;
-
-    if ((int)buffer->size < 6 + (int)header->length)
-    {
-	newData = (BYTE *) Xalloc (XDM_MAX_MSGLEN * sizeof (BYTE));
-	if (!newData)
-	    return FALSE;
-	Xfree ((unsigned long *)(buffer->data));
-	buffer->data = newData;
-	buffer->size = XDM_MAX_MSGLEN;
-    }
-    buffer->pointer = 0;
-    if (!XdmcpWriteCARD16 (buffer, header->version))
-	return FALSE;
-    if (!XdmcpWriteCARD16 (buffer, header->opcode))
-	return FALSE;
-    if (!XdmcpWriteCARD16 (buffer, header->length))
-	return FALSE;
-    return TRUE;
-}
diff --git a/xc/lib/Xdmcp/Wrap.c b/xc/lib/Xdmcp/Wrap.c
deleted file mode 100644
index a9ba4e3f6..000000000
--- a/xc/lib/Xdmcp/Wrap.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * $TOG: Wrap.c /main/10 1998/02/06 14:41:53 kaleb $
- *
- * 
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author:  Keith Packard, MIT X Consortium
- */
-
-/* $XFree86: xc/lib/Xdmcp/Wrap.c,v 1.2 1998/10/10 15:25:18 dawes Exp $ */
-
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-
-#ifdef HASXDMAUTH
-
-/*
- * The following function exists only to demonstrate the
- * desired functional interface for this routine.  You will
- * need to add the appropriate algorithm if you wish to
- * use XDM-AUTHENTICATION-1/XDM-AUTHORIZATION-1.
- *
- * Examine the XDMCP specification for the correct algorithm
- */
-
-#include "Wrap.h"
-
-void
-XdmcpWrap (
-    unsigned char	*input,
-    unsigned char	*wrapper,
-    unsigned char	*output,
-    int			bytes)
-{
-    int			i, j;
-    int			len;
-    unsigned char	tmp[8];
-    unsigned char	expand_wrapper[8];
-    auth_wrapper_schedule	schedule;
-
-    _XdmcpWrapperToOddParity (wrapper, expand_wrapper);
-    _XdmcpAuthSetup (expand_wrapper, schedule);
-    for (j = 0; j < bytes; j += 8)
-    {
-	len = 8;
-	if (bytes - j < len)
-	    len = bytes - j;
-	/* block chaining */
-	for (i = 0; i < len; i++)
-	{
-	    if (j == 0)
-		tmp[i] = input[i];
-	    else
-		tmp[i] = input[j + i] ^ output[j - 8 + i];
-	}
-	for (; i < 8; i++)
-	{
-	    if (j == 0)
-		tmp[i] = 0;
-	    else
-		tmp[i] = 0 ^ output[j - 8 + i];
-	}
-	_XdmcpAuthDoIt (tmp, (output + j), schedule, 1);
-    }
-}
-
-/*
- * Given a 56 bit wrapper in XDMCP format, create a 56
- * bit wrapper in 7-bits + odd parity format
- */
-
-static int
-OddParity (unsigned char c)
-{
-    c = c ^ (c >> 4);
-    c = c ^ (c >> 2);
-    c = c ^ (c >> 1);
-    return ~c & 0x1;
-}
-
-/*
- * Spread the 56 bit wrapper among 8 bytes, using the upper 7 bits
- * of each byte, and storing an odd parity bit in the low bit
- */
-
-void
-_XdmcpWrapperToOddParity (
-    unsigned char   *in,
-    unsigned char   *out)
-{
-    int		    ashift, bshift;
-    int		    i;
-    unsigned char   c;
-
-    ashift = 7;
-    bshift = 1;
-    for (i = 0; i < 7; i++)
-    {
-	c = ((in[i] << ashift) | (in[i+1] >> bshift)) & 0x7f;
-	out[i] = (c << 1) | OddParity (c);
-	ashift--;
-	bshift++;
-    }
-    c = in[i];
-    out[i] = (c << 1) | OddParity(c);
-}
-
-#endif
diff --git a/xc/lib/Xdmcp/Wrap.h b/xc/lib/Xdmcp/Wrap.h
deleted file mode 100644
index 3e3d0552d..000000000
--- a/xc/lib/Xdmcp/Wrap.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* $XConsortium: Wrap.h,v 1.3 94/02/06 20:09:49 rws Exp $ */
-/*
- * header file for compatibility with something useful
- */
-
-/* $XFree86: xc/lib/Xdmcp/Wrap.h,v 1.2 1998/10/10 15:25:18 dawes Exp $ */
-
-typedef unsigned char auth_cblock[8];	/* block size */
-
-typedef struct auth_ks_struct { auth_cblock _; } auth_wrapper_schedule[16];
-
-extern void _XdmcpWrapperToOddParity (unsigned char *in, unsigned char *out);
diff --git a/xc/lib/Xdmcp/Xdmcp.h b/xc/lib/Xdmcp/Xdmcp.h
deleted file mode 100644
index a84874536..000000000
--- a/xc/lib/Xdmcp/Xdmcp.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/* $XConsortium: Xdmcp.h,v 1.9 95/06/07 18:30:59 gildea Exp $ */
-/*
- * Copyright 1989 Network Computing Devices, Inc., Mountain View, California.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of N.C.D. not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  N.C.D. makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- */
-/* $XFree86: xc/lib/Xdmcp/Xdmcp.h,v 3.3 1998/10/25 07:11:20 dawes Exp $ */
-
-#ifndef _XDMCP_H_
-#define _XDMCP_H_
-
-#include <X11/Xmd.h>
-
-#define XDM_PROTOCOL_VERSION	1
-#define XDM_UDP_PORT		177
-#define XDM_MAX_MSGLEN		8192
-#define XDM_MIN_RTX		2
-#define XDM_MAX_RTX		32
-#define XDM_RTX_LIMIT		7
-#define XDM_KA_RTX_LIMIT	4
-#define XDM_DEF_DORMANCY	(3 * 60)	/* 3 minutes */
-#define XDM_MAX_DORMANCY	(24 * 60 * 60)	/* 24 hours */
-
-typedef enum {
-    BROADCAST_QUERY = 1, QUERY, INDIRECT_QUERY, FORWARD_QUERY,
-    WILLING, UNWILLING, REQUEST, ACCEPT, DECLINE, MANAGE, REFUSE,
-    FAILED, KEEPALIVE, ALIVE
-} xdmOpCode;
-
-typedef enum {
-    XDM_QUERY, XDM_BROADCAST, XDM_INDIRECT, XDM_COLLECT_QUERY,
-    XDM_COLLECT_BROADCAST_QUERY, XDM_COLLECT_INDIRECT_QUERY,
-    XDM_START_CONNECTION, XDM_AWAIT_REQUEST_RESPONSE,
-    XDM_AWAIT_MANAGE_RESPONSE, XDM_MANAGE, XDM_RUN_SESSION, XDM_OFF,
-    XDM_AWAIT_USER_INPUT, XDM_KEEPALIVE, XDM_AWAIT_ALIVE_RESPONSE
-} xdmcp_states;
-
-#ifdef NOTDEF
-/* table of hosts */
-
-#define XDM_MAX_STR_LEN 21
-#define XDM_MAX_HOSTS 20
-struct xdm_host_table {
-  struct sockaddr_in sockaddr;
-  char name[XDM_MAX_STR_LEN];
-  char status[XDM_MAX_STR_LEN];
-};
-#endif /* NOTDEF */
-
-typedef CARD8	*CARD8Ptr;
-typedef CARD16	*CARD16Ptr;
-typedef CARD32	*CARD32Ptr;
-
-typedef struct _ARRAY8 {
-    CARD16	length;
-    CARD8Ptr	data;
-} ARRAY8, *ARRAY8Ptr;
-
-typedef struct _ARRAY16 {
-    CARD8	length;
-    CARD16Ptr	data;
-} ARRAY16, *ARRAY16Ptr;
-
-typedef struct _ARRAY32 {
-    CARD8	length;
-    CARD32Ptr	data;
-} ARRAY32, *ARRAY32Ptr;
-
-typedef struct _ARRAYofARRAY8 {
-    CARD8	length;
-    ARRAY8Ptr	data;
-} ARRAYofARRAY8, *ARRAYofARRAY8Ptr;
-
-typedef struct _XdmcpHeader {
-    CARD16  version, opcode, length;
-} XdmcpHeader, *XdmcpHeaderPtr;
-
-typedef struct _XdmcpBuffer {
-    BYTE    *data;
-    int	    size;		/* size of buffer pointed by to data */
-    int	    pointer;		/* current index into data */
-    int	    count;		/* bytes read from network into data */
-} XdmcpBuffer, *XdmcpBufferPtr;
-
-typedef struct _XdmAuthKey {
-    BYTE    data[8];
-} XdmAuthKeyRec, *XdmAuthKeyPtr;
-
-
-/* implementation-independent network address structure.
-   Equiv to sockaddr* for sockets and netbuf* for STREAMS. */
-
-typedef char *XdmcpNetaddr;
-
-extern int XdmcpWriteARRAY16(XdmcpBufferPtr buffer, ARRAY16Ptr array);
-extern int XdmcpWriteARRAY32(XdmcpBufferPtr buffer, ARRAY32Ptr array);
-extern int XdmcpWriteARRAY8(XdmcpBufferPtr buffer, ARRAY8Ptr array);
-extern int XdmcpWriteARRAYofARRAY8(XdmcpBufferPtr buffer, ARRAYofARRAY8Ptr array);
-extern int XdmcpWriteCARD16(XdmcpBufferPtr buffer, unsigned value);
-extern int XdmcpWriteCARD32(XdmcpBufferPtr buffer, unsigned value);
-extern int XdmcpWriteCARD8(XdmcpBufferPtr buffer, unsigned value);
-extern int XdmcpWriteHeader(XdmcpBufferPtr  buffer, XdmcpHeaderPtr  header);
-
-extern int XdmcpFlush(int fd, XdmcpBufferPtr buffer, XdmcpNetaddr to, int tolen);
-
-extern int XdmcpReadARRAY16(XdmcpBufferPtr buffer, ARRAY16Ptr array);
-extern int XdmcpReadARRAY32(XdmcpBufferPtr buffer, ARRAY32Ptr array);
-extern int XdmcpReadARRAY8(XdmcpBufferPtr buffer, ARRAY8Ptr array);
-extern int XdmcpReadARRAYofARRAY8(XdmcpBufferPtr buffer, ARRAYofARRAY8Ptr array);
-extern int XdmcpReadCARD16(XdmcpBufferPtr buffer, CARD16Ptr valuep);
-extern int XdmcpReadCARD32(XdmcpBufferPtr buffer, CARD32Ptr valuep);
-extern int XdmcpReadCARD8(XdmcpBufferPtr buffer, CARD8Ptr valuep);
-extern int XdmcpReadHeader(XdmcpBufferPtr buffer, XdmcpHeaderPtr header);
-
-#ifndef MINIX
-extern int XdmcpFill(int fd, XdmcpBufferPtr buffer, XdmcpNetaddr from, int *fromlen);
-#else
-extern int MNX_XdmcpFill(int fd, XdmcpBufferPtr buffer, XdmcpNetaddr from, int *fromlen, char *data, int datalen);
-#endif
-
-extern int XdmcpReadRemaining(XdmcpBufferPtr buffer);
-
-extern void XdmcpDisposeARRAY8(ARRAY8Ptr array);
-extern void XdmcpDisposeARRAY16(ARRAY16Ptr array);
-extern void XdmcpDisposeARRAY32(ARRAY32Ptr array);
-extern void XdmcpDisposeARRAYofARRAY8(ARRAYofARRAY8Ptr array);
-
-extern int XdmcpCopyARRAY8(ARRAY8Ptr src, ARRAY8Ptr dst);
-
-extern int XdmcpARRAY8Equal(ARRAY8Ptr array1, ARRAY8Ptr array2);
-
-extern void XdmcpGenerateKey (XdmAuthKeyPtr key);
-extern void XdmcpIncrementKey (XdmAuthKeyPtr key);
-extern void XdmcpDecrementKey (XdmAuthKeyPtr key);
-#ifdef HASXDMAUTH
-extern void XdmcpWrap(unsigned char *input, unsigned char *wrapper, unsigned char *output, int bytes);
-extern void XdmcpUnwrap(unsigned char *input, unsigned char *wrapper, unsigned char *output, int bytes);
-#endif
-
-#ifndef TRUE
-#define TRUE	1
-#define FALSE	0
-#endif
-
-#if !defined(Xalloc) && !defined(xalloc) && !defined(Xrealloc)
-extern void *Xalloc (unsigned long amount);
-extern void *Xrealloc (void *old, unsigned long amount);
-extern void Xfree(void *old);
-#endif
-
-extern int XdmcpCompareKeys (XdmAuthKeyPtr a, XdmAuthKeyPtr b);
-
-extern int XdmcpAllocARRAY16 (ARRAY16Ptr array, int length);
-extern int XdmcpAllocARRAY32 (ARRAY32Ptr array, int length);
-extern int XdmcpAllocARRAY8 (ARRAY8Ptr array, int length);
-extern int XdmcpAllocARRAYofARRAY8 (ARRAYofARRAY8Ptr array, int length);
-
-extern int XdmcpReallocARRAY16 (ARRAY16Ptr array, int length);
-extern int XdmcpReallocARRAY32 (ARRAY32Ptr array, int length);
-extern int XdmcpReallocARRAY8 (ARRAY8Ptr array, int length);
-extern int XdmcpReallocARRAYofARRAY8 (ARRAYofARRAY8Ptr array, int length);
-
-#endif /* _XDMCP_H_ */
diff --git a/xc/lib/Xext/DPMS.c b/xc/lib/Xext/DPMS.c
deleted file mode 100644
index f4592459b..000000000
--- a/xc/lib/Xext/DPMS.c
+++ /dev/null
@@ -1,290 +0,0 @@
-/* $TOG: DPMS.c /main/1 1997/11/12 14:37:05 kaleb $ */
-/*****************************************************************
-
-Copyright (c) 1996 Digital Equipment Corporation, Maynard, Massachusetts.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING, 
-BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY, 
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR 
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Digital Equipment Corporation 
-shall not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from Digital 
-Equipment Corporation.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xext/DPMS.c,v 3.3 1999/03/07 14:23:31 dawes Exp $ */
-
-/*
- * HISTORY
- */
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-#include "dpms.h"
-#include "dpmsstr.h"
-#include "Xext.h"
-#include "extutil.h"
-#include "stdio.h"
-
-static XExtensionInfo _dpms_info_data;
-static XExtensionInfo *dpms_info = &_dpms_info_data;
-static char *dpms_extension_name = DPMSExtensionName;
-
-#define DPMSCheckExtension(dpy,i,val) \
-  XextCheckExtension (dpy, i, dpms_extension_name, val)
-
-/*****************************************************************************
- *                                                                           *
- *                         private utility routines                          *
- *                                                                           *
- *****************************************************************************/
-
-static int close_display();
-static /* const */ XExtensionHooks dpms_extension_hooks = {
-    NULL,                               /* create_gc */
-    NULL,                               /* copy_gc */
-    NULL,                               /* flush_gc */
-    NULL,                               /* free_gc */
-    NULL,                               /* create_font */
-    NULL,                               /* free_font */
-    close_display,                      /* close_display */
-    NULL,                               /* wire_to_event */
-    NULL,                               /* event_to_wire */
-    NULL,                               /* error */
-    NULL                                /* error_string */
-};
-
-static XEXT_GENERATE_FIND_DISPLAY (find_display, dpms_info,
-				   dpms_extension_name,
-                                   &dpms_extension_hooks, DPMSNumberEvents,
-                                   NULL)
-
-static XEXT_GENERATE_CLOSE_DISPLAY (close_display, dpms_info)
-                                                              
-/*****************************************************************************
- *                                                                           *
- *                  public routines                                          *
- *                                                                           *
- *****************************************************************************/
-
-Bool
-DPMSQueryExtension (Display *dpy, int *event_basep, int *error_basep)
-{
-    XExtDisplayInfo *info = find_display (dpy);
-
-    if (XextHasExtension(info)) {
-	*event_basep = info->codes->first_event;
-	*error_basep = info->codes->first_error;
-	return True;
-    } else {
-	return False;
-    }
-}
-
-Status
-DPMSGetVersion(Display *dpy, int *major_versionp, int *minor_versionp)
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xDPMSGetVersionReply	    rep;
-    register xDPMSGetVersionReq  *req;
-
-    DPMSCheckExtension (dpy, info, 0);
-
-    LockDisplay (dpy);
-    GetReq (DPMSGetVersion, req);
-    req->reqType = info->codes->major_opcode;
-    req->dpmsReqType = X_DPMSGetVersion;
-    if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) {
-	UnlockDisplay (dpy);
-	SyncHandle ();
-	return 0;
-    }
-    *major_versionp = rep.majorVersion;
-    *minor_versionp = rep.minorVersion;
-    UnlockDisplay (dpy);
-    SyncHandle ();
-    return 1;
-}
-
-Bool
-DPMSCapable(Display *dpy)
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xDPMSCapableReq *req;
-    xDPMSCapableReply rep;
-
-    DPMSCheckExtension (dpy, info, 0);
-
-    LockDisplay(dpy);
-    GetReq(DPMSCapable, req);
-    req->reqType = info->codes->major_opcode;
-    req->dpmsReqType = X_DPMSCapable;
-
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return rep.capable;
-}
-
-Status
-DPMSSetTimeouts(Display *dpy, CARD16 standby, CARD16 suspend, CARD16 off)
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xDPMSSetTimeoutsReq *req;
-
-    if ((off != 0)&&(off < suspend)) 
-    {
-	return BadValue;
-    }
-    if ((suspend != 0)&&(suspend < standby))
-    {
-	return BadValue;
-    }  
-
-    DPMSCheckExtension (dpy, info, 0);
-    LockDisplay(dpy);
-    GetReq(DPMSSetTimeouts, req);
-    req->reqType = info->codes->major_opcode;
-    req->dpmsReqType = X_DPMSSetTimeouts;
-    req->standby = standby;
-    req->suspend = suspend;
-    req->off = off;
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
-Bool
-DPMSGetTimeouts(Display *dpy, CARD16 *standby, CARD16 *suspend, CARD16 *off)
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xDPMSGetTimeoutsReq *req;
-    xDPMSGetTimeoutsReply rep;
-
-    DPMSCheckExtension (dpy, info, 0);
-
-    LockDisplay(dpy);
-    GetReq(DPMSGetTimeouts, req);
-    req->reqType = info->codes->major_opcode;
-    req->dpmsReqType = X_DPMSGetTimeouts;
-
-    if (!_XReply(dpy, (xReply *)&rep, 0, xTrue)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    *standby = rep.standby;
-    *suspend = rep.suspend;
-    *off = rep.off;
-    return 1;
-}
-
-Status
-DPMSEnable(Display *dpy)
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xDPMSEnableReq *req;
-
-    DPMSCheckExtension (dpy, info, 0);
-    LockDisplay(dpy);
-    GetReq(DPMSEnable, req);
-    req->reqType = info->codes->major_opcode;
-    req->dpmsReqType = X_DPMSEnable;
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
-Status
-DPMSDisable(Display *dpy)
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xDPMSDisableReq *req;
-
-    DPMSCheckExtension (dpy, info, 0);
-    LockDisplay(dpy);
-    GetReq(DPMSDisable, req);
-    req->reqType = info->codes->major_opcode;
-    req->dpmsReqType = X_DPMSDisable;
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
-
-Status
-DPMSForceLevel(Display *dpy, CARD16 level)
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xDPMSForceLevelReq *req;
-
-    DPMSCheckExtension (dpy, info, 0);
-
-    if ((level != DPMSModeOn) &&
-	(level != DPMSModeStandby) &&
-	(level != DPMSModeSuspend) &&
-	(level != DPMSModeOff))
-	return BadValue;
-
-    LockDisplay(dpy);
-    GetReq(DPMSForceLevel, req);
-    req->reqType = info->codes->major_opcode;
-    req->dpmsReqType = X_DPMSForceLevel;
-    req->level = level;
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
-Status
-DPMSInfo(Display *dpy, CARD16 *power_level, BOOL *state)
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xDPMSInfoReq *req;
-    xDPMSInfoReply rep;
-
-    DPMSCheckExtension (dpy, info, 0);
-
-    LockDisplay(dpy);
-    GetReq(DPMSInfo, req);
-    req->reqType = info->codes->major_opcode;
-    req->dpmsReqType = X_DPMSInfo;
-
-    if (!_XReply(dpy, (xReply *)&rep, 0, xTrue)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    *power_level = rep.power_level;
-    *state = rep.state;
-    return 1;
-}
-
-
-
diff --git a/xc/lib/Xext/Imakefile b/xc/lib/Xext/Imakefile
deleted file mode 100644
index 4d5f93651..000000000
--- a/xc/lib/Xext/Imakefile
+++ /dev/null
@@ -1,39 +0,0 @@
-XCOMM $TOG: Imakefile /main/62 1997/11/24 16:48:16 kaleb $
-XCOMM $XFree86: xc/lib/Xext/Imakefile,v 1.9 1998/12/20 22:18:56 dawes Exp $
-#define DoNormalLib NormalLibXext
-#define DoSharedLib SharedLibXext
-#define DoExtraLib SharedLibXext
-#define DoDebugLib DebugLibXext
-#define DoProfileLib ProfileLibXext
-#define LibName Xext
-#define SoRev SOXEXTREV
-#define LibHeaders NO
-
-#include <Threads.tmpl>
-
-#ifdef SharedXextReqs
-REQUIREDLIBS = SharedXextReqs
-#endif
-
-#if HasShm
-      SHMSRCS = XShm.c
-      SHMOBJS = XShm.o
-#endif
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = Malloc0ReturnsNullDefines
-#endif
-
-      DEFINES = $(ALLOC_DEFINES)
-     INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC)
-         SRCS = globals.c extutil.c XMultibuf.c XShape.c $(SHMSRCS)  \
-		MITMisc.c XTestExt1.c XSync.c Xdbe.c XLbx.c \
-		XSecurity.c XAppgroup.c Xcup.c XPanoramiX.c DPMS.c XEVI.c
-         OBJS = globals.o extutil.o XMultibuf.o XShape.o $(SHMOBJS) \
-		MITMisc.o XTestExt1.o XSync.o Xdbe.o XLbx.o \
-		XSecurity.o XAppgroup.o Xcup.o XPanoramiX.o DPMS.o XEVI.o
-     LINTLIBS = $(LINTXLIB)
-
-#include <Library.tmpl>
-
-DependTarget()
diff --git a/xc/lib/Xext/MITMisc.c b/xc/lib/Xext/MITMisc.c
deleted file mode 100644
index d2681b95e..000000000
--- a/xc/lib/Xext/MITMisc.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * $TOG: MITMisc.c /main/7 1998/02/06 14:51:08 kaleb $
- *
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- *
- */
-
-/* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM BLESSING */
-
-#define NEED_REPLIES
-#include "Xlibint.h"
-#include "MITMisc.h"
-#include "mitmiscstr.h"
-#include "Xext.h"
-#include "extutil.h"
-
-static XExtensionInfo _mit_info_data;
-static XExtensionInfo *mit_info = &_mit_info_data;
-static /* const */ char *mit_extension_name = MITMISCNAME;
-
-#define MITCheckExtension(dpy,i,val) \
-  XextCheckExtension (dpy, i, mit_extension_name, val)
-
-/*****************************************************************************
- *                                                                           *
- *			   private utility routines                          *
- *                                                                           *
- *****************************************************************************/
-
-static int close_display();
-static /* const */ XExtensionHooks mit_extension_hooks = {
-    NULL,				/* create_gc */
-    NULL,				/* copy_gc */
-    NULL,				/* flush_gc */
-    NULL,				/* free_gc */
-    NULL,				/* create_font */
-    NULL,				/* free_font */
-    close_display,			/* close_display */
-    NULL,				/* wire_to_event */
-    NULL,				/* event_to_wire */
-    NULL,				/* error */
-    NULL				/* error_string */
-};
-
-static XEXT_GENERATE_FIND_DISPLAY (find_display, mit_info, mit_extension_name, 
-				   &mit_extension_hooks, MITMiscNumberEvents,
-				   NULL)
-
-static XEXT_GENERATE_CLOSE_DISPLAY (close_display, mit_info)
-
-
-/*****************************************************************************
- *                                                                           *
- *		    public routines               			     *
- *                                                                           *
- *****************************************************************************/
-
-Bool XMITMiscQueryExtension (dpy, event_basep, error_basep)
-    Display *dpy;
-    int *event_basep, *error_basep;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-
-    if (XextHasExtension(info)) {
-	*event_basep = info->codes->first_event;
-	*error_basep = info->codes->first_error;
-	return True;
-    } else {
-	return False;
-    }
-}
-
-
-Status XMITMiscSetBugMode(dpy, onOff)
-    Display *dpy;
-    Bool onOff;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xMITSetBugModeReq *req;
-
-    MITCheckExtension (dpy, info, 0);
-
-    LockDisplay(dpy);
-    GetReq(MITSetBugMode, req);
-    req->reqType = info->codes->major_opcode;
-    req->mitReqType = X_MITSetBugMode;
-    req->onOff = onOff;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
-Bool XMITMiscGetBugMode(dpy)
-    Display *dpy;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xMITGetBugModeReq *req;
-    xMITGetBugModeReply rep;
-
-    MITCheckExtension (dpy, info, 0);
-
-    LockDisplay(dpy);
-    GetReq(MITGetBugMode, req);
-    req->reqType = info->codes->major_opcode;
-    req->mitReqType = X_MITGetBugMode;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return rep.onOff;
-}
diff --git a/xc/lib/Xext/XAppgroup.c b/xc/lib/Xext/XAppgroup.c
deleted file mode 100644
index ed1ee8374..000000000
--- a/xc/lib/Xext/XAppgroup.c
+++ /dev/null
@@ -1,429 +0,0 @@
-/* $XFree86: xc/lib/Xext/XAppgroup.c,v 1.6 1999/07/12 05:57:21 dawes Exp $ */
-/*
-
-Copyright 1996, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $TOG: XAppgroup.c /main/6 1998/02/06 14:51:14 kaleb $ */
-
-#ifdef WIN32
-#define BOOL wBOOL
-#undef Status
-#define Status wStatus
-#include <windows.h>
-#undef Status
-#define Status int
-#undef BOOL
-#endif
-
-#define NEED_EVENTS
-#define NEED_REPLIES
-#include "Xlibint.h"
-#include "Xagstr.h"
-#include "Xext.h"
-#include "extutil.h"
-
-#if NeedVarargsPrototypes
-#define Va_start(a,b) va_start(a,b)
-#else
-#define Va_start(a,b) va_start(a)
-#endif
-
-struct xagstuff {
-    int attrib_mask;
-    Bool app_group_leader;
-    Bool single_screen;
-    Window default_root;
-    VisualID root_visual;
-    Colormap default_colormap;
-    unsigned long black_pixel;
-    unsigned long white_pixel;
-};
-
-static XExtensionInfo _xag_info_data;
-static XExtensionInfo *xag_info = &_xag_info_data;
-static char *xag_extension_name = XAGNAME;
-
-#define XagCheckExtension(dpy,i,val) \
-  XextCheckExtension (dpy, i, xag_extension_name, val)
-
-/*****************************************************************************
- *                                                                           *
- *			   private utility routines                          *
- *                                                                           *
- *****************************************************************************/
-
-static int close_display();
-static /* const */ XExtensionHooks xag_extension_hooks = {
-    NULL,				/* create_gc */
-    NULL,				/* copy_gc */
-    NULL,				/* flush_gc */
-    NULL,				/* free_gc */
-    NULL,				/* create_font */
-    NULL,				/* free_font */
-    close_display,			/* close_display */
-    NULL,				/* wire_to_event */
-    NULL,				/* event_to_wire */
-    NULL,				/* error */
-    NULL,				/* error_string */
-};
-
-static XEXT_GENERATE_FIND_DISPLAY (find_display, xag_info, 
-				   xag_extension_name, 
-				   &xag_extension_hooks, 
-				   0, NULL)
-
-static XEXT_GENERATE_CLOSE_DISPLAY (close_display, xag_info)
-
-
-/*****************************************************************************
- *                                                                           *
- *		    public Xag Extension routines                            *
- *                                                                           *
- *****************************************************************************/
-
-Bool
-XagQueryVersion(dpy, major_version_return, minor_version_return)
-    Display* dpy;
-    int* major_version_return; 
-    int* minor_version_return;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xXagQueryVersionReply rep;
-    xXagQueryVersionReq *req;
-
-    XagCheckExtension (dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(XagQueryVersion, req);
-    req->reqType = info->codes->major_opcode;
-    req->xagReqType = X_XagQueryVersion;
-    req->client_major_version = XAG_MAJOR_VERSION;
-    req->client_minor_version = XAG_MINOR_VERSION;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xTrue)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-    *major_version_return = rep.server_major_version;
-    *minor_version_return = rep.server_minor_version;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-static void
-StuffToWire (dpy, stuff, req)
-    Display* dpy;
-    struct xagstuff* stuff;
-    xXagCreateReq* req;
-{
-    unsigned long values[8];
-    unsigned long* value = values;
-    unsigned int nvalues;
-
-    /* the order these are in is important */
-    if (stuff->attrib_mask & XagSingleScreenMask)
-	*value++ = stuff->single_screen;
-
-    if (stuff->attrib_mask & XagDefaultRootMask)
-	*value++ = stuff->default_root;
-
-    if (stuff->attrib_mask & XagRootVisualMask)
-	*value++ = stuff->root_visual;
-
-    if (stuff->attrib_mask & XagDefaultColormapMask)
-	*value++ = stuff->default_colormap;
-
-    if (stuff->attrib_mask & XagBlackPixelMask)
-	*value++ = stuff->black_pixel;
-
-    if (stuff->attrib_mask & XagWhitePixelMask)
-	*value++ = stuff->white_pixel;
-
-    if (stuff->attrib_mask & XagAppGroupLeaderMask)
-	*value++ = stuff->app_group_leader;
-
-    req->length += (nvalues = value - values);
-
-    nvalues <<= 2;
-    Data32 (dpy, (long*) values, (long) nvalues);
-}
-
-Bool 
-#if NeedFunctionPrototypes
-XagCreateEmbeddedApplicationGroup(
-    Display* dpy,
-    VisualID root_visual,
-    Colormap default_colormap,
-    unsigned long black_pixel,
-    unsigned long white_pixel,
-    XAppGroup* app_group_return)
-#else
-XagCreateEmbeddedApplicationGroup(dpy, root_visual, default_colormap, black_pixel, white_pixel, app_group_return)
-    Display* dpy;
-    VisualID root_visual;
-    Colormap default_colormap;
-    unsigned long black_pixel, white_pixel;
-    XAppGroup* app_group_return;
-#endif
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xXagCreateReq *req;
-    struct xagstuff stuff;
-
-    XagCheckExtension (dpy, info, False);
-
-    LockDisplay(dpy);
-    stuff.app_group_leader = True;
-    stuff.single_screen = True;
-    stuff.default_root = RootWindow (dpy, DefaultScreen(dpy));
-    stuff.root_visual = root_visual;
-    stuff.default_colormap = default_colormap;
-    stuff.attrib_mask = 
-	XagAppGroupLeaderMask | XagSingleScreenMask | XagDefaultRootMask |
-	XagRootVisualMask | XagDefaultColormapMask;
-    if (default_colormap != None) {
-	stuff.black_pixel = black_pixel;
-	stuff.white_pixel = white_pixel;
-	stuff.attrib_mask |= XagBlackPixelMask | XagWhitePixelMask;
-    }
-    /* might do some validation here */
-    GetReq(XagCreate, req);
-    req->reqType = info->codes->major_opcode;
-    req->xagReqType = X_XagCreate;
-    *app_group_return = req->app_group = XAllocID(dpy);
-    req->attrib_mask = stuff.attrib_mask;
-    StuffToWire (dpy, &stuff, req);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-Bool 
-#if NeedFunctionPrototypes
-XagCreateNonembeddedApplicationGroup(
-    Display* dpy,
-    XAppGroup* app_group_return)
-#else
-XagCreateNonembeddedApplicationGroup(dpy, app_group_return)
-    Display* dpy;
-    XAppGroup* app_group_return;
-#endif
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xXagCreateReq *req;
-    struct xagstuff stuff;
-
-    XagCheckExtension (dpy, info, False);
-
-    LockDisplay(dpy);
-    stuff.app_group_leader = False;
-    stuff.single_screen = False;
-    stuff.attrib_mask = XagAppGroupLeaderMask | XagSingleScreenMask;
-    /* might do some validation here */
-    GetReq(XagCreate, req);
-    req->reqType = info->codes->major_opcode;
-    req->xagReqType = X_XagCreate;
-    *app_group_return = req->app_group = XAllocID(dpy);
-    req->attrib_mask = stuff.attrib_mask;
-    StuffToWire (dpy, &stuff, req);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-Bool XagDestroyApplicationGroup(dpy,app_group)
-    Display* dpy;
-    XAppGroup app_group;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xXagDestroyReq *req;
-
-    XagCheckExtension (dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(XagDestroy, req);
-    req->reqType = info->codes->major_opcode;
-    req->xagReqType = X_XagDestroy;
-    req->app_group = app_group;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-Bool
-#if NeedVarargsPrototypes
-XagGetApplicationGroupAttributes(
-    Display* dpy,
-    XAppGroup app_group,
-    ...)
-#else
-XagGetApplicationGroupAttributes(dpy, app_group, va_alist)
-    Display* dpy;
-    XAppGroup app_group;
-    va_dcl
-#endif
-{
-    va_list var;
-    XExtDisplayInfo *info = find_display (dpy);
-    xXagGetAttrReq *req;
-    xXagGetAttrReply rep;
-    int attr;
-
-    XagCheckExtension (dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(XagGetAttr, req);
-    req->reqType = info->codes->major_opcode;
-    req->xagReqType = X_XagGetAttr;
-    req->app_group = app_group;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-    Va_start (var, app_group);
-    for (attr = va_arg(var, int); attr != 0; attr = va_arg(var, int)) {
-	void* ptr;
-
-	switch (attr) {
-	case XagNappGroupLeader:
-	    ptr = va_arg(var, void*);
-	    *(Bool*)ptr = rep.app_group_leader;
-	    break;
-	case XagNsingleScreen:
-	    ptr = va_arg(var, void*);
-	    *(Bool*)ptr = rep.single_screen;
-	    break;
-	case XagNdefaultRoot:
-	    ptr = va_arg(var, void*);
-	    *(Window*)ptr = rep.default_root;
-	    break;
-	case XagNrootVisual:
-	    ptr = va_arg(var, void*);
-	    *(VisualID*)ptr = rep.root_visual;
-	    break;
-	case XagNdefaultColormap:
-	    ptr = va_arg(var, void*);
-	    *(Colormap*)ptr = rep.default_colormap;
-	    break;
-	case XagNblackPixel:
-	    ptr = va_arg(var, void*);
-	    *(unsigned long*)ptr = rep.black_pixel;
-	    break;
-	case XagNwhitePixel:
-	    ptr = va_arg(var, void*);
-	    *(unsigned long*)ptr = rep.white_pixel;
-	    break;
-	}
-    }
-    va_end (var);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-Bool
-XagQueryApplicationGroup(dpy, resource, app_group_return)
-    Display* dpy;
-    XID resource;
-    XAppGroup* app_group_return;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xXagQueryReq *req;
-    xXagQueryReply rep;
-
-    XagCheckExtension (dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(XagQuery, req);
-    req->reqType = info->codes->major_opcode;
-    req->xagReqType = X_XagQuery;
-    req->resource = resource;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-    *app_group_return = rep.app_group;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-
-}
-
-Bool
-XagCreateAssociation(dpy, window_return, system_window)
-    Display* dpy;
-    Window* window_return;
-    void* system_window;
-{
-#ifdef WIN32
-    long tmp = *(HWND*) system_window;
-    XExtDisplayInfo *info = find_display (dpy);
-    xXagCreateAssocReq *req;
-
-    XagCheckExtension (dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(XagCreateAssoc, req);
-    req->reqType = info->codes->major_opcode;
-    req->xagReqType = X_XagCreateAssoc;
-    *window_return = req->window = XAllocID(dpy);
-    req->window_type = XagWindowTypeWin32;
-    req->system_window_len = sizeof(HWND);
-    Data32 (dpy, (long*) tmp, 1L);
-    req->length++;
-    UnlockDisplay(dpy);
-    SyncHandle();
-#else
-    /* other platforms go here */
-
-    /* this whole thing could be arranged better, but since X need
-     * only short-circuit the protocol and WIN32 is the only other 
-     * platform the XC supports, it will suffice for now.
-     */
-    *window_return = *(Window*)system_window;
-#endif
-    return True;
-}
-
-Bool
-XagDestroyAssociation(dpy, window)
-    Display* dpy;
-    Window window;
-{
-#ifdef WIN32
-    XExtDisplayInfo *info = find_display (dpy);
-    xXagDestroyAssocReq *req;
-
-    XagCheckExtension (dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(XagDestroyAssoc, req);
-    req->reqType = info->codes->major_opcode;
-    req->xagReqType = X_XagDestroyAssoc;
-    req->window = window;
-    UnlockDisplay(dpy);
-    SyncHandle();
-#endif
-    return True;
-}
-
diff --git a/xc/lib/Xext/XEVI.c b/xc/lib/Xext/XEVI.c
deleted file mode 100644
index 0b8a7883e..000000000
--- a/xc/lib/Xext/XEVI.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/* $TOG: XEVI.c /main/2 1998/01/11 08:40:32 kaleb $ */
-/************************************************************
-Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc.
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be
-used in advertising or publicity pertaining to distribution
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-********************************************************/
-#define NEED_EVENTS
-#define NEED_REPLIES
-#include "Xlibint.h"
-#include "XEVI.h"
-#include "XEVIstr.h"
-#include "Xext.h"
-#include "extutil.h"
-#include <X11/Xutil.h>
-static XExtensionInfo *xevi_info;/* needs to move to globals.c */
-static /* const */ char *xevi_extension_name = EVINAME;
-#define XeviCheckExtension(dpy,i,val) \
-  XextCheckExtension (dpy, i, xevi_extension_name, val)
-/*****************************************************************************
- *                                                                           *
- *			   private utility routines                          *
- *                                                                           *
- *****************************************************************************/
-static /* const */ XExtensionHooks xevi_extension_hooks = {
-    NULL,			/* create_gc */
-    NULL,			/* copy_gc */
-    NULL,			/* flush_gc */
-    NULL,			/* free_gc */
-    NULL,			/* create_font */
-    NULL,			/* free_font */
-    NULL,			/* close_display */
-    NULL,			/* wire_to_event */
-    NULL,			/* event_to_wire */
-    NULL,			/* error */
-    NULL,			/* error_string */
-};
-static XEXT_GENERATE_FIND_DISPLAY (find_display, xevi_info,
-                                   xevi_extension_name,
-                                   &xevi_extension_hooks, 0, NULL)
-Bool XeviQueryExtension (dpy)
-    Display *dpy;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    if (XextHasExtension(info)) {
-	return True;
-    } else {
-	return False;
-    }
-}
-Bool XeviQueryVersion(dpy, majorVersion, minorVersion)
-    Display *dpy;
-    int	    *majorVersion, *minorVersion;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xEVIQueryVersionReply rep;
-    register xEVIQueryVersionReq *req;
-    XeviCheckExtension (dpy, info, False);
-    LockDisplay(dpy);
-    GetReq(EVIQueryVersion, req);
-    req->reqType = info->codes->major_opcode;
-    req->xeviReqType = X_EVIQueryVersion;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-    *majorVersion = rep.majorVersion;
-    *minorVersion = rep.minorVersion;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-static Bool notInList(VisualID32 *visual, int sz_visual, VisualID newVisualid)
-{
-    while  (sz_visual-- > 0)  {
-	if (*visual == newVisualid)
-	    return False;
-	visual++;
-    }
-    return True;
-}
-Status XeviGetVisualInfo(dpy, visual, n_visual, evi_return, n_info_return)
-    register Display *dpy;
-    VisualID *visual;
-    int n_visual;
-    ExtendedVisualInfo **evi_return;
-    int *n_info_return;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xEVIGetVisualInfoReq *req;
-    xEVIGetVisualInfoReply rep;
-    int sz_info, sz_xInfo, sz_conflict, sz_xConflict;
-    VisualID32 *temp_conflict, *temp_visual, *xConflictPtr;
-    VisualID *conflict;
-    xExtendedVisualInfo *temp_xInfo;
-    XVisualInfo *vinfo;
-    register ExtendedVisualInfo *infoPtr;
-    register xExtendedVisualInfo *xInfoPtr;
-    register int n_data, visualIndex, vinfoIndex;
-    Bool isValid;
-    XeviCheckExtension (dpy, info, 0);
-    *n_info_return = 0;
-    *evi_return = NULL;
-    vinfo = XGetVisualInfo(dpy, 0, NULL, &sz_info);
-    if (!vinfo) {
-	return BadValue;
-    }
-    if (!n_visual || !visual) {		/* copy the all visual */
-    	temp_visual = (VisualID32 *)Xmalloc(sz_VisualID32 * sz_info);
-    	n_visual = 0;
-        for (vinfoIndex = 0; vinfoIndex < sz_info; vinfoIndex++)
-	    if (notInList(temp_visual, n_visual, vinfo[vinfoIndex].visualid))
-	        temp_visual[n_visual++] = vinfo[vinfoIndex].visualid;
-    }
-    else {	/* check if the visual is valid */
-        for (visualIndex = 0; visualIndex < n_visual; visualIndex++) {
-	    isValid = False;
-            for (vinfoIndex = 0; vinfoIndex < sz_info; vinfoIndex++) {
-	        if (visual[visualIndex] == vinfo[vinfoIndex].visualid) {
-		    isValid = True;
-		    break;
-	        }
-	    }
-	    if (!isValid) {
-		XFree(vinfo);
-	        return BadValue;
-	    }
-	}
-	temp_visual = (VisualID32 *)Xmalloc(sz_VisualID32 * n_visual);
-        for (visualIndex = 0; visualIndex < n_visual; visualIndex++)
-	    temp_visual[visualIndex] = visual[visualIndex];
-    }
-    XFree(vinfo);
-    LockDisplay(dpy);
-    GetReq(EVIGetVisualInfo, req);
-    req->reqType = info->codes->major_opcode;
-    req->xeviReqType = X_EVIGetVisualInfo;
-    req->n_visual = n_visual;
-    SetReqLen(req, n_visual, 1);
-    Data(dpy, (char *)temp_visual, n_visual * sz_VisualID32);
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	Xfree(temp_visual);
-	return BadAccess;
-    }
-    Xfree(temp_visual);
-    sz_info = rep.n_info * sizeof(ExtendedVisualInfo);
-    sz_xInfo = rep.n_info * sz_xExtendedVisualInfo;
-    sz_conflict = rep.n_conflicts * sizeof(VisualID);
-    sz_xConflict = rep.n_conflicts * sz_VisualID32;
-    infoPtr = *evi_return = (ExtendedVisualInfo *)Xmalloc(sz_info + sz_conflict);
-    xInfoPtr = temp_xInfo = (xExtendedVisualInfo *)Xmalloc(sz_xInfo);
-    xConflictPtr = temp_conflict = (VisualID32 *)Xmalloc(sz_xConflict);
-    if (!*evi_return || !temp_xInfo || !temp_conflict) {
-        _XEatData(dpy, (sz_xInfo + sz_xConflict + 3) & ~3);
-	UnlockDisplay(dpy);
-	SyncHandle();
-	if (evi_return)
-	   Xfree(evi_return);
-	if (temp_xInfo)
-	   Xfree(temp_xInfo);
-	if (temp_conflict)
-	   Xfree(temp_conflict);
-	return BadAlloc;
-    }
-    _XRead(dpy, (char *)temp_xInfo, sz_xInfo);
-    _XRead(dpy, (char *)temp_conflict, sz_xConflict);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    n_data = rep.n_info;
-    conflict = (VisualID *)(infoPtr + n_data);
-    while (n_data-- > 0) {
-	infoPtr->core_visual_id		= xInfoPtr->core_visual_id;
-	infoPtr->screen			= xInfoPtr->screen;
-	infoPtr->level			= xInfoPtr->level;
-	infoPtr->transparency_type	= xInfoPtr->transparency_type;
-	infoPtr->transparency_value	= xInfoPtr->transparency_value;
-	infoPtr->min_hw_colormaps	= xInfoPtr->min_hw_colormaps;
-	infoPtr->max_hw_colormaps	= xInfoPtr->max_hw_colormaps;
-	infoPtr->num_colormap_conflicts = xInfoPtr->num_colormap_conflicts;
-	infoPtr->colormap_conflicts	= conflict;
-	conflict += infoPtr->num_colormap_conflicts;
-	infoPtr++;
-	xInfoPtr++;
-    }
-    n_data = rep.n_conflicts;
-    conflict = (VisualID *)(infoPtr);
-    while (n_data-- > 0)
-       *conflict++ = *xConflictPtr++;
-    Xfree(temp_xInfo);
-    Xfree(temp_conflict);
-    *n_info_return = rep.n_info;
-    return Success;
-}
diff --git a/xc/lib/Xext/XLbx.c b/xc/lib/Xext/XLbx.c
deleted file mode 100644
index 496eddbe9..000000000
--- a/xc/lib/Xext/XLbx.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * $XConsortium: XLbx.c /main/4 1996/12/15 21:24:20 rws $
- *
- * Copyright 1992 Network Computing Devices
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of NCD. not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  NCD. makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * NCD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NCD.
- * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author:  Keith Packard, Network Computing Devices
- */
-/* $XFree86: xc/lib/Xext/XLbx.c,v 1.2 1999/07/12 05:57:21 dawes Exp $ */
-
-#define NEED_EVENTS
-#define NEED_REPLIES
-#include <stdio.h>
-#include "Xlibint.h"
-#include "XLbx.h"
-#include "lbxstr.h"
-#include "Xext.h"
-#include "extutil.h"
-
-static XExtensionInfo _lbx_info_data;
-static XExtensionInfo *lbx_info = &_lbx_info_data;
-static /* const */ char *lbx_extension_name = LBXNAME;
-
-#define LbxCheckExtension(dpy,i,val) \
-  XextCheckExtension (dpy, i, lbx_extension_name, val)
-
-static int close_display();
-static char *error_string();
-static /* const */ XExtensionHooks lbx_extension_hooks = {
-    NULL,				/* create_gc */
-    NULL,				/* copy_gc */
-    NULL,				/* flush_gc */
-    NULL,				/* free_gc */
-    NULL,				/* create_font */
-    NULL,				/* free_font */
-    close_display,			/* close_display */
-    NULL,				/* wire_to_event */
-    NULL,				/* event_to_wire */
-    NULL,				/* error */
-    error_string,			/* error_string */
-};
-
-static /* const */ char *lbx_error_list[] = {
-    "BadLbxClient",			/* BadLbxClient */
-};
-
-static XEXT_GENERATE_FIND_DISPLAY (find_display, lbx_info, lbx_extension_name, 
-				   &lbx_extension_hooks, LbxNumberEvents, NULL)
-
-static XEXT_GENERATE_CLOSE_DISPLAY (close_display, lbx_info)
-
-static XEXT_GENERATE_ERROR_STRING (error_string, lbx_extension_name,
-				   LbxNumberErrors, lbx_error_list)
-
-
-Bool XLbxQueryExtension (dpy, requestp, event_basep, error_basep)
-    Display *dpy;
-    int *requestp, *event_basep, *error_basep;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-
-    if (XextHasExtension(info)) {
-	*requestp = info->codes->major_opcode;
-	*event_basep = info->codes->first_event;
-	*error_basep = info->codes->first_error;
-	return True;
-    } else {
-	return False;
-    }
-}
-
-
-int XLbxGetEventBase(dpy)
-    Display *dpy;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-
-    if (XextHasExtension(info)) {
-	return info->codes->first_event;
-    } else {
-	return -1;
-    }
-}
-
-
-Bool XLbxQueryVersion(dpy, majorVersion, minorVersion)
-    Display *dpy;
-    int	    *majorVersion, *minorVersion;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xLbxQueryVersionReply rep;
-    register xLbxQueryVersionReq *req;
-
-    LbxCheckExtension (dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(LbxQueryVersion, req);
-    req->reqType = info->codes->major_opcode;
-    req->lbxReqType = X_LbxQueryVersion;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-    *majorVersion = rep.majorVersion;
-    *minorVersion = rep.minorVersion;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-/* all other requests will run after Xlib has lost the wire ... */
diff --git a/xc/lib/Xext/XMultibuf.c b/xc/lib/Xext/XMultibuf.c
deleted file mode 100644
index 6508b21b1..000000000
--- a/xc/lib/Xext/XMultibuf.c
+++ /dev/null
@@ -1,720 +0,0 @@
-/*
- * $TOG: XMultibuf.c /main/32 1998/02/06 14:51:46 kaleb $
- *
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- *
- * Authors:  Jim Fulton, MIT X Consortium
- */
-/* $XFree86: xc/lib/Xext/XMultibuf.c,v 1.2 1999/07/12 05:57:22 dawes Exp $ */
-
-#define NEED_EVENTS
-#define NEED_REPLIES
-#include <X11/Xlibint.h>
-#include <stdio.h>
-#include "Xext.h"			/* in ../include */
-#include "extutil.h"			/* in ../include */
-#include "multibufst.h"			/* in ../include */
-
-static XExtensionInfo _multibuf_info_data;
-static XExtensionInfo *multibuf_info = &_multibuf_info_data;
-static /* const */ char *multibuf_extension_name = MULTIBUFFER_PROTOCOL_NAME;
-
-#define MbufCheckExtension(dpy,i,val) \
-  XextCheckExtension (dpy, i, multibuf_extension_name, val)
-#define MbufSimpleCheckExtension(dpy,i) \
-  XextSimpleCheckExtension (dpy, i, multibuf_extension_name)
-
-
-/*****************************************************************************
- *                                                                           *
- *			   private utility routines                          *
- *                                                                           *
- *****************************************************************************/
-
-/*
- * find_display - locate the display info block
- */
-static int close_display();
-static char *error_string();
-static Bool wire_to_event();
-static Status event_to_wire();
-static /* const */ XExtensionHooks multibuf_extension_hooks = {
-    NULL,				/* create_gc */
-    NULL,				/* copy_gc */
-    NULL,				/* flush_gc */
-    NULL,				/* free_gc */
-    NULL,				/* create_font */
-    NULL,				/* free_font */
-    close_display,			/* close_display */
-    wire_to_event,			/* wire_to_event */
-    event_to_wire,			/* event_to_wire */
-    NULL,				/* error */
-    error_string,			/* error_string */
-};
-
-static /* const */ char *multibuf_error_list[] = {
-    "BadBuffer",			/* MultibufferBadBuffer */
-};
-
-static XEXT_GENERATE_FIND_DISPLAY (find_display, multibuf_info,
-				   multibuf_extension_name, 
-				   &multibuf_extension_hooks, 
-				   MultibufferNumberEvents, NULL)
-
-static XEXT_GENERATE_CLOSE_DISPLAY (close_display, multibuf_info)
-
-static XEXT_GENERATE_ERROR_STRING (error_string, multibuf_extension_name,
-				   MultibufferNumberErrors, 
-				   multibuf_error_list)
-
-/*
- * wire_to_event - convert a wire event in network format to a C 
- * event structure
- */
-static Bool wire_to_event (dpy, libevent, netevent)
-    Display *dpy;
-    XEvent *libevent;
-    xEvent *netevent;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-
-    MbufCheckExtension (dpy, info, False);
-
-    switch ((netevent->u.u.type & 0x7f) - info->codes->first_event) {
-      case MultibufferClobberNotify:
-	{
-	    XmbufClobberNotifyEvent *ev;
-	    xMbufClobberNotifyEvent *event;
-    
-    	    ev = (XmbufClobberNotifyEvent *) libevent;
-	    event = (xMbufClobberNotifyEvent *) netevent;
-    	    ev->type = event->type & 0x7f;
-    	    ev->serial = _XSetLastRequestRead(dpy,(xGenericReply *) netevent);
-    	    ev->send_event = ((event->type & 0x80) != 0);
-    	    ev->display = dpy;
-    	    ev->buffer = event->buffer;
-	    ev->state = event->state;
-    	    return True;
-	}
-      case MultibufferUpdateNotify:
-	{
-	    XmbufUpdateNotifyEvent *ev;
-	    xMbufUpdateNotifyEvent *event;
-
-	    ev = (XmbufUpdateNotifyEvent *) libevent;
-	    event = (xMbufUpdateNotifyEvent *) netevent;
-	    ev->type = event->type & 0x7f;
-	    ev->serial = _XSetLastRequestRead(dpy,(xGenericReply *) netevent);
-	    ev->send_event = ((event->type & 0x80) != 0);
-	    ev->display = dpy;
-	    ev->buffer = event->buffer;
-	    return True;
-	}
-    }
-    return False;
-}
-
-
-/*
- * event_to_wire - convert a C event structure to a wire event in
- * network format
- */
-static Status event_to_wire (dpy, libevent, netevent)
-    Display *dpy;
-    XEvent  *libevent;
-    xEvent  *netevent;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-
-    MbufCheckExtension (dpy, info, 0);
-
-    switch ((libevent->type & 0x7f) - info->codes->first_event) {
-      case MultibufferClobberNotify:
-	{
-	    XmbufClobberNotifyEvent *ev;
-	    xMbufClobberNotifyEvent *event;
-    
-    	    ev = (XmbufClobberNotifyEvent *) libevent;
-	    event = (xMbufClobberNotifyEvent *) netevent;
-    	    event->type = ev->type;
-    	    event->sequenceNumber = (ev->serial & 0xffff);
-    	    event->buffer = ev->buffer;
-	    event->state = ev->state;
-    	    return 1;
-	}
-      case MultibufferUpdateNotify:
-	{
-	    XmbufUpdateNotifyEvent *ev;
-	    xMbufUpdateNotifyEvent *event;
-
-	    ev = (XmbufUpdateNotifyEvent *) libevent;
-	    event = (xMbufUpdateNotifyEvent *) netevent;
-	    event->type = ev->type;
-	    event->sequenceNumber = (ev->serial & 0xffff);
-	    event->buffer = ev->buffer;
-	    return 1;
-	}
-    }
-    return 0;
-}
-
-
-/*
- * read_buffer_info - read Buffer Info descriptors from the net; if unable
- * to allocate memory, read junk to make sure that stream is clear.
- */
-#define TALLOC(type,count) ((type *) Xmalloc ((unsigned) count * sizeof(type)))
-
-static XmbufBufferInfo *read_buffer_info (dpy, nbufs)
-    Display *dpy;
-    int nbufs;
-{
-    xMbufBufferInfo *netbuf = TALLOC (xMbufBufferInfo, nbufs);
-    XmbufBufferInfo *bufinfo = NULL;
-    long netbytes = nbufs * SIZEOF(xMbufBufferInfo);
-
-    if (netbuf) {
-	_XRead (dpy, (char *) netbuf, netbytes);
-
-	bufinfo = TALLOC (XmbufBufferInfo, nbufs);
-	if (bufinfo) {
-	    register XmbufBufferInfo *c;
-	    register xMbufBufferInfo *net;
-	    register int i;
-
-	    for (i = 0, c = bufinfo, net = netbuf; i < nbufs;
-		 i++, c++, net++) {
-		c->visualid = net->visualID;
-		c->max_buffers = net->maxBuffers;
-		c->depth = net->depth;
-	    }
-	}
-	Xfree ((char *) netbuf);
-    } else {				/* eat the data */
-	while (netbytes > 0) {
-	    char dummy[256];		/* stack size vs loops tradeoff */
-	    long nbytes = sizeof dummy;
-
-	    if (nbytes > netbytes) nbytes = netbytes;
-	    _XRead (dpy, dummy, nbytes);
-	    netbytes -= nbytes;
-	}
-    }
-
-    return bufinfo;
-}
-
-#undef TALLOC
-
-
-/*****************************************************************************
- *                                                                           *
- *		    Multibuffering/stereo public interfaces                  *
- *                                                                           *
- *****************************************************************************/
-
-
-/* 
- * XmbufQueryExtension - 
- * 	Returns True if the multibuffering/stereo extension is available
- * 	on the given display.  If the extension exists, the value of the
- * 	first event code (which should be added to the event type constants
- * 	MultibufferClobberNotify and MultibufferUpdateNotify to get the
- * 	actual values) is stored into event_base and the value of the first
- * 	error code (which should be added to the error type constant
- * 	MultibufferBadBuffer to get the actual value) is stored into 
- * 	error_base.
- */
-Bool XmbufQueryExtension (dpy, event_base_return, error_base_return)
-    Display *dpy;
-    int *event_base_return, *error_base_return;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    
-    if (XextHasExtension (info)) {
-	*event_base_return = info->codes->first_event;
-	*error_base_return = info->codes->first_error;
-	return True;
-    } else {
-	return False;
-    }
-}
-
-
-/* 
- * XmbufGetVersion -
- * 	Gets the major and minor version numbers of the extension.  The return
- * 	value is zero if an error occurs or non-zero if no error happens.
- */
-Status XmbufGetVersion (dpy, major_version_return, minor_version_return)
-    Display *dpy;
-    int *major_version_return, *minor_version_return;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xMbufGetBufferVersionReply rep;
-    register xMbufGetBufferVersionReq *req;
-
-    MbufCheckExtension (dpy, info, 0);
-
-    LockDisplay (dpy);
-    MbufGetReq (MbufGetBufferVersion, req, info);
-    if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) {
-	UnlockDisplay (dpy);
-	SyncHandle ();
-	return 0;
-    }
-    *major_version_return = rep.majorVersion;
-    *minor_version_return = rep.minorVersion;
-    UnlockDisplay (dpy);
-
-    SyncHandle ();
-    return 1;
-}
-
-
-/*
- * XmbufCreateBuffers - 
- * 	Requests that "count" buffers be created with the given update_action
- * 	and update_hint and be associated with the indicated window.  The
- * 	number of buffers created is returned (zero if an error occurred)
- * 	and buffers_return is filled in with that many Multibuffer identifiers.
- */
-int XmbufCreateBuffers (dpy, w, count, update_action, update_hint, buffers)
-    Display *dpy;
-    Window w;
-    int count;
-    int update_action, update_hint;
-    Multibuffer *buffers;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xMbufCreateImageBuffersReply rep;
-    register xMbufCreateImageBuffersReq *req;
-    int result;
-
-    MbufCheckExtension (dpy, info, 0);
-
-    LockDisplay (dpy);
-
-    XAllocIDs(dpy, buffers, count);
-    MbufGetReq (MbufCreateImageBuffers, req, info);
-    req->window = w;
-    req->updateAction = update_action;
-    req->updateHint = update_hint;
-    req->length += count;
-    count <<= 2;
-    PackData32 (dpy, buffers, count);
-    if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) {
-	UnlockDisplay (dpy);
-	SyncHandle ();
-	return 0;
-    }
-    result = rep.numberBuffer;
-    UnlockDisplay (dpy);
-
-    SyncHandle ();
-    return result;
-}
-
-
-/*
- * XmbufDestroyBuffers - 
- * 	Destroys the buffers associated with the given window.
- */
-void XmbufDestroyBuffers (dpy, window)
-    Display *dpy;
-    Window  window;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xMbufDestroyImageBuffersReq *req;
-
-    MbufSimpleCheckExtension (dpy, info);
-
-    LockDisplay (dpy);
-    MbufGetReq (MbufDestroyImageBuffers, req, info);
-    req->window = window;
-    UnlockDisplay (dpy);
-    SyncHandle ();
-}
-
-
-/*
- * XmbufDisplayBuffers - 
- * 	Displays the indicated buffers their appropriate windows within
- * 	max_delay milliseconds after min_delay milliseconds have passed.
- * 	No two buffers may be associated with the same window or else a Matc
- * 	error is generated.
- */
-void XmbufDisplayBuffers (dpy, count, buffers, min_delay, max_delay)
-    Display *dpy;
-    int count;
-    Multibuffer *buffers;
-    int min_delay, max_delay;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xMbufDisplayImageBuffersReq *req;
-
-    MbufSimpleCheckExtension (dpy, info);
-
-    LockDisplay (dpy);
-    MbufGetReq (MbufDisplayImageBuffers, req, info);
-    req->minDelay = min_delay;
-    req->maxDelay = max_delay;
-    req->length += count;
-    count <<= 2;
-    PackData32 (dpy, buffers, count);
-    UnlockDisplay (dpy);
-    SyncHandle();
-}
-
-
-/*
- * XmbufGetWindowAttributes - 
- * 	Gets the multibuffering attributes that apply to all buffers associated
- * 	with the given window.  Returns non-zero on success and zero if an
- * 	error occurs.
- */
-Status XmbufGetWindowAttributes (dpy, w, attr)
-    Display *dpy;
-    Window w;
-    XmbufWindowAttributes *attr;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xMbufGetMBufferAttributesReq *req;
-    xMbufGetMBufferAttributesReply rep;
-
-    MbufCheckExtension (dpy, info, 0);
-
-    LockDisplay (dpy);
-    MbufGetReq (MbufGetMBufferAttributes, req, info);
-    req->window = w;
-    if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) {
-	UnlockDisplay (dpy);
-	SyncHandle ();
-	return 0;
-    }
-    attr->buffers = (Multibuffer *) NULL; 
-    if ((attr->nbuffers = rep.length)) {
-	int nbytes = rep.length * sizeof(Multibuffer);
-	attr->buffers = (Multibuffer *) Xmalloc((unsigned) nbytes);
-	nbytes = rep.length << 2;
-	if (! attr->buffers) {
-	    _XEatData(dpy, (unsigned long) nbytes);
-	    UnlockDisplay(dpy);
-	    SyncHandle();
-	    return (0);
-	}
-	_XRead32 (dpy, (char *) attr->buffers, nbytes);
-    }
-    attr->displayed_index = rep.displayedBuffer;
-    attr->update_action = rep.updateAction;
-    attr->update_hint = rep.updateHint;
-    attr->window_mode = rep.windowMode;
-
-    UnlockDisplay (dpy);
-    SyncHandle();
-    return 1;
-}
-
-
-/*
- * XmbufChangeWindowAttributes - 
- * 	Sets the multibuffering attributes that apply to all buffers associated
- * 	with the given window.  This is currently limited to the update_hint.
- */
-void XmbufChangeWindowAttributes (dpy, w, valuemask, attr)
-    Display *dpy;
-    Window w;
-    unsigned long valuemask;
-    XmbufSetWindowAttributes *attr;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xMbufSetMBufferAttributesReq *req;
-
-    MbufSimpleCheckExtension (dpy, info);
-
-    LockDisplay (dpy);
-    MbufGetReq (MbufSetMBufferAttributes, req, info);
-    req->window = w;
-    if ((req->valueMask = valuemask)) {	/* stolen from lib/X/XWindow.c */
-	unsigned long values[1];	/* one per element in if stmts below */
-	unsigned long *v = values;
-	unsigned int nvalues;
-
-	if (valuemask & MultibufferWindowUpdateHint) 
-	  *v++ = attr->update_hint;
-	req->length += (nvalues = v - values);
-	nvalues <<= 2;			/* watch out for macros... */
-	Data32 (dpy, (long *) values, (long)nvalues);
-    }
-    UnlockDisplay (dpy);
-    SyncHandle();
-}
-
-
-/*
- * XmbufGetBufferAttributes - 
- * 	Gets the attributes for the indicated buffer.  Returns non-zero on
- * 	success and zero if an error occurs.
- */
-Status XmbufGetBufferAttributes (dpy, b, attr)
-    Display *dpy;
-    Multibuffer b;
-    XmbufBufferAttributes *attr;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xMbufGetBufferAttributesReq *req;
-    xMbufGetBufferAttributesReply rep;
-
-    MbufCheckExtension (dpy, info, 0);
-
-    LockDisplay (dpy);
-    MbufGetReq (MbufGetBufferAttributes, req, info);
-    req->buffer = b;
-    if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) {
-	UnlockDisplay (dpy);
-	SyncHandle ();
-	return 0;
-    }
-    attr->window = rep.window;
-    attr->event_mask = rep.eventMask;
-    attr->buffer_index = rep.bufferIndex;
-    attr->side = rep.side;
-
-    UnlockDisplay (dpy);
-    SyncHandle();
-    return 1;
-}
-
-
-/*
- * XmbufChangeBufferAttributes - 
- * 	Sets the attributes for the indicated buffer.  This is currently
- * 	limited to the event_mask.
- */
-void XmbufChangeBufferAttributes (dpy, b, valuemask, attr)
-    Display *dpy;
-    Multibuffer b;
-    unsigned long valuemask;
-    XmbufSetBufferAttributes *attr;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xMbufSetBufferAttributesReq *req;
-
-    MbufSimpleCheckExtension (dpy, info);
-
-    LockDisplay (dpy);
-    MbufGetReq (MbufSetBufferAttributes, req, info);
-    req->buffer = b;
-    if ((req->valueMask = valuemask)) {	/* stolen from lib/X/XWindow.c */
-	unsigned long values[1];	/* one per element in if stmts below */
-	unsigned long *v = values;
-	unsigned int nvalues;
-
-	if (valuemask & MultibufferBufferEventMask)
-	  *v++ = attr->event_mask;
-	req->length += (nvalues = v - values);
-	nvalues <<= 2;			/* watch out for macros... */
-	Data32 (dpy, (long *) values, (long)nvalues);
-    }
-    UnlockDisplay (dpy);
-    SyncHandle();
-}
-
-
-
-/*
- * XmbufGetScreenInfo - 
- * 	Gets the parameters controlling how mono and stereo windows may be
- * 	created on the indicated screen.  The numbers of sets of visual and 
- * 	depths are returned in nmono_return and nstereo_return.  If 
- * 	nmono_return is greater than zero, then mono_info_return is set to
- * 	the address of an array of XmbufBufferInfo structures describing the
- * 	various visuals and depths that may be used.  Otherwise,
- * 	mono_info_return is set to NULL.  Similarly, stereo_info_return is
- * 	set according to nstereo_return.  The storage returned in 
- * 	mono_info_return and stereo_info_return may be released by XFree.
- * 	If no errors are encounted, non-zero will be returned.
- */
-Status XmbufGetScreenInfo (dpy, d, nmono_return, mono_info_return,
-			   nstereo_return, stereo_info_return)
-    Display *dpy;
-    Drawable d;
-    int *nmono_return;
-    XmbufBufferInfo **mono_info_return;
-    int *nstereo_return;
-    XmbufBufferInfo **stereo_info_return;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xMbufGetBufferInfoReq *req;
-    xMbufGetBufferInfoReply rep;
-    int nmono, nstereo;
-    XmbufBufferInfo *minfo, *sinfo;
-
-    MbufCheckExtension (dpy, info, 0);
-
-    LockDisplay (dpy);
-    MbufGetReq (MbufGetBufferInfo, req, info);
-    req->drawable = d;
-    if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) {
-	UnlockDisplay (dpy);
-	SyncHandle ();
-	return 0;
-    }
-    nmono = rep.normalInfo;
-    nstereo = rep.stereoInfo;
-    minfo = ((nmono > 0) ? read_buffer_info (dpy, nmono) : NULL);
-    sinfo = ((nstereo > 0) ? read_buffer_info (dpy, nstereo) : NULL);
-
-    /* check for bad reads indicating we need to return an error */
-    if ((nmono > 0 && !minfo) || (nstereo > 0 && !sinfo)) {
-	if (minfo) Xfree ((char *) minfo);
-	if (sinfo) Xfree ((char *) sinfo);
-	UnlockDisplay (dpy);
-	SyncHandle();
-	return 0;
-    }
-
-    *nmono_return = nmono;
-    *mono_info_return = minfo;
-    *nstereo_return = nstereo;
-    *stereo_info_return = sinfo;
-
-    UnlockDisplay (dpy);
-    SyncHandle();
-    return 1;
-}
-
-
-/*
- * XmbufCreateStereoWindow - 
- * 	Creates a stereo window in the same way that XCreateWindow creates
- * 	a mono window (in fact, use the same code, except for the request)
- *      and returns the left and right buffers that may be 
- */
-Window XmbufCreateStereoWindow (dpy, parent, x, y, width, height, border_width,
-				depth, class, visual, valuemask, attr,
-				leftp, rightp)
-    Display *dpy;
-    Window parent;
-    int x, y;
-    unsigned int width, height, border_width;
-    int depth;
-    unsigned int class;
-    Visual *visual;
-    unsigned long valuemask;
-    XSetWindowAttributes *attr;
-    Multibuffer *leftp, *rightp;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    Window wid;
-    register xMbufCreateStereoWindowReq *req;
-
-    MbufCheckExtension (dpy, info, None);
-
-    LockDisplay(dpy);
-    MbufGetReq(MbufCreateStereoWindow, req, info);
-    wid = req->wid = XAllocID(dpy);
-    req->parent = parent;
-    req->left = *leftp = XAllocID (dpy);
-    req->right = *rightp = XAllocID (dpy);
-    req->x = x;
-    req->y = y;
-    req->width = width;
-    req->height = height;
-    req->borderWidth = border_width;
-    req->depth = depth;
-    req->class = class;
-    if (visual == CopyFromParent)
-	req->visual = CopyFromParent;
-    else
-	req->visual = visual->visualid;
-    valuemask &= (CWBackPixmap|CWBackPixel|CWBorderPixmap|
-		     CWBorderPixel|CWBitGravity|CWWinGravity|
-		     CWBackingStore|CWBackingPlanes|CWBackingPixel|
-		     CWOverrideRedirect|CWSaveUnder|CWEventMask|
-		     CWDontPropagate|CWColormap|CWCursor);
-    if ((req->mask = valuemask)) {
-	unsigned long values[32];
-	register unsigned long *value = values;
-	unsigned int nvalues;
-
-	if (valuemask & CWBackPixmap)
-	  *value++ = attr->background_pixmap;
-	if (valuemask & CWBackPixel)
-	  *value++ = attr->background_pixel;
-	if (valuemask & CWBorderPixmap)
-	  *value++ = attr->border_pixmap;
-	if (valuemask & CWBorderPixel)
-	  *value++ = attr->border_pixel;
-	if (valuemask & CWBitGravity)
-	  *value++ = attr->bit_gravity;
-	if (valuemask & CWWinGravity)
-	  *value++ = attr->win_gravity;
-	if (valuemask & CWBackingStore)
-	  *value++ = attr->backing_store;
-	if (valuemask & CWBackingPlanes)
-	  *value++ = attr->backing_planes;
-	if (valuemask & CWBackingPixel)
-	  *value++ = attr->backing_pixel;
-	if (valuemask & CWOverrideRedirect)
-	  *value++ = attr->override_redirect;
-	if (valuemask & CWSaveUnder)
-	  *value++ = attr->save_under;
-	if (valuemask & CWEventMask)
-	  *value++ = attr->event_mask;
-	if (valuemask & CWDontPropagate)
-	  *value++ = attr->do_not_propagate_mask;
-	if (valuemask & CWColormap)
-	  *value++ = attr->colormap;
-	if (valuemask & CWCursor)
-	  *value++ = attr->cursor;
-	req->length += (nvalues = value - values);
-
-	nvalues <<= 2;			    /* watch out for macros... */
-	Data32 (dpy, (long *) values, (long)nvalues);
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return wid;
-}
-
-void XmbufClearBufferArea (dpy, buffer, x, y, width, height, exposures)
-     Display *dpy;
-     Multibuffer buffer;
-     int x, y;
-     unsigned int width, height;
-     Bool exposures;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xMbufClearImageBufferAreaReq *req;
-
-    MbufSimpleCheckExtension (dpy, info);
-
-    LockDisplay (dpy);
-    MbufGetReq (MbufClearImageBufferArea, req, info);
-    req->buffer = buffer;
-    req->x      = x;
-    req->y      = y;
-    req->width  = width;
-    req->height = height;
-    req->exposures = exposures;
-    UnlockDisplay (dpy);
-    SyncHandle();
-}
-
diff --git a/xc/lib/Xext/XSecurity.c b/xc/lib/Xext/XSecurity.c
deleted file mode 100644
index adae1f793..000000000
--- a/xc/lib/Xext/XSecurity.c
+++ /dev/null
@@ -1,307 +0,0 @@
-/* $TOG: XSecurity.c /main/6 1998/02/06 14:51:57 kaleb $ */
-/*
-
-Copyright 1996, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/Xext/XSecurity.c,v 1.2 1999/07/12 05:57:22 dawes Exp $ */
-
-#include <X11/Xlibint.h>
-#include <stdio.h>
-#include "Xext.h"
-#include "extutil.h"
-#include "securstr.h"
-
-static XExtensionInfo _Security_info_data;
-static XExtensionInfo *Security_info = &_Security_info_data;
-static char *Security_extension_name = SECURITY_EXTENSION_NAME;
-
-#define SecurityCheckExtension(dpy,i,val) \
-  XextCheckExtension (dpy, i, Security_extension_name, val)
-#define SecuritySimpleCheckExtension(dpy,i) \
-  XextSimpleCheckExtension (dpy, i, Security_extension_name)
-
-#define SecurityGetReq(name,req,info) GetReq (name, req); \
-        req->reqType = info->codes->major_opcode; \
-        req->securityReqType = X_##name;
-
-/*****************************************************************************
- *                                                                           *
- *			   private utility routines                          *
- *                                                                           *
- *****************************************************************************/
-
-/*
- * find_display - locate the display info block
- */
-static int close_display();
-static Bool     wire_to_event();
-static Status   event_to_wire();
-static char *error_string();
-static XExtensionHooks Security_extension_hooks = {
-    NULL,                               /* create_gc */
-    NULL,                               /* copy_gc */
-    NULL,                               /* flush_gc */
-    NULL,                               /* free_gc */
-    NULL,                               /* create_font */
-    NULL,                               /* free_font */
-    close_display,                      /* close_display */
-    wire_to_event,                      /* wire_to_event */
-    event_to_wire,                      /* event_to_wire */
-    NULL,                               /* error */
-    error_string                        /* error_string */
-};
-
-static char    *security_error_list[] = {
-    "BadAuthorization"
-    "BadAuthorizationProtocol"
-};
-
-static XEXT_GENERATE_FIND_DISPLAY (find_display, Security_info,
-				   Security_extension_name, 
-				   &Security_extension_hooks, 
-				   XSecurityNumberEvents, NULL)
-
-static XEXT_GENERATE_CLOSE_DISPLAY (close_display, Security_info)
-
-static 
-XEXT_GENERATE_ERROR_STRING(error_string, Security_extension_name,
-			   XSecurityNumberErrors, security_error_list)
-
-static Bool     
-wire_to_event(dpy, event, wire)
-    Display        *dpy;
-    XEvent         *event;
-    xEvent         *wire;
-{
-    XExtDisplayInfo *info = find_display(dpy);
-
-    SecurityCheckExtension (dpy, info, False);
-
-    switch ((wire->u.u.type & 0x7F) - info->codes->first_event)
-    {
-	case XSecurityAuthorizationRevoked:
-	{
-	    xSecurityAuthorizationRevokedEvent *rwire =
-		(xSecurityAuthorizationRevokedEvent *)wire;
-	    XSecurityAuthorizationRevokedEvent *revent = 
-		(XSecurityAuthorizationRevokedEvent *)event;
-
-	  revent->type = rwire->type & 0x7F;
-	  revent->serial = _XSetLastRequestRead(dpy,
-						(xGenericReply *) wire);
-	  revent->send_event = (rwire->type & 0x80) != 0;
-	  revent->display = dpy;
-	  revent->auth_id = rwire->authId;
-	  return True;
-	}
-    }
-    return False;
-}
-
-static Status 
-event_to_wire(dpy, event, wire)
-    Display        *dpy;
-    XEvent         *event;
-    xEvent         *wire;
-{
-    XExtDisplayInfo *info = find_display(dpy);
-
-    SecurityCheckExtension(dpy, info, False);
-
-    switch ((event->type & 0x7F) - info->codes->first_event)
-    {
-	case XSecurityAuthorizationRevoked:
-	{
-	    xSecurityAuthorizationRevokedEvent *rwire =
-		(xSecurityAuthorizationRevokedEvent *)wire;
-	    XSecurityAuthorizationRevokedEvent *revent = 
-		(XSecurityAuthorizationRevokedEvent *)event;
-	    rwire->type = revent->type | (revent->send_event ? 0x80 : 0);
-	    rwire->sequenceNumber = revent->serial & 0xFFFF;
-	    return True;
-	}
-    }
-    return False;
-}
-
-/*****************************************************************************
- *                                                                           *
- *		       Security public interfaces                            *
- *                                                                           *
- *****************************************************************************/
-
-Status XSecurityQueryExtension (
-    Display *dpy,
-    int *major_version_return,
-    int *minor_version_return)
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xSecurityQueryVersionReply rep;
-    register xSecurityQueryVersionReq *req;
-
-    if (!XextHasExtension (info))
-        return (Status)0; /* failure */
-
-    LockDisplay (dpy);
-    SecurityGetReq (SecurityQueryVersion, req, info);
-    req->majorVersion = SECURITY_MAJOR_VERSION;
-    req->minorVersion = SECURITY_MINOR_VERSION;
-
-    if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) {
-	UnlockDisplay (dpy);
-	SyncHandle ();
-	return (Status)0; /* failure */
-    }
-    *major_version_return = rep.majorVersion;
-    *minor_version_return = rep.minorVersion;
-    UnlockDisplay (dpy);
-
-    SyncHandle ();
-
-    if (*major_version_return != SECURITY_MAJOR_VERSION)
-        return (Status)0; /* failure */
-    else
-        return (Status)1; /* success */
-}
-
-Xauth *
-XSecurityAllocXauth(void)
-{
-    return Xcalloc(1, sizeof(Xauth));
-}
-
-void
-XSecurityFreeXauth(Xauth *auth)
-{
-    XFree(auth);
-}
-
-static int
-Ones(Mask mask)
-{
-    register Mask y;
-
-    y = (mask >> 1) &033333333333;
-    y = mask - y - ((y >>1) & 033333333333);
-    return (((y + (y >> 3)) & 030707070707) % 077);
-}
-
-Xauth *
-XSecurityGenerateAuthorization(
-    Display *dpy,
-    Xauth *auth_in,
-    unsigned long valuemask,
-    XSecurityAuthorizationAttributes *attributes,
-    XSecurityAuthorization *auth_id_return)
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xSecurityGenerateAuthorizationReq *req;
-    xSecurityGenerateAuthorizationReply rep;
-    Xauth *auth_return;
-    unsigned long values[3];
-    unsigned long *value = values;
-    unsigned int nvalues;
-
-    *auth_id_return = 0;  /* in case we fail */
-
-    /* make sure extension is available */
-
-    SecurityCheckExtension (dpy, info, (Xauth *)NULL);
-
-    LockDisplay(dpy);
-    SecurityGetReq(SecurityGenerateAuthorization, req, info);
-
-    req->nbytesAuthProto = auth_in->name_length;
-    req->nbytesAuthData  = auth_in->data_length;
-
-    /* adjust length to account for auth name and data */
-    req->length += (auth_in->name_length + (unsigned)3) >> 2;
-    req->length += (auth_in->data_length + (unsigned)3) >> 2;
-
-    /* adjust length to account for list of values */
-    req->valueMask = valuemask & XSecurityAllAuthorizationAttributes;
-    nvalues = Ones(req->valueMask);
-    req->length += nvalues;
-
-    /* send auth name and data */
-    Data(dpy, auth_in->name, auth_in->name_length);
-    Data(dpy, auth_in->data, auth_in->data_length);
-
-    /* send values */
-    if (valuemask & XSecurityTimeout)	 *value++ = attributes->timeout;
-    if (valuemask & XSecurityTrustLevel) *value++ = attributes->trust_level;
-    if (valuemask & XSecurityGroup)	 *value++ = attributes->group;
-    if (valuemask & XSecurityEventMask)	 *value++ = attributes->event_mask;
-
-    nvalues <<= 2;
-    Data32(dpy, (long *)values, (long)nvalues);
-
-    if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) {
-	UnlockDisplay (dpy);
-	SyncHandle ();
-	return (Xauth *)NULL;
-    }
-
-    *auth_id_return = rep.authId;
-
-    /* Allocate space for the Xauth struct and the auth name and data all
-     * in one hunk.  This lets XSecurityFreeXauth not have to care
-     * about whether the auth was allocated here or in
-     * XSecurityAllocXauth; in both cases, you just free one pointer.
-     */
-
-    if ((auth_return = (Xauth *)Xcalloc(1,
-		(sizeof(Xauth) + auth_in->name_length + rep.dataLength))))
-    {
-	auth_return->data_length = rep.dataLength;
-	auth_return->data = (char *)&auth_return[1];
-	_XReadPad(dpy, auth_return->data, (long)rep.dataLength);
-
-	auth_return->name_length = auth_in->name_length;
-	auth_return->name = auth_return->data + auth_return->data_length;
-	memcpy(auth_return->name, auth_in->name, auth_return->name_length);
-    }
-    else
-    {
-	_XEatData(dpy, (unsigned long) (rep.dataLength + 3) & ~3);
-    }
-
-    UnlockDisplay (dpy);
-    SyncHandle ();
-    return auth_return;
-
-} /* XSecurityGenerateAuthorization */
-
-Status
-XSecurityRevokeAuthorization(
-    Display *dpy,
-    XSecurityAuthorization auth_id)
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xSecurityRevokeAuthorizationReq *req;
-    
-    SecurityCheckExtension (dpy, info, 0);
-    LockDisplay(dpy);
-    SecurityGetReq(SecurityRevokeAuthorization, req, info);
-    req->authId = auth_id;
-    UnlockDisplay (dpy);
-    SyncHandle ();
-    return 1;
-} /* XSecurityRevokeAuthorization */
diff --git a/xc/lib/Xext/XShape.c b/xc/lib/Xext/XShape.c
deleted file mode 100644
index 368a9e135..000000000
--- a/xc/lib/Xext/XShape.c
+++ /dev/null
@@ -1,489 +0,0 @@
-/*
- * $TOG: XShape.c /main/26 1998/02/06 14:52:03 kaleb $
- *
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- *
- * Author:  Keith Packard, MIT X Consortium
- */
-#define NEED_EVENTS
-#define NEED_REPLIES
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
-#include "region.h"			/* in Xlib sources */
-#include "Xext.h"			/* in ../include */
-#include "extutil.h"			/* in ../include */
-#include "shapestr.h"			/* in ../include */
-
-static XExtensionInfo _shape_info_data;
-static XExtensionInfo *shape_info = &_shape_info_data;
-static /* const */ char *shape_extension_name = SHAPENAME;
-
-#define ShapeCheckExtension(dpy,i,val) \
-  XextCheckExtension (dpy, i, shape_extension_name, val)
-#define ShapeSimpleCheckExtension(dpy,i) \
-  XextSimpleCheckExtension (dpy, i, shape_extension_name)
-
-
-/*****************************************************************************
- *                                                                           *
- *			   private utility routines                          *
- *                                                                           *
- *****************************************************************************/
-
-static int close_display();
-static Bool wire_to_event();
-static Status event_to_wire();
-static /* const */ XExtensionHooks shape_extension_hooks = {
-    NULL,				/* create_gc */
-    NULL,				/* copy_gc */
-    NULL,				/* flush_gc */
-    NULL,				/* free_gc */
-    NULL,				/* create_font */
-    NULL,				/* free_font */
-    close_display,			/* close_display */
-    wire_to_event,			/* wire_to_event */
-    event_to_wire,			/* event_to_wire */
-    NULL,				/* error */
-    NULL,				/* error_string */
-};
-
-static XEXT_GENERATE_FIND_DISPLAY (find_display, shape_info,
-				   shape_extension_name, 
-				   &shape_extension_hooks,
-				   ShapeNumberEvents, NULL)
-
-static XEXT_GENERATE_CLOSE_DISPLAY (close_display, shape_info)
-
-
-static Bool wire_to_event (dpy, re, event)
-    Display *dpy;
-    XEvent  *re;
-    xEvent  *event;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    XShapeEvent		*se;
-    xShapeNotifyEvent	*sevent;
-
-    ShapeCheckExtension (dpy, info, False);
-
-    switch ((event->u.u.type & 0x7f) - info->codes->first_event) {
-    case ShapeNotify:
-    	se = (XShapeEvent *) re;
-	sevent = (xShapeNotifyEvent *) event;
-    	se->type = sevent->type & 0x7f;
-    	se->serial = _XSetLastRequestRead(dpy,(xGenericReply *) event);
-    	se->send_event = (sevent->type & 0x80) != 0;
-    	se->display = dpy;
-    	se->window = sevent->window;
-    	se->kind = sevent->kind;
-    	se->x = cvtINT16toInt (sevent->x);
-    	se->y = cvtINT16toInt (sevent->y);
-    	se->width = sevent->width;
-    	se->height = sevent->height;
-	se->time = sevent->time;
-	se->shaped = True;
-	if (sevent->shaped == xFalse)
-	    se->shaped = False;
-    	return True;
-    }
-    return False;
-}
-
-static Status event_to_wire (dpy, re, event)
-    Display *dpy;
-    XEvent  *re;
-    xEvent  *event;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    XShapeEvent		*se;
-    xShapeNotifyEvent	*sevent;
-
-    ShapeCheckExtension (dpy, info, 0);
-
-    switch ((re->type & 0x7f) - info->codes->first_event) {
-    case ShapeNotify:
-    	se = (XShapeEvent *) re;
-	sevent = (xShapeNotifyEvent *) event;
-    	sevent->type = se->type | (se->send_event ? 0x80 : 0);
-    	sevent->sequenceNumber = se->serial & 0xffff;
-    	sevent->window = se->window;
-    	sevent->kind = se->kind;
-    	sevent->x = se->x;
-    	sevent->y = se->y;
-    	sevent->width = se->width;
-    	sevent->height = se->height;
-	sevent->time = se->time;
-    	return 1;
-    }
-    return 0;
-}
-
-
-/****************************************************************************
- *                                                                          *
- *			    Shape public interfaces                         *
- *                                                                          *
- ****************************************************************************/
-
-Bool XShapeQueryExtension (dpy, event_basep, error_basep)
-    Display *dpy;
-    int *event_basep, *error_basep;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-
-    if (XextHasExtension(info)) {
-	*event_basep = info->codes->first_event;
-	*error_basep = info->codes->first_error;
-	return True;
-    } else {
-	return False;
-    }
-}
-
-
-Status XShapeQueryVersion(dpy, major_versionp, minor_versionp)
-    Display *dpy;
-    int	    *major_versionp, *minor_versionp;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xShapeQueryVersionReply	    rep;
-    register xShapeQueryVersionReq  *req;
-
-    ShapeCheckExtension (dpy, info, 0);
-
-    LockDisplay (dpy);
-    GetReq (ShapeQueryVersion, req);
-    req->reqType = info->codes->major_opcode;
-    req->shapeReqType = X_ShapeQueryVersion;
-    if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) {
-	UnlockDisplay (dpy);
-	SyncHandle ();
-	return 0;
-    }
-    *major_versionp = rep.majorVersion;
-    *minor_versionp = rep.minorVersion;
-    UnlockDisplay (dpy);
-    SyncHandle ();
-    return 1;
-}
-
-void XShapeCombineRegion(dpy, dest, destKind, xOff, yOff, r, op)
-register Display    *dpy;
-Window		    dest;
-int		    destKind, op, xOff, yOff;
-register REGION	    *r;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xShapeRectanglesReq *req;
-    register long nbytes;
-    register int i;
-    register XRectangle *xr, *pr;
-    register BOX *pb;
-
-    ShapeSimpleCheckExtension (dpy, info);
-
-    LockDisplay(dpy);
-    GetReq(ShapeRectangles, req);
-    xr = (XRectangle *) 
-    	_XAllocScratch(dpy, (unsigned long)(r->numRects * sizeof (XRectangle)));
-    for (pr = xr, pb = r->rects, i = r->numRects; --i >= 0; pr++, pb++) {
-        pr->x = pb->x1;
-	pr->y = pb->y1;
-	pr->width = pb->x2 - pb->x1;
-	pr->height = pb->y2 - pb->y1;
-     }
-    req->reqType = info->codes->major_opcode;
-    req->shapeReqType = X_ShapeRectangles;
-    req->op = op;
-    req->ordering = YXBanded;
-    req->destKind = destKind;
-    req->dest = dest;
-    req->xOff = xOff;
-    req->yOff = yOff;
-
-    /* SIZEOF(xRectangle) will be a multiple of 4 */
-    req->length += r->numRects * (SIZEOF(xRectangle) / 4);
-
-    nbytes = r->numRects * sizeof(xRectangle);
-
-    Data16 (dpy, (short *) xr, nbytes);
-    UnlockDisplay(dpy);
-    SyncHandle();
-}
-
-
-void XShapeCombineRectangles (dpy, dest, destKind, xOff, yOff,
-			      rects, n_rects, op, ordering)
-register Display *dpy;
-XID dest;
-int destKind, op, xOff, yOff, ordering;
-XRectangle  *rects;
-int n_rects;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xShapeRectanglesReq *req;
-    register long nbytes;
-
-    ShapeSimpleCheckExtension (dpy, info);
-
-    LockDisplay(dpy);
-    GetReq(ShapeRectangles, req);
-    req->reqType = info->codes->major_opcode;
-    req->shapeReqType = X_ShapeRectangles;
-    req->op = op;
-    req->ordering = ordering;
-    req->destKind = destKind;
-    req->dest = dest;
-    req->xOff = xOff;
-    req->yOff = yOff;
-
-    /* SIZEOF(xRectangle) will be a multiple of 4 */
-    req->length += n_rects * (SIZEOF(xRectangle) / 4);
-
-    nbytes = n_rects * sizeof(xRectangle);
-
-    Data16 (dpy, (short *) rects, nbytes);
-    UnlockDisplay(dpy);
-    SyncHandle();
-}
-
-
-void XShapeCombineMask (dpy, dest, destKind, xOff, yOff, src, op)
-register Display *dpy;
-int destKind;
-XID dest;
-Pixmap	src;
-int op, xOff, yOff;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xShapeMaskReq *req;
-
-    ShapeSimpleCheckExtension (dpy, info);
-
-    LockDisplay(dpy);
-    GetReq(ShapeMask, req);
-    req->reqType = info->codes->major_opcode;
-    req->shapeReqType = X_ShapeMask;
-    req->op = op;
-    req->destKind = destKind;
-    req->dest = dest;
-    req->xOff = xOff;
-    req->yOff = yOff;
-    req->src = src;
-    UnlockDisplay(dpy);
-    SyncHandle();
-}
-
-void XShapeCombineShape (dpy, dest, destKind, xOff, yOff, src, srcKind, op)
-register Display *dpy;
-int destKind;
-XID dest;
-int srcKind;
-XID src;
-int op, xOff, yOff;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xShapeCombineReq *req;
-
-    ShapeSimpleCheckExtension (dpy, info);
-
-    LockDisplay(dpy);
-    GetReq(ShapeCombine, req);
-    req->reqType = info->codes->major_opcode;
-    req->shapeReqType = X_ShapeCombine;
-    req->op = op;
-    req->destKind = destKind;
-    req->srcKind = srcKind;
-    req->dest = dest;
-    req->xOff = xOff;
-    req->yOff = yOff;
-    req->src = src;
-    UnlockDisplay(dpy);
-    SyncHandle();
-}
-
-void XShapeOffsetShape (dpy, dest, destKind, xOff, yOff)
-register Display *dpy;
-int destKind;
-XID dest;
-int xOff, yOff;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xShapeOffsetReq *req;
-
-    ShapeSimpleCheckExtension (dpy, info);
-
-    LockDisplay(dpy);
-    GetReq(ShapeOffset, req);
-    req->reqType = info->codes->major_opcode;
-    req->shapeReqType = X_ShapeOffset;
-    req->destKind = destKind;
-    req->dest = dest;
-    req->xOff = xOff;
-    req->yOff = yOff;
-    UnlockDisplay(dpy);
-    SyncHandle();
-}
-
-Status XShapeQueryExtents (dpy, window,
-			   bShaped, xbs, ybs, wbs, hbs,
-			   cShaped, xcs, ycs, wcs, hcs)    
-    register Display    *dpy;
-    Window		    window;
-    int			    *bShaped, *cShaped;	    /* RETURN */
-    int			    *xbs, *ybs, *xcs, *ycs; /* RETURN */
-    unsigned int	    *wbs, *hbs, *wcs, *hcs; /* RETURN */
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xShapeQueryExtentsReply	    rep;
-    register xShapeQueryExtentsReq *req;
-    
-    ShapeCheckExtension (dpy, info, 0);
-
-    LockDisplay (dpy);
-    GetReq (ShapeQueryExtents, req);
-    req->reqType = info->codes->major_opcode;
-    req->shapeReqType = X_ShapeQueryExtents;
-    req->window = window;
-    if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) {
-	UnlockDisplay (dpy);
-	SyncHandle ();
-	return 0;
-    }
-    *bShaped = rep.boundingShaped;
-    *cShaped = rep.clipShaped;
-    *xbs = cvtINT16toInt (rep.xBoundingShape);
-    *ybs = cvtINT16toInt (rep.yBoundingShape);
-    *wbs = rep.widthBoundingShape;
-    *hbs = rep.heightBoundingShape;
-    *xcs = cvtINT16toInt (rep.xClipShape);
-    *ycs = cvtINT16toInt (rep.yClipShape);
-    *wcs = rep.widthClipShape;
-    *hcs = rep.heightClipShape;
-    UnlockDisplay (dpy);
-    SyncHandle ();
-    return 1;
-}
-
-
-void XShapeSelectInput (dpy, window, mask)
-    register Display	*dpy;
-    Window		window;
-    unsigned long	mask;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xShapeSelectInputReq   *req;
-
-    ShapeSimpleCheckExtension (dpy, info);
-
-    LockDisplay (dpy);
-    GetReq (ShapeSelectInput, req);
-    req->reqType = info->codes->major_opcode;
-    req->shapeReqType = X_ShapeSelectInput;
-    req->window = window;
-    if (mask & ShapeNotifyMask)
-	req->enable = xTrue;
-    else
-	req->enable = xFalse;
-    UnlockDisplay (dpy);
-    SyncHandle ();
-}
-
-unsigned long XShapeInputSelected (dpy, window)
-    register Display	*dpy;
-    Window		window;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xShapeInputSelectedReq *req;
-    xShapeInputSelectedReply	    rep;
-
-    ShapeCheckExtension (dpy, info, False);
-
-    LockDisplay (dpy);
-    GetReq (ShapeInputSelected, req);
-    req->reqType = info->codes->major_opcode;
-    req->shapeReqType = X_ShapeInputSelected;
-    req->window = window;
-    if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) {
-	UnlockDisplay (dpy);
-	SyncHandle ();
-	return False;
-    }
-    UnlockDisplay (dpy);
-    SyncHandle ();
-    return rep.enabled ? ShapeNotifyMask : 0L;
-}
-
-
-XRectangle *XShapeGetRectangles (dpy, window, kind, count, ordering)
-    register Display	*dpy;
-    Window		window;
-    int			kind;
-    int			*count;	/* RETURN */
-    int			*ordering; /* RETURN */
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xShapeGetRectanglesReq   *req;
-    xShapeGetRectanglesReply	    rep;
-    XRectangle			    *rects;
-    xRectangle			    *xrects;
-    int				    i;
-
-    ShapeCheckExtension (dpy, info, (XRectangle *)NULL);
-
-    LockDisplay (dpy);
-    GetReq (ShapeGetRectangles, req);
-    req->reqType = info->codes->major_opcode;
-    req->shapeReqType = X_ShapeGetRectangles;
-    req->window = window;
-    req->kind = kind;
-    if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) {
-	UnlockDisplay (dpy);
-	SyncHandle ();
-	return (XRectangle *)NULL;
-    }
-    *count = rep.nrects;
-    *ordering = rep.ordering;
-    rects = 0;
-    if (*count) {
-	xrects = (xRectangle *) Xmalloc (*count * sizeof (xRectangle));
-	rects = (XRectangle *) Xmalloc (*count * sizeof (XRectangle));
-	if (!xrects || !rects) {
-	    if (xrects)
-		Xfree (xrects);
-	    if (rects)
-		Xfree (rects);
-	    _XEatData (dpy, *count * sizeof (xRectangle));
-	    rects = 0;
-	    *count = 0;
-	} else {
-	    _XRead (dpy, (char *) xrects, *count * sizeof (xRectangle));
-	    for (i = 0; i < *count; i++) {
-	    	rects[i].x = (short) cvtINT16toInt (xrects[i].x);
-	    	rects[i].y = (short) cvtINT16toInt (xrects[i].y);
-	    	rects[i].width = xrects[i].width;
-	    	rects[i].height = xrects[i].height;
-	    }
-	    Xfree (xrects);
-	}
-    }
-    UnlockDisplay (dpy);
-    SyncHandle ();
-    return rects;
-}
diff --git a/xc/lib/Xext/XShm.c b/xc/lib/Xext/XShm.c
deleted file mode 100644
index c817e7964..000000000
--- a/xc/lib/Xext/XShm.c
+++ /dev/null
@@ -1,447 +0,0 @@
-/*
- * $TOG: XShm.c /main/19 1998/02/11 15:41:35 kaleb $
- *
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- *
- * Author:  Bob Scheifler and Keith Packard, MIT X Consortium
- */
-/* $XFree86: xc/lib/Xext/XShm.c,v 1.2 1999/07/12 05:57:23 dawes Exp $ */
-
-/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
-
-#define NEED_EVENTS
-#define NEED_REPLIES
-#include <stdio.h>
-#include "Xlibint.h"
-#include "XShm.h"
-#include "shmstr.h"
-#include "Xext.h"
-#include "extutil.h"
-
-static XExtensionInfo _shm_info_data;
-static XExtensionInfo *shm_info = &_shm_info_data;
-static /* const */ char *shm_extension_name = SHMNAME;
-
-#define ShmCheckExtension(dpy,i,val) \
-  XextCheckExtension (dpy, i, shm_extension_name, val)
-
-/*****************************************************************************
- *                                                                           *
- *			   private utility routines                          *
- *                                                                           *
- *****************************************************************************/
-
-/* in X11/ImUtil.c */
-extern int _XGetScanlinePad();
-extern int _XGetBitsPerPixel();
-extern void _XInitImageFuncPtrs();
-
-static int close_display();
-static char *error_string();
-static Bool wire_to_event();
-static Status event_to_wire();
-static /* const */ XExtensionHooks shm_extension_hooks = {
-    NULL,				/* create_gc */
-    NULL,				/* copy_gc */
-    NULL,				/* flush_gc */
-    NULL,				/* free_gc */
-    NULL,				/* create_font */
-    NULL,				/* free_font */
-    close_display,			/* close_display */
-    wire_to_event,			/* wire_to_event */
-    event_to_wire,			/* event_to_wire */
-    NULL,				/* error */
-    error_string,			/* error_string */
-};
-
-static /* const */ char *shm_error_list[] = {
-    "BadShmSeg",			/* BadShmSeg */
-};
-
-static XEXT_GENERATE_FIND_DISPLAY (find_display, shm_info, shm_extension_name, 
-				   &shm_extension_hooks, ShmNumberEvents, NULL)
-
-static XEXT_GENERATE_CLOSE_DISPLAY (close_display, shm_info)
-
-static XEXT_GENERATE_ERROR_STRING (error_string, shm_extension_name,
-				   ShmNumberErrors, shm_error_list)
-
-
-static Bool wire_to_event (dpy, re, event)
-    Display *dpy;
-    XEvent  *re;
-    xEvent  *event;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    XShmCompletionEvent	*se;
-    xShmCompletionEvent	*sevent;
-
-    ShmCheckExtension (dpy, info, False);
-
-    switch ((event->u.u.type & 0x7f) - info->codes->first_event) {
-    case ShmCompletion:
-	se = (XShmCompletionEvent *) re;
-	sevent = (xShmCompletionEvent *) event;
-	se->type = sevent->type & 0x7f;
-	se->serial = _XSetLastRequestRead(dpy,(xGenericReply *) event);
-	se->send_event = (sevent->type & 0x80) != 0;
-	se->display = dpy;
-	se->drawable = sevent->drawable;
-	se->major_code = sevent->majorEvent;
-	se->minor_code = sevent->minorEvent;
-	se->shmseg = sevent->shmseg;
-	se->offset = sevent->offset;
-    	return True;
-    }
-    return False;
-}
-
-static Status event_to_wire (dpy, re, event)
-    Display *dpy;
-    XEvent  *re;
-    xEvent  *event;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    XShmCompletionEvent	*se;
-    xShmCompletionEvent	*sevent;
-
-    ShmCheckExtension (dpy, info, 0);
-
-    switch ((re->type & 0x7f) - info->codes->first_event) {
-    case ShmCompletion:
-    	se = (XShmCompletionEvent *) re;
-	sevent = (xShmCompletionEvent *) event;
-    	sevent->type = se->type | (se->send_event ? 0x80 : 0);
-    	sevent->sequenceNumber = se->serial & 0xffff;
-    	sevent->drawable = se->drawable;
-    	sevent->majorEvent = se->major_code;
-    	sevent->minorEvent = se->minor_code;
-    	sevent->shmseg = se->shmseg;
-    	sevent->offset = se->offset;
-    	return True;
-    }
-    return False;
-}
-
-/*****************************************************************************
- *                                                                           *
- *		    public Shared Memory Extension routines                  *
- *                                                                           *
- *****************************************************************************/
-
-Bool XShmQueryExtension (dpy /* event_basep, error_basep */)
-    Display *dpy;
-/*  int *event_basep, *error_basep; */
-{
-    XExtDisplayInfo *info = find_display (dpy);
-
-    if (XextHasExtension(info)) {
-/*	*event_basep = info->codes->first_event;
-	*error_basep = info->codes->error_event; */
-	return True;
-    } else {
-	return False;
-    }
-}
-
-
-int XShmGetEventBase(dpy)
-    Display *dpy;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-
-    if (XextHasExtension(info)) {
-	return info->codes->first_event;
-    } else {
-	return -1;
-    }
-}
-
-
-Bool XShmQueryVersion(dpy, majorVersion, minorVersion, sharedPixmaps)
-    Display *dpy;
-    int	    *majorVersion, *minorVersion;
-    Bool    *sharedPixmaps;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xShmQueryVersionReply rep;
-    register xShmQueryVersionReq *req;
-
-    ShmCheckExtension (dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(ShmQueryVersion, req);
-    req->reqType = info->codes->major_opcode;
-    req->shmReqType = X_ShmQueryVersion;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-    *majorVersion = rep.majorVersion;
-    *minorVersion = rep.minorVersion;
-    *sharedPixmaps = rep.sharedPixmaps ? True : False;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-
-int XShmPixmapFormat(dpy)
-    Display *dpy;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xShmQueryVersionReply rep;
-    register xShmQueryVersionReq *req;
-
-    ShmCheckExtension (dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(ShmQueryVersion, req);
-    req->reqType = info->codes->major_opcode;
-    req->shmReqType = X_ShmQueryVersion;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return 0;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    if (rep.sharedPixmaps &&
-	(rep.majorVersion > 1 || rep.minorVersion > 0))
-	return rep.pixmapFormat;
-    return 0;
-}
-
-
-Status XShmAttach(dpy, shminfo)
-    Display *dpy;
-    XShmSegmentInfo *shminfo;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xShmAttachReq *req;
-
-    ShmCheckExtension (dpy, info, 0);
-
-    shminfo->shmseg = XAllocID(dpy);
-    LockDisplay(dpy);
-    GetReq(ShmAttach, req);
-    req->reqType = info->codes->major_opcode;
-    req->shmReqType = X_ShmAttach;
-    req->shmseg = shminfo->shmseg;
-    req->shmid = shminfo->shmid;
-    req->readOnly = shminfo->readOnly ? xTrue : xFalse;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
-
-Status XShmDetach(dpy, shminfo)
-    Display *dpy;
-    XShmSegmentInfo *shminfo;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xShmDetachReq *req;
-
-    ShmCheckExtension (dpy, info, 0);
-
-    LockDisplay(dpy);
-    GetReq(ShmDetach, req);
-    req->reqType = info->codes->major_opcode;
-    req->shmReqType = X_ShmDetach;
-    req->shmseg = shminfo->shmseg;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
-static int _XShmDestroyImage (ximage)
-    XImage *ximage;
-
-{
-	Xfree((char *)ximage);
-	return 1;
-}
-
-#define ROUNDUP(nbytes, pad) ((((nbytes) + ((pad) - 1)) / (pad)) * (pad))
-
-XImage *XShmCreateImage (dpy, visual, depth, format, data, shminfo,
-			 width, height)
-    register Display *dpy;
-    register Visual *visual;
-    unsigned int depth;
-    int format;
-    char *data;
-    XShmSegmentInfo *shminfo;
-    unsigned int width;
-    unsigned int height;
-{
-    register XImage *image;
-
-    image = (XImage *)Xcalloc(1, (unsigned)sizeof(XImage));
-    if (!image)
-	return image;
-    image->data = data;
-    image->obdata = (char *)shminfo;
-    image->width = width;
-    image->height = height;
-    image->depth = depth;
-    image->format = format;
-    image->byte_order = dpy->byte_order;
-    image->bitmap_unit = dpy->bitmap_unit;
-    image->bitmap_bit_order = dpy->bitmap_bit_order;
-    image->bitmap_pad = _XGetScanlinePad(dpy, depth);
-    image->xoffset = 0;
-    if (visual) {
-	image->red_mask = visual->red_mask;
-	image->green_mask = visual->green_mask;
-	image->blue_mask = visual->blue_mask;
-    } else {
-	image->red_mask = image->green_mask = image->blue_mask = 0;
-    }
-    if (format == ZPixmap)
-	image->bits_per_pixel = _XGetBitsPerPixel(dpy, (int)depth);
-    else
-	image->bits_per_pixel = 1;
-    image->bytes_per_line = ROUNDUP((image->bits_per_pixel * width),
-				    image->bitmap_pad) >> 3;
-    _XInitImageFuncPtrs(image);
-    image->f.destroy_image = _XShmDestroyImage;
-    return image;
-}
-
-Status XShmPutImage (dpy, d, gc, image, src_x, src_y, dst_x, dst_y,
-		     src_width, src_height, send_event)
-    register Display *dpy;
-    Drawable d;
-    GC gc;
-    register XImage *image;
-    int src_x, src_y, dst_x, dst_y;
-    unsigned int src_width, src_height;
-    Bool send_event;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    XShmSegmentInfo *shminfo = (XShmSegmentInfo *)image->obdata;
-    register xShmPutImageReq *req;
-
-    ShmCheckExtension (dpy, info, 0);
-    if (!shminfo) return 0;
-
-    LockDisplay(dpy);
-    FlushGC(dpy, gc);
-    GetReq(ShmPutImage, req);
-    req->reqType = info->codes->major_opcode;
-    req->shmReqType = X_ShmPutImage;
-    req->drawable = d;
-    req->gc = gc->gid;
-    req->srcX = src_x;
-    req->srcY = src_y;
-    req->srcWidth = src_width;
-    req->srcHeight = src_height;
-    req->dstX = dst_x;
-    req->dstY = dst_y;
-    req->totalWidth = image->width;
-    req->totalHeight = image->height;
-    req->depth = image->depth;
-    req->format = image->format;
-    req->sendEvent = send_event;
-    req->shmseg = shminfo->shmseg;
-    req->offset = image->data - shminfo->shmaddr;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
-
-Status XShmGetImage(dpy, d, image, x, y, plane_mask)
-    register Display *dpy;
-    Drawable d;
-    XImage *image;
-    int x, y;
-    unsigned long plane_mask;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    XShmSegmentInfo *shminfo = (XShmSegmentInfo *)image->obdata;
-    register xShmGetImageReq *req;
-    xShmGetImageReply rep;
-    register Visual *visual;
-
-    ShmCheckExtension (dpy, info, 0);
-    if (!shminfo) return 0;
-
-    LockDisplay(dpy);
-    GetReq(ShmGetImage, req);
-    req->reqType = info->codes->major_opcode;
-    req->shmReqType = X_ShmGetImage;
-    req->drawable = d;
-    req->x = x;
-    req->y = y;
-    req->width = image->width;
-    req->height = image->height;
-    req->planeMask = plane_mask;
-    req->format = image->format;
-    req->shmseg = shminfo->shmseg;
-    req->offset = image->data - shminfo->shmaddr;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return 0;
-    }
-    visual = _XVIDtoVisual(dpy, rep.visual);
-    if (visual) {
-    	image->red_mask = visual->red_mask;
-    	image->green_mask = visual->green_mask;
-    	image->blue_mask = visual->blue_mask;
-    } else {
-	image->red_mask = image->green_mask = image->blue_mask = 0;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
-
-Pixmap XShmCreatePixmap (dpy, d, data, shminfo, width, height, depth)
-    register Display *dpy;
-    Drawable d;
-    char *data;
-    XShmSegmentInfo *shminfo;
-    unsigned int width, height, depth;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    Pixmap pid;
-    register xShmCreatePixmapReq *req;
-
-    ShmCheckExtension (dpy, info, 0);
-
-    LockDisplay(dpy);
-    GetReq(ShmCreatePixmap, req);
-    req->reqType = info->codes->major_opcode;
-    req->shmReqType = X_ShmCreatePixmap;
-    req->drawable = d;
-    req->width = width;
-    req->height = height;
-    req->depth = depth;
-    req->shmseg = shminfo->shmseg;
-    req->offset = data - shminfo->shmaddr;
-    pid = req->pid = XAllocID(dpy);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return pid;
-}
diff --git a/xc/lib/Xext/XSync.c b/xc/lib/Xext/XSync.c
deleted file mode 100644
index 1ce3cbeb4..000000000
--- a/xc/lib/Xext/XSync.c
+++ /dev/null
@@ -1,859 +0,0 @@
-/* $TOG: XSync.c /main/10 1998/02/06 14:52:15 kaleb $ */
-/*
-
-Copyright 1991, 1993, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-/***********************************************************
-Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,
-and Olivetti Research Limited, Cambridge, England.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the names of Digital or Olivetti
-not be used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THEY BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xext/XSync.c,v 1.3 1999/07/12 10:11:45 dawes Exp $ */
-
-#include <stdio.h>
-#define NEED_EVENTS
-#define NEED_REPLIES
-#include "Xlibint.h"
-#include "Xext.h"
-#include "extutil.h"
-#include "syncstr.h"
-
-static XExtensionInfo _sync_info_data;
-static XExtensionInfo *sync_info = &_sync_info_data;
-static char    *sync_extension_name = SYNC_NAME;
-
-#define SyncCheckExtension(dpy,i,val) \
-		XextCheckExtension(dpy, i, sync_extension_name, val)
-#define SyncSimpleCheckExtension(dpy,i) \
-		XextSimpleCheckExtension(dpy, i, sync_extension_name)
-
-static int      close_display();
-static Bool     wire_to_event();
-static Status   event_to_wire();
-static char    *error_string();
-
-static XExtensionHooks sync_extension_hooks = {
-    NULL,			/* create_gc */
-    NULL,			/* copy_gc */
-    NULL,			/* flush_gc */
-    NULL,			/* free_gc */
-    NULL,			/* create_font */
-    NULL,			/* free_font */
-    close_display,		/* close_display */
-    wire_to_event,		/* wire_to_event */
-    event_to_wire,		/* event_to_wire */
-    NULL,			/* error */
-    error_string,		/* error_string */
-};
-
-static char    *sync_error_list[] = {
-    "BadCounter",
-    "BadAlarm",
-};
-
-static 
-XEXT_GENERATE_FIND_DISPLAY(find_display, sync_info,
-			   sync_extension_name,
-			   &sync_extension_hooks,
-			   XSyncNumberEvents, (XPointer) NULL)
-
-static 
-XEXT_GENERATE_CLOSE_DISPLAY(close_display, sync_info)
-
-static 
-XEXT_GENERATE_ERROR_STRING(error_string, sync_extension_name,
-			   XSyncNumberErrors, sync_error_list)
-
-
-static Bool     
-wire_to_event(dpy, event, wire)
-    Display        *dpy;
-    XEvent         *event;
-    xEvent         *wire;
-{
-    XExtDisplayInfo *info = find_display(dpy);
-    XSyncCounterNotifyEvent *aevent;
-    xSyncCounterNotifyEvent *awire;
-    XSyncAlarmNotifyEvent *anl;
-    xSyncAlarmNotifyEvent *ane;
-
-    SyncCheckExtension(dpy, info, False);
-
-    switch ((wire->u.u.type & 0x7F) - info->codes->first_event)
-    {
-      case XSyncCounterNotify:
-	awire = (xSyncCounterNotifyEvent *) wire;
-	aevent = (XSyncCounterNotifyEvent *) event;
-	aevent->type = awire->type & 0x7F;
-	aevent->serial = _XSetLastRequestRead(dpy,
-					      (xGenericReply *) wire);
-	aevent->send_event = (awire->type & 0x80) != 0;
-	aevent->display = dpy;
-	aevent->counter = awire->counter;
-	XSyncIntsToValue(&aevent->wait_value, awire->wait_value_lo,
-				    awire->wait_value_hi);
-	XSyncIntsToValue(&aevent->counter_value,
-				    awire->counter_value_lo,
-				    awire->counter_value_hi);
-	aevent->time = awire->time;
-	aevent->count = awire->count;
-	aevent->destroyed = awire->destroyed;
-	return True;
-
-      case XSyncAlarmNotify:
-	ane = (xSyncAlarmNotifyEvent *) wire;	/* ENCODING EVENT PTR */
-	anl = (XSyncAlarmNotifyEvent *) event;	/* LIBRARY EVENT PTR */
-	anl->type = ane->type & 0x7F;
-	anl->serial = _XSetLastRequestRead(dpy,
-					   (xGenericReply *) wire);
-	anl->send_event = (ane->type & 0x80) != 0;
-	anl->display = dpy;
-	anl->alarm = ane->alarm;
-	XSyncIntsToValue(&anl->counter_value,
-				    ane->counter_value_lo,
-				    ane->counter_value_hi);
-	XSyncIntsToValue(&anl->alarm_value,
-				    ane->alarm_value_lo,
-				    ane->alarm_value_hi);
-	anl->state = ane->state;
-	anl->time = ane->time;
-	return True;
-    }
-
-    return False;
-}
-
-static Status 
-event_to_wire(dpy, event, wire)
-    Display        *dpy;
-    XEvent         *event;
-    xEvent         *wire;
-{
-    XExtDisplayInfo *info = find_display(dpy);
-    XSyncCounterNotifyEvent *aevent;
-    xSyncCounterNotifyEvent *awire;
-    XSyncAlarmNotifyEvent *anl;
-    xSyncAlarmNotifyEvent *ane;
-
-    SyncCheckExtension(dpy, info, False);
-
-    switch ((event->type & 0x7F) - info->codes->first_event)
-    {
-      case XSyncCounterNotify:
-	awire = (xSyncCounterNotifyEvent *) wire;
-	aevent = (XSyncCounterNotifyEvent *) event;
-	awire->type = aevent->type | (aevent->send_event ? 0x80 : 0);
-	awire->sequenceNumber = aevent->serial & 0xFFFF;
-	awire->counter = aevent->counter;
-	awire->wait_value_lo = XSyncValueLow32(aevent->wait_value);
-	awire->wait_value_hi = XSyncValueHigh32(aevent->wait_value);
-	awire->counter_value_lo = XSyncValueLow32(aevent->counter_value);
-	awire->counter_value_hi = XSyncValueHigh32(aevent->counter_value);
-	awire->time = aevent->time;
-	awire->count = aevent->count;
-	awire->destroyed = aevent->destroyed;
-	return True;
-
-      case XSyncAlarmNotify:
-	ane = (xSyncAlarmNotifyEvent *) wire;	/* ENCODING EVENT PTR */
-	anl = (XSyncAlarmNotifyEvent *) event;	/* LIBRARY EVENT PTR */
-	ane->type = anl->type | (anl->send_event ? 0x80 : 0);
-	ane->sequenceNumber = anl->serial & 0xFFFF;
-	ane->alarm = anl->alarm;
-	ane->counter_value_lo = XSyncValueLow32(anl->counter_value);
-	ane->counter_value_hi = XSyncValueHigh32(anl->counter_value);
-	ane->alarm_value_lo = XSyncValueLow32(anl->alarm_value);
-	ane->alarm_value_hi = XSyncValueHigh32(anl->alarm_value);
-	ane->state = anl->state;
-	ane->time = anl->time;
-	return True;
-    }
-    return False;
-}
-
-Status
-XSyncQueryExtension(dpy, event_base_return, error_base_return)
-    Display        *dpy;
-    int  *event_base_return, *error_base_return;
-{
-    XExtDisplayInfo *info = find_display(dpy);
-
-    if (XextHasExtension(info))
-    {
-	*event_base_return = info->codes->first_event;
-	*error_base_return = info->codes->first_error;
-	return True;
-    }
-    else
-	return False;
-}
-
-Status
-XSyncInitialize(dpy, major_version_return, minor_version_return)
-    Display        *dpy;
-    int *major_version_return, *minor_version_return;
-{
-    XExtDisplayInfo *info = find_display(dpy);
-    xSyncInitializeReply rep;
-    xSyncInitializeReq *req;
-
-    SyncCheckExtension(dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(SyncInitialize, req);
-    req->reqType = info->codes->major_opcode;
-    req->syncReqType = X_SyncInitialize;
-    req->majorVersion = SYNC_MAJOR_VERSION;
-    req->minorVersion = SYNC_MINOR_VERSION;
-    if (!_XReply(dpy, (xReply *) & rep, 0, xTrue))
-    {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    *major_version_return = rep.majorVersion;
-    *minor_version_return = rep.minorVersion;
-    return ((rep.majorVersion == SYNC_MAJOR_VERSION)
-#if SYNC_MINOR_VERSION > 0	/* avoid compiler warning */
-	    && (rep.minorVersion >= SYNC_MINOR_VERSION)
-#endif
-	    );
-}
-
-XSyncSystemCounter *
-XSyncListSystemCounters(dpy, n_counters_return)
-    Display        *dpy;
-    int		   *n_counters_return;
-{
-    XExtDisplayInfo *info = find_display(dpy);
-    xSyncListSystemCountersReply rep;
-    xSyncListSystemCountersReq *req;
-    XSyncSystemCounter *list = NULL;
-
-    SyncCheckExtension(dpy, info, NULL);
-
-    LockDisplay(dpy);
-    GetReq(SyncListSystemCounters, req);
-    req->reqType = info->codes->major_opcode;
-    req->syncReqType = X_SyncListSystemCounters;
-    if (!_XReply(dpy, (xReply *) & rep, 0, xFalse))
-	goto bail;
-
-    *n_counters_return = rep.nCounters;
-    if (rep.nCounters > 0)
-    {
-	xSyncSystemCounter *pWireSysCounter, *pNextWireSysCounter;
-	XSyncCounter counter;
-	int replylen;
-	int i;
-
-	list = (XSyncSystemCounter *)Xmalloc(
-			rep.nCounters * sizeof(XSyncSystemCounter));
-	replylen = rep.length << 2;
-	pWireSysCounter = (xSyncSystemCounter *) Xmalloc ((unsigned) replylen + 1);
-                /* +1 to leave room for last null-terminator */
-
-	if ((!list) || (!pWireSysCounter))
-	{
-	    if (list) Xfree((char *) list);
-	    if (pWireSysCounter)   Xfree((char *) pWireSysCounter);
-	    _XEatData(dpy, (unsigned long) replylen);
-	    list = NULL;
-	    goto bail;
-	}
-
-	_XReadPad(dpy, (char *)pWireSysCounter, replylen);
-
-	counter = pWireSysCounter->counter;
-	for (i = 0; i < rep.nCounters; i++)
-	{
-	    list[i].counter = counter;
-	    XSyncIntsToValue(&list[i].resolution,
-					pWireSysCounter->resolution_lo,
-					pWireSysCounter->resolution_hi);
-
-	    /* we may be about to clobber the counter field of the
-	     * next syscounter because we have to add a null terminator
-	     * to the counter name string.  So we save the next counter
-	     * here.
-	     */
-	    pNextWireSysCounter = (xSyncSystemCounter *)
-		(((char *)pWireSysCounter) + ((SIZEOF(xSyncSystemCounter) + 
-				     pWireSysCounter->name_length + 3) & ~3));
-	    counter = pNextWireSysCounter->counter;
-
-	    list[i].name = ((char *)pWireSysCounter) + 
-						SIZEOF(xSyncSystemCounter);
-	    /* null-terminate the string */
-	    *(list[i].name + pWireSysCounter->name_length) = '\0';
-	    pWireSysCounter = pNextWireSysCounter;
-	}
-    }
-
-bail:
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return list;
-}
-
-void
-XSyncFreeSystemCounterList(list)
-    XSyncSystemCounter *list;
-{
-    if (list)
-    {
-	Xfree( ((char *)list[0].name) - SIZEOF(xSyncSystemCounter));
-	Xfree(list);
-    }
-}
-
-
-XSyncCounter 
-XSyncCreateCounter(dpy, initial_value)
-    Display        *dpy;
-    XSyncValue    initial_value;
-{
-    XExtDisplayInfo *info = find_display(dpy);
-    xSyncCreateCounterReq *req;
-
-    SyncCheckExtension(dpy, info, None);
-
-    LockDisplay(dpy);
-    GetReq(SyncCreateCounter, req);
-    req->reqType = info->codes->major_opcode;
-    req->syncReqType = X_SyncCreateCounter;
-
-    req->cid = XAllocID(dpy);
-    req->initial_value_lo = XSyncValueLow32(initial_value);
-    req->initial_value_hi = XSyncValueHigh32(initial_value);
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return req->cid;
-}
-
-Status 
-XSyncSetCounter(dpy, counter, value)
-    Display        *dpy;
-    XSyncCounter    counter;
-    XSyncValue    value;
-{
-    XExtDisplayInfo *info = find_display(dpy);
-    xSyncSetCounterReq *req;
-
-    SyncCheckExtension(dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(SyncSetCounter, req);
-    req->reqType = info->codes->major_opcode;
-    req->syncReqType = X_SyncSetCounter;
-    req->cid = counter;
-    req->value_lo = XSyncValueLow32(value);
-    req->value_hi = XSyncValueHigh32(value);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-Status 
-XSyncChangeCounter(dpy, counter, value)
-    Display        *dpy;
-    XSyncCounter    counter;
-    XSyncValue    value;
-{
-    XExtDisplayInfo *info = find_display(dpy);
-    xSyncChangeCounterReq *req;
-
-    SyncCheckExtension(dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(SyncChangeCounter, req);
-    req->reqType = info->codes->major_opcode;
-    req->syncReqType = X_SyncChangeCounter;
-    req->cid = counter;
-    req->value_lo = XSyncValueLow32(value);
-    req->value_hi = XSyncValueHigh32(value);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-Status 
-XSyncDestroyCounter(dpy, counter)
-    Display        *dpy;
-    XSyncCounter    counter;
-{
-    XExtDisplayInfo *info = find_display(dpy);
-    xSyncDestroyCounterReq *req;
-
-    SyncCheckExtension(dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(SyncDestroyCounter, req);
-    req->reqType = info->codes->major_opcode;
-    req->syncReqType = X_SyncDestroyCounter;
-    req->counter = counter;
-    UnlockDisplay(dpy);
-    SyncHandle();
-
-    return True;
-}
-
-Status 
-XSyncQueryCounter(dpy, counter, value_return)
-    Display        *dpy;
-    XSyncCounter    counter;
-    XSyncValue   *value_return;
-{
-    XExtDisplayInfo *info = find_display(dpy);
-    xSyncQueryCounterReply rep;
-    xSyncQueryCounterReq *req;
-
-    SyncCheckExtension(dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(SyncQueryCounter, req);
-    req->reqType = info->codes->major_opcode;
-    req->syncReqType = X_SyncQueryCounter;
-    req->counter = counter;
-    if (!_XReply(dpy, (xReply *) & rep, 0, xTrue))
-    {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-    XSyncIntsToValue(value_return, rep.value_lo, rep.value_hi);
-    UnlockDisplay(dpy);
-    SyncHandle();
-
-    return True;
-}
-
-
-Status
-XSyncAwait(dpy, wait_list, n_conditions)
-    Display        *dpy;
-    XSyncWaitCondition *wait_list;
-    int   n_conditions;
-{
-    XExtDisplayInfo *info = find_display(dpy);
-    XSyncWaitCondition *wait_item = wait_list;
-    xSyncAwaitReq  *req;
-    unsigned int    len;
-
-    SyncCheckExtension(dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(SyncAwait, req);
-    req->reqType = info->codes->major_opcode;
-    req->syncReqType = X_SyncAwait;
-    len = (n_conditions * SIZEOF(xSyncWaitCondition)) >> 2;
-    SetReqLen(req, len, len /* XXX */ );
-
-    while (n_conditions--)
-    {
-	xSyncWaitCondition  wc;
-	wc.counter = wait_item->trigger.counter;
-	wc.value_type = wait_item->trigger.value_type;
-	wc.wait_value_lo = XSyncValueLow32(wait_item->trigger.wait_value);
-	wc.wait_value_hi = XSyncValueHigh32(wait_item->trigger.wait_value);
-	wc.test_type = wait_item->trigger.test_type;
-	wc.event_threshold_lo = XSyncValueLow32(wait_item->event_threshold);
-	wc.event_threshold_hi = XSyncValueHigh32(wait_item->event_threshold);
-	Data(dpy, (char *)&wc, SIZEOF(xSyncWaitCondition));
-	wait_item++;		/* get next trigger */
-    }
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-static void
-_XProcessAlarmAttributes(dpy, req, valuemask, attributes)
-    Display        *dpy;
-    xSyncChangeAlarmReq *req;
-    unsigned long   valuemask;
-    XSyncAlarmAttributes *attributes;
-{
-
-    unsigned long  values[32];
-    unsigned long *value = values;
-    unsigned int    nvalues;
-
-    if (valuemask & XSyncCACounter)
-	*value++ = attributes->trigger.counter;
-
-    if (valuemask & XSyncCAValueType)
-	*value++ = attributes->trigger.value_type;
-
-    if (valuemask & XSyncCAValue)
-    {
-	*value++ = XSyncValueHigh32(attributes->trigger.wait_value);
-	*value++ = XSyncValueLow32(attributes->trigger.wait_value);
-    }
-
-    if (valuemask & XSyncCATestType)
-	*value++ = attributes->trigger.test_type;
-
-    if (valuemask & XSyncCADelta)
-    {
-	*value++ = XSyncValueHigh32(attributes->delta);
-	*value++ = XSyncValueLow32(attributes->delta);
-    }
-
-    if (valuemask & XSyncCAEvents)
-	*value++ = attributes->events;
-
-    /* N.B. the 'state' field cannot be set or changed */
-    req->length += (nvalues = value - values);
-    nvalues <<= 2;		/* watch out for macros... */
-
-    Data32(dpy, (long *) values, (long) nvalues);
-}
-
-XSyncAlarm 
-XSyncCreateAlarm(dpy, values_mask, values)
-    Display        *dpy;
-    unsigned long   values_mask;
-    XSyncAlarmAttributes *values;
-{
-    XExtDisplayInfo *info = find_display(dpy);
-    xSyncCreateAlarmReq *req;
-    XSyncAlarm      aid;
-
-    SyncCheckExtension(dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(SyncCreateAlarm, req);
-    req->reqType = info->codes->major_opcode;
-    req->syncReqType = X_SyncCreateAlarm;
-    req->id = aid = XAllocID(dpy);
-    values_mask &= XSyncCACounter | XSyncCAValueType | XSyncCAValue
-    			| XSyncCATestType | XSyncCADelta | XSyncCAEvents;
-    if ((req->valueMask = values_mask))
-	_XProcessAlarmAttributes(dpy, (xSyncChangeAlarmReq *) req,
-				 values_mask, values);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return aid;
-}
-
-Status
-XSyncDestroyAlarm(dpy, alarm)
-    Display        *dpy;
-    XSyncAlarm      alarm;
-{
-    XExtDisplayInfo *info = find_display(dpy);
-    xSyncDestroyAlarmReq *req;
-
-    SyncCheckExtension(dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(SyncDestroyAlarm, req);
-    req->reqType = info->codes->major_opcode;
-    req->syncReqType = X_SyncDestroyAlarm;
-    req->alarm = alarm;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-Status
-XSyncQueryAlarm(dpy, alarm, values_return)
-    Display        *dpy;
-    XSyncAlarm      alarm;
-    XSyncAlarmAttributes *values_return;
-{
-    XExtDisplayInfo *info = find_display(dpy);
-    xSyncQueryAlarmReq *req;
-    xSyncQueryAlarmReply rep;
-
-    SyncCheckExtension(dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(SyncQueryAlarm, req);
-    req->reqType = info->codes->major_opcode;
-    req->syncReqType = X_SyncQueryAlarm;
-    req->alarm = alarm;
-
-    if (!(_XReply(dpy, (xReply *) & rep,
-    ((SIZEOF(xSyncQueryAlarmReply) - SIZEOF(xGenericReply)) >> 2), xFalse)))
-    {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-
-    values_return->trigger.counter = rep.counter;
-    values_return->trigger.value_type = rep.value_type;
-    XSyncIntsToValue(&values_return->trigger.wait_value,
-				rep.wait_value_lo, rep.wait_value_hi);
-    values_return->trigger.test_type = rep.test_type;
-    XSyncIntsToValue(&values_return->delta, rep.delta_lo,
-				rep.delta_hi);
-    values_return->events = rep.events;
-    values_return->state = rep.state;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-Status
-XSyncChangeAlarm(dpy, alarm, values_mask, values)
-    Display        *dpy;
-    XSyncAlarm      alarm;
-    unsigned long   values_mask;
-    XSyncAlarmAttributes *values;
-{
-    XExtDisplayInfo *info = find_display(dpy);
-    xSyncChangeAlarmReq *req;
-
-    SyncCheckExtension(dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(SyncChangeAlarm, req);
-    req->reqType = info->codes->major_opcode;
-    req->syncReqType = X_SyncChangeAlarm;
-    req->alarm = alarm;
-    values_mask &= XSyncCACounter | XSyncCAValueType | XSyncCAValue
-		 | XSyncCATestType | XSyncCADelta | XSyncCAEvents;
-    if ((req->valueMask = values_mask))
-	_XProcessAlarmAttributes(dpy, req, values_mask, values);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-Status
-XSyncSetPriority(dpy, client_resource_id, priority)
-    Display        *dpy;
-    XID             client_resource_id;
-    int             priority;
-{
-    XExtDisplayInfo *info = find_display(dpy);
-    xSyncSetPriorityReq *req;
-
-    SyncCheckExtension(dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(SyncSetPriority, req);
-    req->reqType = info->codes->major_opcode;
-    req->syncReqType = X_SyncSetPriority;
-    req->id = client_resource_id;
-    req->priority = priority;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-Status 
-XSyncGetPriority(dpy, client_resource_id, return_priority)
-    Display        *dpy;
-    XID             client_resource_id;
-    int            *return_priority;
-{
-    XExtDisplayInfo *info = find_display(dpy);
-    xSyncGetPriorityReply rep;
-    xSyncGetPriorityReq *req;
-
-    SyncCheckExtension(dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(SyncGetPriority, req);
-    req->reqType = info->codes->major_opcode;
-    req->syncReqType = X_SyncGetPriority;
-    req->id = client_resource_id;
-
-    if (!_XReply(dpy, (xReply *) & rep, 0, xFalse))
-    {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-    if (return_priority)
-	*return_priority = rep.priority;
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-/*
- *  Functions corresponding to the macros for manipulating 64-bit values
- */
-
-/* get rid of macros so we can define corresponding functions */
-#undef XSyncIntToValue
-#undef XSyncIntsToValue
-#undef XSyncValueGreaterThan
-#undef XSyncValueLessThan
-#undef XSyncValueGreaterOrEqual
-#undef XSyncValueLessOrEqual
-#undef XSyncValueEqual
-#undef XSyncValueIsNegative
-#undef XSyncValueIsZero
-#undef XSyncValueIsPositive
-#undef XSyncValueLow32
-#undef XSyncValueHigh32
-#undef XSyncValueAdd
-#undef XSyncValueSubtract
-#undef XSyncMaxValue
-#undef XSyncMinValue
-
-void
-XSyncIntToValue(pv, i)
-    XSyncValue *pv;
-    int i;
-{
-    _XSyncIntToValue(pv,i);
-}
-
-void
-XSyncIntsToValue(pv, l, h)
-    XSyncValue *pv;
-    unsigned int l;
-    int h;
-{
-    _XSyncIntsToValue(pv, l, h);
-}
-
-Bool
-XSyncValueGreaterThan(a, b)
-    XSyncValue a, b;
-{
-    return _XSyncValueGreaterThan(a, b);
-}
-
-Bool
-XSyncValueLessThan(a, b)
-    XSyncValue a, b;
-{
-    return _XSyncValueLessThan(a, b);
-}
-
-Bool
-XSyncValueGreaterOrEqual(a, b)
-    XSyncValue a, b;
-{
-    return _XSyncValueGreaterOrEqual(a, b);
-}
-
-Bool
-XSyncValueLessOrEqual(a, b)
-    XSyncValue a, b;
-{
-    return _XSyncValueLessOrEqual(a, b);
-}
-
-Bool
-XSyncValueEqual(a, b)
-    XSyncValue a, b;
-{
-    return _XSyncValueEqual(a, b);
-}
-
-Bool
-XSyncValueIsNegative(v)
-    XSyncValue v;
-{
-    return _XSyncValueIsNegative(v);
-}
-
-Bool
-XSyncValueIsZero(a)
-    XSyncValue a;
-{
-    return _XSyncValueIsZero(a);
-}
-
-Bool
-XSyncValueIsPositive(v)
-    XSyncValue v;
-{
-    return _XSyncValueIsPositive(v);
-}
-
-unsigned int
-XSyncValueLow32(v)
-    XSyncValue v;
-{
-    return _XSyncValueLow32(v);
-}
-
-int
-XSyncValueHigh32(v)
-    XSyncValue v;
-{
-    return _XSyncValueHigh32(v);
-}
-
-void
-XSyncValueAdd(presult, a, b, poverflow)
-    XSyncValue *presult, a, b;
-    Bool *poverflow;
-{
-    _XSyncValueAdd(presult, a, b, poverflow);
-}
-
-void
-XSyncValueSubtract(presult, a, b, poverflow)
-    XSyncValue *presult, a, b;
-    Bool *poverflow;
-{
-    _XSyncValueSubtract(presult, a, b, poverflow);
-}
-
-void
-XSyncMaxValue(pv)
-    XSyncValue *pv;
-{
-    _XSyncMaxValue(pv);
-}
-
-void
-XSyncMinValue(pv)
-    XSyncValue *pv;
-{
-    _XSyncMinValue(pv);
-}
diff --git a/xc/lib/Xext/XTestExt1.c b/xc/lib/Xext/XTestExt1.c
deleted file mode 100644
index d1c274a47..000000000
--- a/xc/lib/Xext/XTestExt1.c
+++ /dev/null
@@ -1,1315 +0,0 @@
-/* $TOG: XTestExt1.c /main/10 1998/02/15 16:19:21 kaleb $ */
-/*
- *	File:  xtestext1lib.c
- *
- *	This file contains the Xlib parts of the input synthesis extension
- */
-
-/*
-
-
-Copyright 1986, 1987, 1988, 1998   The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1986, 1987, 1988 by Hewlett-Packard Corporation
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Hewlett-Packard not be used in
-advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-Hewlett-Packard makes no representations about the 
-suitability of this software for any purpose.  It is provided 
-"as is" without express or implied warranty.
-
-This software is not subject to any license of the American
-Telephone and Telegraph Company or of the Regents of the
-University of California.
-
-*/
-/* $XFree86: xc/lib/Xext/XTestExt1.c,v 1.2 1999/07/12 05:57:24 dawes Exp $ */
-
-/******************************************************************************
- * include files
- *****************************************************************************/
-
-#define NEED_REPLIES
-#define NEED_EVENTS
-
-#include <stdio.h>
-#include <X11/Xproto.h>
-#include <X11/Xlibint.h>
-#include <X11/extensions/xtestext1.h>
-
-/******************************************************************************
- * variables
- *****************************************************************************/
-
-/*
- * Holds the request type code for this extension.  The request type code
- * for this extension may vary depending on how many extensions are installed
- * already, so the initial value given below will be added to the base request
- * code that is aquired when this extension is installed.
- */
-static int		XTestReqCode = 0;
-/*
- * Holds the two event type codes for this extension.  The event type codes
- * for this extension may vary depending on how many extensions are installed
- * already, so the initial values given below will be added to the base event
- * code that is aquired when this extension is installed.
- *
- * These two variables must be available to programs that use this extension.
- */
-int			XTestInputActionType = 0;
-int			XTestFakeAckType   = 1;
-/*
- * holds the current x and y coordinates for XTestMovePointer
- */
-static int	current_x = 0;
-static int	current_y = 0;
-/*
- * Holds input actions being accumulated until the input action buffer is
- * full or until XTestFlush is called.
- */
-static CARD8		action_buf[XTestMAX_ACTION_LIST_SIZE];
-/*
- * the index into the input action buffer
- */
-static int		action_index = 0;
-/*
- * the number of input actions that the server can handle at one time
- */
-static unsigned long	action_array_size = 0;
-/*
- * the current number of input actions
- */
-static unsigned long	action_count = 0;
-
-/******************************************************************************
- * function declarations
- *****************************************************************************/
-
-static int	XTestWireToEvent();
-static int	XTestCheckExtInit();
-static Bool	XTestIdentifyMyEvent();
-static int	XTestInitExtension();
-static int	XTestKeyOrButton();
-static int	XTestCheckDelay();
-static int	XTestPackInputAction();
-static int	XTestWriteInputActions();
-
-/******************************************************************************
- *
- *	XTestFakeInput
- *
- *	Send a a request containing one or more input actions to be sent
- *	to the server by this extension.
- */
-int
-XTestFakeInput(dpy, action_list_addr, action_list_size, ack_flag)
-/*
- * the connection to the X server
- */
-register Display	*dpy;
-/*
- * the address of a list of input actions to be sent to the server
- */
-char			*action_list_addr;
-/*
- * the size (in bytes) of the list of input actions
- */
-int			action_list_size;
-/*
- * specifies whether the server needs to send an event to indicate that its
- * input action buffer is empty
- */
-int			ack_flag;
-{	
-	/*
-	 * pointer to xTestFakeInputReq structure
-	 */
-	xTestFakeInputReq	*req;
-	/*
-	 * loop index
-	 */
-	int			i;
-
-	LockDisplay(dpy);
-	if ((XTestCheckExtInit(dpy) == -1) ||
-	    (action_list_size > XTestMAX_ACTION_LIST_SIZE))
-	{
-		/*
-		 * if the extension is not installed in the server or the 
-		 * action list will not fit in the request, then unlock
-		 * the display and return -1.
-		 */
-		UnlockDisplay(dpy);
-		return(-1);
-	}
-	else
-	{
-		/*
-		 * Get the next available X request packet in the buffer.
-		 * It sets the `length' field to the size (in 32-bit words)
-		 * of the request.  It also sets the `reqType' field in the
-		 * request to X_TestFakeInput, which is not what is needed.
-		 *
-		 * GetReq is a macro defined in Xlibint.h.
-		 */
-		GetReq(TestFakeInput, req);		
-		/*
-		 * fix up the request type code to what is needed
-		 */
-		req->reqType = XTestReqCode;
-		/*
-		 * set the minor request type code to X_TestFakeInput
-		 */
-		req->XTestReqType = X_TestFakeInput;
-		/*
-		 * set the ack code
-		 */
-		req->ack = ack_flag;
-		/*
-		 * Set the action_list area to all 0's. An input action header
-		 * value of 0 is interpreted as a flag to the input action
-		 * list handling code in the server part of this extension
-		 * that there are no more input actions in this request.
-		 */
-		for (i = 0; i < XTestMAX_ACTION_LIST_SIZE; i++)
-		{
-			req->action_list[i] = 0;
-		}
-		/*
-		 * copy the input actions into the request
-		 */
-		for (i = 0; i < action_list_size; i++)
-		{
-			req->action_list[i] = *(action_list_addr++);
-		}
-		UnlockDisplay(dpy);
-		SyncHandle();
-		return(0);
-	}
-}
-
-/******************************************************************************
- *
- *	XTestGetInput
- *
- *	Request the server to begin putting user input actions into events
- *	to be sent to the client that called this function.
- */
-int
-XTestGetInput(dpy, action_handling)
-/*
- * the connection to the X server
- */
-register Display	*dpy;
-/*
- * tells the server what to do with the user input actions
- */
-int			action_handling;
-{	
-	/*
-	 * pointer to xTestGetInputReq structure
-	 */
-	xTestGetInputReq 	*req;
-
-	LockDisplay(dpy);
-	if (XTestCheckExtInit(dpy) == -1)
-	{
-		/*
-		 * if the extension is not installed in the server
-		 * then unlock the display and return -1.
-		 */
-		UnlockDisplay(dpy);
-		return(-1);
-	}
-	else
-	{
-		/*
-		 * Get the next available X request packet in the buffer.
-		 * It sets the `length' field to the size (in 32-bit words)
-		 * of the request.  It also sets the `reqType' field in the
-		 * request to X_TestGetInput, which is not what is needed.
-		 *
-		 * GetReq is a macro defined in Xlibint.h.
-		 */
-		GetReq(TestGetInput, req);		
-		/*
-		 * fix up the request type code to what is needed
-		 */
-		req->reqType = XTestReqCode;
-		/*
-		 * set the minor request type code to X_TestGetInput
-		 */
-		req->XTestReqType = X_TestGetInput;
-		/*
-		 * set the action handling mode
-		 */
-		req->mode = action_handling;
-		UnlockDisplay(dpy);
-		SyncHandle();
-		return(0);
-	}
-}
-
-/******************************************************************************
- *
- *	XTestStopInput
- *
- *	Tell the server to stop putting information about user input actions
- *	into events.
- */
-int
-XTestStopInput(dpy)
-/*
- * the connection to the X server
- */
-register Display	*dpy;
-{	
-	/*
-	 * pointer to xTestStopInputReq structure
-	 */
-	xTestStopInputReq 	*req;
-
-	LockDisplay(dpy);
-	if (XTestCheckExtInit(dpy) == -1)
-	{
-		/*
-		 * if the extension is not installed in the server
-		 * then unlock the display and return -1.
-		 */
-		UnlockDisplay(dpy);
-		return(-1);
-	}
-	else
-	{
-		/*
-		 * Get the next available X request packet in the buffer.
-		 * It sets the `length' field to the size (in 32-bit words)
-		 * of the request.  It also sets the `reqType' field in the
-		 * request to X_TestStopInput, which is not what is needed.
-		 *
-		 * GetReq is a macro defined in Xlibint.h.
-		 */
-		GetReq(TestStopInput, req);		
-		/*
-		 * fix up the request type code to what is needed
-		 */
-		req->reqType = XTestReqCode;
-		/*
-		 * set the minor request type code to X_TestStopInput
-		 */
-		req->XTestReqType = X_TestStopInput;
-		UnlockDisplay(dpy);
-		SyncHandle();
-		return(0);
-	}
-}
-
-/******************************************************************************
- *
- *	XTestReset
- *
- *	Tell the server to set everything having to do with this extension
- *	back to its initial state.
- */
-int
-XTestReset(dpy)
-/*
- * the connection to the X server
- */
-register Display	*dpy;
-{	
-	/*
-	 * pointer to xTestReset structure
-	 */
-	xTestResetReq 	*req;
-
-	LockDisplay(dpy);
-	if (XTestCheckExtInit(dpy) == -1)
-	{
-		/*
-		 * if the extension is not installed in the server
-		 * then unlock the display and return -1.
-		 */
-		UnlockDisplay(dpy);
-		return(-1);
-	}
-	else
-	{
-		/*
-		 * Get the next available X request packet in the buffer.
-		 * It sets the `length' field to the size (in 32-bit words)
-		 * of the request.  It also sets the `reqType' field in the
-		 * request to X_TestReset, which is not what is needed.
-		 *
-		 * GetReq is a macro defined in Xlibint.h.
-		 */
-		GetReq(TestReset, req);		
-		/*
-		 * fix up the request type code to what is needed
-		 */
-		req->reqType = XTestReqCode;
-		/*
-		 * set the minor request type code to X_TestReset
-		 */
-		req->XTestReqType = X_TestReset;
-		UnlockDisplay(dpy);
-		SyncHandle();
-		return(0);
-	}
-}
-
-/******************************************************************************
- *
- *	XTestQueryInputSize
- *
- *	Returns the number of input actions in the server's input action buffer.
- */
-int
-XTestQueryInputSize(dpy, size_return)
-/*
- * the connection to the X server
- */
-register Display	*dpy;
-/*
- * the address of the place to put the number of input actions in the
- * server's input action buffer
- */
-unsigned long		*size_return;
-{	
-	/*
-	 * pointer to xTestQueryInputSize structure
-	 */
-	xTestQueryInputSizeReq 		*req;
-	/*
-	 * pointer to xTestQueryInputSize structure
-	 */
-	xTestQueryInputSizeReply 	rep;
-
-	LockDisplay(dpy);
-	if (XTestCheckExtInit(dpy) == -1)
-	{
-		/*
-		 * if the extension is not installed in the server
-		 * then unlock the display and return -1.
-		 */
-		UnlockDisplay(dpy);
-		return(-1);
-	}
-	else
-	{
-		/*
-		 * Get the next available X request packet in the buffer.
-		 * It sets the `length' field to the size (in 32-bit words)
-		 * of the request.  It also sets the `reqType' field in the
-		 * request to X_TestQueryInputSize, which is not what is needed.
-		 *
-		 * GetReq is a macro defined in Xlibint.h.
-		 */
-		GetReq(TestQueryInputSize, req);		
-		/*
-		 * fix up the request type code to what is needed
-		 */
-		req->reqType = XTestReqCode;
-		/*
-		 * set the minor request type code to X_TestQueryInputSize
-		 */
-		req->XTestReqType = X_TestQueryInputSize;
-		/*
-		 * get a reply from the server
-		 */
-		(void) _XReply (dpy, (xReply *) &rep, 0, xTrue);
-		/*
-		 * put the size in the caller's variable
-		 */
-		*size_return = (unsigned long) rep.size_return;
-		UnlockDisplay(dpy);
-		SyncHandle();
-		return(0);
-	}
-}
-
-/******************************************************************************
- *
- *	XTestCheckExtInit
- *
- *	Check to see if the XTest extension is installed in the server.
- */
-static int
-XTestCheckExtInit(dpy)
-/*
- * the connection to the X server
- */
-register Display	*dpy;
-{
-	/*
-	 * if the extension has not been initialized, then do so
-	 */
-	if (!XTestReqCode) 
-	{
-		return(XTestInitExtension(dpy));
-	}
-	return(0);
-}
-
-/******************************************************************************
- *
- *	XTestInitExtension
- *
- *	Attempt to initialize this extension in the server.  Return 0 if it
- *	succeeds, -1 if it does not succeed.
- */
-static int
-XTestInitExtension(dpy)
-/*
- * the connection to the X server
- */
-register Display	*dpy;
-{
-	/*
-	 * loop index
-	 */
-	int			i;
-	/*
-	 * return value from XInitExtension
-	 */
-	XExtCodes		*ret;
-
-	/*
-	 * attempt to initialize the extension
-	 */
-	ret = XInitExtension(dpy, XTestEXTENSION_NAME);
-	/*
-	 * if the initialize failed, return -1
-	 */
-	if (ret == NULL)
-	{
-		return (-1);
-	}
-	/*
-	 * the initialize succeeded, remember the major opcode
-	 * for this extension
-	 */
-	XTestReqCode = ret->major_opcode;
-	/*
-	 * set up the event handler for any events from 
-	 * this extension
-	 */
-	for (i = 0; i < XTestEVENT_COUNT; i++)
-	{
-		XESetWireToEvent(dpy,
-				 ret->first_event+i,
-				 XTestWireToEvent);
-	}
-	/*
-	 * compute the event type codes for the events
-	 * in this extension
-	 */
-	XTestInputActionType += ret->first_event;
-	XTestFakeAckType += ret->first_event;
-	/*
-	 * everything worked ok
-	 */
-	return(0);
-}
-
-/******************************************************************************
- *
- *	XTestWireToEvent
- *
- *	Handle XTest extension events.
- *	Reformat a wire event into an XEvent structure of the right type.
- */
-static Bool
-XTestWireToEvent(dpy, reTemp, eventTemp)
-/*
- * the connection to the X server
- */
-Display	*dpy;
-/*
- * a pointer to where a host formatted event should be stored
- * with the information copied to it
- */
-XEvent	*reTemp;
-/*
- * a pointer to the wire event
- */
-xEvent	*eventTemp;
-{
-	XTestInputActionEvent *re    = (XTestInputActionEvent *) reTemp;
-	xTestInputActionEvent *event = (xTestInputActionEvent *) eventTemp;
-
-	/*
-	 * loop index
-	 */
-	int	i;
-	/*
-	 * pointer to where the input actions go in the host format event
-	 */
-	CARD8	*to;
-	/*
-	 * pointer to the input actions in the wire event
-	 */
-	CARD8	*from;
-
-	/*
-	 * Copy the type of the wire event to the new event.
-	 * This will work for either event type because the type,
-	 * display, and window fields in the events have to be the same.
-	 */
-	re->type = event->type;
-	/*
-	 * set the display parameter in case it is needed (by who?)
-	 */
-	re->display = dpy;
-	if (re->type == XTestInputActionType)
-	{
-		/*
-		 * point at the first byte of input actions in the wire event
-		 */
-		from = &(event->actions[0]);
-		/*
-		 * point at where the input action bytes go in the new event
-		 */
-		to = &(re->actions[0]);
-		/*
-		 * copy the input action bytes from the wire event to
-		 * the new event
-		 */
-		for (i = 0; i < XTestACTIONS_SIZE; i++)
-		{
-			*(to++) = *(from++);
-		}
-	}
-	else if (re->type == XTestFakeAckType)
-	{
-		/*
-		 * nothing else needs to be done
-		 */
-	}
-	else
-	{
-		printf("XTestWireToEvent: UNKNOWN WIRE EVENT! type=%d\n",
-			(int) event->type);
-		printf("%s is giving up.\n", XTestEXTENSION_NAME);
-		exit (1);
-	}
-	return 1;
-}
-
-/******************************************************************************
- *
- *	XTestPressKey
- *
- *	Send input actions to the server to cause the server to think
- *	that the specified key on the keyboard was moved as specified.
- */
-int
-XTestPressKey(display, device_id, delay, keycode, key_action)
-Display		*display;
-int		device_id;
-unsigned long	delay;
-unsigned int	keycode;
-unsigned int	key_action;
-{
-	/*
-	 * bounds check the key code
-	 */
-	if (keycode < 8 || keycode > 255)
-	{
-		return(-1);
-	}
-	/*
-	 * use the commmon key/button handling routine
-	 */
-	return(XTestKeyOrButton(display,
-				device_id,
-				delay,
-				keycode,
-				key_action));
-}
-
-/******************************************************************************
- *
- *	XTestPressButton
- *
- *	Send input actions to the server to cause the server to think
- *	that the specified button on the mouse was moved as specified.
- */
-int
-XTestPressButton(display, device_id, delay, button_number, button_action)
-Display		*display;
-int		device_id;
-unsigned long	delay;
-unsigned int	button_number;
-unsigned int	button_action;
-{
-	/*
-	 * bounds check the button number
-	 */
-	if (button_number > 7)
-	{
-		return(-1);
-	}
-	/*
-	 * use the commmon key/button handling routine
-	 */
-	return(XTestKeyOrButton(display,
-				device_id,
-				delay,
-				button_number,
-				button_action));
-}
-
-/******************************************************************************
- *
- *	XTestKeyOrButton
- *
- *	Send input actions to the server to cause the server to think
- *	that the specified key/button was moved as specified.
- */
-static int
-XTestKeyOrButton(display, device_id, delay, code, action)
-Display		*display;
-int		device_id;
-unsigned long	delay;
-unsigned int	code;
-unsigned int	action;
-{
-	/*
-	 * holds a key input action to be filled out and sent to the server
-	 */
-	XTestKeyInfo	keyinfo;
-
-	/*
-	 * bounds check the device id
-	 */
-	if (device_id < 0 || device_id > XTestMAX_DEVICE_ID)
-	{
-		return(-1);
-	}
-	/*
-	 * fill out the key input action(s) as appropriate
-	 */
-	switch(action)
-	{
-	case XTestPRESS:
-		/*
-		 * Check the delay.  If it is larger than will fit in the
-		 * key input action, send a delay input action.
-		 */
-		if(XTestCheckDelay(display, &delay) == -1)
-		{
-			/*
-			 * an error occurred, return -1
-			 */
-			return(-1);
-		}
-		/*
-		 * create the header 
-		 */
-		keyinfo.header = XTestPackDeviceID(device_id) |
-				 XTestKEY_ACTION |
-				 XTestKEY_DOWN;
-		/*
-		 * set the key/button code
-		 */
-		keyinfo.keycode = code;
-		/*
-		 * set the delay time
-		 */
-		keyinfo.delay_time = delay;
-		/*
-		 * pack the input action into a request to be sent to the
-		 * server when the request is full or XTestFlush is called
-		 */
-		return(XTestPackInputAction(display,
-					    (CARD8 *) &keyinfo,
-					    sizeof(XTestKeyInfo)));
-	case XTestRELEASE:
-		/*
-		 * Check the delay.  If it is larger than will fit in the
-		 * key input action, send a delay input action.
-		 */
-		if(XTestCheckDelay(display, &delay) == -1)
-		{
-			/*
-			 * an error occurred, return -1
-			 */
-			return(-1);
-		}
-		/*
-		 * create the header 
-		 */
-		keyinfo.header = XTestPackDeviceID(device_id) |
-				 XTestKEY_ACTION |
-				 XTestKEY_UP;
-		/*
-		 * set the key/button code
-		 */
-		keyinfo.keycode = code;
-		/*
-		 * set the delay time
-		 */
-		keyinfo.delay_time = delay;
-		/*
-		 * pack the input action into a request to be sent to the
-		 * server when the request is full or XTestFlush is called
-		 */
-		return(XTestPackInputAction(display,
-					    (CARD8 *) &keyinfo,
-					    sizeof(XTestKeyInfo)));
-	case XTestSTROKE:
-		/*
-		 * Check the delay.  If it is larger than will fit in the
-		 * key input action, send a delay input action.
-		 */
-		if(XTestCheckDelay(display, &delay) == -1)
-		{
-			/*
-			 * an error occurred, return -1
-			 */
-			return(-1);
-		}
-		/*
-		 * create a key/button-down input action header
-		 */
-		keyinfo.header = XTestPackDeviceID(device_id) |
-				 XTestKEY_ACTION |
-				 XTestKEY_DOWN;
-		/*
-		 * set the key/button code
-		 */
-		keyinfo.keycode = code;
-		/*
-		 * set the delay time
-		 */
-		keyinfo.delay_time = delay;
-		/*
-		 * pack the input action into a request to be sent to the
-		 * server when the request is full or XTestFlush is called
-		 */
-		if (XTestPackInputAction(display,
-					 (CARD8 *) &keyinfo,
-					 sizeof(XTestKeyInfo)) == -1)
-		{
-			/*
-			 * an error occurred, return -1
-			 */
-			return(-1);
-		}
-		/*
-		 * set the delay to XTestSTROKE_DELAY_TIME
-		 */
-		delay = XTestSTROKE_DELAY_TIME;
-		/*
-		 * Check the delay.  If it is larger than will fit in the
-		 * key input action, send a delay input action.
-		 */
-		if(XTestCheckDelay(display, &delay) == -1)
-		{
-			/*
-			 * an error occurred, return -1
-			 */
-			return(-1);
-		}
-		/*
-		 * create a key/button-up input action header
-		 */
-		keyinfo.header = XTestPackDeviceID(device_id) |
-				 XTestKEY_ACTION |
-				 XTestKEY_UP;
-		/*
-		 * set the key/button code
-		 */
-		keyinfo.keycode = code;
-		/*
-		 * set the delay time
-		 */
-		keyinfo.delay_time = delay;
-		/*
-		 * pack the input action into a request to be sent to the
-		 * server when the request is full or XTestFlush is called
-		 */
-		return(XTestPackInputAction(display,
-					    (CARD8 *) &keyinfo,
-					    sizeof(XTestKeyInfo)));
-	default:
-		/*
-		 * invalid action value, return -1
-		 */
-		 return(-1);
-	}
-}
-
-/******************************************************************************
- *
- *	XTestMovePointer
- *
- *	Send input actions to the server to cause the server to think
- *	that the mouse was moved as specified.
- */
-int
-XTestMovePointer(display, device_id, delay, x, y, count)
-Display		*display;
-int		device_id;
-unsigned long	delay[];
-int		x[];
-int		y[];
-unsigned int	count;
-{
-	/*
-	 * holds a motion input action to be filled out and sent to the server
-	 */
-	XTestMotionInfo	motioninfo;
-	/*
-	 * holds a jump input action to be filled out and sent to the server
-	 */
-	XTestJumpInfo	jumpinfo;
-	/*
-	 * loop index
-	 */
-	unsigned int	i;
-	/*
-	 * holds the change in x and y directions from the current x and y
-	 * coordinates
-	 */
-	int	dx;
-	int	dy;
-
-	/*
-	 * bounds check the device id
-	 */
-	if (device_id < 0 || device_id > XTestMAX_DEVICE_ID)
-	{
-		return(-1);
-	}
-	/*
-	 * if the count is 0, there is nothing to do.  return 0
-	 */
-	if (count == 0)
-	{
-		return(0);
-	}
-	/*
-	 * loop through the pointer motions, creating the appropriate
-	 * input actions for each motion
-	 */
-	for (i = 0; i < count; i++)
-	{
-		/*
-		 * Check the delay.  If it is larger than will fit in the
-		 * input action, send a delay input action.
-		 */
-		if(XTestCheckDelay(display, &(delay[i])) == -1)
-		{
-			/*
-			 * an error occurred, return -1
-			 */
-			return(-1);
-		}
-		/*
-		 * compute the change from the current x and y coordinates
-		 * to the new x and y coordinates
-		 */
-		dx = x[i] - current_x;
-		dy = y[i] - current_y;
-		/*
-		 * update the current x and y coordinates
-		 */
-		current_x = x[i];
-		current_y = y[i];
-		/*
-		 * If the pointer motion range is too large to fit into
-		 * a motion input action, then use a jump input action.
-		 * Otherwise, use a motion input action.
-		 */
-		 if ((dx > XTestMOTION_MAX) || (dx < XTestMOTION_MIN) ||
-		     (dy > XTestMOTION_MAX) || (dy < XTestMOTION_MIN))
-		{
-			/*
-			 * create a jump input action header
-			 */
-			jumpinfo.header = XTestPackDeviceID(device_id) |
-					  XTestJUMP_ACTION;
-			/*
-			 * set the x and y coordinates to jump to
-			 */
-			jumpinfo.jumpx = x[i];
-			jumpinfo.jumpy = y[i];
-			/*
-			 * set the delay time
-			 */
-			jumpinfo.delay_time = delay[i];
-			/*
-			 * pack the jump input action into a request to be
-			 * sent to the server when the request is full
-			 * or XTestFlush is called
-			 */
-			if (XTestPackInputAction(display,
-						 (CARD8 *) &jumpinfo,
-						 sizeof(XTestJumpInfo)) == -1)
-			{
-				/*
-				 * an error occurred, return -1
-				 */
-				return(-1);
-			}
-		}
-		else
-		{
-			/*
-			 * create a motion input action header
-			 */
-			motioninfo.header = XTestPackDeviceID(device_id) |
-					    XTestMOTION_ACTION;
-			/*
-			 * compute the motion data byte
-			 */
-			if (dx < 0)
-			{
-				motioninfo.header |= XTestX_NEGATIVE;
-				dx = abs(dx);
-			}
-			if (dy < 0)
-			{
-				motioninfo.header |= XTestY_NEGATIVE;
-				dy = abs(dy);
-			}
-			motioninfo.motion_data = XTestPackXMotionValue(dx);
-			motioninfo.motion_data |= XTestPackYMotionValue(dy);
-			/*
-			 * set the delay time
-			 */
-			motioninfo.delay_time = delay[i];
-			/*
-			 * pack the motion input action into a request to be
-			 * sent to the server when the request is full
-			 * or XTestFlush is called
-			 */
-			if (XTestPackInputAction(display,
-						 (CARD8 *) &motioninfo,
-						 sizeof(XTestMotionInfo)) == -1)
-			{
-				/*
-				 * an error occurred, return -1
-				 */
-				return(-1);
-			}
-		}
-	}
-	/*
-	 * if you get here, everything went ok
-	 */
-	return(0);
-}
-
-/******************************************************************************
- *
- *	XTestCheckDelay
- *
- *	Check the delay value at the passed-in address.  If it is larger than
- *	will fit in a normal input action, then send a delay input action.
- */
-static int
-XTestCheckDelay(display, delay_addr)
-Display		*display;
-unsigned long	*delay_addr;
-{
-	/*
-	 * holds a delay input action to be filled out and sent to the server
-	 */
-	XTestDelayInfo	delayinfo;
-
-	/*
-	 * if the delay value will fit in the input action,
-	 * then there is no need for a delay input action
-	 */
-	if (*delay_addr <= XTestSHORT_DELAY_TIME)
-	{
-		return(0);
-	}
-	/*
-	 * fill out a delay input action
-	 */
-	delayinfo.header = XTestPackDeviceID(XTestDELAY_DEVICE_ID);
-	delayinfo.delay_time = *delay_addr;
-	/*
-	 * all of the delay time will be accounted for in the
-	 * delay input action, so set the original delay value to 0
-	 */
-	*delay_addr = 0;
-	/*
-	 * pack the delay input action into a request to be sent to the
-	 * server when the request is full or XTestFlush is called
-	 */
-	return(XTestPackInputAction(display,
-				    (CARD8 *) &delayinfo,
-				    sizeof(XTestDelayInfo)));
-}
-
-/******************************************************************************
- *
- *	XTestPackInputAction
- *
- *	If the input action buffer is full or the number of input actions
- *	has reached the maximum that the server can handle at one time,
- *	then send the input actions to the server using XTestFakeInput.
- */
-static int
-XTestPackInputAction(display, action_addr, action_size)
-Display	*display;
-CARD8	*action_addr;
-int	action_size;
-{
-	/*
-	 * loop index
-	 */
-	int	i;
-	/*
-	 * acknowledge flag
-	 */
-	int	ack_flag;
-
-	/*
-	 * if we don't already know it, find out how many input actions
-	 * the server can handle at one time
-	 */
-	if (action_array_size == 0)
-	{
-		if(XTestQueryInputSize(display, &action_array_size) == -1)
-		{
-			/*
-			 * if an error, return -1
-			 */
-			return(-1);
-		}
-	}
-	/*
-	 * if the specified input action will fit in the the input
-	 * action buffer and won't exceed the server's capacity, then
-	 * put the input action into the input buffer
-	 */
-	if(((action_index + action_size) <= XTestMAX_ACTION_LIST_SIZE) &&
-	   ((action_count + 1) < action_array_size))
-	{
-		/*
-		 * copy the input action into the buffer
-		 */
-		for (i = 0; i < action_size; i++)
-		{
-			action_buf[action_index++] = *(action_addr++);
-		}
-		/*
-		 * increment the action count
-		 */
-		action_count++;
-		/*
-		 * everything went ok, return 0
-		 */
-		return(0);
-	}
-	/*
-	 * We have to write input actions to the server.  If the server's
-	 * input action capacity will be reached, then ask for an
-	 * acknowledge event when the server has processed all of the 
-	 * input actions.  Otherwise, an acknowledge event is not needed.
-	 */
-	if (action_count >= action_array_size)
-	{
-		ack_flag = XTestFAKE_ACK_REQUEST;
-	}
-	else
-	{
-		ack_flag = XTestFAKE_ACK_NOT_NEEDED;
-	}
-	/*
-	 * write the input actions to the server
-	 */
-	if (XTestWriteInputActions(display,
-				   (char *) &(action_buf[0]),
-				   action_index,
-				   ack_flag) == -1)
-	{
-		/*
-		 * error, return -1
-		 */
-		return(-1);
-	}
-	/*
-	 * copy the input action into the buffer
-	 */
-	for (i = 0; i < action_size; i++)
-	{
-		action_buf[action_index++] = *(action_addr++);
-	}
-	/*
-	 * increment the action count
-	 */
-	action_count++;
-	return(0);
-}
-
-/******************************************************************************
- *
- *	XTestWriteInputActions
- *
- *	Send input actions to the server.
- */
-static int
-XTestWriteInputActions(display, action_list_addr, action_list_size, ack_flag)
-Display	*display;
-char	*action_list_addr;
-int	action_list_size;
-int	ack_flag;
-{
-	/*
-	 * Holds an event.  Used while waiting for an acknowledge event
-	 */
-	XEvent	event;
-	/*
-	 * points to XTestIdentifyMyEvent
-	 */
-	Bool	(*func_ptr)();
-
-	/*
-	 * write the input actions to the server
-	 */
-	if (XTestFakeInput(display,
-			   action_list_addr,
-			   action_list_size,
-			   ack_flag) == -1)
-	{
-		/*
-		 * if an error, return -1
-		 */
-		return(-1);
-	}
-	/*
-	 * flush X's buffers to make sure that the server really gets
-	 * the input actions
-	 */
-	XFlush(display);
-	/*
-	 * mark the input action buffer as empty
-	 */
-	action_index = 0;
-	/*
-	 * if we asked for an acknowledge event, then wait for it
-	 */
-	if (ack_flag == XTestFAKE_ACK_REQUEST)
-	{
-		/*
-		 * point func_ptr at XTestIdentifyMyEvent
-		 */
-		func_ptr = XTestIdentifyMyEvent;
-		/*
-		 * Wait until the acknowledge event comes.  When the
-		 * acknowledge event comes, it is removed from the event
-		 * queue without disturbing any other events that might
-		 * be in the queue.
-		 */
-		XIfEvent(display, &event, func_ptr, NULL);
-		/*
-		 * set the input action count back to 0
-		 */
-		action_count = 0;
-	}
-	/*
-	 * if we got here, then everything is ok, return 0
-	 */
-	return(0);
-}
-
-/******************************************************************************
- *
- *	XTestIdentifyMyEvent
- *
- *	This function is called by XIfEvent to look at an event and see if
- *	it is of XTestFakeAckType.
- */
-static	Bool
-XTestIdentifyMyEvent(display, event_ptr, args)
-Display	*display;
-/*
- * Holds the event that this routiine is supposed to look at.
- */
-XEvent	*event_ptr;
-/*
- * this points to any user-specified arguments (ignored)
- */
-char	*args;
-{
-	/*
-	 * if the event if of the correct type, return the Bool True,
-	 * otherwise return the Bool False.
-	 */
-	if (event_ptr->type == XTestFakeAckType)
-	{
-		return(True);
-	}
-	else
-	{
-		return(False);
-	}
-}
-
-/******************************************************************************
- *
- *	XTestFlush
- *
- *	Send any input actions in the input action buffer to the server.
- */
-int
-XTestFlush(display)
-Display	*display;
-{
-	/*
-	 * acknowledge flag
-	 */
-	int	ack_flag;
-
-	/*
-	 * if there are no input actions in the input action buffer,
-	 * then return 0
-	 */
-	if (action_index == 0)
-	{
-		return(0);
-	}
-	/*
-	 * We have input actions to write to the server.  We will
-	 * wait until the server has finished processing the input actions.
-	 */
-	ack_flag = XTestFAKE_ACK_REQUEST;
-	/*
-	 * write the input actions to the server
-	 */
-	return(XTestWriteInputActions(display,
-				      (char *) &(action_buf[0]),
-				      action_index,
-				      ack_flag));
-}
diff --git a/xc/lib/Xext/Xcup.c b/xc/lib/Xext/Xcup.c
deleted file mode 100644
index 5423d1424..000000000
--- a/xc/lib/Xext/Xcup.c
+++ /dev/null
@@ -1,280 +0,0 @@
-/* $XFree86: xc/lib/Xext/Xcup.c,v 1.4 1999/07/12 05:57:24 dawes Exp $ */
-/*
-
-Copyright 1987, 1988, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $TOG: Xcup.c /main/4 1998/02/06 14:51:19 kaleb $ */
-
-#ifdef WIN32
-#define BOOL wBOOL
-#undef Status
-#define Status wStatus
-#include <windows.h>
-#undef Status
-#define Status int
-#undef BOOL
-#endif
-
-#define NEED_EVENTS
-#define NEED_REPLIES
-#include "Xlibint.h"
-#include "Xcupstr.h"
-#include "Xext.h"
-#include "extutil.h"
-
-static XExtensionInfo _xcup_info_data;
-static XExtensionInfo *xcup_info = &_xcup_info_data;
-static char *xcup_extension_name = XCUPNAME;
-
-/*****************************************************************************
- *                                                                           *
- *			   private utility routines                          *
- *                                                                           *
- *****************************************************************************/
-
-static int close_display();
-static /* const */ XExtensionHooks xcup_extension_hooks = {
-    NULL,				/* create_gc */
-    NULL,				/* copy_gc */
-    NULL,				/* flush_gc */
-    NULL,				/* free_gc */
-    NULL,				/* create_font */
-    NULL,				/* free_font */
-    close_display,			/* close_display */
-    NULL,				/* wire_to_event */
-    NULL,				/* event_to_wire */
-    NULL,				/* error */
-    NULL,				/* error_string */
-};
-
-static XEXT_GENERATE_FIND_DISPLAY (find_display, xcup_info, 
-				   xcup_extension_name, 
-				   &xcup_extension_hooks, 
-				   0, NULL)
-
-static XEXT_GENERATE_CLOSE_DISPLAY (close_display, xcup_info)
-
-
-/*****************************************************************************
- *                                                                           *
- *		    public Xcup Extension routines                           *
- *                                                                           *
- *****************************************************************************/
-
-Status
-XcupQueryVersion(dpy, major_version_return, minor_version_return)
-    Display* dpy;
-    int* major_version_return; 
-    int* minor_version_return;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xXcupQueryVersionReply rep;
-    xXcupQueryVersionReq *req;
-
-    XextCheckExtension (dpy, info, xcup_extension_name, False);
-
-    LockDisplay(dpy);
-    GetReq(XcupQueryVersion, req);
-    req->reqType = info->codes->major_opcode;
-    req->xcupReqType = X_XcupQueryVersion;
-    req->client_major_version = XCUP_MAJOR_VERSION;
-    req->client_minor_version = XCUP_MINOR_VERSION;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xTrue)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-    *major_version_return = rep.server_major_version;
-    *minor_version_return = rep.server_minor_version;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return True;
-}
-
-/* Win32 reserves 20 colormap entries for its desktop */
-#ifndef TYP_RESERVED_ENTRIES
-#define TYP_RESERVED_ENTRIES 20
-#endif
-
-Status 
-#if NeedFunctionPrototypes
-XcupGetReservedColormapEntries(
-    Display* dpy,
-    int screen,
-    XColor** colors_out,
-    int* ncolors)
-#else
-XcupGetReservedColormapEntries(dpy, screen, colors_out, ncolors)
-    Display* dpy;
-    int screen;
-    XColor** colors_out;
-    int* ncolors;
-#endif
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xXcupGetReservedColormapEntriesReply rep;
-    xXcupGetReservedColormapEntriesReq *req;
-    xColorItem rbuf[TYP_RESERVED_ENTRIES];
-
-    *ncolors = 0;
-
-    XextCheckExtension (dpy, info, xcup_extension_name, False);
-
-    LockDisplay(dpy);
-    GetReq(XcupGetReservedColormapEntries, req);
-    req->reqType = info->codes->major_opcode;
-    req->xcupReqType = X_XcupGetReservedColormapEntries;
-    req->screen = screen;
-    if (_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	long nbytes;
-	xColorItem* rbufp;
-	int nentries = rep.length / 3;
-
-	nbytes = nentries * SIZEOF (xColorItem);
-	if (nentries > TYP_RESERVED_ENTRIES)
-	    rbufp = (xColorItem*) Xmalloc (nbytes);
-	else
-	    rbufp = rbuf;
-
-	if (rbufp == NULL) {
-	    _XEatData (dpy, (unsigned long) nbytes);
-	    UnlockDisplay (dpy);
-	    SyncHandle ();
-	    return False;
-	}
-	_XRead (dpy, (char*) rbufp, nbytes);
-
-	*colors_out = (XColor*) Xmalloc (nentries  * sizeof (XColor));
-	if (*colors_out) {
-	    xColorItem* cs = (xColorItem *) rbufp;
-	    XColor* cd = *colors_out;
-	    int i;
-
-	    *ncolors = nentries;
-	    for (i = 0; i < *ncolors; i++, cd++) {
-		cd->pixel = cs->pixel;
-		cd->red = cs->red;
-		cd->green = cs->green;
-		cd->blue = cs->blue;
-		cs = (xColorItem*) (((char*) cs) + SIZEOF(xColorItem));
-	    }
-	    if (rbufp != rbuf) XFree ((char*) rbufp);
-	    UnlockDisplay(dpy);
-    	    SyncHandle();
-	    return True;
-	}
-	if (rbufp != rbuf) XFree ((char*) rbufp);
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return False;
-}
-
-Status
-#if NeedFunctionPrototypes
-XcupStoreColors(
-    Display* dpy,
-    Colormap colormap,
-    XColor* colors_in_out,
-    int ncolors)
-#else
-XcupStoreColors(dpy, colormap, colors_in_out, ncolors)
-    Display* dpy;
-    Colormap colormap;
-    XColor* colors_in_out;
-    int ncolors;
-#endif
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xXcupStoreColorsReply rep;
-    xXcupStoreColorsReq *req;
-    xColorItem rbuf[256];
-    xColorItem citem;
-    int i;
-    XColor* xcp;
-
-    XextCheckExtension (dpy, info, xcup_extension_name, False);
-
-    LockDisplay(dpy);
-    GetReq(XcupStoreColors, req);
-    req->reqType = info->codes->major_opcode;
-    req->xcupReqType = X_XcupStoreColors;
-    req->cmap = colormap;
-    req->length += (ncolors * SIZEOF(xColorItem)) >> 2;
-
-    for (i = 0, xcp = colors_in_out; i < ncolors; i++, xcp++) {
-	citem.pixel = xcp->pixel;
-	citem.red = xcp->red;
-	citem.green = xcp->green;
-	citem.blue = xcp->blue;
-
-	/* note that xColorItem doesn't contain all 16-bit quantities, so
-	   we can't use Data16 */
-	Data(dpy, (char *)&citem, (long) SIZEOF(xColorItem));
-    }
-
-    if (_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	long nbytes;
-	xColorItem* rbufp;
-	xColorItem* cs;
-	int nentries = rep.length / 3;
-
-	nbytes = nentries * SIZEOF (xColorItem);
-
-	if (nentries != ncolors) {
-	    _XEatData (dpy, (unsigned long) nbytes);
-	    UnlockDisplay (dpy);
-	    SyncHandle ();
-	    return False;
-	}
-
-	if (ncolors > 256)
-	    rbufp = (xColorItem*) Xmalloc (nbytes);
-	else
-	    rbufp = rbuf;
-
-	if (rbufp == NULL) {
-	    _XEatData (dpy, (unsigned long) nbytes);
-	    UnlockDisplay (dpy);
-	    SyncHandle ();
-	    return False;
-
-	}
-
-	_XRead (dpy, (char*) rbufp, nbytes);
-
-	for (i = 0, xcp = colors_in_out, cs = rbufp; i < ncolors; i++, xcp++, cs++) {
-	    xcp->pixel = cs->pixel;
-	    xcp->red = cs->red;
-	    xcp->green = cs->green;
-	    xcp->blue = cs->blue;
-	    xcp->flags = cs->flags;
-	}
-	if (rbufp != rbuf) XFree ((char*)rbufp);
-
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return True;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return False;
-}
-
diff --git a/xc/lib/Xext/Xdbe.c b/xc/lib/Xext/Xdbe.c
deleted file mode 100644
index b502ce752..000000000
--- a/xc/lib/Xext/Xdbe.c
+++ /dev/null
@@ -1,544 +0,0 @@
-/* $XConsortium: Xdbe.c /main/3 1995/09/22 10:20:31 dpw $ */
-/******************************************************************************
- * 
- * Copyright (c) 1994, 1995  Hewlett-Packard Company
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL HEWLETT-PACKARD COMPANY BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * 
- * Except as contained in this notice, the name of the Hewlett-Packard
- * Company shall not be used in advertising or otherwise to promote the
- * sale, use or other dealings in this Software without prior written
- * authorization from the Hewlett-Packard Company.
- * 
- *     Xlib DBE code
- *
- *****************************************************************************/
-/* $XFree86: xc/lib/Xext/Xdbe.c,v 3.1 1999/07/12 05:57:24 dawes Exp $ */
-
-
-#define NEED_EVENTS
-#define NEED_REPLIES
-#include <stdio.h>
-#include <X11/Xlibint.h>
-#include "Xext.h"
-#include "extutil.h"
-#define NEED_DBE_PROTOCOL
-#include "Xdbe.h"
-
-static XExtensionInfo _dbe_info_data;
-static XExtensionInfo *dbe_info = &_dbe_info_data;
-static char *dbe_extension_name = DBE_PROTOCOL_NAME;
-
-#define DbeCheckExtension(dpy,i,val) \
-  XextCheckExtension (dpy, i, dbe_extension_name, val)
-#define DbeSimpleCheckExtension(dpy,i) \
-  XextSimpleCheckExtension (dpy, i, dbe_extension_name)
-
-#if defined(__STDC__) && !defined(UNIXCPP)
-#define DbeGetReq(name,req,info) GetReq (name, req); \
-        req->reqType = info->codes->major_opcode; \
-        req->dbeReqType = X_##name;
-#else
-#define DbeGetReq(name,req,info) GetReq (name, req); \
-        req->reqType = info->codes->major_opcode; \
-        req->dbeReqType = X_/**/name;
-#endif
-
-
-/*****************************************************************************
- *                                                                           *
- *			   private utility routines                          *
- *                                                                           *
- *****************************************************************************/
-
-/*
- * find_display - locate the display info block
- */
-static int close_display();
-static char *error_string();
-static XExtensionHooks dbe_extension_hooks = {
-    NULL,                               /* create_gc */
-    NULL,                               /* copy_gc */
-    NULL,                               /* flush_gc */
-    NULL,                               /* free_gc */
-    NULL,                               /* create_font */
-    NULL,                               /* free_font */
-    close_display,                      /* close_display */
-    NULL,                               /* wire_to_event */
-    NULL,                               /* event_to_wire */
-    NULL,                               /* error */
-    error_string,                       /* error_string */
-};
-
-static char *dbe_error_list[] = {
-    "BadBuffer",			/* DbeBadBuffer */
-};
-
-static XEXT_GENERATE_FIND_DISPLAY (find_display, dbe_info,
-				   dbe_extension_name, 
-				   &dbe_extension_hooks, 
-				   DbeNumberEvents, NULL)
-
-static XEXT_GENERATE_CLOSE_DISPLAY (close_display, dbe_info)
-
-static XEXT_GENERATE_ERROR_STRING (error_string, dbe_extension_name,
-				   DbeNumberErrors, 
-				   dbe_error_list)
-
-
-/*****************************************************************************
- *                                                                           *
- *		       Double-Buffering public interfaces                    *
- *                                                                           *
- *****************************************************************************/
-
-/* 
- * XdbeQueryExtension -
- *	Sets major_version_return and minor_verion_return to the major and
- *	minor DBE protocol version supported by the server.  If the DBE
- *	library is compatible with the version returned by the server, this
- *	function returns non-zero.  If dpy does not support the DBE
- *	extension, or if there was an error during communication with the
- *	server, or if the server and library protocol versions are
- *	incompatible, this functions returns zero.  No other Xdbe functions
- *	may be called before this function.   If a client violates this rule,
- *	the effects of all subsequent Xdbe calls are undefined.
- */
-#if NeedFunctionPrototypes
-Status XdbeQueryExtension (
-    Display *dpy,
-    int *major_version_return,
-    int *minor_version_return)
-#else
-Status XdbeQueryExtension (dpy, major_version_return, minor_version_return)
-    Display *dpy;
-    int *major_version_return;
-    int *minor_version_return;
-#endif
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xDbeGetVersionReply rep;
-    register xDbeGetVersionReq *req;
-
-    if (!XextHasExtension (info))
-        return (Status)0; /* failure */
-
-    LockDisplay (dpy);
-    DbeGetReq (DbeGetVersion, req, info);
-    req->majorVersion = DBE_MAJOR_VERSION;
-    req->minorVersion = DBE_MINOR_VERSION;
-
-    if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) {
-	UnlockDisplay (dpy);
-	SyncHandle ();
-	return (Status)0; /* failure */
-    }
-    *major_version_return = rep.majorVersion;
-    *minor_version_return = rep.minorVersion;
-    UnlockDisplay (dpy);
-
-    SyncHandle ();
-
-    if (*major_version_return != DBE_MAJOR_VERSION)
-        return (Status)0; /* failure */
-    else
-        return (Status)1; /* success */
-}
-
-
-/*
- * XdbeAllocateBackBuffer -
- *	This function returns a drawable ID used to refer to the back buffer
- *	of the specified window.  The swap_action is a hint to indicate the
- *	swap action that will likely be used in subsequent calls to
- *	XdbeSwapBuffers.  The actual swap action used in calls to
- *	XdbeSwapBuffers does not have to be the same as the swap_action
- *	passed to this function, though clients are encouraged to provide
- *	accurate information whenever possible.
- */
-
-/*## If NeedFunctionPrototypes is defined, the swap_action parameter causes
- *## compiler failure without the #ifdef workaround below.  With
- *## NeedFunctionPrototype enabled, this function is prototyped as
- *##
- *## XdbeBackBuffer XdbeAllocateBackBufferName (dpy, window, swap_action)
- *##     Display *dpy;
- *##     Window window;
- *##     XdbeSwapAction swap_action;
- *##
- *## Without the workaround, an error occurs because swap_action is promoted to
- *## an int by the compiler when compiling this file.  However, this type does
- *## not match what is in the function prototype in Xdbe.h.  In Xdbe.h, the
- *## swap_action parameter is defined as an unsigned char, not an int.
- *##*/
-
-#if NeedFunctionPrototypes
-XdbeBackBuffer XdbeAllocateBackBufferName(
-    Display *dpy,
-    Window window,
-    XdbeSwapAction swap_action)
-#else
-XdbeBackBuffer XdbeAllocateBackBufferName (dpy, window, swap_action)
-    Display *dpy;
-    Window window;
-    XdbeSwapAction swap_action;
-#endif
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xDbeAllocateBackBufferNameReq *req;
-    XdbeBackBuffer buffer;
-
-    /* make sure extension is available; if not, return the
-     * third parameter (0).
-     */
-    DbeCheckExtension (dpy, info, (XdbeBackBuffer)0);
-
-    /* allocate the id */
-    buffer = XAllocID (dpy);
-
-    LockDisplay(dpy);
-    DbeGetReq(DbeAllocateBackBufferName, req, info);
-    req->window = window;
-    req->swapAction = (unsigned char)swap_action;
-    req->buffer = buffer;
-
-    UnlockDisplay (dpy);
-    SyncHandle ();
-    return buffer;
-
-} /* XdbeAllocateBackBufferName() */
-
-/*
- * XdbeDeallocateBackBufferName - 
- *	This function frees a drawable ID, buffer, that was obtained via
- *	XdbeAllocateBackBufferName.  The buffer must refer to the back buffer
- *	of the specified window, or a protocol error results.
- */
-#if NeedFunctionPrototypes
-Status XdbeDeallocateBackBufferName (
-    Display *dpy,
-    XdbeBackBuffer buffer)
-#else
-Status XdbeDeallocateBackBufferName (dpy, buffer)
-    Display *dpy;
-    XdbeBackBuffer buffer;
-#endif
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xDbeDeallocateBackBufferNameReq *req;
-
-    DbeCheckExtension (dpy, info, (Status)0 /* failure */);
-
-    LockDisplay (dpy);
-    DbeGetReq (DbeDeallocateBackBufferName, req, info);
-    req->buffer = buffer;
-    UnlockDisplay (dpy);
-    SyncHandle ();
-
-    return (Status)1; /* success */
-}
-
-
-/*
- * XdbeSwapBuffers - 
- *	This function swaps the front and back buffers for a list of windows.
- *	The argument num_windows specifies how many windows are to have their
- *	buffers swapped; it is the number of elements in the swap_info array.
- *	The argument swap_info specifies the information needed per window
- *	to do the swap.
- */
-#if NeedFunctionPrototypes
-Status XdbeSwapBuffers (
-    Display *dpy,
-    XdbeSwapInfo *swap_info,
-    int num_windows)
-#else
-Status XdbeSwapBuffers (dpy, swap_info, num_windows)
-    Display *dpy;
-    XdbeSwapInfo *swap_info;
-    int num_windows;
-#endif
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xDbeSwapBuffersReq *req;
-    int i;
-
-    DbeCheckExtension (dpy, info, (Status)0 /* failure */);
-
-    LockDisplay (dpy);
-    DbeGetReq (DbeSwapBuffers, req, info);
-    req->length += 2*num_windows;
-    req->n = num_windows;
-
-    /* We need to handle 64-bit machines, where we can not use PackData32
-     * directly because info would be lost in translating from 32- to 64-bit.
-     * Instead we send data via a loop that accounts for the translation.
-     */
-    for (i = 0; i < num_windows; i++)
-    {
-        char tmp[4];
-        Data32 (dpy, (long *)&swap_info[i].swap_window, 4);
-        tmp[0] = swap_info[i].swap_action;
-        Data (dpy, (char *)tmp, 4);
-    }
-
-    UnlockDisplay (dpy);
-    SyncHandle ();
-
-
-    return (Status)1; /* success */
-
-} /* XdbeSwapBuffers() */
-
-
-/*
- * XdbeBeginIdiom -
- *	This function marks the beginning of an idiom sequence.
- */
-#if NeedFunctionPrototypes
-Status XdbeBeginIdiom (
-    Display *dpy)
-#else
-Status XdbeBeginIdiom (dpy)
-    Display *dpy;
-#endif
-{
-    XExtDisplayInfo *info = find_display(dpy);
-    register xDbeBeginIdiomReq *req;
-
-    DbeCheckExtension (dpy, info, (Status)0 /* failure */);
-
-    LockDisplay (dpy);
-    DbeGetReq (DbeBeginIdiom, req, info);
-    UnlockDisplay (dpy);
-    SyncHandle ();
-
-    return (Status)1; /* success */
-}
-
-
-/*
- * XdbeEndIdiom -
- *	This function marks the end of an idiom sequence.
- */
-#if NeedFunctionPrototypes
-Status XdbeEndIdiom (
-    Display *dpy)
-#else
-Status XdbeEndIdiom (dpy)
-    Display *dpy;
-#endif
-{
-    XExtDisplayInfo *info = find_display(dpy);
-    register xDbeEndIdiomReq *req;
-
-    DbeCheckExtension (dpy, info, (Status)0 /* failure */);
-
-    LockDisplay (dpy);
-    DbeGetReq (DbeEndIdiom, req, info);
-    UnlockDisplay (dpy);
-    SyncHandle ();
-
-    return (Status)1; /* success */
-}
-
-
-/*
- * XdbeGetVisualInfo -
- *	This function returns information about which visuals support
- *	double buffering.  The argument num_screens specifies how many
- *	elements there are in the screen_specifiers list.  Each drawable
- *	in screen_specifiers designates a screen for which the supported
- *	visuals are being requested.  If num_screens is zero, information
- *	for all screens is requested.  In this case, upon return from this
- *	function, num_screens will be set to the number of screens that were
- *	found.  If an error occurs, this function returns NULL, else it returns
- *	a pointer to a list of XdbeScreenVisualInfo structures of length
- *	num_screens.  The nth element in the returned list corresponds to the
- *	nth drawable in the screen_specifiers list, unless num_screens was
- *	passed in with the value zero, in which case the nth element in the
- *	returned list corresponds to the nth screen of the server, starting
- *	with screen zero.
- */
-#if NeedFunctionPrototypes
-XdbeScreenVisualInfo *XdbeGetVisualInfo (
-    Display        *dpy,
-    Drawable       *screen_specifiers,
-    int            *num_screens)  /* SEND and RETURN */
-#else
-XdbeScreenVisualInfo *XdbeGetVisualInfo (dpy, screen_specifiers, num_screens)
-    Display        *dpy;
-    Drawable       *screen_specifiers;
-    int            *num_screens;  /* SEND and RETURN */
-#endif
-{
-    XExtDisplayInfo *info = find_display(dpy);
-    register xDbeGetVisualInfoReq *req;
-    xDbeGetVisualInfoReply rep;
-    XdbeScreenVisualInfo *scrVisInfo;
-    int i;
-
-    DbeCheckExtension (dpy, info, (XdbeScreenVisualInfo *)NULL);
-
-    LockDisplay (dpy);
-
-    DbeGetReq(DbeGetVisualInfo, req, info);
-    req->length = 2 + *num_screens;
-    req->n      = *num_screens;
-    Data32 (dpy, screen_specifiers, (*num_screens * sizeof (CARD32)));
-
-    if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) {
-        UnlockDisplay (dpy);
-        SyncHandle ();
-        return NULL;
-    }
-
-    /* return the number of screens actually found if we
-     * requested information about all screens (*num_screens == 0)
-     */
-    if (*num_screens == 0)
-       *num_screens = rep.m;
-
-    /* allocate list of visual information to be returned */
-    if (!(scrVisInfo =
-        (XdbeScreenVisualInfo *)Xmalloc(
-        (unsigned)(*num_screens * sizeof(XdbeScreenVisualInfo))))) {
-        UnlockDisplay (dpy);
-        SyncHandle ();
-        return NULL;
-    }
-
-    for (i = 0; i < *num_screens; i++)
-    {
-        int nbytes;
-        int j;
-        long c;
-
-        _XRead32 (dpy, (char *)&c, sizeof(CARD32));
-        scrVisInfo[i].count = c;
-
-        nbytes = scrVisInfo[i].count * sizeof(XdbeVisualInfo);
-
-        /* if we can not allocate the list of visual/depth info
-         * then free the lists that we already allocate as well
-         * as the visual info list itself
-         */
-        if (!(scrVisInfo[i].visinfo = (XdbeVisualInfo *)Xmalloc(
-            (unsigned)nbytes))) {
-            for (j = 0; j < i; j++) {
-                Xfree ((char *)scrVisInfo[j].visinfo);
-            }
-            Xfree ((char *)scrVisInfo);
-            UnlockDisplay (dpy);
-            SyncHandle ();
-            return NULL;
-        }
-    
-        /* Read the visual info item into the wire structure.  Then copy each
-         * element into the library structure.  The element sizes and/or
-         * padding may be different in the two structures.
-         */
-        for (j = 0; j < scrVisInfo[i].count; j++) {
-            xDbeVisInfo xvi;
-
-            _XRead (dpy, (char *)&xvi, sizeof(xDbeVisInfo));
-            scrVisInfo[i].visinfo[j].visual    = xvi.visualID;
-            scrVisInfo[i].visinfo[j].depth     = xvi.depth;
-            scrVisInfo[i].visinfo[j].perflevel = xvi.perfLevel;
-        }
-
-    }
-
-    UnlockDisplay (dpy);
-    SyncHandle ();
-    return scrVisInfo;
-
-} /* XdbeGetVisualInfo() */
-
-
-/*
- * XdbeFreeVisualInfo -
- *	This function frees the list of XdbeScreenVisualInfo returned by the
- *	function XdbeGetVisualInfo.
- */
-#if NeedFunctionPrototypes
-void XdbeFreeVisualInfo(
-    XdbeScreenVisualInfo *visual_info)
-#else
-void XdbeFreeVisualInfo(visual_info)
-    XdbeScreenVisualInfo *visual_info;
-#endif
-{
-    if (visual_info == NULL) {
-        return;
-    }
-
-    if (visual_info->visinfo) {
-        XFree(visual_info->visinfo);
-    }
-
-    XFree(visual_info);
-}
-
-
-/*
- * XdbeGetBackBufferAttributes -
- *	This function returns the attributes associated with the specified
- *	buffer.
- */
-#if NeedFunctionPrototypes
-XdbeBackBufferAttributes *XdbeGetBackBufferAttributes(
-    Display *dpy,
-    XdbeBackBuffer buffer)
-#else
-XdbeBackBufferAttributes *XdbeGetBackBufferAttributes(dpy, buffer)
-    Display *dpy;
-    XdbeBackBuffer buffer;
-#endif
-{
-    XExtDisplayInfo *info = find_display(dpy);
-    register xDbeGetBackBufferAttributesReq *req;
-    xDbeGetBackBufferAttributesReply rep;
-    XdbeBackBufferAttributes *attr;
-
-    DbeCheckExtension(dpy, info, (XdbeBackBufferAttributes *)NULL);
-
-    if (!(attr =
-       (XdbeBackBufferAttributes *)Xmalloc(sizeof(XdbeBackBufferAttributes)))) {
-        return NULL;
-    }
-
-    LockDisplay(dpy);
-    DbeGetReq(DbeGetBackBufferAttributes, req, info);
-    req->buffer = buffer;
-
-    if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) {
-        UnlockDisplay (dpy);
-        SyncHandle ();
-        return NULL;
-    }
-    attr->window = rep.attributes;
-
-    UnlockDisplay (dpy);
-    SyncHandle ();
-
-    return attr;
-}
-
diff --git a/xc/lib/Xext/Xext-def.cpp b/xc/lib/Xext/Xext-def.cpp
deleted file mode 100644
index 112fa2f2f..000000000
--- a/xc/lib/Xext/Xext-def.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-LIBRARY XEXT
-VERSION LIBRARY_VERSION
-EXPORTS
- XMITMiscGetBugMode
- XMITMiscQueryExtension
- XMITMiscSetBugMode
- XMissingExtension
- XSetExtensionErrorHandler
- XShapeCombineMask
- XShapeCombineRectangles
- XShapeCombineRegion
- XShapeCombineShape
- XShapeGetRectangles
- XShapeInputSelected
- XShapeOffsetShape
- XShapeQueryExtension
- XShapeQueryExtents
- XShapeQueryVersion
- XShapeSelectInput
- XSyncAwait
- XSyncChangeAlarm
- XSyncChangeCounter
- XSyncCreateAlarm
- XSyncCreateCounter
- XSyncDestroyAlarm
- XSyncDestroyCounter
- XSyncFreeSystemCounterList
- XSyncGetPriority
- XSyncInitialize
- XSyncIntToValue
- XSyncIntsToValue
- XSyncListSystemCounters
- XSyncMaxValue
- XSyncMinValue
- XSyncQueryAlarm
- XSyncQueryCounter
- XSyncQueryExtension
- XSyncSetCounter
- XSyncSetPriority
- XSyncValueAdd
- XSyncValueEqual
- XSyncValueGreaterOrEqual
- XSyncValueGreaterThan
- XSyncValueHigh32
- XSyncValueIsNegative
- XSyncValueIsPositive
- XSyncValueIsZero
- XSyncValueLessOrEqual
- XSyncValueLessThan
- XSyncValueLow32
- XSyncValueSubtract
- XTestFakeInput
- XTestFlush
- XTestGetInput
- XTestMovePointer
- XTestPressButton
- XTestPressKey
- XTestQueryInputSize
- XTestReset
- XTestStopInput
- XextAddDisplay
- XextCreateExtension
- XextDestroyExtension
- XextFindDisplay
- XextRemoveDisplay
- XmbufChangeBufferAttributes
- XmbufChangeWindowAttributes
- XmbufClearBufferArea
- XmbufCreateBuffers
- XmbufCreateStereoWindow
- XmbufDestroyBuffers
- XmbufDisplayBuffers
- XmbufGetBufferAttributes
- XmbufGetScreenInfo
- XmbufGetVersion
- XmbufGetWindowAttributes
- XmbufQueryExtension
- XdbeQueryExtension
- XdbeAllocateBackBufferName
- XdbeDeallocateBackBufferName
- XdbeSwapBuffers
- XdbeBeginIdiom
- XdbeEndIdiom
- XdbeGetVisualInfo
- XdbeFreeVisualInfo
- XdbeGetBackBufferAttributes
- XSecurityQueryExtension
- XSecurityAllocXauth
- XSecurityFreeXauth
- XSecurityGenerateAuthorization
- XSecurityRevokeAuthorization
- XagQueryVersion
- XagCreateAssociation
- XagCreateEmbeddedApplicationGroup
- XagCreateNonembeddedApplicationGroup
- XagDestroyApplicationGroup
- XagDestroyAssociation
- XagGetApplicationGroupAttributes
- XagQueryApplicationGroup
- XLbxQueryExtension
- XLbxGetEventBase
- XLbxQueryVersion
- XcupGetReservedColormapEntries
- XcupQueryVersion
- XcupStoreColors
- XPanoramiXQueryVersion
- XPanoramiXAllocInfo
- XPanoramiXGetScreenCount
- XPanoramiXGetScreenSize
- XPanoramiXGetState
- XPanoramiXQueryExtension
- DPMSQueryExtension
- DPMSGetVersion
- DPMSCapable
- DPMSSetTimeouts
- DPMSGetTimeouts
- DPMSEnable
- DPMSDisable
- DPMSForceLevel
- DPMSInfo
- XeviQueryExtension
- XeviQueryVersion
- XeviGetVisualInfo
-/* $TOG: Xext-def.cpp /main/10 1998/01/04 12:31:45 kaleb $ */
diff --git a/xc/lib/Xext/Xextos2.def b/xc/lib/Xext/Xextos2.def
deleted file mode 100644
index 17e028c7c..000000000
--- a/xc/lib/Xext/Xextos2.def
+++ /dev/null
@@ -1,138 +0,0 @@
-LIBRARY XEXT
-DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/Xext/Xextos2.def,v 3.8 1999/04/29 09:13:31 dawes Exp $"
-CODE
-	PRELOAD
-DATA
-	MULTIPLE NONSHARED
-STACKSIZE 4096
-EXPORTS
-	XMITMiscGetBugMode  @ 1
-	XMITMiscQueryExtension  @ 2
-	XMITMiscSetBugMode  @ 3
-	XMissingExtension  @ 4
-	XSetExtensionErrorHandler  @ 5
-	XShapeCombineMask  @ 6
-	XShapeCombineRectangles  @ 7
-	XShapeCombineRegion  @ 8
-	XShapeCombineShape  @ 9
-	XShapeGetRectangles  @ 10
-	XShapeInputSelected  @ 11
-	XShapeOffsetShape  @ 12
-	XShapeQueryExtension  @ 13
-	XShapeQueryExtents  @ 14
-	XShapeQueryVersion  @ 15
-	XShapeSelectInput  @ 16
-	XSyncAwait  @ 17
-	XSyncChangeAlarm  @ 18
-	XSyncChangeCounter  @ 19
-	XSyncCreateAlarm  @ 20
-	XSyncCreateCounter  @ 21
-	XSyncDestroyAlarm  @ 22
-	XSyncDestroyCounter  @ 23
-	XSyncFreeSystemCounterList  @ 24
-	XSyncGetPriority  @ 25
-	XSyncInitialize  @ 26
-	XSyncIntToValue  @ 27
-	XSyncIntsToValue  @ 28
-	XSyncListSystemCounters  @ 29
-	XSyncMaxValue  @ 30
-	XSyncMinValue  @ 31
-	XSyncQueryAlarm  @ 32
-	XSyncQueryCounter  @ 33
-	XSyncQueryExtension  @ 34
-	XSyncSetCounter  @ 35
-	XSyncSetPriority  @ 36
-	XSyncValueAdd  @ 37
-	XSyncValueEqual  @ 38
-	XSyncValueGreaterOrEqual  @ 39
-	XSyncValueGreaterThan  @ 40
-	XSyncValueHigh32  @ 41
-	XSyncValueIsNegative  @ 42
-	XSyncValueIsPositive  @ 43
-	XSyncValueIsZero  @ 44
-	XSyncValueLessOrEqual  @ 45
-	XSyncValueLessThan  @ 46
-	XSyncValueLow32  @ 47
-	XSyncValueSubtract  @ 48
-	XTestFakeInput  @ 49
-	XTestFlush  @ 50
-	XTestGetInput  @ 51
-	XTestMovePointer  @ 52
-	XTestPressButton  @ 53
-	XTestPressKey  @ 54
-	XTestQueryInputSize  @ 55
-	XTestReset  @ 56
-	XTestStopInput  @ 57
-	XextAddDisplay  @ 58
-	XextCreateExtension  @ 59
-	XextDestroyExtension  @ 60
-	XextFindDisplay  @ 61
-	XextRemoveDisplay  @ 62
-	XmbufChangeBufferAttributes  @ 63
-	XmbufChangeWindowAttributes  @ 64
-	XmbufClearBufferArea  @ 65
-	XmbufCreateBuffers  @ 66
-	XmbufCreateStereoWindow  @ 67
-	XmbufDestroyBuffers  @ 68
-	XmbufDisplayBuffers  @ 69
-	XmbufGetBufferAttributes  @ 70
-	XmbufGetScreenInfo  @ 71
-	XmbufGetVersion  @ 72
-	XmbufGetWindowAttributes  @ 73
-	XmbufQueryExtension  @ 74
-	XdbeQueryExtension @ 75
-	XdbeAllocateBackBufferName @ 76
-	XdbeDeallocateBackBufferName @ 77
-	XdbeSwapBuffers @ 78
-	XdbeBeginIdiom @ 79
-	XdbeEndIdiom @ 80
-	XdbeGetVisualInfo @ 81
-	XdbeFreeVisualInfo @ 82
-	XdbeGetBackBufferAttributes @ 83
-	XSecurityQueryExtension @ 84
-	XSecurityAllocXauth @ 85
-	XSecurityFreeXauth @ 86
-	XSecurityGenerateAuthorization @ 87
-	XSecurityRevokeAuthorization @ 88
-	XagQueryVersion @ 89
-	XagCreateEmbeddedApplicationGroup @ 90
-	XagCreateNonembeddedApplicationGroup @ 91
-	XagDestroyApplicationGroup @ 92
-	XagGetApplicationGroupAttributes @ 93
-	XagQueryApplicationGroup @ 94
-	XagCreateAssociation @ 95
-	XagDestroyAssociation @ 96
-	XLbxQueryExtension @ 97
-	XLbxGetEventBase @ 98
-	XLbxQueryVersion @ 99
-	XShmQueryExtension @ 100
-	XShmGetEventBase @ 101
-	XShmQueryVersion @ 102
-	XShmPixmapFormat @ 103
-	XShmAttach @ 104
-	XShmDetach @ 105
-	XShmCreateImage @ 106
-	XShmPutImage @ 107
-	XShmGetImage @ 108
-	XShmCreatePixmap @ 109
-	XcupGetReservedColormapEntries @ 110
-	XcupQueryVersion @ 111
-	XcupStoreColors @ 112
-	XPanoramiXQueryVersion @ 113
-	XPanoramiXAllocInfo @ 114
-	XPanoramiXGetScreenCount @ 115
-	XPanoramiXGetScreenSize @ 116
-	XPanoramiXGetState @ 117
-	XPanoramiXQueryExtension @ 118
-	DPMSQueryExtension @ 119
-	DPMSGetVersion @ 120
-	DPMSCapable @ 121
-	DPMSSetTimeouts @ 122
-	DPMSGetTimeouts @ 123
-	DPMSEnable @ 124
-	DPMSDisable @ 125
-	DPMSForceLevel @ 126
-	DPMSInfo @ 127
-	XeviQueryExtension @ 128
-	XeviQueryVersion @ 129
-	XeviGetVisualInfo @ 130
diff --git a/xc/lib/Xext/Xextos2.rsp b/xc/lib/Xext/Xextos2.rsp
deleted file mode 100644
index 845b62f48..000000000
--- a/xc/lib/Xext/Xextos2.rsp
+++ /dev/null
@@ -1,5 +0,0 @@
-XMultibuf.obj XPanoramiX.obj XSecurity.obj XShape.obj XShm.obj XSync.obj+
-XTestExt1.obj Xcup.obj Xdbe.obj extutil.obj globals.obj MITMisc.obj+
-XAppgroup.obj XLbx.obj DPMS.obj XEVI.obj /NOI /NOL /NOD /BAT
-Xext.dll
-Xext.map
diff --git a/xc/lib/Xext/extutil.c b/xc/lib/Xext/extutil.c
deleted file mode 100644
index 1aa2ef550..000000000
--- a/xc/lib/Xext/extutil.c
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * $TOG: extutil.c /main/20 1998/02/06 14:50:55 kaleb $
- *
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- *
- * Author:  Jim Fulton, MIT X Consortium
- *
- * 
- * 		       Xlib Extension-Writing Utilities
- * 
- * This package contains utilities for writing the client API for various
- * protocol extensions.  THESE INTERFACES ARE NOT PART OF THE X STANDARD AND
- * ARE SUBJECT TO CHANGE!
- * 
- *  Routines include:
- * 
- *         XextCreateExtension		called once per extension
- *         XextDestroyExtension		if no longer using extension
- *         XextAddDisplay		add another display
- *         XextRemoveDisplay		remove a display
- *         XextFindDisplay		is a display open
- * 
- * In addition, the following Xlib-style interfaces are provided:
- * 
- *         XSetExtensionErrorHandler	establish an extension error handler
- *         XMissingExtension		raise an error about missing ext
- */
-
-#include <stdio.h>
-#include "Xlibint.h"
-#include "Xext.h"
-#include "extutil.h"
-
-
-/*
- * XextCreateExtension - return an extension descriptor containing context
- * information for this extension.  This object is passed to all Xext 
- * routines.
- */
-XExtensionInfo *XextCreateExtension ()
-{
-    register XExtensionInfo *info =
-      (XExtensionInfo *) Xmalloc (sizeof (XExtensionInfo));
-
-    if (info) {
-	info->head = NULL;
-	info->cur = NULL;
-	info->ndisplays = 0;
-    }
-    return info;
-}
-
-
-/*
- * XextDestroyExtension - free memory the given extension descriptor
- */
-void XextDestroyExtension (info)
-    XExtensionInfo *info;
-{
-    info->head = NULL;			/* to catch refs after this */
-    info->cur = NULL;
-    info->ndisplays = 0;
-    XFree ((char *) info);
-}
-
-
-
-/*
- * XextAddDisplay - add a display to this extension
- */
-XExtDisplayInfo *XextAddDisplay (extinfo, dpy, ext_name, hooks, nevents, data)
-    XExtensionInfo *extinfo;
-    Display *dpy;
-    char *ext_name;
-    XExtensionHooks *hooks;
-    int nevents;
-    XPointer data;
-{
-    XExtDisplayInfo *dpyinfo;
-
-    dpyinfo = (XExtDisplayInfo *) Xmalloc (sizeof (XExtDisplayInfo));
-    if (!dpyinfo) return NULL;
-    dpyinfo->display = dpy;
-    dpyinfo->data = data;
-    dpyinfo->codes = XInitExtension (dpy, ext_name);
-
-    /*
-     * if the server has the extension, then we can initialize the 
-     * appropriate function vectors
-     */
-    if (dpyinfo->codes) {
-	int i, j;
-
-	for (i = 0, j = dpyinfo->codes->first_event; i < nevents; i++, j++) {
-	    XESetWireToEvent (dpy, j, hooks->wire_to_event);
-	    XESetEventToWire (dpy, j, hooks->event_to_wire);
-	}
-	if (hooks->create_gc)
-	  XESetCreateGC (dpy, dpyinfo->codes->extension, hooks->create_gc);
-	if (hooks->copy_gc)
-	  XESetCopyGC (dpy, dpyinfo->codes->extension, hooks->copy_gc);
-	if (hooks->flush_gc)
-	  XESetFlushGC (dpy, dpyinfo->codes->extension, hooks->flush_gc);
-	if (hooks->free_gc)
-	  XESetFreeGC (dpy, dpyinfo->codes->extension, hooks->free_gc);
-	if (hooks->create_font)
-	  XESetCreateFont (dpy, dpyinfo->codes->extension, hooks->create_font);
-	if (hooks->free_font)
-	  XESetFreeFont (dpy, dpyinfo->codes->extension, hooks->free_font);
-	if (hooks->close_display)
-	  XESetCloseDisplay (dpy, dpyinfo->codes->extension, 
-			     hooks->close_display);
-	if (hooks->error)
-	  XESetError (dpy, dpyinfo->codes->extension, hooks->error);
-	if (hooks->error_string)
-	  XESetErrorString (dpy, dpyinfo->codes->extension,
-			    hooks->error_string);
-    } else if (hooks->close_display) {
-	/* The server doesn't have this extension.
-	 * Use a private Xlib-internal extension to hang the close_display
-	 * hook on so that the "cache" (extinfo->cur) is properly cleaned.
-	 * (XBUG 7955)
-	 */
-	XExtCodes *codes = XAddExtension(dpy);
-	if (!codes) {
-	    XFree(dpyinfo);
-	    return NULL;
-	}
-	XESetCloseDisplay (dpy, codes->extension, hooks->close_display);
-    }
-
-    /*
-     * now, chain it onto the list
-     */
-    _XLockMutex(_Xglobal_lock);
-    dpyinfo->next = extinfo->head;
-    extinfo->head = dpyinfo;
-    extinfo->cur = dpyinfo;
-    extinfo->ndisplays++;
-    _XUnlockMutex(_Xglobal_lock);
-    return dpyinfo;
-}
-
-
-/*
- * XextRemoveDisplay - remove the indicated display from the extension object
- */
-int XextRemoveDisplay (extinfo, dpy)
-    XExtensionInfo *extinfo;
-    Display *dpy;
-{
-    XExtDisplayInfo *dpyinfo, *prev;
-
-    /*
-     * locate this display and its back link so that it can be removed
-     */
-    _XLockMutex(_Xglobal_lock);
-    prev = NULL;
-    for (dpyinfo = extinfo->head; dpyinfo; dpyinfo = dpyinfo->next) {
-	if (dpyinfo->display == dpy) break;
-	prev = dpyinfo;
-    }
-    if (!dpyinfo) {
-	_XUnlockMutex(_Xglobal_lock);
-	return 0;		/* hmm, actually an error */
-    }
-
-    /*
-     * remove the display from the list; handles going to zero
-     */
-    if (prev)
-	prev->next = dpyinfo->next;
-    else
-	extinfo->head = dpyinfo->next;
-
-    extinfo->ndisplays--;
-    if (dpyinfo == extinfo->cur) extinfo->cur = NULL;  /* flush cache */
-    _XUnlockMutex(_Xglobal_lock);
-
-    Xfree ((char *) dpyinfo);
-    return 1;
-}
-
-
-/*
- * XextFindDisplay - look for a display in this extension; keeps a cache
- * of the most-recently used for efficiency.
- */
-XExtDisplayInfo *XextFindDisplay (extinfo, dpy)
-    XExtensionInfo *extinfo;
-    Display *dpy;
-{
-    register XExtDisplayInfo *dpyinfo;
-
-    /*
-     * see if this was the most recently accessed display
-     */
-    if ((dpyinfo = extinfo->cur)&& dpyinfo->display == dpy) return dpyinfo;
-
-
-    /*
-     * look for display in list
-     */
-    _XLockMutex(_Xglobal_lock);
-    for (dpyinfo = extinfo->head; dpyinfo; dpyinfo = dpyinfo->next) {
-	if (dpyinfo->display == dpy) {
-	    extinfo->cur = dpyinfo;	/* cache most recently used */
-	    _XUnlockMutex(_Xglobal_lock);
-	    return dpyinfo;
-	}
-    }
-    _XUnlockMutex(_Xglobal_lock);
-
-    return NULL;
-}
-
-
-
-static int _default_exterror (dpy, ext_name, reason)
-    Display *dpy;
-    char *ext_name;
-    char *reason;
-{
-    fprintf (stderr, "Xlib:  extension \"%s\" %s on display \"%s\".\n",
-	     ext_name, reason, DisplayString(dpy));
-    return 0;
-}
-
-
-/*
- * XSetExtensionErrorHandler - sets the handler that gets called when a 
- * requested extension is referenced.  This should eventually move into Xlib.
- */
-
-extern int (*_XExtensionErrorFunction)();
-
-#if NeedFunctionPrototypes
-int (*XSetExtensionErrorHandler(
-    int (*handler)(
-#if NeedNestedPrototypes
-		   Display*,
-		   char *,
-		   char *
-#endif
-		   )
-))()
-#else
-int (*XSetExtensionErrorHandler(handler))()
-    int (*handler)();
-#endif
-{
-    int (*oldhandler)() = _XExtensionErrorFunction;
-
-    _XExtensionErrorFunction = (handler ? handler :
-				_default_exterror);
-    return oldhandler;
-}
-
-
-/*
- * XMissingExtension - call the extension error handler
- */
-#if NeedFunctionPrototypes
-int XMissingExtension (
-    Display *dpy,
-    _Xconst char *ext_name)
-#else
-int XMissingExtension (dpy, ext_name)
-    Display *dpy;
-    char *ext_name;
-#endif
-{
-    int (*func)() = (_XExtensionErrorFunction ?
-		     _XExtensionErrorFunction : _default_exterror);
-
-    if (!ext_name) ext_name = X_EXTENSION_UNKNOWN;
-    return (*func) (dpy, ext_name, X_EXTENSION_MISSING);
-}
diff --git a/xc/lib/Xext/globals.c b/xc/lib/Xext/globals.c
deleted file mode 100644
index 12b7dfddf..000000000
--- a/xc/lib/Xext/globals.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* $TOG: globals.c /main/6 1998/02/06 14:51:01 kaleb $ */
-/*
-
-Copyright 1989, 1998  The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/*
- * This file should contain only those objects which must be predefined.
- */
-#include <X11/Xlib.h>
-#include <X11/extensions/Xext.h>
-#ifndef X_NOT_STDC_ENV
-#include <stddef.h>			/* for definition of NULL */
-#else
-#include <sys/param.h>
-#endif
-
-/*
- * If possible, it is useful to have the global data default to a null value.
- * Some shared library implementations are *much* happier if there isn't any
- * global initialized data.
- */
-#ifdef NULL_NOT_ZERO			/* then need to initialize */
-#define SetZero(t,var,z) t var = z
-#else 
-#define SetZero(t,var,z) t var
-#endif
-
-#ifdef ATTSHAREDLIB			/* then need extra variables */
-/*
- * If we need to define extra variables for each global
- */
-#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
-#define ZEROINIT(t,var,val) SetZero(t,var,val); \
-  SetZero (long, _libX_##var##Flag, 0); \
-  SetZero (void *, _libX_##var##Ptr, NULL)
-#else /* else pcc concatenation */
-#define ZEROINIT(t,var,val) SetZero(t,var,val); \
-  SetZero (long, _libX_/**/var/**/Flag, 0); \
-  SetZero (void *, _libX_/**/var/**/Ptr, NULL)
-#endif /* concat ANSI C vs. pcc */
-
-#else /* else not ATTSHAREDLIB */
-/*
- * no extra crud
- */
-#define ZEROINIT(t,var,val) SetZero (t, var, val)
-
-#endif /* ATTSHAREDLIB */
-
-
-/*
- * Error handlers; used to be in XlibInt.c
- */
-typedef int (*funcptr)();
-ZEROINIT (funcptr, _XExtensionErrorFunction, NULL);
-
-/*
- * NOTE: any additional external definition NEED
- * to be inserted BELOW this point!!!
- */
-
-/*
- * NOTE: any additional external definition NEED
- * to be inserted ABOVE this point!!!
- */
-
diff --git a/xc/lib/font/FreeType/Imakefile b/xc/lib/font/FreeType/Imakefile
index 674f0e4f4..953c6ff0d 100644
--- a/xc/lib/font/FreeType/Imakefile
+++ b/xc/lib/font/FreeType/Imakefile
@@ -1,10 +1,10 @@
-XCOMM $XFree86: xc/lib/font/FreeType/Imakefile,v 1.15 1999/08/30 01:24:57 dawes Exp $
+XCOMM $XFree86: xc/lib/font/FreeType/Imakefile,v 1.16 2000/09/19 12:46:06 eich Exp $
 
 XCOMM Imakefile created for the Freetype TrueType renderer.
 XCOMM Mark Leisher <mleisher@crl.nmsu.edu>
 XCOMM Juliusz Chroboczek <jec@dcs.ed.ac.uk>
 
-#if DoLoadableServer
+#if BuildServer && DoLoadableServer
 #define IHaveSubdirs
 #define NoLibSubdirs
 #define PassCDebugFlags
@@ -35,6 +35,7 @@ INCLUDES = -I. -I$(FONTINCSRC) -I../include -I$(SERVERSRC)/include \
 SRCS = ftfuncs.c ftenc.c ftutil.c freetype.c ftxcmap.c
 OBJS = ftfuncs.o ftenc.o ftutil.o freetype.o ftxcmap.o
 
+#if BuildFontLib
 #define DoNormalLib NormalLibFont
 #define DoSharedLib SharedLibFont
 #define DoDebugLib DebugLibFont
@@ -47,8 +48,9 @@ NormalLintTarget($(SRCS))
 
 LinkSourceFile(freetype.c,$(FTSOURCEDIR)/lib/arch/unix)
 LinkSourceFile(ftxcmap.c,$(FTSOURCEDIR)/lib/extend)
+#endif
 
-#if DoLoadableServer
+#if BuildServer && DoLoadableServer
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
 #endif
diff --git a/xc/lib/font/Imakefile b/xc/lib/font/Imakefile
index 59e51a724..e48028420 100644
--- a/xc/lib/font/Imakefile
+++ b/xc/lib/font/Imakefile
@@ -1,5 +1,10 @@
-XCOMM $TOG: Imakefile /main/14 1998/06/16 15:23:15 msr $
-XCOMM $XFree86: xc/lib/font/Imakefile,v 3.27 1999/07/10 07:24:36 dawes Exp $
+XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:24 cpqbld Exp $
+
+
+
+
+XCOMM $XFree86: xc/lib/font/Imakefile,v 3.32 2001/01/17 19:43:16 dawes Exp $
+
 #include <Server.tmpl>
 
 #define	IHaveSubdirs
@@ -10,6 +15,22 @@ XCOMM $XFree86: xc/lib/font/Imakefile,v 3.27 1999/07/10 07:24:36 dawes Exp $
 #define DoDebugLib DebugLibFont
 #define DoProfileLib ProfileLibFont
 
+#if !BuildFontLib
+#define LibCreate NO
+#else
+#define LibCreate YES
+#endif
+
+#if BuildLibraries
+#define LibInstall YES
+#else
+#define LibInstall NO
+#endif
+
+#if BuildLibraries
+STUBDIRS = stubs
+#endif
+
 LIBNAME = Xfont
 SOREV = $(SOFONTREV)
 
@@ -48,9 +69,9 @@ REQUIREDLIBS = SharedXfontReqs
 FREETYPEPROFILEOBJS = FreeType/profiled/?*.o
       FREETYPEDONES = FreeType/DONE
 #endif
-#if BuildXTT
+#if BuildXTrueType
             XTTDIRS = X-TrueType
-#if XTTInLibFont
+#if XTTInLibXFont
       XTTSHAREDOBJS = X-TrueType/?*.o
       XTTSTATICOBJS = X-TrueType/$(STATIC_OBJSDIR)?*.o
        XTTDEBUGOBJS = X-TrueType/debugger/?*.o
@@ -58,40 +79,51 @@ FREETYPEPROFILEOBJS = FreeType/profiled/?*.o
            XTTDONES = X-TrueType/DONE
 #endif
 #endif
+#if BuildBuiltinFonts
+        BUILTINDIRS = builtins
+  BUILTINSHAREDOBJS = builtins/?*.o
+  BUILTINSTATICOBJS = builtins/$(STATIC_OBJSDIR)?*.o
+   BUILTINDEBUGOBJS = builtins/debugger/?*.o
+ BUILTINPROFILEOBJS = builtins/profiled/?*.o
+       BUILTINDONES = builtins/DONE
+#endif
 
-       SUBDIRS = bitmap fontfile fc \
+       SUBDIRS = bitmap fontfile fc fontcache \
 		 $(SPEEDODIRS) $(TYPE1DIRS) \
-		 $(FREETYPEDIRS) $(XTTDIRS) \
-		 util stubs
-   SHARED_OBJS = bitmap/?*.o fontfile/?*.o fc/?*.o \
+		 $(FREETYPEDIRS) $(XTTDIRS) $(BUILTINDIRS) \
+		 util $(STUBDIRS)
+   SHARED_OBJS = bitmap/?*.o fontfile/?*.o fc/?*.o fontcache/?*.o \
 		 $(SPEEDOSHAREDOBJS) $(TYPE1SHAREDOBJS) \
 		 $(FREETYPESHAREDOBJS) $(XTTSHAREDOBJS) \
-		 util/?*.o
+		 $(BUILTINSHAREDOBJS) util/?*.o
    STATIC_OBJS = bitmap/$(STATIC_OBJSDIR)?*.o fontfile/$(STATIC_OBJSDIR)?*.o \
-		 fc/$(STATIC_OBJSDIR)?*.o \
+		 fc/$(STATIC_OBJSDIR)?*.o fontcache/$(STATIC_OBJSDIR)?*.o \
 		 $(SPEEDOSTATICOBJS) $(TYPE1STATICOBJS) \
 		 $(FREETYPESTATICOBJS) $(XTTSTATICOBJS) \
-		 util/$(STATIC_OBJSDIR)?*.o
+		 $(BUILTINSTATICOBJS) util/$(STATIC_OBJSDIR)?*.o
     DEBUG_OBJS = bitmap/debugger/?*.o fontfile/debugger/?*.o fc/debugger/?*.o \
+		 fontcache/debugger/?*.o \
 		 $(SPEEDODEBUGOBJS) $(TYPE1DEBUGOBJS) \
 		 $(FREETYPEDEBUGOBJS) $(XTTDEBUGOBJS) \
-		 util/debugger/?*.o
+		 $(BUILTINDEBUGOBJS) util/debugger/?*.o
   PROFILE_OBJS = bitmap/profiled/?*.o fontfile/profiled/?*.o fc/profiled/?*.o \
+		 fontcache/profiled/?*.o \
 		 $(SPEEDOPROFILEOBJS) $(TYPE1PROFILEOBJS) \
 		 $(FREETYPEPROFILEOBJS) $(XTTPROFILEOBJS) \
-		 util/profiled/?*.o
-         DONES = bitmap/DONE fontfile/DONE fc/DONE \
+		 $(BUILTINPROFILEOBJS) util/profiled/?*.o
+         DONES = bitmap/DONE fontfile/DONE fc/DONE fontcache/DONE \
 		 $(SPEEDODONES) $(TYPE1DONES) \
 		 $(FREETYPEDONES) $(XTTDONES) \
-		 util/DONE
+		 $(BUILTINDONES) util/DONE
 
-#if DoLoadableServer
-      BASEDIRS = fontfile fc util
+#if BuildServer && DoLoadableServer
+      BASEDIRS = fontfile fc util fontcache
    BASELIBOBJS = fontfile/$(STATIC_OBJSDIR)?*.o fc/$(STATIC_OBJSDIR)?*.o \
-		 util/$(STATIC_OBJSDIR)?*.o
+		 util/$(STATIC_OBJSDIR)?*.o fontcache/$(STATIC_OBJSDIR)?*.o 
       BASEOBJS = fontfile/module/ffcheck.o fontfile/module/register.o \
 		 util/private.o
-     BASEDONES = fontfile/DONE fontfile/module/DONE fc/DONE util/DONE
+     BASEDONES = fontfile/DONE fontfile/module/DONE fc/DONE util/DONE \
+		 fontcache/DONE
 #endif
 
 #if HasParallelMake
@@ -107,27 +139,37 @@ $(DONES): $(SUBDIRS)
 #undef _LinkBuildLibrary
 #define _LinkBuildLibrary(lib) LinkBuildLibrary(lib)
 
+#if LibCreate
 #if NormalLibFont
 NormalDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(STATIC_OBJS))
+#if LibInstall
 InstallLibrary($(LIBNAME),$(USRLIBDIR))
+#endif /* LibInstall */
 #endif /* NormalLibFont */
 
 #if SharedLibFont
 SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(SUBDIRS) $(DONES),$(SHARED_OBJS),.,.)
+#if LibInstall
 InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR))
+#endif /* LibInstall */
 #endif /* SharedLibFont */
 
 #if DebugLibFont
-DebuggedDepLibraryTarget(Xfont,$(SUBDIRS) $(DONES),$(DEBUG_OBJS))
+DebuggedDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(DEBUG_OBJS))
+#if LibInstall
 InstallLibrary($(LIBNAME)_d,$(USRLIBDIR))
+#endif /* LibInstall */
 #endif /* DebugLibFont */
 
 #if ProfileLibFont
-ProfiledDepLibraryTarget(Xfont,$(SUBDIRS) $(DONES),$(PROFILE_OBJS))
+ProfiledDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(PROFILE_OBJS))
+#if LibInstall
 InstallLibrary($(LIBNAME)_p,$(USRLIBDIR))
+#endif /* LibInstall */
 #endif /* ProfileLibFont */
+#endif /* LibCreate */
 
-#if DoLoadableServer
+#if BuildServer && DoLoadableServer
 NormalDepLibraryTarget(fontbase,$(BASEDIRS) $(BASEDONES),$(BASELIBOBJS))
 NormalDepRelocatableTarget(fontbase,$(BASEDIRS) $(BASEDONES),$(BASEOBJS))
 #endif
diff --git a/xc/lib/font/Speedo/Imakefile b/xc/lib/font/Speedo/Imakefile
index 3db6754e4..e2d9dcdeb 100644
--- a/xc/lib/font/Speedo/Imakefile
+++ b/xc/lib/font/Speedo/Imakefile
@@ -1,7 +1,11 @@
-XCOMM $XConsortium: Imakefile,v 1.10 93/09/04 16:42:59 rws Exp $
-XCOMM $XFree86: xc/lib/font/Speedo/Imakefile,v 1.7 1999/03/02 02:49:14 dawes Exp $
+XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:24 cpqbld Exp $
 
-#if DoLoadableServer
+
+
+
+XCOMM $XFree86: xc/lib/font/Speedo/Imakefile,v 1.10 2001/01/19 08:13:29 dawes Exp $
+
+#if BuildServer && DoLoadableServer
 #define IHaveSubdirs
 #define NoLibSubdirs
 #define PassCDebugFlags
@@ -22,6 +26,7 @@ SUBDIRS = module
 		spencode.o bics-unicode.o \
 		$(SPEEDOOBJS)
 
+#if BuildFontLib
 #define DoNormalLib NormalLibFont
 #define DoSharedLib SharedLibFont
 #define DoDebugLib DebugLibFont
@@ -31,8 +36,9 @@ LibraryObjectRule()
 
 SubdirLibraryRule($(OBJS))
 NormalLintTarget($(SRCS))
+#endif
 
-#if DoLoadableServer
+#if BuildServer && DoLoadableServer
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
 #endif
diff --git a/xc/lib/font/Type1/Imakefile b/xc/lib/font/Type1/Imakefile
index cd54fad68..f5ea064b1 100644
--- a/xc/lib/font/Type1/Imakefile
+++ b/xc/lib/font/Type1/Imakefile
@@ -1,7 +1,11 @@
-XCOMM $XConsortium: Imakefile,v 1.5 93/09/04 16:43:32 rws Exp $
-XCOMM $XFree86: xc/lib/font/Type1/Imakefile,v 1.8 1999/05/03 05:58:44 dawes Exp $
+XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:28 cpqbld Exp $
 
-#if DoLoadableServer
+
+
+
+XCOMM $XFree86: xc/lib/font/Type1/Imakefile,v 1.10 2001/01/17 19:43:21 dawes Exp $
+
+#if BuildServer && DoLoadableServer
 #define IHaveSubdirs
 #define NoLibSubdirs
 #define PassCDebugFlags
@@ -67,6 +71,7 @@ OBJS =          \
        $(CIDOBJS)      \
        t1unicode.o
 
+#if BuildFontLib
 #define DoNormalLib NormalLibFont
 #define DoSharedLib SharedLibFont
 #define DoDebugLib DebugLibFont
@@ -76,8 +81,9 @@ LibraryObjectRule()
 
 SubdirLibraryRule($(OBJS))
 NormalLintTarget($(SRCS))
+#endif
 
-#if DoLoadableServer
+#if BuildServer && DoLoadableServer
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
 #endif
diff --git a/xc/lib/font/X-TrueType/Imakefile b/xc/lib/font/X-TrueType/Imakefile
index faf668143..651ecf0e7 100644
--- a/xc/lib/font/X-TrueType/Imakefile
+++ b/xc/lib/font/X-TrueType/Imakefile
@@ -1,19 +1,20 @@
 XCOMM X-TrueType Server - TrueType rasterizer for X
-XCOMM $XFree86: xc/lib/font/X-TrueType/Imakefile,v 1.4 1999/03/28 15:59:31 dawes Exp $
+XCOMM $XFree86: xc/lib/font/X-TrueType/Imakefile,v 1.7 2000/11/28 19:09:30 dawes Exp $
 
 #define IHaveSubdirs
 #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
 
-#if DoLoadableServer
+#if BuildServer && DoLoadableServer
 MODULE_SUBDIRS = module
 #endif
 
-INCLUDES = -I. -I$(FONTINCSRC) -I../include \
-           -I$(TOP)/include -I$(SERVERSRC)/include \
+INCLUDES = -I. -I$(FONTINCSRC) -I../include -I../fontcache \
+           -I$(XTOP)/include -I$(SERVERSRC)/include \
            -I$(FTSOURCEDIR)/lib -I$(FTSOURCEDIR)/lib/extend \
            -I$(FTSOURCEDIR)/lib/arch/unix -I$(FONTLIBSRC)/FreeType
 
-DEFINES = -DTT_MAKE_OPTION_SINGLE_OBJECT=1  $(FONTMODULEDEF) \
+DEFINES = -DTT_MAKE_OPTION_SINGLE_OBJECT=1  -DTT_CONFIG_OPTION_EXTEND_ENGINE \
+	  $(FONTMODULEDEF) \
 	  $(XTT_DEBUG_FLAGS) $(XTT_CCONV_MOUDLE_DEFINES) \
 	  $(XTT_USE_OPT_ENC_DEFINES)
 
@@ -26,7 +27,7 @@ CCONVINSTDIR = XTrueTypeCConvIncDir
 InstallMultipleFlags($(CCONVHEADERS),$(CCONVINSTDIR),$(INSTINCFLAGS))
 #endif
 
-#if XTTInLibFont
+#if BuildFontLib && XTTInLibXFont
 #define DoNormalLib NormalLibFont
 #define DoSharedLib SharedLibFont
 #define DoDebugLib DebugLibFont
diff --git a/xc/lib/font/bitmap/Imakefile b/xc/lib/font/bitmap/Imakefile
index 4ef9da054..f69bd467a 100644
--- a/xc/lib/font/bitmap/Imakefile
+++ b/xc/lib/font/bitmap/Imakefile
@@ -1,13 +1,32 @@
-XCOMM $XConsortium: Imakefile /main/9 1996/11/03 19:31:58 kaleb $
-XCOMM $XFree86: xc/lib/font/bitmap/Imakefile,v 1.7 1999/03/02 02:49:15 dawes Exp $
+XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:34 cpqbld Exp $
 
-#if DoLoadableServer
+
+
+
+XCOMM $XFree86: xc/lib/font/bitmap/Imakefile,v 1.11 2001/04/03 17:51:59 paulo Exp $
+
+#if BuildServer && DoLoadableServer
 #define IHaveSubdirs
 #define NoLibSubdirs
 #define PassCDebugFlags
 SUBDIRS = module
 #endif
 
+#ifndef KDriveXServer
+BDFSRCS=bdfread.c bdfutils.c
+BDFOBJS=bdfread.o bdfutils.o
+BDFDEFS=-DBDFFORMAT
+
+SNFSRCS=snfread.c
+SNFOBJS=snfread.o
+SNFDEFS=-DSNFFORMAT
+#endif
+
+PCFSRCS=pcfread.c pcfwrite.c
+PCFOBJS=pcfread.o pcfwrite.o
+PCFDEFS=-DPCFFORMAT
+
+
         INCLUDES = -I$(FONTINCSRC) -I../include 
          HEADERS = 
 #ifdef FontFormatDefines
@@ -16,15 +35,17 @@ SUBDIRS = module
 #if GzipFontCompression
        GZIP_DEFS = -DX_GZIP_FONT_COMPRESSION
 #endif
+         DEFINES = $(BDFDEFS) $(PCFDEFS) $(SNFDEFS)
 
-            SRCS = bdfread.c bdfutils.c bitmap.c bitmaputil.c bitscale.c \
-		   bitmapfunc.c pcfread.c pcfwrite.c snfread.c \
+            SRCS = $(BDFSRCS) bitmap.c bitmaputil.c bitscale.c \
+		   bitmapfunc.c $(PCFSRCS) $(SNFSRCS) \
 		   fontink.c 
 
-            OBJS = bdfread.o bdfutils.o bitmap.o bitmaputil.o bitscale.o \
-		   bitmapfunc.o pcfread.o pcfwrite.o snfread.o \
+            OBJS = $(BDFOBJS) bitmap.o bitmaputil.o bitscale.o \
+		   bitmapfunc.o $(PCFOBJS) $(SNFOBJS) \
 		   fontink.o
 
+#if BuildFontLib
 #define DoNormalLib NormalLibFont
 #define DoSharedLib SharedLibFont
 #define DoDebugLib DebugLibFont
@@ -33,10 +54,13 @@ SUBDIRS = module
 LibraryObjectRule()
 
 SpecialCLibObjectRule(bitmapfunc,$(ICONFIGFILES),$(GZIP_DEFS))
+SpecialCLibObjectRule(bitscale,$(ICONFIGFILES),$(GZIP_DEFS))
+
 SubdirLibraryRule($(OBJS))
 NormalLintTarget($(SRCS))
+#endif
 
-#if DoLoadableServer
+#if BuildServer && DoLoadableServer
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
 #endif
diff --git a/xc/programs/Xserver/Imakefile b/xc/programs/Xserver/Imakefile
index e7681f224..3c57989af 100644
--- a/xc/programs/Xserver/Imakefile
+++ b/xc/programs/Xserver/Imakefile
@@ -208,12 +208,10 @@ XPFBLIBS = dix/LibraryTargetName(xpstubs)
         EXTDIRS = Xext $(XKBDIR) $(XIDIR) $(XIEDIR) $(PEXDIR) $(GLXDIR) \
                   $(LBXDIRS) $(DBEDIR) $(RECORDDIR) $(SITEEXTDIRS) \
                   $(RENDERDIR) $(RANDRDIR)
-         XAULIB = $(XAUTHSRC)/LibraryTargetName(Xau)
-       XDMCPLIB = $(XDMCPLIBSRC)/LibraryTargetName(Xdmcp)
 #if BuildLBX || GzipFontCompression
            ZLIB = GzipLibrary
 #endif
-             OS = os/LibraryTargetName(os) $(XAULIB) $(XDMCPLIB)
+             OS = os/LibraryTargetName(os) $(XAUTHLIB) $(XDMCPLIB)
         BSDEMUL = $(DEPXBSDLIB)
 #if DoLoadableServer
             MFB = mfb/ModuleLibraryTargetName(mfb)
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c
index 4916e0323..b5aa6f73f 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c
@@ -62,7 +62,7 @@
 extern int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *);
 extern int xf86RemoveSIGIOHandler(int fd);
 # else
-#  include <Xlibint.h>
+#  include <X11/Xlibint.h>
 #  define _DRM_MALLOC Xmalloc
 #  define _DRM_FREE   Xfree
 # endif
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmI810.c b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmI810.c
index f39dbdd8f..bcbadc30c 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmI810.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmI810.c
@@ -28,7 +28,7 @@
 extern int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *);
 extern int xf86RemoveSIGIOHandler(int fd);
 # else
-#  include <Xlibint.h>
+#  include <X11/Xlibint.h>
 #  define _DRM_MALLOC Xmalloc
 #  define _DRM_FREE   Xfree
 # endif
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmMga.c b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmMga.c
index cde110d72..fc8bbdd8a 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmMga.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmMga.c
@@ -57,7 +57,7 @@
 extern int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *);
 extern int xf86RemoveSIGIOHandler(int fd);
 # else
-#  include <Xlibint.h>
+#  include <X11/Xlibint.h>
 #  define _DRM_MALLOC Xmalloc
 #  define _DRM_FREE   Xfree
 # endif
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmR128.c b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmR128.c
index 62e7c323d..730dadd2b 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmR128.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmR128.c
@@ -56,7 +56,7 @@
 extern int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *);
 extern int xf86RemoveSIGIOHandler(int fd);
 # else
-#  include <Xlibint.h>
+#  include <X11/Xlibint.h>
 #  define _DRM_MALLOC Xmalloc
 #  define _DRM_FREE   Xfree
 # endif
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmRadeon.c b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmRadeon.c
index 18778f99e..0da6a5b4e 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmRadeon.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmRadeon.c
@@ -57,7 +57,7 @@
 extern int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *);
 extern int xf86RemoveSIGIOHandler(int fd);
 # else
-#  include <Xlibint.h>
+#  include <X11/Xlibint.h>
 #  define _DRM_MALLOC Xmalloc
 #  define _DRM_FREE   Xfree
 # endif
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmSiS.c b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmSiS.c
index 0fb4ae63e..47b7e1463 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmSiS.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmSiS.c
@@ -28,7 +28,7 @@
 extern int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *);
 extern int xf86RemoveSIGIOHandler(int fd);
 # else
-#  include <Xlibint.h>
+#  include <X11/Xlibint.h>
 #  define _DRM_MALLOC Xmalloc
 #  define _DRM_FREE   Xfree
 # endif
diff --git a/xc/programs/Xserver/hw/xnest/Display.c b/xc/programs/Xserver/hw/xnest/Display.c
index d0a2180b4..660f89817 100644
--- a/xc/programs/Xserver/hw/xnest/Display.c
+++ b/xc/programs/Xserver/hw/xnest/Display.c
@@ -1,5 +1,4 @@
-/* $XConsortium: Display.c /main/4 1996/08/20 11:31:58 kaleb $ */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Display.c,v 3.1 1996/12/23 07:09:11 dawes Exp $ */
+/* $Xorg: Display.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */
 /*
 
 Copyright 1993 by Davor Matic
@@ -13,10 +12,11 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
+/* $XFree86: xc/programs/Xserver/hw/xnest/Display.c,v 3.2 2001/01/17 22:36:55 dawes Exp $ */
 
 
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "screenint.h"
 #include "input.h"
 #include "misc.h"
diff --git a/xc/programs/Xserver/hw/xnest/TestExt.c b/xc/programs/Xserver/hw/xnest/TestExt.c
index c1ff6618c..b29c7564c 100644
--- a/xc/programs/Xserver/hw/xnest/TestExt.c
+++ b/xc/programs/Xserver/hw/xnest/TestExt.c
@@ -1,5 +1,4 @@
-/* $XConsortium: TestExt.c,v 1.3 94/10/28 20:47:10 dpw Exp $ */
-/* $XFree86: xc/programs/Xserver/hw/xnest/TestExt.c,v 3.2 1996/01/07 10:46:49 dawes Exp $ */
+/* $Xorg: TestExt.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */
 /*
 
 Copyright 1993 by Davor Matic
@@ -13,15 +12,18 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-#include "X.h"
-#include "Xproto.h"
-#include "Xlib.h"
+/* $XFree86: xc/programs/Xserver/hw/xnest/TestExt.c,v 3.4 2001/08/01 00:44:57 tsi Exp $ */
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include <X11/Xlib.h>
 #undef Bool
 #include "screenint.h"
 #include "input.h"
 #include "misc.h"
 #include "scrnintstr.h"
 #include "servermd.h"
+#include "mipointer.h"
 #define XTestSERVER_SIDE
 #include "xtestext1.h"
 
diff --git a/xc/programs/Xserver/hw/xnest/Xnest.h b/xc/programs/Xserver/hw/xnest/Xnest.h
index c61a1154f..fe8ac62df 100644
--- a/xc/programs/Xserver/hw/xnest/Xnest.h
+++ b/xc/programs/Xserver/hw/xnest/Xnest.h
@@ -1,4 +1,4 @@
-/* $XConsortium: Xnest.h,v 1.1 95/07/10 17:43:42 ray Exp $ */
+/* $Xorg: Xnest.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */
 /*
 
 Copyright (c) 1995  X Consortium
@@ -65,8 +65,8 @@ typedef XID KeySym64;
 #endif  /*_XSERVER64*/
 
 #define GC XlibGC
-#include "Xlib.h"
-#include "Xutil.h"
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #include <X11/extensions/shape.h>
 #undef GC
 
diff --git a/xc/programs/Xserver/mi/miinitext.c b/xc/programs/Xserver/mi/miinitext.c
index 6e93fef7c..cbb8454fb 100644
--- a/xc/programs/Xserver/mi/miinitext.c
+++ b/xc/programs/Xserver/mi/miinitext.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.41 1999/06/14 07:32:11 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.60 2001/08/06 20:51:18 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $TOG: miinitext.c /main/47 1998/02/09 14:47:26 kaleb $ */
+/* $Xorg: miinitext.c,v 1.3 2000/08/17 19:53:38 cpqbld Exp $ */
 
 #include "misc.h"
 #include "extension.h"
@@ -50,6 +50,13 @@ SOFTWARE.
 #ifdef NOPEXEXT /* sleaze for Solaris cpp building XsunMono */
 #undef PEXEXT
 #endif
+
+#if defined(QNX4) /* sleaze for Watcom on QNX4 ... */
+#undef PEXEXT
+#undef XIE
+#undef GLXEXT
+#endif
+
 #ifdef PANORAMIX
 extern Bool noPanoramiXExtension;
 #endif
@@ -59,14 +66,39 @@ extern Bool noXkbExtension;
 #endif
 
 #ifndef XFree86LOADER
-#if NeedFunctionPrototypes
 #define INITARGS void
-#else
-#define INITARGS /*nothing*/
-#endif
 typedef void (*InitExtension)(INITARGS);
 #else /* XFree86Loader */
-#include "xf86Module.h"
+#include "loaderProcs.h"
+#endif
+
+#include <X11/Xlib.h>
+#ifdef MITSHM
+#include "shmstr.h"
+#endif
+#ifdef XTEST
+#include "XTest.h"
+#endif
+#ifdef XKB
+#include "XKB.h"
+#endif
+#ifdef LBX
+#include "lbxstr.h"
+#endif
+#ifdef XPRINT
+#include "Print.h"
+#endif
+#ifdef XAPPGROUP
+#include "Xagstr.h"
+#endif
+#ifdef XCSECURITY
+#include "securstr.h"
+#endif
+#ifdef PANORAMIX
+#include "panoramiXproto.h"
+#endif
+#ifdef XF86BIGFONT
+#include "xf86bigfstr.h"
 #endif
 
 /* FIXME: this whole block of externs should be from the appropriate headers */
@@ -117,6 +149,7 @@ extern void ScreenSaverExtensionInit (INITARGS);
 #endif
 #ifdef XV
 extern void XvExtensionInit(INITARGS);
+extern void XvMCExtensionInit(INITARGS);
 #endif
 #ifdef XIE
 extern void XieInit(INITARGS);
@@ -148,6 +181,9 @@ extern void SecurityExtensionInit(INITARGS);
 #ifdef XPRINT
 extern void XpExtensionInit(INITARGS);
 #endif
+#ifdef XF86BIGFONT
+extern void XFree86BigfontExtensionInit(INITARGS);
+#endif
 #ifdef XF86VIDMODE
 extern void XFree86VidModeExtensionInit(INITARGS);
 #endif
@@ -170,8 +206,17 @@ extern void XcupExtensionInit(INITARGS);
 #ifdef DPMSExtension
 extern void DPMSExtensionInit(INITARGS);
 #endif
-#ifdef XANTI
-extern void XAntiExtensionInit(INITARGS);
+#ifdef DPSEXT
+extern void DPSExtensionInit(INITARGS);
+#endif
+#ifdef FONTCACHE
+extern void FontCacheExtensionInit(INITARGS);
+#endif
+#ifdef RENDER
+extern void RenderExtensionInit(INITARGS);
+#endif
+#ifdef RANDR
+extern void RRExtensionInit(INITARGS);
 #endif
 
 #ifndef XFree86LOADER
@@ -183,9 +228,9 @@ InitExtensions(argc, argv)
     char	*argv[];
 {
 #ifdef PANORAMIX
-#if !defined(PRINT_ONLY_SERVER) && !defined(NO_PANORAMIX)
+# if !defined(PRINT_ONLY_SERVER) && !defined(NO_PANORAMIX)
   if (!noPanoramiXExtension) PanoramiXExtensionInit();
-#endif
+# endif
 #endif
 #ifdef BEZIER
     BezierExtensionInit();
@@ -231,6 +276,7 @@ InitExtensions(argc, argv)
 #endif
 #ifdef XV
     XvExtensionInit();
+    XvMCExtensionInit();
 #endif
 #ifdef XIE
     XieInit();
@@ -268,8 +314,11 @@ InitExtensions(argc, argv)
 #if defined(DPMSExtension) && !defined(NO_HW_ONLY_EXTS)
     DPMSExtensionInit();
 #endif
-#ifdef XANTI
-    XAntiExtensionInit();
+#ifdef FONTCACHE
+    FontCacheExtensionInit();
+#endif
+#ifdef XF86BIGFONT
+    XFree86BigfontExtensionInit();
 #endif
 #if !defined(PRINT_ONLY_SERVER) && !defined(NO_HW_ONLY_EXTS)
 #if defined(XF86VIDMODE)
@@ -281,9 +330,7 @@ InitExtensions(argc, argv)
 #if defined(XFreeXDGA)
     XFree86DGAExtensionInit();
 #endif
-#endif
 #ifdef XF86DRI
-#ifndef XPRINT	/* we don't want Glx in the Xprint server */
     XFree86DRIExtensionInit();
 #endif
 #endif
@@ -292,6 +339,17 @@ InitExtensions(argc, argv)
     GlxExtensionInit();
 #endif
 #endif
+#ifdef DPSEXT
+#ifndef XPRINT
+    DPSExtensionInit();
+#endif
+#endif
+#ifdef RENDER
+    RenderExtensionInit();
+#endif
+#ifdef RANDR
+    RRExtensionInit();
+#endif
 }
 
 void
@@ -306,6 +364,7 @@ InitVisualWrap()
 }
 
 #else /* XFree86LOADER */
+#if 0
 /* FIXME:The names here must come from the headers. those with ?? are 
    not included in X11R6.3 sample implementation, so there's a problem... */
 /* XXX use the correct #ifdefs for symbols not present when an extension
@@ -352,88 +411,97 @@ ExtensionModule extension[] =
 #else
     { NULL, "NOXINERAMA", NULL, NULL },
 #endif
-    { NULL, "XAnti", NULL, NULL },
+    { NULL, "XFree86-Bigfont", NULL, NULL },
     { NULL, "XFree86-DRI", NULL, NULL },
+    { NULL, "Adobe-DPS-Extension", NULL, NULL },
+    { NULL, "FontCache", NULL, NULL },
+    { NULL, "RENDER", NULL, NULL },
+    { NULL, "RANDR", NULL, NULL },
     { NULL, NULL, NULL, NULL }
 };
+#endif
 
-/*ARGSUSED*/
-void
-InitExtensions(argc, argv)
-    int		argc;
-    char	*argv[];
-{
-    int i;
-#if 1 
-   /* Add static extensions */
+/* List of built-in (statically linked) extensions */
+static ExtensionModule staticExtensions[] = {
 #ifdef BEZIER
-    extension[0].initFunc = BezierExtensionInit;
-#endif 
+    { BezierExtensionInit, "BEZIER", NULL, NULL, NULL },
+#endif
 #ifdef XTESTEXT1
-    extension[1].initFunc = XTestExtension1Init;
+    { XTestExtension1Init, "XTEST1", &noTestExtensions, NULL, NULL },
 #endif
-    /* 2 - SHAPE */
 #ifdef MITSHM
-    extension[3].initFunc = ShmExtensionInit;
+    { ShmExtensionInit, SHMNAME, NULL, NULL, NULL },
 #endif
-    /* 4 - pex */
-    /* 5 - multibuf */
 #ifdef XINPUT
-    extension[6].initFunc = XInputExtensionInit;
+    { XInputExtensionInit, "XInputExtension", NULL, NULL, NULL },
 #endif
 #ifdef XTEST
-    extension[7].initFunc = XTestExtensionInit;
+    { XTestExtensionInit, XTestExtensionName, &noTestExtensions, NULL, NULL },
 #endif
-    /* 8 - BigReqs */
-    /* 9 - MITMisc */
 #ifdef XIDLE
-    extension[10].initFunc = XIdleExtensionInit;
+    { XIdleExtensionInit, "XIDLE", NULL, NULL, NULL },
 #endif
 #ifdef XTRAP
-    extension[11].initFunc = DEC_XTRAPIbit;
+    { DEC_XTRAPInit, "XTRAP", &noTestExtensions, NULL, NULL },
 #endif
-    /* 12 - ScreenSaver */
-    /* 13 - XVideo */
-    /* 14 - XIE */
-    /* 15 - XSYNC */
 #ifdef XKB
-    extension[16].initFunc = XkbExtensionInit;
+    { XkbExtensionInit, XkbName, &noXkbExtension, NULL, NULL },
 #endif
-    /* 17 - XCMISC */
-    /* 18 - XRECORD */
 #ifdef LBX
-    extension[19].initFunc = LbxExtensionInit;
+    { LbxExtensionInit, LBXNAME, NULL, NULL, NULL },
 #endif
-    /* 20 - DBE */
 #ifdef XAPPGROUP
-    extension[21].initFunc = XagExtensionInit;
+    { XagExtensionInit, XAGNAME, NULL, NULL, NULL },
 #endif
 #ifdef XCSECURITY
-    extension[22].initFunc = SecurityExtensionInit;
+    { SecurityExtensionInit, SECURITY_EXTENSION_NAME, NULL, NULL, NULL },
 #endif
 #ifdef XPRINT
-    extension[23].initFunc = XpExtensionInit;
-#endif
-    /* 24 - XF86VidMode */
-    /* 25 - XF86Misc */
-    /* 26 - XF86DGA */
-    /* 27 - DPMS */
-    /* 28 - GLX */
-    /* 29 - TOG-CUP */
-    /* 30 - EVI */
+    { XpExtensionInit, XP_PRINTNAME, NULL, NULL, NULL },
+#endif
 #ifdef PANORAMIX
-    extension[31].initFunc = PanoramiXExtensionInit;
+    { PanoramiXExtensionInit, PANORAMIX_PROTOCOL_NAME, &noPanoramiXExtension, NULL, NULL },
 #endif
-    /* 31 - XAnti */
-    /* 32 - XF86DRI */
-
+#ifdef XF86BIGFONT
+    { XFree86BigfontExtensionInit, XF86BIGFONTNAME, NULL, NULL, NULL },
+#endif
+#ifdef RENDER
+    { RenderExtensionInit, "RENDER", NULL, NULL, NULL },
+#endif
+#ifdef RANDR
+    { RRExtensionInit, "RANDR", NULL, NULL, NULL },
 #endif
-    for (i = 0; extension[i].name != NULL; i++) 
-	if (extension[i].initFunc != NULL && 
-	    (extension[i].disablePtr == NULL || 
-	     (extension[i].disablePtr != NULL && !*extension[i].disablePtr))) {
-	    (*extension[i].initFunc)();
+    { NULL, NULL, NULL, NULL, NULL }
+};
+    
+/*ARGSUSED*/
+void
+InitExtensions(argc, argv)
+    int		argc;
+    char	*argv[];
+{
+    int i;
+    ExtensionModule *ext;
+    static Bool listInitialised = FALSE;
+
+    if (!listInitialised) {
+	/* Add built-in extensions to the list. */
+	for (i = 0; staticExtensions[i].name; i++)
+	    LoadExtension(&staticExtensions[i], TRUE);
+
+	/* Sort the extensions according the init dependencies. */
+	LoaderSortExtensions();
+	listInitialised = TRUE;
+    }
+
+    for (i = 0; ExtensionModuleList[i].name != NULL; i++) {
+	ext = &ExtensionModuleList[i];
+	if (ext->initFunc != NULL && 
+	    (ext->disablePtr == NULL || 
+	     (ext->disablePtr != NULL && !*ext->disablePtr))) {
+	    (ext->initFunc)();
 	}
+    }
 }
 
 static void (*__miHookInitVisualsFunction)(miInitVisualsProcPtr *);
diff --git a/xc/programs/Xserver/os/auth.c b/xc/programs/Xserver/os/auth.c
index 0d40e088e..f482c5c1f 100644
--- a/xc/programs/Xserver/os/auth.c
+++ b/xc/programs/Xserver/os/auth.c
@@ -1,4 +1,4 @@
-/* $TOG: auth.c /main/28 1998/02/09 15:11:49 kaleb $ */
+/* $Xorg: auth.c,v 1.3 2000/08/17 19:53:40 cpqbld Exp $ */
 /*
 
 Copyright 1988, 1998  The Open Group
@@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/os/auth.c,v 1.4 1998/12/06 06:08:47 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/os/auth.c,v 1.6 2001/01/17 22:37:10 dawes Exp $ */
 
 /*
  * authorization hooks for the server
@@ -32,8 +32,8 @@ from The Open Group.
 #ifdef K5AUTH
 # include   <krb5/krb5.h>
 #endif
-# include   "X.h"
-# include   "Xauth.h"
+# include   <X11/X.h>
+# include   <X11/Xauth.h>
 # include   "misc.h"
 # include   "osdep.h"
 # include   "dixstruct.h"
@@ -150,6 +150,7 @@ LoadAuthorization (void)
 #endif
     if (!f)
 	return 0;
+
     while ((auth = XauReadAuth (f)) != 0) {
 	for (i = 0; i < NUM_AUTHORIZATION; i++) {
 	    if (protocols[i].name_length == auth->name_length &&
@@ -163,6 +164,7 @@ LoadAuthorization (void)
 	}
 	XauDisposeAuth (auth);
     }
+
 #if !defined(WIN32) && !defined(__EMX__)
     Pclose (f);
 #else
diff --git a/xc/programs/Xserver/os/xdmcp.c b/xc/programs/Xserver/os/xdmcp.c
index 81c0512c2..04d6e9241 100644
--- a/xc/programs/Xserver/os/xdmcp.c
+++ b/xc/programs/Xserver/os/xdmcp.c
@@ -1,5 +1,4 @@
-/* $XConsortium: xdmcp.c /main/34 1996/12/02 10:23:29 lehors $ */
-/* $XFree86: xc/programs/Xserver/os/xdmcp.c,v 3.12 1999/02/24 03:21:58 dawes Exp $ */
+/* $Xorg: xdmcp.c,v 1.3 2000/08/17 19:53:42 cpqbld Exp $ */
 /*
  * Copyright 1989 Network Computing Devices, Inc., Mountain View, California.
  *
@@ -14,6 +13,7 @@
  * without express or implied warranty.
  *
  */
+/* $XFree86: xc/programs/Xserver/os/xdmcp.c,v 3.16 2001/07/23 13:15:50 dawes Exp $ */
 
 #ifdef WIN32
 /* avoid conflicting definitions */
@@ -31,7 +31,7 @@
 
 #include "Xos.h"
 
-#if !defined(MINIX) && !defined(WIN32)
+#if !defined(WIN32)
 #ifndef Lynx
 #include <sys/param.h>
 #include <sys/socket.h>
@@ -40,17 +40,8 @@
 #endif
 #include <netinet/in.h>
 #include <netdb.h>
-#else
-#if defined(MINIX)
-#include <net/hton.h>
-#include <net/netlib.h>
-#include <net/gen/netdb.h>
-#include <net/gen/udp.h>
-#include <net/gen/udp_io.h>
-#include <sys/nbio.h>
-#include <sys/ioctl.h>
-#endif
 #endif
+
 #include <stdio.h>
 #include "X.h"
 #include "Xmd.h"
@@ -74,7 +65,7 @@
 
 #ifdef XDMCP
 #undef REQUEST
-#include "Xdmcp.h"
+#include <X11/Xdmcp.h>
 
 extern char *display;
 extern fd_set EnabledDevices;
@@ -257,15 +248,6 @@ void XdmcpRegisterManufacturerDisplayID(
 #endif
 );
 
-#ifdef MINIX
-static void read_cb(
-#if NeedFunctionPrototypes
-    nbio_ref_t	/*ref*/,
-    int		/*res*/,
-    int		/*err*/
-#endif
-);
-#endif
 
 static short	xdm_udp_port = XDM_UDP_PORT;
 static Bool	OneSession = FALSE;
@@ -308,7 +290,10 @@ XdmcpOptions(int argc, char **argv, int i)
 	return (i + 1);
     }
     if (strcmp(argv[i], "-port") == 0) {
-	++i;
+        if (++i == argc)  {
+	    ErrorF("Xserver: missing port number in command line\n");
+	    exit(1);
+	}
 	xdm_udp_port = atoi(argv[i]);
 	return (i + 1);
     }
@@ -321,19 +306,28 @@ XdmcpOptions(int argc, char **argv, int i)
 	return (i + 1);
     }
     if (strcmp(argv[i], "-class") == 0) {
-	++i;
+        if (++i == argc)  {
+	    ErrorF("Xserver: missing class name in command line\n");
+	    exit(1);
+	}
 	defaultDisplayClass = argv[i];
 	return (i + 1);
     }
 #ifdef HASXDMAUTH
     if (strcmp(argv[i], "-cookie") == 0) {
-	++i;
+        if (++i == argc)  {
+	    ErrorF("Xserver: missing cookie data in command line\n");
+	    exit(1);
+	}
 	xdmAuthCookie = argv[i];
 	return (i + 1);
     }
 #endif
     if (strcmp(argv[i], "-displayID") == 0) {
-	++i;
+        if (++i == argc)  {
+	    ErrorF("Xserver: missing displayID in command line\n");
+	    exit(1);
+	}
 	XdmcpRegisterManufacturerDisplayID (argv[i], strlen (argv[i]));
 	return (i + 1);
     }
@@ -1009,51 +1003,9 @@ get_xdmcp_sock(void)
  
     freenetconfigent(nconf);
 #else
-#ifndef _MINIX
     int soopts = 1;
 
     if ((xdmcpSocket = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
-#else /* MINIX */
-    char *udp_device;
-    int r, s_errno;
-    nwio_udpopt_t udpopt;
-    nbio_ref_t ref;
-
-    udp_device= getenv("UDP_DEVICE");
-    if (udp_device == NULL)
-    	udp_device= UDP_DEVICE;
-    xdmcpSocket= open(udp_device, O_RDWR);
-    if (xdmcpSocket != -1)
-    {
-    	udpopt.nwuo_flags= NWUO_COPY | NWUO_LP_SEL | NWUO_EN_LOC | 
-    		NWUO_DI_BROAD | NWUO_RP_ANY | NWUO_RA_ANY | NWUO_RWDATALL |
-    		NWUO_DI_IPOPT;
-    	r= ioctl(xdmcpSocket, NWIOSUDPOPT, &udpopt);
-    	if (r == -1)
-    	{
-    		s_errno= errno;
-    		close(xdmcpSocket);
-    		xdmcpSocket= -1;
-    		errno= s_errno;
-    	}
-    	ioctl(xdmcpSocket, NWIOGUDPOPT, &udpopt);
-    	ErrorF("0x%x, 0x%x, 0x%x, 0x%x, 0x%x\n", 
-    		udpopt.nwuo_flags,
-    		udpopt.nwuo_locport,
-    		udpopt.nwuo_remport,
-    		udpopt.nwuo_locaddr,
-    		udpopt.nwuo_remaddr);
-    }
-    if (xdmcpSocket != -1)
-    {
-	fcntl(xdmcpSocket, F_SETFD, fcntl(xdmcpSocket, F_GETFD) | 
-    								FD_ASYNCHIO);
-	nbio_register(xdmcpSocket);
-	ref.ref_int= xdmcpSocket;
-	nbio_setcallback(xdmcpSocket, ASIO_READ, read_cb, ref);
-    }
-    if (xdmcpSocket == -1)
-#endif /* !MINIX */
 	XdmcpWarning("UDP socket creation failed");
 #ifdef SO_BROADCAST
     else if (setsockopt(xdmcpSocket, SOL_SOCKET, SO_BROADCAST, (char *)&soopts,
@@ -1422,11 +1374,7 @@ get_manager_by_name(
 	ErrorF("Xserver: unknown host: %s\n", argv[i]);
 	exit(1);
     }
-#ifndef _MINIX
     if (hep->h_length == sizeof (struct in_addr))
-#else
-    if (hep->h_length == sizeof (ipaddr_t))
-#endif
     {
 	memmove(&ManagerAddress.sin_addr, hep->h_addr, hep->h_length);
 #ifdef BSD44SOCKETS
@@ -1460,11 +1408,7 @@ get_fromaddr_by_name(
 	ErrorF("Xserver: unknown host: %s\n", argv[i]);
 	exit(1);
     }
-#ifndef _MINIX
     if (hep->h_length == sizeof (struct in_addr))
-#else
-    if (hep->h_length == sizeof (ipaddr_t))
-#endif
     {
 	memset(&FromAddress, 0, sizeof(FromAddress));
 	memmove(&FromAddress.sin_addr, hep->h_addr, hep->h_length);
@@ -1482,65 +1426,6 @@ get_fromaddr_by_name(
     xdm_from = argv[i];
 }
 
-#ifdef MINIX
-static char read_buffer[XDM_MAX_MSGLEN+sizeof(udp_io_hdr_t)];
-static int read_inprogress;
-static int read_size;
-
-int
-XdmcpFill (
-int             fd,
-XdmcpBufferPtr  buffer,
-XdmcpNetaddr    from,       /* return */
-int             *fromlen)   /* return */
-{
-	int r;
-
-	if (read_inprogress)
-		return 0;
-
-	if (read_size != 0)
-	{
-		r= read_size;
-		read_size= 0;
-		return MNX_XdmcpFill(fd, buffer, from, fromlen, read_buffer,
-			r);
-	}
-
-	r= read(fd, read_buffer, sizeof(read_buffer));
-	if (r > 0)
-	{
-		return MNX_XdmcpFill(fd, buffer, from, fromlen, read_buffer,
-			r);
-	}
-	else if (r == -1 && errno == EINPROGRESS)
-	{
-		read_inprogress= 1;
-		nbio_inprogress(fd, ASIO_READ, 1 /* read */, 0 /* write */,
-			0 /* except */);
-		return 0;
-	}
-	else
-		FatalError("XdmcpFill: read failed: %s\n",
-			r == 0 ? "EOF" : strerror(errno));
-	return 0;
-}
-
-static void read_cb(ref, res, err)
-nbio_ref_t ref;
-int res;
-int err;
-{
-	if (res <= 0)
-	{
-		FatalError("xdmcp'read_cb: read failed: %s\n",
-			res == 0 ? "EOF" : strerror(err));
-	}
-	read_inprogress= 0;
-	read_size= res;
-}
-#endif
-
 #else
 static int xdmcp_non_empty; /* avoid complaint by ranlib */
 #endif /* XDMCP */
diff --git a/xc/programs/Xserver/xkb/Imakefile b/xc/programs/Xserver/xkb/Imakefile
index 58ed69bc7..2beb2fdfb 100644
--- a/xc/programs/Xserver/xkb/Imakefile
+++ b/xc/programs/Xserver/xkb/Imakefile
@@ -1,5 +1,10 @@
-XCOMM $TOG: Imakefile /main/12 1997/07/16 14:51:50 kaleb $
-XCOMM $XFree86: xc/programs/Xserver/xkb/Imakefile,v 3.12 1999/04/17 09:08:51 dawes Exp $
+XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:45 cpqbld Exp $
+
+
+
+
+XCOMM $XFree86: xc/programs/Xserver/xkb/Imakefile,v 3.16 2001/01/17 22:37:14 dawes Exp $
+
 #define SGIHyperOpt
 #include <Server.tmpl>
 
@@ -40,7 +45,8 @@ XKB_DDXDEFS = XkbServerDefines
 	    xkmread.o xkbtext.o xkbfmisc.o xkberrs.o xkbout.o maprules.o \
 	    XKBMisc.o XKBMAlloc.o XKBAlloc.o XKBGAlloc.o \
 	    $(XKBXI_OBJS) $(DDX_OBJS)
-   INCLUDES = -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC)
+   INCLUDES = -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(SERVERSRC)/Xext \
+	      -I$(SERVERSRC)/mi
    LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln
 
 DEFINES = -DXKB_IN_SERVER $(EXTRA_ALLOC_DEFINES) $(XKB_DDXDEFS)
@@ -66,4 +72,8 @@ LinkSourceFile(XKBMAlloc.c,$(XLIBSRC))
 LinkSourceFile(XKBAlloc.c,$(XLIBSRC))
 LinkSourceFile(XKBGAlloc.c,$(XLIBSRC))
 
+#if UseConfDirForXkb && BuildLibraries
+LinkConfDirectory(xkb,.,xkb,.)
+#endif
+
 DependTarget()
author	dawes <dawes>	2001-08-25 03:13:01 +0000
committer	dawes <dawes>	2001-08-25 03:13:01 +0000
commit	78d8c394fd74a2ecaaefd2e50515e1efb3b06408 (patch)
tree	63a9fededc551fb427766dfc092075675257b302
parent	1bc269d9ee0b7ece9ebe6487b48f8786cdd0ee35 (diff)