svn merge ^/branches/released .

9 files changed, 3275 insertions, 3274 deletions

diff --git a/libX11/src/GetProp.c b/libX11/src/GetProp.c
index fc4643b95..5d6e0b8c4 100644
--- a/libX11/src/GetProp.c
+++ b/libX11/src/GetProp.c
@@ -1,133 +1,133 @@
-/*

-

-Copyright 1986, 1998  The Open Group

-

-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.

-

-The above copyright notice and this permission notice shall be included in

-all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-

-Except as contained in this notice, the name of The Open Group shall not be

-used in advertising or otherwise to promote the sale, use or other dealings

-in this Software without prior written authorization from The Open Group.

-

-*/

-

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#include "Xlibint.h"

-

-int

-XGetWindowProperty(

-    register Display *dpy,

-    Window w,

-    Atom property,

-    long offset,

-    long length,

-    Bool delete,

-    Atom req_type,

-    Atom *actual_type,		/* RETURN */

-    int *actual_format,  	/* RETURN  8, 16, or 32 */

-    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 (nbytes + 1 > 0 &&

-		(*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 (nbytes + 1 > 0 &&

-		(*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 (nbytes + 1 > 0 &&

-		(*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);

-	    }

-	    nbytes = 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);

-}

-

+/*
+
+Copyright 1986, 1998  The Open Group
+
+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.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "Xlibint.h"
+
+int
+XGetWindowProperty(
+    register Display *dpy,
+    Window w,
+    Atom property,
+    long offset,
+    long length,
+    Bool delete,
+    Atom req_type,
+    Atom *actual_type,		/* RETURN */
+    int *actual_format,  	/* RETURN  8, 16, or 32 */
+    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 = {0};
+
+    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 (nbytes + 1 > 0 &&
+		(*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 (nbytes + 1 > 0 &&
+		(*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 (nbytes + 1 > 0 &&
+		(*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);
+	    }
+	    nbytes = 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/libX11/src/ImUtil.c b/libX11/src/ImUtil.c
index cd418d885..3164d43b7 100644
--- a/libX11/src/ImUtil.c
+++ b/libX11/src/ImUtil.c
@@ -372,6 +372,7 @@ XImage *XCreateImage (
 	if (image_bytes_per_line == 0) {
 	    image->bytes_per_line = min_bytes_per_line;
 	} else if (image_bytes_per_line < min_bytes_per_line) {
+	    Xfree(image);
 	    return NULL;
 	} else {
 	    image->bytes_per_line = image_bytes_per_line;
diff --git a/libX11/src/XlibInt.c b/libX11/src/XlibInt.c
index 498cf16be..33bbe5458 100644
--- a/libX11/src/XlibInt.c
+++ b/libX11/src/XlibInt.c
@@ -668,6 +668,7 @@ XAddConnectionWatch(
 	    UnlockDisplay(dpy);
 	    return 0;
 	}
+	info_list->watch_data = wd_array;
 	wd_array[dpy->watcher_count] = NULL;	/* for cleanliness */
     }
 
@@ -1444,9 +1445,10 @@ static int _XPrintDefaultError(
 	     ext && (ext->codes.major_opcode != event->request_code);
 	     ext = ext->next)
 	  ;
-	if (ext)
-	    strcpy(buffer, ext->name);
-	else
+	if (ext) {
+	    strncpy(buffer, ext->name, BUFSIZ);
+	    buffer[BUFSIZ - 1] = '\0';
+        } else
 	    buffer[0] = '\0';
     }
     (void) fprintf(fp, " (%s)\n", buffer);
diff --git a/libX11/src/Xrm.c b/libX11/src/Xrm.c
index 21f0af3c0..fbc8ad293 100644
--- a/libX11/src/Xrm.c
+++ b/libX11/src/Xrm.c
@@ -842,8 +842,10 @@ static void PutEntry(
 	nprev = NodeBuckets(table); \
     } else { \
 	table->leaf = 1; \
-	if (!(nprev = (NTable *)Xmalloc(sizeof(VEntry *)))) \
+	if (!(nprev = (NTable *)Xmalloc(sizeof(VEntry *)))) {\
+	    Xfree(table); \
 	    return; \
+        } \
 	((LTable)table)->buckets = (VEntry *)nprev; \
     } \
     *nprev = (NTable)NULL; \
@@ -1594,6 +1596,12 @@ ReadInFile(_Xconst char *filename)
      */
     GetSizeOfFile(fd, size);
 
+    /* There might have been a problem trying to stat a file */
+    if (size == -1) {
+	close (fd);
+	return (char *)NULL;
+    }
+
     if (!(filebuf = Xmalloc(size + 1))) { /* leave room for '\0' */
 	close(fd);
 	return (char *)NULL;
diff --git a/libX11/src/xcms/LRGB.c b/libX11/src/xcms/LRGB.c
index 7e09db00a..750c4924e 100644
--- a/libX11/src/xcms/LRGB.c
+++ b/libX11/src/xcms/LRGB.c
@@ -1,1847 +1,1845 @@
-

-/*

- * 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

- *

- */

-

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#include <stdio.h>

-#include <X11/Xos.h>

-#include <X11/Xatom.h>

-#include "Xlibint.h"

-#include "Xcmsint.h"

-#include "Cv.h"

-

-/*

- *      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(XPointer pScreenDataTemp);

-static int LINEAR_RGB_InitSCCData(Display *dpy,

-    int screenNumber, XcmsPerScrnInfo *pPerScrnInfo);

-static int XcmsLRGB_RGB_ParseString(register char *spec, XcmsColor *pColor);

-static int XcmsLRGB_RGBi_ParseString(register char *spec, XcmsColor *pColor);

-static Status

-_XcmsGetTableType0(

-    IntensityTbl *pTbl,

-    int	  format,

-    char **pChar,

-    unsigned long *pCount);

-static Status

-_XcmsGetTableType1(

-    IntensityTbl *pTbl,

-    int	  format,

-    char **pChar,

-    unsigned long *pCount);

-

-/*

- *      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[] = {

-    (XcmsConversionProc)XcmsRGBToRGBi,

-    (XcmsConversionProc)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[] = {

-    (XcmsConversionProc)XcmsCIEXYZToRGBi,

-    (XcmsConversionProc)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[] = {

-    (XcmsConversionProc)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[] = {

-    (XcmsConversionProc)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(

-    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 FreeGreenTblElements;

-		}

-		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(

-    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

- */

-static Status

-_XcmsGetTableType0(

-    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

- */

-static Status

-_XcmsGetTableType1(

-    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

- */

-static int

-_XcmsValueCmp(

-    IntensityRec *p1, IntensityRec *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

- */

-static int

-_XcmsIntensityCmp(

-    IntensityRec *p1, IntensityRec *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 */

-static int

-_XcmsValueInterpolation(

-    IntensityRec *key, IntensityRec *lo, IntensityRec *hi, IntensityRec *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

- */

-static int

-_XcmsIntensityInterpolation(

-    IntensityRec *key, IntensityRec *lo, IntensityRec *hi, IntensityRec *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);

-}

-

-

-

-typedef int (*comparProcp)(

-    char *p1,

-    char *p2);

-typedef int (*interpolProcp)(

-    char *key,

-    char *lo,

-    char *hi,

-    char *answer,

-    int bitsPerRGB);

-

-/*

- *	NAME

- *		_XcmsTableSearch

- *

- *	SYNOPSIS

- */

-static int

-_XcmsTableSearch(

-    char *key,

-    int bitsPerRGB,

-    char *base,

-    unsigned nel,

-    unsigned nKeyPtrSize,

-    int (*compar)(

-        char *p1,

-        char *p2),

-    int (*interpol)(

-        char *key,

-        char *lo,

-        char *hi,

-        char *answer,

-        int bitsPerRGB),

-    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

- */

-static void _XcmsMatVec(

-    XcmsFloat *pMat, XcmsFloat *pIn, XcmsFloat *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(

-    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(

-    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) {

-        char *s; /* Maybe failed due to locale */

-        int f;

-        if ((s = strdup(spec))) {

-            for (f = 0; s[f]; ++f)

-                if (s[f] == '.')

-                    s[f] = ',';

-                else if (s[f] == ',')

-                    s[f] = '.';

-	    if (sscanf(s + n + 1, "%lf/%lf/%lf",

-		       &pColor->spec.RGBi.red,

-		       &pColor->spec.RGBi.green,

-		       &pColor->spec.RGBi.blue) != 3) {

-                free(s);

-                return(XcmsFailure);

-            }

-            free(s);

-        } else

-	    return(XcmsFailure);

-    }

-

-    /*

-     * Succeeded !

-     */

-    pColor->format = XcmsRGBiFormat;

-    pColor->pixel = 0;

-    return (XcmsSuccess);

-}

-

-

-/*

- *	NAME

- *		XcmsCIEXYZToRGBi - convert CIE XYZ to RGB

- *

- *	SYNOPSIS

- */

-/* ARGSUSED */

-Status

-XcmsCIEXYZToRGBi(

-    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(

-    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(

-    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),

-		(comparProcp)_XcmsIntensityCmp, (interpolProcp)_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),

-		(comparProcp)_XcmsIntensityCmp, (interpolProcp)_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),

-		(comparProcp)_XcmsIntensityCmp, (interpolProcp)_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(

-    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),

-		(comparProcp)_XcmsValueCmp, (interpolProcp)_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),

-		(comparProcp)_XcmsValueCmp, (interpolProcp)_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),

-		(comparProcp)_XcmsValueCmp, (interpolProcp)_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(

-    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);

-}

+
+/*
+ * 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
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <stdio.h>
+#include <X11/Xos.h>
+#include <X11/Xatom.h>
+#include "Xlibint.h"
+#include "Xcmsint.h"
+#include "Cv.h"
+
+/*
+ *      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(XPointer pScreenDataTemp);
+static int LINEAR_RGB_InitSCCData(Display *dpy,
+    int screenNumber, XcmsPerScrnInfo *pPerScrnInfo);
+static int XcmsLRGB_RGB_ParseString(register char *spec, XcmsColor *pColor);
+static int XcmsLRGB_RGBi_ParseString(register char *spec, XcmsColor *pColor);
+static Status
+_XcmsGetTableType0(
+    IntensityTbl *pTbl,
+    int	  format,
+    char **pChar,
+    unsigned long *pCount);
+static Status
+_XcmsGetTableType1(
+    IntensityTbl *pTbl,
+    int	  format,
+    char **pChar,
+    unsigned long *pCount);
+
+/*
+ *      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[] = {
+    (XcmsConversionProc)XcmsRGBToRGBi,
+    (XcmsConversionProc)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[] = {
+    (XcmsConversionProc)XcmsCIEXYZToRGBi,
+    (XcmsConversionProc)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[] = {
+    (XcmsConversionProc)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[] = {
+    (XcmsConversionProc)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(
+    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) {
+		goto Free_property_return;
+	    }
+	    count = 3;
+	    break;
+	  case 16:
+	    /*
+	     * Must have at least:
+	     *		VisualID0
+	     *		VisualID3
+	     *		type
+	     *		count
+	     *		length
+	     *		intensity1
+	     *		intensity2
+	     */
+	    if (nitems < 7) {
+		goto Free_property_return;
+	    }
+	    count = 1;
+	    break;
+	  case 32:
+	    /*
+	     * Must have at least:
+	     *		VisualID0
+	     *		type
+	     *		count
+	     *		length
+	     *		intensity1
+	     *		intensity2
+	     */
+	    if (nitems < 6) {
+		goto Free_property_return;
+	    }
+	    count = 0;
+	    break;
+	  default:
+	    goto Free_property_return;
+	}
+
+	/*
+	 * 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 Free_property_return;
+	    }
+	    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 Free_property_return;
+	    }
+	    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 FreeGreenTblElements;
+		}
+		if (_XcmsGetTableType1(pScreenData->pBlueTbl, format_return, &pChar,
+			&nitems) == XcmsFailure) {
+		    goto FreeBlueTbl;
+		}
+	    }
+	} else {
+	    goto Free_property_return;
+	}
+
+#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);
+
+Free_property_return:
+    Xfree ((char *)property_return);
+
+FreeSCCData:
+    Xfree((char *)pScreenData);
+    pPerScrnInfo->state = XcmsInitNone;
+    return(XcmsFailure);
+}
+
+
+/*
+ *	NAME
+ *		LINEAR_RGB_FreeSCCData()
+ *
+ *	SYNOPSIS
+ */
+static void
+LINEAR_RGB_FreeSCCData(
+    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
+ */
+static Status
+_XcmsGetTableType0(
+    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
+ */
+static Status
+_XcmsGetTableType1(
+    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
+ */
+static int
+_XcmsValueCmp(
+    IntensityRec *p1, IntensityRec *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
+ */
+static int
+_XcmsIntensityCmp(
+    IntensityRec *p1, IntensityRec *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 */
+static int
+_XcmsValueInterpolation(
+    IntensityRec *key, IntensityRec *lo, IntensityRec *hi, IntensityRec *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
+ */
+static int
+_XcmsIntensityInterpolation(
+    IntensityRec *key, IntensityRec *lo, IntensityRec *hi, IntensityRec *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);
+}
+
+
+
+typedef int (*comparProcp)(
+    char *p1,
+    char *p2);
+typedef int (*interpolProcp)(
+    char *key,
+    char *lo,
+    char *hi,
+    char *answer,
+    int bitsPerRGB);
+
+/*
+ *	NAME
+ *		_XcmsTableSearch
+ *
+ *	SYNOPSIS
+ */
+static int
+_XcmsTableSearch(
+    char *key,
+    int bitsPerRGB,
+    char *base,
+    unsigned nel,
+    unsigned nKeyPtrSize,
+    int (*compar)(
+        char *p1,
+        char *p2),
+    int (*interpol)(
+        char *key,
+        char *lo,
+        char *hi,
+        char *answer,
+        int bitsPerRGB),
+    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
+ */
+static void _XcmsMatVec(
+    XcmsFloat *pMat, XcmsFloat *pIn, XcmsFloat *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(
+    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(
+    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) {
+        char *s; /* Maybe failed due to locale */
+        int f;
+        if ((s = strdup(spec))) {
+            for (f = 0; s[f]; ++f)
+                if (s[f] == '.')
+                    s[f] = ',';
+                else if (s[f] == ',')
+                    s[f] = '.';
+	    if (sscanf(s + n + 1, "%lf/%lf/%lf",
+		       &pColor->spec.RGBi.red,
+		       &pColor->spec.RGBi.green,
+		       &pColor->spec.RGBi.blue) != 3) {
+                free(s);
+                return(XcmsFailure);
+            }
+            free(s);
+        } else
+	    return(XcmsFailure);
+    }
+
+    /*
+     * Succeeded !
+     */
+    pColor->format = XcmsRGBiFormat;
+    pColor->pixel = 0;
+    return (XcmsSuccess);
+}
+
+
+/*
+ *	NAME
+ *		XcmsCIEXYZToRGBi - convert CIE XYZ to RGB
+ *
+ *	SYNOPSIS
+ */
+/* ARGSUSED */
+Status
+XcmsCIEXYZToRGBi(
+    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(
+    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(
+    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),
+		(comparProcp)_XcmsIntensityCmp, (interpolProcp)_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),
+		(comparProcp)_XcmsIntensityCmp, (interpolProcp)_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),
+		(comparProcp)_XcmsIntensityCmp, (interpolProcp)_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(
+    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),
+		(comparProcp)_XcmsValueCmp, (interpolProcp)_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),
+		(comparProcp)_XcmsValueCmp, (interpolProcp)_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),
+		(comparProcp)_XcmsValueCmp, (interpolProcp)_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(
+    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/libX11/src/xcms/cmsColNm.c b/libX11/src/xcms/cmsColNm.c
index 41643703e..8518adfd1 100644
--- a/libX11/src/xcms/cmsColNm.c
+++ b/libX11/src/xcms/cmsColNm.c
@@ -567,7 +567,7 @@ stringSectionSize(
 	return(XcmsFailure);
     }
 
-    while((pBuf = fgets(buf, XCMSDB_MAXLINELEN, stream)) != NULL) {
+    while((fgets(buf, XCMSDB_MAXLINELEN, stream)) != NULL) {
 	if ((sscanf(buf, "%s", token)) && (strcmp(token, END_TOKEN) == 0)) {
 	    break;
 	}
@@ -651,7 +651,7 @@ ReadColornameDB(
      * Process lines between START_TOKEN to END_TOKEN
      */
 
-    while ((pBuf = fgets(buf, XCMSDB_MAXLINELEN, stream)) != NULL) {
+    while ((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
diff --git a/libX11/src/xlibi18n/XDefaultOMIF.c b/libX11/src/xlibi18n/XDefaultOMIF.c
index d209d8f49..1821e6459 100644
--- a/libX11/src/xlibi18n/XDefaultOMIF.c
+++ b/libX11/src/xlibi18n/XDefaultOMIF.c
@@ -1,1283 +1,1277 @@
-/*

-Copyright 1985, 1986, 1987, 1991, 1998  The Open Group

-

-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

-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE

-EVEN IF ADVISED IN ADVANCE OF THE POSSIBILITY OF SUCH DAMAGES.

-

-

-Except as contained in this notice, the name of The Open Group shall not be

-used in advertising or otherwise to promote the sale, use or other dealings

-in this Software without prior written authorization from The Open Group.

-

-

-X Window System is a trademark of The Open Group

-

-OSF/1, OSF/Motif and Motif are registered trademarks, and OSF, the OSF

-logo, LBX, X Window System, and Xinerama are trademarks of the Open

-Group. All other trademarks and registered trademarks mentioned herein

-are the property of their respective owners. No right, title or

-interest in or to any trademark, service mark, logo or trade name of

-Sun Microsystems, Inc. or its licensors is granted.

-

-*/

-/*

- * Copyright 2000 Oracle and/or its affiliates. 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 (including the next

- * paragraph) shall be included in all copies or substantial portions of the

- * Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

- * DEALINGS IN THE SOFTWARE.

- */

-

-

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#include "Xlibint.h"

-#include "Xlcint.h"

-#include "XlcPublic.h"

-#include <X11/Xos.h>

-#include <X11/Xatom.h>

-#include <stdio.h>

-#include <stdint.h>

-

-#define MAXFONTS		100

-

-#define XOM_GENERIC(om)		(&((XOMGeneric) om)->gen)

-#define XOC_GENERIC(font_set)	(&((XOCGeneric) font_set)->gen)

-

-#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)

-

-typedef struct _FontDataRec {

-    char *name;

-} FontDataRec, *FontData;

-

-typedef struct _OMDataRec {

-    int font_data_count;

-    FontData font_data;

-} OMDataRec, *OMData;

-

-typedef struct _XOMGenericPart {

-    OMData data;

-} XOMGenericPart;

-

-typedef struct _XOMGenericRec {

-    XOMMethods methods;

-    XOMCoreRec core;

-    XOMGenericPart gen;

-} XOMGenericRec, *XOMGeneric;

-

-typedef struct _FontSetRec {

-    int id;

-    int font_data_count;

-    FontData font_data;

-    char *font_name;

-    XFontStruct *info;

-    XFontStruct *font;

-} FontSetRec, *FontSet;

-

-typedef struct _XOCGenericPart {

-    XlcConv wcs_to_cs;

-    FontSet font_set;

-} XOCGenericPart;

-

-typedef struct _XOCGenericRec {

-    XOCMethods methods;

-    XOCCoreRec core;

-    XOCGenericPart gen;

-} XOCGenericRec, *XOCGeneric;

-

-static Bool

-init_fontset(

-    XOC oc)

-{

-    XOCGenericPart *gen;

-    FontSet font_set;

-    OMData data;

-

-    data = XOM_GENERIC(oc->core.om)->data;

-

-    font_set = (FontSet) Xmalloc(sizeof(FontSetRec));

-    if (font_set == NULL)

-	return False;

-    bzero((char *) font_set, sizeof(FontSetRec));

-

-    gen = XOC_GENERIC(oc);

-    gen->font_set = font_set;

-

-    font_set->font_data_count = data->font_data_count;

-    font_set->font_data = data->font_data;

-

-    return True;

-}

-

-static char *

-get_prop_name(

-    Display *dpy,

-    XFontStruct	*fs)

-{

-    unsigned long fp;

-

-    if (XGetFontProperty(fs, XA_FONT, &fp))

-	return XGetAtomName(dpy, fp);

-

-    return (char *) NULL;

-}

-

-static FontData

-check_charset(

-    FontSet font_set,

-    char *font_name)

-{

-    FontData font_data;

-    char *last;

-    int count;

-    ssize_t length, name_len;

-

-    name_len = strlen(font_name);

-    last = font_name + name_len;

-

-    count = font_set->font_data_count;

-    font_data = font_set->font_data;

-

-    for ( ; count-- > 0; font_data++) {

-	length = strlen(font_data->name);

-

-	if (length > name_len)

-	    return(NULL);

-

-	if (_XlcCompareISOLatin1(last - length, font_data->name) == 0)

-	    return font_data;

-    }

-    return (FontData) NULL;

-}

-

-#if 0 /* Unused */

-static int

-check_fontname(

-    XOC oc,

-    char *name)

-{

-    Display *dpy = oc->core.om->core.display;

-    XOCGenericPart *gen = XOC_GENERIC(oc);

-    FontData data;

-    FontSet font_set;

-    XFontStruct *fs_list;

-    char **fn_list, *fname, *prop_fname = NULL;

-    int list_num, i;

-    int list2_num;

-    char **fn2_list = NULL;

-    int found_num = 0;

-

-    fn_list = XListFonts(dpy, name, MAXFONTS, &list_num);

-    if (fn_list == NULL)

-	return found_num;

-

-    for (i = 0; i < list_num; i++) {

-	fname = fn_list[i];

-

-	font_set = gen->font_set;

-

-	if ((data = check_charset(font_set, fname)) == NULL) {

-	    if ((fn2_list = XListFontsWithInfo(dpy, name, MAXFONTS,

-					       &list2_num, &fs_list))

-		&& (prop_fname = get_prop_name(dpy, fs_list))

-		&& (data = check_charset(font_set, prop_fname)))

-		fname = prop_fname;

-	}

-	if (data) {

-	    font_set->font_name = (char *) Xmalloc(strlen(fname) + 1);

-	    if (font_set->font_name) {

-		strcpy(font_set->font_name, fname);

-		found_num++;

-	    }

-	}

-	if (fn2_list) {

-	    XFreeFontInfo(fn2_list, fs_list, list2_num);

-	    fn2_list = NULL;

-	    if (prop_fname) {

-		Xfree(prop_fname);

-		prop_fname = NULL;

-	    }

-	}

-	if (found_num == 1)

-	    break;

-    }

-    XFreeFontNames(fn_list);

-    return found_num;

-}

-#endif

-

-static Bool

-load_font(

-    XOC oc)

-{

-    Display *dpy = oc->core.om->core.display;

-    XOCGenericPart *gen = XOC_GENERIC(oc);

-    FontSet font_set = gen->font_set;

-

-    if (font_set->font_name == NULL)

-	return False;

-

-    if (font_set->font == NULL) {

-	font_set->font = XLoadQueryFont(dpy, font_set->font_name);

-	if (font_set->font == NULL)

-	    return False;

-    }

-    return True;

-}

-

-#if 0

-static Bool

-load_font_info(

-    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;

-

-    if (font_set->font_name == NULL)

-	return False;

-

-    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;

-	if (fn_num > 0)

-	    font_set->info->fid = XLoadFont(dpy, font_set->font_name);

-

-	if (fn_list) XFreeFontNames(fn_list);

-    }

-    return True;

-}

-#endif

-

-static void

-set_fontset_extents(

-    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;

-

-    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;

-

-    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(

-    XOC oc)

-{

-    XOCGenericPart *gen = XOC_GENERIC(oc);

-    FontSet font_set;

-    XFontStruct **font_struct_list;

-    char **font_name_list, *font_name_buf;

-    int	count, length;

-

-    font_set = gen->font_set;

-    count = length = 0;

-

-    if (font_set->font_name != NULL) {

-	length += strlen(font_set->font_name) + 1;

-	count++;

-    }

-    if (count == 0)

-        return False;

-

-    font_struct_list = (XFontStruct **) Xmalloc(sizeof(XFontStruct *));

-    if (font_struct_list == NULL)

-	return False;

-

-    font_name_list = (char **) Xmalloc(sizeof(char *));

-    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 = 1;

-    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;

-

-    if (font_set->font_name != NULL) {

-	font_set->id = 1;

-	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(

-    XOC oc,

-    char *pattern)

-{

-    char **list, *name, *prop_name;

-    int count;

-    XFontStruct *fs;

-    Display *dpy = oc->core.om->core.display;

-

-    list = XListFonts(dpy, pattern, 1, &count);

-    if (list != NULL) {

-	name = (char *) Xmalloc(strlen(*list) + 1);

-	if (name)

-	    strcpy(name, *list);

-

-	XFreeFontNames(list);

-    } else {

-	fs = XLoadQueryFont(dpy, pattern);

-	if (fs == NULL) return NULL;

-

-	prop_name = get_prop_name(dpy, fs);

-	if (prop_name == NULL) return NULL;

-

-	name = (char*) Xmalloc(strlen(prop_name) + 1);

-	if (name)

-	    strcpy(name, prop_name);

-

-	XFreeFont(dpy, fs);

-    }

-    return name;

-}

-

-static int

-parse_fontname(

-    XOC oc)

-{

-    XOCGenericPart *gen = XOC_GENERIC(oc);

-    FontSet font_set;

-    FontData font_data;

-    char *pattern, *last, buf[BUFSIZ];

-    int font_data_count, found_num = 0;

-    ssize_t length;

-    int count, num_fields;

-    char *base_name, *font_name, **name_list, **cur_name_list;

-    char *charset_p = NULL;

-    Bool append_charset;

-    /*

-       append_charset flag should be set to True when the XLFD fontname

-       doesn't contain a chaset part.

-     */

-

-    name_list = _XParseBaseFontNameList(oc->core.base_name_list, &count);

-    if (name_list == NULL)

-	return -1;

-    cur_name_list = name_list;

-

-    while (count-- > 0) {

-        pattern = *cur_name_list++;

-	if (pattern == NULL || *pattern == '\0')

-	    continue;

-

-	append_charset = False;

-

-	if (strchr(pattern, '*') == NULL &&

-	    (font_name = get_font_name(oc, pattern))) {

-

-	    font_set = gen->font_set;

-

-	    font_data = check_charset(font_set, font_name);

-	    if (font_data == NULL) {

-		Display *dpy = oc->core.om->core.display;

-		char **fn_list = NULL, *prop_fname = NULL;

-		int list_num;

-		XFontStruct *fs_list;

-		if ((fn_list = XListFontsWithInfo(dpy, font_name,

-						  MAXFONTS,

-						  &list_num, &fs_list))

-		    && (prop_fname = get_prop_name(dpy, fs_list))

-		    && (font_data = check_charset(font_set, prop_fname))) {

-		    if (fn_list) {

-			XFreeFontInfo(fn_list, fs_list, list_num);

-			fn_list = NULL;

-		    }

-		    font_name = prop_fname;

-		}

-	    }

-	    if (font_data == NULL)

-		continue;

-

-	    font_set->font_name = (char *) Xmalloc(strlen(font_name) + 1);

-	    if (font_set->font_name == NULL) {

-		Xfree(font_name);

-		goto err;

-	    }

-	    strcpy(font_set->font_name, font_name);

-	    Xfree(font_name);

-	    found_num++;

-	    goto found;

-	}

-/*

-1266793

-Limit the length of the string copy to prevent stack corruption.

-	strcpy(buf, pattern);

-*/

-	strncpy(buf, pattern, BUFSIZ);

-	buf[BUFSIZ-1] = '\0';

-	length = strlen(buf);

-	last = buf + length - 1;

-

-	for (num_fields = 0, base_name = buf; *base_name != '\0'; base_name++)

-	    if (*base_name == '-') num_fields++;

-	if (strchr(pattern, '*') == NULL) {

-	    if (num_fields == 12) {

-		append_charset = True;

-		*++last = '-';

-		last++;

-	    } else

-		continue;

-	} else {

-	    if (num_fields == 13 || num_fields == 14) {

-	    /*

-	     * There are 14 fields in an XLFD name -- make certain the

-	     * charset (& encoding) is placed in the correct field.

-	     */

-		append_charset = True;

-		last = strrchr (buf, '-');

-		if (num_fields == 14) {

-		    *last = '\0';

-		    last = strrchr (buf, '-');

-		}

-		last++;

-	    } else if (*last == '*') {

-		append_charset = True;

-		if (length > 3 && *(last-3) == '-' && *(last-2) == '*'

-		    && *(last-1) == '-') {

-		    last -= 2;

-		}

-		*++last = '-';

-		last++;

-	    } else {

-		last = strrchr (buf, '-');

-		charset_p = last;

-		charset_p = strrchr (buf, '-');

-		while (*(--charset_p) != '-');

-		charset_p++;

-	    }

-	}

-

-	font_set = gen->font_set;

-

-	font_data = font_set->font_data;

-	font_data_count = font_set->font_data_count;

-	for ( ; font_data_count-- > 0; font_data++) {

-	    if (append_charset)

-		{

-/*

-1266793

-Limit the length of the string copy to prevent stack corruption.

-		strcpy(last, font_data->name);

-*/

-		strncpy(last, font_data->name, BUFSIZ - length);

-		buf[BUFSIZ-1] = '\0';

-		}

-	    else {

-		if (_XlcCompareISOLatin1(charset_p,

-					 font_data->name)) {

-		    continue;

-		}

-	    }

-	    if ((font_set->font_name = get_font_name(oc, buf)))

-		break;

-	}

-	if (font_set->font_name != NULL) {

-	    found_num++;

-	    goto found;

-	}

-    }

-  found:

-    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);

-

-    return -1;

-}

-

-static Bool

-set_missing_list(

-    XOC oc)

-{

-    XOCGenericPart *gen = XOC_GENERIC(oc);

-    FontSet font_set;

-    char **charset_list, *charset_buf;

-    int	count, length;

-

-    font_set = gen->font_set;

-    count = length = 0;

-

-    if (!font_set->info && !font_set->font) {

-	length += strlen(font_set->font_data->name) + 1;

-	count++;

-    }

-

-    if (count == 0)

-	return True;

-

-    charset_list = (char **) Xmalloc(sizeof(char *));

-    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;

-

-    font_set = gen->font_set;

-

-    if (!font_set->info && !font_set->font) {

-	strcpy(charset_buf, font_set->font_data->name);

-	*charset_list++ = charset_buf;

-	charset_buf += strlen(charset_buf) + 1;

-    }

-    return True;

-}

-

-static Bool

-create_fontset(

-    XOC oc)

-{

-    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 (load_font(oc) == False)

-	return False;

-

-    if (init_core_part(oc) == False)

-	return False;

-

-    if (set_missing_list(oc) == False)

-	return False;

-

-    return True;

-}

-

-static void

-destroy_oc(

-    XOC oc)

-{

-    Display *dpy = oc->core.om->core.display;

-    XOCGenericPart *gen = XOC_GENERIC(oc);

-    XFontStruct **font_list, *font;

-

-    if (gen->font_set)

-	Xfree(gen->font_set);

-

-    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)) {

-	if ((font = *font_list)) {

-	    if (font->fid)

-		XFreeFont(dpy, font);

-	    else

-		XFreeFontInfo(NULL, font, 1);

-	}

-	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(

-    XOC oc,

-    XlcArgList args,

-    int num_args)

-{

-    if (oc->core.resources == NULL)

-	return NULL;

-

-    return _XlcSetValues((XPointer) oc, oc->core.resources,

-			 oc->core.num_resources, args, num_args, XlcSetMask);

-}

-

-static char *

-get_oc_values(

-    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 Bool

-wcs_to_mbs(

-    XOC oc,

-    char *to,

-    _Xconst 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;

-}

-

-static int

-_XmbDefaultTextEscapement(XOC oc, _Xconst char *text, int length)

-{

-    return XTextWidth(*oc->core.font_info.font_struct_list, text, length);

-}

-

-static int

-_XwcDefaultTextEscapement(XOC oc, _Xconst wchar_t *text, int length)

-{

-    DefineLocalBuf;

-    char *buf = AllocLocalBuf(length);

-    int ret = 0;

-

-    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;

-}

-

-static int

-_XmbDefaultTextExtents(XOC oc, _Xconst char *text, int length,

-		       XRectangle *overall_ink, XRectangle *overall_logical)

-{

-    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;

-}

-

-static int

-_XwcDefaultTextExtents(XOC oc, _Xconst wchar_t *text, int length,

-		       XRectangle *overall_ink, XRectangle *overall_logical)

-{

-    DefineLocalBuf;

-    char *buf = AllocLocalBuf(length);

-    int ret = 0;

-

-    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;

-}

-

-static Status

-_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)

-{

-    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;

-}

-

-static Status

-_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)

-{

-    DefineLocalBuf;

-    char *buf = AllocLocalBuf(length);

-    Status ret = 0;

-

-    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;

-}

-

-static int

-_XmbDefaultDrawString(Display *dpy, Drawable d, XOC oc, GC gc, int x, int y,

-		      _Xconst char *text, int length)

-{

-    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);

-}

-

-static int

-_XwcDefaultDrawString(Display *dpy, Drawable d, XOC oc, GC gc, int x, int y,

-		      _Xconst wchar_t *text, int length)

-{

-    DefineLocalBuf;

-    char *buf = AllocLocalBuf(length);

-    int ret = 0;

-

-    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;

-}

-

-static void

-_XmbDefaultDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, int x,

-			   int y, _Xconst char *text, int length)

-{

-    XSetFont(dpy, gc, (*oc->core.font_info.font_struct_list)->fid);

-    XDrawImageString(dpy, d, gc, x, y, text, length);

-}

-

-static void

-_XwcDefaultDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, int x,

-			   int y, _Xconst wchar_t *text, int length)

-{

-    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);

-}

-

-static _Xconst XOCMethodsRec oc_default_methods = {

-    destroy_oc,

-    set_oc_values,

-    get_oc_values,

-    _XmbDefaultTextEscapement,

-    _XmbDefaultTextExtents,

-    _XmbDefaultTextPerCharExtents,

-    _XmbDefaultDrawString,

-    _XmbDefaultDrawImageString,

-    _XwcDefaultTextEscapement,

-    _XwcDefaultTextExtents,

-    _XwcDefaultTextPerCharExtents,

-    _XwcDefaultDrawString,

-    _XwcDefaultDrawImageString

-};

-

-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), 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(

-    XOM om,

-    XlcArgList args,

-    int num_args)

-{

-    XOC oc;

-

-    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 = (XOCMethods)&oc_default_methods;

-

-    return oc;

-

-err:

-    destroy_oc(oc);

-

-    return (XOC) NULL;

-}

-

-static Status

-close_om(

-    XOM om)

-{

-    XOMGenericPart *gen = XOM_GENERIC(om);

-    OMData data;

-    FontData font_data;

-    int count;

-

-    if ((data = gen->data)) {

-	if (data->font_data) {

-	  for (font_data = data->font_data, count = data->font_data_count;

-	       count-- > 0 ; font_data++) {

-	    if (font_data->name)

-		Xfree(font_data->name);

-	  }

-	  Xfree(data->font_data);

-	}

-	Xfree(gen->data);

-    }

-

-    if (om->core.res_name)

-	Xfree(om->core.res_name);

-    if (om->core.res_class)

-	Xfree(om->core.res_class);

-    if (om->core.required_charset.charset_list)

-	XFreeStringList(om->core.required_charset.charset_list);

-    else

-	Xfree((char*)om->core.required_charset.charset_list);

-    if (om->core.orientation_list.orientation)

-	Xfree(om->core.orientation_list.orientation);

-

-    Xfree(om);

-

-    return 1;

-}

-

-static char *

-set_om_values(

-    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(

-    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 _Xconst 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 OMData

-add_data(

-    XOM om)

-{

-    XOMGenericPart *gen = XOM_GENERIC(om);

-    OMData new;

-

-    new = (OMData) Xmalloc(sizeof(OMDataRec));

-

-    if (new == NULL)

-        return NULL;

-

-    gen->data = new;

-

-    bzero((char *) new, sizeof(OMDataRec));

-

-    return new;

-}

-

-static _Xconst char *supported_charset_list[] = {

-    "ISO8859-1",

-/* fix for bug4332979 */

-    "adobe-fontspecific",

-/* fix for bug4237353: "JISX0201.1976-0" entry should be removed from

-   supported_charset_list because it is not a supported_charset for C locale

-    "JISX0201.1976-0", */

-    "SUNOLCURSOR-1",

-    "SUNOLGLYPH-1"

-};

-

-static Bool

-init_om(

-    XOM om)

-{

-    XOMGenericPart *gen = XOM_GENERIC(om);

-    OMData data;

-    FontData font_data;

-    char **required_list;

-    XOrientation *orientation;

-    char **value, buf[BUFSIZ], *bufptr;

-    int count, length = 0;

-

-    value = (char**)supported_charset_list;

-    count = XlcNumber(supported_charset_list);

-

-    data = add_data(om);

-    if (data == NULL)

-	return False;

-

-    font_data = (FontData) Xmalloc(sizeof(FontDataRec) * count);

-    if (font_data == NULL)

-	return False;

-    bzero((char *) font_data, sizeof(FontDataRec) * count);

-    data->font_data = font_data;

-    data->font_data_count = count;

-

-    for ( ; count-- > 0; font_data++) {

-/*

-1266793

-This one is fine.  *value points to one of the local strings in

-supported_charset_list[].

-*/

-	strcpy(buf, *value++);

-	font_data->name = (char *) Xmalloc(strlen(buf) + 1);

-	if (font_data->name == NULL)

-	    return False;

-	strcpy(font_data->name, buf);

-    }

-

-    length += strlen(data->font_data->name) + 1;

-

-    /* required charset list */

-    required_list = (char **) Xmalloc(sizeof(char *));

-    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 = 1; /* always 1 */

-

-    data = gen->data;

-

-    strcpy(bufptr, data->font_data->name);

-    *required_list++ = bufptr;

-    bufptr += strlen(bufptr) + 1;

-

-    /* orientation list */

-    orientation = (XOrientation *) Xmalloc(sizeof(XOrientation));

-    if (orientation == NULL)

-	return False;

-

-    *orientation = XOMOrientation_LTR_TTB;

-    om->core.orientation_list.orientation = orientation;

-    om->core.orientation_list.num_orientation = 1;

-

-    /* 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

-_XDefaultOpenOM(XLCd lcd, Display *dpy, XrmDatabase rdb,

-		_Xconst char *res_name, _Xconst char *res_class)

-{

-    XOM om;

-

-    om = (XOM) Xmalloc(sizeof(XOMGenericRec));

-    if (om == NULL)

-	return (XOM) NULL;

-    bzero((char *) om, sizeof(XOMGenericRec));

-

-    om->methods = (XOMMethods)&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);

-

-    if (init_om(om) == False)

-	goto err;

-

-    return om;

-err:

-    close_om(om);

-

-    return (XOM) NULL;

-}

+/*
+Copyright 1985, 1986, 1987, 1991, 1998  The Open Group
+
+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
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
+EVEN IF ADVISED IN ADVANCE OF THE POSSIBILITY OF SUCH DAMAGES.
+
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+
+X Window System is a trademark of The Open Group
+
+OSF/1, OSF/Motif and Motif are registered trademarks, and OSF, the OSF
+logo, LBX, X Window System, and Xinerama are trademarks of the Open
+Group. All other trademarks and registered trademarks mentioned herein
+are the property of their respective owners. No right, title or
+interest in or to any trademark, service mark, logo or trade name of
+Sun Microsystems, Inc. or its licensors is granted.
+
+*/
+/*
+ * Copyright 2000 Oracle and/or its affiliates. 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 (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "Xlibint.h"
+#include "Xlcint.h"
+#include "XlcPublic.h"
+#include <X11/Xos.h>
+#include <X11/Xatom.h>
+#include <stdio.h>
+#include <stdint.h>
+
+#define MAXFONTS		100
+
+#define XOM_GENERIC(om)		(&((XOMGeneric) om)->gen)
+#define XOC_GENERIC(font_set)	(&((XOCGeneric) font_set)->gen)
+
+#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)
+
+typedef struct _FontDataRec {
+    char *name;
+} FontDataRec, *FontData;
+
+typedef struct _OMDataRec {
+    int font_data_count;
+    FontData font_data;
+} OMDataRec, *OMData;
+
+typedef struct _XOMGenericPart {
+    OMData data;
+} XOMGenericPart;
+
+typedef struct _XOMGenericRec {
+    XOMMethods methods;
+    XOMCoreRec core;
+    XOMGenericPart gen;
+} XOMGenericRec, *XOMGeneric;
+
+typedef struct _FontSetRec {
+    int id;
+    int font_data_count;
+    FontData font_data;
+    char *font_name;
+    XFontStruct *info;
+    XFontStruct *font;
+} FontSetRec, *FontSet;
+
+typedef struct _XOCGenericPart {
+    XlcConv wcs_to_cs;
+    FontSet font_set;
+} XOCGenericPart;
+
+typedef struct _XOCGenericRec {
+    XOCMethods methods;
+    XOCCoreRec core;
+    XOCGenericPart gen;
+} XOCGenericRec, *XOCGeneric;
+
+static Bool
+init_fontset(
+    XOC oc)
+{
+    XOCGenericPart *gen;
+    FontSet font_set;
+    OMData data;
+
+    data = XOM_GENERIC(oc->core.om)->data;
+
+    font_set = (FontSet) Xmalloc(sizeof(FontSetRec));
+    if (font_set == NULL)
+	return False;
+    bzero((char *) font_set, sizeof(FontSetRec));
+
+    gen = XOC_GENERIC(oc);
+    gen->font_set = font_set;
+
+    font_set->font_data_count = data->font_data_count;
+    font_set->font_data = data->font_data;
+
+    return True;
+}
+
+static char *
+get_prop_name(
+    Display *dpy,
+    XFontStruct	*fs)
+{
+    unsigned long fp;
+
+    if (XGetFontProperty(fs, XA_FONT, &fp))
+	return XGetAtomName(dpy, fp);
+
+    return (char *) NULL;
+}
+
+static FontData
+check_charset(
+    FontSet font_set,
+    char *font_name)
+{
+    FontData font_data;
+    char *last;
+    int count;
+    ssize_t length, name_len;
+
+    name_len = strlen(font_name);
+    last = font_name + name_len;
+
+    count = font_set->font_data_count;
+    font_data = font_set->font_data;
+
+    for ( ; count-- > 0; font_data++) {
+	length = strlen(font_data->name);
+
+	if (length > name_len)
+	    return(NULL);
+
+	if (_XlcCompareISOLatin1(last - length, font_data->name) == 0)
+	    return font_data;
+    }
+    return (FontData) NULL;
+}
+
+#if 0 /* Unused */
+static int
+check_fontname(
+    XOC oc,
+    char *name)
+{
+    Display *dpy = oc->core.om->core.display;
+    XOCGenericPart *gen = XOC_GENERIC(oc);
+    FontData data;
+    FontSet font_set;
+    XFontStruct *fs_list;
+    char **fn_list, *fname, *prop_fname = NULL;
+    int list_num, i;
+    int list2_num;
+    char **fn2_list = NULL;
+    int found_num = 0;
+
+    fn_list = XListFonts(dpy, name, MAXFONTS, &list_num);
+    if (fn_list == NULL)
+	return found_num;
+
+    for (i = 0; i < list_num; i++) {
+	fname = fn_list[i];
+
+	font_set = gen->font_set;
+
+	if ((data = check_charset(font_set, fname)) == NULL) {
+	    if ((fn2_list = XListFontsWithInfo(dpy, name, MAXFONTS,
+					       &list2_num, &fs_list))
+		&& (prop_fname = get_prop_name(dpy, fs_list))
+		&& (data = check_charset(font_set, prop_fname)))
+		fname = prop_fname;
+	}
+	if (data) {
+	    font_set->font_name = (char *) Xmalloc(strlen(fname) + 1);
+	    if (font_set->font_name) {
+		strcpy(font_set->font_name, fname);
+		found_num++;
+	    }
+	}
+	if (fn2_list) {
+	    XFreeFontInfo(fn2_list, fs_list, list2_num);
+	    fn2_list = NULL;
+	    if (prop_fname) {
+		Xfree(prop_fname);
+		prop_fname = NULL;
+	    }
+	}
+	if (found_num == 1)
+	    break;
+    }
+    XFreeFontNames(fn_list);
+    return found_num;
+}
+#endif
+
+static Bool
+load_font(
+    XOC oc)
+{
+    Display *dpy = oc->core.om->core.display;
+    XOCGenericPart *gen = XOC_GENERIC(oc);
+    FontSet font_set = gen->font_set;
+
+    if (font_set->font_name == NULL)
+	return False;
+
+    if (font_set->font == NULL) {
+	font_set->font = XLoadQueryFont(dpy, font_set->font_name);
+	if (font_set->font == NULL)
+	    return False;
+    }
+    return True;
+}
+
+#if 0
+static Bool
+load_font_info(
+    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;
+
+    if (font_set->font_name == NULL)
+	return False;
+
+    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;
+	if (fn_num > 0)
+	    font_set->info->fid = XLoadFont(dpy, font_set->font_name);
+
+	if (fn_list) XFreeFontNames(fn_list);
+    }
+    return True;
+}
+#endif
+
+static void
+set_fontset_extents(
+    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;
+
+    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;
+
+    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(
+    XOC oc)
+{
+    XOCGenericPart *gen = XOC_GENERIC(oc);
+    FontSet font_set;
+    XFontStruct **font_struct_list;
+    char **font_name_list, *font_name_buf;
+    int	count, length;
+
+    font_set = gen->font_set;
+    count = length = 0;
+
+    if (font_set->font_name != NULL) {
+	length += strlen(font_set->font_name) + 1;
+	count++;
+    }
+    if (count == 0)
+        return False;
+
+    font_struct_list = (XFontStruct **) Xmalloc(sizeof(XFontStruct *));
+    if (font_struct_list == NULL)
+	return False;
+
+    font_name_list = (char **) Xmalloc(sizeof(char *));
+    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 = 1;
+    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;
+
+    if (font_set->font_name != NULL) {
+	font_set->id = 1;
+	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(
+    XOC oc,
+    char *pattern)
+{
+    char **list, *name;
+    int count;
+    XFontStruct *fs;
+    Display *dpy = oc->core.om->core.display;
+
+    list = XListFonts(dpy, pattern, 1, &count);
+    if (list != NULL) {
+	name = (char *) Xmalloc(strlen(*list) + 1);
+	if (name)
+	    strcpy(name, *list);
+
+	XFreeFontNames(list);
+    } else {
+	fs = XLoadQueryFont(dpy, pattern);
+	if (fs == NULL) return NULL;
+
+	name = get_prop_name(dpy, fs);
+	XFreeFont(dpy, fs);
+    }
+    return name;
+}
+
+static int
+parse_fontname(
+    XOC oc)
+{
+    XOCGenericPart *gen = XOC_GENERIC(oc);
+    FontSet font_set;
+    FontData font_data;
+    char *pattern, *last, buf[BUFSIZ];
+    int font_data_count, found_num = 0;
+    ssize_t length;
+    int count, num_fields;
+    char *base_name, *font_name, **name_list, **cur_name_list;
+    char *charset_p = NULL;
+    Bool append_charset;
+    /*
+       append_charset flag should be set to True when the XLFD fontname
+       doesn't contain a chaset part.
+     */
+
+    name_list = _XParseBaseFontNameList(oc->core.base_name_list, &count);
+    if (name_list == NULL)
+	return -1;
+    cur_name_list = name_list;
+
+    while (count-- > 0) {
+        pattern = *cur_name_list++;
+	if (pattern == NULL || *pattern == '\0')
+	    continue;
+
+	append_charset = False;
+
+	if (strchr(pattern, '*') == NULL &&
+	    (font_name = get_font_name(oc, pattern))) {
+
+	    font_set = gen->font_set;
+
+	    font_data = check_charset(font_set, font_name);
+	    if (font_data == NULL) {
+		Display *dpy = oc->core.om->core.display;
+		char **fn_list = NULL, *prop_fname = NULL;
+		int list_num;
+		XFontStruct *fs_list;
+		if ((fn_list = XListFontsWithInfo(dpy, font_name,
+						  MAXFONTS,
+						  &list_num, &fs_list))
+		    && (prop_fname = get_prop_name(dpy, fs_list))
+		    && (font_data = check_charset(font_set, prop_fname))) {
+		    if (fn_list) {
+			XFreeFontInfo(fn_list, fs_list, list_num);
+			fn_list = NULL;
+		    }
+		    font_name = prop_fname;
+		}
+	    }
+	    if (font_data == NULL)
+		continue;
+
+	    font_set->font_name = (char *) Xmalloc(strlen(font_name) + 1);
+	    if (font_set->font_name == NULL) {
+		Xfree(font_name);
+		goto err;
+	    }
+	    strcpy(font_set->font_name, font_name);
+	    Xfree(font_name);
+	    found_num++;
+	    goto found;
+	}
+/*
+1266793
+Limit the length of the string copy to prevent stack corruption.
+	strcpy(buf, pattern);
+*/
+	strncpy(buf, pattern, BUFSIZ);
+	buf[BUFSIZ-1] = '\0';
+	length = strlen(buf);
+	last = buf + length - 1;
+
+	for (num_fields = 0, base_name = buf; *base_name != '\0'; base_name++)
+	    if (*base_name == '-') num_fields++;
+	if (strchr(pattern, '*') == NULL) {
+	    if (num_fields == 12) {
+		append_charset = True;
+		*++last = '-';
+		last++;
+	    } else
+		continue;
+	} else {
+	    if (num_fields == 13 || num_fields == 14) {
+	    /*
+	     * There are 14 fields in an XLFD name -- make certain the
+	     * charset (& encoding) is placed in the correct field.
+	     */
+		append_charset = True;
+		last = strrchr (buf, '-');
+		if (num_fields == 14) {
+		    *last = '\0';
+		    last = strrchr (buf, '-');
+		}
+		last++;
+	    } else if (*last == '*') {
+		append_charset = True;
+		if (length > 3 && *(last-3) == '-' && *(last-2) == '*'
+		    && *(last-1) == '-') {
+		    last -= 2;
+		}
+		*++last = '-';
+		last++;
+	    } else {
+		last = strrchr (buf, '-');
+		charset_p = last;
+		charset_p = strrchr (buf, '-');
+		while (*(--charset_p) != '-');
+		charset_p++;
+	    }
+	}
+
+	font_set = gen->font_set;
+
+	font_data = font_set->font_data;
+	font_data_count = font_set->font_data_count;
+	for ( ; font_data_count-- > 0; font_data++) {
+	    if (append_charset)
+		{
+/*
+1266793
+Limit the length of the string copy to prevent stack corruption.
+		strcpy(last, font_data->name);
+*/
+		strncpy(last, font_data->name, BUFSIZ - length);
+		buf[BUFSIZ-1] = '\0';
+		}
+	    else {
+		if (_XlcCompareISOLatin1(charset_p,
+					 font_data->name)) {
+		    continue;
+		}
+	    }
+	    if ((font_set->font_name = get_font_name(oc, buf)))
+		break;
+	}
+	if (font_set->font_name != NULL) {
+	    found_num++;
+	    goto found;
+	}
+    }
+  found:
+    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);
+
+    return -1;
+}
+
+static Bool
+set_missing_list(
+    XOC oc)
+{
+    XOCGenericPart *gen = XOC_GENERIC(oc);
+    FontSet font_set;
+    char **charset_list, *charset_buf;
+    int	count, length;
+
+    font_set = gen->font_set;
+    count = length = 0;
+
+    if (!font_set->info && !font_set->font) {
+	length += strlen(font_set->font_data->name) + 1;
+	count++;
+    }
+
+    if (count == 0)
+	return True;
+
+    charset_list = (char **) Xmalloc(sizeof(char *));
+    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;
+
+    font_set = gen->font_set;
+
+    if (!font_set->info && !font_set->font) {
+	strcpy(charset_buf, font_set->font_data->name);
+	*charset_list++ = charset_buf;
+	charset_buf += strlen(charset_buf) + 1;
+    }
+    return True;
+}
+
+static Bool
+create_fontset(
+    XOC oc)
+{
+    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 (load_font(oc) == False)
+	return False;
+
+    if (init_core_part(oc) == False)
+	return False;
+
+    if (set_missing_list(oc) == False)
+	return False;
+
+    return True;
+}
+
+static void
+destroy_oc(
+    XOC oc)
+{
+    Display *dpy = oc->core.om->core.display;
+    XOCGenericPart *gen = XOC_GENERIC(oc);
+    XFontStruct **font_list, *font;
+
+    if (gen->font_set)
+	Xfree(gen->font_set);
+
+    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)) {
+	if ((font = *font_list)) {
+	    if (font->fid)
+		XFreeFont(dpy, font);
+	    else
+		XFreeFontInfo(NULL, font, 1);
+	}
+	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(
+    XOC oc,
+    XlcArgList args,
+    int num_args)
+{
+    if (oc->core.resources == NULL)
+	return NULL;
+
+    return _XlcSetValues((XPointer) oc, oc->core.resources,
+			 oc->core.num_resources, args, num_args, XlcSetMask);
+}
+
+static char *
+get_oc_values(
+    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 Bool
+wcs_to_mbs(
+    XOC oc,
+    char *to,
+    _Xconst 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;
+}
+
+static int
+_XmbDefaultTextEscapement(XOC oc, _Xconst char *text, int length)
+{
+    return XTextWidth(*oc->core.font_info.font_struct_list, text, length);
+}
+
+static int
+_XwcDefaultTextEscapement(XOC oc, _Xconst wchar_t *text, int length)
+{
+    DefineLocalBuf;
+    char *buf = AllocLocalBuf(length);
+    int ret = 0;
+
+    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;
+}
+
+static int
+_XmbDefaultTextExtents(XOC oc, _Xconst char *text, int length,
+		       XRectangle *overall_ink, XRectangle *overall_logical)
+{
+    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;
+}
+
+static int
+_XwcDefaultTextExtents(XOC oc, _Xconst wchar_t *text, int length,
+		       XRectangle *overall_ink, XRectangle *overall_logical)
+{
+    DefineLocalBuf;
+    char *buf = AllocLocalBuf(length);
+    int ret = 0;
+
+    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;
+}
+
+static Status
+_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)
+{
+    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;
+}
+
+static Status
+_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)
+{
+    DefineLocalBuf;
+    char *buf = AllocLocalBuf(length);
+    Status ret = 0;
+
+    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;
+}
+
+static int
+_XmbDefaultDrawString(Display *dpy, Drawable d, XOC oc, GC gc, int x, int y,
+		      _Xconst char *text, int length)
+{
+    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);
+}
+
+static int
+_XwcDefaultDrawString(Display *dpy, Drawable d, XOC oc, GC gc, int x, int y,
+		      _Xconst wchar_t *text, int length)
+{
+    DefineLocalBuf;
+    char *buf = AllocLocalBuf(length);
+    int ret = 0;
+
+    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;
+}
+
+static void
+_XmbDefaultDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, int x,
+			   int y, _Xconst char *text, int length)
+{
+    XSetFont(dpy, gc, (*oc->core.font_info.font_struct_list)->fid);
+    XDrawImageString(dpy, d, gc, x, y, text, length);
+}
+
+static void
+_XwcDefaultDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, int x,
+			   int y, _Xconst wchar_t *text, int length)
+{
+    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);
+}
+
+static _Xconst XOCMethodsRec oc_default_methods = {
+    destroy_oc,
+    set_oc_values,
+    get_oc_values,
+    _XmbDefaultTextEscapement,
+    _XmbDefaultTextExtents,
+    _XmbDefaultTextPerCharExtents,
+    _XmbDefaultDrawString,
+    _XmbDefaultDrawImageString,
+    _XwcDefaultTextEscapement,
+    _XwcDefaultTextExtents,
+    _XwcDefaultTextPerCharExtents,
+    _XwcDefaultDrawString,
+    _XwcDefaultDrawImageString
+};
+
+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), 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(
+    XOM om,
+    XlcArgList args,
+    int num_args)
+{
+    XOC oc;
+
+    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 = (XOCMethods)&oc_default_methods;
+
+    return oc;
+
+err:
+    destroy_oc(oc);
+
+    return (XOC) NULL;
+}
+
+static Status
+close_om(
+    XOM om)
+{
+    XOMGenericPart *gen = XOM_GENERIC(om);
+    OMData data;
+    FontData font_data;
+    int count;
+
+    if ((data = gen->data)) {
+	if (data->font_data) {
+	  for (font_data = data->font_data, count = data->font_data_count;
+	       count-- > 0 ; font_data++) {
+	    if (font_data->name)
+		Xfree(font_data->name);
+	  }
+	  Xfree(data->font_data);
+	}
+	Xfree(gen->data);
+    }
+
+    if (om->core.res_name)
+	Xfree(om->core.res_name);
+    if (om->core.res_class)
+	Xfree(om->core.res_class);
+    if (om->core.required_charset.charset_list)
+	XFreeStringList(om->core.required_charset.charset_list);
+    else
+	Xfree((char*)om->core.required_charset.charset_list);
+    if (om->core.orientation_list.orientation)
+	Xfree(om->core.orientation_list.orientation);
+
+    Xfree(om);
+
+    return 1;
+}
+
+static char *
+set_om_values(
+    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(
+    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 _Xconst 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 OMData
+add_data(
+    XOM om)
+{
+    XOMGenericPart *gen = XOM_GENERIC(om);
+    OMData new;
+
+    new = (OMData) Xmalloc(sizeof(OMDataRec));
+
+    if (new == NULL)
+        return NULL;
+
+    gen->data = new;
+
+    bzero((char *) new, sizeof(OMDataRec));
+
+    return new;
+}
+
+static _Xconst char *supported_charset_list[] = {
+    "ISO8859-1",
+/* fix for bug4332979 */
+    "adobe-fontspecific",
+/* fix for bug4237353: "JISX0201.1976-0" entry should be removed from
+   supported_charset_list because it is not a supported_charset for C locale
+    "JISX0201.1976-0", */
+    "SUNOLCURSOR-1",
+    "SUNOLGLYPH-1"
+};
+
+static Bool
+init_om(
+    XOM om)
+{
+    XOMGenericPart *gen = XOM_GENERIC(om);
+    OMData data;
+    FontData font_data;
+    char **required_list;
+    XOrientation *orientation;
+    char **value, buf[BUFSIZ], *bufptr;
+    int count, length = 0;
+
+    value = (char**)supported_charset_list;
+    count = XlcNumber(supported_charset_list);
+
+    data = add_data(om);
+    if (data == NULL)
+	return False;
+
+    font_data = (FontData) Xmalloc(sizeof(FontDataRec) * count);
+    if (font_data == NULL)
+	return False;
+    bzero((char *) font_data, sizeof(FontDataRec) * count);
+    data->font_data = font_data;
+    data->font_data_count = count;
+
+    for ( ; count-- > 0; font_data++) {
+/*
+1266793
+This one is fine.  *value points to one of the local strings in
+supported_charset_list[].
+*/
+	strcpy(buf, *value++);
+	font_data->name = (char *) Xmalloc(strlen(buf) + 1);
+	if (font_data->name == NULL)
+	    return False;
+	strcpy(font_data->name, buf);
+    }
+
+    length += strlen(data->font_data->name) + 1;
+
+    /* required charset list */
+    required_list = (char **) Xmalloc(sizeof(char *));
+    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 = 1; /* always 1 */
+
+    data = gen->data;
+
+    strcpy(bufptr, data->font_data->name);
+    *required_list++ = bufptr;
+    bufptr += strlen(bufptr) + 1;
+
+    /* orientation list */
+    orientation = (XOrientation *) Xmalloc(sizeof(XOrientation));
+    if (orientation == NULL)
+	return False;
+
+    *orientation = XOMOrientation_LTR_TTB;
+    om->core.orientation_list.orientation = orientation;
+    om->core.orientation_list.num_orientation = 1;
+
+    /* 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
+_XDefaultOpenOM(XLCd lcd, Display *dpy, XrmDatabase rdb,
+		_Xconst char *res_name, _Xconst char *res_class)
+{
+    XOM om;
+
+    om = (XOM) Xmalloc(sizeof(XOMGenericRec));
+    if (om == NULL)
+	return (XOM) NULL;
+    bzero((char *) om, sizeof(XOMGenericRec));
+
+    om->methods = (XOMMethods)&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);
+
+    if (init_om(om) == False)
+	goto err;
+
+    return om;
+err:
+    close_om(om);
+
+    return (XOM) NULL;
+}
diff --git a/libX11/src/xlibi18n/lcFile.c b/libX11/src/xlibi18n/lcFile.c
index 4bab0217c..167943d3c 100644
--- a/libX11/src/xlibi18n/lcFile.c
+++ b/libX11/src/xlibi18n/lcFile.c
@@ -685,8 +685,7 @@ _XlcLocaleDirName(char *dir_name, size_t dir_len, char *lc_name)
  		Xfree(name);
  	    continue;
  	}
- 	if ((1 + (target_dir ? strlen (target_dir) : 0) +
- 	     strlen("locale.dir")) < PATH_MAX) {
+ 	if ((1 + strlen (target_dir) + strlen("locale.dir")) < PATH_MAX) {
  	    sprintf(buf, "%s/locale.dir", target_dir);
  	    target_name = resolve_name(name, buf, RtoL);
  	}
@@ -785,8 +784,7 @@ _XlcLocaleLibDirName(char *dir_name, size_t dir_len, char *lc_name)
  		Xfree(name);
  	    continue;
  	}
- 	if ((1 + (target_dir ? strlen (target_dir) : 0) +
- 	     strlen("locale.dir")) < PATH_MAX) {
+ 	if ((1 + strlen (target_dir) + strlen("locale.dir")) < PATH_MAX) {
  	    sprintf(buf, "%s/locale.dir", target_dir);
  	    target_name = resolve_name(name, buf, RtoL);
  	}
diff --git a/libX11/src/xlibi18n/lcGeneric.c b/libX11/src/xlibi18n/lcGeneric.c
index 69ea97db8..688a4cfc4 100644
--- a/libX11/src/xlibi18n/lcGeneric.c
+++ b/libX11/src/xlibi18n/lcGeneric.c
@@ -428,7 +428,7 @@ read_charset_define(
     char name[BUFSIZ];
     XlcCharSet charsetd;
     char **value;
-    int num, new;
+    int num, new = 0;
     XlcSide side = XlcUnknown;
     char *tmp;