# HG changeset patch
# User Yoshiki Yazawa <yaz@honeyplanet.jp>
# Date 1268046425 -32400
# Node ID 31f1de16683af2e95472f4143148fe83ae403316
# Parent  92745d501b9ae6ccdef194f6aafbfe0dc7b98f35
imported patch 01_Kinput2.ad.patch

diff -r 92745d501b9a -r 31f1de16683a cmd/Kinput2.ad
--- a/cmd/Kinput2.ad	Mon Mar 08 04:44:30 2010 +0900
+++ b/cmd/Kinput2.ad	Mon Mar 08 20:07:05 2010 +0900
@@ -32,15 +32,16 @@
 !!
 !!	Wnn setup
 !!
-!*CcWnn.Jserver:	"primary-jserver-host"
-!*CcWnn.jserver2nd:	"secondary-jserver-host-if-any"
-*CcWnn.ccdef:		ccdef.kinput2
+*CcWnn.Jserver:		unix
+!*CcWnn.jserver2nd:	localhost
+*CcWnn.ccdef:		ccdef.kinput2.egg
+*CcWnn.wnnEnvrc:	/etc/FreeWnn/ja/wnnenvrc
 !*CcWnn.wnnEnvrc4:	"wnenvrc-file-for-Wnn4"
 !*CcWnn.wnnEnvrc6:	"wnenvrc-file-for-Wnn6"
 !!
 !!	Canna setup for version 2.x, 3.x
 !!
-!*Canna.Cannahost:	"canna-host"
+*Canna.Cannahost:	localhost
 !*Canna.Cannafile:	"canna-initialization-file"
 !!
 !!	Sj3 setup
@@ -92,16 +93,16 @@
 !!
 ! KinputProtocol
 *KinputProtocol.BackwardCompatible: true
-*KinputProtocol.XlcConversionStartKey:	Shift<Key>space
+!*KinputProtocol.XlcConversionStartKey:	Shift<Key>space
 ! XimpProtocol
 *XimpProtocol.ForceDefaultServer: true
 ! X Input Method Protocol
-*IMProtocol.locales: ja_JP.SJIS, ja_JP.EUC, ja_JP, japanese, japan, ja
+*IMProtocol.locales: ja_JP.SJIS, ja_JP.EUC, ja_JP.UTF-8, ja_JP, japanese, japan, ja, en_US.UTF-8
 ! common to XimpProtocol and IMProtocol
 *defaultFontList: -misc-fixed-medium-r-normal--14-*-*-*-c-*
-*ConversionStartKeys: \
-	Shift<Key>space \n\
-	Ctrl<Key>Kanji
+*ConversionStartKeys: Shift<Key>space
+!	Shift<Key>space \n\
+!	Ctrl<Key>Kanji
 !!
 !! sending back unused keypress events
 !!
@@ -118,4 +119,25 @@
 ! the following resource.  This phenomenon is caused by the incorrent
 ! focus management of your window manager, and this resource avoids
 ! it by making the window manager totally ignore the mode window.
-!*OverTheSpotConversion.UseOverrideShellForMode: True
+*OverTheSpotConversion.UseOverrideShellForMode: True
+!!
+!! Don't give input focus to the windows of kinput2, they don't need input focus
+!! it just causes problems if they get input focus.
+!!
+!! For example, if you use kinput2 with Canna and open the 'auxShell' window
+!! by pressing the 'insert' key a window pops up where special symbols
+!! can be selected. If this window gets focus, the selected symbol will not
+!! appear in the application until the application gets focus again. This is
+!! quite confusing.
+!! And there are even some applications where the selected symbol will never appear,
+!! not even when the application gets focus again, Gvim currently behaves
+!! like that and XIM in Gvim may even become completely unusable after one of
+!! the kinput2 windows got focus, making it necessary to restart Gvim to be able
+!! to use XIM again.
+!!
+!! I found no reason why one of kinput2's windows should need input focus.
+!!
+*SeparateConversion.input: false
+*selectionShell.input: false
+*auxShell.input: false
+