Checked in the following released items:

xkeyboard-config-1.4.tar.gz
ttf-bitstream-vera-1.10.tar.gz
font-alias-1.0.1.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sony-misc-1.0.0.tar.gz
font-schumacher-misc-1.0.0.tar.gz
font-mutt-misc-1.0.0.tar.gz
font-misc-misc-1.0.0.tar.gz
font-misc-meltho-1.0.0.tar.gz
font-micro-misc-1.0.0.tar.gz
font-jis-misc-1.0.0.tar.gz
font-isas-misc-1.0.0.tar.gz
font-dec-misc-1.0.0.tar.gz
font-daewoo-misc-1.0.0.tar.gz
font-cursor-misc-1.0.0.tar.gz
font-arabic-misc-1.0.0.tar.gz
font-winitzki-cyrillic-1.0.0.tar.gz
font-misc-cyrillic-1.0.0.tar.gz
font-cronyx-cyrillic-1.0.0.tar.gz
font-screen-cyrillic-1.0.1.tar.gz
font-xfree86-type1-1.0.1.tar.gz
font-adobe-utopia-type1-1.0.1.tar.gz
font-ibm-type1-1.0.0.tar.gz
font-bitstream-type1-1.0.0.tar.gz
font-bitstream-speedo-1.0.0.tar.gz
font-bh-ttf-1.0.0.tar.gz
font-bh-type1-1.0.0.tar.gz
font-bitstream-100dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz
font-bh-100dpi-1.0.0.tar.gz
font-adobe-utopia-100dpi-1.0.1.tar.gz
font-adobe-100dpi-1.0.0.tar.gz
font-util-1.0.1.tar.gz
font-bitstream-75dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz
font-adobe-utopia-75dpi-1.0.1.tar.gz
font-bh-75dpi-1.0.0.tar.gz
bdftopcf-1.0.1.tar.gz
font-adobe-75dpi-1.0.0.tar.gz
mkfontscale-1.0.6.tar.gz
openssl-0.9.8k.tar.gz
bigreqsproto-1.0.2.tar.gz
xtrans-1.2.2.tar.gz
resourceproto-1.0.2.tar.gz
inputproto-1.4.4.tar.gz
compositeproto-0.4.tar.gz
damageproto-1.1.0.tar.gz
zlib-1.2.3.tar.gz
xkbcomp-1.0.5.tar.gz
freetype-2.3.9.tar.gz
pthreads-w32-2-8-0-release.tar.gz
pixman-0.12.0.tar.gz
kbproto-1.0.3.tar.gz
evieext-1.0.2.tar.gz
fixesproto-4.0.tar.gz
recordproto-1.13.2.tar.gz
randrproto-1.2.2.tar.gz
scrnsaverproto-1.1.0.tar.gz
renderproto-0.9.3.tar.gz
xcmiscproto-1.1.2.tar.gz
fontsproto-2.0.2.tar.gz
xextproto-7.0.3.tar.gz
xproto-7.0.14.tar.gz
libXdmcp-1.0.2.tar.gz
libxkbfile-1.0.5.tar.gz
libfontenc-1.0.4.tar.gz
libXfont-1.3.4.tar.gz
libX11-1.1.5.tar.gz
libXau-1.0.4.tar.gz
libxcb-1.1.tar.gz
xorg-server-1.5.3.tar.gz

1 files changed, 322 insertions, 0 deletions

diff --git a/xkbcomp/xkbpath.c b/xkbcomp/xkbpath.c
new file mode 100644
index 000000000..0a7329c8e
--- /dev/null
+++ b/xkbcomp/xkbpath.c
@@ -0,0 +1,322 @@
+/* $Xorg: xkbpath.c,v 1.3 2000/08/17 19:54:34 cpqbld Exp $ */
+/************************************************************
+ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
+
+ Permission to use, copy, modify, and distribute this
+ software and its documentation for any purpose and without
+ fee is hereby granted, provided that the above copyright
+ notice appear in all copies and that both that copyright
+ notice and this permission notice appear in supporting
+ documentation, and that the name of Silicon Graphics not be 
+ used in advertising or publicity pertaining to distribution 
+ of the software without specific prior written permission.
+ Silicon Graphics makes no representation about the suitability 
+ of this software for any purpose. It is provided "as is"
+ without any express or implied warranty.
+ 
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+ AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
+ THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+ ********************************************************/
+/* $XFree86: xc/programs/xkbcomp/xkbpath.c,v 3.7 2002/06/05 00:00:38 dawes Exp $ */
+
+#include <X11/Xlib.h>
+#include <X11/XKBlib.h>
+
+#define	DEBUG_VAR_NOT_LOCAL
+#define	DEBUG_VAR debugFlags
+#include "utils.h"
+#include <stdlib.h>
+#include <X11/extensions/XKM.h>
+#include "xkbpath.h"
+
+#ifndef DFLT_XKB_CONFIG_ROOT
+#define DFLT_XKB_CONFIG_ROOT	"/usr/lib/X11/xkb"
+#endif
+
+#ifndef PATH_MAX
+#define	PATH_MAX 1024
+#endif
+
+#define	PATH_CHUNK	8
+
+static	Bool	 noDefaultPath = False;
+static	int	 longestPath;
+static	int	 szPath;
+static	int	 nPathEntries;
+static	char **	 includePath;
+
+Bool
+XkbParseIncludeMap(char **str_inout,char **file_rtrn,char **map_rtrn,
+				char *nextop_rtrn, char **extra_data)
+{
+char *tmp,*str,*next;
+
+    str= *str_inout;
+    if ((*str=='+')||(*str=='|')) {
+	*file_rtrn= *map_rtrn= NULL;
+	*nextop_rtrn= *str;
+	next= str+1;
+    }
+    else if (*str=='%') {
+	*file_rtrn= *map_rtrn= NULL;
+	*nextop_rtrn= str[1];
+	next= str+2;
+    }
+    else {
+	next= strpbrk(str,"|+");
+	if (next) {
+	    *nextop_rtrn= *next;
+	    *next++= '\0';
+	}
+	else {
+	    *nextop_rtrn= '\0';
+	    next= NULL;
+	}
+	tmp= strchr(str,':');
+	if (tmp != NULL) {
+	   *tmp++ = '\0';
+	   *extra_data = uStringDup(tmp);
+	}
+	else {
+	   *extra_data = NULL;
+	}
+	tmp= strchr(str,'(');
+	if (tmp==NULL) {
+	    *file_rtrn= uStringDup(str);
+	    *map_rtrn= NULL;
+	}
+	else if (str[0]=='(') {
+	    uFree(*extra_data);
+	    return False;
+	}
+	else {
+	    *tmp++= '\0';
+	    *file_rtrn= uStringDup(str);
+	    str= tmp;
+	    tmp= strchr(str,')');
+	    if ((tmp==NULL)||(tmp[1]!='\0')) {
+		uFree(*file_rtrn);
+		uFree(*extra_data);
+		return False;
+	    }
+	    *tmp++= '\0';
+	    *map_rtrn= uStringDup(str);
+	}
+    }
+    if (*nextop_rtrn=='\0')
+	*str_inout= NULL;
+    else if ((*nextop_rtrn=='|')||(*nextop_rtrn=='+'))
+	*str_inout= next;
+    else return False;
+    return True;
+}
+
+Bool
+XkbInitIncludePath(void)
+{
+    szPath= PATH_CHUNK;
+    includePath=  (char **)calloc(szPath,sizeof(char *));
+    if (includePath==NULL)
+	return False;
+    return True;
+}
+
+void
+XkbAddDefaultDirectoriesToPath(void)
+{
+    if (noDefaultPath)
+	return;
+    XkbAddDirectoryToPath(DFLT_XKB_CONFIG_ROOT);
+}
+
+void
+XkbClearIncludePath(void)
+{
+register int i;
+
+    if (szPath>0) {
+	for (i=0;i<nPathEntries;i++) {
+	    if (includePath[i]!=NULL) {
+		uFree(includePath[i]);
+		includePath[i]= NULL;
+	    }
+	}
+	nPathEntries= 0;
+	longestPath= 0;
+    }
+    noDefaultPath = True;
+    return;
+}
+
+Bool
+XkbAddDirectoryToPath(const char *dir)
+{
+int	len;
+    if ((dir==NULL)||(dir[0]=='\0')) {
+	XkbClearIncludePath();
+	return True;
+    }
+#ifdef __UNIXOS2__
+    dir = (char*)__XOS2RedirRoot(dir);
+#endif
+    len= strlen(dir);
+    if (len+2>=PATH_MAX) { /* allow for '/' and at least one character */
+	ERROR2("Path entry (%s) too long (maxiumum length is %d)\n",
+							dir,PATH_MAX-3);
+	return False;
+    }
+    if (len>longestPath)
+	longestPath= len;
+    if (nPathEntries>=szPath) {
+	szPath+= PATH_CHUNK;
+	includePath= (char **)realloc(includePath,szPath*sizeof(char *));
+	if (includePath==NULL) {
+	    WSGO("Allocation failed (includePath)\n");
+	    return False;
+	}
+    }
+    includePath[nPathEntries]= (char *)calloc(strlen(dir)+1,sizeof(char));
+    if (includePath[nPathEntries]==NULL) {
+	WSGO1("Allocation failed (includePath[%d])\n",nPathEntries);
+	return False;
+    }
+    strcpy(includePath[nPathEntries++],dir);
+    return True;
+}
+
+/***====================================================================***/
+
+char *
+XkbDirectoryForInclude(unsigned type)
+{
+static char buf[32];
+
+    switch (type) {
+	case XkmSemanticsFile:
+	    strcpy(buf,"semantics");
+	    break;
+	case XkmLayoutFile:
+	    strcpy(buf,"layout");
+	    break;
+	case XkmKeymapFile:
+	    strcpy(buf,"keymap");
+	    break;
+	case XkmKeyNamesIndex:
+	    strcpy(buf,"keycodes");
+	    break;
+	case XkmTypesIndex:
+	    strcpy(buf,"types");
+	    break;
+	case XkmSymbolsIndex:
+	    strcpy(buf,"symbols");
+	    break;
+	case XkmCompatMapIndex:
+	    strcpy(buf,"compat");
+	    break;
+	case XkmGeometryFile:
+	case XkmGeometryIndex:
+	    strcpy(buf,"geometry");
+	    break;
+	default:
+	    strcpy(buf,"");
+	    break;
+    }
+    return buf;
+}
+
+/***====================================================================***/
+
+typedef struct _FileCacheEntry {
+	char *				name;
+	unsigned			type;
+	char *				path;
+	void *				data;
+	struct _FileCacheEntry *	next;
+} FileCacheEntry;
+static FileCacheEntry	*fileCache;
+
+void *
+XkbAddFileToCache(char *name,unsigned type,char *path,void *data)
+{
+FileCacheEntry	*entry;
+
+    for (entry=fileCache;entry!=NULL;entry=entry->next) {
+	if ((type==entry->type)&&(uStringEqual(name,entry->name))) {
+	    void *old= entry->data;
+	    WSGO2("Replacing file cache entry (%s/%d)\n",name,type);
+	    entry->path= path;
+	    entry->data= data;
+	    return old;
+	}
+    }
+    entry= uTypedAlloc(FileCacheEntry);
+    if (entry!=NULL) {
+	entry->name= name;
+	entry->type= type;
+	entry->path= path;
+	entry->data= data;
+	entry->next= fileCache;
+	fileCache= entry;
+    }
+    return NULL;
+}
+
+void *
+XkbFindFileInCache(char *name,unsigned type,char **pathRtrn)
+{
+FileCacheEntry	*entry;
+
+    for (entry=fileCache;entry!=NULL;entry=entry->next) {
+	if ((type==entry->type)&&(uStringEqual(name,entry->name))) {
+	   *pathRtrn= entry->path;
+	   return entry->data;
+	}
+    }
+    return NULL;
+}
+
+/***====================================================================***/
+
+FILE *
+XkbFindFileInPath(char *name,unsigned type,char **pathRtrn)
+{
+register int i;
+FILE	*file= NULL;
+int	 nameLen,typeLen,pathLen;
+char	 buf[PATH_MAX],*typeDir;
+
+    typeDir= XkbDirectoryForInclude(type);
+    nameLen= strlen(name);
+    typeLen= strlen(typeDir);
+    for (i=0;i<nPathEntries;i++) {
+	pathLen= strlen(includePath[i]);
+	if (typeLen<1)
+	     continue;
+
+	if ((nameLen+typeLen+pathLen+2)>=PATH_MAX) {
+	    ERROR3("File name (%s/%s/%s) too long\n",includePath[i],typeDir,
+	    							    name);
+	    ACTION("Ignored\n");
+	    continue;
+	}
+	sprintf(buf,"%s/%s/%s",includePath[i],typeDir,name);
+	file= fopen(buf,"r");
+	if (file!=NULL)
+	    break;
+    }
+
+    if ((file!=NULL)&&(pathRtrn!=NULL)) {
+	*pathRtrn= (char *)calloc(strlen(buf)+1,sizeof(char));
+	if (*pathRtrn!=NULL)
+	    strcpy(*pathRtrn,buf);
+    }
+    return file;
+}
+