From 991adfef73cb6dea95fdc2551876f01b965b5633 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Tue, 29 Dec 2009 14:56:45 +0000 Subject: old (Portage version: 2.2_rc61/cvs/Linux x86_64) --- app-i18n/xcin/files/gentoo-xcinrc | 306 -------------- app-i18n/xcin/files/xcin-2.5.2.3-gentoo.patch | 38 -- app-i18n/xcin/files/xcin-2.5.3_pre2-db3.patch | 13 - app-i18n/xcin/files/xcin-2.5.3_pre2-gentoo.patch | 15 - app-i18n/xcin/files/xcin-chewing.diff | 517 ----------------------- app-i18n/xcin/files/xcin-db3.patch | 13 - 6 files changed, 902 deletions(-) delete mode 100644 app-i18n/xcin/files/gentoo-xcinrc delete mode 100644 app-i18n/xcin/files/xcin-2.5.2.3-gentoo.patch delete mode 100644 app-i18n/xcin/files/xcin-2.5.3_pre2-db3.patch delete mode 100644 app-i18n/xcin/files/xcin-2.5.3_pre2-gentoo.patch delete mode 100644 app-i18n/xcin/files/xcin-chewing.diff delete mode 100644 app-i18n/xcin/files/xcin-db3.patch (limited to 'app-i18n/xcin/files') diff --git a/app-i18n/xcin/files/gentoo-xcinrc b/app-i18n/xcin/files/gentoo-xcinrc deleted file mode 100644 index ff215696ccbe..000000000000 --- a/app-i18n/xcin/files/gentoo-xcinrc +++ /dev/null @@ -1,306 +0,0 @@ -; -; Xcin resource file for GNU/Linux -; -; By T.H.Hsieh. -; - -; -; Directories. -; -(define XCIN_DEFAULT_DIR "/usr/lib/X11/xcin25") -(define XCIN_USER_DIR ".xcin") - -; -; This defines GUI attribute. -; -(define INDEX_FONT "-sony-*-16-*-iso8859-1") -(define FG_COLOR "white") -(define BG_COLOR "blue") -(define M_FG_COLOR "yellow") -(define M_BG_COLOR "darkred") -(define ULINE_COLOR "cyan") -(define GRID_COLOR "white") -(define X_GEOMETRY "45x2+200-1") -(define START_MAINWIN2 "YES") -(define MAINWIN2_GEOMETRY "27x1+200-1") -(define XCIN_HIDE "NO") -(define XKILL_DISABLE "NO") -(define ICCHECK_DISABLE "NO") -(define SINGLE_IM_CONTEXT "NO") -(define IM_FOCUS_ON "NO") -(define KEEP_POSITION_ON "NO") -(define DIFF_BEEP "YES") -(define KEYBOARD_TRANSLATE "NO") - -(define LOCALE '(zh_TW.Big5 zh_HK.Big5HKSCS zh_CN.GB2312 zh_CN.GBK)) - -; -; XIM Input Style Adjustments. -; -(define INPUT_STYLE '(Root OverTheSpot)) -(define OVERSPOT_USE_USRCOLOR "YES") -(define OVERSPOT_USE_USRFONTSET "YES") -(define OVERSPOT_WINDOW_ONLY "YES") - -; -; Special Trigger Keys. -; -;(define FKEY_ZHEN "ctrl space") -;(define FKEY_2BSB "shift space") -;(define FKEY_CIRIM "ctrl shift") -;(define FKEY_CIRRIM "shift ctrl") -;(define FKEY_CHREP "ctrl alt r") -;(define FKEY_SIMD "ctrl alt i") -;(define FKEY_IMFOCUS "ctrl alt f") -;(define FKEY_IMN "ctrl alt") -;(define FKEY_QPHRASE "shift alt") - -; -; IM module default resources. -; -(define gen_inp_default - '((AUTO_COMPOSE YES) - (AUTO_UPCHAR YES) - (AUTO_FULLUP NO) - (SPACE_AUTOUP NO) - (SELKEY_SHIFT NO) - (SPACE_IGNORE NO) - (SPACE_RESET YES) - (AUTO_RESET NO) - (WILD_ENABLE YES) - (SINMD_IN_LINE1 NO) - (END_KEY NO) - (QPHRASE_MODE 0) ; 1:shift, 2:ctrl, 4:alt, 8:fallback - (DISABLE_SEL_LIST "NONE") - (KEYSTROKE_REMAP "NONE") - (BEEP_WRONG YES) - (BEEP_DUPCHAR NO) - (TSI_FNAME "/usr/lib/tabe/tsi.db") - (HINT_SELECT NO) - (HINT_TSI NO))) - -(define bimsphone_default - '((N_SELECTION_KEY 9) - (SELECTION_KEYS 0) ; 0: "1234567890", 1: "asdfgjkl;" - (PAGE_KEYS 5) ; 1:<> 2:,. 4:(Rt)(Lt) - (QPHRASE_MODE 1) ; 1:shift, 2:ctrl, 4:alt, 8:fallback - ; - ; This is only valid for "bimsphone*" IM name. - (AUTO_SELECTION YES) - (KEYMAP 0) ; 0:zozy, 1:et, 2:et26, 3:hsu - ; - ; This is only valid for "bimspinyin*" IM name. - (PINPHO_MAP "bims_pinyin") - ; - ; The following has effect only when AUTO_SELECTION is YES - (TSI_FNAME "/usr/lib/tabe/tsi.db") - (YIN_FNAME "/usr/lib/tabe/yin.db") - (TSI_USERDEF_FNAME "utsi.db") - (YIN_USERDEF_FNAME "uyin.db") - (SPACE_SELECTION NO) - (PHRASE_SELECTION YES) - (N_SELECTION_PHR 4) - ; - ; The following has effect only when AUTO_SELECTION is NO - (AUTO_UPCHAR YES))) - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; -; This is the global configuration of the zh_TW.Big5 locale -; -(define zh_TW.Big5 - '((DEFAULT_IM "cj") - (DEFAULT_IM_MODULE "gen_inp") - (DEFAULT_IM_SINMD "DEFAULT") - (PHRASE "default.phr") - (CINPUT (cj simplex phone bimspinyin bimsphone chewing - array30 jyutping jyutping0 zh_hex)) - (FONTSET "-sony-*-24-*-iso8859-1,-kc-*-medium-r-*-24-*-big5-0") - (OVERSPOT_FONTSET "-sony-*-16-*-iso8859-1,-kc-*-medium-r-*-16-*-big5-0"))) -; -; Here are detailed configuration of each IM (for zh_TW.Big5 locale). -; -(define cj@big5 - '((SETKEY 1))) - -(define simplex@big5 - '((SETKEY 2))) - -(define phone@big5 - '((SETKEY 3) - (END_KEY YES) - (BEEP_DUPCHAR YES))) - -(define jyutping@big5 - '((SETKEY 4) - (END_KEY YES) - (BEEP_DUPCHAR YES))) - -(define bimspinyin@big5 - '((SETKEY 5) - (MODULE "bimsphone"))) - -(define bimsphone@big5 - '((SETKEY 6) - (MODULE "bimsphone"))) - -(define chewing@big5 - '((SETKEY 7) - (KB_TYPE "KB_DEFAULT") - (MODULE "chewing"))) - -(define array30@big5 - '((SETKEY 8) - (BEEP_DUPCHAR YES) - (DISABLE_SEL_LIST "w") - (KEYSTROKE_REMAP "t:0xaaba;T:0xaaba;"))) - -(define jyutping0@big5 - '((SETKEY 9) - (BEEP_DUPCHAR YES))) - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; -; This is the global configuration of the zh_CN.GB2312 locale -; -(define zh_CN.GB2312 - '((DEFAULT_IM "pinyin") - (DEFAULT_IM_MODULE "gen_inp") - (DEFAULT_IM_SINMD "DEFAULT") - (PHRASE "default.phr") - (CINPUT (pinyin shuangpin jtcj_gb wubizixing phonegb2 - array30 zh_hex)) - (FONTSET "-sony-*-24-*-iso8859-1,-*-medium-r-*-24-*-gb2312.1980-0") - (OVERSPOT_FONTSET "-sony-*-16-*-iso8859-1,-*-medium-r-*-16-*-gb2312.1980-0"))) -; -; Here are detailed configuration of each IM (for zh_CN.GB2312 locale). -; -(define pinyin@gb2312 - '((SETKEY 1) - (BEEP_DUPCHAR YES))) - -(define shuangpin@gb2312 - '((SETKEY 2) - (BEEP_DUPCHAR YES))) - -(define jtcj_gb@gb2312 - '((SETKEY 3))) - -(define phonegb2@gb2312 - '((SETKEY 4) - (END_KEY YES) - (BEEP_DUPCHAR YES))) - -(define wubizixing@gb2312 - '((SETKEY 5))) - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; -; This is the global configuration of the zh_HK.Big5HKSCS locale -; -(define zh_HK.Big5HKSCS - '((DEFAULT_IM "cj") - (DEFAULT_IM_MODULE "gen_inp") - (DEFAULT_IM_SINMD "DEFAULT") - (PHRASE "default.phr") - (CINPUT (cj simplex phone bimspinyin bimsphone chewing - array30 jyutping jyutping0 zh_hex)) - (FONTSET "-sony-*-24-*-iso8859-1,-*-*-medium-r-*--24-*-*-*-c-*-big5hkscs-0") - (OVERSPOT_FONTSET "-sony-*-16-*-iso8859-1,-*-*-medium-r-*--16-*-*-*-c-*-big5hkscs-0"))) -; -; Here are detailed configuration of each IM (for zh_HK.Big5HKSCS locale). -; -(define cj@big5hkscs - '((SETKEY 1))) - -(define simplex@big5hkscs - '((SETKEY 2))) - -(define phone@big5hkscs - '((SETKEY 3) - (END_KEY YES) - (BEEP_DUPCHAR YES))) - -(define jyutping@big5hkscs - '((SETKEY 4) - (END_KEY YES) - (BEEP_DUPCHAR YES))) - -(define bimspinyin@big5hkscs - '((SETKEY 5) - (MODULE "bimsphone"))) - -(define bimsphone@big5hkscs - '((SETKEY 6) - (MODULE "bimsphone"))) - -(define chewing@big5hkscs - '((SETKEY 7) - (KB_TYPE "KB_DEFAULT") - (MODULE "chewing"))) - -(define array30@big5hkscs - '((SETKEY 8) - (BEEP_DUPCHAR YES) - (DISABLE_SEL_LIST "w") - (KEYSTROKE_REMAP "t:0xaaba;T:0xaaba;"))) - -(define jyutping0@big5hkscs - '((SETKEY 9) - (END_KEY YES) - (BEEP_DUPCHAR YES))) - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; -; This is the global configuration of the zh_CN.GBK locale -; -(define zh_CN.GBK - '((DEFAULT_IM "zh_hex") - (DEFAULT_IM_MODULE "gen_inp") - (DEFAULT_IM_SINMD "DEFAULT") - (PHRASE "default.phr") - (CINPUT (zh_hex)) - (FONTSET "-sony-*-24-*-iso8859-1,-*-medium-r-*-24-*-gbk-0") - (OVERSPOT_FONTSET "NONE"))) - -(define pinyin@gbk - '((SETKEY 1) - (BEEP_DUPCHAR YES))) - -(define shuangpin@gbk - '((SETKEY 2) - (BEEP_DUPCHAR YES))) - -(define jtcj_gb@gbk - '((SETKEY 3))) - -(define phonegb2@gbk - '((SETKEY 4) - (END_KEY YES) - (BEEP_DUPCHAR YES))) - -(define wubizixing@gbk - '((SETKEY 5))) - -(define array30@gbk - '((SETKEY 8) - (BEEP_DUPCHAR YES) - (DISABLE_SEL_LIST "w") - (KEYSTROKE_REMAP "t:0xb5c4;T:0xb5c4;"))) - -; -; The zh_hex module (zh_hex input method) is a special IM, which can be -; used in many different encodings. -; -(define zh_hex - '((SETKEY 0) - (MODULE zh_hex) - (INP_CNAME_big5 "0xa4ba+0xbd58") - (INP_CNAME_big5hkscs "0xa4ba+0xbd58") - (INP_CNAME_gb2312 "0xc4da+0xc2eb") - (INP_CNAME_gbk "0xc4da+0xc2eb") - (BEEP_WRONG YES))) diff --git a/app-i18n/xcin/files/xcin-2.5.2.3-gentoo.patch b/app-i18n/xcin/files/xcin-2.5.2.3-gentoo.patch deleted file mode 100644 index 1fe84f7664f5..000000000000 --- a/app-i18n/xcin/files/xcin-2.5.2.3-gentoo.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- xcin-zh_TW.po Sat Dec 9 10:57:08 2000 -+++ xcin-zh_TW.po.new Thu Aug 1 01:51:12 2002 -@@ -332,7 +332,7 @@ - msgstr "" - "這是內碼輸入法模組。它是一個最簡單的模組，用以展示基本的 xcin\n" - "輸入法模組的程式寫作。在不同的 locale 設定下，它同時也具備不同\n" --"內碼的中文輸入功\能，例如 Big5 或 GB 碼。目前它只能處理每個中文\n" -+"內碼的中文輸入功能，例如 Big5 或 GB 碼。目前它只能處理每個中文\n" - "雙位元內碼。\n" - "\n" - "本模組是一個自由軟體，為 xcin 系統的一部分。\n" -@@ -370,7 +370,7 @@ - msgstr "" - "這是一個一般性輸入法模組。它是最一般化的模組，可以讀入輸入法表格\n" - "檔 (\".tab\" 檔) 並且以該輸入法所定義的方式運作。它同時可以接受來\n" --"自 \"xcinrc\" 中許\許\多多的設定選項，以精確控制該輸入法的行為。我\n" -+"自 \"xcinrc\" 中許許多多的設定選項，以精確控制該輸入法的行為。我\n" - "們希望此模組可以符合大部分使用者的中文輸入要求。\n" - "\n" - "本模組是一個自由軟體，為 xcin 系統的一部分\n" -@@ -400,7 +400,7 @@ - "This module is free software, as part of xcin system.\n" - msgstr "" - "這是一個 \"專業\" 的注音輸入法模組。它使用 libtabe 以及 bims 函\n" --"式庫作為搜尋引擎，以達到具有相同輸入字鍵重複字的自動選字功\能。此\n" -+"式庫作為搜尋引擎，以達到具有相同輸入字鍵重複字的自動選字功能。此\n" - "引擎同時也提供幾個特殊注音輸入法的鍵盤轉換表。我們希望本模組可以\n" - "提供中文輸入的 \"最自然\" 的方式。\n" - "\n" -@@ -646,7 +646,7 @@ - #: ../src/fkey.c:221 - #, c-format - msgid "set_funckey: %d: unknown key_type\n" --msgstr "set_funckey: %d: 未知的功\能鍵形別\n" -+msgstr "set_funckey: %d: 未知的功能鍵形別\n" - - #: ../src/fkey.c:225 - #, c-format diff --git a/app-i18n/xcin/files/xcin-2.5.3_pre2-db3.patch b/app-i18n/xcin/files/xcin-2.5.3_pre2-db3.patch deleted file mode 100644 index 416e737df281..000000000000 --- a/app-i18n/xcin/files/xcin-2.5.3_pre2-db3.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -uNrbB xcin.bak/configure xcin/configure ---- xcin.bak/configure 2003-09-21 01:20:50.000000000 +0800 -+++ xcin/configure 2003-09-21 01:21:01.000000000 +0800 -@@ -7869,7 +7869,7 @@ - fi - - LIBS="$OLD_LIBS" --for f in db db3; do -+for f in db db3 db-3; do - echo $ac_n "checking for db_create in -l$f""... $ac_c" 1>&6 - echo "configure:7875: checking for db_create in -l$f" >&5 - ac_lib_var=`echo $f'_'db_create | sed 'y%./+-%__p_%'` - diff --git a/app-i18n/xcin/files/xcin-2.5.3_pre2-gentoo.patch b/app-i18n/xcin/files/xcin-2.5.3_pre2-gentoo.patch deleted file mode 100644 index 02001d33b594..000000000000 --- a/app-i18n/xcin/files/xcin-2.5.3_pre2-gentoo.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- configure 2002-10-10 01:25:18.000000000 +0900 -+++ configure.new 2002-10-10 01:27:57.000000000 +0900 -@@ -938,9 +938,9 @@ - if test x$with_extra_prefix = x; then - with_extra_prefix=$prefix - fi --if test x$with_extra_inc = x; then -- with_extra_inc="-I$with_extra_prefix/include" --fi -+#if test x$with_extra_inc = x; then -+# with_extra_inc="-I$with_extra_prefix/include" -+#fi - if test x$with_extra_lib = x; then - with_extra_lib="$with_extra_prefix/lib" - fi diff --git a/app-i18n/xcin/files/xcin-chewing.diff b/app-i18n/xcin/files/xcin-chewing.diff deleted file mode 100644 index 9bec1dc8c9f9..000000000000 --- a/app-i18n/xcin/files/xcin-chewing.diff +++ /dev/null @@ -1,517 +0,0 @@ -diff -uNrBb xcin.bak/configure xcin/configure ---- xcin.bak/configure 2004-05-27 19:19:22.000000000 +0800 -+++ xcin/configure 2004-05-27 19:20:03.000000000 +0800 -@@ -8601,6 +8601,7 @@ - src/Cinput/zh_hex/Makefile \ - src/Cinput/gen_inp/Makefile \ - src/Cinput/bimsphone/Makefile \ -+ src/Cinput/chewing/Makefile \ - src/util/Makefile \ - src/util/cin2tab/Makefile \ - src/util/testprog/Makefile \ -@@ -8751,6 +8752,7 @@ - src/Cinput/zh_hex/Makefile \ - src/Cinput/gen_inp/Makefile \ - src/Cinput/bimsphone/Makefile \ -+ src/Cinput/chewing/Makefile \ - src/util/Makefile \ - src/util/cin2tab/Makefile \ - src/util/testprog/Makefile \ -diff -uNrBb xcin.bak/src/Cinput/Makefile.in xcin/src/Cinput/Makefile.in ---- xcin.bak/src/Cinput/Makefile.in 2001-09-22 18:47:48.000000000 +0800 -+++ xcin/src/Cinput/Makefile.in 2004-05-27 19:18:50.000000000 +0800 -@@ -1,4 +1,4 @@ --SUBSYS = zh_hex gen_inp bimsphone -+SUBSYS = zh_hex gen_inp bimsphone chewing - OTHERS = im_comm - - .PHONY: depend subdirs clean distclean install -diff -uNrBb xcin.bak/src/Cinput/chewing/.depend xcin/src/Cinput/chewing/.depend ---- xcin.bak/src/Cinput/chewing/.depend 1970-01-01 08:00:00.000000000 +0800 -+++ xcin/src/Cinput/chewing/.depend 2004-05-27 19:18:50.000000000 +0800 -@@ -0,0 +1,9 @@ -+# -+# PLEASE DON'T EDIT. -+# -+# This is automatically generated from "make depend". -+# You need GCC and perl to generate me. -+# -+ -+xcin_chewing.lo: xcin_chewing.c ../../../config.h ../../../src/include/xcintool.h ../../../src/include/module.h -+ @$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(DEFS) $(INC) -c -o $@ xcin_chewing.c -diff -uNrBb xcin.bak/src/Cinput/chewing/Makefile.in xcin/src/Cinput/chewing/Makefile.in ---- xcin.bak/src/Cinput/chewing/Makefile.in 1970-01-01 08:00:00.000000000 +0800 -+++ xcin/src/Cinput/chewing/Makefile.in 2004-05-27 19:18:50.000000000 +0800 -@@ -0,0 +1,29 @@ -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+include $(top_srcdir)/Rules -+ -+INC = $(xcininc) $(intl_inc) $(x_includes) -I$(top_srcdir) -+LIB = $(xcinlib) -lchewing -+TARGET = chewing.la -+ -+SRC = xcin_chewing.c -+OBJ = $(SRC:.c=.lo) -+ -+.PHONY: depend clean distclean -+ -+all: depend $(TARGET) -+ -+$(TARGET): $(OBJ) -+ $(LIBTOOL) --mode=link $(CC) -module -avoid-version -o $(TARGET) \ -+ $(OBJ) $(LIB) -rpath $(moddir) -+include .depend -+ -+depend: -+ $(Dep_Rule) | $(PERL) $(makedep) $(rules) LC_Rule lo > .depend -+ -+clean: -+ rm -f $(OBJ) *.o $(TARGET) core *.a -+distclean: clean -+ rm -rf Makefile .libs -+install: $(TARGET) -+ $(LIBTOOL) --mode=install $(INSTALL_DATA) $(TARGET) $(xcin_modp) -diff -uNrBb xcin.bak/src/Cinput/chewing/xcin_chewing.c xcin/src/Cinput/chewing/xcin_chewing.c ---- xcin.bak/src/Cinput/chewing/xcin_chewing.c 1970-01-01 08:00:00.000000000 +0800 -+++ xcin/src/Cinput/chewing/xcin_chewing.c 2004-05-27 19:18:50.000000000 +0800 -@@ -0,0 +1,409 @@ -+/* -+ this file is the interface between chewing and xcin -+*/ -+ -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif -+ -+#include -+#include -+/* XXX: #include */ -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include "xcintool.h" -+#include "module.h" -+ -+#define DBG(msg) \ -+ fprintf(stderr, "\033[44;37m" msg "\033[m\n") -+ -+// the following keystate masks are defined by xcin -+#define CAPS_MASK (2) -+#define CTRL_MASK (4) -+ -+/* statistics symbol required by chewing */ -+int lifetime ; -+ -+int MakeInpinfo(inpinfo_t *inpinfo, ChewingOutput *pgo) ; -+ -+int CallSetConfig(inpinfo_t *inpinfo, ChewingData *pgdata) -+{ -+ ConfigData config ; -+ int i ; -+ -+ /* config.selectAreaLen = inpinfo->xcin_wlen ; -+ if (config.selectAreaLen == 0) -+ config.selectAreaLen = 80 ; */ -+ config.selectAreaLen = 40; -+ // config.maxChiSymbolLen = 22 ; -+ config.maxChiSymbolLen = 16; -+ -+ for(i=0; i<9; i++) -+ config.selKey[i] = i + '1' ; -+ config.selKey[9] = '0' ; -+ SetConfig(pgdata, &config) ; -+ return 0 ; -+} -+ -+static int -+ChewingInit(void *conf, char *objname, xcin_rc_t *xc) -+{ -+ char *cmd[2], kb_type_str[256]; -+ ChewingConf *cf = (ChewingConf *)conf ; -+ -+ char *prefix = "/usr/share/chewing"; -+ -+ cmd[0] = objname ; -+ cmd[1] = "KB_TYPE" ; -+ kb_type_str[0] = '\0' ; -+ get_resource(xc, cmd, kb_type_str, 200, 2) ; -+ cf->kb_type = KBStr2Num(kb_type_str) ; -+ -+ cf->inp_cname = strdup("新酷音") ; -+ cf->inp_ename = strdup("Chewing") ; -+ -+ /* Initialize Chewing */ -+ ReadTree(prefix) ; -+ InitChar(prefix) ; -+ InitDict(prefix) ; -+ ReadHash(prefix) ; -+ -+ return True ; -+} -+ -+static int -+ChewingXimInit(void *conf, inpinfo_t *inpinfo) -+{ -+ static char cchBuffer[MAX_PHONE_SEQ_LEN] ; -+ ChewingConf *cf = (ChewingConf *)conf ; -+ int i; -+ -+ inpinfo->iccf = (ChewingData *) calloc(1, sizeof(ChewingData)) ; -+ -+ InitChewing(inpinfo->iccf, cf) ; -+ CallSetConfig(inpinfo, (ChewingData *) inpinfo->iccf) ; -+ -+ inpinfo->lcch = (wch_t *) calloc(MAX_PHONE_SEQ_LEN, sizeof(wch_t)) ; -+ inpinfo->lcch_grouping = (ubyte_t *) calloc(MAX_PHONE_SEQ_LEN, sizeof(ubyte_t) ); -+ inpinfo->cch = cchBuffer ; // 2000.6.30 -+ -+ inpinfo->inp_cname = cf->inp_cname; -+ inpinfo->inp_ename = cf->inp_ename; -+ inpinfo->area3_len = 2 * ZUIN_SIZE + 4; -+ inpinfo->guimode = GUIMOD_LISTCHAR | GUIMOD_SELKEYSPOT; -+ inpinfo->keystroke_len = 0; -+ inpinfo->s_keystroke = (wch_t *) calloc(3 + MAX_PHRASE_LEN, sizeof(wch_t)) ; -+ -+ inpinfo->mcch = (wch_t *) calloc( MAX_CHOICE_BUF, sizeof(wch_t) ); -+ inpinfo->mcch_grouping = (ubyte_t *) calloc( MAX_SELKEY, sizeof(ubyte_t) ); -+ inpinfo->n_mcch = 0; -+ -+ inpinfo->n_lcch = 0; -+ inpinfo->edit_pos = 0; -+ inpinfo->cch_publish.wch = (wchar_t)0; -+ -+ // check_winsize(inpinfo, iccf); -+ // [yet] check winsize is under construction. -+ -+ inpinfo->n_selkey = 10; -+ inpinfo->s_selkey = (wch_t *) calloc( MAX_SELKEY, sizeof(wch_t) ); -+ -+ for (i=0; i<9; i++) { -+ inpinfo->s_selkey[i].wch = (wchar_t)0; -+ inpinfo->s_selkey[i].s[0] = i + '1'; -+ } -+ inpinfo->s_selkey[9].wch = (wchar_t)0; -+ inpinfo->s_selkey[9].s[0] = '0'; -+ -+ return True ; -+} -+ -+void CommitString(inpinfo_t *inpinfo, ChewingOutput *pgo) -+{ -+ int i ; -+ -+ memset(inpinfo->cch, 0, sizeof(wch_t)*MAX_PHONE_SEQ_LEN) ; -+ for(i=0; inCommitStr; i++) -+ strcat(inpinfo->cch, (const char *)pgo->commitStr[i].s) ; -+} -+ -+static unsigned int -+ChewingXimEnd(void *conf, inpinfo_t *inpinfo) -+{ -+ ChewingOutput gOut ; -+ int rtn ; -+ -+ /* if preedit exists, commit the string */ -+ OnKeyEnter(inpinfo->iccf, &gOut) ; -+ -+ rtn = MakeInpinfo(inpinfo, &gOut) ; -+ free(inpinfo->iccf); -+ free(inpinfo->s_keystroke); -+ free(inpinfo->lcch); -+ free(inpinfo->mcch); -+ free(inpinfo->mcch_grouping); -+ -+ inpinfo->iccf = NULL; -+ inpinfo->s_keystroke = NULL; -+ inpinfo->lcch = NULL; -+ -+ // under construction -+ return rtn ; -+} -+ -+void ShowChoose(inpinfo_t *inpinfo, ChoiceInfo *pci, ChewingOutput *pgo) -+{ -+ int i,no,k,len; -+ -+ // for new xcin, there is no need to modify the lcch buffer -+ // instead, we put phrase to choose in mcch -+ no = pci->pageNo * pci->nChoicePerPage; -+ len = 0; -+ -+ for(i=0;inChoicePerPage; no++,i++) { -+ -+ // in the last page, no will exceed nTotalChoice -+ if( no >= pci->nTotalChoice ) -+ break; -+ // for each char in the phrase, copy to mcch -+ for(k=0; pci->totalChoiceStr[no][k]!='\0'; k+=2) -+ memcpy(inpinfo->mcch[len++].s, &(pci->totalChoiceStr[no][k]), 2) ; -+ // set grouping to the length of the phrase -+ inpinfo->mcch_grouping[i+1] = k/2; -+ } -+ // i stores how many choices are available -+ inpinfo->mcch_grouping[0] = i; -+ -+ // set pgstate according to pci->pageNo & pci->nPage -+ if( pci->nPage == 1) { -+ inpinfo->mcch_pgstate = MCCH_ONEPG; -+ } -+ else { -+ if( pci->pageNo == 0 ) -+ inpinfo->mcch_pgstate = MCCH_BEGIN; -+ else if( pci->pageNo == pci->nPage - 1) -+ inpinfo->mcch_pgstate = MCCH_END; -+ else -+ inpinfo->mcch_pgstate = MCCH_MIDDLE; -+ } -+ -+ inpinfo->n_mcch = len ; -+} -+ -+void ShowText(inpinfo_t *inpinfo, ChewingOutput *pgo) -+{ -+ memset(inpinfo->lcch, 0, sizeof(wch_t)*MAX_PHONE_SEQ_LEN) ; -+ memcpy(inpinfo->lcch, pgo->chiSymbolBuf, sizeof(wch_t) * pgo->chiSymbolBufLen) ; -+ inpinfo->n_lcch = pgo->chiSymbolBufLen ; -+} -+ -+void ShowInterval(inpinfo_t *inpinfo, ChewingOutput *pgo) -+{ -+ int i, k, begin, len, count, nGroup ; -+ int label[MAX_PHONE_SEQ_LEN] ; -+ -+ if( pgo->chiSymbolBufLen == 0) { -+ inpinfo->lcch_grouping[0] = 0 ; -+ return ; -+ } -+ -+ // set label -+ for(count=0; countchiSymbolBufLen; count++) -+ label[count] = count ; -+ -+ for(i=0; inDispInterval; i++) { -+ len = pgo->dispInterval[i].to - pgo->dispInterval[i].from ; -+ -+ if( len > 1) { -+ for(k=pgo->dispInterval[i].from; kdispInterval[i].to; k++) -+ label[k] = count ; -+ count++ ; -+ } -+ } -+ -+ // begin to set lcch_grouping by the label -+ nGroup = 0 ; -+ begin = 0 ; -+ for(i=1; ichiSymbolBufLen; i++) { -+ if( label[i] != label[begin] ) { -+ inpinfo->lcch_grouping[++nGroup] = ( i - begin ) ; -+ begin = i ; -+ } -+ } -+ inpinfo->lcch_grouping[++nGroup] = ( i - begin ) ; -+ inpinfo->lcch_grouping[0] = nGroup ; -+} -+ -+void ShowStateAndZuin(inpinfo_t *inpinfo, ChewingOutput *pgo) -+{ -+ int i, a , len = 0; -+ memset( inpinfo->s_keystroke, 0, sizeof(wch_t)*(3 + MAX_PHRASE_LEN)) ; -+ if(pgo->bShowMsg) { -+ memcpy( inpinfo->s_keystroke, pgo->showMsg, sizeof(wch_t)*pgo->showMsgLen) ; -+ inpinfo->keystroke_len = pgo->showMsgLen ; -+ } -+ else { -+ if(pgo->bChiSym) -+ strcpy( (char *)inpinfo->s_keystroke[0].s, "中") ; -+ else -+ strcpy( (char *)inpinfo->s_keystroke[0].s, "英") ; -+ -+ inpinfo->s_keystroke[1].s[0] = ' ' ; -+ for(i=0,a=2; izuinBuf[i].s[0] != '\0') { -+ inpinfo->s_keystroke[a++].wch = pgo->zuinBuf[i].wch ; -+ ++ len; -+ } -+ inpinfo->keystroke_len = len; -+ } -+} -+ -+void SetCursor(inpinfo_t *inpinfo, ChewingOutput *pgo) -+{ -+ inpinfo->edit_pos = pgo->chiSymbolCursor; -+} -+ -+int MakeInpinfo(inpinfo_t *inpinfo, ChewingOutput *pgo) -+{ -+ int rtnValue = 0 ; -+ -+ if(pgo->keystrokeRtn & KEYSTROKE_ABSORB) -+ rtnValue |= IMKEY_ABSORB ; -+ if(pgo->keystrokeRtn & KEYSTROKE_IGNORE) -+ rtnValue |= IMKEY_IGNORE ; -+ if(pgo->keystrokeRtn & KEYSTROKE_BELL) -+ rtnValue |= IMKEY_BELL ; -+ if(pgo->keystrokeRtn & KEYSTROKE_COMMIT) { -+ rtnValue |= IMKEY_COMMIT ; -+ CommitString(inpinfo, pgo) ; -+ } -+ -+ if(pgo->pci->nPage != 0) { // in selection mode -+ ShowChoose(inpinfo,pgo->pci,pgo) ; -+ inpinfo->guimode &= ~GUIMOD_LISTCHAR; -+ } -+ else { // not in selection mode -+ ShowText(inpinfo, pgo) ; -+ ShowInterval(inpinfo, pgo) ; // kpchen 2000.2.9 -+ inpinfo->guimode |= GUIMOD_LISTCHAR; -+ } -+ ShowStateAndZuin(inpinfo, pgo) ; -+ SetCursor(inpinfo, pgo) ; -+ return rtnValue ; -+} -+ -+static unsigned int -+ChewingKeystroke(void *conf, inpinfo_t *inpinfo, keyinfo_t *keyinfo) -+{ -+ KeySym keysym = keyinfo->keysym; -+ ChewingOutput gOut ; -+ int rtn ; -+ static KeySym last_key = 0; -+ -+ // set Chinese / English mode by keystate -+ if( keyinfo->keystate & CAPS_MASK ) { // uppercase -+ SetChiEngMode( inpinfo->iccf, SYMBOL_MODE); -+ } -+ else { // lower case -+ SetChiEngMode( inpinfo->iccf, CHINESE_MODE); -+ } -+ -+ -+ // check no ctrl key was pressed -+ if(keyinfo->keystate >= 0 && !(keyinfo->keystate & CTRL_MASK) ) { -+ switch(keysym) { -+ case XK_Escape: -+ OnKeyEsc(inpinfo->iccf, &gOut) ; -+ break ; -+ case XK_Return: -+ OnKeyEnter(inpinfo->iccf, &gOut) ; -+ inpinfo->n_mcch = 0; -+ break ; -+ case XK_Delete: -+ OnKeyDel(inpinfo->iccf, &gOut) ; -+ break ; -+ case XK_BackSpace: -+ OnKeyBackspace(inpinfo->iccf, &gOut) ; -+ break ; -+ case XK_Up: -+ OnKeyUp(inpinfo->iccf, &gOut); -+ break ; -+ case XK_Down: -+ OnKeyDown(inpinfo->iccf, &gOut) ; -+ break ; -+ case XK_Left: -+ OnKeyLeft(inpinfo->iccf, &gOut) ; -+ break ; -+ case XK_Right: -+ OnKeyRight(inpinfo->iccf, &gOut) ; -+ break ; -+ case XK_Home: -+ OnKeyHome(inpinfo->iccf, &gOut); -+ break; -+ case XK_End: -+ OnKeyEnd(inpinfo->iccf, &gOut); -+ break; -+ -+ case XK_Tab: -+ if( last_key == XK_Tab) // double click TAB -+ OnKeyDblTab(inpinfo->iccf, &gOut); -+ else -+ OnKeyTab(inpinfo->iccf, &gOut) ; -+ break ; -+ case XK_Caps_Lock: -+ OnKeyCapslock(inpinfo->iccf, &gOut) ; -+ break ; -+ default: -+ OnKeyDefault(inpinfo->iccf,keysym,&gOut ) ; -+ break ; -+ } -+ } -+ -+ else if(keyinfo->keystate & CTRL_MASK) { // Ctrl-key Mask -+ // We need to fill the 'gOut' variable for output. -+ if(keysym <= '9' && keysym >= '0') -+ OnKeyCtrlNum(inpinfo->iccf,keysym,&gOut) ; -+ else -+ OnKeyCtrlDefault(inpinfo->iccf,&gOut) ; -+ } -+ -+ -+ last_key = keysym; -+ rtn = MakeInpinfo(inpinfo, &gOut) ; -+ return rtn ; -+} -+ -+static int -+ChewingShowKeystroke(void *conf, simdinfo_t *simdinfo) -+{ -+ simdinfo->s_keystroke = NULL; -+ return False; -+} -+ -+static char zh_chewing_comments[] = -+"This is a very smart phonetic input method module.\n" -+"By Lu-chuan Kung and\n" -+"And Kang-pen Chen .\n"; -+ -+static char *zh_chewing_valid_objname[] = { "chewing", NULL }; -+ -+module_t module_ptr = { -+ { MTYPE_IM, -+ "zh_chewing", /* name */ -+ MODULE_VERSION, /* version */ -+ zh_chewing_comments }, /* comments */ -+ zh_chewing_valid_objname, /* valid_objname */ -+ sizeof(ChewingConf), /* conf_size */ -+ ChewingInit, /* init */ -+ ChewingXimInit, /* xim_init */ -+ ChewingXimEnd, /* xim_end */ -+ ChewingKeystroke, /* keystroke */ -+ ChewingShowKeystroke, /* show_keystroke */ -+ NULL -+}; -+ -diff -uNrBb xcin.bak/src/include/module.h xcin/src/include/module.h ---- xcin.bak/src/include/module.h 2001-10-16 00:21:14.000000000 +0800 -+++ xcin/src/include/module.h 2004-05-27 19:18:50.000000000 +0800 -@@ -278,7 +278,7 @@ - - /* Quick key phrase: %trigger, %shift, %ctrl, %alt */ - extern void qphrase_init(xcin_rc_t *xrc, char *phrase_fn); --extern char *qphrase_str(int ch, int class); -+extern char *qphrase_str(int ch, int _class); - extern char *get_qphrase_list(void); - - /* GUI Request registration */ -diff -uNrBb xcin.bak/src/include/xcintool.h xcin/src/include/xcintool.h ---- xcin.bak/src/include/xcintool.h 2001-11-11 20:50:48.000000000 +0800 -+++ xcin/src/include/xcintool.h 2004-05-27 19:18:50.000000000 +0800 -@@ -197,12 +197,14 @@ - }; - - /* XCIN global resources. */ -+#ifndef __USE_GNU - typedef struct { - char *lc_ctype; - char *lc_messages; - char *encoding; - int encid, locid; - } locale_t; -+#endif - - typedef struct { - int argc; /* Command line arguement list */ diff --git a/app-i18n/xcin/files/xcin-db3.patch b/app-i18n/xcin/files/xcin-db3.patch deleted file mode 100644 index 416e737df281..000000000000 --- a/app-i18n/xcin/files/xcin-db3.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -uNrbB xcin.bak/configure xcin/configure ---- xcin.bak/configure 2003-09-21 01:20:50.000000000 +0800 -+++ xcin/configure 2003-09-21 01:21:01.000000000 +0800 -@@ -7869,7 +7869,7 @@ - fi - - LIBS="$OLD_LIBS" --for f in db db3; do -+for f in db db3 db-3; do - echo $ac_n "checking for db_create in -l$f""... $ac_c" 1>&6 - echo "configure:7875: checking for db_create in -l$f" >&5 - ac_lib_var=`echo $f'_'db_create | sed 'y%./+-%__p_%'` - -- cgit v1.2.3-65-gdbad