diff -u -r kinput2-v3.1-beta4/include/Canna.h kinput2-v3.1-beta4-modified/include/Canna.h
--- kinput2-v3.1-beta4/include/Canna.h	Sun Jan 27 20:41:01 2002
+++ kinput2-v3.1-beta4-modified/include/Canna.h	Sat Sep 28 19:38:45 2002
@@ -63,7 +63,9 @@
 #define XtCCannafile	"Cannafile"
 #define XtNsendReturnByString     "sendReturnByString"
 #define XtCSendReturnByString     "SendReturnByString"
-
+#define XtNconversionEndKeys      "conversionEndKeys"
+#define XtCConversionEndKeys      "ConversionEndKeys"
+ 
 typedef struct _CannaClassRec	*CannaObjectClass;
 typedef struct _CannaRec	*CannaObject;
 
diff -u -r kinput2-v3.1-beta4/include/CannaP.h kinput2-v3.1-beta4-modified/include/CannaP.h
--- kinput2-v3.1-beta4/include/CannaP.h	Sun Jan 27 20:41:01 2002
+++ kinput2-v3.1-beta4-modified/include/CannaP.h	Sat Sep 28 19:38:45 2002
@@ -82,12 +82,21 @@
 #define CANNA_GLINE_End		2
 #define CANNA_GLINE_Change	3
 
+typedef struct _cKeyList {
+	KeySym ksym;
+	long mods;
+	long chk_mods;	
+	struct _cKeyList *next; 
+} cKeyList;
+
 typedef struct {
     /* resources */
     String	cannahost;
     String	cannafile;
     Boolean     sendReturnByString;
+	String  conversion_end_keys;
     /* private data */
+	cKeyList *conv_end_key_list;
     iBuf	*ibuf;
     Boolean	textchanged;	/* 変換テキストが変わったか */
     Boolean	selectionending;/* 選択モードを終了しようとしているか */
diff -u -r kinput2-v3.1-beta4/lib/Canna.c kinput2-v3.1-beta4-modified/lib/Canna.c
--- kinput2-v3.1-beta4/lib/Canna.c	Sun Jan 27 20:41:02 2002
+++ kinput2-v3.1-beta4-modified/lib/Canna.c	Sat Sep 28 20:40:53 2002
@@ -50,6 +50,9 @@
 static char *rcsid = "$Id: Canna.c,v 1.55 1999/05/25 08:13:03 ishisone Exp $";
 #endif
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
 #include <X11/Xmu/Atoms.h>
@@ -59,6 +62,7 @@
 #include <X11/Xfuncs.h>
 #endif
 #include "CannaP.h"
+#include "ParseKey.h"
 #include "DebugPrint.h"
 
 #define _WCHAR_T /* この定義は jrkanji.h で wcKanjiStatus などを定義するため */
@@ -68,13 +72,15 @@
 
 static XtResource resources[] = {
 #define offset(field) XtOffset(CannaObject, canna.field)
-    { XtNcannahost, XtCCannahost, XtRString, sizeof(String),
+	{ XtNcannahost, XtCCannahost, XtRString, sizeof(String),
 	offset(cannahost), XtRString, NULL },
-    { XtNcannafile, XtCCannafile, XtRString, sizeof(String),
+	{ XtNcannafile, XtCCannafile, XtRString, sizeof(String),
 	offset(cannafile), XtRString, NULL },
-    { XtNsendReturnByString, XtCSendReturnByString,
+	{ XtNsendReturnByString, XtCSendReturnByString,
 	XtRBoolean, sizeof(Boolean),
 	offset(sendReturnByString), XtRBoolean, False },
+	{ XtNconversionEndKeys, XtCConversionEndKeys, XtRString, sizeof(String),
+	offset(conversion_end_keys), XtRImmediate, NULL } 
 #undef offset
 };
 
@@ -124,61 +130,61 @@
 
 CannaClassRec cannaClassRec = {
   { /* object fields */
-    /* superclass		*/	(WidgetClass) &inputConvClassRec,
-    /* class_name		*/	"Canna",
-    /* widget_size		*/	sizeof(CannaRec),
-    /* class_initialize		*/	ClassInitialize,
-    /* class_part_initialize	*/	NULL,
-    /* class_inited		*/	FALSE,
-    /* initialize		*/	Initialize,
-    /* initialize_hook		*/	NULL,
-    /* obj1			*/	NULL,
-    /* obj2			*/	NULL,
-    /* obj3			*/	0,
-    /* resources		*/	resources,
-    /* num_resources		*/	XtNumber(resources),
-    /* xrm_class		*/	NULLQUARK,
-    /* obj4			*/	FALSE,
-    /* obj5			*/	FALSE,
-    /* obj6			*/	FALSE,
-    /* obj7			*/	FALSE,
-    /* destroy			*/	Destroy,
-    /* obj8			*/	NULL,
-    /* obj9			*/	NULL,
-    /* set_values		*/	SetValues,
-    /* set_values_hook		*/	NULL,
-    /* obj10			*/	NULL,
-    /* get_values_hook		*/	NULL,
-    /* obj11			*/	NULL,
-    /* version			*/	XtVersion,
-    /* callback_private		*/	NULL,
-    /* obj12			*/	NULL,
-    /* obj13			*/	NULL,
-    /* obj14			*/	NULL,
-    /* extension		*/	NULL
+	/* superclass		*/	(WidgetClass) &inputConvClassRec,
+	/* class_name		*/	"Canna",
+	/* widget_size		*/	sizeof(CannaRec),
+	/* class_initialize		*/	ClassInitialize,
+	/* class_part_initialize	*/	NULL,
+	/* class_inited		*/	FALSE,
+	/* initialize		*/	Initialize,
+	/* initialize_hook		*/	NULL,
+	/* obj1			*/	NULL,
+	/* obj2			*/	NULL,
+	/* obj3			*/	0,
+	/* resources		*/	resources,
+	/* num_resources		*/	XtNumber(resources),
+	/* xrm_class		*/	NULLQUARK,
+	/* obj4			*/	FALSE,
+	/* obj5			*/	FALSE,
+	/* obj6			*/	FALSE,
+	/* obj7			*/	FALSE,
+	/* destroy			*/	Destroy,
+	/* obj8			*/	NULL,
+	/* obj9			*/	NULL,
+	/* set_values		*/	SetValues,
+	/* set_values_hook		*/	NULL,
+	/* obj10			*/	NULL,
+	/* get_values_hook		*/	NULL,
+	/* obj11			*/	NULL,
+	/* version			*/	XtVersion,
+	/* callback_private		*/	NULL,
+	/* obj12			*/	NULL,
+	/* obj13			*/	NULL,
+	/* obj14			*/	NULL,
+	/* extension		*/	NULL
   },
   { /* inputConv fields */
-    /* InputEvent		*/	InputEvent,
-    /* GetMode			*/	GetMode,
-    /* CursorPos		*/	CursorPos,
-    /* NumSegments		*/	NumSegments,
-    /* GetSegment		*/	GetSegment,
-    /* CompareSegment		*/	CompareSegment,
-    /* GetItemList		*/	GetItemList,
-    /* SelectItem		*/	SelectItem,
-    /* GetConvertedString	*/	ConvertedString,
-    /* ClearConversion		*/	ClearConversion,
-    /* GetAuxSegments		*/	GetAuxSegments,
-    /* SupportMultipleObjects	*/	True,
-    /* GetTriggerKeys		*/	GetTriggerKeys,
-    /* num_trigger_keys		*/	0,
-    /* trigger_keys		*/	NULL,
-    /* GetPreeditString		*/	PreeditString,
-    /* GetStatusString		*/	StatusString,
-    /* NoMoreObjects		*/	False,
+	/* InputEvent		*/	InputEvent,
+	/* GetMode			*/	GetMode,
+	/* CursorPos		*/	CursorPos,
+	/* NumSegments		*/	NumSegments,
+	/* GetSegment		*/	GetSegment,
+	/* CompareSegment		*/	CompareSegment,
+	/* GetItemList		*/	GetItemList,
+	/* SelectItem		*/	SelectItem,
+	/* GetConvertedString	*/	ConvertedString,
+	/* ClearConversion		*/	ClearConversion,
+	/* GetAuxSegments		*/	GetAuxSegments,
+	/* SupportMultipleObjects	*/	True,
+	/* GetTriggerKeys		*/	GetTriggerKeys,
+	/* num_trigger_keys		*/	0,
+	/* trigger_keys		*/	NULL,
+	/* GetPreeditString		*/	PreeditString,
+	/* GetStatusString		*/	StatusString,
+	/* NoMoreObjects		*/	False,
   },
   { /* canna fields */
-    /* foo			*/	0,
+	/* foo			*/	0,
   }
 };
 
@@ -198,6 +204,14 @@
 
 static Display *displaybell = (Display *)0;
 
+static void bail_out( void );
+
+static void bail_out( void )
+{
+	fprintf( stderr, "FATAL: bailing out...\n" );
+	exit( -1 );
+} 
+
 static void
 ClassInitialize()
 {
@@ -207,7 +221,7 @@
 
 static int
 XKanaLookup(event_struct, buffer_return, bytes_buffer,
-	    keysym, status_return)
+		keysym, status_return)
 XKeyEvent *event_struct;
 char *buffer_return;
 int bytes_buffer;
@@ -216,10 +230,10 @@
 {
   int res;
   res = XLookupString(event_struct, buffer_return, bytes_buffer,
-		      keysym, status_return);
+			  keysym, status_return);
   if (!res && XK_overline <= *keysym && *keysym <= XK_semivoicedsound) {
-    buffer_return[0] = (unsigned long)(*keysym) & 0xff;
-    res = 1;
+	buffer_return[0] = (unsigned long)(*keysym) & 0xff;
+	res = 1;
   }
   return res;
 }
@@ -229,52 +243,62 @@
 Widget w;
 XEvent *event;
 {
-    CannaObject obj = (CannaObject)w;
-    wchar buf[1024];
-    char kanabuf[20];
-    KeySym ks;
-    XComposeStatus   compose_status;
-    wcKanjiStatus    kanji_status;
-    int len, nbytes, functionalChar;
-
-    /* KeyPress以外は捨てる */
-    if (event->type != KeyPress /*&& event->type != KeyRelease*/) return 0;
-
-    obj->canna.textchanged = False;
-
-    /* 取りあえず文字に直してしまう */
-    kanabuf[0] = '\0';
-    nbytes = XKanaLookup(event, kanabuf, 20, &ks, &compose_status);
+	CannaObject obj = (CannaObject)w;
+	wchar buf[1024];
+	char kanabuf[20];
+	KeySym ks;
+	XComposeStatus   compose_status;
+	wcKanjiStatus	kanji_status;
+	int len, nbytes, functionalChar;
+
+	/* KeyPress以外は捨てる */
+	if (event->type != KeyPress /*&& event->type != KeyRelease*/) return 0;
 
-    buf[0] = (wchar)kanabuf[0]; /* きたない */
+	obj->canna.textchanged = False;
 
-    if (ks == XK_space && (event->xkey.state & ShiftMask)) {
+	/* 取りあえず文字に直してしまう */
+	kanabuf[0] = '\0';
+	nbytes = XKanaLookup(event, kanabuf, 20, &ks, &compose_status);
+
+	buf[0] = (wchar)kanabuf[0]; /* きたない */
+
+	if ( obj->canna.conv_end_key_list != NULL ) {
+		cKeyList *listelem;
+		for ( listelem=obj->canna.conv_end_key_list; listelem!=NULL; listelem=listelem->next ) {
+			if (ks == listelem->ksym && event->xkey.state == listelem->mods) {
+				void convend();
+
+				convend(obj);
+				return 0;
+			}
+		}
+	} else if (ks == XK_space && (event->xkey.state & ShiftMask)) {
       void convend();
 
       convend(obj);
       return 0;
     }
 
-    /* 長さがゼロのものに関してはちょっと救済 */
-    functionalChar = checkIfFunctionalChar(event, ks, buf, 1024);
-    /* shift+→のような文字だったら１文字と数える */
-    if ( !nbytes && functionalChar ) {
-      nbytes = 1;
-    }
+	/* 長さがゼロのものに関してはちょっと救済 */
+	functionalChar = checkIfFunctionalChar(event, ks, buf, 1024);
+	/* shift+→のような文字だったら１文字と数える */
+	if ( !nbytes && functionalChar ) {
+	  nbytes = 1;
+	}
 
-    /* 要らない場合は無視する */
-    if (nbytes == 0) return 1;
+	/* 要らない場合は無視する */
+	if (nbytes == 0) return 1;
 
-    /* ベルを鳴らすディスプレイの設定 */
+	/* ベルを鳴らすディスプレイの設定 */
  
-    displaybell = XtDisplayOfObject((Widget)obj);
+	displaybell = XtDisplayOfObject((Widget)obj);
 
-    /* かな漢字変換する */
-    len = wcKanjiString((int)obj, (int)buf[0],
+	/* かな漢字変換する */
+	len = wcKanjiString((int)obj, (int)buf[0],
 			(wchar_t *)buf, 1024, &kanji_status);
 
-    displayPreEdit(obj, len, buf, &kanji_status);
-    return (kanji_status.info & KanjiThroughInfo) ? 1 : 0;
+	displayPreEdit(obj, len, buf, &kanji_status);
+	return (kanji_status.info & KanjiThroughInfo) ? 1 : 0;
 }
 
 static void
@@ -284,91 +308,91 @@
 wchar *buf;
 wcKanjiStatus *ks;
 {
-    Widget w = (Widget)obj;
+	Widget w = (Widget)obj;
 
-    if (len > 0) { /* 確定文字がある場合 */
-      if (len == 1 && (ks->info & KanjiThroughInfo) &&
+	if (len > 0) { /* 確定文字がある場合 */
+	  if (len == 1 && (ks->info & KanjiThroughInfo) &&
 	  (obj->canna.sendReturnByString == False ||
 	   (((buf[0] & 0x7f) < (unsigned)0x20 &&
-	     buf[0] != '\r' && buf[0] != '\t') ||
-	    buf[0] == '\177'))) {
+		 buf[0] != '\r' && buf[0] != '\t') ||
+		buf[0] == '\177'))) {
 	;/* XSendEventで送ってもらうような文字(何もしない) */
-      }
-      else {
+	  }
+	  else {
 	ks->info &= ~KanjiThroughInfo;
 	fixProcForCanna(obj, buf, len);
 	fix(obj);
-      }
-    }
+	  }
+	}
 
-    changeTextForCanna(obj, ks);
+	changeTextForCanna(obj, ks);
 
-    /* テキストの変化をチェックする */
-    if (obj->canna.textchanged) {
+	/* テキストの変化をチェックする */
+	if (obj->canna.textchanged) {
 	XtCallCallbackList(w, obj->inputConv.textchangecallback,
 			   (XtPointer)NULL);
 	obj->canna.textchanged = False;
-    }
+	}
 
-    /* 入力モードをチェックする */
-    if (ks->info & KanjiModeInfo) {
-      XtCallCallbackList(w, obj->inputConv.modechangecallback,
+	/* 入力モードをチェックする */
+	if (ks->info & KanjiModeInfo) {
+	  XtCallCallbackList(w, obj->inputConv.modechangecallback,
 			 (XtPointer)NULL);
-    }
+	}
 
-    if (ks->info & KanjiGLineInfo) { /* 一覧行がある場合 */
-      ICAuxControlArg arg;
+	if (ks->info & KanjiGLineInfo) { /* 一覧行がある場合 */
+	  ICAuxControlArg arg;
 
-      switch (obj->canna.ibuf->candstat) {
-      case CANNA_GLINE_Start:
+	  switch (obj->canna.ibuf->candstat) {
+	  case CANNA_GLINE_Start:
 	arg.command = ICAuxStart;
 	XtCallCallbackList((Widget)obj, obj->inputConv.auxcallback,
 			   (XtPointer)&arg);
 	break;
-      case CANNA_GLINE_End:
+	  case CANNA_GLINE_End:
 	arg.command = ICAuxEnd;
 	XtCallCallbackList((Widget)obj, obj->inputConv.auxcallback,
 			   (XtPointer)&arg);
 	break;
-      case CANNA_GLINE_Change:
+	  case CANNA_GLINE_Change:
 	arg.command = ICAuxChange;
 	XtCallCallbackList((Widget)obj, obj->inputConv.auxcallback,
 			   (XtPointer)&arg);
 	break;
-      }
-    }
+	  }
+	}
 
-    /* 終わりかどうかチェックする */
-    if (ks->info & KanjiModeInfo) {
-      wchar modeinfo[4];
-
-      wcKanjiControl((int)obj, KC_SETMODEINFOSTYLE, (char *)1);
-      wcKanjiControl((int)obj, KC_QUERYMODE, (char *)modeinfo);
-      wcKanjiControl((int)obj, KC_SETMODEINFOSTYLE, (char *)0);
-      if (modeinfo[0] - '@' == CANNA_MODE_AlphaMode) {
+	/* 終わりかどうかチェックする */
+	if (ks->info & KanjiModeInfo) {
+	  wchar modeinfo[4];
+
+	  wcKanjiControl((int)obj, KC_SETMODEINFOSTYLE, (char *)1);
+	  wcKanjiControl((int)obj, KC_QUERYMODE, (char *)modeinfo);
+	  wcKanjiControl((int)obj, KC_SETMODEINFOSTYLE, (char *)0);
+	  if (modeinfo[0] - '@' == CANNA_MODE_AlphaMode) {
 	toJapaneseMode(obj);
 	convend(obj);
-      }
-    }
-    openSelection(obj, SELECTION_DO, 0/* dummy */);
+	  }
+	}
+	openSelection(obj, SELECTION_DO, 0/* dummy */);
 }
 
 static ICString *
 GetMode(w)
 Widget w;
 {
-    CannaObject obj = (CannaObject)w;
-    wchar *mode;
-    static ICString icstr;
-
-    icstr.nchars = obj->canna.ibuf->modelen;
-    if (icstr.nchars > 0) {
-      mode = obj->canna.ibuf->curmode;
-      icstr.data = (char *)mode;
-      icstr.nbytes = icstr.nchars * sizeof(wchar);
-      icstr.attr = ICAttrNormalString;
-    }
-    return &icstr;
+	CannaObject obj = (CannaObject)w;
+	wchar *mode;
+	static ICString icstr;
+
+	icstr.nchars = obj->canna.ibuf->modelen;
+	if (icstr.nchars > 0) {
+	  mode = obj->canna.ibuf->curmode;
+	  icstr.data = (char *)mode;
+	  icstr.nbytes = icstr.nchars * sizeof(wchar);
+	  icstr.attr = ICAttrNormalString;
+	}
+	return &icstr;
 }
 
 static int
@@ -377,38 +401,38 @@
 Cardinal *nsegp;
 Cardinal *ncharp;
 {
-    CannaObject obj = (CannaObject)w;
-    iBuf *ib = obj->canna.ibuf;
-    Cardinal nseg, nchar;
-    int ret = 0;
-
-    if (ib->curseg < ib->nseg) {
-      nseg = ib->curseg;
-      nchar = 0;
-    }
-    else {
-      nseg = ib->offset;
-      nchar = ib->len[0 + ib->offset];
-      ret = 1;
-    }
-    if (nsegp) {
-      *nsegp = nseg;
-    }
-    if (ncharp) {
-      *ncharp = nchar;
-    }
+	CannaObject obj = (CannaObject)w;
+	iBuf *ib = obj->canna.ibuf;
+	Cardinal nseg, nchar;
+	int ret = 0;
+
+	if (ib->curseg < ib->nseg) {
+	  nseg = ib->curseg;
+	  nchar = 0;
+	}
+	else {
+	  nseg = ib->offset;
+	  nchar = ib->len[0 + ib->offset];
+	  ret = 1;
+	}
+	if (nsegp) {
+	  *nsegp = nseg;
+	}
+	if (ncharp) {
+	  *ncharp = nchar;
+	}
 
-    return ret;
+	return ret;
 }
 
 static int
 NumSegments(w)
 Widget w;
 {
-    CannaObject obj = (CannaObject)w;
-    iBuf *ib = obj->canna.ibuf;
+	CannaObject obj = (CannaObject)w;
+	iBuf *ib = obj->canna.ibuf;
 
-    return ib->nseg;
+	return ib->nseg;
 }
 
 static ICString *
@@ -416,24 +440,24 @@
 Widget w;
 Cardinal n;
 {
-    CannaObject obj = (CannaObject)w;
-    iBuf *ib = obj->canna.ibuf;
-    static ICString seg;
-
-    seg.data = (char *)ib->str[n];
-    seg.nchars = ib->len[n];
-    seg.nbytes = seg.nchars * sizeof(wchar);
-    if (ib->curseg == n) {
-      seg.attr = ICAttrConverted | ICAttrCurrentSegment;
-    }
-    else if (n < ib->offset) {
-      seg.attr = ICAttrConverted;
-    }
-    else {
-      seg.attr = ICAttrNotConverted;
-    }
+	CannaObject obj = (CannaObject)w;
+	iBuf *ib = obj->canna.ibuf;
+	static ICString seg;
+
+	seg.data = (char *)ib->str[n];
+	seg.nchars = ib->len[n];
+	seg.nbytes = seg.nchars * sizeof(wchar);
+	if (ib->curseg == n) {
+	  seg.attr = ICAttrConverted | ICAttrCurrentSegment;
+	}
+	else if (n < ib->offset) {
+	  seg.attr = ICAttrConverted;
+	}
+	else {
+	  seg.attr = ICAttrNotConverted;
+	}
 
-    return &seg;
+	return &seg;
 }
 
 /* ARGSUSED */
@@ -444,24 +468,24 @@
 ICString *seg2;
 Cardinal *n;
 {
-    wchar *p, *q;
-    int len, nsame;
-    int result = 0;
-
-    if (seg1->attr != seg2->attr) result |= ICAttrChanged;
-
-    len = seg1->nchars > seg2->nchars ? seg2->nchars : seg1->nchars;
-    nsame = 0;
-    p = (wchar *)seg1->data;
-    q = (wchar *)seg2->data;
-    while (nsame < len && *p++ == *q++) nsame++;
+	wchar *p, *q;
+	int len, nsame;
+	int result = 0;
+
+	if (seg1->attr != seg2->attr) result |= ICAttrChanged;
+
+	len = seg1->nchars > seg2->nchars ? seg2->nchars : seg1->nchars;
+	nsame = 0;
+	p = (wchar *)seg1->data;
+	q = (wchar *)seg2->data;
+	while (nsame < len && *p++ == *q++) nsame++;
 
-    if (nsame != len || len != seg1->nchars || len != seg2->nchars)
+	if (nsame != len || len != seg1->nchars || len != seg2->nchars)
 	result |= ICStringChanged;
 
-    if (n) *n = nsame;
+	if (n) *n = nsame;
 
-    return result;
+	return result;
 }
 
 static ICString *
@@ -469,10 +493,10 @@
 Widget w;
 Cardinal *n;
 {
-    CannaObject obj = (CannaObject)w;
+	CannaObject obj = (CannaObject)w;
 
-    *n = obj->canna.numcand;
-    return obj->canna.candlist;
+	*n = obj->canna.numcand;
+	return obj->canna.candlist;
 }
 
 #define SELECTBUFSIZE 1024
@@ -488,7 +512,7 @@
   wchar buf[SELECTBUFSIZE];
 
   if (n >= 0)
-    *(obj->canna.cur_addr) = n;
+	*(obj->canna.cur_addr) = n;
 
   ksv.ks = &ks;
   buf[0] = (wchar)'\r';
@@ -496,9 +520,9 @@
   ksv.n_buffer = SELECTBUFSIZE;
   ksv.val = CANNA_FN_Kakutei;
   {
-    ignoreListfunc = 1;
-    wcKanjiControl((int)obj, KC_DO, (char *)&ksv);
-    ignoreListfunc = 0;
+	ignoreListfunc = 1;
+	wcKanjiControl((int)obj, KC_DO, (char *)&ksv);
+	ignoreListfunc = 0;
   }
   displayPreEdit(obj, ksv.val, buf, ksv.ks);
   return 0;
@@ -512,41 +536,43 @@
 int *length;
 XtPointer *string;
 {
-    CannaObject obj = (CannaObject)w;
-    iBuf *ib = obj->canna.ibuf;
-    wchar *wbuf, *wp;
-    int len, wlen;
-    extern int convJWStoCT();
-    int offset = ib->offset;
-
-    if (ib == NULL) return -1;
-
-    if (ib->nseg == 0 || ib->offset == 0) return -1;
-
-    wlen = ib->len[offset - 1];
-    if (wlen == 0) return -1;
-
-    wbuf = ib->str[offset - 1];
-
-    /*
-     * Canna オブジェクトは COMPOUND_TEXT エンコーディングしかサポートしない
-     * COMPOUND_TEXT に変換する
-     */
-    *encoding = XA_COMPOUND_TEXT(XtDisplayOfObject((Widget)obj));
-    *format = 8;
+	CannaObject obj = (CannaObject)w;
+	iBuf *ib = obj->canna.ibuf;
+	wchar *wbuf, *wp;
+	int len, wlen;
+	extern int convJWStoCT();
+	int offset = ib->offset;
+
+	if (ib == NULL) return -1;
+
+	if (ib->nseg == 0 || ib->offset == 0) return -1;
+
+	wlen = ib->len[offset - 1];
+	if (wlen == 0) return -1;
+
+	wbuf = ib->str[offset - 1];
+
+	/*
+	 * Canna オブジェクトは COMPOUND_TEXT エンコーディングしかサポートしない
+	 * COMPOUND_TEXT に変換する
+	 */
+	*encoding = XA_COMPOUND_TEXT(XtDisplayOfObject((Widget)obj));
+	*format = 8;
 
-    /* COMPOUND_TEXT は \r が送れないので \n に変換しておく */
-    for (wp = wbuf; *wp != 0; wp++) {
+	/* COMPOUND_TEXT は \r が送れないので \n に変換しておく */
+	for (wp = wbuf; *wp != 0; wp++) {
 	if (*wp == '\r') *wp = '\n';
-    }
+	}
 
-    *length = len = convJWStoCT(wbuf, (unsigned char *)NULL, 0);
-    *string = XtMalloc(len + 1);
-    (void)convJWStoCT(wbuf, (unsigned char *)*string, 0);
+	*length = len = convJWStoCT(wbuf, (unsigned char *)NULL, 0);
+	if ( ( *string = XtMalloc(len + 1) ) == NULL ) {
+		bail_out();
+	}
+	(void)convJWStoCT(wbuf, (unsigned char *)*string, 0);
 
-    shiftLeftAll(ib);
+	shiftLeftAll(ib);
 
-    return 0;
+	return 0;
 }
 
 static int
@@ -577,22 +603,22 @@
   Cardinal nseg, nchar;
 
   if (n) {
-    *n = ib->ngseg;
+	*n = ib->ngseg;
   }
 
   if (ib->curgseg < ib->ngseg) {
-    nseg = ib->curgseg;
-    nchar = 0;
+	nseg = ib->curgseg;
+	nchar = 0;
   }
   else {
-    nseg = 0;
-    nchar = ib->gllen[0];
+	nseg = 0;
+	nchar = ib->gllen[0];
   }
   if (ns) {
-    *ns = nseg;
+	*ns = nseg;
   }
   if (nc) {
-    *nc = nchar;
+	*nc = nchar;
   }
 
   return ib->ics;
@@ -606,31 +632,92 @@
 ArgList args;
 Cardinal *num_args;
 {
-    CannaObject obj = (CannaObject)new;
+	CannaObject obj = (CannaObject)new;
 
-    obj->canna.selectionending = False;
-    obj->canna.textchanged = False;
-    obj->canna.symbollist = SymbolList;
-    obj->canna.numsymbols = NumSymbols;
-    obj->canna.cursymbol = 0;
-    obj->canna.candlist = NULL;
-    obj->canna.candlistsize = 0;
-    obj->canna.numcand = 0;
-    obj->canna.lastTextLengthIsZero = False;
-      
-    ibufInitialize(obj);
+	obj->canna.selectionending = False;
+	obj->canna.textchanged = False;
+	obj->canna.symbollist = SymbolList;
+	obj->canna.numsymbols = NumSymbols;
+	obj->canna.cursymbol = 0;
+	obj->canna.candlist = NULL;
+	obj->canna.candlistsize = 0;
+	obj->canna.numcand = 0;
+	obj->canna.lastTextLengthIsZero = False;
+   	obj->canna.conv_end_key_list = NULL;
+
+	if ( obj->canna.conversion_end_keys != NULL ) {
+		char *p = obj->canna.conversion_end_keys;
+		char *buf = NULL;
+		size_t buf_size = 0;
+		cKeyList *prev_key_listelem = NULL, *new_key_listelem;
+
+		while ( *p != '\0' ) {
+			KeySym ksym;
+			long mods, chk_mods;
+			unsigned int comp_len;
+
+			comp_len = strlen( p ) + 1;
+			if ( buf_size < comp_len ) {
+				char *new_buf;
+				if ( ( new_buf = XtRealloc( buf, comp_len * sizeof(char) ) ) == NULL ) {
+					if ( buf != NULL ) XtFree( buf );
+					if ( obj->canna.conv_end_key_list != NULL ) {
+						cKeyList *listelem = obj->canna.conv_end_key_list;
+						while ( listelem != NULL) {
+							cKeyList *next_elem = listelem->next;
+							XtFree( (char *)listelem );
+							listelem = next_elem;
+						}
+					}
+					bail_out();
+				}
+				buf = new_buf;
+				buf_size = comp_len;
+			}
+			memcpy( buf, p, comp_len );
+
+			if ( ParseKeyEvent( buf, &ksym, &mods, &chk_mods ) ) {
+				if ( ( new_key_listelem = (cKeyList *)XtMalloc( sizeof(cKeyList) ) ) == NULL ) {
+					if ( buf != NULL ) XtFree( buf );
+					if ( obj->canna.conv_end_key_list != NULL ) {
+						cKeyList *listelem = obj->canna.conv_end_key_list;
+						while ( listelem != NULL) {
+							cKeyList *next_elem = listelem->next;
+							XtFree( (char *)listelem );
+							listelem = next_elem;
+						}
+					}
+					bail_out();
+				}
+				new_key_listelem->ksym = ksym;
+				new_key_listelem->mods = mods;
+				new_key_listelem->chk_mods = chk_mods;
+				new_key_listelem->next = NULL;
+				if ( prev_key_listelem == NULL ) {
+					obj->canna.conv_end_key_list = new_key_listelem;
+				} else {
+					prev_key_listelem->next = new_key_listelem;
+				}
+				prev_key_listelem = new_key_listelem;
+			}
+			p += comp_len;
+		}
+		if ( buf != NULL ) XtFree( (char *)buf );
+	}
+
+	ibufInitialize(obj);
 
-    /* 変換の初期化 */
-    initializeCannaConnection(obj);
+	/* 変換の初期化 */
+	initializeCannaConnection(obj);
 
-    addObject(obj);
+	addObject(obj);
 }
 
 static int
 bell()
 {
   if (displaybell) {
-    XBell(displaybell, 0);
+	XBell(displaybell, 0);
   }
   return 0;
 }
@@ -646,26 +733,26 @@
 
   if (nCannaContexts == 0) {
 #ifdef KC_SETSERVERNAME
-    if (obj->canna.cannahost != NULL) {
-      wcKanjiControl((int)obj, KC_SETSERVERNAME, obj->canna.cannahost);
-    }
+	if (obj->canna.cannahost != NULL) {
+	  wcKanjiControl((int)obj, KC_SETSERVERNAME, obj->canna.cannahost);
+	}
 #endif /* KC_SETSERVERNAME */
 #ifdef KC_SETINITFILENAME
-    if (obj->canna.cannafile != NULL) {
-      wcKanjiControl((int)obj, KC_SETINITFILENAME, obj->canna.cannafile);
-    }
+	if (obj->canna.cannafile != NULL) {
+	  wcKanjiControl((int)obj, KC_SETINITFILENAME, obj->canna.cannafile);
+	}
 #endif /* KC_SETINITFILENAME */
   
-    wcKanjiControl((int)obj, KC_INITIALIZE, (char *)&warn);
-    TRACE(("Canna initialized\n"));
+	wcKanjiControl((int)obj, KC_INITIALIZE, (char *)&warn);
+	TRACE(("Canna initialized\n"));
 
-    if (warn) {
-      char **p;
-    
-      for (p = warn; *p ; p++) {
+	if (warn) {
+	  char **p;
+	
+	  for (p = warn; *p ; p++) {
 	XtAppWarning(XtWidgetToApplicationContext((Widget)obj), *p);
-      }
-    }
+	  }
+	}
   }
   nCannaContexts++;
 
@@ -685,11 +772,11 @@
 
 #ifdef KC_SETLISTCALLBACK
   {
-    jrListCallbackStruct lcs;
+	jrListCallbackStruct lcs;
 
-    lcs.client_data = (char *)obj;
-    lcs.callback_func = listfunc;
-    wcKanjiControl((int)obj, KC_SETLISTCALLBACK, (char *)&lcs);
+	lcs.client_data = (char *)obj;
+	lcs.callback_func = listfunc;
+	wcKanjiControl((int)obj, KC_SETLISTCALLBACK, (char *)&lcs);
   }
 #endif /* KC_SETLISTCALLBACK */
 
@@ -704,47 +791,55 @@
 Destroy(w)
 Widget w;
 {
-    CannaObject obj = (CannaObject)w;
-    wcKanjiStatusWithValue ksv;
-    wcKanjiStatus ks;
-    wchar buf[512];
-    int i;
-    
-    /* バッファの解放 */
+	CannaObject obj = (CannaObject)w;
+	wcKanjiStatusWithValue ksv;
+	wcKanjiStatus ks;
+	wchar buf[512];
+	int i;
+	
+	/* バッファの解放 */
+	if ( obj->canna.conv_end_key_list != NULL ) {
+		cKeyList *listelem = obj->canna.conv_end_key_list;
+		while ( listelem != NULL) {
+			cKeyList *next_elem = listelem->next;
+			XtFree( (char*)listelem );
+			listelem = next_elem;
+		}
+	}
 
-    freeIBuf(obj->canna.ibuf);
+	freeIBuf(obj->canna.ibuf);
 
-    if (obj->canna.candlist) {
-      for (i = 0 ; i < obj->canna.candlistsize ; i++) {
+	if (obj->canna.candlist) {
+	  for (i = 0 ; i < obj->canna.candlistsize ; i++) {
 	if ((obj->canna.candlist + i)->data) {
 	  XtFree((obj->canna.candlist + i)->data);
 	}
-      }
+	  }
 
-      XtFree((char *)obj->canna.candlist);
-    }
+	  XtFree((char *)obj->canna.candlist);
+	}
 
-    /* 『かんな』の処理 */
-    ksv.buffer = buf;
-    ksv.n_buffer = 512;
-    ksv.ks = &ks;
+	/* 『かんな』の処理 */
+	ksv.buffer = buf;
+	ksv.n_buffer = 512;
+	ksv.ks = &ks;
 
-    wcKanjiControl((int)obj, KC_CLOSEUICONTEXT, (char *)&ksv);
+	wcKanjiControl((int)obj, KC_CLOSEUICONTEXT, (char *)&ksv);
 
-    if (--nCannaContexts == 0) {
-      char **warn = 0;
+	if (--nCannaContexts == 0) {
+	  char **warn = 0;
 
-      wcKanjiControl(0, KC_FINALIZE, (char *)&warn);
-      if (warn) {
+	  wcKanjiControl(0, KC_FINALIZE, (char *)&warn);
+	  if (warn) {
 	char **p;
 	
 	for (p = warn; *p ; p++) {
 	  XtAppWarning(XtWidgetToApplicationContext((Widget)obj), *p);
 	}
-      }
-    }
+	  }
+	}
 
-    deleteObject(obj);
+	deleteObject(obj);
 }
 
 static Boolean
@@ -756,35 +851,35 @@
 Cardinal *num_args;
 /* ARGSUSED */
 {
-    CannaObject old = (CannaObject)cur;
-    CannaObject new = (CannaObject)wid;
+	CannaObject old = (CannaObject)cur;
+	CannaObject new = (CannaObject)wid;
 
-    return False;	     
+	return False;		 
 }
 
 static void
 fix(obj)
 CannaObject obj;
 {
-    /* 確定の処理 */
-    XtCallCallbackList((Widget)obj, obj->inputConv.fixcallback,
-		       (XtPointer)NULL);	/* ？？？ */
+	/* 確定の処理 */
+	XtCallCallbackList((Widget)obj, obj->inputConv.fixcallback,
+			   (XtPointer)NULL);	/* ？？？ */
 }
 
 static void
 convend(obj)
 CannaObject obj;
 {
-    XtCallCallbackList((Widget)obj, obj->inputConv.endcallback,
-		       (XtPointer)NULL);
+	XtCallCallbackList((Widget)obj, obj->inputConv.endcallback,
+			   (XtPointer)NULL);
 }
 
 /*
  * keeping list of objects
  */
 typedef struct _oblist_ {
-    CannaObject obj;
-    struct _oblist_ *next;
+	CannaObject obj;
+	struct _oblist_ *next;
 } ObjRec;
 
 static ObjRec *ObjList = NULL;
@@ -793,32 +888,32 @@
 addObject(obj)
 CannaObject obj;
 {
-    ObjRec *objp = XtNew(ObjRec);
+	ObjRec *objp = XtNew(ObjRec);
 
-    objp->obj = obj;
-    objp->next = ObjList;
-    ObjList = objp;
+	objp->obj = obj;
+	objp->next = ObjList;
+	ObjList = objp;
 }
 
 static void
 deleteObject(obj)
 CannaObject obj;
 {
-    ObjRec *objp, *objp0;
+	ObjRec *objp, *objp0;
 
-    for (objp0 = NULL, objp = ObjList;
+	for (objp0 = NULL, objp = ObjList;
 	 objp != NULL;
 	 objp0 = objp, objp = objp->next) {
 	if (objp->obj == obj) {
-	    if (objp0 == NULL) {
+		if (objp0 == NULL) {
 		ObjList = objp->next;
-	    } else {
+		} else {
 		objp0->next = objp->next;
-	    }
-	    XtFree((char *)objp);
-	    return;
+		}
+		XtFree((char *)objp);
+		return;
+	}
 	}
-    }
 }
 
 /*
@@ -833,13 +928,13 @@
    基本的には候補文字列と候補一覧行文字列に関して以下の処理を行う。
 
    (1) いずれの文字列もテキストが反転している部分とそうでない部分
-       が存在し、反転している部分は１カ所しか存在しない。
+	   が存在し、反転している部分は１カ所しか存在しない。
    (2) したがっていずれの文字列も反転しているところとその両端に反転
-       していない部分とが存在する場合に３部分に分かれることになり、
-       反転している部分の位置や、反転している箇所がない場合などを
-       合わせて考えても３部分以上に分かれることはない。
+	   していない部分とが存在する場合に３部分に分かれることになり、
+	   反転している部分の位置や、反転している箇所がない場合などを
+	   合わせて考えても３部分以上に分かれることはない。
    (3) したがって、いずれの文字列も最大３つのセグメントに分けて表示
-       ウィジェットに渡すようにする。
+	   ウィジェットに渡すようにする。
 
  */
 
@@ -848,80 +943,80 @@
 caddr_t cldata;
 wcKanjiStatus *ksp;
 {
-    CannaObject obj = (CannaObject)cldata;
-    iBuf *ibuf = obj->canna.ibuf;
-    int offset = ibuf->offset, i;
-
-    if (ksp->length == 0) {
-      ibuf->curseg = offset;
-      ibuf->nseg = offset;
-      ibuf->len[0 + offset] = ibuf->len[1 + offset] =
+	CannaObject obj = (CannaObject)cldata;
+	iBuf *ibuf = obj->canna.ibuf;
+	int offset = ibuf->offset, i;
+
+	if (ksp->length == 0) {
+	  ibuf->curseg = offset;
+	  ibuf->nseg = offset;
+	  ibuf->len[0 + offset] = ibuf->len[1 + offset] =
 	ibuf->len[2 + offset] = 0;
-      if (!obj->canna.lastTextLengthIsZero) {
+	  if (!obj->canna.lastTextLengthIsZero) {
 	obj->canna.textchanged = True;
 	obj->canna.lastTextLengthIsZero = True;
-      }
-    }
-    else if (ksp->length > 0) {
-      obj->canna.lastTextLengthIsZero = False;
-      ibuf->len[1 + offset] = ibuf->len[2 + offset] = 0;
-      if (ksp->revLen > 0) {
+	  }
+	}
+	else if (ksp->length > 0) {
+	  obj->canna.lastTextLengthIsZero = False;
+	  ibuf->len[1 + offset] = ibuf->len[2 + offset] = 0;
+	  if (ksp->revLen > 0) {
 	if (ksp->revPos == 0) {
 	  int remain = ksp->length - ksp->revLen;
 
 	  copyInWchar(ksp->echoStr, ksp->revLen,
-		      &(ibuf->str[0 + offset]), &(ibuf->size[0 + offset]),
-		      &(ibuf->len[0 + offset]));
+			  &(ibuf->str[0 + offset]), &(ibuf->size[0 + offset]),
+			  &(ibuf->len[0 + offset]));
 	  ibuf->curseg = offset;
 	  ibuf->nseg = offset + 1;
 	  if (remain) {
-	    copyInWchar(ksp->echoStr + ksp->revLen, remain,
+		copyInWchar(ksp->echoStr + ksp->revLen, remain,
 			&(ibuf->str[1 + offset]), &(ibuf->size[1 + offset]),
 			&(ibuf->len[1 + offset]));
-	    ibuf->nseg = offset + 2;
+		ibuf->nseg = offset + 2;
 	  }
 	}
 	else {
 	  int remain = ksp->length - ksp->revPos - ksp->revLen;
 
 	  copyInWchar(ksp->echoStr, ksp->revPos,
-		      &(ibuf->str[0 + offset]), &(ibuf->size[0 + offset]),
-		      &(ibuf->len[0 + offset]));
+			  &(ibuf->str[0 + offset]), &(ibuf->size[0 + offset]),
+			  &(ibuf->len[0 + offset]));
 	  copyInWchar(ksp->echoStr + ksp->revPos, ksp->revLen,
-		      &(ibuf->str[1 + offset]), &(ibuf->size[1 + offset]),
-		      &(ibuf->len[1 + offset]));
+			  &(ibuf->str[1 + offset]), &(ibuf->size[1 + offset]),
+			  &(ibuf->len[1 + offset]));
 	  ibuf->curseg = offset + 1;
 	  ibuf->nseg = offset + 2;
 	  if (remain) {
-	    copyInWchar(ksp->echoStr + ksp->revPos + ksp->revLen,
+		copyInWchar(ksp->echoStr + ksp->revPos + ksp->revLen,
 			remain,
 			&(ibuf->str[2 + offset]), &(ibuf->size[2 + offset]),
 			&(ibuf->len[2 + offset]));
 	  ibuf->nseg = offset + 3;
 	  }
 	}
-      }
-      else {
+	  }
+	  else {
 	copyInWchar(ksp->echoStr, ksp->length,
-		    &(ibuf->str[0 + offset]), &(ibuf->size[0 + offset]),
-		    &(ibuf->len[0 + offset]));
+			&(ibuf->str[0 + offset]), &(ibuf->size[0 + offset]),
+			&(ibuf->len[0 + offset]));
 	ibuf->len[1 + offset] = ibuf->len[2 + offset] = 0;
 	ibuf->nseg = offset + 1;
 	ibuf->curseg = offset + 1;
-      }
-      obj->canna.textchanged = True;
-    }
-    /* モード */
-    if (ksp->info & KanjiModeInfo) {
-      int modelen = 0;
+	  }
+	  obj->canna.textchanged = True;
+	}
+	/* モード */
+	if (ksp->info & KanjiModeInfo) {
+	  int modelen = 0;
 
-      while (ksp->mode[modelen]) modelen++;
-      copyInWchar(ksp->mode, modelen,
+	  while (ksp->mode[modelen]) modelen++;
+	  copyInWchar(ksp->mode, modelen,
 		  &(ibuf->curmode), &(ibuf->modesize), &(ibuf->modelen));
-    }
-    /* 一覧行 */
-    if (ksp->info & KanjiGLineInfo) {
-      if (ksp->gline.length == 0) {
+	}
+	/* 一覧行 */
+	if (ksp->info & KanjiGLineInfo) {
+	  if (ksp->gline.length == 0) {
 	switch (ibuf->candstat) {
 	case CANNA_GLINE_Empty:
 	case CANNA_GLINE_End:
@@ -935,8 +1030,8 @@
 	ibuf->curgseg = 0;
 	ibuf->ngseg = 0;
 	ibuf->gllen[0] = ibuf->gllen[1] = ibuf->gllen[2] = 0;
-      }
-      else if (ksp->gline.length > 0) {
+	  }
+	  else if (ksp->gline.length > 0) {
 	switch (ibuf->candstat) {
 	case CANNA_GLINE_Empty:
 	case CANNA_GLINE_End:
@@ -950,61 +1045,61 @@
 	ibuf->gllen[1] = ibuf->gllen[2] = 0;
 	if (ksp->gline.revLen > 0) {
 	  if (ksp->gline.revPos == 0) {
-	    int remain = ksp->gline.length - ksp->gline.revLen;
-	    
-	    copyInWchar(ksp->gline.line, ksp->gline.revLen,
+		int remain = ksp->gline.length - ksp->gline.revLen;
+		
+		copyInWchar(ksp->gline.line, ksp->gline.revLen,
 			&(ibuf->gline[0]), &(ibuf->glsize[0]),
 			&(ibuf->gllen[0]));
-	    ibuf->curgseg = 0;
-	    ibuf->ngseg = 1;
-	    if (remain) {
-	      copyInWchar(ksp->gline.line + ksp->gline.revLen, remain,
+		ibuf->curgseg = 0;
+		ibuf->ngseg = 1;
+		if (remain) {
+		  copyInWchar(ksp->gline.line + ksp->gline.revLen, remain,
 			  &(ibuf->gline[1]), &(ibuf->glsize[1]),
 			  &(ibuf->gllen[1]));
-	      ibuf->ngseg = 2;
-	    }
+		  ibuf->ngseg = 2;
+		}
 	  }
 	  else {
-	    int remain = ksp->gline.length
-	      - ksp->gline.revPos - ksp->gline.revLen;
-	    
-	    copyInWchar(ksp->gline.line, ksp->gline.revPos,
+		int remain = ksp->gline.length
+		  - ksp->gline.revPos - ksp->gline.revLen;
+		
+		copyInWchar(ksp->gline.line, ksp->gline.revPos,
 			&(ibuf->gline[0]), &(ibuf->glsize[0]),
 			&(ibuf->gllen[0]));
-	    copyInWchar(ksp->gline.line + ksp->gline.revPos, ksp->gline.revLen,
+		copyInWchar(ksp->gline.line + ksp->gline.revPos, ksp->gline.revLen,
 			&(ibuf->gline[1]), &(ibuf->glsize[1]),
 			&(ibuf->gllen[1]));
-	    ibuf->curgseg = 1;
-	    ibuf->ngseg = 2;
-	    if (remain) {
-	      copyInWchar(ksp->gline.line
+		ibuf->curgseg = 1;
+		ibuf->ngseg = 2;
+		if (remain) {
+		  copyInWchar(ksp->gline.line
 			  + ksp->gline.revPos + ksp->gline.revLen,
 			  remain,
 			  &(ibuf->gline[2]), &(ibuf->glsize[2]),
 			  &(ibuf->gllen[2]));
-	      ibuf->ngseg = 3;
-	    }
+		  ibuf->ngseg = 3;
+		}
 	  }
 	}
 	else {
 	  copyInWchar(ksp->gline.line, ksp->gline.length,
-		      &(ibuf->gline[0]), &(ibuf->glsize[0]),
-		      &(ibuf->gllen[0]));
+			  &(ibuf->gline[0]), &(ibuf->glsize[0]),
+			  &(ibuf->gllen[0]));
 	  ibuf->gllen[1] = ibuf->gllen[2] = 0;
 	  ibuf->ngseg = 1;
 	  ibuf->curgseg = 1;
 	}
-      }
-      for (i = 0 ; i < ibuf->ngseg ; i++) {
+	  }
+	  for (i = 0 ; i < ibuf->ngseg ; i++) {
 	ibuf->ics[i].data = (char *)ibuf->gline[i];
 	ibuf->ics[i].nchars = ibuf->gllen[i];
 	ibuf->ics[i].nbytes = ibuf->gllen[i] * sizeof(wchar);
 	ibuf->ics[i].attr = ICAttrConverted;
-      }
-      if (ibuf->curgseg < ibuf->ngseg) {
+	  }
+	  if (ibuf->curgseg < ibuf->ngseg) {
 	ibuf->ics[ibuf->curgseg].attr |= ICAttrCurrentSegment;
-      }
-    }
+	  }
+	}
 }
 
 /* cfuncdef
@@ -1030,23 +1125,24 @@
   int i;
 
   if (*wssize == 0) {
-    if ((*wsbuf = (wchar *)XtMalloc((wlen + 1) * sizeof(wchar)))
+	if ((*wsbuf = (wchar *)XtMalloc((wlen + 1) * sizeof(wchar)))
 	 == (wchar *)0) {
-      /* エラーだ */
-    }
-    else {
-      *wssize = wlen + 1;
-    }
+	  /* エラーだ */
+		bail_out();
+	}
+	else {
+	  *wssize = wlen + 1;
+	}
   }
   if (wlen + 1 > *wssize) {
-    if ((*wsbuf = (wchar *)XtRealloc((char *)*wsbuf,
-				     (wlen + 1) * sizeof(wchar)))
+	if ((*wsbuf = (wchar *)XtRealloc((char *)*wsbuf,
+					 (wlen + 1) * sizeof(wchar)))
 	 == (wchar *)0) {
-      /* エラーだ。どうすれば良い？ */
-    }
-    else {
-      *wssize = wlen + 1;
-    }
+	  /* エラーだ。どうすれば良い？ */
+	}
+	else {
+	  *wssize = wlen + 1;
+	}
   }
   *wslen = wlen;
   (void)bcopy(ws, *wsbuf, wlen * sizeof(wchar));
@@ -1072,15 +1168,15 @@
   int offset = ib->offset;
   
   if (offset < NConvertedSegments) {
-    shiftRight(ib);
-    offset = ib->offset;
+	shiftRight(ib);
+	offset = ib->offset;
   }
   else {
-    shiftLeft(ib);
+	shiftLeft(ib);
   }
   copyInWchar(fixedstr, fixedlen,
-	      &(ib->str[offset - 1]), &(ib->size[offset - 1]),
-	      &(ib->len[offset - 1]));
+		  &(ib->str[offset - 1]), &(ib->size[offset - 1]),
+		  &(ib->len[offset - 1]));
 }
 
 /* cfuncdef
@@ -1101,9 +1197,9 @@
   tmpbuf = ib->str[ib->nseg];
   tmpsize = ib->size[ib->nseg];
   for (i = ib->nseg ; offset < i ; i--) {
-    ib->str[i] = ib->str[i - 1];
-    ib->size[i] = ib->size[i - 1];
-    ib->len[i] = ib->len[i - 1];
+	ib->str[i] = ib->str[i - 1];
+	ib->size[i] = ib->size[i - 1];
+	ib->len[i] = ib->len[i - 1];
   }
   ib->str[offset] = tmpbuf;
   ib->size[offset] = tmpsize;
@@ -1130,9 +1226,9 @@
   tmpbuf = ib->str[0];
   tmpsize = ib->size[0];
   for (i = 0 ; i < offset - 1 ; i++) {
-    ib->str[i] = ib->str[i + 1];
-    ib->size[i] = ib->size[i + 1];
-    ib->len[i] = ib->len[i + 1];
+	ib->str[i] = ib->str[i + 1];
+	ib->size[i] = ib->size[i + 1];
+	ib->len[i] = ib->len[i + 1];
   }
   ib->str[offset - 1] = tmpbuf;
   ib->size[offset - 1] = tmpsize;
@@ -1156,9 +1252,9 @@
   tmpbuf = ib->str[0];
   tmpsize = ib->size[0];
   for (i = 0 ; i < nseg - 1 ; i++) {
-    ib->str[i] = ib->str[i + 1];
-    ib->size[i] = ib->size[i + 1];
-    ib->len[i] = ib->len[i + 1];
+	ib->str[i] = ib->str[i + 1];
+	ib->size[i] = ib->size[i + 1];
+	ib->len[i] = ib->len[i + 1];
   }
   ib->str[nseg - 1] = tmpbuf;
   ib->size[nseg - 1] = tmpsize;
@@ -1181,17 +1277,18 @@
 
   ib = obj->canna.ibuf = (iBuf *)XtMalloc(sizeof(iBuf));
   if (ib == 0) {
-    /* エラーだ。どうすべ */
+	/* エラーだ。どうすべ */
+	bail_out();
   }
   for (i = 0 ; i < NConvertedSegments + 3 ; i++) {
-    ib->size[i] = 0;
-    ib->len[i] = 0;
+	ib->size[i] = 0;
+	ib->len[i] = 0;
   }
   ib->offset = ib->curseg = ib->nseg = 0;
   ib->candstat = CANNA_GLINE_Empty;
   for (i = 0 ; i < 3 ; i++) {
-    ib->gline[i] = 0;
-    ib->glsize[i] = ib->gllen[i] = 0;
+	ib->gline[i] = 0;
+	ib->glsize[i] = ib->gllen[i] = 0;
   }
   ib->modesize = 0;
   ib->modelen = 0;
@@ -1210,20 +1307,20 @@
   int i;
 
   if (ib == 0) {
-    return 0;
+	return 0;
   }
   for (i = 0 ; i < NConvertedSegments + 3 ; i++) {
-    if (ib->size[i] > 0) {
-      XtFree((char *)ib->str[i]);
-    }
+	if (ib->size[i] > 0) {
+	  XtFree((char *)ib->str[i]);
+	}
   }
   for (i = 0 ; i < 3 ; i++) {
-    if (ib->glsize[i] > 0) {
-      XtFree((char *)ib->gline[i]);
-    }
+	if (ib->glsize[i] > 0) {
+	  XtFree((char *)ib->gline[i]);
+	}
   }
   if (ib->modesize > 0) {
-    XtFree((char *)ib->curmode);
+	XtFree((char *)ib->curmode);
   }
   free(ib);
   return 0;
@@ -1267,108 +1364,108 @@
   int functionalChar = 0;
 
   switch ((int)keysym)
-    {
-    case XK_KP_F1:
-    case XK_KP_F2:
-    case XK_KP_F3:
-    case XK_KP_F4:
-      *buffer_return = 	CANNA_KEY_PF1 + (int)keysym - (int)XK_KP_F1;
-      functionalChar = 1;
-      break;
-    case XK_F1:
-    case XK_F2:
-    case XK_F3:
-    case XK_F4:
-    case XK_F5:
-    case XK_F6:
-    case XK_F7:
-    case XK_F8:
-    case XK_F9:
-    case XK_F10:
-    case XK_F11:
-    case XK_F12:
-    case XK_F13:
-    case XK_F14:
-    case XK_F15:
-    case XK_F16:
-      *buffer_return = CANNA_KEY_F1 + (int)keysym - (int)XK_F1;
-      functionalChar = 1;
-      break;
-    case XK_Insert:
-      *buffer_return = CANNA_KEY_Insert;
-      functionalChar = 1;
-      break;
-    case XK_Prior:
-      *buffer_return = CANNA_KEY_Rollup;
-      functionalChar = 1;
-      break;
-    case XK_Next:
-      *buffer_return = CANNA_KEY_Rolldown;
-      functionalChar = 1;
-      break;
-    case XK_Muhenkan:
-      if (event_struct->state & 4 /* control-shifted */)
+	{
+	case XK_KP_F1:
+	case XK_KP_F2:
+	case XK_KP_F3:
+	case XK_KP_F4:
+	  *buffer_return = 	CANNA_KEY_PF1 + (int)keysym - (int)XK_KP_F1;
+	  functionalChar = 1;
+	  break;
+	case XK_F1:
+	case XK_F2:
+	case XK_F3:
+	case XK_F4:
+	case XK_F5:
+	case XK_F6:
+	case XK_F7:
+	case XK_F8:
+	case XK_F9:
+	case XK_F10:
+	case XK_F11:
+	case XK_F12:
+	case XK_F13:
+	case XK_F14:
+	case XK_F15:
+	case XK_F16:
+	  *buffer_return = CANNA_KEY_F1 + (int)keysym - (int)XK_F1;
+	  functionalChar = 1;
+	  break;
+	case XK_Insert:
+	  *buffer_return = CANNA_KEY_Insert;
+	  functionalChar = 1;
+	  break;
+	case XK_Prior:
+	  *buffer_return = CANNA_KEY_Rollup;
+	  functionalChar = 1;
+	  break;
+	case XK_Next:
+	  *buffer_return = CANNA_KEY_Rolldown;
+	  functionalChar = 1;
+	  break;
+	case XK_Muhenkan:
+	  if (event_struct->state & 4 /* control-shifted */)
 	*buffer_return = CANNA_KEY_Cntrl_Nfer;
-      else if (event_struct->state & 1 /* shifted */)
+	  else if (event_struct->state & 1 /* shifted */)
 	*buffer_return = CANNA_KEY_Shift_Nfer;
-      else
+	  else
 	*buffer_return = CANNA_KEY_Nfer;
-      functionalChar = 1;
-      break;
-    case XK_Kanji:
-      if (event_struct->state & 4 /* control-shifted */)
+	  functionalChar = 1;
+	  break;
+	case XK_Kanji:
+	  if (event_struct->state & 4 /* control-shifted */)
 	*buffer_return = CANNA_KEY_Cntrl_Xfer;
-      else if (event_struct->state & 1 /* shifted */)
+	  else if (event_struct->state & 1 /* shifted */)
 	*buffer_return = CANNA_KEY_Shift_Xfer;
-      else
+	  else
 	*buffer_return = CANNA_KEY_Xfer;
-      functionalChar = 1;
-      break;
-    case XK_Up:
-      if (event_struct->state & 4 /* control-shifted */)
+	  functionalChar = 1;
+	  break;
+	case XK_Up:
+	  if (event_struct->state & 4 /* control-shifted */)
 	*buffer_return = CANNA_KEY_Cntrl_Up;
-      else if (event_struct->state & 1 /* shifted */)
+	  else if (event_struct->state & 1 /* shifted */)
 	*buffer_return = CANNA_KEY_Shift_Up;
-      else
+	  else
 	*buffer_return = CANNA_KEY_Up;
-      functionalChar = 1;
-      break;
-    case XK_Down:
-      if (event_struct->state & 4 /* control-shifted */)
+	  functionalChar = 1;
+	  break;
+	case XK_Down:
+	  if (event_struct->state & 4 /* control-shifted */)
 	*buffer_return = CANNA_KEY_Cntrl_Down;
-      else if (event_struct->state & 1 /* shifted */)
+	  else if (event_struct->state & 1 /* shifted */)
 	*buffer_return = CANNA_KEY_Shift_Down;
-      else
+	  else
 	*buffer_return = CANNA_KEY_Down;
-      functionalChar = 1;
-      break;
-    case XK_Right:
-      if (event_struct->state & 4 /* control-shifted */)
+	  functionalChar = 1;
+	  break;
+	case XK_Right:
+	  if (event_struct->state & 4 /* control-shifted */)
 	*buffer_return = CANNA_KEY_Cntrl_Right;
-      else if (event_struct->state & 1 /* shifted */)
+	  else if (event_struct->state & 1 /* shifted */)
 	*buffer_return = CANNA_KEY_Shift_Right;
-      else
+	  else
 	*buffer_return = CANNA_KEY_Right;
-      functionalChar = 1;
-      break;
-    case XK_Left:
-      if (event_struct->state & 4 /* control-shifted */)
+	  functionalChar = 1;
+	  break;
+	case XK_Left:
+	  if (event_struct->state & 4 /* control-shifted */)
 	*buffer_return = CANNA_KEY_Cntrl_Left;
-      else if (event_struct->state & 1 /* shifted */)
+	  else if (event_struct->state & 1 /* shifted */)
 	*buffer_return = CANNA_KEY_Shift_Left;
-      else
+	  else
 	*buffer_return = CANNA_KEY_Left;
-      functionalChar = 1;
-      break;
-    case XK_Help:
-      *buffer_return = CANNA_KEY_Help;
-      functionalChar = 1;
-      break;
-    case XK_Home:
-      *buffer_return = CANNA_KEY_Home;
-      functionalChar = 1;
-      break;
-    }
+	  functionalChar = 1;
+	  break;
+	case XK_Help:
+	  *buffer_return = CANNA_KEY_Help;
+	  functionalChar = 1;
+	  break;
+	case XK_Home:
+	  *buffer_return = CANNA_KEY_Home;
+	  functionalChar = 1;
+	  break;
+	}
   return functionalChar;
 }
 
@@ -1379,12 +1476,12 @@
 CannaObject obj;
 int dir;
 {
-    ICSelectionControlArg arg;
+	ICSelectionControlArg arg;
 
-    arg.command = ICSelectionMove;
-    arg.u.dir = dir;
-    XtCallCallbackList((Widget)obj, obj->inputConv.selectioncallback,
-		       (XtPointer)&arg);
+	arg.command = ICSelectionMove;
+	arg.u.dir = dir;
+	XtCallCallbackList((Widget)obj, obj->inputConv.selectioncallback,
+			   (XtPointer)&arg);
 }
 
 static int
@@ -1392,10 +1489,10 @@
 CannaObject obj;
 int selected;
 {
-    obj->canna.curcand = selected;
-    *(obj->canna.cur_addr) = selected;
+	obj->canna.curcand = selected;
+	*(obj->canna.cur_addr) = selected;
 
-    return 0;
+	return 0;
 }
 
 static void
@@ -1403,18 +1500,18 @@
 CannaObject obj;
 int abort;
 {
-    ICSelectionControlArg arg;
-    int selected;
+	ICSelectionControlArg arg;
+	int selected;
 
-    if (ignoreListfunc) return; /* SelectItem で処理されるのでここは不要 */
-    arg.command = ICSelectionEnd;
-    arg.u.current_item = -1;
-    XtCallCallbackList((Widget)obj, obj->inputConv.selectioncallback,
-		       (XtPointer)&arg);
+	if (ignoreListfunc) return; /* SelectItem で処理されるのでここは不要 */
+	arg.command = ICSelectionEnd;
+	arg.u.current_item = -1;
+	XtCallCallbackList((Widget)obj, obj->inputConv.selectioncallback,
+			   (XtPointer)&arg);
 
-    if (!abort && (selected = arg.u.current_item) >= 0) {
-        insertSelection(obj, selected);
-    }
+	if (!abort && (selected = arg.u.current_item) >= 0) {
+		insertSelection(obj, selected);
+	}
 }
 
 #ifdef CANNA_LIST_Query
@@ -1429,10 +1526,10 @@
   arg.command = ICSelectionGet;
   arg.u.current_item = -1;
   XtCallCallbackList((Widget)obj, obj->inputConv.selectioncallback,
-		     (XtPointer)&arg);
+			 (XtPointer)&arg);
 
   if ((selected = arg.u.current_item) >= 0) {
-    insertSelection(obj, selected);
+	insertSelection(obj, selected);
   }
 }
 #endif
@@ -1448,21 +1545,21 @@
   static int doit = 0;
 
   if (func == SELECTION_SET) {
-    current = curitem;
-    doit = 1;
+	current = curitem;
+	doit = 1;
   }
   else if (func == SELECTION_DO && doit) {
-    doit = 0;
-    arg.command = ICSelectionStart;
-    arg.u.selection_kind = ICSelectionCandidates;
-    XtCallCallbackList((Widget)obj, obj->inputConv.selectioncallback,
-		       (XtPointer)&arg);
-
-    /* set current item */
-    arg.command = ICSelectionSet;
-    arg.u.current_item = current;
-    XtCallCallbackList((Widget)obj, obj->inputConv.selectioncallback,
-		       (XtPointer)&arg);
+	doit = 0;
+	arg.command = ICSelectionStart;
+	arg.u.selection_kind = ICSelectionCandidates;
+	XtCallCallbackList((Widget)obj, obj->inputConv.selectioncallback,
+			   (XtPointer)&arg);
+
+	/* set current item */
+	arg.command = ICSelectionSet;
+	arg.u.current_item = current;
+	XtCallCallbackList((Widget)obj, obj->inputConv.selectioncallback,
+			   (XtPointer)&arg);
   }
 }
 
@@ -1470,11 +1567,11 @@
 
 /* listfunc -- 候補一覧モードになった時に呼び出される関数
  *
- * obj      : KC_SETLISTCALLBACK で設定したクライアントデータ
- * func     : 候補一覧機能の固有の機能を表すＩＤ
- * items    : Start の時には候補一覧の全アイテムが入る
- * nitems   :      〃       全アイテムの数が入る
- * cur_item :      〃       カレントアイテム番号を格納するアドレスが入る
+ * obj	  : KC_SETLISTCALLBACK で設定したクライアントデータ
+ * func	 : 候補一覧機能の固有の機能を表すＩＤ
+ * items	: Start の時には候補一覧の全アイテムが入る
+ * nitems   :	  〃	   全アイテムの数が入る
+ * cur_item :	  〃	   カレントアイテム番号を格納するアドレスが入る
  */
 
 static CANNA_LISTFUNCTYPE
@@ -1490,47 +1587,47 @@
 
   switch (func) {
   case CANNA_LIST_Start:
-    getAllCandidates(obj, nitems, items);
-    obj->canna.numcand = nitems;
-    obj->canna.curcand = *cur_item;
-    obj->canna.cur_addr = cur_item;
-    openSelection(obj, SELECTION_SET, *cur_item);
-    break;
+	getAllCandidates(obj, nitems, items);
+	obj->canna.numcand = nitems;
+	obj->canna.curcand = *cur_item;
+	obj->canna.cur_addr = cur_item;
+	openSelection(obj, SELECTION_SET, *cur_item);
+	break;
   case CANNA_LIST_Select:
-    endSelection(obj, False);
-    break;
+	endSelection(obj, False);
+	break;
   case CANNA_LIST_Quit:
-    endSelection(obj, True);
-    break;
+	endSelection(obj, True);
+	break;
 #ifdef CANNA_LIST_Query
   case CANNA_LIST_Query:
-    querySelection(obj);
-    break;
+	querySelection(obj);
+	break;
 #endif
 #ifdef CANNA_LIST_Convert
   case CANNA_LIST_Convert:
 #endif
   case CANNA_LIST_Forward:
-    moveSelection(obj, ICMoveRight);
-    break;
+	moveSelection(obj, ICMoveRight);
+	break;
   case CANNA_LIST_Backward:
-    moveSelection(obj, ICMoveLeft);
-    break;
+	moveSelection(obj, ICMoveLeft);
+	break;
   case CANNA_LIST_Next:
-    moveSelection(obj, ICMoveDown);
-    break;
+	moveSelection(obj, ICMoveDown);
+	break;
   case CANNA_LIST_Prev:
-    moveSelection(obj, ICMoveUp);
-    break;
+	moveSelection(obj, ICMoveUp);
+	break;
   case CANNA_LIST_BeginningOfLine:
-    moveSelection(obj, ICMoveLeftMost);
-    break;
+	moveSelection(obj, ICMoveLeftMost);
+	break;
   case CANNA_LIST_EndOfLine:
-    moveSelection(obj, ICMoveRightMost);
-    break;
+	moveSelection(obj, ICMoveRightMost);
+	break;
 #ifdef CANNA_LIST_Insert
   case CANNA_LIST_Insert:
-    return 0;
+	return 0;
 #endif
   }
 #ifdef CANNA_LIST_Convert
@@ -1543,25 +1640,28 @@
 CannaObject obj;
 int n;
 {
-    ICString *p;
-    int i;
+	ICString *p;
+	int i;
 
-    if (n <= obj->canna.candlistsize) return;
+	if (n <= obj->canna.candlistsize) return;
 
-    if (obj->canna.candlistsize == 0) {
+	if (obj->canna.candlistsize == 0) {
 	p = (ICString *)XtMalloc(n * sizeof(ICString));
-    } else {
+	} else {
 	p = (ICString *)XtRealloc((char *)obj->canna.candlist,
 				  n * sizeof(ICString));
-    }
-    for (i = obj->canna.candlistsize ; i < n ; i++) {
-      p[i].nbytes = p[i].nchars = (unsigned short)0;
-      p[i].data = (char *)0;
-      p[i].attr = 0;
-    }
+	}
+	if ( p == NULL ) {
+		bail_out();
+	}
+	for (i = obj->canna.candlistsize ; i < n ; i++) {
+	  p[i].nbytes = p[i].nchars = (unsigned short)0;
+	  p[i].data = (char *)0;
+	  p[i].attr = 0;
+	}
 
-    obj->canna.candlist = p;
-    obj->canna.candlistsize = n;
+	obj->canna.candlist = p;
+	obj->canna.candlistsize = n;
 }
 
 static void
@@ -1570,24 +1670,24 @@
 int ncand;
 wchar **items;
 {
-    ICString *strp;
-    wchar **p;
-    int i, bytes, chars;
+	ICString *strp;
+	wchar **p;
+	int i, bytes, chars;
 
-    allocCandlist(obj, ncand);
+	allocCandlist(obj, ncand);
 
-    for (i = 0, strp = obj->canna.candlist, p = items ;
+	for (i = 0, strp = obj->canna.candlist, p = items ;
 	 i < ncand; i++, strp++, p++) {
-        int len = 0;
+		int len = 0;
 
-        bytes = strp->nbytes;
+		bytes = strp->nbytes;
 	chars = strp->nchars;
 	while ((*p)[len]) len++;
-        copyInWchar(*p, len, (wchar **)&(strp->data), &bytes, &chars);
+		copyInWchar(*p, len, (wchar **)&(strp->data), &bytes, &chars);
 	strp->nbytes = bytes;
 	strp->nchars = chars;
 	strp->attr = ICAttrNormalString;
-    }
+	}
 }
 #endif /* KC_SETLISTCALLBACK */
 
@@ -1666,59 +1766,61 @@
 
   n = wcKanjiControl((int)obj, KC_MODEKEYS, (char *)mkeys);
 
-  *keys_return = keys =
-    (ICTriggerKey *)XtMalloc(2 * n * sizeof(ICTriggerKey));
+  if ( ( *keys_return = keys =
+	     (ICTriggerKey *)XtMalloc(2 * n * sizeof(ICTriggerKey)) ) == NULL ) {
+	bail_out();
+  }
   /* 「2 *」の意味:
-     一つのコードに2つの X のキーが存在していたりする事がある。
-     (例) C-h → Ctl<Key>h, <Key>Backspace */
+	 一つのコードに2つの X のキーが存在していたりする事がある。
+	 (例) C-h → Ctl<Key>h, <Key>Backspace */
 
   if (keys) {
-    for (p = mkeys, ekeys = p + n ; p < ekeys ; p++, keys++) {
-      c = *p;
-      if (c == (unsigned char)0) {
+	for (p = mkeys, ekeys = p + n ; p < ekeys ; p++, keys++) {
+	  c = *p;
+	  if (c == (unsigned char)0) {
 	keys->keysym = XK_space;
 	keys->modifiers = keys->modifiermask = ControlMask;
 	keys++;
 	keys->keysym = XK_at;
 	keys->modifiers = keys->modifiermask = ControlMask;
-      }
-      else if (c < ' ') {
+	  }
+	  else if (c < ' ') {
 	keys->keysym = XK_quoteleft + c;
 	keys->modifiers = keys->modifiermask = ControlMask;
 	for (pk = cannakeymap, ek = cannakeymap + NCANNAKEYMAP ;
-	     pk < ek ; pk++) {
+		 pk < ek ; pk++) {
 	  if (c == pk->cannakey) {
-	    keys++;
-	    keys->keysym = pk->keysym;
-	    keys->modifiers = keys->modifiermask = pk->modifier;
+		keys++;
+		keys->keysym = pk->keysym;
+		keys->modifiers = keys->modifiermask = pk->modifier;
 	  }
 	}
-      }
-      else if (c <= '~') {
+	  }
+	  else if (c <= '~') {
 	keys->keysym = XK_space + (c - (unsigned char)' ');
 	keys->modifiers = keys->modifiermask = 0;
-      }
-      else if (c == 0x7f) {
+	  }
+	  else if (c == 0x7f) {
 	keys->keysym = XK_Delete;
 	keys->modifiers = keys->modifiermask = 0;
-      }
-      else if ((unsigned char)0xa1 <= c && c <= (unsigned char)0xdf) {
+	  }
+	  else if ((unsigned char)0xa1 <= c && c <= (unsigned char)0xdf) {
 	keys->keysym = XK_kana_fullstop + (c - (unsigned char)0xa1);
 	keys->modifiers = keys->modifiermask = pk->modifier;
-      }
-      else {
+	  }
+	  else {
 	keys--;
 	for (pk = cannakeymap, ek = cannakeymap + NCANNAKEYMAP ;
-	     pk < ek ; pk++) {
+		 pk < ek ; pk++) {
 	  if (c == pk->cannakey) {
-	    keys++;
-	    keys->keysym = pk->keysym;
-	    keys->modifiers = keys->modifiermask = pk->modifier;
+		keys++;
+		keys->keysym = pk->keysym;
+		keys->modifiers = keys->modifiermask = pk->modifier;
 	  }
 	}
-      }
-    }
-    return n;
+	  }
+	}
+	return n;
   }
   return 0;
 }
@@ -1734,65 +1836,71 @@
 int *length;
 XtPointer *string;
 {
-    CannaObject obj = (CannaObject)w;
-    iBuf *ib = obj->canna.ibuf;
-    int i;
-    wchar *wbuf, *wp;
-    int len, wlen;
-    extern int convJWStoCT();
+	CannaObject obj = (CannaObject)w;
+	iBuf *ib = obj->canna.ibuf;
+	int i;
+	wchar *wbuf, *wp;
+	int len, wlen;
+	extern int convJWStoCT();
 
-    if (ib == NULL) return -1;
-    if (segn < ib->nseg && offset >= ib->len[segn]) {
+	if (ib == NULL) return -1;
+	if (segn < ib->nseg && offset >= ib->len[segn]) {
 	/* セグメントの最後 */
 	++segn;
 	offset = 0;
-    }
-    if (segn >= ib->nseg || offset >= ib->len[segn]) {
+	}
+	if (segn >= ib->nseg || offset >= ib->len[segn]) {
 	/* 削除された */
 	*encoding = XA_COMPOUND_TEXT(XtDisplayOfObject(w));
 	*format = 8;
 	*length = 0;
-	*string = (XtPointer)XtMalloc(1);
+	if ( ( *string = (XtPointer)XtMalloc(1) ) == NULL ) {
+		bail_out();
+	}
 	return 0;
-    }
+	}
 
-    wlen = 0;
-    for (i = segn; i < ib->nseg; i++) {
+	wlen = 0;
+	for (i = segn; i < ib->nseg; i++) {
 	wlen += ib->len[i];
-    }
-    wlen -= offset;
+	}
+	wlen -= offset;
 
-    wp = wbuf = (wchar *)XtMalloc((wlen + 1) * sizeof(wchar));
-    len = ib->len[segn] - offset;
-    (void)bcopy((char *)(ib->str[segn] + offset), (char *)wp, sizeof(wchar) * len);
-    wp += len;
-    for (i = segn + 1; i < ib->nseg; i++) {
+	if ( ( wp = wbuf = (wchar *)XtMalloc((wlen + 1) * sizeof(wchar)) ) == NULL ) {
+		bail_out();
+	}
+	len = ib->len[segn] - offset;
+	(void)bcopy((char *)(ib->str[segn] + offset), (char *)wp, sizeof(wchar) * len);
+	wp += len;
+	for (i = segn + 1; i < ib->nseg; i++) {
 	len = ib->len[i];
 	(void)bcopy((char *)ib->str[i], (char *)wp, sizeof(wchar) * len);
 	wp += len;
-    }
-    wbuf[wlen] = 0;
+	}
+	wbuf[wlen] = 0;
 
-    /*
-     * Canna オブジェクトは COMPOUND_TEXT エンコーディングしかサポートしない
-     * COMPOUND_TEXT に変換する
-     */
-    *encoding = XA_COMPOUND_TEXT(XtDisplayOfObject(w));
-    *format = 8;
+	/*
+	 * Canna オブジェクトは COMPOUND_TEXT エンコーディングしかサポートしない
+	 * COMPOUND_TEXT に変換する
+	 */
+	*encoding = XA_COMPOUND_TEXT(XtDisplayOfObject(w));
+	*format = 8;
 
-    /* COMPOUND_TEXT は \r が送れないので \n に変換しておく */
-    for (wp = wbuf; *wp != 0; wp++) {
+	/* COMPOUND_TEXT は \r が送れないので \n に変換しておく */
+	for (wp = wbuf; *wp != 0; wp++) {
 	if (*wp == '\r') *wp = '\n';
-    }
+	}
 
-    *length = len = convJWStoCT(wbuf, (unsigned char *)NULL, 0);
-    *string = (XtPointer)XtMalloc(len + 1);
-    (void)convJWStoCT(wbuf, (unsigned char *)*string, 0);
+	*length = len = convJWStoCT(wbuf, (unsigned char *)NULL, 0);
+	if ( ( *string = (XtPointer)XtMalloc(len + 1) ) == NULL ) {
+		bail_out();
+	}
+	(void)convJWStoCT(wbuf, (unsigned char *)*string, 0);
 
-    /* wbuf を free しておく */
-    XtFree((char *)wbuf);
+	/* wbuf を free しておく */
+	XtFree((char *)wbuf);
 
-    return 0;
+	return 0;
 }
 
 /* ARGSUSED */
@@ -1805,50 +1913,54 @@
 XtPointer *string;
 int *nchars;
 {
-    ICString *seg;
-    wchar *wbuf, *wp;
-    int len, wlen;
-    extern int convJWStoCT();
+	ICString *seg;
+	wchar *wbuf, *wp;
+	int len, wlen;
+	extern int convJWStoCT();
 
-    seg = GetMode(w);
-    if (seg == NULL) {
+	seg = GetMode(w);
+	if (seg == NULL) {
 	*length = *nchars = 0;
 	return -1;
-    }
+	}
 
-    wlen = seg->nchars;
-    if (wlen <= 0) {
+	wlen = seg->nchars;
+	if (wlen <= 0) {
 	*length = *nchars = 0;
 	return -1;
-    }
+	}
 
-    /*
-     * data に入っている変換テキストは null ターミネートされていないかも
-     * しれないので、まずコピーして null ターミネートする
-     */
-    wbuf = (wchar *)XtMalloc((wlen + 1) * sizeof(wchar));
-    (void)bcopy(seg->data, (char *)wbuf, sizeof(wchar) * wlen);
-    wbuf[wlen] = 0;
-
-    /*
-     * Canna オブジェクトは COMPOUND_TEXT エンコーディングしかサポートしない
-     * COMPOUND_TEXT に変換する
-     */
-    *encoding = XA_COMPOUND_TEXT(XtDisplayOfObject(w));
-    *format = 8;
+	/*
+	 * data に入っている変換テキストは null ターミネートされていないかも
+	 * しれないので、まずコピーして null ターミネートする
+	 */
+	if ( ( wbuf = (wchar *)XtMalloc((wlen + 1) * sizeof(wchar)) ) == NULL ) {
+		bail_out();
+	}
+	(void)bcopy(seg->data, (char *)wbuf, sizeof(wchar) * wlen);
+	wbuf[wlen] = 0;
 
-    /* COMPOUND_TEXT は \r が送れないので \n に変換しておく */
-    for (wp = wbuf; *wp != 0; wp++) {
+	/*
+	 * Canna オブジェクトは COMPOUND_TEXT エンコーディングしかサポートしない
+	 * COMPOUND_TEXT に変換する
+	 */
+	*encoding = XA_COMPOUND_TEXT(XtDisplayOfObject(w));
+	*format = 8;
+
+	/* COMPOUND_TEXT は \r が送れないので \n に変換しておく */
+	for (wp = wbuf; *wp != 0; wp++) {
 	if (*wp == '\r') *wp = '\n';
-    }
+	}
 
-    *length = len = convJWStoCT(wbuf, (unsigned char *)NULL, 0);
-    *string = XtMalloc(len + 1);
-    (void)convJWStoCT(wbuf, (unsigned char *)*string, 0);
-    *nchars = seg->nchars;
+	*length = len = convJWStoCT(wbuf, (unsigned char *)NULL, 0);
+	if ( ( *string = XtMalloc(len + 1) ) == NULL ) {
+		bail_out();
+	}
+	(void)convJWStoCT(wbuf, (unsigned char *)*string, 0);
+	*nchars = seg->nchars;
 
-    /* wbuf を free しておく */
-    XtFree((char *)wbuf);
+	/* wbuf を free しておく */
+	XtFree((char *)wbuf);
 
-    return 0;
+	return 0;
 }
diff -u -r kinput2-v3.1-beta4/lib/parsekey.c kinput2-v3.1-beta4-modified/lib/parsekey.c
--- kinput2-v3.1-beta4/lib/parsekey.c	Sun Jan 27 20:41:04 2002
+++ kinput2-v3.1-beta4-modified/lib/parsekey.c	Sat Sep 28 19:38:45 2002
@@ -29,13 +29,13 @@
 long *modp;		/* RETURN: modifiers which must be set */
 long *chkmodp;		/* RETURN: modifiers to be checked */
 {
-    String p;
-    int i;
-    int c;
-    static struct _moddesc_ {
+	String p;
+	int i;
+	int c;
+	static struct _moddesc_ {
 	String modname;		/* modifier name */
 	long modmask;		/* modifier mask */
-    } mods[] = {
+	} mods[] = {
 	{ "Shift",	ShiftMask },
 	{ "Lock",	LockMask },
 	{ "Ctrl",	ControlMask },
@@ -50,37 +50,37 @@
 	{ "l",		LockMask },
 	{ "m",		Mod1Mask },
 	{ "a",		Mod1Mask },
-    };
+	};
 
-    *modp = *chkmodp = 0L;
+	*modp = *chkmodp = 0L;
 
 #define SKIPBLANK \
-    while ((c = *s) == ' ' || c == '\t' || c == '\n') s++; \
-    if (c == '\0') return;
+	while ((c = *s) == ' ' || c == '\t' || c == '\n') s++; \
+	if (c == '\0') return;
 #define SEARCHBLANK \
-    p = s; while ((c = *p) != '\0' && c != ' ' && c != '\t' && c != '\n') p++;
+	p = s; while ((c = *p) != '\0' && c != ' ' && c != '\t' && c != '\n') p++;
 
-    while (*s != '\0') {
+	while (*s != '\0') {
 	int tilde = 0;
 
 	SKIPBLANK;
 	if (c == '~') {
-	    tilde = 1;
-	    s++;
-	    SKIPBLANK;
+		tilde = 1;
+		s++;
+		SKIPBLANK;
 	}
 	SEARCHBLANK;
 	*p = '\0';
 	for (i = 0; i < XtNumber(mods); i++) {
-	    if (!strcmp(s, mods[i].modname)) {
+		if (!strcmp(s, mods[i].modname)) {
 		*chkmodp |= mods[i].modmask;
 		if (!tilde) *modp |= mods[i].modmask;
 		break;
-	    }
+		}
 	}
 	if (c == '\0') break;
 	s = p + 1;
-    }
+	}
 #undef SKIPBLANK
 #undef SEARCHBLANK
 }
@@ -91,15 +91,15 @@
 char *s1;
 char *s2;
 {
-    register char *p, *q;
+	register char *p, *q;
 
-    while (*(p = s1++) != '\0') {
+	while (*(p = s1++) != '\0') {
 	q = s2;
 	do {
-	    if (*q == '\0') return s1 - 1;
+		if (*q == '\0') return s1 - 1;
 	} while (*p++ == *q++);
-    }
-    return NULL;
+	}
+	return NULL;
 }
 
 
@@ -114,43 +114,52 @@
 long *modp;		/* OUT: mask of modifiers which must be pressed */
 long *chkmodp;		/* OUT: mask of modifiers of interest */
 {
-    String key;
-    String p;
-    KeySym keysym;
-
-    /*
-     * keyevent description (stored in  argument 's') must be of the
-     * following format (subset of Xt translation table syntax):
-     *		modifier-list<Key>keysym
-     * modifier-list is a combination of:
-     *		Ctrl, Shift, Lock, Meta, Alt, Mod1, Mod2, Mod3, Mod4, Mod5
-     * if '~' is prepended before a modifier, it means the modifier key should
-     * not be pressed.
-     */
-
-    /* find "<Key>" */
-    if ((p = mystrstr(s, "<Key>")) != NULL) {
-	key = p + 5;	/* p + strlen("<Key>") */
-    } else if ((p = mystrstr(s, "<KeyPress>")) != NULL) {
-	key = p + 10;	/* p + strlen("<KeyPress>") */
-    } else if ((p = mystrstr(s, "<KeyDown>")) != NULL) {
-	key = p + 9;	/* p + strlen("<KeyDown>") */
-    } else {
-	return 0;
-    }
-    *p = '\0';
-    while (*key == ' ' || *key == '\t') key++;
-    p = key;
-    while (*p != '\0' && *p != ' ' && *p != '\t') p++;
-    *p = '\0';
-
-    /* get modifier mask */
-    parseModifiers(s, modp, chkmodp);
+	String key;
+	String p;
+	KeySym keysym;
+
+	/*
+	 * keyevent description (stored in  argument 's') must be of the
+	 * following format (subset of Xt translation table syntax):
+	 *		modifier-list<Key>keysym
+	 * modifier-list is a combination of:
+	 *		Ctrl, Shift, Lock, Meta, Alt, Mod1, Mod2, Mod3, Mod4, Mod5
+	 * if '~' is prepended before a modifier, it means the modifier key should
+	 * not be pressed.
+	 */
+
+	/* find "<Key>" */
+	{
+		static char sym_str_key[] = "<Key>";
+		static char sym_str_keypress[] = "<KeyPress>";
+		static char sym_str_keydown[] = "<KeyDown>";
+
+		if ((p = mystrstr(s, sym_str_key)) != NULL) {
+			/* p + strlen("<Key>") */
+			key = p + (sizeof(sym_str_key)-1);
+		} else if ((p = mystrstr(s, sym_str_keypress)) != NULL) {
+			/* p + strlen("<KeyPress>") */
+			key = p + (sizeof(sym_str_keypress)-1);
+		} else if ((p = mystrstr(s, sym_str_keydown)) != NULL) {
+			/* p + strlen("<KeyDown>") */
+			key = p + (sizeof(sym_str_keydown)-1);	
+		} else {
+			return 0;
+		}
+	}
+	*p = '\0';
+	while (*key == ' ' || *key == '\t') key++;
+	p = key;
+	while (*p != '\0' && *p != ' ' && *p != '\t') p++;
+	*p = '\0';
+
+	/* get modifier mask */
+	parseModifiers(s, modp, chkmodp);
 
-    /* get keycode */
-    if ((keysym = XStringToKeysym(key)) == NoSymbol) return 0;
+	/* get keycode */
+	if ((