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, 457 insertions, 0 deletions

diff --git a/libX11/src/xlibi18n/ICWrap.c b/libX11/src/xlibi18n/ICWrap.c
new file mode 100644
index 000000000..b51da6f41
--- /dev/null
+++ b/libX11/src/xlibi18n/ICWrap.c
@@ -0,0 +1,457 @@
+/*
+ * $Xorg: ICWrap.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $
+ */
+
+/*
+ * Copyright 1990, 1991 by OMRON Corporation, NTT Software Corporation,
+ *                      and Nippon Telegraph and Telephone Corporation
+ * Copyright 1991 by the Open Software Foundation
+ * Copyright 1993 by the FUJITSU LIMITED
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the names of OMRON, NTT Software, NTT, and
+ * Open Software Foundation not be used in advertising or publicity 
+ * pertaining to distribution of the software without specific, 
+ * written prior permission. OMRON, NTT Software, NTT, and Open Software
+ * Foundation make no representations about the suitability of this
+ * software for any purpose.  It is provided "as is" without express or
+ * implied warranty.
+ *
+ * OMRON, NTT SOFTWARE, NTT, AND OPEN SOFTWARE FOUNDATION 
+ * DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
+ * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT 
+ * SHALL OMRON, NTT SOFTWARE, NTT, OR OPEN SOFTWARE FOUNDATION BE
+ * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * 
+ *	Authors: Li Yuhong		OMRON Corporation
+ *		 Tatsuya Kato		NTT Software Corporation
+ *		 Hiroshi Kuribayashi	OMRON Coproration
+ *		 Muneiyoshi Suzuki	Nippon Telegraph and Telephone Co.
+ * 
+ *		 M. Collins		OSF  
+ *		 Takashi Fujiwara	FUJITSU LIMITED
+ */				
+/*
+
+Copyright 1991, 1998  The Open Group
+
+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.
+
+*/
+/* $XFree86: xc/lib/X11/ICWrap.c,v 1.10 2003/04/25 14:12:38 tsi Exp $ */
+
+#define NEED_EVENTS
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "Xlibint.h"
+#include "Xlcint.h"
+
+static int
+_XIMNestedListToNestedList(
+    XIMArg *nlist,   /* This is the new list */
+    XIMArg *list)    /* The original list */
+{
+    register XIMArg *ptr = list;
+
+    while (ptr->name) {
+	if (!strcmp(ptr->name, XNVaNestedList)) {
+	    nlist += _XIMNestedListToNestedList(nlist, (XIMArg *)ptr->value);
+	} else {
+	    nlist->name = ptr->name;
+	    nlist->value = ptr->value;
+	    ptr++;
+	    nlist++;
+	}
+    }
+    return ptr - list;
+}
+
+static void
+_XIMCountNestedList(
+    XIMArg *args,
+    int *total_count)
+{
+    for (; args->name; args++) {
+	if (!strcmp(args->name, XNVaNestedList))
+	    _XIMCountNestedList((XIMArg *)args->value, total_count);
+	else
+	    ++(*total_count);
+    }
+}
+
+static void
+_XIMCountVaList(va_list var, int *total_count)
+{
+    char *attr;
+
+    *total_count = 0;
+
+    for (attr = va_arg(var, char*); attr; attr = va_arg(var, char*)) {
+	if (!strcmp(attr, XNVaNestedList)) {
+	    _XIMCountNestedList(va_arg(var, XIMArg*), total_count);
+	} else {
+	    (void)va_arg(var, XIMArg*);
+	    ++(*total_count);
+	}
+    }
+}
+
+static void
+_XIMVaToNestedList(va_list var, int max_count, XIMArg **args_return)
+{
+    XIMArg *args;
+    char   *attr;
+
+    if (max_count <= 0) {
+	*args_return = (XIMArg *)NULL;
+	return;
+    }
+
+    args = (XIMArg *)Xmalloc((unsigned)(max_count + 1) * sizeof(XIMArg));
+    *args_return = args;
+    if (!args) return;
+
+    for (attr = va_arg(var, char*); attr; attr = va_arg(var, char*)) {
+	if (!strcmp(attr, XNVaNestedList)) {
+	    args += _XIMNestedListToNestedList(args, va_arg(var, XIMArg*));
+	} else {
+	    args->name = attr;
+	    args->value = va_arg(var, XPointer);
+	    args++;
+	}
+    }
+    args->name = (char*)NULL;
+}
+
+/*ARGSUSED*/
+XVaNestedList
+XVaCreateNestedList(int dummy, ...)
+{
+    va_list		var;
+    XIMArg		*args = NULL;
+    int			total_count;
+
+    va_start(var, dummy);
+    _XIMCountVaList(var, &total_count);
+    va_end(var);
+
+    va_start(var, dummy);
+    _XIMVaToNestedList(var, total_count, &args);
+    va_end(var);
+
+    return (XVaNestedList)args;
+}
+
+char *
+XSetIMValues(XIM im, ...)
+{
+    va_list var;
+    int     total_count;
+    XIMArg *args;
+    char   *ret;
+
+    /*
+     * so count the stuff dangling here
+     */
+    va_start(var, im);
+    _XIMCountVaList(var, &total_count);
+    va_end(var);
+
+    /*
+     * now package it up so we can send it along
+     */
+    va_start(var, im);
+    _XIMVaToNestedList(var, total_count, &args);
+    va_end(var);
+
+    ret = (*im->methods->set_values) (im, args);
+    if (args) Xfree((char *)args);
+    return ret;
+}
+
+char *
+XGetIMValues(XIM im, ...)
+{
+    va_list var;
+    int     total_count;
+    XIMArg *args;
+    char   *ret;
+
+    /*
+     * so count the stuff dangling here
+     */
+    va_start(var, im);
+    _XIMCountVaList(var, &total_count);
+    va_end(var);
+
+    /*
+     * now package it up so we can send it along
+     */
+    va_start(var, im);
+    _XIMVaToNestedList(var, total_count, &args);
+    va_end(var);
+
+    ret = (*im->methods->get_values) (im, args);
+    if (args) Xfree((char *)args);
+    return ret;
+}
+
+/*
+ * Create an input context within the input method, 
+ * and return a pointer to the input context.
+ */
+
+XIC
+XCreateIC(XIM im, ...)
+{
+    va_list var;
+    int     total_count;
+    XIMArg *args;
+    XIC     ic;
+  
+    /*
+     * so count the stuff dangling here
+     */
+    va_start(var, im);
+    _XIMCountVaList(var, &total_count);
+    va_end(var);
+
+    /*
+     * now package it up so we can send it along
+     */
+    va_start(var, im);
+    _XIMVaToNestedList(var, total_count, &args);
+    va_end(var);
+
+    ic = (XIC) (*im->methods->create_ic) (im, args);
+    if (args) Xfree((char *)args);
+    if (ic) {
+	ic->core.next = im->core.ic_chain;
+	im->core.ic_chain = ic;
+    }
+    return ic;
+}
+
+/*
+ * Free the input context.
+ */
+void
+XDestroyIC(ic)
+    XIC ic;
+{
+    XIM im = ic->core.im;
+    XIC *prev;
+
+    (*ic->methods->destroy) (ic);
+    if (im) {
+	for (prev = &im->core.ic_chain; *prev; prev = &(*prev)->core.next) {
+	    if (*prev == ic) {
+		*prev = ic->core.next;
+		break;
+	    }
+	}
+    }
+    Xfree ((char *) ic);
+}
+
+char *
+XGetICValues(XIC ic, ...)
+{ 
+    va_list var;
+    int     total_count;
+    XIMArg *args;
+    char   *ret;
+
+    if (!ic->core.im)
+	return (char *) NULL;
+
+    /*
+     * so count the stuff dangling here
+     */
+    va_start(var, ic);
+    _XIMCountVaList(var, &total_count);
+    va_end(var);
+
+    /*
+     * now package it up so we can send it along
+     */
+    va_start(var, ic);
+    _XIMVaToNestedList(var, total_count, &args);
+    va_end(var);
+
+    ret = (*ic->methods->get_values) (ic, args);
+    if (args) Xfree((char *)args);
+    return ret;
+}
+
+char *
+XSetICValues(XIC ic, ...)
+{
+    va_list var;
+    int     total_count;
+    XIMArg *args;
+    char   *ret;
+
+    if (!ic->core.im)
+	return (char *) NULL;
+
+    /*
+     * so count the stuff dangling here
+     */
+    va_start(var, ic);
+    _XIMCountVaList(var, &total_count);
+    va_end(var);
+
+    /*
+     * now package it up so we can send it along
+     */
+    va_start(var, ic);
+    _XIMVaToNestedList(var, total_count, &args);
+    va_end(var);
+
+    ret = (*ic->methods->set_values) (ic, args);
+    if (args) Xfree((char *)args);
+    return ret;
+}
+
+/*
+ * Require the input manager to focus the focus window attached to the ic
+ * argument.
+ */
+void
+XSetICFocus(ic)
+    XIC ic;
+{
+  if (ic && ic->core.im)
+      (*ic->methods->set_focus) (ic);
+}
+
+/*
+ * Require the input manager to unfocus the focus window attached to the ic
+ * argument.
+ */
+void
+XUnsetICFocus(ic)
+    XIC ic;
+{
+  if (ic->core.im)
+      (*ic->methods->unset_focus) (ic);
+}
+
+/*
+ * Return the XIM associated with the input context.
+ */
+XIM
+XIMOfIC(ic)
+    XIC ic;
+{
+    return ic->core.im;
+}
+
+char *
+XmbResetIC(ic)
+    XIC ic;
+{
+    if (ic->core.im)
+	return (*ic->methods->mb_reset)(ic);
+    return (char *)NULL;
+}
+
+wchar_t *
+XwcResetIC(ic)
+    XIC ic;
+{
+    if (ic->core.im)
+	return (*ic->methods->wc_reset)(ic);
+    return (wchar_t *)NULL;
+}
+
+char *
+Xutf8ResetIC(ic)
+    XIC ic;
+{
+    if (ic->core.im) {
+	if (ic->methods->utf8_reset)
+	    return (*ic->methods->utf8_reset)(ic);
+	else if (ic->methods->mb_reset)
+	    return (*ic->methods->mb_reset)(ic);
+    }
+    return (char *)NULL;
+}
+
+int
+XmbLookupString(ic, ev, buffer, nbytes, keysym, status)
+    XIC ic;
+    register XKeyEvent *ev;
+    char *buffer;
+    int nbytes;
+    KeySym *keysym;
+    Status *status;
+{
+    if (ic->core.im)
+	return (*ic->methods->mb_lookup_string) (ic, ev, buffer, nbytes,
+						 keysym, status);
+    return XLookupNone;
+}
+
+int
+XwcLookupString(ic, ev, buffer, nchars, keysym, status)
+    XIC ic;
+    register XKeyEvent *ev;
+    wchar_t *buffer;
+    int nchars;
+    KeySym *keysym;
+    Status *status;
+{
+    if (ic->core.im)
+	return (*ic->methods->wc_lookup_string) (ic, ev, buffer, nchars,
+						 keysym, status);
+    return XLookupNone;
+}
+
+int
+Xutf8LookupString(ic, ev, buffer, nbytes, keysym, status)
+    XIC ic;
+    register XKeyEvent *ev;
+    char *buffer;
+    int nbytes;
+    KeySym *keysym;
+    Status *status;
+{
+    if (ic->core.im) {
+	if (ic->methods->utf8_lookup_string)
+	    return (*ic->methods->utf8_lookup_string) (ic, ev, buffer, nbytes,
+						   	keysym, status);
+	else if (ic->methods->mb_lookup_string)
+	    return (*ic->methods->mb_lookup_string) (ic, ev, buffer, nbytes,
+						   	keysym, status);
+    }
+    return XLookupNone;
+}