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

diff --git a/libX11/modules/im/ximcp/imInt.c b/libX11/modules/im/ximcp/imInt.c
new file mode 100644
index 000000000..c759cf375
--- /dev/null
+++ b/libX11/modules/im/ximcp/imInt.c
@@ -0,0 +1,271 @@
+/* $Xorg: imInt.c,v 1.8 2000/08/17 19:45:13 cpqbld Exp $ */
+/******************************************************************
+
+           Copyright 1992, 1993, 1994 by FUJITSU LIMITED
+
+Permission to use, copy, modify, distribute, and sell this software
+and its documentation for any purpose is hereby granted without fee,
+provided that the above copyright notice appear in all copies and
+that both that copyright notice and this permission notice appear
+in supporting documentation, and that the name of FUJITSU LIMITED
+not be used in advertising or publicity pertaining to distribution
+of the software without specific, written prior permission.
+FUJITSU LIMITED makes no representations about the suitability of
+this software for any purpose. 
+It is provided "as is" without express or implied warranty.
+
+FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+  Author: Takashi Fujiwara     FUJITSU LIMITED 
+                               fujiwara@a80.tech.yk.fujitsu.co.jp
+
+******************************************************************/
+/* $XFree86: xc/lib/X11/imInt.c,v 3.12 2003/04/17 02:06:32 dawes Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/Xatom.h>
+#include <X11/Xlib.h>
+#include <X11/Xmd.h>
+#include "Xlibint.h"
+#include "Xlcint.h"
+#include "Ximint.h"
+#include "XimImSw.h"
+
+Private Xim 		*_XimCurrentIMlist  = (Xim *)NULL;
+Private int		 _XimCurrentIMcount = 0;
+
+Private Bool
+_XimSetIMStructureList(
+    Xim		  im)
+{
+    register int  i;
+    Xim		 *xim;
+
+    if(!(_XimCurrentIMlist)) {
+	if(!(_XimCurrentIMlist = (Xim *)Xmalloc(sizeof(Xim))))
+	    return False;
+	_XimCurrentIMlist[0] = im;
+	_XimCurrentIMcount   = 1;
+    }
+    else {
+	for(i = 0; i < _XimCurrentIMcount; i++) {
+	    if(!( _XimCurrentIMlist[i])) {
+		_XimCurrentIMlist[i] = im;
+		break;
+	    }
+	}
+	if(i >= _XimCurrentIMcount) {
+	    if(!(xim = (Xim *)Xrealloc(_XimCurrentIMlist, 
+					 ((i + 1) * sizeof(Xim)))))
+		return False;
+	    _XimCurrentIMlist			  = xim;
+	    _XimCurrentIMlist[_XimCurrentIMcount] = im;
+	    _XimCurrentIMcount++;
+	}
+    }
+    return True;
+}
+
+Public void
+_XimDestroyIMStructureList(im)
+    Xim		  im;
+{
+    register int  i;
+
+    for(i = 0; i < _XimCurrentIMcount; i++) {
+	if(_XimCurrentIMlist[i] == im) {
+	    _XimCurrentIMlist[i] = NULL;
+	    break;
+	}
+    }
+    return;
+}
+
+Public void
+_XimServerDestroy(im_2_destroy)
+    Xim		  im_2_destroy;
+{
+    register int  i;
+    Xim		  im;
+    XIC		  ic;
+
+    for(i = 0; i < _XimCurrentIMcount; i++) {
+	if(!(im = _XimCurrentIMlist[i]))
+	    continue;
+	/*
+	 * Only continue if this im is the one to be destroyed.
+	 */
+	if (im != im_2_destroy)
+	    continue;
+
+	if (im->core.destroy_callback.callback)
+	    (*im->core.destroy_callback.callback)((XIM)im,
+			im->core.destroy_callback.client_data, NULL);
+	for (ic = im->core.ic_chain; ic; ic = ic->core.next) {
+	    if (ic->core.destroy_callback.callback) {
+		(*ic->core.destroy_callback.callback)(ic,
+			ic->core.destroy_callback.client_data, NULL);
+	    }
+	}
+	_XimResetIMInstantiateCallback( im );
+	(void)im->methods->close((XIM)im);
+	Xfree(im);
+	_XimCurrentIMlist[i] = NULL;
+	return;
+    }
+}
+
+#ifdef XIM_CONNECTABLE
+Public void
+_XimServerReconectableDestroy()
+{
+    register int  i;
+    Xim		  im;
+    XIC		  ic;
+
+    for(i = 0; i < _XimCurrentIMcount; i++) {
+	if(!(im = _XimCurrentIMlist[i]))
+	    continue;
+
+	if (im->core.destroy_callback.callback)
+	    (*im->core.destroy_callback.callback)(im,
+			im->core.destroy_callback.client_data, NULL);
+	for (ic = im->core.ic_chain; ic; ic = ic->core.next) {
+	    if (ic->core.destroy_callback.callback) {
+		(*ic->core.destroy_callback.callback)(ic,
+			ic->core.destroy_callback.client_data, NULL);
+	    }
+	}
+	_XimResetIMInstantiateCallback( im );
+	(void)im->methods->close((XIM)im);
+    }
+    return;
+}
+#endif /* XIM_CONNECTABLE */
+
+Private const char *
+_XimStrstr(
+    register const char *src,
+    register const char *dest)
+{
+    int			 len;
+    
+    len = strlen(dest);
+    while((src = strchr(src, *dest))) {
+	if(!strncmp(src, dest, len))
+	    return src;
+	src++;
+    }
+    return NULL;
+}
+
+Private char *
+_XimMakeImName(
+    XLCd	   lcd)
+{
+    const char* begin = NULL;
+    const char* end = NULL;
+    char* ret = NULL;
+    const char* ximmodifier = XIMMODIFIER;
+
+    if(lcd->core->modifiers != NULL && *lcd->core->modifiers != '\0') {
+	begin = _XimStrstr(lcd->core->modifiers, ximmodifier);
+	if (begin != NULL) {
+	    end = begin += strlen(ximmodifier);
+	    while (*end && *end != '@')
+		end++;
+	}
+    }
+    ret = Xmalloc(end - begin + 1);
+    if (ret != NULL) {
+	if (begin != NULL && end != NULL) {
+	    (void)strncpy(ret, begin, end - begin);
+	    ret[end - begin] = '\0';
+	} else {
+	    ret[0] = '\0';
+	}
+    }
+
+    return ret;
+}
+
+Public XIM
+_XimOpenIM(
+    XLCd		 lcd,
+    Display		*dpy,
+    XrmDatabase		 rdb,
+    char		*res_name,
+    char		*res_class)
+{
+    Xim			 im;
+    register int	 i;
+    
+    if (!(im = (Xim)Xmalloc(sizeof(XimRec))))
+	return (XIM)NULL;
+    bzero(im, sizeof(XimRec));
+
+    im->core.lcd       = lcd;
+    im->core.ic_chain  = (XIC)NULL;
+    im->core.display   = dpy;
+    im->core.rdb       = rdb;
+    im->core.res_name  = NULL;
+    im->core.res_class = NULL;
+    if((res_name != NULL) && (*res_name != '\0')){
+	if(!(im->core.res_name  = (char *)Xmalloc(strlen(res_name)+1)))
+	    goto Error1;
+	strcpy(im->core.res_name,res_name);
+    }
+    if((res_class != NULL) && (*res_class != '\0')){
+	if(!(im->core.res_class = (char *)Xmalloc(strlen(res_class)+1)))
+	    goto Error2;
+	strcpy(im->core.res_class,res_class);
+    }
+    if(!(im->core.im_name = _XimMakeImName(lcd)))
+	goto Error3;
+
+    for(i= 0; ; i++) {
+	if(_XimImSportRec[i].checkprocessing(im)) {
+	    if(!(_XimImSportRec[i].im_open(im)))
+		goto Error4;
+	    if(!_XimSetIMStructureList(im))
+		goto Error4;
+	    return (XIM)im;
+	}
+    }
+
+Error4 :
+    _XimImSportRec[i].im_free(im);
+    Xfree(im);
+    return NULL;
+Error3 :
+    if(im->core.im_name)
+	Xfree(im->core.im_name);
+Error2:
+    if(im->core.res_class)
+	Xfree(im->core.res_class);
+Error1:
+    if(im->core.res_name)
+	Xfree(im->core.res_name);
+    Xfree(im);
+    return NULL;
+}
+
+Public Bool
+_XInitIM(lcd)
+    XLCd	 lcd;
+{
+    if(lcd == (XLCd)NULL)
+	return False;
+    lcd->methods->open_im = _XimOpenIM;
+    lcd->methods->register_callback = _XimRegisterIMInstantiateCallback;
+    lcd->methods->unregister_callback = _XimUnRegisterIMInstantiateCallback;
+    return True;
+}