massive reduction of unneeded files

1 files changed, 0 insertions, 1087 deletions

diff --git a/nx-X11/lib/Xt/Convert.c b/nx-X11/lib/Xt/Convert.c
deleted file mode 100644
index c3bb3c63a..000000000
--- a/nx-X11/lib/Xt/Convert.c
+++ /dev/null
@@ -1,1087 +0,0 @@
-/* $Xorg: Convert.c,v 1.5 2001/02/09 02:03:54 xorgcvs Exp $ */
-
-/***********************************************************
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts
-Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the names of Digital or Sun not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO  THIS  SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FIT-
-NESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SUN BE  LI-
-ABLE  FOR  ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,  DATA  OR
-PROFITS,  WHETHER  IN  AN  ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xt/Convert.c,v 3.7 2001/12/14 19:56:09 dawes Exp $ */
-
-/*
-
-Copyright 1987, 1988, 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	"IntrinsicI.h"
-#include	"StringDefs.h"
-#include	"Intrinsic.h"
-
-/* Conversion procedure hash table */
-
-#define CONVERTHASHSIZE	((unsigned)256)
-#define CONVERTHASHMASK	255
-#define ProcHash(from_type, to_type) (2 * (from_type) + to_type)
-
-typedef struct _ConverterRec *ConverterPtr;
-typedef struct _ConverterRec {
-    ConverterPtr	next;
-    XrmRepresentation	from, to;
-    XtTypeConverter	converter;
-    XtDestructor	destructor;
-    unsigned short	num_args;
-    unsigned int	do_ref_count:1;
-    unsigned int	new_style:1;
-    unsigned int	global:1;
-    char		cache_type;
-} ConverterRec;
-
-#define ConvertArgs(p) ((XtConvertArgList)((p)+1))
-
-/* used for old-style type converter cache only */
-static Heap globalHeap = {NULL, NULL, 0};
-
-void _XtSetDefaultConverterTable(
-	ConverterTable *table)
-{
-    register ConverterTable globalConverterTable;
-
-    LOCK_PROCESS;
-    globalConverterTable = _XtGetProcessContext()->globalConverterTable;
-
-    *table = (ConverterTable)
-	__XtCalloc(CONVERTHASHSIZE, (unsigned)sizeof(ConverterPtr));
-    _XtAddDefaultConverters(*table);
-
-    if (globalConverterTable) {
-	ConverterPtr rec;
-	int i;
-	XtCacheType cache_type;
-	for (i = CONVERTHASHSIZE; --i >= 0; ) {
-	    for (rec = *globalConverterTable++; rec; rec = rec->next) {
-		cache_type = rec->cache_type;
-		if (rec->do_ref_count)
-		    cache_type |= XtCacheRefCount;
-	       _XtTableAddConverter(*table, rec->from, rec->to, rec->converter,
-				    ConvertArgs(rec), rec->num_args,
-				    rec->new_style, cache_type,
-				    rec->destructor, True);
-	    }
-  	}
-    }
-    UNLOCK_PROCESS;
-}
-
-void _XtFreeConverterTable(
-	ConverterTable table)
-{
-	register Cardinal i;
-	register ConverterPtr p;
-
-	for (i = 0; i < CONVERTHASHSIZE; i++) {
-	    for (p = table[i]; p; ) {
-		register ConverterPtr next = p->next;
-		XtFree((char*)p);
-		p = next;
-	    }
-	}
-	XtFree((char*)table);
-}
-
-/* Data cache hash table */
-
-typedef struct _CacheRec *CachePtr;
-
-typedef struct _CacheRec {
-    CachePtr	next;
-    XtPointer	tag;
-    int		hash;
-    XtTypeConverter converter;
-    unsigned short num_args;
-    unsigned int conversion_succeeded:1;
-    unsigned int has_ext:1;
-    unsigned int is_refcounted:1;
-    unsigned int must_be_freed:1;
-    unsigned int from_is_value:1;
-    unsigned int to_is_value:1;
-    XrmValue	from;
-    XrmValue	to;
-} CacheRec;
-
-typedef struct _CacheRecExt {
-    CachePtr	*prev;
-    XtDestructor destructor;
-    XtPointer	 closure;
-    long	 ref_count;
-} CacheRecExt;
-
-#define CEXT(p) ((CacheRecExt *)((p)+1))
-#define CARGS(p) ((p)->has_ext ? (XrmValue *)(CEXT(p)+1) : (XrmValue *)((p)+1))
-
-#define CACHEHASHSIZE	256
-#define CACHEHASHMASK	255
-typedef CachePtr CacheHashTable[CACHEHASHSIZE];
-
-static CacheHashTable	cacheHashTable;
-
-void _XtTableAddConverter(
-    ConverterTable	table,
-    XrmRepresentation   from_type,
-    XrmRepresentation   to_type,
-    XtTypeConverter	converter,
-    XtConvertArgList    convert_args,
-    Cardinal		num_args,
-    _XtBoolean		new_style,
-    XtCacheType		cache_type,
-    XtDestructor	destructor,
-    _XtBoolean		global)
-{
-    register ConverterPtr	*pp;
-    register ConverterPtr	p;
-    XtConvertArgList args;
-
-    pp= &table[ProcHash(from_type, to_type) & CONVERTHASHMASK];
-    while ((p = *pp) && (p->from != from_type || p->to != to_type))
-	pp = &p->next;
-
-    if (p) {
-	*pp = p->next;
-	XtFree((char *)p);
-    }
-
-    p = (ConverterPtr) __XtMalloc(sizeof(ConverterRec) +
-				sizeof(XtConvertArgRec) * num_args);
-    p->next	    = *pp;
-    *pp = p;
-    p->from	    = from_type;
-    p->to	    = to_type;
-    p->converter    = converter;
-    p->destructor   = destructor;
-    p->num_args     = num_args;
-    p->global       = global;
-    args = ConvertArgs(p);
-    while (num_args--)
-	*args++ = *convert_args++;
-    p->new_style    = new_style;
-    p->do_ref_count = False;
-    if (destructor || (cache_type & 0xff)) {
-	p->cache_type = cache_type & 0xff;
-	if (cache_type & XtCacheRefCount)
-	    p->do_ref_count = True;
-    } else {
-	p->cache_type = XtCacheNone;
-    }
-}
-
-void XtSetTypeConverter(
-    register _Xconst char* from_type,
-    register _Xconst char* to_type,
-    XtTypeConverter	converter,
-    XtConvertArgList    convert_args,
-    Cardinal		num_args,
-    XtCacheType		cache_type,
-    XtDestructor	destructor
-    )
-{
-    ProcessContext process;
-    XtAppContext app;
-    XrmRepresentation from;
-    XrmRepresentation to;
-
-    LOCK_PROCESS;
-    process = _XtGetProcessContext();
-    app = process->appContextList;
-    from = XrmStringToRepresentation(from_type);
-    to = XrmStringToRepresentation(to_type);
-
-    if (!process->globalConverterTable) {
-	process->globalConverterTable = (ConverterTable)
-	    __XtCalloc(CONVERTHASHSIZE, (unsigned)sizeof(ConverterPtr));
-    }
-    _XtTableAddConverter(process->globalConverterTable, from, to,
-			 converter, convert_args,
-			 num_args, True, cache_type, destructor, True);
-    while (app) {
-	_XtTableAddConverter(app->converterTable, from, to,
-			     converter, convert_args,
-			     num_args, True, cache_type, destructor, True);
-	app = app->next;
-    }
-    UNLOCK_PROCESS;
-}
-
-void XtAppSetTypeConverter(
-    XtAppContext	app,
-    register _Xconst char* from_type,
-    register _Xconst char* to_type,
-    XtTypeConverter	converter,
-    XtConvertArgList    convert_args,
-    Cardinal		num_args,
-    XtCacheType		cache_type,
-    XtDestructor	destructor
-    )
-{
-    LOCK_PROCESS;
-    _XtTableAddConverter(app->converterTable,
-	XrmStringToRepresentation(from_type),
-        XrmStringToRepresentation(to_type),
-	converter, convert_args, num_args,
-	True, cache_type, destructor, False);
-    UNLOCK_PROCESS;
-}
-
-/* old interface */
-void XtAddConverter(
-    register _Xconst char* from_type,
-    register _Xconst char* to_type,
-    XtConverter		converter,
-    XtConvertArgList    convert_args,
-    Cardinal		num_args
-    )
-{
-    ProcessContext process;
-    XtAppContext app;
-    XrmRepresentation from;
-    XrmRepresentation to;
-
-    LOCK_PROCESS;
-    process = _XtGetProcessContext();
-    app = process->appContextList;
-    from = XrmStringToRepresentation(from_type);
-    to = XrmStringToRepresentation(to_type);
-
-    if (!process->globalConverterTable) {
-	process->globalConverterTable = (ConverterTable)
-	    __XtCalloc(CONVERTHASHSIZE, (unsigned)sizeof(ConverterPtr));
-    }
-    _XtTableAddConverter(process->globalConverterTable, from, to,
-			 (XtTypeConverter)converter, convert_args, num_args,
-			 False, XtCacheAll, (XtDestructor)NULL, True);
-    while (app) {
-	_XtTableAddConverter(app->converterTable, from, to,
-			     (XtTypeConverter)converter, convert_args,
-			     num_args, False, XtCacheAll, (XtDestructor)NULL,
-			     True);
-	app = app->next;
-    }
-    UNLOCK_PROCESS;
-}
-
-/* old interface */
-void XtAppAddConverter(
-    XtAppContext	app,
-    register _Xconst char* from_type,
-    register _Xconst char* to_type,
-    XtConverter		converter,
-    XtConvertArgList    convert_args,
-    Cardinal		num_args
-    )
-{
-    LOCK_PROCESS;
-    _XtTableAddConverter(app->converterTable,
-	XrmStringToRepresentation(from_type),
-        XrmStringToRepresentation(to_type),
-	(XtTypeConverter)converter, convert_args, num_args,
-	False, XtCacheAll, (XtDestructor)NULL, False);
-    UNLOCK_PROCESS;
-}
-
-static CachePtr
-CacheEnter(
-    Heap*		    heap,
-    register XtTypeConverter converter,
-    register XrmValuePtr    args,
-    Cardinal		    num_args,
-    XrmValuePtr		    from,
-    XrmValuePtr		    to,
-    Boolean		    succeeded,
-    register int	    hash,
-    Boolean		    do_ref,
-    Boolean		    do_free,
-    XtDestructor	    destructor,
-    XtPointer		    closure)
-{
-    register	CachePtr *pHashEntry;
-    register	CachePtr p;
-    register    Cardinal i;
-
-    LOCK_PROCESS;
-    pHashEntry = &cacheHashTable[hash & CACHEHASHMASK];
-
-    if ((succeeded && destructor) || do_ref) {
-	p = (CachePtr) _XtHeapAlloc(heap, (sizeof(CacheRec) +
-					   sizeof(CacheRecExt) +
-					   num_args * sizeof(XrmValue)));
-	CEXT(p)->prev = pHashEntry;
-	CEXT(p)->destructor = succeeded ? destructor : NULL;
-	CEXT(p)->closure = closure;
-	CEXT(p)->ref_count = 1;
-	p->has_ext = True;
-    }
-    else {
-	p = (CachePtr)_XtHeapAlloc(heap, (sizeof(CacheRec) +
-					  num_args * sizeof(XrmValue)));
-	p->has_ext = False;
-    }
-    if (!to->addr)
-	succeeded = False;
-    p->conversion_succeeded = succeeded;
-    p->is_refcounted = do_ref;
-    p->must_be_freed = do_free;
-    p->next	    = *pHashEntry;
-    if (p->next && p->next->has_ext)
-	CEXT(p->next)->prev = &p->next;
-
-    *pHashEntry     = p;
-    p->tag	    = (XtPointer)heap;
-    p->hash	    = hash;
-    p->converter    = converter;
-    p->from.size    = from->size;
-    if (from->size <= sizeof(p->from.addr)) {
-	p->from_is_value = True;
-	XtMemmove(&p->from.addr, from->addr, from->size);
-    } else {
-	p->from_is_value = False;
-	p->from.addr = (XPointer)_XtHeapAlloc(heap, from->size);
-	(void) memmove((char *)p->from.addr, (char *)from->addr, from->size);
-    }
-    p->num_args = num_args;
-    if (num_args) {
-	XrmValue *pargs = CARGS(p);
-	for (i = 0; i < num_args; i++) {
-	    pargs[i].size = args[i].size;
-	    pargs[i].addr = (XPointer)_XtHeapAlloc(heap, args[i].size);
-	    XtMemmove(pargs[i].addr, args[i].addr, args[i].size);
-	}
-    }
-    p->to.size = to->size;
-    if (!succeeded) {
-	p->to_is_value = False;
-	p->to.addr = NULL;
-    } else if (to->size <= sizeof(p->to.addr)) {
-	p->to_is_value = True;
-	XtMemmove(&p->to.addr, to->addr, to->size);
-    } else {
-	p->to_is_value = False;
-	p->to.addr = (XPointer)_XtHeapAlloc(heap, to->size);
-	(void) memmove((char *)p->to.addr, (char *)to->addr, to->size);
-    }
-    UNLOCK_PROCESS;
-    return p;
-}
-
-static void FreeCacheRec(
-    XtAppContext app,
-    CachePtr p,
-    CachePtr *prev)
-{
-    LOCK_PROCESS;
-    if (p->has_ext) {
-	if (CEXT(p)->destructor) {
-	    Cardinal num_args = p->num_args;
-	    XrmValue *args = NULL;
-	    XrmValue toc;
-	    if (num_args)
-		args = CARGS(p);
-	    toc.size = p->to.size;
-	    if (p->to_is_value)
-		toc.addr = (XPointer)&p->to.addr;
-	    else
-		toc.addr = p->to.addr;
-	    (*CEXT(p)->destructor) (app, &toc, CEXT(p)->closure, args,
-				    &num_args);
-	}
-	*(CEXT(p)->prev) = p->next;
-	if (p->next && p->next->has_ext)
-	    CEXT(p->next)->prev = CEXT(p)->prev;
-    } else {
-	*prev = p->next;
-	if (p->next && p->next->has_ext)
-	    CEXT(p->next)->prev = prev;
-    }
-    if (p->must_be_freed) {
-	register int i;
-	if (!p->from_is_value)
-	    XtFree(p->from.addr);
-	if ((i = p->num_args)) {
-	    XrmValue *pargs = CARGS(p);
-	    while (i--)
-		XtFree(pargs[i].addr);
-	}
-	if (!p->to_is_value)
-	    XtFree(p->to.addr);
-	XtFree((char*)p);
-    }
-    /* else on private heap; will free entire heap later */
-    UNLOCK_PROCESS;
-}
-
-
-void _XtCacheFlushTag(
-    XtAppContext app,
-    XtPointer	tag)
-{
-    int i;
-    register CachePtr *prev;
-    register CachePtr rec;
-
-    LOCK_PROCESS;
-    for (i = CACHEHASHSIZE; --i >= 0;) {
-	prev = &cacheHashTable[i];
-	while ((rec = *prev)) {
-	    if (rec->tag == tag)
-		FreeCacheRec(app, rec, prev);
-	    else
-		prev = &rec->next;
-	}
-    }
-    UNLOCK_PROCESS;
-}
-
-#ifdef DEBUG
-#include	<stdio.h>
-
-void _XtConverterCacheStats(void)
-{
-    register Cardinal i;
-    register CachePtr p;
-    register Cardinal entries;
-
-    LOCK_PROCESS;
-    for (i = 0; i < CACHEHASHSIZE; i++) {
-	p = cacheHashTable[i];
-	if (p) {
-	    for (entries = 0; p; p = p->next) {
-		entries++;
-	    }
-	    (void) fprintf(stdout, "Index: %4d  Entries: %d\n", i, entries);
-	    for (p = cacheHashTable[i]; p; p = p->next) {
-		(void) fprintf(stdout, "    Size: %3d  Refs: %3d  '",
-			       p->from.size,
-			       p->has_ext ? CEXT(p)->ref_count : 0);
-		(void) fprintf(stdout, "'\n");
-	    }
-	    (void) fprintf(stdout, "\n");
-	}
-    }
-    UNLOCK_PROCESS;
-}
-#endif /*DEBUG*/
-
-static Boolean ResourceQuarkToOffset(
-    WidgetClass widget_class,
-    XrmName     name,
-    Cardinal    *offset)
-{
-    register WidgetClass     wc;
-    register Cardinal        i;
-    register XrmResourceList res, *resources;
-
-    for (wc = widget_class; wc; wc = wc->core_class.superclass) {
-	resources = (XrmResourceList*) wc->core_class.resources;
-	for (i = 0; i < wc->core_class.num_resources; i++, resources++) {
-	    res = *resources;
-	    if (res->xrm_name == name) {
-		*offset = -res->xrm_offset - 1;
-		return True;
-	    }
-	} /* for i in resources */
-    } /* for wc in widget classes */
-    (*offset) = 0;
-    return False;
-}
-
-
-static void ComputeArgs(
-    Widget		widget,
-    XtConvertArgList    convert_args,
-    Cardinal		num_args,
-    XrmValuePtr		args)
-{
-    register Cardinal   i;
-    Cardinal		offset;
-    String              params[1];
-    Cardinal		num_params = 1;
-    Widget		ancestor = NULL;
-
-    for (i = 0; i < num_args; i++) {
-	args[i].size = convert_args[i].size;
-	switch (convert_args[i].address_mode) {
-	case XtAddress:
-	    args[i].addr = convert_args[i].address_id;
-	    break;
-
-	case XtBaseOffset:
-	    args[i].addr =
-		(XPointer)((char *)widget + (long)convert_args[i].address_id);
-	    break;
-
-	case XtWidgetBaseOffset:
-	    if (!ancestor) {
-		if (XtIsWidget(widget))
-		    ancestor = widget;
-		else
-		    ancestor = _XtWindowedAncestor(widget);
-	    }
-
-	    args[i].addr =
-		(XPointer)((char *)ancestor + (long)convert_args[i].address_id);
-	    break;
-
-	case XtImmediate:
-	    args[i].addr = (XPointer) &(convert_args[i].address_id);
-	    break;
-
-	case XtProcedureArg:
-	    (*(XtConvertArgProc)convert_args[i].address_id)
-		(widget, &convert_args[i].size, &args[i]);
-	    break;
-
-	case XtResourceString:
-	    /* Convert in place for next usage */
-	    convert_args[i].address_mode = XtResourceQuark;
-	    convert_args[i].address_id =
-	       (XtPointer)(long)XrmStringToQuark((String)convert_args[i].address_id);
-	    /* Fall through */
-
-	case XtResourceQuark:
-	    if (! ResourceQuarkToOffset(widget->core.widget_class,
-		    (XrmQuark)(long) convert_args[i].address_id, &offset)) {
-		params[0]=
-                  XrmQuarkToString((XrmQuark)(long) convert_args[i].address_id);
-               XtAppWarningMsg(XtWidgetToApplicationContext(widget),
-		    "invalidResourceName","computeArgs",XtCXtToolkitError,
-		    "Cannot find resource name %s as argument to conversion",
-                     params,&num_params);
-		offset = 0;
-	    }
-	    args[i].addr = (XPointer)((char *)widget + offset);
-	    break;
-	default:
-	    params[0] = XtName(widget);
-	    XtAppWarningMsg(XtWidgetToApplicationContext(widget),
-		"invalidAddressMode", "computeArgs", XtCXtToolkitError,
-		"Conversion arguments for widget '%s' contain an unsupported address mode",
-			params,&num_params);
-	    args[i].addr = NULL;
-	    args[i].size = 0;
-	} /* switch */
-    } /* for */
-} /* ComputeArgs */
-
-void XtDirectConvert(
-    XtConverter     converter,
-    XrmValuePtr     args,
-    Cardinal	    num_args,
-    register XrmValuePtr from,
-    XrmValuePtr     to)
-{
-    register CachePtr   p;
-    register int	hash;
-    register Cardinal   i;
-
-    LOCK_PROCESS;
-    /* Try to find cache entry for conversion */
-    hash = ((long) converter >> 2) + from->size + *((char *) from->addr);
-    if (from->size > 1) hash += ((char *) from->addr)[1];
-
-    for (p = cacheHashTable[hash & CACHEHASHMASK]; p; p = p->next) {
-	if ((p->hash == hash)
-	 && (p->converter == (XtTypeConverter)converter)
-	 && (p->from.size == from->size)
-	 && !(p->from_is_value ?
-	      XtMemcmp(&p->from.addr, from->addr, from->size) :
-	      memcmp((char *)p->from.addr, (char *)from->addr, from->size))
-         && (p->num_args == num_args)) {
-	    if ((i = num_args)) {
-		XrmValue *pargs = CARGS(p);
-		/* Are all args the same data ? */
-		while (i) {
-		    i--; /* do not move to while test, broken compilers */
-		    if (pargs[i].size != args[i].size ||
-			XtMemcmp(pargs[i].addr, args[i].addr, args[i].size)) {
-			i++;
-			break;
-		    }
-		}
-	    }
-	    if (!i) {
-		/* Perfect match */
-		to->size = p->to.size;
-		if (p->to_is_value)
-		    to->addr = (XPointer)&p->to.addr;
-		else
-		    to->addr = p->to.addr;
-		UNLOCK_PROCESS;
-		return;
-	    }
-	}
-    }
-
-    /* Didn't find it, call converter procedure and entry result in cache */
-    (*to).size = 0;
-    (*to).addr = NULL;
-    (*converter)(args, &num_args, from, to);
-    /* This memory can never be freed since we don't know the Display
-     * or app context from which to compute the persistance */
-    {
-	CacheEnter(&globalHeap, (XtTypeConverter)converter, args, num_args,
-		   from, to, (to->addr != NULL), hash, False, False,
-		   (XtDestructor)NULL, NULL);
-    }
-    UNLOCK_PROCESS;
-}
-
-
-static ConverterPtr GetConverterEntry(
-    XtAppContext app,
-    XtTypeConverter converter)
-{
-    Cardinal entry;
-    register ConverterPtr cP;
-    ConverterTable converterTable;
-
-    LOCK_PROCESS;
-    converterTable = app->converterTable;
-    cP = NULL;
-    for (entry = 0; (entry < CONVERTHASHSIZE) && !cP; entry++) {
-	cP = converterTable[entry];
-	while (cP && (cP->converter != converter)) cP = cP->next;
-    }
-    UNLOCK_PROCESS;
-    return cP;
-}
-
-
-static Boolean
-CallConverter(
-    Display*	    dpy,
-    XtTypeConverter converter,
-    XrmValuePtr     args,
-    Cardinal	    num_args,
-    register XrmValuePtr from,
-    XrmValuePtr     to,
-    XtCacheRef	    *cache_ref_return,
-    register ConverterPtr cP)
-{
-    CachePtr p;
-    int	hash;
-    Cardinal i;
-    Boolean retval;
-
-    if (!cP || ((cP->cache_type == XtCacheNone) && !cP->destructor)) {
-	XtPointer closure;
-	if (cache_ref_return) *cache_ref_return = NULL;
-	retval = (*(XtTypeConverter)converter)
-	    (dpy, args, &num_args, from, to, &closure);
-	return retval;
-    }
-
-    LOCK_PROCESS;
-    /* Try to find cache entry for conversion */
-    hash = ((long)(converter) >> 2) + from->size + *((char *) from->addr);
-    if (from->size > 1) hash += ((char *) from->addr)[1];
-
-    if (cP->cache_type != XtCacheNone) {
-	for (p = cacheHashTable[hash & CACHEHASHMASK]; p; p = p->next){
-	    if ((p->hash == hash)
-	     && (p->converter == converter)
-	     && (p->from.size == from->size)
-	     && !(p->from_is_value ?
-		  XtMemcmp(&p->from.addr, from->addr, from->size) :
-		  memcmp((char *)p->from.addr, (char *)from->addr, from->size))
-	     && (p->num_args == num_args)) {
-		if ((i = num_args)) {
-		    XrmValue *pargs = CARGS(p);
-		    /* Are all args the same data ? */
-		    while (i) {
-			i--; /* do not move to while test, broken compilers */
-			if (pargs[i].size != args[i].size ||
-			    XtMemcmp(pargs[i].addr, args[i].addr, args[i].size)){
-			    i++;
-			    break;
-			}
-		    }
-		}
-		if (!i) {
-		    /* Perfect match */
-		    if (p->conversion_succeeded) {
-			if (to->addr) {	/* new-style call */
-			    if (to->size < p->to.size) {
-				to->size = p->to.size;
-				UNLOCK_PROCESS;
-				return False;
-			    }
-			    to->size = p->to.size;
-			    if (p->to_is_value) {
-				XtMemmove(to->addr, &p->to.addr,
-					  to->size);
-			    } else {
-				(void) memmove((char *)to->addr,
-					       (char *)p->to.addr, to->size);
-			    }
-			} else {	/* old-style call */
-			    to->size = p->to.size;
-			    if (p->to_is_value)
-				to->addr = (XPointer)&p->to.addr;
-			    else
-				to->addr = p->to.addr;
-			}
-		    }
-		    if (p->is_refcounted) {
-			CEXT(p)->ref_count++;
-			if (cache_ref_return)
-			    *cache_ref_return = (XtCacheRef)p;
-			else
-			    p->is_refcounted = False;
-		    }
-		    else {
-			if (cache_ref_return)
-			    *cache_ref_return = NULL;
-		    }
-		    retval = (p->conversion_succeeded);
-		    UNLOCK_PROCESS;
-		    return retval;
-		}
-	    }
-	}
-    }
-
-    /* No cache entry, call converter procedure and enter result in cache */
-    {
-	Heap *heap;
-	XtPointer closure = NULL;
-	unsigned int supplied_size = to->size;
-	Boolean do_ref = cP->do_ref_count && cache_ref_return;
-	Boolean do_free = False;
-	Boolean retval =
-	    (*(XtTypeConverter)converter)(dpy, args, &num_args, from, to, &closure);
-
-	if (retval == False && supplied_size < to->size) {
-	    /* programmer error: caller must allocate sufficient storage */
-	    if (cache_ref_return)
-		*cache_ref_return = NULL;
-	    UNLOCK_PROCESS;
-	    return False;
-	}
-
-	if ((cP->cache_type == XtCacheNone) || do_ref) {
-	    heap = NULL;
-	    do_free = True;
-	}
-	else if (cP->cache_type == XtCacheByDisplay)
-	    heap = &_XtGetPerDisplay(dpy)->heap;
-	else if (cP->global)
-	    heap = &globalHeap;
-	else
-	    heap = &XtDisplayToApplicationContext(dpy)->heap;
-
-	p = CacheEnter(heap, converter, args, num_args, from, to, retval,
-		       hash, do_ref, do_free, cP->destructor, closure);
-	if (do_ref)
-	    *cache_ref_return = (XtCacheRef)p;
-	else if (cache_ref_return)
-	    *cache_ref_return = NULL;
-	UNLOCK_PROCESS;
-	return retval;
-    }
-}
-
-Boolean
-XtCallConverter(
-    Display*	    dpy,
-    XtTypeConverter converter,
-    XrmValuePtr     args,
-    Cardinal	    num_args,
-    register XrmValuePtr from,
-    XrmValuePtr     to,
-    XtCacheRef	    *cache_ref_return)
-{
-    ConverterPtr cP;
-    Boolean retval;
-    XtAppContext app = XtDisplayToApplicationContext(dpy);
-
-    LOCK_APP(app);
-    if ((cP = GetConverterEntry(app, converter)) == NULL) {
-	XtAppSetTypeConverter(XtDisplayToApplicationContext(dpy),
-			      "_XtUnk1", "_XtUnk2",
-			      converter, NULL, 0,
-			      XtCacheAll, NULL);
-	cP = GetConverterEntry(app, converter);
-    }
-    retval = CallConverter(dpy, converter, args, num_args, from, to,
-			    cache_ref_return, cP);
-    UNLOCK_APP(app);
-    return retval;
-}
-
-Boolean _XtConvert(
-             Widget		widget,
-    register XrmRepresentation	from_type,
-	     XrmValuePtr	from,
-    register XrmRepresentation	to_type,
-    register XrmValuePtr	to,
-    XtCacheRef			*cache_ref_return)
-{
-    XtAppContext	app = XtWidgetToApplicationContext(widget);
-    register ConverterPtr	p;
-    Cardinal		num_args;
-    XrmValue		*args;
-
-    /* Look for type converter */
-    LOCK_PROCESS;
-    p = app->converterTable[ProcHash(from_type, to_type) & CONVERTHASHMASK];
-    for (; p; p = p->next) {
-	if (from_type == p->from && to_type == p->to) {
-	    Boolean retval = False;
-	    /* Compute actual arguments from widget and arg descriptor */
-	    num_args = p->num_args;
-	    if (num_args != 0) {
-		args = (XrmValue*)
-		    ALLOCATE_LOCAL( num_args * sizeof (XrmValue) );
-		if (!args) _XtAllocError("alloca");
-		ComputeArgs(widget, ConvertArgs(p), num_args, args);
-	    } else args = NULL;
-	    if (p->new_style) {
-		retval =
-		    CallConverter(XtDisplayOfObject(widget),
-				     p->converter, args, num_args,
-				     from, to, cache_ref_return, p);
-	    }
-	    else { /* is old-style (non-display) converter */
-		XrmValue tempTo;
-		XtDirectConvert((XtConverter)p->converter, args, num_args,
-				from, &tempTo);
-		if (cache_ref_return)
-		    *cache_ref_return = NULL;
-		if (tempTo.addr) {
-		    if (to->addr) {	/* new-style caller */
-			if (to->size >= tempTo.size) {
-			    if (to_type == _XtQString)
-				*(String*)(to->addr) = tempTo.addr;
-			    else {
-				XtMemmove(to->addr, tempTo.addr,
-					  tempTo.size);
-			    }
-			    retval = True;
-			}
-			to->size = tempTo.size;
-		    } else {		/* old-style caller */
-			*to = tempTo;
-			retval = True;
-		    }
-		}
-	    }
-	    if (args) DEALLOCATE_LOCAL( (XtPointer)args );
-	    UNLOCK_PROCESS;
-	    return retval;
-	}
-    }
-
-    {
-	String params[2];
-	Cardinal num_params = 2;
-	params[0] = XrmRepresentationToString(from_type);
-	params[1] = XrmRepresentationToString(to_type);
-	XtAppWarningMsg(app, "typeConversionError", "noConverter", XtCXtToolkitError,
-	     "No type converter registered for '%s' to '%s' conversion.",
-             params, &num_params);
-    }
-    UNLOCK_PROCESS;
-    return False;
-}
-
-void XtConvert(
-    Widget	widget,
-    _Xconst char* from_type_str,
-    XrmValuePtr	from,
-    _Xconst char* to_type_str,
-    XrmValuePtr	to)
-{
-    XrmQuark    from_type, to_type;
-    WIDGET_TO_APPCON(widget);
-
-    LOCK_APP(app);
-    from_type = XrmStringToRepresentation(from_type_str);
-    to_type = XrmStringToRepresentation(to_type_str);
-    if (from_type != to_type) {
-	/*  It's not safe to ref count these resources, 'cause we
-	    don't know what older clients may have assumed about
-	    the resource lifetimes.
-	XtCacheRef ref;
-	*/
-	to->addr = NULL;
-	to->size = 0;
-	_XtConvert(widget, from_type, from, to_type, to, /*&ref*/ NULL);
-	/*
-	if (ref) {
-	    XtAddCallback( widget, XtNdestroyCallback,
-			   XtCallbackReleaseCacheRef, (XtPointer)ref );
-	}
-	*/
-    }
-    else
-	(*to) = *from;
-    UNLOCK_APP(app);
-}
-
-Boolean XtConvertAndStore(
-    Widget	object,
-    _Xconst char* from_type_str,
-    XrmValuePtr	from,
-    _Xconst char* to_type_str,
-    XrmValuePtr	to)
-{
-    XrmQuark    from_type, to_type;
-    WIDGET_TO_APPCON(object);
-
-    LOCK_APP(app);
-    LOCK_PROCESS;
-    from_type = XrmStringToRepresentation(from_type_str);
-    to_type = XrmStringToRepresentation(to_type_str);
-    if (from_type != to_type) {
-	static XtPointer local_valueP = NULL;
-	static Cardinal local_valueS = 128;
-	XtCacheRef ref;
-	Boolean local = False;
-	do {
-	    if (!to->addr) {
-		if (!local_valueP)
-		    local_valueP = _XtHeapAlloc(&globalHeap, local_valueS);
-		to->addr = local_valueP;
-		to->size = local_valueS;
-		local = True;
-	    }
-	    if (!_XtConvert(object, from_type, from, to_type, to, &ref)) {
-		if (local && (to->size > local_valueS)) {
-		    to->addr =
-			local_valueP = _XtHeapAlloc(&globalHeap, to->size);
-		    local_valueS = to->size;
-		    continue;
-		} else {
-		    if (local) {
-			to->addr = NULL;
-			to->size = 0;
-		    }
-		    UNLOCK_PROCESS;
-		    UNLOCK_APP(app);
-		    return False;
-		}
-	    }
-	    if (ref) {
-		XtAddCallback( object, XtNdestroyCallback,
-			       XtCallbackReleaseCacheRef, (XtPointer)ref );
-	    }
-	    UNLOCK_PROCESS;
-	    UNLOCK_APP(app);
-	    return True;
-	} while (local /* && local_valueS < to->size */);
-    }
-    if (to->addr) {
-	if (to->size < from->size) {
-	    to->size = from->size;
-	    UNLOCK_PROCESS;
-	    UNLOCK_APP(app);
-	    return False;
-	}
-	(void) memmove(to->addr, from->addr, from->size );
-	to->size = from->size;
-    } else			/* from_type == to_type */
-	*to = *from;
-    UNLOCK_PROCESS;
-    UNLOCK_APP(app);
-    return True;
-}
-
-void XtAppReleaseCacheRefs(
-    XtAppContext app,
-    XtCacheRef *refs)
-{
-    register CachePtr *r;
-    register CachePtr p;
-
-    LOCK_APP(app);
-    LOCK_PROCESS;
-    for (r = (CachePtr*)refs; (p = *r); r++) {
-	if (p->is_refcounted && --(CEXT(p)->ref_count) == 0) {
-	    FreeCacheRec(app, p, NULL);
-	}
-    }
-    UNLOCK_PROCESS;
-    UNLOCK_APP(app);
-}
-
-
-/* ARGSUSED */
-void XtCallbackReleaseCacheRefList(
-    Widget widget,		/* unused */
-    XtPointer closure,
-    XtPointer call_data)	/* unused */
-{
-    XtAppReleaseCacheRefs( XtWidgetToApplicationContext(widget),
-			   (XtCacheRef*)closure );
-    XtFree(closure);
-}
-
-
-/* ARGSUSED */
-void XtCallbackReleaseCacheRef(
-    Widget widget,		/* unused */
-    XtPointer closure,
-    XtPointer call_data)	/* unused */
-{
-    XtCacheRef cache_refs[2];
-    cache_refs[0] = (XtCacheRef)closure;
-    cache_refs[1] = NULL;
-    XtAppReleaseCacheRefs( XtWidgetToApplicationContext(widget), cache_refs );
-}