svn merge ^/branches/released .

3 files changed, 639 insertions, 619 deletions

diff --git a/libX11/modules/im/ximcp/imLcFlt.c b/libX11/modules/im/ximcp/imLcFlt.c
index 014ad6add..7ab56f8a1 100644
--- a/libX11/modules/im/ximcp/imLcFlt.c
+++ b/libX11/modules/im/ximcp/imLcFlt.c
@@ -45,6 +45,7 @@ _XimLocalFilter(Display *d, Window w, XEvent *ev, XPointer client_data)
     static char	 buf[256];

     DefTree	*b = ic->private.local.base.tree;

     DTIndex	 t;

+    Bool	 braille = False;

 

     if(ev->xkey.keycode == 0)

 	return (False);

@@ -58,6 +59,7 @@ _XimLocalFilter(Display *d, Window w, XEvent *ev, XPointer client_data)
 	if(ev->type == KeyPress) {

 	    ic->private.local.brl_pressed |=

 		1<<(keysym-XK_braille_dot_1);

+	    return(True);

 	} else {

 	    if(!ic->private.local.brl_committing

 		    || ev->xkey.time - ic->private.local.brl_release_start > 300) {

@@ -65,23 +67,20 @@ _XimLocalFilter(Display *d, Window w, XEvent *ev, XPointer client_data)
 		ic->private.local.brl_release_start = ev->xkey.time;

 	    }

 	    ic->private.local.brl_pressed &= ~(1<<(keysym-XK_braille_dot_1));

-	    if(!ic->private.local.brl_pressed) {

-		if(ic->private.local.brl_committing) {

-		    ic->private.local.brl_committed =

-			ic->private.local.brl_committing;

-		    ic->private.local.composed = 0;

-		    ev->type = KeyPress;

-		    ev->xkey.keycode = 0;

-		    _XPutBackEvent(d, ev);

-		}

+	    if(!ic->private.local.brl_pressed && ic->private.local.brl_committing) {

+		/* Commited a braille pattern, let it go through compose tree */

+		keysym = XK_braille_blank | ic->private.local.brl_committing;

+		ev->type = KeyPress;

+		braille = True;

+	    } else {

+	        return(True);

 	    }

 	}

-	return(True);

     }

 

     if(   (ev->type != KeyPress)

        || (((Xim)ic->core.im)->private.local.top == 0 ) )

-	return(False);

+	goto emit_braille;

 

     for(t = ic->private.local.context; t; t = b[t].next) {

 	if(((ev->xkey.state & b[t].modifier_mask) == b[t].modifier) &&

@@ -105,11 +104,22 @@ _XimLocalFilter(Display *d, Window w, XEvent *ev, XPointer client_data)
 	}

     } else { /* Unmatched */

 	if(ic->private.local.context == ((Xim)ic->core.im)->private.local.top) {

-	    return(False);

+	    goto emit_braille;

 	}

 	/* Error (Sequence Unmatch occured) */

 	/* initialize internal state for next key sequence */

 	ic->private.local.context = ((Xim)ic->core.im)->private.local.top;

 	return(True);

     }

+

+emit_braille:

+    if(braille) {

+	/* Braille pattern is not in compose tree, emit alone */

+	ic->private.local.brl_committed = ic->private.local.brl_committing;

+	ic->private.local.composed = 0;

+	ev->xkey.keycode = 0;

+	_XPutBackEvent(d, ev);

+	return(True);

+    }

+    return(False);

 }

diff --git a/libX11/modules/im/ximcp/imLcIc.c b/libX11/modules/im/ximcp/imLcIc.c
index 53d53efec..04de3c1bd 100644
--- a/libX11/modules/im/ximcp/imLcIc.c
+++ b/libX11/modules/im/ximcp/imLcIc.c
@@ -1,200 +1,200 @@
-/******************************************************************
-
-                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
-
-******************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <stdio.h>
-#include <X11/Xlib.h>
-#include <X11/Xmd.h>
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "Ximint.h"
-
-Private void
-_XimLocalUnSetFocus(
-    XIC	 xic)
-{
-    Xic  ic = (Xic)xic;
-    ((Xim)ic->core.im)->private.local.current_ic = (XIC)NULL;
-
-    if (ic->core.focus_window)
-	_XUnregisterFilter(ic->core.im->core.display,
-			ic->core.focus_window, _XimLocalFilter, (XPointer)ic);
-    return;
-}
-
-Private void
-_XimLocalDestroyIC(
-    XIC	 xic)
-{
-    Xic	 ic = (Xic)xic;
-
-    if(((Xim)ic->core.im)->private.local.current_ic == (XIC)ic) {
-	((Xim)ic->core.im)->private.local.current_ic = (XIC)NULL;
-    }
-    if (ic->core.focus_window)
-	_XUnregisterFilter(ic->core.im->core.display,
-			ic->core.focus_window, _XimLocalFilter, (XPointer)ic);
-    if(ic->private.local.ic_resources) {
-	Xfree(ic->private.local.ic_resources);
-	ic->private.local.ic_resources = NULL;
-    }
-    return;
-}
-
-Private void
-_XimLocalSetFocus(
-    XIC	 xic)
-{
-    Xic	 ic = (Xic)xic;
-    XIC	 current_ic = ((Xim)ic->core.im)->private.local.current_ic;
-
-    if (current_ic == (XIC)ic)
-	return;
-
-    if (current_ic != (XIC)NULL) {
-	_XimLocalUnSetFocus(current_ic);
-    }
-    ((Xim)ic->core.im)->private.local.current_ic = (XIC)ic;
-
-    if (ic->core.focus_window)
-	_XRegisterFilterByType(ic->core.im->core.display,
-			ic->core.focus_window, KeyPress, KeyRelease,
-			_XimLocalFilter, (XPointer)ic);
-    return;
-}
-
-Private void
-_XimLocalReset(
-    XIC	 xic)
-{
-    Xic	 ic = (Xic)xic;
-    ic->private.local.composed       = 0;
-    ic->private.local.context        = ((Xim)ic->core.im)->private.local.top;
-    ic->private.local.brl_pressed    = 0;
-    ic->private.local.brl_committing = 0;
-    ic->private.local.brl_committed  = 0;
-}
-
-Private char *
-_XimLocalMbReset(
-    XIC	 xic)
-{
-    _XimLocalReset(xic);
-    return (char *)NULL;
-}
-
-Private wchar_t *
-_XimLocalWcReset(
-    XIC	 xic)
-{
-    _XimLocalReset(xic);
-    return (wchar_t *)NULL;
-}
-
-Private XICMethodsRec Local_ic_methods = {
-    _XimLocalDestroyIC, 	/* destroy */
-    _XimLocalSetFocus,  	/* set_focus */
-    _XimLocalUnSetFocus,	/* unset_focus */
-    _XimLocalSetICValues,	/* set_values */
-    _XimLocalGetICValues,	/* get_values */
-    _XimLocalMbReset,		/* mb_reset */
-    _XimLocalWcReset,		/* wc_reset */
-    _XimLocalMbReset,		/* utf8_reset */
-    _XimLocalMbLookupString,	/* mb_lookup_string */
-    _XimLocalWcLookupString,	/* wc_lookup_string */
-    _XimLocalUtf8LookupString	/* utf8_lookup_string */
-};
-
-Public XIC
-_XimLocalCreateIC(
-    XIM			 im,
-    XIMArg		*values)
-{
-    Xic			 ic;
-    XimDefICValues	 ic_values;
-    XIMResourceList	 res;
-    unsigned int	 num;
-    int			 len;
-
-    if((ic = (Xic)Xmalloc(sizeof(XicRec))) == (Xic)NULL) {
-	return ((XIC)NULL);
-    }
-    bzero((char *)ic, sizeof(XicRec));
-
-    ic->methods = &Local_ic_methods;
-    ic->core.im = im;
-    ic->private.local.base           = ((Xim)im)->private.local.base;
-    ic->private.local.context        = ((Xim)im)->private.local.top;
-    ic->private.local.composed       = 0;
-    ic->private.local.brl_pressed    = 0;
-    ic->private.local.brl_committing = 0;
-    ic->private.local.brl_committed  = 0;
-
-    num = im->core.ic_num_resources;
-    len = sizeof(XIMResource) * num;
-    if((res = (XIMResourceList)Xmalloc(len)) == (XIMResourceList)NULL) {
-	goto Set_Error;
-    }
-    (void)memcpy((char *)res, (char *)im->core.ic_resources, len);
-    ic->private.local.ic_resources     = res;
-    ic->private.local.ic_num_resources = num;
-
-    bzero((char *)&ic_values, sizeof(XimDefICValues));
-    if(_XimCheckLocalInputStyle(ic, (XPointer)&ic_values, values,
-				 im->core.styles, res, num) == False) {
-	goto Set_Error;
-    }
-
-    _XimSetICMode(res, num, ic_values.input_style);
-
-    if(_XimSetICValueData(ic, (XPointer)&ic_values,
-			ic->private.local.ic_resources,
-			ic->private.local.ic_num_resources,
-			values, XIM_CREATEIC, True)) {
-	goto Set_Error;
-    }
-    ic_values.filter_events = KeyPressMask;
-    _XimSetCurrentICValues(ic, &ic_values);
-    if(_XimSetICDefaults(ic, (XPointer)&ic_values,
-				XIM_SETICDEFAULTS, res, num) == False) {
-	goto Set_Error;
-    }
-    _XimSetCurrentICValues(ic, &ic_values);
-
-    return((XIC)ic);
-
-Set_Error :
-    if (ic->private.local.ic_resources) {
-	Xfree(ic->private.local.ic_resources);
-	ic->private.local.ic_resources = NULL;
-    }
-    Xfree(ic);
-    return((XIC)NULL);
-}
+/******************************************************************

+

+                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

+

+******************************************************************/

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include <stdio.h>

+#include <X11/Xlib.h>

+#include <X11/Xmd.h>

+#include "Xlibint.h"

+#include "Xlcint.h"

+#include "Ximint.h"

+

+Private void

+_XimLocalUnSetFocus(

+    XIC	 xic)

+{

+    Xic  ic = (Xic)xic;

+    ((Xim)ic->core.im)->private.local.current_ic = (XIC)NULL;

+

+    if (ic->core.focus_window)

+	_XUnregisterFilter(ic->core.im->core.display,

+			ic->core.focus_window, _XimLocalFilter, (XPointer)ic);

+    return;

+}

+

+Private void

+_XimLocalDestroyIC(

+    XIC	 xic)

+{

+    Xic	 ic = (Xic)xic;

+

+    if(((Xim)ic->core.im)->private.local.current_ic == (XIC)ic) {

+	((Xim)ic->core.im)->private.local.current_ic = (XIC)NULL;

+    }

+    if (ic->core.focus_window)

+	_XUnregisterFilter(ic->core.im->core.display,

+			ic->core.focus_window, _XimLocalFilter, (XPointer)ic);

+    if(ic->private.local.ic_resources) {

+	Xfree(ic->private.local.ic_resources);

+	ic->private.local.ic_resources = NULL;

+    }

+    return;

+}

+

+Private void

+_XimLocalSetFocus(

+    XIC	 xic)

+{

+    Xic	 ic = (Xic)xic;

+    XIC	 current_ic = ((Xim)ic->core.im)->private.local.current_ic;

+

+    if (current_ic == (XIC)ic)

+	return;

+

+    if (current_ic != (XIC)NULL) {

+	_XimLocalUnSetFocus(current_ic);

+    }

+    ((Xim)ic->core.im)->private.local.current_ic = (XIC)ic;

+

+    if (ic->core.focus_window)

+	_XRegisterFilterByType(ic->core.im->core.display,

+			ic->core.focus_window, KeyPress, KeyRelease,

+			_XimLocalFilter, (XPointer)ic);

+    return;

+}

+

+Private void

+_XimLocalReset(

+    XIC	 xic)

+{

+    Xic	 ic = (Xic)xic;

+    ic->private.local.composed       = 0;

+    ic->private.local.context        = ((Xim)ic->core.im)->private.local.top;

+    ic->private.local.brl_pressed    = 0;

+    ic->private.local.brl_committing = 0;

+    ic->private.local.brl_committed  = 0;

+}

+

+Private char *

+_XimLocalMbReset(

+    XIC	 xic)

+{

+    _XimLocalReset(xic);

+    return (char *)NULL;

+}

+

+Private wchar_t *

+_XimLocalWcReset(

+    XIC	 xic)

+{

+    _XimLocalReset(xic);

+    return (wchar_t *)NULL;

+}

+

+Private XICMethodsRec Local_ic_methods = {

+    _XimLocalDestroyIC, 	/* destroy */

+    _XimLocalSetFocus,  	/* set_focus */

+    _XimLocalUnSetFocus,	/* unset_focus */

+    _XimLocalSetICValues,	/* set_values */

+    _XimLocalGetICValues,	/* get_values */

+    _XimLocalMbReset,		/* mb_reset */

+    _XimLocalWcReset,		/* wc_reset */

+    _XimLocalMbReset,		/* utf8_reset */

+    _XimLocalMbLookupString,	/* mb_lookup_string */

+    _XimLocalWcLookupString,	/* wc_lookup_string */

+    _XimLocalUtf8LookupString	/* utf8_lookup_string */

+};

+

+Public XIC

+_XimLocalCreateIC(

+    XIM			 im,

+    XIMArg		*values)

+{

+    Xic			 ic;

+    XimDefICValues	 ic_values;

+    XIMResourceList	 res;

+    unsigned int	 num;

+    int			 len;

+

+    if((ic = (Xic)Xmalloc(sizeof(XicRec))) == (Xic)NULL) {

+	return ((XIC)NULL);

+    }

+    bzero((char *)ic, sizeof(XicRec));

+

+    ic->methods = &Local_ic_methods;

+    ic->core.im = im;

+    ic->private.local.base           = ((Xim)im)->private.local.base;

+    ic->private.local.context        = ((Xim)im)->private.local.top;

+    ic->private.local.composed       = 0;

+    ic->private.local.brl_pressed    = 0;

+    ic->private.local.brl_committing = 0;

+    ic->private.local.brl_committed  = 0;

+

+    num = im->core.ic_num_resources;

+    len = sizeof(XIMResource) * num;

+    if((res = (XIMResourceList)Xmalloc(len)) == (XIMResourceList)NULL) {

+	goto Set_Error;

+    }

+    (void)memcpy((char *)res, (char *)im->core.ic_resources, len);

+    ic->private.local.ic_resources     = res;

+    ic->private.local.ic_num_resources = num;

+

+    bzero((char *)&ic_values, sizeof(XimDefICValues));

+    if(_XimCheckLocalInputStyle(ic, (XPointer)&ic_values, values,

+				 im->core.styles, res, num) == False) {

+	goto Set_Error;

+    }

+

+    _XimSetICMode(res, num, ic_values.input_style);

+

+    if(_XimSetICValueData(ic, (XPointer)&ic_values,

+			ic->private.local.ic_resources,

+			ic->private.local.ic_num_resources,

+			values, XIM_CREATEIC, True)) {

+	goto Set_Error;

+    }

+    ic_values.filter_events = KeyPressMask | KeyReleaseMask;

+    _XimSetCurrentICValues(ic, &ic_values);

+    if(_XimSetICDefaults(ic, (XPointer)&ic_values,

+				XIM_SETICDEFAULTS, res, num) == False) {

+	goto Set_Error;

+    }

+    _XimSetCurrentICValues(ic, &ic_values);

+

+    return((XIC)ic);

+

+Set_Error :

+    if (ic->private.local.ic_resources) {

+	Xfree(ic->private.local.ic_resources);

+	ic->private.local.ic_resources = NULL;

+    }

+    Xfree(ic);

+    return((XIC)NULL);

+}

diff --git a/libX11/modules/im/ximcp/imLcLkup.c b/libX11/modules/im/ximcp/imLcLkup.c
index 813efcd25..c62a9106c 100644
--- a/libX11/modules/im/ximcp/imLcLkup.c
+++ b/libX11/modules/im/ximcp/imLcLkup.c
@@ -1,407 +1,417 @@
-/******************************************************************
-
-              Copyright 1992 by Fuji Xerox Co., Ltd.
-              Copyright 1992, 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 Fuji Xerox,
-FUJITSU LIMITED not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  Fuji Xerox, FUJITSU LIMITED  make no representations
-about the suitability of this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-FUJI XEROX, FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL FUJI XEROX,
-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: Kazunori Nishihara   Fuji Xerox
-          Takashi Fujiwara     FUJITSU LIMITED
-                               fujiwara@a80.tech.yk.fujitsu.co.jp
-
-******************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <stdio.h>
-#include <X11/Xatom.h>
-#include <X11/Xos.h>
-#include <X11/Xlib.h>
-#include <X11/keysym.h>
-#include <X11/Xutil.h>
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include "XlcPubI.h"
-#include "Ximint.h"
-
-Public int
-_XimLocalMbLookupString(XIC xic, XKeyEvent *ev, char *buffer, int bytes,
-			KeySym *keysym, Status *status)
-{
-    Xic		 ic = (Xic)xic;
-    int		 ret;
-    DefTree	*b  = ic->private.local.base.tree;
-    char	*mb = ic->private.local.base.mb;
-
-    if(ev->type != KeyPress) {
-	if(status) *status = XLookupNone;
-	return(0);
-    }
-    if(ev->keycode == 0 &&
-	   (  (ic->private.local.composed != 0)
-	    ||(ic->private.local.brl_committed != 0))) {
-	if (ic->private.local.brl_committed != 0) { /* Braille Event */
-	    unsigned char pattern = ic->private.local.brl_committed;
-	    char *mb=alloca(XLC_PUBLIC(ic->core.im->core.lcd, mb_cur_max));
-	    ret = _Xlcwctomb(ic->core.im->core.lcd, mb, BRL_UC_ROW | pattern);
-	    if(ret < 0) {
-		if(status) *status = XLookupNone;
-		return(0);
-	    }
-	    if(ret > bytes) {
-		if(status) *status = XBufferOverflow;
-		return(ret);
-	    }
-	    if(keysym) {
-		*keysym = XK_braille_blank | pattern;
-		if(status) *status = XLookupBoth;
-	    } else
-		if(status) *status = XLookupChars;
-	    memcpy(buffer, mb, ret);
-	} else { /* Composed Event */
-	    ret = strlen(&mb[b[ic->private.local.composed].mb]);
-	    if(ret > bytes) {
-		if(status) *status = XBufferOverflow;
-		return(ret);
-	    }
-	    memcpy(buffer, &mb[b[ic->private.local.composed].mb], ret);
-	    if(keysym) *keysym = b[ic->private.local.composed].ks;
-	    if (ret > 0) {
-		if (keysym && *keysym != NoSymbol) {
-		    if(status) *status = XLookupBoth;
-		} else {
-		    if(status) *status = XLookupChars;
-		}
-	    } else {
-		if(keysym && *keysym != NoSymbol) {
-		    if(status) *status = XLookupKeySym;
-		} else {
-		    if(status) *status = XLookupNone;
-		}
-	    }
-	}
-	return (ret);
-    } else { /* Throughed Event */
-	ret = _XimLookupMBText(ic, ev, buffer, bytes, keysym, NULL);
-	if(ret > 0) {
-	    if (ret > bytes) {
-		if (status) *status = XBufferOverflow;
-	    } else if (keysym && *keysym != NoSymbol) {
-		if(status) *status = XLookupBoth;
-	    } else {
-		if(status) *status = XLookupChars;
-	    }
-	} else {
-	    if(keysym && *keysym != NoSymbol) {
-		if(status) *status = XLookupKeySym;
-	    } else {
-		if(status) *status = XLookupNone;
-	    }
-	}
-    }
-    return (ret);
-}
-
-Public int
-_XimLocalWcLookupString(XIC xic, XKeyEvent *ev, wchar_t *buffer, int wlen,
-			KeySym *keysym, Status *status)
-{
-    Xic		 ic = (Xic)xic;
-    int		 ret;
-    DefTree	*b  = ic->private.local.base.tree;
-    wchar_t	*wc = ic->private.local.base.wc;
-
-    if(ev->type != KeyPress) {
-	if(status) *status = XLookupNone;
-	return(0);
-    }
-    if(ev->keycode == 0) {
-	if (ic->private.local.brl_committed != 0) { /* Braille Event */
-	    unsigned char pattern = ic->private.local.brl_committed;
-	    ret = 1;
-	    if (ret > wlen) {
-		if(status) *status = XBufferOverflow;
-		return (ret);
-	    }
-	    *buffer = BRL_UC_ROW | pattern;
-	    if(keysym) {
-		*keysym = XK_braille_blank | pattern;
-		if(status) *status = XLookupBoth;
-	    } else
-		if(status) *status = XLookupChars;
-	} else { /* Composed Event */
-	    ret = _Xwcslen(&wc[b[ic->private.local.composed].wc]);
-	    if(ret > wlen) {
-		if(status) *status = XBufferOverflow;
-		return (ret);
-	    }
-	    memcpy((char *)buffer, (char *)&wc[b[ic->private.local.composed].wc],
-		   ret * sizeof(wchar_t));
-	    if(keysym) *keysym = b[ic->private.local.composed].ks;
-	    if (ret > 0) {
-		if (keysym && *keysym != NoSymbol) {
-		    if(status) *status = XLookupBoth;
-		} else {
-		    if(status) *status = XLookupChars;
-		}
-	    } else {
-		if(keysym && *keysym != NoSymbol) {
-		    if(status) *status = XLookupKeySym;
-		} else {
-		    if(status) *status = XLookupNone;
-		}
-	    }
-	}
-	return (ret);
-    } else { /* Throughed Event */
-	ret = _XimLookupWCText(ic, ev, buffer, wlen, keysym, NULL);
-	if(ret > 0) {
-	    if (ret > wlen) {
-		if (status) *status = XBufferOverflow;
-	    } else if (keysym && *keysym != NoSymbol) {
-		if(status) *status = XLookupBoth;
-	    } else {
-		if(status) *status = XLookupChars;
-	    }
-	} else {
-	    if(keysym && *keysym != NoSymbol) {
-		if(status) *status = XLookupKeySym;
-	    } else {
-		if(status) *status = XLookupNone;
-	    }
-	}
-    }
-    return (ret);
-}
-
-Public int
-_XimLocalUtf8LookupString(XIC xic, XKeyEvent *ev, char *buffer, int bytes,
-			  KeySym *keysym, Status *status)
-{
-    Xic		 ic = (Xic)xic;
-    int		 ret;
-    DefTree	*b    = ic->private.local.base.tree;
-    char	*utf8 = ic->private.local.base.utf8;
-
-    if(ev->type != KeyPress) {
-	if(status) *status = XLookupNone;
-	return(0);
-    }
-    if(ev->keycode == 0) {
-	if (ic->private.local.brl_committed != 0) { /* Braille Event */
-	    unsigned char pattern = ic->private.local.brl_committed;
-	    ret = 3;
-	    if (ret > bytes) {
-		if(status) *status = XBufferOverflow;
-		return (ret);
-	    }
-	    buffer[0] = 0xe0 | ((BRL_UC_ROW >> 12) & 0x0f);
-	    buffer[1] = 0x80 | ((BRL_UC_ROW >> 8) & 0x30) | (pattern >> 6);
-	    buffer[2] = 0x80 | (pattern & 0x3f);
-	} else { /* Composed Event */
-	    ret = strlen(&utf8[b[ic->private.local.composed].utf8]);
-	    if(ret > bytes) {
-		if(status) *status = XBufferOverflow;
-		return (ret);
-	    }
-	    memcpy(buffer, &utf8[b[ic->private.local.composed].utf8], ret);
-	    if(keysym) *keysym = b[ic->private.local.composed].ks;
-	    if (ret > 0) {
-		if (keysym && *keysym != NoSymbol) {
-		    if(status) *status = XLookupBoth;
-		} else {
-		    if(status) *status = XLookupChars;
-		}
-	    } else {
-		if(keysym && *keysym != NoSymbol) {
-		    if(status) *status = XLookupKeySym;
-		} else {
-		    if(status) *status = XLookupNone;
-		}
-	    }
-	}
-	return (ret);
-    } else { /* Throughed Event */
-	ret = _XimLookupUTF8Text(ic, ev, buffer, bytes, keysym, NULL);
-	if(ret > 0) {
-	    if (ret > bytes) {
-		if (status) *status = XBufferOverflow;
-	    } else if (keysym && *keysym != NoSymbol) {
-		if(status) *status = XLookupBoth;
-	    } else {
-		if(status) *status = XLookupChars;
-	    }
-	} else {
-	    if(keysym && *keysym != NoSymbol) {
-		if(status) *status = XLookupKeySym;
-	    } else {
-		if(status) *status = XLookupNone;
-	    }
-	}
-    }
-    return (ret);
-}
-
-Private int
-_XimLcctsconvert(
-    XlcConv	 conv,
-    char	*from,
-    int		 from_len,
-    char	*to,
-    int		 to_len,
-    Status	*state)
-{
-    int		 from_left;
-    int		 to_left;
-    int		 from_savelen;
-    int		 to_savelen;
-    int		 from_cnvlen;
-    int		 to_cnvlen;
-    char	*from_buf;
-    char	*to_buf;
-    char	 scratchbuf[BUFSIZ];
-    Status	 tmp_state;
-
-    if (!state)
-	state = &tmp_state;
-
-    if (!conv || !from || !from_len) {
-	*state = XLookupNone;
-	return 0;
-    }
-
-    /* Reset the converter.  The CompoundText at 'from' starts in
-       initial state.  */
-    _XlcResetConverter(conv);
-
-    from_left = from_len;
-    to_left = BUFSIZ;
-    from_cnvlen = 0;
-    to_cnvlen = 0;
-    for (;;) {
-	from_buf = &from[from_cnvlen];
-	from_savelen = from_left;
-	to_buf = &scratchbuf[to_cnvlen];
-	to_savelen = to_left;
-	if (_XlcConvert(conv, (XPointer *)&from_buf, &from_left,
-				 (XPointer *)&to_buf, &to_left, NULL, 0) < 0) {
-	    *state = XLookupNone;
-	    return 0;
-	}
-	from_cnvlen += (from_savelen - from_left);
-	to_cnvlen += (to_savelen - to_left);
-	if (from_left == 0) {
-	    if (!to_cnvlen) {
-		*state = XLookupNone;
-		return 0;
-           }
-	   break;
-	}
-    }
-
-    if (!to || !to_len || (to_len < to_cnvlen)) {
-       *state = XBufferOverflow;
-    } else {
-       memcpy(to, scratchbuf, to_cnvlen);
-       *state = XLookupChars;
-    }
-    return to_cnvlen;
-}
-
-Public int
-_XimLcctstombs(XIM xim, char *from, int from_len,
-	       char *to, int to_len, Status *state)
-{
-    return _XimLcctsconvert(((Xim)xim)->private.local.ctom_conv,
-			    from, from_len, to, to_len, state);
-}
-
-Public int
-_XimLcctstowcs(XIM xim, char *from, int from_len,
-	       wchar_t *to, int to_len, Status *state)
-{
-    Xim		 im = (Xim)xim;
-    XlcConv	 conv = im->private.local.ctow_conv;
-    int		 from_left;
-    int		 to_left;
-    int		 from_savelen;
-    int		 to_savelen;
-    int		 from_cnvlen;
-    int		 to_cnvlen;
-    char	*from_buf;
-    wchar_t	*to_buf;
-    wchar_t	 scratchbuf[BUFSIZ];
-    Status	 tmp_state;
-
-    if (!state)
-	state = &tmp_state;
-
-    if (!conv || !from || !from_len) {
-	*state = XLookupNone;
-	return 0;
-    }
-
-    /* Reset the converter.  The CompoundText at 'from' starts in
-       initial state.  */
-    _XlcResetConverter(conv);
-
-    from_left = from_len;
-    to_left = BUFSIZ;
-    from_cnvlen = 0;
-    to_cnvlen = 0;
-    for (;;) {
-	from_buf = &from[from_cnvlen];
-       from_savelen = from_left;
-       to_buf = &scratchbuf[to_cnvlen];
-       to_savelen = to_left;
-	if (_XlcConvert(conv, (XPointer *)&from_buf, &from_left,
-				 (XPointer *)&to_buf, &to_left, NULL, 0) < 0) {
-	    *state = XLookupNone;
-	    return 0;
-	}
-	from_cnvlen += (from_savelen - from_left);
-       to_cnvlen += (to_savelen - to_left);
-	if (from_left == 0) {
-           if (!to_cnvlen){
-		*state = XLookupNone;
-               return 0;
-           }
-	    break;
-	}
-    }
-
-    if (!to || !to_len || (to_len < to_cnvlen)) {
-       *state = XBufferOverflow;
-    } else {
-       memcpy(to, scratchbuf, to_cnvlen * sizeof(wchar_t));
-       *state = XLookupChars;
-    }
-    return to_cnvlen;
-}
-
-Public int
-_XimLcctstoutf8(XIM xim, char *from, int from_len,
-		char *to, int to_len, Status *state)
-{
-    return _XimLcctsconvert(((Xim)xim)->private.local.ctoutf8_conv,
-			    from, from_len, to, to_len, state);
-}
+/******************************************************************

+

+              Copyright 1992 by Fuji Xerox Co., Ltd.

+              Copyright 1992, 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 Fuji Xerox,

+FUJITSU LIMITED not be used in advertising or publicity pertaining

+to distribution of the software without specific, written prior

+permission.  Fuji Xerox, FUJITSU LIMITED  make no representations

+about the suitability of this software for any purpose.

+It is provided "as is" without express or implied warranty.

+

+FUJI XEROX, FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH

+REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF

+MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL FUJI XEROX,

+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: Kazunori Nishihara   Fuji Xerox

+          Takashi Fujiwara     FUJITSU LIMITED

+                               fujiwara@a80.tech.yk.fujitsu.co.jp

+

+******************************************************************/

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include <stdio.h>

+#include <X11/Xatom.h>

+#include <X11/Xos.h>

+#include <X11/Xlib.h>

+#include <X11/keysym.h>

+#include <X11/Xutil.h>

+#include "Xlibint.h"

+#include "Xlcint.h"

+#include "XlcPubI.h"

+#include "Ximint.h"

+

+Public int

+_XimLocalMbLookupString(XIC xic, XKeyEvent *ev, char *buffer, int bytes,

+			KeySym *keysym, Status *status)

+{

+    Xic		 ic = (Xic)xic;

+    int		 ret;

+    DefTree	*b  = ic->private.local.base.tree;

+    char	*mb = ic->private.local.base.mb;

+

+    if(ev->type != KeyPress) {

+	if(status) *status = XLookupNone;

+	return(0);

+    }

+    if(ev->keycode == 0 &&

+	   (  (ic->private.local.composed != 0)

+	    ||(ic->private.local.brl_committed != 0))) {

+	if (ic->private.local.brl_committed != 0) { /* Braille Event */

+	    unsigned char pattern = ic->private.local.brl_committed;

+	    char *mb=alloca(XLC_PUBLIC(ic->core.im->core.lcd, mb_cur_max));

+	    ret = _Xlcwctomb(ic->core.im->core.lcd, mb, BRL_UC_ROW | pattern);

+	    if(ret > bytes) {

+		if(status) *status = XBufferOverflow;

+		return(ret);

+	    }

+	    if(keysym) *keysym = XK_braille_blank | pattern;

+	    if(ret > 0) {

+		if (keysym) {

+		    if(status) *status = XLookupBoth;

+		} else {

+		    if(status) *status = XLookupChars;

+		}

+		memcpy(buffer, mb, ret);

+	    } else {

+		if(keysym) {

+		    if(status) *status = XLookupKeySym;

+		} else {

+		    if(status) *status = XLookupNone;

+		}

+	    }

+	} else { /* Composed Event */

+	    ret = strlen(&mb[b[ic->private.local.composed].mb]);

+	    if(ret > bytes) {

+		if(status) *status = XBufferOverflow;

+		return(ret);

+	    }

+	    memcpy(buffer, &mb[b[ic->private.local.composed].mb], ret);

+	    if(keysym) *keysym = b[ic->private.local.composed].ks;

+	    if (ret > 0) {

+		if (keysym && *keysym != NoSymbol) {

+		    if(status) *status = XLookupBoth;

+		} else {

+		    if(status) *status = XLookupChars;

+		}

+	    } else {

+		if(keysym && *keysym != NoSymbol) {

+		    if(status) *status = XLookupKeySym;

+		} else {

+		    if(status) *status = XLookupNone;

+		}

+	    }

+	}

+	return (ret);

+    } else { /* Throughed Event */

+	ret = _XimLookupMBText(ic, ev, buffer, bytes, keysym, NULL);

+	if(ret > 0) {

+	    if (ret > bytes) {

+		if (status) *status = XBufferOverflow;

+	    } else if (keysym && *keysym != NoSymbol) {

+		if(status) *status = XLookupBoth;

+	    } else {

+		if(status) *status = XLookupChars;

+	    }

+	} else {

+	    if(keysym && *keysym != NoSymbol) {

+		if(status) *status = XLookupKeySym;

+	    } else {

+		if(status) *status = XLookupNone;

+	    }

+	}

+    }

+    return (ret);

+}

+

+Public int

+_XimLocalWcLookupString(XIC xic, XKeyEvent *ev, wchar_t *buffer, int wlen,

+			KeySym *keysym, Status *status)

+{

+    Xic		 ic = (Xic)xic;

+    int		 ret;

+    DefTree	*b  = ic->private.local.base.tree;

+    wchar_t	*wc = ic->private.local.base.wc;

+

+    if(ev->type != KeyPress) {

+	if(status) *status = XLookupNone;

+	return(0);

+    }

+    if(ev->keycode == 0) {

+	if (ic->private.local.brl_committed != 0) { /* Braille Event */

+	    unsigned char pattern = ic->private.local.brl_committed;

+	    ret = 1;

+	    if (ret > wlen) {

+		if(status) *status = XBufferOverflow;

+		return (ret);

+	    }

+	    *buffer = BRL_UC_ROW | pattern;

+	    if(keysym) {

+		*keysym = XK_braille_blank | pattern;

+		if(status) *status = XLookupBoth;

+	    } else

+		if(status) *status = XLookupChars;

+	} else { /* Composed Event */

+	    ret = _Xwcslen(&wc[b[ic->private.local.composed].wc]);

+	    if(ret > wlen) {

+		if(status) *status = XBufferOverflow;

+		return (ret);

+	    }

+	    memcpy((char *)buffer, (char *)&wc[b[ic->private.local.composed].wc],

+		   ret * sizeof(wchar_t));

+	    if(keysym) *keysym = b[ic->private.local.composed].ks;

+	    if (ret > 0) {

+		if (keysym && *keysym != NoSymbol) {

+		    if(status) *status = XLookupBoth;

+		} else {

+		    if(status) *status = XLookupChars;

+		}

+	    } else {

+		if(keysym && *keysym != NoSymbol) {

+		    if(status) *status = XLookupKeySym;

+		} else {

+		    if(status) *status = XLookupNone;

+		}

+	    }

+	}

+	return (ret);

+    } else { /* Throughed Event */

+	ret = _XimLookupWCText(ic, ev, buffer, wlen, keysym, NULL);

+	if(ret > 0) {

+	    if (ret > wlen) {

+		if (status) *status = XBufferOverflow;

+	    } else if (keysym && *keysym != NoSymbol) {

+		if(status) *status = XLookupBoth;

+	    } else {

+		if(status) *status = XLookupChars;

+	    }

+	} else {

+	    if(keysym && *keysym != NoSymbol) {

+		if(status) *status = XLookupKeySym;

+	    } else {

+		if(status) *status = XLookupNone;

+	    }

+	}

+    }

+    return (ret);

+}

+

+Public int

+_XimLocalUtf8LookupString(XIC xic, XKeyEvent *ev, char *buffer, int bytes,

+			  KeySym *keysym, Status *status)

+{

+    Xic		 ic = (Xic)xic;

+    int		 ret;

+    DefTree	*b    = ic->private.local.base.tree;

+    char	*utf8 = ic->private.local.base.utf8;

+

+    if(ev->type != KeyPress) {

+	if(status) *status = XLookupNone;

+	return(0);

+    }

+    if(ev->keycode == 0) {

+	if (ic->private.local.brl_committed != 0) { /* Braille Event */

+	    unsigned char pattern = ic->private.local.brl_committed;

+	    ret = 3;

+	    if (ret > bytes) {

+		if(status) *status = XBufferOverflow;

+		return (ret);

+	    }

+	    buffer[0] = 0xe0 | ((BRL_UC_ROW >> 12) & 0x0f);

+	    buffer[1] = 0x80 | ((BRL_UC_ROW >> 8) & 0x30) | (pattern >> 6);

+	    buffer[2] = 0x80 | (pattern & 0x3f);

+	    if(keysym) {

+		*keysym = XK_braille_blank | pattern;

+		if(status) *status = XLookupBoth;

+	    } else

+		if(status) *status = XLookupChars;

+	} else { /* Composed Event */

+	    ret = strlen(&utf8[b[ic->private.local.composed].utf8]);

+	    if(ret > bytes) {

+		if(status) *status = XBufferOverflow;

+		return (ret);

+	    }

+	    memcpy(buffer, &utf8[b[ic->private.local.composed].utf8], ret);

+	    if(keysym) *keysym = b[ic->private.local.composed].ks;

+	    if (ret > 0) {

+		if (keysym && *keysym != NoSymbol) {

+		    if(status) *status = XLookupBoth;

+		} else {

+		    if(status) *status = XLookupChars;

+		}

+	    } else {

+		if(keysym && *keysym != NoSymbol) {

+		    if(status) *status = XLookupKeySym;

+		} else {

+		    if(status) *status = XLookupNone;

+		}

+	    }

+	}

+	return (ret);

+    } else { /* Throughed Event */

+	ret = _XimLookupUTF8Text(ic, ev, buffer, bytes, keysym, NULL);

+	if(ret > 0) {

+	    if (ret > bytes) {

+		if (status) *status = XBufferOverflow;

+	    } else if (keysym && *keysym != NoSymbol) {

+		if(status) *status = XLookupBoth;

+	    } else {

+		if(status) *status = XLookupChars;

+	    }

+	} else {

+	    if(keysym && *keysym != NoSymbol) {

+		if(status) *status = XLookupKeySym;

+	    } else {

+		if(status) *status = XLookupNone;

+	    }

+	}

+    }

+    return (ret);

+}

+

+Private int

+_XimLcctsconvert(

+    XlcConv	 conv,

+    char	*from,

+    int		 from_len,

+    char	*to,

+    int		 to_len,

+    Status	*state)

+{

+    int		 from_left;

+    int		 to_left;

+    int		 from_savelen;

+    int		 to_savelen;

+    int		 from_cnvlen;

+    int		 to_cnvlen;

+    char	*from_buf;

+    char	*to_buf;

+    char	 scratchbuf[BUFSIZ];

+    Status	 tmp_state;

+

+    if (!state)

+	state = &tmp_state;

+

+    if (!conv || !from || !from_len) {

+	*state = XLookupNone;

+	return 0;

+    }

+

+    /* Reset the converter.  The CompoundText at 'from' starts in

+       initial state.  */

+    _XlcResetConverter(conv);

+

+    from_left = from_len;

+    to_left = BUFSIZ;

+    from_cnvlen = 0;

+    to_cnvlen = 0;

+    for (;;) {

+	from_buf = &from[from_cnvlen];

+	from_savelen = from_left;

+	to_buf = &scratchbuf[to_cnvlen];

+	to_savelen = to_left;

+	if (_XlcConvert(conv, (XPointer *)&from_buf, &from_left,

+				 (XPointer *)&to_buf, &to_left, NULL, 0) < 0) {

+	    *state = XLookupNone;

+	    return 0;

+	}

+	from_cnvlen += (from_savelen - from_left);

+	to_cnvlen += (to_savelen - to_left);

+	if (from_left == 0) {

+	    if (!to_cnvlen) {

+		*state = XLookupNone;

+		return 0;

+           }

+	   break;

+	}

+    }

+

+    if (!to || !to_len || (to_len < to_cnvlen)) {

+       *state = XBufferOverflow;

+    } else {

+       memcpy(to, scratchbuf, to_cnvlen);

+       *state = XLookupChars;

+    }

+    return to_cnvlen;

+}

+

+Public int

+_XimLcctstombs(XIM xim, char *from, int from_len,

+	       char *to, int to_len, Status *state)

+{

+    return _XimLcctsconvert(((Xim)xim)->private.local.ctom_conv,

+			    from, from_len, to, to_len, state);

+}

+

+Public int

+_XimLcctstowcs(XIM xim, char *from, int from_len,

+	       wchar_t *to, int to_len, Status *state)

+{

+    Xim		 im = (Xim)xim;

+    XlcConv	 conv = im->private.local.ctow_conv;

+    int		 from_left;

+    int		 to_left;

+    int		 from_savelen;

+    int		 to_savelen;

+    int		 from_cnvlen;

+    int		 to_cnvlen;

+    char	*from_buf;

+    wchar_t	*to_buf;

+    wchar_t	 scratchbuf[BUFSIZ];

+    Status	 tmp_state;

+

+    if (!state)

+	state = &tmp_state;

+

+    if (!conv || !from || !from_len) {

+	*state = XLookupNone;

+	return 0;

+    }

+

+    /* Reset the converter.  The CompoundText at 'from' starts in

+       initial state.  */

+    _XlcResetConverter(conv);

+

+    from_left = from_len;

+    to_left = BUFSIZ;

+    from_cnvlen = 0;

+    to_cnvlen = 0;

+    for (;;) {

+	from_buf = &from[from_cnvlen];

+       from_savelen = from_left;

+       to_buf = &scratchbuf[to_cnvlen];

+       to_savelen = to_left;

+	if (_XlcConvert(conv, (XPointer *)&from_buf, &from_left,

+				 (XPointer *)&to_buf, &to_left, NULL, 0) < 0) {

+	    *state = XLookupNone;

+	    return 0;

+	}

+	from_cnvlen += (from_savelen - from_left);

+       to_cnvlen += (to_savelen - to_left);

+	if (from_left == 0) {

+           if (!to_cnvlen){

+		*state = XLookupNone;

+               return 0;

+           }

+	    break;

+	}

+    }

+

+    if (!to || !to_len || (to_len < to_cnvlen)) {

+       *state = XBufferOverflow;

+    } else {

+       memcpy(to, scratchbuf, to_cnvlen * sizeof(wchar_t));

+       *state = XLookupChars;

+    }

+    return to_cnvlen;

+}

+

+Public int

+_XimLcctstoutf8(XIM xim, char *from, int from_len,

+		char *to, int to_len, Status *state)

+{

+    return _XimLcctsconvert(((Xim)xim)->private.local.ctoutf8_conv,

+			    from, from_len, to, to_len, state);

+}