--- kinput2-3.1.orig/Kinput2.conf
+++ kinput2-3.1/Kinput2.conf
@@ -8,18 +8,17 @@
 
 /**
  ** Conversion system configuration:
- **	Kinput2 supports 4 conversion systems, Wnn, Canna, Sj3 and Atok.
+ **	Kinput2 supports 3 conversion systems, Wnn, Canna and Sj3.
  **	In order to install and use kinput2, you have to compile and
  **	install at least one of them.  If you select more than one
  **	conversion system, you can choose one at run time with a
  **	command line option.
  **/
 
-/* #define UseWnn */	/* define if you are going to use Wnn (v4, v6 or v7) */
-/* #define UseWnn6 */	/* define if you are going to use Wnn6 or above */
+/* #define UseWnn */	/* define if you are going to use Wnn (v4 or v6) */
+/* #define UseWnn6 */	/* define if you are going to use Wnn6 */
 #define UseCanna	/* define if you are going to use Canna */
 #define UseSj3		/* define if you are going to use Sj3 */
-/* #define UseAtok */	/* define if you are going to use Atok */
 
 
 XCOMM Wnn configuration
@@ -121,22 +120,6 @@
 SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a
 
 
-XCOMM Atok configuration
-/*
- * If you define UseAtok, set following 2 variables:
- *	ATOKINCDIR: Atok include file directory (if atok.h is there)
- *	ATOKLIBDIR: Atok client-side library directory
- */
-
-/*
- * If you have already installed Atok header files and libraries..
- */
-XCOMM use installed headers/libraries
-XCOMM ATOKINCDIR = /usr/include/atok
-XCOMM ATOKLIBDIR = /usr/jp/lib
-ATOKLIB = -latok12n -latok12util
-
-
 /**
  ** Transport configuration:
  **	Kinput2 X Input Method Protocol handler supports
--- kinput2-3.1.orig/cmd/Kinput2.ad
+++ kinput2-3.1/cmd/Kinput2.ad
@@ -17,6 +17,27 @@
 *SeparateConversion.title: Kana-Kanji Conversion
 *selectionShell.title: Candidate Selection
 *auxShell.title: Auxiliary Control
+
+!! 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
+
 ! if you're using mwm (Motif1.1), you can set kanji titles.
 !*SeparateConversion.title: \033$(B$+$J4A;zJQ49
 !*SeparateConversion.titleEncoding: COMPOUND_TEXT
@@ -32,9 +53,9 @@
 !!
 !!	Wnn setup
 !!
-!*CcWnn.Jserver:	"primary-jserver-host"
+*CcWnn.Jserver:	localhost
 !*CcWnn.jserver2nd:	"secondary-jserver-host-if-any"
-*CcWnn.ccdef:		ccdef.kinput2
+*CcWnn.ccdef:		ccdef.kinput2.egg
 !*CcWnn.wnnEnvrc4:	"wnenvrc-file-for-Wnn4"
 !*CcWnn.wnnEnvrc6:	"wnenvrc-file-for-Wnn6"
 !!
@@ -118,4 +139,4 @@
 ! 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