diff -uNr kinput2.orig/Kinput2.conf.canna kinput2/Kinput2.conf.canna --- kinput2.orig/Kinput2.conf.canna Thu Jan 1 09:00:00 1970 +++ kinput2/Kinput2.conf.canna Sat Dec 13 19:32:29 1997 @@ -0,0 +1,133 @@ +XCOMM +XCOMM Kinput2 global configuration parameters +XCOMM +/* + * Before editing following parameters, you should read + * README file. + */ + +/** + ** Conversion system configuration: + ** 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 */ +#define UseCanna /* define if you are going to use Canna */ +/* #define UseSj3 */ /* define if you are going to use Sj3 */ + + +XCOMM Wnn configuration +/* + * If you define UseWnn, set following 3 variables: + * + * WNNINCDIR: Wnn include file directory + * WNNLIB: Wnn client-side library + * CCDEF_DIR: directory where character conversion rule + * definition files are to be installed + * + * You may need to define WnnLibDir if Wnn configuration files + * are not installed in /usr/local/lib/wnn (the default). + */ +/* #define WnnLibDir /some/peculiar/directory/wnn */ + +CCDEF_DIR = $(LIBDIR)/ccdef + +/* + * If you have installed Wnn.. + * + * First check the directory where Wnn header files has been installed. + * If "config.h" is not there, you must specify the include directory + * in the Wnn source tree. + */ +XCOMM use installed header files (if config.h is there) +XCOMM WNNINCDIR = /usr/X11R6/include/wnn +XCOMM or header files in the source tree +XCOMM WNNINCDIR = $(CONTRIBSRC)/programs/Xsi/Wnn/include +XCOMM use installed library +XCOMM WNNLIB = -lwnn + +/* + * Or, use library in the source tree.. + */ +XCOMM use library in the source tree +WNNSRC = $(CONTRIBSRC)/programs/Xsi/Wnn +WNNINCDIR = $(WNNSRC)/include +WNNLIB = $(WNNSRC)/jlib/libwnn.a + + +XCOMM Canna configuration +/* + * If you define UseCanna, set following 2 variables: + * CANNASRC: Canna source directory (or directory of installed headers) + * CANNALIB: Canna user library + * Note that kinput2 no longer supports Canna version 1.x, + * which came with X11R5. Use the new version in R6 contrib. + */ + +/* + * If you have already installed Canna header files and libraries.. + */ +XCOMM use installed headers/libraries +CANNAINSTDIR = /var/lib/canna +CANNASRC = /usr/include/canna +CANNALIB = -lcanna16 + +/* + * If you have compiled Canna that came with X11R6 (contrib/programs/Canna), + * but not installed yet.. + */ +XCOMM use headers/libraries in the source tree +XCOMM CANNASRC = $(CONTRIBSRC)/programs/Canna32 +XCOMM CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16 + + +XCOMM SJ3 configuration +/* + * If you define UseSj3, set following 3 variables: + * SJ3SRC: Sj3 source directory + * SJ3LIB: Sj3 user library + * SJ3DEF_DIR: directory where conversion rule + * definition files are to be installed + */ + +SJ3DEF_DIR = $(LIBDIR)/sj3def + +/* + * If you have installed SJ3 library and header file, + * or your machine is Sony NEWS, on which SJ3 is + * already installed.. + * (in this case, you don't have to care about SJ3SRC) + */ +XCOMM use installed header/library +XCOMM SJ3LIB = -lsj3lib + +/* + * Use compiled library in the source tree.. + */ +XCOMM use library in the source tree +SJ3SRC = $(CONTRIBSRC)/programs/sj3 +SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a + + +/** + ** Transport configuration: + ** Kinput2 X Input Method Protocol handler supports + ** 3 transports, X, TCP and local (UNIX domain). + ** If your system does not support any of these, + ** add appropriate flag(s) to TRANSPORTDEFS. + ** + ** -DNO_UNIX_TRANSPORT -- if UNIX domain transport is not available + ** -DNO_TCP_TRANSPORT -- if TCP/IP transport is not available + ** -DNO_X_TRANSPORT -- if X transport is not available (unlikely) + **/ +XCOMM transport configuration + +TRANSPORTDEFS = + +XCOMM +XCOMM End of global configuration parameters +XCOMM diff -uNr kinput2.orig/Kinput2.conf.canna-wnn kinput2/Kinput2.conf.canna-wnn --- kinput2.orig/Kinput2.conf.canna-wnn Thu Jan 1 09:00:00 1970 +++ kinput2/Kinput2.conf.canna-wnn Sat Dec 13 19:32:29 1997 @@ -0,0 +1,134 @@ +XCOMM +XCOMM Kinput2 global configuration parameters +XCOMM +/* + * Before editing following parameters, you should read + * README file. + */ + +/** + ** Conversion system configuration: + ** 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 */ +#define UseCanna /* define if you are going to use Canna */ +/* #define UseSj3 */ /* define if you are going to use Sj3 */ + + +XCOMM Wnn configuration +/* + * If you define UseWnn, set following 3 variables: + * + * WNNINCDIR: Wnn include file directory + * WNNLIB: Wnn client-side library + * CCDEF_DIR: directory where character conversion rule + * definition files are to be installed + * + * You may need to define WnnLibDir if Wnn configuration files + * are not installed in /usr/local/lib/wnn (the default). + */ +#define WnnLibDir /var/lib/wnn + +CCDEF_DIR = $(LIBDIR)/ccdef + +/* + * If you have installed Wnn.. + * + * First check the directory where Wnn header files has been installed. + * If "config.h" is not there, you must specify the include directory + * in the Wnn source tree. + */ +XCOMM use installed header files (if config.h is there) +XCOMM WNNINCDIR = /usr/X11R6/include/wnn +XCOMM or header files in the source tree +XCOMM WNNINCDIR = $(CONTRIBSRC)/programs/Xsi/Wnn/include +XCOMM use installed library +WNNINCDIR = /usr/include/wnn +WNNLIB = -lwnn + +/* + * Or, use library in the source tree.. + */ +XCOMM use library in the source tree +XCOMM WNNSRC = $(CONTRIBSRC)/programs/Xsi/Wnn +XCOMM WNNINCDIR = $(WNNSRC)/include +XCOMM WNNLIB = $(WNNSRC)/jlib/libwnn.a + + +XCOMM Canna configuration +/* + * If you define UseCanna, set following 2 variables: + * CANNASRC: Canna source directory (or directory of installed headers) + * CANNALIB: Canna user library + * Note that kinput2 no longer supports Canna version 1.x, + * which came with X11R5. Use the new version in R6 contrib. + */ + +/* + * If you have already installed Canna header files and libraries.. + */ +XCOMM use installed headers/libraries +CANNAINSTDIR = /var/lib/canna +CANNASRC = /usr/include/canna +CANNALIB = -lcanna16 + +/* + * If you have compiled Canna that came with X11R6 (contrib/programs/Canna), + * but not installed yet.. + */ +XCOMM use headers/libraries in the source tree +XCOMM CANNASRC = $(CONTRIBSRC)/programs/Canna32 +XCOMM CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16 + + +XCOMM SJ3 configuration +/* + * If you define UseSj3, set following 3 variables: + * SJ3SRC: Sj3 source directory + * SJ3LIB: Sj3 user library + * SJ3DEF_DIR: directory where conversion rule + * definition files are to be installed + */ + +SJ3DEF_DIR = $(LIBDIR)/sj3def + +/* + * If you have installed SJ3 library and header file, + * or your machine is Sony NEWS, on which SJ3 is + * already installed.. + * (in this case, you don't have to care about SJ3SRC) + */ +XCOMM use installed header/library +XCOMM SJ3LIB = -lsj3lib + +/* + * Use compiled library in the source tree.. + */ +XCOMM use library in the source tree +SJ3SRC = $(CONTRIBSRC)/programs/sj3 +SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a + + +/** + ** Transport configuration: + ** Kinput2 X Input Method Protocol handler supports + ** 3 transports, X, TCP and local (UNIX domain). + ** If your system does not support any of these, + ** add appropriate flag(s) to TRANSPORTDEFS. + ** + ** -DNO_UNIX_TRANSPORT -- if UNIX domain transport is not available + ** -DNO_TCP_TRANSPORT -- if TCP/IP transport is not available + ** -DNO_X_TRANSPORT -- if X transport is not available (unlikely) + **/ +XCOMM transport configuration + +TRANSPORTDEFS = + +XCOMM +XCOMM End of global configuration parameters +XCOMM diff -uNr kinput2.orig/Kinput2.conf.wnn kinput2/Kinput2.conf.wnn --- kinput2.orig/Kinput2.conf.wnn Thu Jan 1 09:00:00 1970 +++ kinput2/Kinput2.conf.wnn Sat Dec 13 19:32:29 1997 @@ -0,0 +1,134 @@ +XCOMM +XCOMM Kinput2 global configuration parameters +XCOMM +/* + * Before editing following parameters, you should read + * README file. + */ + +/** + ** Conversion system configuration: + ** 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 */ +/* #define UseCanna */ /* define if you are going to use Canna */ +/* #define UseSj3 */ /* define if you are going to use Sj3 */ + + +XCOMM Wnn configuration +/* + * If you define UseWnn, set following 3 variables: + * + * WNNINCDIR: Wnn include file directory + * WNNLIB: Wnn client-side library + * CCDEF_DIR: directory where character conversion rule + * definition files are to be installed + * + * You may need to define WnnLibDir if Wnn configuration files + * are not installed in /usr/local/lib/wnn (the default). + */ +#define WnnLibDir /var/lib/wnn + +CCDEF_DIR = $(LIBDIR)/ccdef + +/* + * If you have installed Wnn.. + * + * First check the directory where Wnn header files has been installed. + * If "config.h" is not there, you must specify the include directory + * in the Wnn source tree. + */ +XCOMM use installed header files (if config.h is there) +XCOMM WNNINCDIR = /usr/X11R6/include/wnn +XCOMM or header files in the source tree +XCOMM WNNINCDIR = $(CONTRIBSRC)/programs/Xsi/Wnn/include +XCOMM use installed library +WNNINCDIR = /usr/include/wnn +WNNLIB = -lwnn + +/* + * Or, use library in the source tree.. + */ +XCOMM use library in the source tree +XCOMM WNNSRC = $(CONTRIBSRC)/programs/Xsi/Wnn +XCOMM WNNINCDIR = $(WNNSRC)/include +XCOMM WNNLIB = $(WNNSRC)/jlib/libwnn.a + + +XCOMM Canna configuration +/* + * If you define UseCanna, set following 2 variables: + * CANNASRC: Canna source directory (or directory of installed headers) + * CANNALIB: Canna user library + * Note that kinput2 no longer supports Canna version 1.x, + * which came with X11R5. Use the new version in R6 contrib. + */ + +/* + * If you have already installed Canna header files and libraries.. + */ +XCOMM use installed headers/libraries +XCOMM CANNAINSTDIR = /usr/local/canna +XCOMM CANNASRC = $(CANNAINSTDIR)/include +XCOMM CANNALIB = -lcanna16 + +/* + * If you have compiled Canna that came with X11R6 (contrib/programs/Canna), + * but not installed yet.. + */ +XCOMM use headers/libraries in the source tree +CANNASRC = $(CONTRIBSRC)/programs/Canna32 +CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16 + + +XCOMM SJ3 configuration +/* + * If you define UseSj3, set following 3 variables: + * SJ3SRC: Sj3 source directory + * SJ3LIB: Sj3 user library + * SJ3DEF_DIR: directory where conversion rule + * definition files are to be installed + */ + +SJ3DEF_DIR = $(LIBDIR)/sj3def + +/* + * If you have installed SJ3 library and header file, + * or your machine is Sony NEWS, on which SJ3 is + * already installed.. + * (in this case, you don't have to care about SJ3SRC) + */ +XCOMM use installed header/library +XCOMM SJ3LIB = -lsj3lib + +/* + * Use compiled library in the source tree.. + */ +XCOMM use library in the source tree +SJ3SRC = $(CONTRIBSRC)/programs/sj3 +SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a + + +/** + ** Transport configuration: + ** Kinput2 X Input Method Protocol handler supports + ** 3 transports, X, TCP and local (UNIX domain). + ** If your system does not support any of these, + ** add appropriate flag(s) to TRANSPORTDEFS. + ** + ** -DNO_UNIX_TRANSPORT -- if UNIX domain transport is not available + ** -DNO_TCP_TRANSPORT -- if TCP/IP transport is not available + ** -DNO_X_TRANSPORT -- if X transport is not available (unlikely) + **/ +XCOMM transport configuration + +TRANSPORTDEFS = + +XCOMM +XCOMM End of global configuration parameters +XCOMM diff -uNr kinput2.orig/cmd/Kinput2.ad kinput2/cmd/Kinput2.ad --- kinput2-v3-beta2/cmd/Kinput2.ad.orig Thu Apr 15 08:59:18 1999 +++ kinput2-v3-beta2/cmd/Kinput2.ad Fri Apr 23 00:26:10 1999 @@ -32,15 +32,15 @@ !! !! 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.wnnEnvrc4: /var/lib/wnn/ja_JP/wnnenvrc -!*CcWnn.wnnEnvrc6: "wnenvrc-file-for-Wnn6" +*CcWnn.wnnEnvrc6: /var/lib/wnn6/ja_JP/wnnenvrc !! !! Canna setup for version 2.x, 3.x !! -!*Canna.Cannahost: "canna-host" +*Canna.Cannahost: localhost !*Canna.Cannafile: "canna-initialization-file" !! !! Sj3 setup @@ -92,16 +92,16 @@ !! ! KinputProtocol *KinputProtocol.BackwardCompatible: true -*KinputProtocol.XlcConversionStartKey: Shiftspace +!*KinputProtocol.XlcConversionStartKey: Shiftspace ! XimpProtocol *XimpProtocol.ForceDefaultServer: true ! X Input Method Protocol *IMProtocol.locales: ja_JP.SJIS, ja_JP.EUC, ja_JP, japanese, japan, ja ! common to XimpProtocol and IMProtocol *defaultFontList: -misc-fixed-medium-r-normal--14-*-*-*-c-* -*ConversionStartKeys: \ - Shiftspace \n\ - CtrlKanji +*ConversionStartKeys: Shiftspace +! Shiftspace \n\ +! CtrlKanji !! !! sending back unused keypress events !!